[anjuta] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit b91602dd31c29ca5cc220d8e5c0261cca7d41165
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Feb 17 19:27:49 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 5168 ++++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po | 5182 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 4975 insertions(+), 5375 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9d44995..486c179 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,11 +7,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta 2.27.5\n"
+"Project-Id-Version: anjuta 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 22:14+0800\n"
-"PO-Revision-Date: 2009-08-02 22:16+0800\n"
-"Last-Translator: Hialan Liu <hialan liu gmail com>\n"
+"POT-Creation-Date: 2010-02-17 19:26+0800\n"
+"PO-Revision-Date: 2010-02-17 19:26+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,9 +68,9 @@ 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 "anjuta ç?¡æ³?è?ªå??å?¤æ?·ä½ æ?³è¦?é??å??æª?æ¡?ç??編碼ç?ºä½?ã??"
+msgstr "Anjuta ç?¡æ³?è?ªå??å?¤æ?·ä½ æ?³è¦?é??å??æª?æ¡?ç??編碼ç?ºä½?ã??"
 
 #: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
 #: ../libanjuta/anjuta-encodings.c:184 ../libanjuta/anjuta-encodings.c:186
@@ -184,36 +184,39 @@ 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:191
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3267
 #: ../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:802
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1150 ../libanjuta/resources.c:267
+#: ../libanjuta/anjuta-launcher.c:1154 ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1151
+#: ../libanjuta/anjuta-launcher.c:1155
 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 "Anjuta Shell"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "å?«æ??æ­¤å¤?æ??ç¨?å¼?ç?? Anjuta shell"
 
 #: ../libanjuta/anjuta-plugin-manager.c:733
 #, c-format
-msgid "Plugin '%s' do not want to be deactivated"
+msgid "Plugin '%s' does not want to be deactivated"
 msgstr "å¤?æ??ç¨?å¼?ã??%sã??ä¸?æ?³è¦?被å??止使ç?¨"
 
 #: ../libanjuta/anjuta-plugin-manager.c:764
@@ -234,7 +237,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 "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
@@ -259,64 +262,65 @@ 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 "è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
-msgid "No plugin able to load other plugins in %s"
+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
-msgid "Anjuta shell for which the plugins are"
+#: ../libanjuta/anjuta-plugin-manager.c:2313
+#, fuzzy
+msgid "Anjuta shell for which the plugins are made"
 msgstr "Anjuta shell å¤?æ??ç¨?å¼?ç?º"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2319
+#: ../libanjuta/anjuta-plugin-manager.c:2321
 msgid "Anjuta Status"
 msgstr "Anjuta ç??æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2320
+#: ../libanjuta/anjuta-plugin-manager.c:2322
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "Anjuta ç??æ??ï¼?ç?¨æ?¼å¤?æ??ç¨?å¼?ç??è¼?å?¥è??å?¸è¼?"
 
 #. 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 "已���"
 
@@ -349,8 +353,8 @@ msgid "Synchronization file"
 msgstr "å??æ­¥æª?æ¡?"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
-msgstr "ç?¨ä¾?å??步設å®?çµ?å?? xml ç??æª?æ¡?"
+msgid "File to syncronize the profile XML"
+msgstr "ç?¨ä¾?å??步設å®?çµ?å?? XML ç??æª?æ¡?"
 
 #: ../libanjuta/anjuta-profile.c:508
 msgid "Please select a plugin from the list"
@@ -359,9 +363,9 @@ 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 解æ??é?¯èª¤ã??ç?¡æ??æ??æ??å£?ç?? anjuta å¤?æ??ç¨?å¼?設å®?çµ?å??ã??"
+msgstr "è®?å??ã??%sã??失æ??ï¼?XML 解æ??é?¯èª¤ã??ç?¡æ??æ??æ??å£?ç?? Anjuta å¤?æ??ç¨?å¼?設å®?çµ?å??ã??"
 
 #. <Pluginname>: Install it from <some location on the web>
 #: ../libanjuta/anjuta-profile.c:699
@@ -388,7 +392,7 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:415
+#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "é??ç½®(_R)"
 
@@ -400,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 "��"
 
@@ -409,24 +413,24 @@ msgstr "��"
 msgid "Anjuta Preferences"
 msgstr "Anjuta å??好設å®?"
 
-#: ../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 "æ??æ£?æ?´æ?¹(_D)"
 
@@ -460,11 +464,32 @@ msgid "Shortcut"
 msgstr "å¿«æ?·é?µ"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:355
+#: ../libanjuta/anjuta-utils.c:359
 msgid "System:"
 msgstr "系統�"
 
-#: ../libanjuta/anjuta-utils.c:493
+#: ../libanjuta/anjuta-utils.c:505
+msgid ""
+"You do not seem to have PackageKit installed. PackageKit is required for "
+"installing missing packages. Please install \"packagekit-gnome\" package "
+"from your distribution, or install the missing packages manually."
+msgstr "ä½ ä¼¼ä¹?æ²?æ??å®?è£? PackageKitã??å¿?é ?æ?? PackageKit æ??è?½å®?è£?缺å°?ç??å¥?件ã??è«?å¾?ä½ ç??ç?¼è¡?ç??æ?¬å®?è£?ã??packagekit-gnomeã??å¥?件ï¼?æ??æ??å??å®?è£?缺å°?ç??å¥?件ã??"
+
+#: ../libanjuta/anjuta-utils.c:515
+#, c-format
+msgid "Installation failed: %s"
+msgstr "å®?è£?ä½?æ?¯å¤±æ??ï¼?%s"
+
+#: ../libanjuta/anjuta-utils.c:575
+#, c-format
+msgid ""
+"The \"%s\" package is not installed.\n"
+"Please install it."
+msgstr ""
+"ä½ å°?æ?ªå®?è£?ã??%sã??å¥?件ã??\n"
+"è«?å®?è£?å®?ã??"
+
+#: ../libanjuta/anjuta-utils.c:593
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -474,68 +499,69 @@ msgstr ""
 "è«?å®?è£?å®?ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:986
-msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr "æ?¾ä¸?å?°çµ?端æ©?ï¼?使ç?¨ xtermï¼?ä¸?管å®?è?½ä¸?è?½é??ä½?"
+#: ../libanjuta/anjuta-utils.c:1086
+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:1122 ../libanjuta/anjuta-utils.c:1126
+#: ../libanjuta/anjuta-utils.c:1154 ../libanjuta/anjuta-utils.c:1158
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?%sï¼?使ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1692
+#: ../libanjuta/anjuta-utils.c:1790
 msgid ""
-"Unable to display help. Please make sure Anjuta documentation package is "
-"install. It can be downloaded from http://anjuta.org";
-msgstr "ç?¡æ³?顯示æ±?å?©ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??ä»?å?¯ä»¥å¾? 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 "ç?¡æ³?顯示æ±?å?©æ??件ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??ä½ å?¯ä»¥å¾? http://anjuta.org ä¸?è¼?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:2131
+#: ../libanjuta/anjuta-utils.c:2229
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:65
+#: ../plugins/file-manager/file-view.c:75
 msgid "Modified"
 msgstr "已修�"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:69
+#: ../plugins/file-manager/file-view.c:79
 msgid "Added"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:67
+#: ../plugins/file-manager/file-view.c:77
 msgid "Deleted"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:71
+#: ../plugins/file-manager/file-view.c:81
 msgid "Conflicted"
 msgstr "æ??è¡?çª?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
-msgstr "æ??æ?°ç??"
+#: ../plugins/file-manager/file-view.c:83
+msgid "Up-to-date"
+msgstr "æ??æ?°ç??"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:85
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:87
 msgid "Missing"
 msgstr "�失"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:89
 msgid "Unversioned"
 msgstr "æ?ªè¨?ç??æ?¬"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:91
 msgid "Ignored"
 msgstr "已忽�"
 
@@ -555,8 +581,8 @@ msgstr "Pixbuf �件"
 msgid "The pixbuf to render."
 msgstr "æº?å??æ??繪ç?? pixbufã??"
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3031
-#: ../plugins/glade/plugin.c:3066
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3029
+#: ../plugins/glade/plugin.c:3064
 #, c-format
 msgid "Widget not found: %s"
 msgstr "ç?¡æ³?æ?¾å?°å??件ï¼?%s"
@@ -567,95 +593,93 @@ msgid "Could not find application pixmap file: %s"
 msgstr "ç?¡æ³?æ?¾å?°ç¨?å¼?å??示æª?ï¼?%s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-#, fuzzy
-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
-#, fuzzy
-msgid "Build Directory:"
-msgstr "建置��(_B)"
-
-#: ../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
 #, fuzzy
 msgid "Continue on errors"
-msgstr "ä¸?æ??ç??é?¯èª¤ã??"
+msgstr "å?³æ?? ECC é?¯èª¤ç??次æ?¸"
 
-#: ../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 "以 root ���"
 
-#: ../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
-#, fuzzy
 msgid "Select a build directory"
-msgstr "é?¸æ??ç?®é??"
+msgstr "é?¸æ??ä¸?å??çµ?建ç?®é??"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:17
 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 "��"
+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 "æ??ä½³å??"
 
@@ -663,39 +687,42 @@ msgstr "æ??ä½³å??"
 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/build-basic-autotools/executer.c:157
+#: ../plugins/gbf-am/gbf-am-project.c:196
+#: ../plugins/gbf-am/gbf-am-project.c:3362
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:194
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3261
 msgid "Program"
 msgstr "��"
 
-#: ../plugins/build-basic-autotools/executer.c:255
+#: ../plugins/build-basic-autotools/executer.c:258
 msgid "No file or project currently opened."
 msgstr "ç?®å??æ²?æ??é??å??ä»»ä½?æª?æ¡?æ??å°?æ¡?ã??"
 
 #. Only local program are supported
-#: ../plugins/build-basic-autotools/executer.c:295
+#: ../plugins/build-basic-autotools/executer.c:298
 #: ../plugins/run-program/execute.c:70
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "�� '%s' ������"
 
-#: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/build-basic-autotools/executer.c:313
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
-msgstr "�� '%s' ���"
+msgid "Program '%s' does not exist"
+msgstr "ç¨?å¼?ã??%sã??ä¸?å­?å?¨"
 
-#: ../plugins/build-basic-autotools/executer.c:318
+#: ../plugins/build-basic-autotools/executer.c:321
 #: ../plugins/run-program/execute.c:80
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "ç¨?å¼? '%s' ä¸?å?·æ??å?·è¡?æ¬?é??"
 
-#: ../plugins/build-basic-autotools/executer.c:350
+#: ../plugins/build-basic-autotools/executer.c:353
 msgid "No executable for this file."
 msgstr "é??ä¸?æ?¯ä¸?å??å?¯å?·è¡?ç??æª?æ¡?ã??"
 
-#: ../plugins/build-basic-autotools/executer.c:356
+#: ../plugins/build-basic-autotools/executer.c:359
 #, c-format
 msgid "Executable '%s' is not up-to-date."
 msgstr "å?¯å?·è¡?æª? '%s' 並ä¸?æ?¯æ??æ?°ç??ã??"
@@ -726,272 +753,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 ""
-"Using this new configuration, need to to remove the default one. Do you want "
-"to do it ?"
-msgstr ""
+"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:1800
+#: ../plugins/build-basic-autotools/plugin.c:1820
 #, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
-msgstr "ç?¡æ³?編譯 \"%s\"ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
+msgstr "ç?¡æ³?編譯ã??%sã??ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1926
+#: ../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:2392
-#: ../plugins/build-basic-autotools/plugin.c:2466
-#: ../plugins/build-basic-autotools/plugin.c:2476
-#: ../plugins/build-basic-autotools/plugin.c:2494
-#: ../plugins/build-basic-autotools/plugin.c:2504
-#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2432
+#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../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 "建置(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2396
+#: ../plugins/build-basic-autotools/plugin.c:2436
 msgid "_Build Project"
 msgstr "建置��(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2397
+#: ../plugins/build-basic-autotools/plugin.c:2437
 msgid "Build whole project"
 msgstr "建置æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2402
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Install Project"
 msgstr "����(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2403
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2408
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2409
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2414
-msgid "C_onfigure Project..."
+#: ../plugins/build-basic-autotools/plugin.c:2454
+msgid "C_onfigure Projectâ?¦"
 msgstr "設���(_O)..."
 
-#: ../plugins/build-basic-autotools/plugin.c:2415
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Configure project"
 msgstr "設���"
 
-#: ../plugins/build-basic-autotools/plugin.c:2420
+#: ../plugins/build-basic-autotools/plugin.c:2460
 msgid "Build _Tarball"
 msgstr "建置 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2421
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Build project tarball distribution"
 msgstr "建置�� tarball ���件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2426
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "_Build Module"
 msgstr "建置模�(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2427
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build module associated with current file"
 msgstr "建置è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2432
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Install Module"
 msgstr "��模�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2433
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2438
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Clean Module"
 msgstr "��模�(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2439
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2444
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "Co_mpile File"
 msgstr "編譯��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2445
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Compile current editor file"
 msgstr "編譯ç?®å??編輯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2450
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2451
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2456
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Remove Configuration"
 msgstr "移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2457
+#: ../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:2470
-#: ../plugins/build-basic-autotools/plugin.c:2498
+#: ../plugins/build-basic-autotools/plugin.c:2510
+#: ../plugins/build-basic-autotools/plugin.c:2538
 msgid "_Compile"
 msgstr "編譯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2471
-#: ../plugins/build-basic-autotools/plugin.c:2499
+#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2539
 msgid "Compile file"
 msgstr "編譯��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2477
-#: ../plugins/build-basic-autotools/plugin.c:2505
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Build module"
 msgstr "建置模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
-#: ../plugins/build-basic-autotools/plugin.c:2510
-#: ../plugins/build-basic-autotools/plugin.c:2568
+#: ../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 "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2483
-#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Install module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
-#: ../plugins/build-basic-autotools/plugin.c:2516
-#: ../plugins/build-basic-autotools/plugin.c:2575
+#: ../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 "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2489
-#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Clean module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2562
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??令(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Cancel build command"
 msgstr "å??æ¶?建置æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2601
 #, c-format
 msgid "_Build (%s)"
 msgstr "建置(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2568
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2575
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "編譯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile"
 msgstr "編譯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3119
+#: ../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:3128
+#: ../plugins/build-basic-autotools/plugin.c:3168
 msgid "Build popup commands"
 msgstr "建置å½?å?ºå¼?æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:3510
-#: ../plugins/build-basic-autotools/plugin.c:3518
+#: ../plugins/build-basic-autotools/plugin.c:3550
+#: ../plugins/build-basic-autotools/plugin.c:3558
 msgid "Build Autotools"
 msgstr "建置 Autotools"
 
@@ -1000,49 +1027,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 "é¡?å?¥å??稱ï¼?"
@@ -1064,71 +1092,61 @@ 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
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è¨±å?¯è­? (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 "�� 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 ""
 
-#: ../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
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU 寬é??ç?¨å?¬å?±è¨±å?¯è­? (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:4436
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/glade/plugin.c:4433
 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 ""
-
 #: ../plugins/class-gen/generator.c:132
 #, c-format
 msgid "Header or source file has not been created"
@@ -1151,214 +1169,280 @@ 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:1127
 msgid ""
-"Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
-msgstr "æ?¾ä¸?å?° autogen 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??ä½ å?¯ä»¥å¾? 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 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??ä½ å?¯ä»¥å¾? http://autogen.sourceforge.net å??å¾?ã??"
 
-#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
+#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
 #, 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:1914
+#: ../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:754
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+msgid "ParamSpec"
+msgstr "å??æ?¸ï¼?"
+
+#. 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 ""
+
+#: ../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"
 "æ??ä¸?確å®?æ??å?ªé?¤ç£?ç¢?è?? CVS ä¸?ç??æª?æ¡?ã??ç?¶ç?¶å?¨ä½ ä½¿ç?¨ CVS Commit å??é??ä¸?æ??移é?¤ CVS ä¸?ç??æª?æ¡?ã??<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..."
+#: ../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ï¼?æ??交æª?æ¡?/ç?®é??"
 
-#: ../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: å·®ç?°æª?æ¡?/ç?®é??"
 
-#: ../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 "é?¸å??æ??交ç??æª?æ¡?æ??ç?®é??ï¼?"
 
-#: ../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 ""
 
-#: ../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/symbol-db/plugin.c:2332 ../plugins/symbol-db/plugin.c:2396
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2320
+#: ../plugins/symbol-db/plugin.c:2390
 msgid "Local"
 msgstr "å??å??"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:62
+#: ../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:3085
+#: ../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 "Patchå¼? 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:89
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ä¿®è¨?ç??ï¼?"
 
@@ -1371,7 +1455,7 @@ msgid "Unified format instead of context format"
 msgstr "以統ä¸?æ ¼å¼?代æ?¿é??è?¯æ ¼å¼?"
 
 #: ../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 "使ç?¨ä¿®è¨?ç??/æ¨?籤ï¼?"
 
@@ -1380,7 +1464,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 "使ç?¨è??å??稱ï¼?"
 
@@ -1390,7 +1474,7 @@ msgstr "å» å??æ¨?籤ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
 #: ../plugins/git/anjuta-git.ui.h:123
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "æ?´å??å°?æ¡?"
 
@@ -1424,7 +1508,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 "模�"
 
@@ -1441,18 +1525,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
@@ -1506,14 +1590,13 @@ msgstr "æ??交你ç??ä¿®æ?¹è?³ CVS 樹"
 #. Stock icon, if any
 #: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
-#: ../plugins/gdb/anjuta-gdb.glade.h:38
 msgid "_Update"
 msgstr "_Update"
 
 #. 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"
+msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?ä½ æ?¬æ©?ç??è¤?æ?¬è?? CVS 樹å??æ­¥"
 
 #. Action name
@@ -1573,152 +1656,133 @@ 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 ""
 
-#: ../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/gdb/anjuta-gdb.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "è¦?è??ç??ç??é??å? æª?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
-#: ../plugins/gdb/anjuta-gdb.glade.h:3
+#: ../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/breakpoints.c:1980
-#: ../plugins/gdb/anjuta-gdb.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/breakpoints.c:1987
 msgid "Breakpoints"
 msgstr "中��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
-#: ../plugins/gdb/anjuta-gdb.glade.h:5
+#: ../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/gdb/anjuta-gdb.glade.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
-msgstr "å?µé?¯å·¥å?·æ??令"
+msgstr "é?¤é?¯å·¥å?·æ??令"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
-#: ../plugins/gdb/anjuta-gdb.glade.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
-msgstr "å?µé?¯å·¥å?·æ??令ï¼?"
+msgstr "é?¤é?¯å·¥å?·æ??令ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
-#: ../plugins/gdb/anjuta-gdb.glade.h:9
-#: ../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
 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/gdb/anjuta-gdb.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "顯示��樹(_T)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
-#, fuzzy
-#| msgid "_Do not show again"
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Do not show again"
-msgstr "ä¸?å??顯示(_D)"
+msgstr "ä¸?å??顯示"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
-#: ../plugins/gdb/anjuta-gdb.glade.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "å?¨é?¨å??ç?¨(_A)"
 
-#: ../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/gdb/anjuta-gdb.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "é?±è??è¡?ç¨?å??æ?¸(_M)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
-#: ../plugins/gdb/anjuta-gdb.glade.h:15
+#: ../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 ../plugins/gdb/anjuta-gdb.glade.h:16
+#: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "å?§æ ¸è¨?è??"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/gdb/anjuta-gdb.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/breakpoints.c:1914
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
-#: ../plugins/debug-manager/memory.c:180 ../plugins/gdb/anjuta-gdb.glade.h:18
+#: ../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/gdb/anjuta-gdb.glade.h:19
+#: ../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/gdb/anjuta-gdb.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "æ??å?°ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
-#: ../plugins/gdb/anjuta-gdb.glade.h:21
+#: ../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
-#: ../plugins/gdb/anjuta-gdb.glade.h:23
 msgid "SIGINT"
 msgstr "SIGINT"
 
@@ -1731,32 +1795,27 @@ msgid "Serial Line Connection"
 msgstr "åº?å??å? é?£ç·?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:35
-#: ../plugins/gdb/anjuta-gdb.glade.h:24
 msgid "Set Signal Property"
 msgstr "編輯è¨?è??å?§å®¹"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
 #: ../plugins/debug-manager/sharedlib.c:214
-#: ../plugins/gdb/anjuta-gdb.glade.h:25
 msgid "Shared libraries"
 msgstr "�享��庫"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:37
-#: ../plugins/gdb/anjuta-gdb.glade.h:26
 msgid "Signal:"
 msgstr "è¨?è??ï¼?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:38
-#: ../plugins/gdb/anjuta-gdb.glade.h:27
 msgid "Source Directories"
 msgstr "æº?代碼ç?®é??"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
 msgid "Start Debugger"
-msgstr "å??å??å?µé?¯å?¨"
+msgstr "å??å??é?¤é?¯å?¨"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:40
-#: ../plugins/gdb/anjuta-gdb.glade.h:28
 msgid "Stop:"
 msgstr "å??æ­¢ï¼?"
 
@@ -1765,13 +1824,11 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/gdb/anjuta-gdb.glade.h:29
-#: ../plugins/project-wizard/property.c:286
+#: ../plugins/project-wizard/property.c:309
 msgid "Yes"
 msgstr "æ?¯"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:43
-#: ../plugins/gdb/anjuta-gdb.glade.h:30
 msgid "_Attach"
 msgstr "é??å? (_A)"
 
@@ -1780,22 +1837,18 @@ msgid "_Automatic update"
 msgstr "è?ªå??æ?´æ?°(_A)"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:45
-#: ../plugins/gdb/anjuta-gdb.glade.h:31
 msgid "_Condition:"
 msgstr "�件(_C)�"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:46
-#: ../plugins/gdb/anjuta-gdb.glade.h:32
 msgid "_Disable all"
 msgstr "å?¨é?¨å??ç?¨(_D)ï¼?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:47
-#: ../plugins/gdb/anjuta-gdb.glade.h:33
 msgid "_Hide paths"
 msgstr "é?±è??è·¯å¾?(_H)"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:48
-#: ../plugins/gdb/anjuta-gdb.glade.h:34
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
@@ -1809,12 +1862,10 @@ msgid "_Pass count:"
 msgstr "é??é??次æ?¸(_P):"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:52
-#: ../plugins/gdb/anjuta-gdb.glade.h:36
 msgid "_Process to attach to:"
 msgstr "è¦?é??å? ç??ç¨?åº?(_P):"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:53
-#: ../plugins/gdb/anjuta-gdb.glade.h:37
 msgid "_Remove all"
 msgstr "��移�(_R)"
 
@@ -1822,180 +1873,174 @@ msgstr "��移�(_R)"
 msgid "_Value:"
 msgstr "��(_V):"
 
-#: ../plugins/debug-manager/breakpoints.c:1673
+#: ../plugins/debug-manager/breakpoints.c:1680
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??中æ?·é»?ï¼?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1770
+#: ../plugins/debug-manager/breakpoints.c:1777
 msgid "_Breakpoints"
 msgstr "中��(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1778
+#: ../plugins/debug-manager/breakpoints.c:1785
 msgid "Toggle Breakpoint"
 msgstr "å??æ??中æ?·é»?ç??æ³?"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1780
+#: ../plugins/debug-manager/breakpoints.c:1787
 msgid "Toggle breakpoint at the current location"
 msgstr "å??æ??ç?®å??ä½?ç½®ç??中æ?·é»?ç??æ³?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1786
-msgid "Add Breakpoint..."
-msgstr "��中��..."
+#: ../plugins/debug-manager/breakpoints.c:1793
+msgid "Add Breakpointâ?¦"
+msgstr "��中��..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1788
+#: ../plugins/debug-manager/breakpoints.c:1795
 msgid "Add a breakpoint"
 msgstr "��中��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1794
+#: ../plugins/debug-manager/breakpoints.c:1801
 msgid "Remove Breakpoint"
 msgstr "移�中��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1796
+#: ../plugins/debug-manager/breakpoints.c:1803
 msgid "Remove a breakpoint"
 msgstr "移�中��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1802
+#: ../plugins/debug-manager/breakpoints.c:1809
 msgid "Edit Breakpoint"
 msgstr "編輯中��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1804
+#: ../plugins/debug-manager/breakpoints.c:1811
 msgid "Edit breakpoint properties"
 msgstr "編輯中��屬�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1810
-#: ../plugins/debug-manager/breakpoints.c:1881
+#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1888
 msgid "Enable Breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1812
-#: ../plugins/debug-manager/breakpoints.c:1882
+#: ../plugins/debug-manager/breakpoints.c:1819
+#: ../plugins/debug-manager/breakpoints.c:1889
 msgid "Enable a breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1818
+#: ../plugins/debug-manager/breakpoints.c:1825
 msgid "Disable All Breakpoints"
 msgstr "å??ç?¨å?¨é?¨ä¸­æ?·é»?"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1820
+#: ../plugins/debug-manager/breakpoints.c:1827
 msgid "Deactivate all breakpoints"
 msgstr "å°?å?¨é?¨ä¸­æ?·é»?設ç?ºå??止使ç?¨"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1826
+#: ../plugins/debug-manager/breakpoints.c:1833
 msgid "R_emove All Breakpoints"
 msgstr "����中��(_E)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1828
+#: ../plugins/debug-manager/breakpoints.c:1835
 msgid "Remove all breakpoints"
 msgstr "����中��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1837
+#: ../plugins/debug-manager/breakpoints.c:1844
 msgid "Jump to Breakpoint"
 msgstr "跳�中��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1839
+#: ../plugins/debug-manager/breakpoints.c:1846
 msgid "Jump to breakpoint location"
 msgstr "跳�中���置"
 
-#: ../plugins/debug-manager/breakpoints.c:1876
+#: ../plugins/debug-manager/breakpoints.c:1883
 msgid "Disable Breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1884
 msgid "Disable a breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/debug-manager/breakpoints.c:1914
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 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
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Condition"
 msgstr "ç??æ³?"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Pass count"
 msgstr "é??é??次æ?¸"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "State"
 msgstr "ç??æ??"
 
-#: ../plugins/debug-manager/breakpoints.c:1957
-#: ../plugins/debug-manager/breakpoints.c:1963
+#: ../plugins/debug-manager/breakpoints.c:1964
+#: ../plugins/debug-manager/breakpoints.c:1970
 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 "移è?³ä½?å??(_G)"
 
 #: ../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:763 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "���"
 
 #: ../plugins/debug-manager/disassemble.c:851
-#, fuzzy
 msgid "Disassembly"
-msgstr "å·²å??ç?¨"
+msgstr "å??çµ?è­¯"
 
 #: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
-#: ../plugins/project-wizard/druid.c:135
+#: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "��"
 
@@ -2010,14 +2055,14 @@ msgstr "å?°å??è®?æ?¸"
 
 #: ../plugins/debug-manager/plugin.c:315
 msgid "Debugger Log"
-msgstr "å?µé?¯å·¥å?·ç´?é??"
+msgstr "é?¤é?¯å·¥å?·ç´?é??"
 
 #: ../plugins/debug-manager/plugin.c:389 ../plugins/debug-manager/plugin.c:409
 #: ../plugins/debug-manager/plugin.c:429 ../plugins/debug-manager/plugin.c:451
 #: ../plugins/debug-manager/plugin.c:485 ../plugins/debug-manager/plugin.c:520
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
-msgstr "��工�"
+msgstr "��工�"
 
 #: ../plugins/debug-manager/plugin.c:389
 msgid "Started"
@@ -2028,8 +2073,8 @@ msgid "Loaded"
 msgstr "已��"
 
 #: ../plugins/debug-manager/plugin.c:429
-msgid "Running..."
-msgstr "正���..."
+msgid "Runningâ?¦"
+msgstr "正����"
 
 #: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
@@ -2042,7 +2087,7 @@ msgstr "���"
 #: ../plugins/debug-manager/plugin.c:529
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
-msgstr "å?µé?¯ç¨?å¼?å?  %d é?¯èª¤è??中止ï¼?%s\n"
+msgstr "é?¤é?¯ç¨?å¼?å?  %d é?¯èª¤è??中止ï¼?%s\n"
 
 #: ../plugins/debug-manager/plugin.c:542
 #, c-format
@@ -2053,31 +2098,31 @@ msgstr "ç¨?å¼?æ?¥æ?¶å?°ä¿¡è??ï¼?%s\n"
 #. Stock icon, if any
 #: ../plugins/debug-manager/plugin.c:829
 msgid "_Debug"
-msgstr "��(_D)"
+msgstr "��(_D)"
 
 #: ../plugins/debug-manager/plugin.c:837
 msgid "_Start Debugger"
-msgstr "å??å??å?µé?¯å?¨(_S)"
+msgstr "å??å??é?¤é?¯å?¨(_S)"
 
 #: ../plugins/debug-manager/plugin.c:845
 msgid "_Debug Program"
-msgstr "�����(_D)"
+msgstr "�����(_D)"
 
 #: ../plugins/debug-manager/plugin.c:847
 msgid "Start debugger and load the program"
-msgstr "å??å??å?µé?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
+msgstr "å??å??é?¤é?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
 
 #: ../plugins/debug-manager/plugin.c:853
-msgid "_Debug Process..."
-msgstr "�����(_D)..."
+msgid "_Debug Processâ?¦"
+msgstr "����(_D)..."
 
 #: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
-msgstr "å??å??å?µé?¯å?¨ä¸¦å°?æ­£å?¨å?·è¡?中ç??ç¨?å¼?é?²è¡?å?µé?¯"
+msgstr "å??å??é?¤é?¯å?¨ä¸¦å°?æ­£å?¨å?·è¡?中ç??ç¨?å¼?é?²è¡?é?¤é?¯"
 
 #: ../plugins/debug-manager/plugin.c:861
-msgid "Debug _Remote Target..."
-msgstr "��端����..."
+msgid "Debug _Remote Targetâ?¦"
+msgstr "��端����(_R)�"
 
 #: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
@@ -2085,15 +2130,15 @@ msgstr "é?£æ?¥å?°é? ç«¯è¦?é?¤é?¯ç??ç?®æ¨?"
 
 #: ../plugins/debug-manager/plugin.c:869
 msgid "Stop Debugger"
-msgstr "å??æ­¢å?µé?¯å·¥å?·"
+msgstr "å??æ­¢é?¤é?¯å·¥å?·"
 
 #: ../plugins/debug-manager/plugin.c:871
 msgid "Say goodbye to the debugger"
-msgstr "è·?å?µé?¯å·¥å?·èªªè?²å??è¦?"
+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"
@@ -2102,14 +2147,14 @@ 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
 #: ../plugins/debug-manager/plugin.c:891 ../plugins/debug-manager/plugin.c:999
 msgid "Custom debugger command"
-msgstr "è?ªé?¸å?µé?¯å?¨æ??令"
+msgstr "è?ªé?¸é?¤é?¯å?¨æ??令"
 
 #: ../plugins/debug-manager/plugin.c:897
 #: ../plugins/debug-manager/plugin.c:1005
@@ -2122,7 +2167,7 @@ msgstr "����(_T)"
 
 #: ../plugins/debug-manager/plugin.c:907
 msgid "Display information on the files the debugger is active with"
-msgstr "顯示ç?®å??æ­£å?¨è¢«å?µé?¯ç??ç¨?å¼?ç??å?·è¡?ç?°å¢?ç??è³?è¨?"
+msgstr "顯示ç?®å??æ­£å?¨è¢«é?¤é?¯ç??ç¨?å¼?ç??å?·è¡?ç?°å¢?ç??è³?è¨?"
 
 #: ../plugins/debug-manager/plugin.c:913
 msgid "Info _Program"
@@ -2147,7 +2192,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
@@ -2188,7 +2233,8 @@ msgid "Step _Out"
 msgstr "步�(_O)"
 
 #: ../plugins/debug-manager/plugin.c:983
-msgid "Single step out of the function"
+#, fuzzy
+msgid "Single step out of function"
 msgstr "å?·è¡?ç?®å??å?½æ?¸å?§é¤?ä¸?ç¨?å¼?碼å¾?é??å??"
 
 #: ../plugins/debug-manager/plugin.c:989
@@ -2240,13 +2286,12 @@ msgstr "æ?«å??å?·è¡?ç¨?å¼?"
 #: ../plugins/debug-manager/plugin.c:1111
 #: ../plugins/debug-manager/plugin.c:1117
 msgid "Debugger operations"
-msgstr "å?µé?¯å·¥å?·æ??ä½?"
+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 "æ?¾ä¸?å?°ä»»ä½?å?µé?¯å·¥å?·å¤?æ??ç¨?å¼?å?¯ä»¥æ?¯æ?´ %s mime é¡?å??ç??ç?®æ¨?"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
+msgstr "æ?¾ä¸?å?°ä»»ä½?é?¤é?¯å·¥å?·å¤?æ??ç¨?å¼?å?¯ä»¥æ?¯æ?´ %s MIME é¡?å??ç??ç?®æ¨?"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2265,7 +2310,7 @@ msgstr "æ?´æ?°"
 msgid "Shared Object"
 msgstr "�享�件"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "èµ·å§?ä½?å??"
 
@@ -2277,7 +2322,7 @@ msgstr "çµ?æ??ä½?å??"
 msgid "Symbols read"
 msgstr "è®?å??符è??"
 
-#: ../plugins/debug-manager/sharedlib.c:338
+#: ../plugins/debug-manager/sharedlib.c:341
 msgid "Shared library operations"
 msgstr "å?±äº«ç¨?å¼?庫æ??ä½?"
 
@@ -2311,24 +2356,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 "æ?¯å?¦é¡¯ç¤ºè¡¨ç¤ºæ¯?è¡?é??å§?ç?? pixbuf æ¨?è¨?"
 
@@ -2362,7 +2407,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:943
 msgid "Line"
 msgstr "è¡?"
 
@@ -2371,10 +2416,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 "å ?ç??"
@@ -2383,53 +2424,53 @@ msgstr "å ?ç??"
 msgid "Stack frame operations"
 msgstr "å ?ç??ç·¨è??æ??ä½?"
 
-#: ../plugins/debug-manager/start.c:98
-msgid "Pid"
-msgstr "é?²ç¨?ç·¨è??"
+#: ../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:630
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "ç?¡æ³?å?·è¡?ï¼?%sã??"
 
-#: ../plugins/debug-manager/start.c:641
+#: ../plugins/debug-manager/start.c:644
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼?%s\n"
 
-#: ../plugins/debug-manager/start.c:965
+#: ../plugins/debug-manager/start.c:968
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
-msgstr "ç?¡æ³?å?¨é??å?? %sã??å?µé?¯å·¥å?·ä¸?è?½å??å??ã??"
+msgstr "ç?¡æ³?å?¨é??å?? %sã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:975
+#: ../plugins/debug-manager/start.c:978
 #, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
-msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? mime-é¡?å??ã??å?µé?¯å·¥å?·ä¸?è?½å??å??ã??"
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
+msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:1336
+#: ../plugins/debug-manager/start.c:1339
 msgid "Path"
 msgstr "路�"
 
-#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1388 ../plugins/gdb/debugger.c:1738
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
 msgstr ""
 "ç¨?å¼?ä»?å?¨å?·è¡?中ã??\n"
-"æ?¯å?¦ç¢ºå®?è¦?å??æ­¢å?µé?¯å·¥å?·ï¼?"
+"æ?¯å?¦ç¢ºå®?è¦?å??æ­¢é?¤é?¯å·¥å?·ï¼?"
 
 #. Action name
 #. Stock icon, if any
@@ -2438,8 +2479,8 @@ msgid "Set current thread"
 msgstr "設å®?ç?®å??å?·è¡?çº?"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "Id"
+msgid "ID"
+msgstr "ID"
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2452,8 +2493,8 @@ msgstr "å?·è¡?ç·?æ??ä½?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/watch.c:372
-msgid "Ins_pect/Evaluate..."
-msgstr "é©?証å??測試 (_P)..."
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "��/�估(_P)�"
 
 #. Display label
 #. short-cut
@@ -2462,8 +2503,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"
@@ -2503,10 +2544,10 @@ 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"
-msgstr "å??å¾?(_G)"
+#: ../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 "移�(_G)"
 
 #: ../plugins/devhelp/plugin.c:231
 msgid "_API Reference"
@@ -2540,12 +2581,12 @@ msgstr "æ±?å?©æ??ä½?"
 msgid "Contents"
 msgstr "�容"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1034
-#: ../plugins/search/search-replace.c:1710
+#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
 #: ../plugins/search/search-replace.c:1717
-#: ../plugins/search/search-replace.c:1729
-#: ../plugins/search/search-replace.c:2058 ../plugins/symbol-db/plugin.c:2334
-#: ../plugins/symbol-db/plugin.c:2446
+#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1736
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2324
+#: ../plugins/symbol-db/plugin.c:2440
 msgid "Search"
 msgstr "æ??å°?"
 
@@ -2562,7 +2603,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"
@@ -2571,44 +2612,53 @@ msgstr ""
 "æ?¯å?¦ç¢ºå®?è¦?é??æ?°è¼?å?¥ã?? %sã??ï¼?\n"
 "ä¹?å??å°?æ?ªå?²å­?ç??æ?´æ?¹å°?æ??æ¶?失ã??"
 
-#: ../plugins/document-manager/action-callbacks.c:285
+#: ../plugins/document-manager/action-callbacks.c:286
 msgid "_Reload"
 msgstr "é??æ?°è¼?å?¥(_R)"
 
-#: ../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"
@@ -2617,46 +2667,46 @@ msgstr ""
 "æª?æ¡?â??%sâ??å·²ç¶?å­?å?¨ã??\n"
 "ä½ æ?¯å?¦è¦?以ç?¾å?¨æº?å??å?²å­?ç??æª?æ¡?è¦?寫å®?ï¼?"
 
-#: ../plugins/document-manager/anjuta-docman.c:674
+#: ../plugins/document-manager/anjuta-docman.c:673
 msgid "_Replace"
 msgstr "å??代(_R)"
 
-#: ../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 ""
+msgstr "å·¦"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h: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 "å?³"
 
@@ -2681,172 +2731,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 "����(_S)"
 
-#: ../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 "����(_A)..."
+#: ../plugins/document-manager/plugin.c:152
+msgid "Save _Asâ?¦"
+msgstr "���(_A)�"
 
-#: ../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 "����(_L)"
 
-#: ../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 "é??é??æª?æ¡?(_C)"
 
-#: ../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 "é??æ?°è¼?å?¥æª?æ¡?(_I)"
 
-#: ../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 "æ??è¿?é??å??æª?æ¡? (_F)"
 
-#: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "æ??å?°(_P)..."
+#: ../plugins/document-manager/plugin.c:171
+msgid "_Printâ?¦"
+msgstr "æ??å?°(_P)â?¦"
 
-#: ../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 "é ?覽æ??å?°(_P)"
 
-#: ../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 "è½?æ??(_T)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:183
+#: ../plugins/document-manager/plugin.c:186
 msgid "_Make Selection Uppercase"
 msgstr "é?¸å®?ç¯?å??ç?ºå¤§å¯« (_M)"
 
-#: ../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 "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?º DOS EOL (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 "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?º Unix 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 "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?º Mac OS EOL (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 "é?¸å??(_S)"
 
-#: ../plugins/document-manager/plugin.c:206
+#: ../plugins/document-manager/plugin.c:209
 msgid "Select _All"
 msgstr "å?¨é?¨é?¸å??(_A)"
 
-#: ../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 "é?¸æ??å??å§?碼å??å¡?(_C)"
 
-#: ../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 "å??註(_M)"
 
 #. 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 "å??å¡?å? ä¸?/å??æ¶?å??註(_B)"
 
-#: ../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 "æ?¹å¡?å? ä¸?/å??æ¶?å??註(_X)"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:227
 msgid "Box comment the selected text"
 msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?æ?¹å¡?註解"
 
@@ -2854,432 +2904,440 @@ 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
 #, fuzzy
 msgid "_Stream Comment/Uncomment"
-msgstr "註解�缺� )"
+msgstr "å??å¡?å? ä¸?/å??æ¶?å??註(_B)"
 
-#: ../plugins/document-manager/plugin.c:231
+#: ../plugins/document-manager/plugin.c:234
 #, fuzzy
 msgid "Stream comment the selected text"
-msgstr "�詢已���(_L)"
+msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?å??å¡?註解"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
-msgstr "è¡?è??(_L)..."
+#: ../plugins/document-manager/plugin.c:240
+msgid "_Line Numberâ?¦"
+msgstr "è¡?è??(_L)â?¦"
 
-#: ../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 "å??å¾?å°?æ??æ?¬è?? (_B)"
 
-#: ../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 "å??å¡?é??é ­(_S)"
 
-#: ../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 "å??å¡?çµ?å°¾(_E)"
 
-#: ../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 "ä¸?ä¸?å??æ­·å?²ç´?é??(_P)"
 
-#: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
-msgstr "å??å¾?ä¸?ä¸?å??æ­·å?²ç´?é??"
+#: ../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 "ä¸?ä¸?å??æ­·å?²ç´?é??(_Y)"
 
-#: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
-msgstr "å??å¾?ä¸?ä¸?å??æ­·å?²ç´?é??"
+#: ../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 "æ??å°?(_S)"
 
-#: ../plugins/document-manager/plugin.c:259
+#: ../plugins/document-manager/plugin.c:262
 msgid "_Quick Search"
 msgstr "å¿«é??æ??å°?(_Q)"
 
-#: ../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 "å¿«é??é??æ?°æ??å°?(_R)"
 
-#: ../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 "編輯(_E)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:269
+#: ../plugins/document-manager/plugin.c:272
 msgid "_Editor"
 msgstr "編輯��(_E)"
 
-#: ../plugins/document-manager/plugin.c:276
+#: ../plugins/document-manager/plugin.c:279
 msgid "_Add Editor View"
 msgstr "��編輯�檢�(_A)"
 
-#: ../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 "移�編輯�檢�(_R)"
 
-#: ../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 "復å??(_N)"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4079
+#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "å??æ¶?å??å®?æ??ç??å??ä½?"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "_Redo"
 msgstr "é??è¤?(_R)"
 
-#: ../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 "��(_U)"
 
-#: ../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 "�製(_C)"
 
-#: ../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 "貼�(_P)"
 
-#: ../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 "��(_C)"
 
-#: ../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 "è?ªå??è£?é½?(_A)"
+
+#: ../plugins/document-manager/plugin.c:311
+msgid "Auto-complete the current word"
+msgstr "è?ªå??è£?é½?ç?®å??ç??å­?"
+
+#: ../plugins/document-manager/plugin.c:316
 msgid "_Line Number Margin"
 msgstr "è¡?è??å??(_L)"
 
-#: ../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 "æ¨?è??å??(_M)"
 
-#: ../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 "ç¨?å¼?碼å±?ç??å??(_C)"
 
-#: ../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 "縮æ??æ??å¼?(_I)"
 
-#: ../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 "空��符(_W)"
 
-#: ../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 "å?¥å­?çµ?æ??å­?符(_L)"
 
-#: ../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 "æ??è¡?(_W)"
 
-#: ../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 "���示模�(_H)"
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Close All Folds"
 msgstr "å?½æ?¸å?¨é?¨æ?ºç??(_C)"
 
-#: ../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 "å?½æ?¸å?¨é?¨å±?é??(_O)"
 
-#: ../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 "å??æ??ç?®å??æ??ç??ç??æ??(_T)"
 
-#: ../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 "æ??件(_D)"
 
-#: ../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 "�籤(_K)"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:376
 msgid "_Add Bookmark"
 msgstr "���籤(_A)"
 
-#: ../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 "ä¸?ä¸?å??æ?¸ç±¤(_P)"
 
-#: ../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 "ä¸?ä¸?å??æ?¸ç±¤(_N)"
 
-#: ../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 "æ¸?é?¤æ??æ??æ?¸ç±¤(_C)"
 
-#: ../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:1734
+#: ../plugins/document-manager/plugin.c:2151
+#: ../plugins/document-manager/plugin.c:2161
 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"
-msgstr "å??å¾?"
+#: ../plugins/document-manager/plugin.c:613
+msgid "Go to"
+msgstr "移�"
 
-#: ../plugins/document-manager/plugin.c:909
+#: ../plugins/document-manager/plugin.c:928
 msgid "OVR"
 msgstr "�寫"
 
-#: ../plugins/document-manager/plugin.c:913
+#: ../plugins/document-manager/plugin.c:932
 msgid "INS"
 msgstr "æ??å?¥"
 
-#: ../plugins/document-manager/plugin.c:917
-#: ../plugins/document-manager/plugin.c:919
+#: ../plugins/document-manager/plugin.c:938
+#: ../plugins/document-manager/plugin.c:941
 msgid "Zoom"
 msgstr "æ??é? "
 
-#: ../plugins/document-manager/plugin.c:922
+#: ../plugins/document-manager/plugin.c:944
 msgid "Col"
 msgstr "�"
 
-#: ../plugins/document-manager/plugin.c:923
+#: ../plugins/document-manager/plugin.c:945
 msgid "Mode"
 msgstr "模�"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1003
+#: ../plugins/document-manager/plugin.c:1025
 msgid "Automatic"
 msgstr "è?ªå??"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1537
+#: ../plugins/document-manager/plugin.c:1558
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå??å?²å­? %s 失æ??"
 
-#: ../plugins/document-manager/plugin.c:1551
+#: ../plugins/document-manager/plugin.c:1572
 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."
-msgstr "æ??å°?ã??%sã??å·²é??çµ?尾並å°?å¾?é ­é??å§?ï¼?ä½?å·²æ?¾ä¸?å?°ç¬¦å??é ?ç?®ã??"
+"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 "å??å??大å°?寫"
 
@@ -3300,8 +3358,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
@@ -3322,28 +3380,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 ""
@@ -3359,7 +3415,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 ""
@@ -3367,7 +3423,7 @@ msgstr ""
 "\n"
 "æ²?æ??å¤?æ??ç¨?å¼?ã??é ?設å??ä½?æ??æ??ç?¨ç¨?å¼?æ?¯è¨­å®?ä¾?è??ç??é??å??æª?æ¡?é¡?å??ç??ã??\n"
 "\n"
-"Mime é¡?å??ï¼? %s\n"
+"MIME é¡?å??ï¼? %s\n"
 "\n"
 "ä½ å?¯ä»¥é?¸æ??å??試使ç?¨ä¸?å??å¤?æ??ç¨?å¼?æ??æ??ç?¨ç¨?å¼?ä¾?é??å??å®?ã??"
 
@@ -3419,11 +3475,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 "Shell �令稿��"
 
 #: ../plugins/file-loader/plugin.c:569
@@ -3452,8 +3508,8 @@ msgid "New empty file"
 msgstr "��空���"
 
 #: ../plugins/file-loader/plugin.c:892
-msgid "_Open..."
-msgstr "é??å??(_O)..."
+msgid "_Openâ?¦"
+msgstr "é??å??(_O)â?¦"
 
 #: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
@@ -3467,51 +3523,51 @@ msgstr "é??å??以(_W)"
 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 "æ??è¿?é??å??(_R)"
 
-#: ../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> ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../plugins/file-loader/plugin.c:1445
+#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "以此é??å??"
 
@@ -3540,7 +3596,8 @@ msgid "Filter"
 msgstr "é??濾æ¢?件"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2333 ../plugins/symbol-db/plugin.c:2422
+#: ../plugins/symbol-db/plugin.c:2322 ../plugins/symbol-db/plugin.c:2416
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å??"
 
@@ -3548,25 +3605,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:567
 msgid "Filename"
 msgstr "æª?æ¡?å??稱"
 
-#: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
-msgstr "�� URI"
+#: ../plugins/file-manager/file-view.c:654
+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:655
+msgid "URI of the top-most path displayed"
 msgstr "æ??ä¸?層路å¾?顯示ç?? URI"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3577,40 +3629,36 @@ msgstr "é??æ?°å?½å??(_R)"
 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."
@@ -3618,20 +3666,24 @@ msgstr ""
 "輸å?¥æª?æ¡?å??稱ã??\n"
 "延伸æª?å??æ??æ ¹æ??å?¶é¡?å??è?ªå??å? å?¥ã??"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:67 ../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 "é¡?å??ï¼?"
 
@@ -3639,47 +3691,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 "Shell �令稿��"
 
-#: ../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 "ç?¡æ³?建ç«?æ?°æª?æ¡?ç??使ç?¨è??ä»?é?¢"
 
@@ -3688,21 +3740,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 "���件(_P)"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "��模�(_M)"
 
-#: ../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 "é?¸æ??å¥?件"
@@ -3711,362 +3763,423 @@ 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:197
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3253
+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:200
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3255
+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:203
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3257
+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:206
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3259
+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:209
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3263
+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:212
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3265
+msgid "Info Documentation"
+msgstr "Info æ??件"
+
+#: ../plugins/gbf-am/gbf-am-project.c:217
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:215
+msgid "Lisp Module"
+msgstr "Lisp 模�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:220
+#: ../plugins/gbf-am/gbf-am-project.c:3356
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:218
+msgid "Header Files"
+msgstr "�頭�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:223
+#: ../plugins/gbf-am/gbf-am-project.c:3368
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:221
+msgid "Java Module"
+msgstr "Java 模�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:226
+#: ../plugins/gbf-am/gbf-am-project.c:3370
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:224
+msgid "Python Module"
+msgstr "Python 模�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:229
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:227
+msgid "Generic rule"
+msgstr "ä¸?è?¬è¦?å??"
+
+#: ../plugins/gbf-am/gbf-am-project.c:232
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:230
+msgid "Extra target"
+msgstr "����"
+
+#: ../plugins/gbf-am/gbf-am-project.c:235
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:233
+msgid "Configure file"
+msgstr "設���"
+
+#: ../plugins/gbf-am/gbf-am-project.c:238
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:236
+msgid "Interface file"
+msgstr "����"
+
+#: ../plugins/gbf-am/gbf-am-project.c:241
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:239
+msgid "GLib mkenums"
+msgstr ""
+
+#: ../plugins/gbf-am/gbf-am-project.c:244
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
+msgid "GLib genmarshal"
+msgstr ""
+
+#: ../plugins/gbf-am/gbf-am-project.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:245
+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:2506
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2584
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2812
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2998
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3146
 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:2526
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2629
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3041
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3221
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3407
 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:2560
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2604
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2647
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2959
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3019
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3182
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3242
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3474
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3535
 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:2692
 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:2713
+#: ../plugins/dir-project/dir-project.c:693
+#: ../plugins/dir-project/dir-project.c:765
+#, 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:2727
 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:2925
 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:2936
 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:2946
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2973
 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:3159
 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 "Java 模�"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3202
-msgid "Python Module"
-msgstr "Python 模�"
-
-#: ../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:3317
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3512
 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:3520
 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-mkfile/gbf-mkfile-project.c:3450
+#: ../plugins/gbf-am/gbf-am-project.c:4111
+#: ../plugins/gbf-am/gbf-am-project.c:4112
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3830
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3831
 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
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
-msgstr "網å??:"
+#: ../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 "C 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1331
+#: ../plugins/gbf-am/gbf-am-properties.c:1334
 msgid "C preprocessor flags:"
 msgstr "C é ?è??ç??å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1333
+#: ../plugins/gbf-am/gbf-am-properties.c:1336
 msgid "C++ compiler flags:"
 msgstr "C++ 編譯å?¨æ??æ¨?:"
 
-#: ../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 "Java 編譯å?¨æ??æ¨? (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 "Fortran 編譯å?¨æ??æ¨?:"
 
-#: ../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 "C é ?è??ç??å?¨æ??æ¨?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1423
+#: ../plugins/gbf-am/gbf-am-properties.c:1426
 msgid "C++ compiler flags"
 msgstr "C++ 編譯å?¨æ??æ¨?"
 
-#: ../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..."
+#: ../plugins/gbf-am/gbf-am-properties.c:1586
+msgid "Advancedâ?¦"
 msgstr "é?²é??..."
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
@@ -4074,81 +4187,53 @@ msgstr "é?²é??..."
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "ç?¡æ??ç?? GbfMkfileConfigValue é¡?å??"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2699
 msgid "Project doesn't exist"
 msgstr "�����"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3006
 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:3169
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3196
 msgid "Target couldn't be created"
 msgstr "��建���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3229
 msgid "Target coudn't be removed"
 msgstr "��移���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3427
 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:3439
 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:3456
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3488
 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 "å??å?«:"
 
-#: ../plugins/gdb/anjuta-gdb.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:6
-msgid "Command Line Parameters"
-msgstr "æ??令å??æ?¸"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:12
-msgid "Enter a Hexa adress or select one in the data"
-msgstr "輸å?¥ Hexa ä½?å??æ??å?¨è³?æ??中é?¸æ??ä¸?å??"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:13
-msgid "Execute Program"
-msgstr "����"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:22
-msgid "Run in Terminal"
-msgstr "��端����"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:35
-msgid "_Pass:"
-msgstr "é??é??(_P):"
-
 #. 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"
@@ -4156,71 +4241,71 @@ msgid ""
 "Make sure Anjuta is installed correctly."
 msgstr ""
 "æ?¾ä¸?å?°ï¼?%sã??\n"
-"ç?¡æ³?å??å§?å??å?µé?¯å·¥å?·ã??\n"
+"ç?¡æ³?å??å§?å??é?¤é?¯å·¥å?·ã??\n"
 "è«?確å®? Anjuta æ?¯å?¦å®?è£?正確ã??"
 
-#: ../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"
+msgstr "è«?é??å??ä¸?å??å?·è¡?æª?æ??å°?ä¸?å??æ­£å?¨å?·è¡?中ç??é?²ç¨?é?²è¡?é?¤é?¯ã??\n"
 
-#: ../plugins/gdb/debugger.c:960
+#: ../plugins/gdb/debugger.c:1000
 msgid "There was an error whilst launching the debugger.\n"
-msgstr "ç?¶å?·è¡?å?µé?¯å·¥å?·æ??ç?¼ç??é?¯èª¤ã??\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?"
 msgstr ""
 "ç¨?å¼?ä»?å?¨å?·è¡?中ã??\n"
-"æ?¯å?¦ä»?è¦?å??æ­¢å?µé?¯å·¥ä½?ï¼?"
+"æ?¯å?¦ä»?è¦?å??æ­¢é?¤é?¯å·¥ä½?ï¼?"
 
 #. 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"
@@ -4229,556 +4314,507 @@ msgstr ""
 "������端���%s\n"
 "æ?¯å?¦è¦?å??試ä¸?次ï¼?"
 
-#: ../plugins/gdb/debugger.c:1875
+#: ../plugins/gdb/debugger.c:1914
 msgid "Debugger connected\n"
-msgstr "��工�已��\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?"
 msgstr ""
 "å·²æ??ä¸?å??é?²ç¨?æ­£å?¨å?·è¡?ã??\n"
-"æ?¯å?¦å??å°?å®?çµ?æ­¢å¾?å??å°?æ?°ç??é?²ç¨?é?²è¡?é?²ç¨?å?µé?¯ï¼?"
+"æ?¯å?¦å??å°?å®?çµ?æ­¢å¾?å??å°?æ?°ç??é?²ç¨?é?²è¡?é?²ç¨?é?¤é?¯ï¼?"
 
-#: ../plugins/gdb/debugger.c:2013
+#: ../plugins/gdb/debugger.c:2052
 msgid "Anjuta is unable to attach to itself."
 msgstr "Anjuta ç?¡æ³?æ ¹æ??é??å?¨è?ªå·±ä¸?ã??"
 
-#: ../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 "建ç«?å??ç?º %s ç?? fifo æª?æ¡?失æ??ã??該ç¨?å¼?æ??以ä¸?使ç?¨çµ?端æ©?ç??æ?¹å¼?å?·è¡?ã??"
+"Failed to create FIFO file named %s. The program will run without a terminal."
+msgstr "建ç«?å??ç?º %s ç?? FIFO æª?æ¡?失æ??ã??該ç¨?å¼?æ??以ä¸?使ç?¨çµ?端æ©?ç??æ?¹å¼?å?·è¡?ã??"
 
 #: ../plugins/gdb/plugin.c:198
 msgid "Cannot start terminal for debugging."
-msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?å?µé?¯ã??"
+msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?é?¤é?¯ã??"
 
-#: ../plugins/git/anjuta-git.ui.h:2
-#, fuzzy
-#| msgid "<b>Messages options</b>"
-msgid "<b>Stash Message (Optional)</b>"
-msgstr "<b>����</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:3
-#, fuzzy
-#| msgid "<b>Scope</b>"
-msgid "<b>Stash to Apply</b>"
-msgstr "<b>ç¯?å??</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:4
-#, fuzzy
-#| msgid "<b>Tag:</b> %s"
-msgid "<b>Tags</b>"
-msgstr "<b>�籤:</b> %s"
-
-#: ../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"
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "Add signed-off-by line"
 msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:5
 #, fuzzy
 msgid "Amend the previous commit"
-msgstr "Subversion: æ??交å®?æ??ã??"
+msgstr "ä¸?ä¸?å??æ??交è¨?æ?¯ï¼?"
 
-#: ../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 "æ·»å? å??å??ç??è³?æ??"
 
-#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "Apply Stash"
-msgstr ""
+msgstr "�� Stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:247
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "��信箱��"
 
-#: ../plugins/git/anjuta-git.ui.h:16
-#, fuzzy
-#| msgid "Copy the selection"
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Apply the selected stash"
-msgstr "è¤?製é?¸å??å??å??"
+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
 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 "å??å?ºæª?æ¡?"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "Check out all local changes"
-msgstr ""
+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 "å?¨å??æ?¯å»ºç«?å¾?å??å?ºå®?"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "Cherry Pick"
-msgstr ""
+msgstr "Cherry Pick"
 
-#: ../plugins/git/anjuta-git.ui.h:33
-#, fuzzy
-#| msgid "Mark all matches"
+#: ../plugins/git/anjuta-git.ui.h:28
 msgid "Clear all stashes"
-msgstr "æ¨?è¨?æ??æ??符å??ç??é ?ç?®"
+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:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "æ??交修æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
-msgstr ""
+msgstr "å?¨ fast-forward å??ä½µä¸? commit"
 
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "Commit to Cherry Pick:"
-msgstr ""
+msgstr "Commit è?³ Cherry Pickï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "Commit to revert:"
 msgstr "è¦?æ??交ç?ºå¾©å??ç??ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "建ç«?å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "建��籤"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "建ç«?è£?é??ç³»å??"
 
-#: ../plugins/git/anjuta-git.ui.h:41 ../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:42
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "å?ªé?¤å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "å?ªé?¤é? ç«¯å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:44
-#, fuzzy
-#| msgid "Deleted: %s"
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
-msgstr "已��� %s"
+msgstr "���籤"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "ä¸?è¦?æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "�����籤"
 
-#: ../plugins/git/anjuta-git.ui.h:47
-#, fuzzy
-#| msgid "Copy the selection"
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Drop the selected stash"
-msgstr "è¤?製é?¸å??å??å??"
+msgstr "æ?¾æ£?é?¸å??ç?? stash"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "���件�"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "å?¨å»ºç«?å¾?å??å??é? ç«¯å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "é??濾æ¢?件"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "ç?¨ä¾?建ç«?ä¿®è£?æª?ç??ç?®é??ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "å¼·å?¶"
 
-#: ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "å¾?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Generate patches relative to:"
 msgstr "ç?¢ç??ç?¸å°?æ?¼æ­¤ç??ä¿®è£?æª?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Good revision:"
 msgstr "è?¯å¥½ç??ç??æ?¬ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.ui.h:58
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
-msgstr "å?°é?£"
+msgstr "Hard"
 
-#: ../plugins/git/anjuta-git.ui.h:59
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
-msgstr "Document head"
+msgstr "Head"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "忽���:"
 
-#: ../plugins/git/anjuta-git.ui.h:61
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "ç´?é??è¨?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Mailbox file containing patches:"
 msgstr "å??å?«ä¿®è£?ç??ä¿¡ç®±æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "å??ä½µ"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "æ··å??ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Mode:"
 msgstr "模��"
 
-#: ../plugins/git/anjuta-git.ui.h:68
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
-#: ../plugins/subversion/anjuta-subversion.ui.h:23
-msgid "Options"
-msgstr "��"
-
-#: ../plugins/git/anjuta-git.ui.h:69
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-msgid "Options:"
-msgstr "���"
-
-#: ../plugins/git/anjuta-git.ui.h:70
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "å??ä¸?次æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:71
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Pull"
 
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
 msgstr "Push"
 
-#: ../plugins/git/anjuta-git.ui.h:73
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
-msgstr "æ??æ??æ?¯æ?´ç??é¡?å??"
+msgstr "Push æ??æ??ç??å??æ?¯è??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:74
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Push all tags"
-msgstr "API �籤"
+msgstr "Push æ??æ??ç??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "é??建å?ºç¤?"
 
-#: ../plugins/git/anjuta-git.ui.h:76
-#, fuzzy
-#| msgid "Remove"
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Remote"
-msgstr "移�"
+msgstr "�端"
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Remote to delete:"
 msgstr "è¦?å?ªé?¤ç??é? ç«¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:79
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "移���"
 
-#: ../plugins/git/anjuta-git.ui.h:80
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Repository origin"
 msgstr "��庫�頭"
 
-#: ../plugins/git/anjuta-git.ui.h:81
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Repository to pull from:"
 msgstr "è¦?é?²è¡? pull ç??æª?æ¡?庫ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:82
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Repository to push to:"
 msgstr "� push ���庫�"
 
-#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "é??設æª?æ¡?樹"
 
-#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "é??設ç?ºï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:85
-#, fuzzy
-#| msgid "Reset Tree"
+#: ../plugins/git/anjuta-git.ui.h:82
 msgid "Restore index"
-msgstr "é??設æª?æ¡?樹"
+msgstr "é??å??ç´¢å¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../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:87
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "å??復æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "ä¿®è¨?ç??/æ¨?籤:"
 
-#: ../plugins/git/anjuta-git.ui.h:90
-msgid "Select A Folder"
-msgstr "é?¸å??è³?æ??夾"
-
-#: ../plugins/git/anjuta-git.ui.h:91
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "é?¸æ??è¦?å??å??ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:92
-#: ../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 "é?¸æ??è¦?æ??交ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "é?¸æ??è¦?忽ç?¥ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:94
-#: ../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:95
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:91
 msgid "Select Files to Unstage:"
-msgstr "é?¸å??å¤?å??è¦?é??å??ç??æª?æ¡?"
+msgstr "é?¸æ??è¦? Unstage ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "é?¸æ??ä¿¡ç®±æª?æ¡?"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../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:98
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "é?¸æ??è¦?移é?¤ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:99
-#: ../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:100
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "å?¨ç´?é??è¨?æ?¯ä¸­é¡¯ç¤ºä¾?æº?ç??ä¿®è¨?ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:101
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
-msgstr "�詢已���(_L)"
+msgstr "顯示å?¨ç·¨è¼¯å?¨ä¸­é?¸å?? stash ç??å?§å®¹"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
 msgstr "å? è¨»é??å??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:103
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "Soft"
 
-#: ../plugins/git/anjuta-git.ui.h:104
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
-msgstr "西ç?­ç??æ??"
+msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.ui.h:105 ../plugins/git/plugin.c:776
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
 msgid "Stash"
-msgstr "西ç?­ç??æ??"
+msgstr "Stash"
 
-#: ../plugins/git/anjuta-git.ui.h:106
-#, fuzzy
-#| msgid "Show uncommitted changes"
+#: ../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 "顯示æ?ªæ??交ç??æ?´æ?¹"
+msgstr "Stash æ?ªæ??交ç??æ?´æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:107
-#, fuzzy
-#| msgid "Show uncommitted changes"
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Stash indexed changes"
-msgstr "顯示æ?ªæ??交ç??æ?´æ?¹"
+msgstr "Stash 已索å¼?ç??æ?´æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:108
-#, fuzzy
-#| msgid "Show uncommitted changes"
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Stash the working tree's uncommitted changes"
-msgstr "顯示æ?ªæ??交ç??æ?´æ?¹"
+msgstr "Stash working tree 中æ?ªæ??交ç??æ?´æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:109
+#: ../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:110
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "æ¨?籤å??稱ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "æ¨?籤/æ??交"
 
+#. 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
-#, fuzzy
-#| msgid "Branches to delete:"
 msgid "Tags to delete:"
-msgstr "è¦?å?ªé?¤ç??å??æ?¯ï¼?"
+msgstr "è¦?å?ªé?¤ç??æ¨?籤ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "é??次æ??交ç?±æ?¼å??併失æ??è??çµ?æ­¢ï¼?使ç?¨ -iï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:115
-#, fuzzy
 msgid "To:"
-msgstr "å?°:"
+msgstr "å?°ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:116
-#, fuzzy
-#| msgid "URL:"
 msgid "URL"
-msgstr "URL:"
+msgstr "網å??"
 
 #: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/git/anjuta-git.ui.h:118
-#, fuzzy
 msgid "Unstage Files"
-msgstr "æ?¥å??æª?æ¡?(_A):"
+msgstr "Unstage ��"
 
 #: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
@@ -4793,21 +4829,21 @@ msgid "View log"
 msgstr "檢è¦?ç´?é??"
 
 #: ../plugins/git/anjuta-git.ui.h:122
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "檢è¦?æª?æ¡?/è³?æ??夾ç??ç´?é??æª?ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:124
 msgid "page 1"
-msgstr ""
+msgstr "é ? 1"
 
 #: ../plugins/git/anjuta-git.ui.h:125
 msgid "page 2"
-msgstr ""
+msgstr "é ? 2"
 
 #: ../plugins/git/anjuta-git.ui.h:126
 msgid "page 3"
-msgstr ""
+msgstr "é ? 3"
 
 #: ../plugins/git/git-add-dialog.c:36
 msgid "Git: File staged for add."
@@ -4833,7 +4869,7 @@ msgstr "è«?輸å?¥ URLã??"
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
+msgid "Git: Fetchingâ?¦"
 msgstr "Gitï¼?æ­£å?¨å??å??..."
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
@@ -4888,10 +4924,12 @@ msgstr "è«?輸å?¥æ¨?籤å??稱ã??"
 msgid "Git: Deleted selected branches."
 msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
 
+#: ../plugins/git/git-delete-branch-dialog.c:106
+msgid "Please select branches to delete"
+msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
+
 #: ../plugins/git/git-delete-tag-dialog.c:37
-#, fuzzy
-#| msgid "Git: Deleted selected branches."
-msgid "Git: Deleted selected tages."
+msgid "Git: Deleted selected tags."
 msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
 
 #: ../plugins/git/git-fetch-dialog.c:40
@@ -4912,8 +4950,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
@@ -4942,9 +4980,9 @@ msgstr "<b>�籤:</b> %s"
 msgid "<b>Remote:</b> %s"
 msgstr "<b>�端:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:832
+#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
+#: ../plugins/git/plugin.c:867
 #, fuzzy
-#| msgid "Branch:"
 msgid "Branch"
 msgstr "å??æ?¯ï¼?"
 
@@ -4956,30 +4994,33 @@ msgstr "Gitï¼?å??ä½µå®?æ??ã??"
 msgid "Git: Pull complete."
 msgstr "Gitï¼? Pull å·²å®?æ??ã??"
 
-#: ../plugins/git/git-pull-dialog.c:87
-#, fuzzy
+#. The "input widget" is the widget that should receive focus if the
+#. * user does not properly enter anything
+#: ../plugins/git/git-pull-dialog.c:124
+msgid "Please select a remote to pull from."
+msgstr "è«?輸å?¥è¦? pull ç??é? ç«¯ã??"
+
+#: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
-msgstr "è«?輸å?¥çµ?æ??ä¿®è¨?ç??ã??"
+msgstr "è«?輸å?¥è¦? pull ç??æª?æ¡?庫 URLã??"
 
 #: ../plugins/git/git-push-dialog.c:36
 msgid "Git: Push complete."
 msgstr "Git: Push complete."
 
-#. The "focus widget" is the widget that should receive focus if the
+#. The "input widget" is the widget that should receive focus if the
 #. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:194
-#, fuzzy
+#: ../plugins/git/git-push-dialog.c:144
 msgid "Please select a remote to push to."
-msgstr "è«?輸å?¥çµ?æ??ä¿®è¨?ç??ã??"
+msgstr "è«?é?¸æ??è¦? push ç??é? ç«¯ã??"
 
-#: ../plugins/git/git-push-dialog.c:212
-#, fuzzy
+#: ../plugins/git/git-push-dialog.c:162
 msgid "Please enter the URL of the repository to push to."
-msgstr "è«?輸å?¥çµ?æ??ä¿®è¨?ç??ã??"
+msgstr "è«?輸å?¥è¦? push å?°ç??æª?æ¡?庫 URLã??"
 
-#: ../plugins/git/git-push-dialog.c:246
-msgid "Git: Pushing..."
-msgstr "Git�正� Push..."
+#: ../plugins/git/git-push-dialog.c:197
+msgid "Git: Pushingâ?¦"
+msgstr "Gitï¼?Pushingâ?¦"
 
 #: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
@@ -4994,14 +5035,12 @@ msgid "Git: Resolve complete."
 msgstr "Gitï¼?調解已å®?æ??ã??"
 
 #: ../plugins/git/git-stash-widget.c:219
-#, fuzzy
-#| msgid "Git: Push complete."
 msgid "Git: Stash dropped."
-msgstr "Git: Push complete."
+msgstr "Gitï¼?Stash å·²æ?¾æ£?ã??"
 
 #: ../plugins/git/git-stash-widget.c:275
 msgid "Git: All stashes cleared."
-msgstr ""
+msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
 
 #: ../plugins/git/git-switch-dialog.c:36
 msgid "Git: Branch checkout complete."
@@ -5014,677 +5053,674 @@ msgstr "Git"
 
 #: ../plugins/git/git-ui-utils.c:158
 msgid "There are no branches available."
-msgstr ""
+msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
 
 #: ../plugins/git/git-ui-utils.c:194
-#, fuzzy
-#| msgid "Please select a file."
 msgid "Please select a stash"
-msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
+msgstr "è«?é?¸æ??ä¸?å?? stash"
 
-#: ../plugins/git/git-ui-utils.c:533
+#: ../plugins/git/git-ui-utils.c:604
 msgid "Git: Changes stored in a stash."
-msgstr ""
+msgstr "Gitï¼?å?²å­?å?¨ stash ç??æ?´æ?¹ã??"
 
-#: ../plugins/git/git-ui-utils.c:549
+#: ../plugins/git/git-ui-utils.c:620
+#, fuzzy
 msgid "Git: Stashed changes applied."
-msgstr ""
+msgstr "å¥?ç?¨å·² stash ç??æ?´æ?¹å?° working tree"
 
-#: ../plugins/git/git-ui-utils.c:626
+#: ../plugins/git/git-ui-utils.c:744
 msgid "Git: Diff complete."
 msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
 
+#: ../plugins/git/git-ui-utils.c:760
+#, c-format
+msgid "Column %i"
+msgstr "� %i"
+
 #: ../plugins/git/git-unstage-dialog.c:36
-#, fuzzy
 msgid "Git: Files unstaged."
-msgstr "�寫����"
+msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:543
+#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:79 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "_Commit..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:81
-msgid "Commit changes to the local repository"
-msgstr "æ??交æ?´æ?¹è?³æ?¬å?°ç«¯æª?æ¡?庫"
+#: ../plugins/git/plugin.c:79
+msgid "_Changes"
+msgstr "æ?´æ?¹(_C)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:87
-msgid "_Fetch"
-msgstr "_Fetch"
+#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+msgid "_Commitâ?¦"
+msgstr "_Commitâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:89
-msgid "Update remote branches"
-msgstr "æ?´æ?°é? ç«¯å??æ?¯"
+msgid "Commit changes to the local repository"
+msgstr "æ??交æ?´æ?¹è?³æ?¬å?°ç«¯æª?æ¡?庫"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:95
-msgid "_Rebase"
-msgstr "_Rebase"
+msgid "_Diff uncommitted changes"
+msgstr "_Diff uncommitted changes"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:97
-msgid "Merge your changes with an upstream remote branch"
-msgstr "å°?ä½ ç??æ?´æ?¹è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+msgid "Show uncommitted changes"
+msgstr "顯示æ?ªæ??交ç??æ?´æ?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:103 ../plugins/git/plugin.c:407
-msgid "_Start..."
-msgstr "_Start..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:105
-#, fuzzy
-msgid "Start a rebase"
-msgstr "å??å??å?µé?¯å?¨(_S)"
+#: ../plugins/git/plugin.c:103
+msgid "_Stash"
+msgstr "_Stash"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:111
-msgid "_Continue"
-msgstr "_Continue"
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "_Stash æ?ªæ??交ç??æ?´æ?¹â?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:113
-msgid "Continue a rebase that stopped because of conflicts"
-msgstr ""
+msgid "Save uncommitted changes and re-apply them later"
+msgstr "å°?æ?ªæ??交ç??æ?´æ?¹å?²å­?並å?¨ç¨?å¾?é??æ?°å¥?ç?¨å®?å??"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:119
-msgid "_Skip"
-msgstr "_Skip"
+msgid "_Apply stashed changesâ?¦"
+msgstr "��已 stash ��(_A)�"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:121
-msgid "Skip the current conflicted commmit and continue"
-msgstr "ç?¥é??ç?®å??è¡?çª?ç??æ??交"
+msgid "Apply stashed changes to the working tree"
+msgstr "å¥?ç?¨å·² stash ç??æ?´æ?¹å?° working tree"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:279
-msgid "_Abort"
-msgstr "_Abort"
+#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+msgid "_View logâ?¦"
+msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:129
-msgid "Abort the rebase and put the repository in its original state"
-msgstr ""
+msgid "View change history"
+msgstr "檢è¦?æ?´æ?¹æ­·å?²ç´?é??"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:135
-msgid "_Push..."
-msgstr "_Push..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:137
-#, fuzzy
-msgid "Push changes to a remote repository"
-msgstr "Subversion: æ­£å?¨æ??交æ?´æ?¹è?³æª?æ¡?庫..."
+msgid "_Remote repository"
+msgstr "�端��庫(_R)"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:143
-msgid "_Pull..."
-msgstr "_Pull..."
+msgid "_Pushâ?¦"
+msgstr "_Pushâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:145
-msgid "Update the working copy"
-msgstr "��工���"
+msgid "Push changes to a remote repository"
+msgstr "��� push ��端��庫"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:151
-msgid "_Diff uncommitted changes"
-msgstr "_Diff uncommitted changes"
+msgid "_Pullâ?¦"
+msgstr "_Pullâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:153
-msgid "Show uncommitted changes"
-msgstr "顯示æ?ªæ??交ç??æ?´æ?¹"
+msgid "Update the working copy"
+msgstr "��工���"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:159
-#, fuzzy
-msgid "_Stash"
-msgstr "西ç?­ç??æ??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:167
-#, fuzzy
-#| msgid "Show uncommitted changes"
-msgid "_Stash uncommitted changes..."
-msgstr "顯示æ?ªæ??交ç??æ?´æ?¹"
+msgid "_Fetch"
+msgstr "_Fetch"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:169
-#, fuzzy
-#| msgid "Revert uncommitted changes to files"
-msgid "Save ucommitted changes and re-apply them later"
-msgstr "å°?æ?ªæ??交ç??æ?´æ?¹é??å??ç?ºæª?æ¡?"
+#: ../plugins/git/plugin.c:161
+msgid "Update remote branches"
+msgstr "æ?´æ?°é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:175
-msgid "_Apply stashed changes..."
-msgstr ""
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:177
-#, fuzzy
-#| msgid "Commit your changes to the Subversion tree"
-msgid "Apply stashed changes to the working tree"
-msgstr "æ??交你ç??ä¿®æ?¹è?³ Subversion 樹"
+#: ../plugins/git/plugin.c:167
+msgid "_Files"
+msgstr "��(_F)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:343
-#: ../plugins/git/plugin.c:559 ../plugins/subversion/plugin.c:60
+#: ../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 "_Add..."
+msgid "_Addâ?¦"
+msgstr "å? å?¥(_A)â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:185
+#: ../plugins/git/plugin.c:177
 msgid "Add files to the repository"
 msgstr "�������庫"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:191 ../plugins/git/plugin.c:567
+#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_Remove..."
+msgid "_Removeâ?¦"
+msgstr "移�(_R)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:193
+#: ../plugins/git/plugin.c:185
 msgid "Remove files from the repository"
 msgstr "���庫移���"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:199
-msgid "_Ignore..."
-msgstr "_Ignore..."
+#: ../plugins/git/plugin.c:191
+msgid "_Ignoreâ?¦"
+msgstr "忽�(_I)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:201
+#: ../plugins/git/plugin.c:193
 msgid "Ignore files"
 msgstr "忽���"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:207
-msgid "_Check out files..."
-msgstr "_Check out files..."
+#: ../plugins/git/plugin.c:199
+msgid "_Check out filesâ?¦"
+msgstr "_Check out ���"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:209
+#: ../plugins/git/plugin.c:201
 msgid "Revert uncommitted changes to files"
 msgstr "å°?æ?ªæ??交ç??æ?´æ?¹é??å??ç?ºæª?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:215
-#, fuzzy
-msgid "_Unstage files..."
-msgstr "æ?¥å??æª?æ¡?(_A):"
+#: ../plugins/git/plugin.c:207
+msgid "_Unstage filesâ?¦"
+msgstr "��� _Unstage�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:217
+#: ../plugins/git/plugin.c:209
 msgid "Remove files from the commit index"
 msgstr "å¾?æ??交索å¼?中移é?¤æª?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:223
-msgid "_Resolve conflicts..."
-msgstr "_Resolve conflicts..."
+#: ../plugins/git/plugin.c:215
+msgid "_Resolve conflictsâ?¦"
+msgstr "_Resolve conflictsâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:225
+#: ../plugins/git/plugin.c:217
 msgid "Mark conflicted files as resolved"
 msgstr "å°?è¡?çª?ç??æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:231 ../plugins/patch/patch-plugin.c:117
+#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
 msgid "Patches"
 msgstr "修�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:239
-msgid "Create patch series..."
-msgstr "建ç«?ä¿®è£?ç³»å??..."
+#: ../plugins/git/plugin.c:231
+msgid "Create patch seriesâ?¦"
+msgstr "建� patch series�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:241
+#: ../plugins/git/plugin.c:233
 msgid "Generate patch files for submission upstream"
 msgstr "å¾?æ??交ä¸?游ç?¢ç??ä¿®è£?æª?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:255
-msgid "_Apply..."
-msgstr "��(_A)..."
+#: ../plugins/git/plugin.c:247
+msgid "_Applyâ?¦"
+msgstr "��(_A)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:257
-#, fuzzy
+#: ../plugins/git/plugin.c:249
 msgid "Start applying a patch series"
-msgstr "建ç«?è£?é??ç³»å??"
+msgstr "é??å§?å¥?ç?¨ patch series"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:263
+#: ../plugins/git/plugin.c:255
 msgid "_Continue with resolved conflicts"
 msgstr "以解決å¾?ç??è¡?çª?ç¹¼çº?(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:265
+#: ../plugins/git/plugin.c:257
 msgid "Continue applying a series after resolving conflicts"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:271
+#: ../plugins/git/plugin.c:263
 msgid "_Skip current patch"
 msgstr "忽ç?¥ç?®å??ç??ä¿®è£?æª?(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:273
+#: ../plugins/git/plugin.c:265
 msgid "Skip the current patch in the series and continue"
 msgstr ""
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+msgid "_Abort"
+msgstr "_Abort"
+
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:281
+#: ../plugins/git/plugin.c:273
 msgid ""
 "Stop applying the series and return the repository to its original state"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:287
+#: ../plugins/git/plugin.c:279
 msgid "_Branches"
 msgstr "å??æ?¯(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:295 ../plugins/git/plugin.c:475
-msgid "_Create branch..."
-msgstr "_Create branch..."
+#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+msgid "_Create branchâ?¦"
+msgstr "建� bran_ch�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:297
+#: ../plugins/git/plugin.c:289
 msgid "Create a branch"
 msgstr "建ç«?å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:303
-msgid "_Delete branch..."
-msgstr "_Delete branch..."
+#: ../plugins/git/plugin.c:295
+msgid "_Delete branchâ?¦"
+msgstr "�� branch(_D)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:305
+#: ../plugins/git/plugin.c:297
 msgid "Delete branches"
 msgstr "å?ªé?¤å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:311
-msgid "_Switch to another branch..."
-msgstr "_Switch to another branch..."
+#: ../plugins/git/plugin.c:303
+msgid "_Switch to another branchâ?¦"
+msgstr "å??æ??è?³å?¦ä¸?å?? branch(_S)â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:313
+#: ../plugins/git/plugin.c:305
 msgid "Switch to another branch"
 msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:319
-msgid "_Merge..."
-msgstr "_Merge..."
+#: ../plugins/git/plugin.c:311
+msgid "_Mergeâ?¦"
+msgstr "_Mergeâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:321
+#: ../plugins/git/plugin.c:313
 msgid "Merge changes from another branch into the current one"
 msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µæ?´æ?¹è?³ç?®å??ç??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:507
-msgid "_Cherry pick..."
-msgstr ""
+#: ../plugins/git/plugin.c:319
+msgid "_Rebase"
+msgstr "_Rebase"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:321
+msgid "Merge your changes with an upstream remote branch"
+msgstr "å°?ä½ ç??æ?´æ?¹è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+msgid "_Startâ?¦"
+msgstr "é??å§?(_S)..."
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:329
+msgid "Start a rebase"
+msgstr "é??å§? rebase"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:335
+msgid "_Continue"
+msgstr "_Continue"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:337
+msgid "Continue a rebase that stopped because of conflicts"
+msgstr ""
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:343
+msgid "_Skip"
+msgstr "_Skip"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:345
+msgid "Skip the current conflicted commit and continue"
+msgstr "ç?¥é??ç?®å??è¡?çª?ç?? commit 並繼çº?"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:353
+msgid "Abort the rebase and put the repository in its original state"
+msgstr ""
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+msgid "_Cherry pickâ?¦"
+msgstr "_Cherry pickâ?¦"
+
+#. 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
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:335
+#: ../plugins/git/plugin.c:367
 msgid "_Remote branches"
 msgstr "_Remote branches"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:345
+#: ../plugins/git/plugin.c:377
 msgid "Add a remote branch"
 msgstr "å? å?¥é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:351
-msgid "_Delete..."
-msgstr "_Delete..."
+#: ../plugins/git/plugin.c:383
+msgid "_Deleteâ?¦"
+msgstr "��(_D)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:353
+#: ../plugins/git/plugin.c:385
 msgid "Delete a remote branch"
 msgstr "å?ªé?¤é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:359
-#, fuzzy
-#| msgid "Tabs"
-msgid "Tags"
-msgstr "å??é ?"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:367 ../plugins/git/plugin.c:483
-msgid "_Create tag..."
-msgstr "_Create tag..."
+#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+msgid "_Create tagâ?¦"
+msgstr "建��籤(_C)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:369
+#: ../plugins/git/plugin.c:401
 msgid "Create a tag"
 msgstr "建��籤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:375
-#, fuzzy
-#| msgid "_Delete..."
-msgid "_Delete tag..."
-msgstr "_Delete..."
+#: ../plugins/git/plugin.c:407
+msgid "_Delete tagâ?¦"
+msgstr "���籤(_D)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:377
-#, fuzzy
-#| msgid "Deleted: %s"
+#: ../plugins/git/plugin.c:409
 msgid "Delete tags"
-msgstr "已��� %s"
+msgstr "���籤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:383 ../plugins/git/plugin.c:491
-msgid "_Reset tree..."
-msgstr "_Reset tree..."
+#: ../plugins/git/plugin.c:415
+msgid "_Reset/Revert"
+msgstr "_Reset/Revert"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+msgid "_Reset treeâ?¦"
+msgstr "_Reset treeâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:385
+#: ../plugins/git/plugin.c:425
 msgid "Reset repository head to any past state"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391 ../plugins/git/plugin.c:499
-msgid "_Revert commit..."
-msgstr "_Revert commit..."
+#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+msgid "_Revert commitâ?¦"
+msgstr "_Revert commitâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:393
+#: ../plugins/git/plugin.c:433
 msgid "Revert a commit"
 msgstr "復å??æ??交"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:399
-#, fuzzy
+#: ../plugins/git/plugin.c:439
 msgid "Bisect"
-msgstr "é??ç½®(_R)"
+msgstr "Bisect"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:409
-#, fuzzy
+#: ../plugins/git/plugin.c:449
 msgid "Start a bisect operation"
-msgstr "å ?ç??ç·¨è??æ??ä½?"
+msgstr "é??å§? bisect æ??ä½?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:417
+#: ../plugins/git/plugin.c:457
 msgid "Stop the bisect and bring the tree back to normal"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:423
+#: ../plugins/git/plugin.c:463
 msgid "_Good"
 msgstr "_Good"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:425
+#: ../plugins/git/plugin.c:465
 msgid "Mark the current head revision as good"
-msgstr ""
+msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º good"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:431
+#: ../plugins/git/plugin.c:471
 msgid "_Bad"
 msgstr "_Bad"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:433
+#: ../plugins/git/plugin.c:473
 msgid "Mark the current head revision as bad"
-msgstr ""
+msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º bad"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:439 ../plugins/git/plugin.c:551
-msgid "_View log..."
-msgstr "_View log..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:441
-msgid "View change history"
-msgstr "檢è¦?æ?´æ?¹æ­·å?²ç´?é??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:447
-#, fuzzy
-#| msgid "Add to repository"
+#: ../plugins/git/plugin.c:479
 msgid "_Initialize repository"
-msgstr "�����庫"
+msgstr "å??å§?å??æª?æ¡?庫(_I)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:449
+#: ../plugins/git/plugin.c:481
 msgid "Create a new git repository or reinitialize an existing one"
-msgstr ""
+msgstr "建ç«?æ?° git æª?æ¡?庫æ??é??æ?°å??å§?å??ç?¾æ??ç??æª?æ¡?庫"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:459
+#: ../plugins/git/plugin.c:491
 msgid "_Show commit diff"
 msgstr "_Show commit diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:461
+#: ../plugins/git/plugin.c:493
 msgid "Show changes introduced by this commit"
 msgstr "顯示ä»?ç´¹é??次æ??交ç??æ?´æ?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:467
+#: ../plugins/git/plugin.c:499
 msgid "_View selected revision"
 msgstr "_View selected revision"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:469
+#: ../plugins/git/plugin.c:501
 msgid "View a copy of this file at this revision"
 msgstr "檢è¦?é??次修è¨?ç??ç??æª?æ¡?è¤?æ?¬"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:477
+#: ../plugins/git/plugin.c:509
 msgid "Create a branch with the selected revision as its head"
 msgstr ""
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:485
+#: ../plugins/git/plugin.c:517
 msgid "Create a tag at this revision"
 msgstr "建ç«?此修è¨?ç??ç??æ¨?籤"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:493
-#, fuzzy
+#: ../plugins/git/plugin.c:525
 msgid "Reset repository head to this revision"
-msgstr "è«?輸å?¥èµ·å§?ä¿®è¨?ç??ã??"
+msgstr "é??設é??å??ä¿®è¨?ç??ç??æª?æ¡?庫"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:501
+#: ../plugins/git/plugin.c:533
 msgid "Revert this commit"
 msgstr "復å??此次æ??交"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:509
+#: ../plugins/git/plugin.c:541
 msgid "Merge this commit into the current branch"
 msgstr "å°?é??次æ??交å??ä½µå?°ç?®å??ç??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:515
-#, fuzzy
+#: ../plugins/git/plugin.c:547
 msgid "_Bisect"
-msgstr "é??ç½®(_R)"
+msgstr "_Bisect"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:523
+#: ../plugins/git/plugin.c:555
 msgid "_Set good revision"
 msgstr "_Set good revision"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:525
+#: ../plugins/git/plugin.c:557
 msgid "Mark this revision as good"
-msgstr ""
+msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º good"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:531
+#: ../plugins/git/plugin.c:563
 msgid "_Set bad revision"
 msgstr "_Set bad revision"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:533
+#: ../plugins/git/plugin.c:565
 msgid "Mark this revision as bad"
-msgstr ""
+msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º bad"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:553
+#: ../plugins/git/plugin.c:585
 msgid "View changes to this file or folder"
 msgstr "檢è¦?å?¨é??å??æª?æ¡?æ??è³?æ??夾ç??æ?´æ?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:561
+#: ../plugins/git/plugin.c:593
 msgid "Add this file or folder to the repository"
 msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å? å?¥æª?æ¡?庫"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:569
+#: ../plugins/git/plugin.c:601
 msgid "Remove this file or folder from the repository"
 msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å¾?æª?æ¡?庫移é?¤"
 
-#: ../plugins/git/plugin.c:731
+#: ../plugins/git/plugin.c:766
 msgid "Top level git menu item"
-msgstr ""
+msgstr "�端層� git ����"
 
-#: ../plugins/git/plugin.c:739
+#: ../plugins/git/plugin.c:774
 msgid "Git operations"
 msgstr "Git æ??ä½?"
 
-#: ../plugins/git/plugin.c:744
+#: ../plugins/git/plugin.c:779
 msgid "Git log operations"
 msgstr "Git ç´?é??æª?æ??ä½?"
 
-#: ../plugins/git/plugin.c:749
+#: ../plugins/git/plugin.c:784
 msgid "Git FM operations"
 msgstr "Git FM æ??ä½?"
 
-#: ../plugins/git/plugin.c:764
+#: ../plugins/git/plugin.c:799
 msgid "Git Log"
 msgstr "Git ç´?é??æª?"
 
@@ -5700,52 +5736,46 @@ msgstr "<b>管ç??é??è?¯</b>"
 msgid "<b>New association</b>"
 msgstr "<b>æ?°å¢?é??è?¯</b>"
 
-#: ../plugins/glade/anjuta-glade.glade.h:4
+#. Link a file with a widget
+#: ../plugins/glade/anjuta-glade.glade.h:5
 msgid "Associate"
 msgstr "é??è?¯"
 
-#: ../plugins/glade/anjuta-glade.glade.h:5
+#: ../plugins/glade/anjuta-glade.glade.h:6
 msgid "Automatically add resources"
 msgstr "è?ªå??å? å?¥ä¾?æº?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:6 ../plugins/glade/plugin.c:755
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:762
+#: ../plugins/glade/plugin.c:3082
 msgid "Designer"
 msgstr "設�師"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3084
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "編輯�"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8
+#: ../plugins/glade/anjuta-glade.glade.h:9
 #, fuzzy
 msgid "Insert handler on edit"
 msgstr "編輯å?¨ç??å­?å??å??é¡?è?²"
 
-#: ../plugins/glade/anjuta-glade.glade.h:9
+#: ../plugins/glade/anjuta-glade.glade.h:10
 msgid "Position type"
 msgstr "ä½?ç½®é¡?å??"
 
-#: ../plugins/glade/anjuta-glade.glade.h:10
+#: ../plugins/glade/anjuta-glade.glade.h:11
 msgid "Separated designer layout"
 msgstr "å??é?¢å¼?設è¨?師é??ç½®"
 
-#: ../plugins/glade/anjuta-glade.glade.h:11
+#: ../plugins/glade/anjuta-glade.glade.h:12
 msgid "Special regexp"
 msgstr "��正�表示�"
 
-#: ../plugins/glade/anjuta-glade.glade.h:12
+#: ../plugins/glade/anjuta-glade.glade.h:13
 msgid "Widget name"
 msgstr "å??件å??稱"
 
-#: ../plugins/glade/anjuta-glade.glade.h:13
-msgid "on_widget_signal"
-msgstr "on_widget_signal"
-
-#: ../plugins/glade/anjuta-glade.glade.h:14
-msgid "widget_signal_cb"
-msgstr "widget_signal_cb"
-
 #: ../plugins/glade/designer-associations-item.c:243
 #, c-format
 msgid "Association item has no designer"
@@ -5776,203 +5806,230 @@ msgstr "ç?¡æ??ç?? %s 屬æ?§æ?¸å?¼"
 msgid "Association item filename has no path"
 msgstr "é??è?¯é ?ç?®æª?æ¡?å??稱æ²?æ??è·¯å¾?"
 
-#: ../plugins/glade/plugin.c:847
+#: ../plugins/glade/plugin.c:856
 #, c-format
-msgid "No associations initialized, nothing to save"
-msgstr "æ²?æ??é??è?¯å®?æ??å??å§?å??ï¼?ä¸?é?²è¡?å?²å­?"
+msgid "No associations initialized: nothing to save"
+msgstr "æ²?æ??é??è?¯å®?æ??å??å§?å??ï¼?ä¸?é?²è¡?å?²å­?"
 
-#: ../plugins/glade/plugin.c:854
+#: ../plugins/glade/plugin.c:863
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr "å? ç?ºå°?æ¡?æ ¹ç?®é??å°?æ?ªè¨­å®?ï¼?ç?¡æ³?å?²å­?é??è?¯"
 
-#: ../plugins/glade/plugin.c:876
+#: ../plugins/glade/plugin.c:885
 #, c-format
 msgid "Failed to save associations"
 msgstr "ç?¡æ³?å?²å­?é??è?¯"
 
-#: ../plugins/glade/plugin.c:1360
+#. iptCurrent:
+#: ../plugins/glade/plugin.c:1184
+msgid "Current"
+msgstr "ç?®å??ç??"
+
+#. iptBeforeEnd:
+#: ../plugins/glade/plugin.c:1185
+msgid "Before end"
+msgstr "æ?¼çµ?æ??å??"
+
+#. iptAfterBegin:
+#: ../plugins/glade/plugin.c:1186
+msgid "After begin"
+msgstr "æ?¼é??å§?å¾?"
+
+#. ipEOF:
+#: ../plugins/glade/plugin.c:1187
+msgid "End of file"
+msgstr "æª?æ¡?ç??çµ?å°¾"
+
+#: ../plugins/glade/plugin.c:1356
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "ç?¡æ³?è?ªæ??ç??å¯?此信è??"
 
-#: ../plugins/glade/plugin.c:1382
+#: ../plugins/glade/plugin.c:1378
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "Python ������"
 
-#: ../plugins/glade/plugin.c:1395
+#: ../plugins/glade/plugin.c:1391
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "Vala ������"
 
-#: ../plugins/glade/plugin.c:1954
+#: ../plugins/glade/plugin.c:1950
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "此設è¨?師æ²?æ??é??è?¯ç??編輯å?¨"
 
-#: ../plugins/glade/plugin.c:1972
+#: ../plugins/glade/plugin.c:1968
 #, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "編輯å?¨ã??%sã??ç??èª?è¨?ä¸?æ??"
+msgid "Unknown editor language \"%s\""
+msgstr "ä¸?æ??ç??編輯å?¨ç??èª?è¨?ã??%sã??"
 
-#: ../plugins/glade/plugin.c:2039 ../plugins/glade/plugin.c:2116
-#: ../plugins/glade/plugin.c:2241
+#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2112
+#: ../plugins/glade/plugin.c:2237
 #, fuzzy, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "å¾?æª?æ¡?è®?å??æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/glade/plugin.c:2046 ../plugins/glade/plugin.c:2130
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2042 ../plugins/glade/plugin.c:2126
+msgid "Couldn't find signal information"
 msgstr "æ?¾ä¸?å?°ä¿¡è??è³?è¨?"
 
-#: ../plugins/glade/plugin.c:2073
+#: ../plugins/glade/plugin.c:2069
 msgid "Error while adding a new handler stub: No current editor"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:2244
+#: ../plugins/glade/plugin.c:2242
 #, c-format
 msgid ""
-"To avoid this messages turn off \"Insert handler on edit\" flag in "
-"Preferences->Glade GUI Designer"
-msgstr ""
+"To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
+msgstr "è¦?é?¿å??é??å??è¨?æ?¯è«?é??é?? å??好設å®?->Glade ä»?é?¢è¨­è¨?師 ç??ã??%sã??"
 
-#: ../plugins/glade/plugin.c:2380
+#: ../plugins/glade/plugin.c:2312
+msgid "Couldn't find an associated document"
+msgstr "æ?¾ä¸?å?°é??è?¯ç??æ??件"
+
+#: ../plugins/glade/plugin.c:2378
 msgid "Those documents are already associated"
 msgstr "é??äº?æ??件已æ??é??è?¯"
 
-#: ../plugins/glade/plugin.c:2418
+#: ../plugins/glade/plugin.c:2416
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "ç?¡æ³?è®?å??æª?æ¡?ï¼?%sã??"
 
-#: ../plugins/glade/plugin.c:3676
+#: ../plugins/glade/plugin.c:3083
+msgid "Top level widget"
+msgstr "é ?端層ç´?è¦?çª?å??件"
+
+#: ../plugins/glade/plugin.c:3674
 msgid "Couldn't find a default signal name"
 msgstr "æ?¾ä¸?å?°é ?設ç??ä¿¡è??å??稱"
 
-#: ../plugins/glade/plugin.c:3886
+#: ../plugins/glade/plugin.c:3883
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "å°?æ¡? %s æ²?æ??廢æ£?ç??è¦?çª?å??件æ??ç??æ?¬ä¸?符ã??"
 
-#: ../plugins/glade/plugin.c:3903
+#: ../plugins/glade/plugin.c:3900
 msgid "There is no Glade project"
 msgstr "æ²?æ?? Glade å°?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3989
+#: ../plugins/glade/plugin.c:3986
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:3997 ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:3994 ../plugins/glade/plugin.c:3996
 msgid "Switch between designer/code"
 msgstr "å?¨è¨­è¨?師è??å??å§?碼ä¹?é??å??æ??"
 
-#: ../plugins/glade/plugin.c:4005 ../plugins/glade/plugin.c:4007
+#: ../plugins/glade/plugin.c:4002 ../plugins/glade/plugin.c:4004
 #, fuzzy
 msgid "Insert handler stub"
 msgstr "å? å?¥ä¿¡è??è??ç??å?¨ %s"
 
-#: ../plugins/glade/plugin.c:4013 ../plugins/glade/plugin.c:4015
+#: ../plugins/glade/plugin.c:4010 ../plugins/glade/plugin.c:4012
 msgid "Insert handler stub, autoposition"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:4021
+#: ../plugins/glade/plugin.c:4018
 msgid "Associate last designer and last editor"
 msgstr "å°?æ??å¾?ç??設è¨?師è??æ??å¾?ç??編輯å?¨é??è?¯"
 
-#: ../plugins/glade/plugin.c:4023
+#: ../plugins/glade/plugin.c:4020
 msgid "Associate last designer and editor"
 msgstr "å°?æ??å¾?ç??設è¨?師è??編輯å?¨é??è?¯"
 
-#: ../plugins/glade/plugin.c:4029 ../plugins/glade/plugin.c:4031
-msgid "Associations dialog..."
-msgstr "é??è?¯æ?§å°?話ç??..."
+#: ../plugins/glade/plugin.c:4026 ../plugins/glade/plugin.c:4028
+msgid "Associations dialogâ?¦"
+msgstr "é??è?¯å°?話ç??â?¦"
 
-#: ../plugins/glade/plugin.c:4037
-msgid "Versioning..."
-msgstr "æ­£å?¨å®?ç??..."
+#: ../plugins/glade/plugin.c:4034
+msgid "Versioningâ?¦"
+msgstr "æ­£å?¨å®?ç??â?¦"
 
-#: ../plugins/glade/plugin.c:4039
+#: ../plugins/glade/plugin.c:4036
 msgid "Switch between library versions and check deprecations"
 msgstr "å?¨ç¨?å¼?庫ç??æ?¬è??檢æ?¥å»¢æ£?ä¹?é??å??æ??"
 
-#: ../plugins/glade/plugin.c:4045 ../plugins/glade/plugin.c:4047
+#: ../plugins/glade/plugin.c:4042 ../plugins/glade/plugin.c:4044
 msgid "Set as default resource target"
 msgstr "設ç?ºé ?設ç??è³?æº?ç?®æ¨?"
 
-#: ../plugins/glade/plugin.c:4055
+#: ../plugins/glade/plugin.c:4052
 msgid "Current default target"
 msgstr "ç?®å??ç??é ?設ç?®æ¨?"
 
-#: ../plugins/glade/plugin.c:4063
+#: ../plugins/glade/plugin.c:4060
 msgid "Close the current file"
 msgstr "é??é??ç?®å??æª?æ¡?"
 
-#: ../plugins/glade/plugin.c:4071
+#: ../plugins/glade/plugin.c:4068
 msgid "Save the current file"
 msgstr "å?²å­?ç?®å??æª?æ¡?"
 
-#: ../plugins/glade/plugin.c:4087
+#: ../plugins/glade/plugin.c:4084
 msgid "Redo the last action"
 msgstr "é??æ?°é?²è¡?å??é??å??ç??ä¸?æ­¥"
 
-#: ../plugins/glade/plugin.c:4095
+#: ../plugins/glade/plugin.c:4092
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??å??å??"
 
-#: ../plugins/glade/plugin.c:4103
+#: ../plugins/glade/plugin.c:4100
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å??å??å??"
 
-#: ../plugins/glade/plugin.c:4111
+#: ../plugins/glade/plugin.c:4108
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../plugins/glade/plugin.c:4119
+#: ../plugins/glade/plugin.c:4116
 msgid "Delete the selection"
 msgstr "æ¸?é?¤é?¸å??å??å??"
 
-#: ../plugins/glade/plugin.c:4297
+#: ../plugins/glade/plugin.c:4294
 msgid "Glade designer operations"
 msgstr "Glade 設è¨?師æ??ä½?"
 
-#: ../plugins/glade/plugin.c:4397
+#: ../plugins/glade/plugin.c:4394
 msgid "Go back in undo history"
 msgstr "å?¨å¾©å??ç´?é??中å¾?å¾?"
 
-#: ../plugins/glade/plugin.c:4399
+#: ../plugins/glade/plugin.c:4396
 msgid "Go forward in undo history"
 msgstr "å?¨å¾©å??ç´?é??中å¾?å??"
 
-#: ../plugins/glade/plugin.c:4421
+#: ../plugins/glade/plugin.c:4418
 msgid "Glade Clipboard"
 msgstr "Glade �貼簿"
 
-#: ../plugins/glade/plugin.c:4426
+#: ../plugins/glade/plugin.c:4423
 msgid "Widgets"
 msgstr "è¦?çª?å??件"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4428
 msgid "Palette"
 msgstr "å??件ä¸?覽表"
 
-#: ../plugins/glade/plugin.c:4685
+#: ../plugins/glade/plugin.c:4682
 #, c-format
 msgid "Not local file: %s"
 msgstr "�������%s"
 
-#: ../plugins/glade/plugin.c:4706
+#: ../plugins/glade/plugin.c:4703
 #, c-format
 msgid "Could not open %s"
 msgstr "ç?¡æ³?é??å?? %s"
 
-#: ../plugins/glade/plugin.c:4757
+#: ../plugins/glade/plugin.c:4754
 msgid "Could not create a new glade project."
 msgstr "ç?¡æ³?建ç«?æ?° Glade å°?æ¡?ã??"
 
-#: ../plugins/glade/plugin.c:5027 ../plugins/glade/plugin.c:5052
+#: ../plugins/glade/plugin.c:5025 ../plugins/glade/plugin.c:5050
 msgid "Glade GUI Designer"
 msgstr "Glade ��設�師"
 
@@ -5984,8 +6041,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"
@@ -6005,7 +6062,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 "å??é¡?:"
 
@@ -6046,8 +6103,8 @@ 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"
-msgstr "n/a"
+msgid "N/A"
+msgstr "N/A"
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -6055,27 +6112,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 "ä½ é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
 
 #: ../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 "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
 
-#: ../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 "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
 
 #: ../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 "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
 
 #: ../plugins/gtodo/export.c:47
@@ -6147,8 +6200,8 @@ msgstr "ç?¡æ³?è®?å??æª?æ¡?"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
-msgid "Failed to parse xml structure"
-msgstr "å??æ?? xml çµ?æ§?失æ??"
+msgid "Failed to parse XML structure"
+msgstr "å??æ?? XML çµ?æ§?失æ??"
 
 #: ../plugins/gtodo/libgtodo.c:646
 #, c-format
@@ -6204,18 +6257,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 "ä¸?å??顯示(_D)"
 
@@ -6228,8 +6281,8 @@ msgid "Hide _Completed Items"
 msgstr "é?±è??å·²å®?æ??é ?ç?®(_C)"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
-msgstr "é?±è??å·²å®?æ??é ?ç?®"
+msgid "Hide completed to-do items"
+msgstr "é?±è??å·²å®?æ??ç??å¾?辦äº?é ?"
 
 #: ../plugins/gtodo/plugin.c:83
 msgid "Hide Items Past _Due Date"
@@ -6248,11 +6301,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
@@ -6260,12 +6313,12 @@ msgid "Tasks"
 msgstr "工�"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "å¾?辦äº?é ?管ç??å?¡"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
-msgstr "å¾?辦äº?é ?å??好設å®?"
+msgid "To-do List Preferences"
+msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
 
 #: ../plugins/gtodo/preferences.c:84
 msgid "Interface"
@@ -6313,11 +6366,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"
@@ -6331,7 +6384,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
@@ -6340,8 +6393,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] "å??許å¾?辦äº?é ?å?¨å?°æ??ç?? %i å??é??å??é??ç?¥æ??"
 
 #: ../plugins/gtodo/tasklists.c:10
@@ -6356,29 +6409,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"
@@ -6403,15 +6456,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 "å? å?¥/編輯巨é??"
 
@@ -6430,24 +6483,24 @@ msgid "Macros"
 msgstr "å·¨é??"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
-msgstr "æ??å?¥å·¨é??(_I)..."
+msgid "_Insert Macroâ?¦"
+msgstr "æ??å?¥å·¨é??(_I)â?¦"
 
 #: ../plugins/macro/plugin.c:44
 msgid "Insert a macro using a shortcut"
 msgstr "使ç?¨å¿«æ?·é?µæ??å?¥å·¨é??"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
-msgstr "å? å?¥å·¨é??(_A)..."
+msgid "_Add Macroâ?¦"
+msgstr "å? å?¥å·¨é??(_A)â?¦"
 
 #: ../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"
@@ -6457,74 +6510,80 @@ 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
 #, fuzzy
 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 ""
+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 ""
+msgstr "è¦?顯示ç??æ??å¾?å­?符æ?¸ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
-#, fuzzy
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
-msgstr "步�(_O)"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
-msgstr "Tabs �置�"
+msgstr "���"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+msgid "Tab position:"
+msgstr "Tab �置�"
+
+#: ../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
+#, fuzzy
 msgid "Underline-Plain"
-msgstr ""
+msgstr "ç´?æ??å­? (ASCII)"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
+#, fuzzy
 msgid "Underline-Squiggle"
-msgstr ""
+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
 #, fuzzy
 msgid "Underline-TT"
-msgstr "æ?ªè¨?ç??æ?¬"
+msgstr "使���"
 
-#: ../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 "è­¦å??ï¼?"
 
@@ -6532,56 +6591,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"
@@ -6645,16 +6704,16 @@ msgid "Patching %s using %s\n"
 msgstr "使� %2$s 修� %1$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 ""
@@ -6673,7 +6732,7 @@ msgstr "ä¿®è£?å®?æ??"
 #: ../plugins/patch/patch-plugin.ui.h:1
 #: ../plugins/subversion/anjuta-subversion.ui.h:14
 msgid "Dry run"
-msgstr ""
+msgstr "Dry run"
 
 #: ../plugins/patch/patch-plugin.ui.h:2
 msgid "File/Directory to patch:"
@@ -6696,71 +6755,75 @@ msgstr "工�(_T)"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "修�(_P)..."
+msgid "_Patchâ?¦"
+msgstr "_Patchâ?¦"
 
 #: ../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 "ç?¢ç??å°?æ¡?æª?æ¡?失æ??ã??æ?¾ä¸?å?°é?©å??ç??å°?æ¡?ç¯?æ?¬å?¯ç?¨ã??è«?確å®?ä½ ç?? Anjuta ç??æ?¬æ?¯æ??æ?°ç??ã??"
 
-#: ../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) 中æ?¾ä¸?å?°æ??æ??ç??å°?æ¡?å¾?端ç¨?å¼?ã??è«?é?¸æ??ä¸?å??ç??ç?®é??ï¼?æ??å??試å??ç´?ç?ºæ?´æ?°ç?? Anjuta ç??æ?¬ã??"
+msgstr "å?¨æ??å®?ç?®é?? (%s) 中æ?¾ä¸?å?°æ??æ??ç??å°?æ¡?å¾?端ç¨?å¼?ã??è«?é?¸æ??ä¸?å??ç??ç?®é??ï¼?æ??å??試å??ç´?ç?ºæ?´æ?°ç?? Anjutaã??"
 
-#: ../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 ""
+"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/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 "����"
@@ -6814,130 +6877,152 @@ msgid "_Group name:"
 msgstr "ç¾£çµ?å??稱(_G):"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)..."
+msgid "_Select file to addâ?¦"
+msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)â?¦"
 
-#: ../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:231
+#: ../plugins/project-manager/plugin.c:1430
+#: ../plugins/project-manager/plugin.c:1513
+#: ../plugins/project-manager/plugin.c:1689
 #: ../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:232
 msgid "GbfProject Object"
 msgstr "GbfProject �件"
 
-#: ../plugins/project-manager/gbf-project-model.c:251
+#: ../plugins/project-manager/gbf-project-model.c:677
 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"
-msgstr "����羣�"
+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"
-msgstr "��������"
+#: ../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:430
+#: ../plugins/project-manager/plugin.c:446
+msgid "No properties available for this group"
+msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦é??å??ç¾£çµ?"
+
+#: ../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:907
+msgid "Project properties"
+msgstr "��屬�"
+
+#: ../plugins/project-manager/plugin.c:511
+#, fuzzy
+msgid "Refreshing symbol treeâ?¦"
+msgstr "å??å¾?符è??宣å??"
+
+#: ../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:696
 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
+#: ../plugins/project-manager/plugin.c:699
 msgid ""
-"Group: %s\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
-"The group will not be deleted from file system."
 msgstr ""
-"羣��%s\n"
+"ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
-"該羣çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:667
+#: ../plugins/project-manager/plugin.c:702
 msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
-"ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
+"æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?碼æª?å¾?å°?æ¡?中移é?¤ï¼?\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:705
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following elements from the project?\n"
 "\n"
 msgstr ""
-"æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?æª?å¾?å°?æ¡?中移é?¤ï¼?\n"
+"ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??ç´ å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:672
+#: ../plugins/project-manager/plugin.c:722
 #, c-format
-msgid ""
-"Source: %s\n"
-"\n"
-"The source file will not be deleted from file system."
-msgstr ""
-"���%s\n"
-"\n"
-"該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+msgid "Group: %s\n"
+msgstr "羣��%s\n"
+
+#: ../plugins/project-manager/plugin.c:725
+#, c-format
+msgid "Target: %s\n"
+msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:727
+#: ../plugins/project-manager/plugin.c:728
+#, c-format
+msgid "Source: %s\n"
+msgstr "���%s\n"
+
+#: ../plugins/project-manager/plugin.c:731
+#, c-format
+msgid "Shortcut: %s\n"
+msgstr "æ?·å¾?ï¼?%s\n"
+
+#: ../plugins/project-manager/plugin.c:743
+msgid "The group will not be deleted from the file system."
+msgstr "é??å??ç¾£çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:745
+msgid "The source file will not be deleted from the file system."
+msgstr "該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:750
+msgid "Confirm remove"
+msgstr "確�移�"
+
+#: ../plugins/project-manager/plugin.c:795
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6946,151 +7031,147 @@ msgstr ""
 "移é?¤â??%sâ??失æ??ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:784
+#: ../plugins/project-manager/plugin.c:865
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "å??å?? %s ç?? URI è³?è¨?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:822
+#: ../plugins/project-manager/plugin.c:903
 msgid "_Project"
 msgstr "å°?æ¡?(_P)"
 
-#: ../plugins/project-manager/plugin.c:826
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:907
+#: ../plugins/project-manager/plugin.c:941
 msgid "_Properties"
 msgstr "屬�(_P)"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "_Refresh"
 msgstr "é??æ?°æ?´ç??(_R)"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "Refresh project manager tree"
 msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
 
-#: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "��羣�(_G)..."
+#: ../plugins/project-manager/plugin.c:917
+msgid "Add _Groupâ?¦"
+msgstr "��羣�(_G)�"
 
-#: ../plugins/project-manager/plugin.c:836
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add a group to project"
 msgstr "��羣����"
 
-#: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "����(_T)..."
+#: ../plugins/project-manager/plugin.c:922
+msgid "Add _Targetâ?¦"
+msgstr "����(_T)�"
 
-#: ../plugins/project-manager/plugin.c:841
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:922
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add a target to project"
 msgstr "�������"
 
-#: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "å? å?¥å??å§?æª?(_S)"
+#: ../plugins/project-manager/plugin.c:927
+msgid "Add _Source Fileâ?¦"
+msgstr "������(_S)�"
 
-#: ../plugins/project-manager/plugin.c:846
-#: ../plugins/project-manager/plugin.c:865
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:927
+#: ../plugins/project-manager/plugin.c:946
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add a source file to project"
 msgstr "å? å?¥å??å§?æª?è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close Pro_ject"
 msgstr "é??é??å°?æ¡? (_J)"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close project"
 msgstr "é??é??å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:941
 msgid "Properties of group/target/source"
 msgstr "ç¾£çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
 
-#: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
+#: ../plugins/project-manager/plugin.c:946
+msgid "_Add to Project"
 msgstr "�����(_A)"
 
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add _Group"
 msgstr "��羣�(_G)"
 
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add _Target"
 msgstr "����(_T)"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add _Source File"
 msgstr "å? å?¥å??å§?æª?(_S)"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Re_move"
 msgstr "移�(_M)"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Remove from project"
 msgstr "���中移�"
 
-#: ../plugins/project-manager/plugin.c:1259
+#: ../plugins/project-manager/plugin.c:1387
 #, c-format
 msgid "Loading project: %s"
 msgstr "正������%s"
 
-#: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
-msgstr "已建���檢�..."
+#: ../plugins/project-manager/plugin.c:1395
+msgid "Created project viewâ?¦"
+msgstr "已建���檢��"
 
-#: ../plugins/project-manager/plugin.c:1280
+#: ../plugins/project-manager/plugin.c:1408
 #, 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:1601
 #, c-format
 msgid "Error closing project: %s"
 msgstr "é??é??å°?æ¡?æ??é?¯èª¤ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1536
+#: ../plugins/project-manager/plugin.c:1668
 msgid "Project manager actions"
 msgstr "å°?æ¡?管ç??å?¡å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:1544
+#: ../plugins/project-manager/plugin.c:1676
 msgid "Project manager popup actions"
 msgstr "å°?æ¡?管ç??å?¡å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
-msgstr "å??å§?å??å°?æ¡?..."
+#: ../plugins/project-manager/plugin.c:2471
+msgid "Initializing Projectâ?¦"
+msgstr "å??å§?å??å°?æ¡?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2644
+#: ../plugins/project-manager/plugin.c:2474
 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
+#: ../plugins/project-wizard/druid.c:150
 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
+#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../plugins/project-wizard/druid.c:150
+#: ../plugins/project-wizard/druid.c:153
 msgid "Message"
 msgstr "��"
 
-#: ../plugins/project-wizard/druid.c:216
+#: ../plugins/project-wizard/druid.c:232
 msgid ""
 "<b>Confirm the following information:</b>\n"
 "\n"
@@ -7100,17 +7181,17 @@ msgstr ""
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:220
+#: ../plugins/project-wizard/druid.c:236
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "å°?æ¡?é¡?å??ï¼?%s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:393
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "����任���樣�� %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:594
 #, c-format
 msgid ""
 "\n"
@@ -7119,39 +7200,47 @@ msgstr ""
 "\n"
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?輸å?¥å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:590
+#: ../plugins/project-wizard/druid.c:609
 #, 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:614
+#, 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:619
 #, c-format
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:646
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
 "cannot be written. Do you want to continue?"
 msgstr "ç?®é??ã??%sã??ä¸?æ?¯ç©ºç??ã??å¦?æ??æ??äº?æª?æ¡?ç?¡æ³?寫å?¥ï¼?å°?æ¡?ç??建ç«?å?¯è?½æ??失æ??ã??確å®?è¦?ç¹¼çº?å??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:648
 #, 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:679
 msgid "Invalid entry"
 msgstr "ç?¡æ??ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:690
 msgid "Dubious entry"
 msgstr "ä¸?確å®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:851
 #, c-format
 msgid ""
 "\n"
@@ -7160,7 +7249,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:862
 #, c-format
 msgid ""
 "\n"
@@ -7169,28 +7258,32 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?件ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:871
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
 "generating the project.\n"
 msgstr "編譯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?件é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??確å®?å®?å??å·²ç¶?正確ç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:879
+msgid "Install missing packages"
+msgstr "å®?è£?缺å°?ç??å¥?件"
+
+#: ../plugins/project-wizard/druid.c:887
 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."
-msgstr "缺å°?ç??ç¨?å¼?é??常æ?¯æ??äº?ç?¼è¡?ç??æ?¬ç??ä¸?é?¨å??ï¼?å?¯ä»¥å?¨ä½ ç??å¥?件管ç??ç¨?å¼?中æ??å°?å?°ã??å??樣ç??ï¼?é??ç?¼ç?¨å¥?件ä¹?常å­?å?¨ç?¹å?¥ç??å¥?件中ï¼?æ?¯ä½ ç??ç?¼è¡?ç??æ?¬æ??ä¾?以便é??ç?¼ä»¥å®?å??ç?ºå?ºç¤?ç??å°?æ¡?ã??å®?å??é??常å?¨å¥?件å??稱中以 -dev æ?? -devel å¾?綴çµ?å°¾ï¼?è??ä¸?å??樣å?¯ä»¥å?¨ä½ ç??å¥?件管ç??ç¨?å¼?中æ??å°?å?°ã??"
-
-#: ../plugins/project-wizard/druid.c:809
+"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ã??å¾?綴çµ?å°¾ï¼?è??ä¸?å??樣å?¯ä»¥å?¨ä½ ç??å¥?件管ç??ç¨?å¼?中æ??å°?å?°ã??"
+
+#: ../plugins/project-wizard/druid.c:895
 msgid "Missing components"
 msgstr "é?ºå¤±å??件"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:1027
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?建ç«?å°?æ¡?å?©ç??使ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7210,18 +7303,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
@@ -7234,461 +7327,37 @@ 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 "é?¸å??æª?æ¡?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:1
-msgid "A GNOME applet project"
-msgstr "GNOME ������"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:2
-msgid "A generic C++ project"
-msgstr "�� C++ ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:3
-msgid "A generic GTK+ project"
-msgstr "�� GTK+ ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:4
-msgid "A generic GTKmm (C++) project"
-msgstr "�� GTKmm (C++) ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:5
-msgid "A generic Xlib dock applet"
-msgstr "�� Xlib dock ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:6
-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 å°?æ¡?管ç??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:8
-msgid "A generic minimal and flat project"
-msgstr "é??ç?¨ã??æ??å°?å??ç??å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:9
-msgid ""
-"A generic natively compiled java project using the GNU Java Compiler (gcj)"
-msgstr "ä¸?è?¬å??ç??編譯 java å°?æ¡?ï¼?使ç?¨ GNU Java 編譯å?¨ (gcj)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:10
-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 å°?æ¡?管ç??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wx Widgets project"
-msgstr "�� wx Widgets ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:13
-msgid "A sample SDL project"
-msgstr "SDL 樣���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:14
-msgid "Add C++ support:"
-msgstr "�� C++ ���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:15
-msgid "Add gtk-doc system:"
-msgstr "�� gtk-doc 系統�"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:16
-msgid "Add internationalization:"
-msgstr "å? å?¥å??é??å??å??è?½:"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:17
-msgid "Add shared library support:"
-msgstr "���享��庫���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:18
-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
-msgid "Adds support for building shared libraries in your project"
-msgstr "å?¨ä½ ç??å°?æ¡?中å? å?¥ç·¨è­¯å?±äº«ç¨?å¼?庫ç??æ?¯æ?´"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:20
-msgid ""
-"Adds support for internationalization so that your project can have "
-"translations in different languages"
-msgstr "å? å?¥å??é??å??æ?¯æ?´ï¼?è®?ä½ ç??å°?æ¡?å?¯ä»¥ç¿»è­¯æ??ä¸?å??ç??èª?è¨?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:21
-msgid "Anjuta Plugin"
-msgstr "Anjuta å¤?æ??ç¨?å¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:22
-msgid "Anjuta plugin project that uses libanjuta framework"
-msgstr "使ç?¨ libanjuta æ?¶æ§?ç?? Anjuta å¤?æ??ç¨?å¼?å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:23
-msgid "Applet Title:"
-msgstr "������:"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:25
-msgid "Basic information"
-msgstr "����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:26
-msgid "Berkeley Software Distribution License (BSD)"
-msgstr "æ??å??è??è»?件æ?£ä½?許å?¯è­? ï¼?BSDï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:27
-msgid ""
-"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
-msgid "Configure external packages"
-msgstr "設����件"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:29
-msgid "Configure external packages:"
-msgstr "設����件�"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:30
-#, fuzzy
-#| msgid "Create glade interface file"
-msgid "Create Gtk Builder interface file"
-msgstr "建� glade ���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:31
-#, fuzzy
-#| msgid "Create a template glade interface file"
-msgid "Create a template Gtk Builder interface file"
-msgstr "建� Glade ��樣��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:32
-#, fuzzy
-#| msgid "Create a template glade interface file"
-msgid "Create a template gtk builder interface file"
-msgstr "建� Glade ��樣��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
-msgid "Display description of the applet"
-msgstr "顯示é?¢æ?¿ç¨?å¼?ç??æ??è¿°"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
-msgid "Display description of the plugin"
-msgstr "顯示å¤?æ??ç¨?å¼?ç??æ??è¿°"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
-msgid "Display title of the applet"
-msgstr "顯示é?¢æ?¿ç¨?å¼?ç??æ¨?é¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
-msgid "Display title of the plugin"
-msgstr "顯示å¤?æ??ç¨?å¼?ç??æ¨?é¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
-msgid "Django Project"
-msgstr "Django å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
-msgid "Django Project information"
-msgstr "Django ����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
-msgid "Email address:"
-msgstr "Email å?°å??ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
-msgid "GCJ needs to know which class contains the main() function"
-msgstr "GCJ é??è¦?ç?¥é??å?ªå??é¡?å?¥(class)å?«æ?? main() å?½æ?¸"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
-msgid "GNOME Applet"
-msgstr "GNOME ����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
-msgid "GTK+"
-msgstr "GTK+"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
-msgid "GTKmm"
-msgstr "GTKmm"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
-msgid "General Project Information"
-msgstr "������"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
-msgid "Generic"
-msgstr "��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
-msgid "Generic (Minimal)"
-msgstr "ä¸?è?¬(æ??å°?)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
-msgid "Generic C++"
-msgstr "ç?¢ç?? C++"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
-msgid "Generic gcj compiled java"
-msgstr "ä¸?è?¬ gcj 編譯ç?? java"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
-msgid "Generic java (automake)"
-msgstr "�� java (automake)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
-msgid "Generic python (automake)"
-msgstr "�� python (automake)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
-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 "
-"'libgnomeui-2.0 >= 2.2.0'"
-msgstr "æ??å®?ä½ ç??å°?æ¡?é??è¦?ç??å¥?件å??稱ã??ä½ ä¹?å?¯ä»¥æ??å?ºè©²å¥?件æ??é??ç??ç??æ?¬ã??ä¾?å¦?ã??libgnomeui-2.0ã??æ??ã??libgnomeui-2.0 >= 2.2.0ã??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
-msgid "Icon File:"
-msgstr "å??示æª?ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
-msgid "Icon file for the plugin"
-msgstr "å¤?æ??ç¨?å¼?ç??å??示æª?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
-msgid "Implement plugin interfaces"
-msgstr "實å??å¤?æ??ç¨?å¼?ä»?é?¢"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
-msgid "Interface implemented by the plugin"
-msgstr "實ä½?ä»?é?¢ç??å¤?æ??ç¨?å¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
-msgid "Interface:"
-msgstr "���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
-msgid "License"
-msgstr "æ??æ¬?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
-msgid "Main Class:"
-msgstr "主���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
-msgid "Main class"
-msgstr "主��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
-msgid "Makefile project"
-msgstr "Makefile å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
-msgid "Makefile-based project"
-msgstr "å?ºæ?¼ Makefile ç??å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
-msgid "Mininum SDL version required"
-msgstr "é??è¦?æ??å°? SDL ç??æ?¬"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
-msgid "Name of the value to watch"
-msgstr "è¦?ç?£æ?§ç??æ?¸å?¼å??稱"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
-msgid "No license"
-msgstr "æ²?æ??æ??æ¬?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
-msgid "Options for project build system"
-msgstr "å°?æ¡?編譯系統ç??é?¸é ?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
-msgid "Plugin Class Name:"
-msgstr "å¤?æ??ç¨?å¼?é¡?å?¥å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
-msgid "Plugin Dependencies:"
-msgstr "å¤?æ??ç¨?å¼?æ??è¿°ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
-msgid "Plugin Description:"
-msgstr "å¤?æ??ç¨?å¼?æ??è¿°ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
-msgid "Plugin Title:"
-msgstr "å¤?æ??ç¨?å¼?æ¨?é¡?ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
-msgid "Plugin class name"
-msgstr "å¤?æ??ç¨?å¼?é¡?å?¥å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
-msgid "Plugin has menus or/and toolbars"
-msgstr "å¤?æ??ç¨?å¼?å?·æ??é?¸å?®æ??/å??å·¥å?·å??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
-msgid "Plugin interfaces to implement"
-msgstr "欲實å??ç??å¤?æ??ç¨?å¼?ä»?é?¢"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
-msgid "Project Name:"
-msgstr "å°?æ¡?å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
-msgid "Project directory, output file etc."
-msgstr "å°?æ¡?ç?®é??ï¼?輸å?ºæª?æ¡?ç­?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
-msgid "Project directory:"
-msgstr "å°?æ¡?ç?®é??ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
-msgid ""
-"Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
-msgstr "å°?æ¡?å??稱ä¸?è?½å?«æ??空ç?½ï¼?å? ç?ºå®?æ??æ??ç?ºè©²å°?æ¡?編譯ç?®æ¨?(å?¯å?·è¡?æª?ã??ç¨?å¼?庫ç­?)ç??å??稱"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
-msgid "Project name:"
-msgstr "å°?æ¡?å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
-msgid "Project options"
-msgstr "����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
-msgid "Python webproject using Django Web Framework"
-msgstr "使ç?¨ Django Web æ?¶æ§?ç?? Python 網絡å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
-msgid "Require Package:"
-msgstr "é??è¦?å¥?件ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
-msgid "Require SDL version:"
-msgstr "é??è¦? SDL ç??æ?¬ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
-msgid "Require SDL_gfx library"
-msgstr "é??è¦? SDL_gfx å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
-msgid "Require SDL_gfx:"
-msgstr "é??è¦? SDL_gfxï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
-msgid "Require SDL_image library"
-msgstr "é??è¦? SDL_image å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
-msgid "Require SDL_image:"
-msgstr "é??è¦? SDL_imageï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
-msgid "Require SDL_mixer library"
-msgstr "é??è¦? SDL_mixer å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
-msgid "Require SDL_mixer:"
-msgstr "é??è¦? SDL_mixerï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
-msgid "Require SDL_net library"
-msgstr "é??è¦? SDL_net å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
-msgid "Require SDL_net:"
-msgstr "é??è¦? SDL_netï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
-msgid "Require SDL_ttf library"
-msgstr "é??è¦? SDL_ttf å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
-msgid "Require SDL_ttf:"
-msgstr "é??è¦? SDL_ttfï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
-msgid "SDL"
-msgstr "SDL"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
-msgid "Select code license"
-msgstr "é?¸æ??å??å§?碼æ??æ¬?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
-msgid "Shell values to watch"
-msgstr "è¦?ç?£æ?§ç?? Shell æ?¸å?¼"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
-msgid "Use pkg-config to add library support from other packages"
-msgstr "使� pkg"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
-msgid "Value Name:"
-msgstr "æ?¸å?¼å??稱:"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
-msgid "Values to watch"
-msgstr "è¦?ç?£æ?§ç??æ?¸å?¼"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
-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:105
-msgid "Xlib"
-msgstr "Xlib"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
-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 æ?¯ç?¨ä¾?編譯以 GObject ç?ºå?ºç¤?ç??é¡?å?¥ä¹? API æ??件"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
-msgid "project name"
-msgstr "å°?æ¡?å??稱"
-
 #: ../plugins/run-program/anjuta-run-program.ui.h:2
 msgid "Choose a working directory"
 msgstr "é?¸æ??ä¸?å??å·¥ä½?ç?®é??"
@@ -7706,18 +7375,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
@@ -7728,16 +7392,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"
@@ -7748,191 +7407,190 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:229
+#: ../plugins/run-program/plugin.c:231
 msgid "_Run"
 msgstr "å?·è¡?(_R)"
 
-#: ../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 "�使���工������"
+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:280
+#: ../plugins/run-program/plugin.c:257
+msgid "Set current program, arguments, etc."
+msgstr "設å®?ç?®å??ç??ç¨?å¼?ã??å¼?æ?¸ç­?ç­?ã??"
+
+#: ../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 ""
+msgstr "Greedy matching"
 
-#: ../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 "æ??å°?(_F)..."
+msgid "_Findâ?¦"
+msgstr "å°?æ?¾(_F)â?¦"
 
 #: ../plugins/search/plugin.c:69
 msgid "Search for a string or regular expression in the editor"
@@ -7951,8 +7609,8 @@ msgid "Find _Previous"
 msgstr "æ?¾ä¸?ä¸?å??(_P)"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
-msgstr "æ??å°?å??å??代(_E)..."
+msgid "Find and R_eplaceâ?¦"
+msgstr "å°?æ?¾è??å??代(_R)â?¦"
 
 #: ../plugins/search/plugin.c:80
 msgid ""
@@ -7964,16 +7622,16 @@ msgid "Search and Replace"
 msgstr "æ??å°?å??å??代"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
-msgstr "���中��(_D)..."
+msgid "Fin_d in Filesâ?¦"
+msgstr "���中��(_D)�"
 
 #: ../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"
@@ -8045,76 +7703,76 @@ msgstr "å??代"
 msgid "Search complete"
 msgstr "æ??å°?å®?æ??"
 
-#: ../plugins/search/search-replace.c:1037
-#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1044
+#: ../plugins/search/search-replace.c:1731
 msgid "Replace All"
 msgstr "å?¨é?¨å??代"
 
-#: ../plugins/search/search-replace.c:1076
+#: ../plugins/search/search-replace.c:1083
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??å?¥å­?ã??æ?¯å?¦è¦?å¾?é ­é??å§?æ??å°?ï¼?"
 
-#: ../plugins/search/search-replace.c:1096
+#: ../plugins/search/search-replace.c:1103
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??é ?ç?®ã??"
 
-#: ../plugins/search/search-replace.c:1111
+#: ../plugins/search/search-replace.c:1118
 msgid "The maximum number of results has been reached."
 msgstr "å·²é??å?°çµ?æ??ç??æ??大æ?¸é??ã??"
 
-#: ../plugins/search/search-replace.c:1124
+#: ../plugins/search/search-replace.c:1131
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "å·²å??代 %d å??符å??é ?ã??"
 
-#: ../plugins/search/search-replace.c:1291
-msgid "Unable to build user interface for Search And Replace"
+#: ../plugins/search/search-replace.c:1298
+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"
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. 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?"
+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"
@@ -8132,115 +7790,119 @@ msgid "Create backup files"
 msgstr "建ç«?å??份æª?æ¡?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+msgid "Enable autocompletion for document words"
+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 "Tab 大�(空��):"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
 msgid "Use tabs for indentation"
 msgstr "使ç?¨ tabs 縮æ??"
 
-#: ../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
 #, fuzzy
 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 "Anjuta ç??é¦?é ?"
 
-#: ../plugins/starter/starter.c:475
+#: ../plugins/starter/starter.c:480
 msgid "Anjuta Manual"
 msgstr "Anjuta æ??å??"
 
-#: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
-msgstr "Gnome 網ä¸? API æ??件"
+#: ../plugins/starter/starter.c:486
+msgid "GNOME Online API Documentation"
+msgstr "GNOME 網ä¸? API æ??件"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "Add file/directory"
@@ -8263,9 +7925,8 @@ msgid "Diff file/directory"
 msgstr "æ¯?å°?æª?æ¡?/ç?®é??å·®ç?°"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:12
-#, fuzzy
 msgid "Diff to Previous"
-msgstr "æ?¾ä¸?ä¸?å??(_P)"
+msgstr "Diff è?³å??ä¸?å??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:15
 msgid "End Revision:"
@@ -8286,7 +7947,7 @@ msgstr "第�路��"
 #: ../plugins/subversion/anjuta-subversion.ui.h:20
 #, fuzzy
 msgid "Ignore ancestry"
-msgstr "忽���:"
+msgstr "忽ç?¥é?±è??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:22
 msgid "Merge changes into working copy"
@@ -8301,14 +7962,12 @@ msgid "Previous Commit Messages:"
 msgstr "ä¸?ä¸?å??æ??交è¨?æ?¯ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:28
-#, fuzzy
 msgid "Realm:"
-msgstr "é??æ?°å?½å??(_R)"
+msgstr "é ?å??ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:29
-#, fuzzy
 msgid "Recurse"
-msgstr "é??ç½®(_R)"
+msgstr "é??è¿´"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:30
 msgid "Remember Password"
@@ -8323,94 +7982,96 @@ msgid "Remove file/directory"
 msgstr "移é?¤æª?æ¡?/ç?®é??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:33
-#, fuzzy
 msgid "Repository Head"
-msgstr "<b>��庫�</b>"
+msgstr "��庫 Head"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:34
 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
-#, fuzzy
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
-msgstr "ç·¨è??"
+msgstr "é ?å??"
 
 #. Action name
 #. Stock icon, if any
@@ -8439,8 +8100,8 @@ msgstr "æ??交你ç??ä¿®æ?¹è?³ Subversion 樹"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
-msgstr "�復(_R)..."
+msgid "_Revertâ?¦"
+msgstr "_Revertâ?¦"
 
 #. Display label
 #. short-cut
@@ -8451,8 +8112,8 @@ msgstr "å??復æ?´æ?¹è?³ä½ ç??å·¥ä½?è¤?æ?¬ã??"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
-msgstr "調解��(_R)..."
+msgid "_Resolve Conflictsâ?¦"
+msgstr "_Resolve Conflictsâ?¦"
 
 #. Display label
 #. short-cut
@@ -8463,20 +8124,20 @@ msgstr "調解你工ä½?è¤?æ?¬ä¸­ç??è¡?çª?ã??"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "æ?´æ?°(_U)..."
+msgid "_Updateâ?¦"
+msgstr "_Updateâ?¦"
 
 #. 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 樹å??æ­¥"
 
 #. 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
@@ -8487,8 +8148,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
@@ -8499,8 +8160,8 @@ msgstr "å??æ??ä½ ç??æ?¬å?°ç«¯è¤?æ?¬å?°æª?æ¡?庫中ç??å??æ?¯æ??æ¨?籤"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "å??ä½µ..."
+msgid "Mergeâ?¦"
+msgstr "Mergeâ?¦"
 
 #. Display label
 #. short-cut
@@ -8511,8 +8172,8 @@ msgstr "å??ä½µæ?´æ?¹è?³ä½ ç??å·¥ä½?è¤?æ?¬ä¸­"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "檢è¦?ç´?é??(_V)..."
+msgid "_View Logâ?¦"
+msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
 
 #. Display label
 #. short-cut
@@ -8523,8 +8184,8 @@ msgstr "檢���歷�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "差�(_D)..."
+msgid "_Diffâ?¦"
+msgstr "_Diffâ?¦"
 
 #. Display label
 #. short-cut
@@ -8535,14 +8196,14 @@ msgstr "æ¯?å°?æ?¬å?°ç«¯æª?æ¡?樹è??æª?æ¡?庫ç??å·®ç?°"
 #. 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 "差�..."
+msgid "Diffâ?¦"
+msgstr "Diffâ?¦"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8565,8 +8226,8 @@ msgid "Subversion: Commit complete."
 msgstr "Subversion: æ??交å®?æ??ã??"
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
-msgstr "Subversion: æ­£å?¨æ??交æ?´æ?¹è?³æª?æ¡?庫..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
+msgstr "Subversionï¼?æ­£å?¨æ??交æ?´æ?¹è?³æª?æ¡?庫â?¦"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
 msgid "Subversion: Copy complete."
@@ -8587,8 +8248,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"
@@ -8603,16 +8264,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."
@@ -8754,64 +8415,68 @@ msgstr "�失� %s"
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
 
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/symbol-db/plugin.c:317
 msgid "Tag De_claration"
 msgstr "æ¨?籤宣å??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
-msgstr "å??å¾?符è??宣å??"
+#: ../plugins/symbol-db/plugin.c:319
+#, fuzzy
+msgid "Go to symbol declaration"
+msgstr "å¾?ä¸?ä¸?å¹?ç?¸ç??"
 
-#: ../plugins/symbol-db/plugin.c:321
+#. Translators: Go to the line where the tag is implemented
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag _Implementation"
 msgstr "�籤實�(_I)"
 
-#: ../plugins/symbol-db/plugin.c:323
-msgid "Goto symbol definition"
-msgstr "å??å¾?符è??å®?義"
+#: ../plugins/symbol-db/plugin.c:328
+#, fuzzy
+msgid "Go to symbol definition"
+msgstr "å??å¾?ä¸?ä¸?å??å­?è©?ç??解é??"
 
-#: ../plugins/symbol-db/plugin.c:330
-msgid "_Find Symbol..."
-msgstr "å°?æ?¾ç¬¦è??(_F)..."
+#: ../plugins/symbol-db/plugin.c:335
+#, fuzzy
+msgid "_Find Symbolâ?¦"
+msgstr "æ?¾ä¸?ä¸?å??(_P)"
 
-#: ../plugins/symbol-db/plugin.c:331
+#: ../plugins/symbol-db/plugin.c:336
 msgid "Find Symbol"
 msgstr "å°?æ?¾ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:1169
+#: ../plugins/symbol-db/plugin.c:1175
 #, c-format
-msgid "%s: Generating inheritances..."
-msgstr "%sï¼?æ­£å?¨ç?¢ç??ç¹¼æ?¿..."
+msgid "%s: Generating inheritancesâ?¦"
+msgstr "%sï¼?æ­£å?¨ç?¢ç??å¯?碼å??ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1174
+#: ../plugins/symbol-db/plugin.c:1180
 #, fuzzy, c-format
 msgid "%s: %d files scanned out of %d"
-msgstr "<b>ã??ä¸?å?¨è¾¦å?¬å®¤ã??è¨?æ?¯ï¼?</b>"
+msgstr "å??å?ºæª?æ¡?"
 
-#: ../plugins/symbol-db/plugin.c:1205
+#: ../plugins/symbol-db/plugin.c:1211
 #, c-format
-msgid "Generating inheritances..."
-msgstr "æ­£å?¨ç?¢ç??ç¹¼æ?¿..."
+msgid "Generating inheritancesâ?¦"
+msgstr "æ­£å?¨ç?¢ç??å¯?碼å??ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1207
+#: ../plugins/symbol-db/plugin.c:1213
 #, fuzzy, c-format
 msgid "%d files scanned out of %d"
-msgstr "<b>ã??ä¸?å?¨è¾¦å?¬å®¤ã??è¨?æ?¯ï¼?</b>"
+msgstr "å??å?ºæª?æ¡?"
 
-#: ../plugins/symbol-db/plugin.c:1967
+#: ../plugins/symbol-db/plugin.c:1981
 #, fuzzy
-msgid "Populating symbols' db..."
-msgstr "顯示æ??æ??符è??"
+msgid "Populating symbol databaseâ?¦"
+msgstr "å??å¾?符è??宣å??"
 
-#: ../plugins/symbol-db/plugin.c:2351 ../plugins/symbol-db/plugin.c:2479
+#: ../plugins/symbol-db/plugin.c:2345 ../plugins/symbol-db/plugin.c:2473
 msgid "Symbols"
 msgstr "符è??"
 
-#: ../plugins/symbol-db/plugin.c:2488
+#: ../plugins/symbol-db/plugin.c:2482
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2496
+#: ../plugins/symbol-db/plugin.c:2490
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
@@ -8838,29 +8503,31 @@ 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>å?¨å??</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 "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??..."
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
-msgid "Ctags executable:"
-msgstr "Ctags �����"
+msgid "Checking if package is parseableâ?¦"
+msgstr "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??â?¦"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
@@ -8869,91 +8536,97 @@ msgstr ""
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
 msgid ""
 "This option enables the default packages required by your opened project, e."
-"g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)"
-msgstr "é??å??é?¸é ?æ??å??ç?¨ä½ é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?你建ç«? Gtk+ å°?æ¡?å°±é??è¦? glib å?? gtk+ (å?¯è?½é??è¦?æ?´å¤? cpu é??ç®?æ??é??)"
+"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
+msgstr "é??å??é?¸é ?æ??å??ç?¨ä½ é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?你建ç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
 
 #: ../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:10
-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 "é??é??æ??å°?æ??令ç?¶æ?? Anjuta ç??å?½ä»¤ç¨¿ç·¨è¼¯"
 
-#: ../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
-#, fuzzy
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
-msgstr "å¿«æ?·é?µ"
+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 "����"
@@ -8963,8 +8636,8 @@ msgid "Working directory:"
 msgstr "å·¥ä½?ç?®é??ï¼?"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "è®?æ?¸(_V)..."
+msgid "_Variableâ?¦"
+msgstr "è®?æ?¸(_V)â?¦"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -9014,8 +8687,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
@@ -9041,8 +8714,8 @@ msgstr "��誤�"
 #. 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
@@ -9050,12 +8723,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
@@ -9084,11 +8757,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"
@@ -9166,8 +8834,8 @@ msgid "Currently edited file directory"
 msgstr "ç?®å??編輯ç??æª?æ¡?ç?®é??"
 
 #: ../plugins/tools/variable.c:103
-msgid "Currently selection in editor"
-msgstr "ç?®å??編輯å?¨ä¸­ç??é?¸æ??å??å??"
+msgid "Currently selected text in editor"
+msgstr "編輯å?¨ä¸­ç?®å??é?¸å??ç??æ??å­?"
 
 #: ../plugins/tools/variable.c:104
 msgid "Current word in editor"
@@ -9181,7 +8849,7 @@ msgstr "ç?®å??編輯å?¨ä¸­ç??è¡?"
 msgid "Ask the user to get additional parameters"
 msgstr "è©¢å??使ç?¨è??以å??å¾?é¡?å¤?ç??å??æ?¸"
 
-#: ../plugins/tools/variable.c:493
+#: ../plugins/tools/variable.c:499
 msgid "Command line parameters"
 msgstr "æ??令å??æ?¸"
 
@@ -9206,8 +8874,8 @@ msgid "Replace buffer"
 msgstr "å??代緩è¡?å??"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
-msgstr "æ??å?¥ç·©è¡?å??"
+msgid "Insert into buffer"
+msgstr "æ??å?¥è?³ç·©è¡?å??"
 
 #: ../plugins/tools/tool.c:87
 msgid "Append to buffer"
@@ -9246,9 +8914,9 @@ msgstr "�串"
 msgid "Copyright (c) Naba Kumar"
 msgstr "ç??æ¬?æ??æ?? © 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"
@@ -9375,7 +9043,7 @@ msgid "About External _Plugins"
 msgstr "é??æ?¼å¤?é?¨å¤?æ??ç¨?å¼?(_P)"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+msgid "About third-party Anjuta plugins"
 msgstr "é??æ?¼ç¬¬ä¸?æ?¹ Anjuta å¤?æ??ç¨?å¼?"
 
 #: ../src/anjuta-app.c:489
@@ -9406,11 +9074,11 @@ msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
 #: ../src/main.c:70
-msgid "Do not show the splashscreen"
-msgstr "ä¸?è¦?顯示起å§?å??å??"
+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
@@ -9422,14 +9090,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 "é??é?? anjuta 並é?©ç?¶ç??é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
+msgstr "é?©ç?¶ç??é??é?? Anjuta 並é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
 
 #: ../src/main.c:156
 msgid "- Integrated Development Environment"
 msgstr "- æ?´å??å¼?é??ç?¼ç?°å¢?"
 
-#: ../src/main.c:216
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9462,9 +9130,9 @@ msgstr "ä¸?è¦?å?¨å??å??æ??è¼?å?¥æ??å¾?ä¸?次ä½?業é??段"
 msgid "Dock switcher style:"
 msgstr "å??é§?å??æ??å?¨æ¨£å¼?:"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
-msgstr "Gnome å·¥å?·å??設å®?å?¼"
+#: ../src/preferences.ui.h:10
+msgid "GNOME toolbar setting"
+msgstr "GNOME å·¥å?·å??設å®?å?¼"
 
 #: ../src/preferences.ui.h:12
 msgid "Icons"
@@ -9479,7 +9147,7 @@ msgid "Project Defaults"
 msgstr "���設�"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "é?¸æ??å°?æ¡?ç?®é??"
 
 #: ../src/preferences.ui.h:16
@@ -9511,6 +9179,10 @@ msgstr "å?ªæ??æ??å­?"
 msgid "Toolbar button labels:"
 msgstr "å·¥å?·å??æ??é??æ¨?籤:"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+msgid "Do not display warning if not using a Debug configuration"
+msgstr "å¦?æ??ä¸?使ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?顯示警å??"
+
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?¨å?½æ?¸å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ '('"
@@ -9520,7 +9192,7 @@ msgid "Add a space after function call autocompletion"
 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
@@ -9540,98 +9212,88 @@ msgid "Calltips"
 msgstr "å?¼å?«æ??示"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
-msgid "Enable adaptive indentation"
-msgstr "å??ç?¨å??é?©ç¸®æ??"
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable code completion"
 msgstr "å??ç?¨ç¨?å¼?碼è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart brace completion"
 msgstr "å??ç?¨æ?ºæ?§å??æ?¬å¼§è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart indentation"
 msgstr "å??ç?¨æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Indent:"
 msgstr "縮æ??ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Indentation parameters"
 msgstr "縮æ??å??æ?¸"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#, fuzzy
 msgid "Line up parentheses"
-msgstr ""
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
-msgid "Parenthese indentation"
-msgstr ""
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
-msgid "Pressing tab indents"
-msgstr "æ??å£? tab 縮æ??"
+msgstr "å??ä¸?移å??æ??å®?ç??æ?¸å­?æ?¹å¡?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 #, fuzzy
+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 "顯示ç??æ??(_S)"
+msgstr "顯示å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??縮æ??大å°?(空ç?½å­?符)ï¼?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
-msgid "_AutoComplete"
-msgstr "è?ªå??è£?å®?(_A)"
-
-#: ../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"
+#: ../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:1071
+msgid "C/C++"
+msgstr "C/C++"
+
 #: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView 編輯�"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "GNU Debugger å¤?æ??ç¨?å¼?"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb plugin."
-msgstr "Gdb å¤?æ??ç¨?å¼?ã??"
+msgid "Gdb"
+msgstr "Gdb"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -9726,24 +9388,24 @@ msgid "CVS Plugin"
 msgstr "CVS å¤?æ??ç¨?å¼?"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
-msgstr "å?¯å?¥å·²å­?å?¨ç?? Autotools å°?æ¡?è?³ Anjuta"
+msgid "Import an existing autotools project to Anjuta"
+msgstr "å?¯å?¥å·²å­?å?¨ç?? autotools å°?æ¡?è?³ Anjuta"
 
 #: ../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."
@@ -9754,8 +9416,8 @@ 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."
-msgstr "C++ å?? Java æ?¯æ?´å¤?æ??ç¨?å¼?ï¼?æ??ä¾?ç¨?å¼?碼è?ªå??è£?å®?ã??è?ªå??縮æ??ç­?å??è?½ã??"
+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
 msgid "Project Assistant"
@@ -9777,10 +9439,6 @@ msgstr "Anjuta é¡?å?¥ç?¢ç??å?¨å¤?æ??ç¨?å¼?"
 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 "å°?æ¡?管ç??å?¡"
@@ -9790,10 +9448,8 @@ msgid "Project Manager Plugin for Anjuta."
 msgstr "Anjuta ç??å°?æ¡?管ç??å?¡å¤?æ??ç¨?å¼?"
 
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:2
-#, fuzzy
-#| msgid "Symbol Database Plugin for Anjuta (unstable)."
 msgid "Symbol Database Plugin for Anjuta."
-msgstr "Anjuta ç??符è??è³?æ??庫å¤?æ??ç¨?å¼?(ä¸?ç©©å®?ç??)ã??"
+msgstr "Anjuta ç??符è??è³?æ??庫å¤?æ??ç¨?å¼?"
 
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
@@ -9813,7 +9469,7 @@ msgstr "é?¤é?¯ç®¡ç??å?¡å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/run-program/anjuta-run-program.plugin.in.h:1
 msgid "Allow to execute program without debugger."
-msgstr "å??許ä¸?使ç?¨å?µé?¯ç¨?å¼?è??å?·è¡?ç¨?å¼?ã??"
+msgstr "å??許ä¸?使ç?¨é?¤é?¯ç¨?å¼?è??å?·è¡?ç¨?å¼?ã??"
 
 #: ../plugins/run-program/anjuta-run-program.plugin.in.h:2
 msgid "Run Program"
@@ -9843,8 +9499,152 @@ msgstr "Autotools �端��"
 msgid "Autotools backend for project manager"
 msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Autotools å¾?端ç¨?å¼?"
 
-#~ msgid "Unable to build user interface for tool variable"
-#~ msgstr "ç?¡æ³?ç?ºå·¥å?·è®?æ?¸å»ºç«?使ç?¨è??ä»?é?¢"
+#: ../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 "�誤��������"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:1
+msgid "Anjuta JS Debugger Plugin"
+msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:2
+msgid "Javascript Debugger Plugin"
+msgstr "Javascript Debugger å¤?æ??ç¨?å¼?"
+
+#: ../plugins/language-support-js/plugin.c:332
+#: ../plugins/language-support-js/plugin.c:341
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: ../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 "JavaScript æ?¯æ?´å¤?æ??ç¨?å¼?"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
+msgid "<b>JS Find dirs</b>"
+msgstr "<b>JS Find ç?®é??</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 "æ¨?示æ¼?æ??ç??å??è??"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
+msgid "Min character for completion "
+msgstr "è?ªå??è£?é½?ç??æ??å°?å­?符"
+
+#~ msgid "Up to date"
+#~ msgstr "æ??æ?°ç??"
+
+#, fuzzy
+#~ 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 "設���(_O)..."
+
+#~ msgid "private"
+#~ msgstr "private"
+
+#~ msgid "protected"
+#~ msgstr "protected"
+
+#~ 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 "é?²ç¨?ç·¨è??"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "é©?証å??測試 (_P)..."
+
+#~ msgid "Add Watch..."
+#~ msgstr "æ?°å¢?ç?£ç??..."
+
+#~ msgid "_Print..."
+#~ msgstr "å??å?°(_P)..."
+
+#~ msgid "recent menu label|_%d. %s"
+#~ msgstr "_%d. %s"
+
+#~ msgid "recent menu label|%d. %s"
+#~ msgstr "%d. %s"
+
+#~ msgid "_Open..."
+#~ msgstr "é??å??(_O)..."
+
+#~ msgid "Url:"
+#~ msgstr "網å??:"
+
+#~ msgid "Advanced..."
+#~ msgstr "é?²é??..."
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Command Line Parameters"
+#~ msgstr "æ??令å??æ?¸"
+
+#~ msgid "Enter a Hexa adress or select one in the data"
+#~ msgstr "輸å?¥ Hexa ä½?å??æ??å?¨è³?æ??中é?¸æ??ä¸?å??"
+
+#~ msgid "Execute Program"
+#~ msgstr "����"
 
-#~ msgid "Unable to build user interface for tool editor"
-#~ msgstr "ç?¡æ³?ç?ºå·¥å?·ç·¨è¼¯å?¨å»ºç«?使ç?¨è??ä»?é?¢"
+#~ msgid "_Pass:"
+#~ msgstr "é??é??(_P):"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8bc2624..0cbfad1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,11 +7,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta 2.27.5\n"
+"Project-Id-Version: anjuta 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 22:14+0800\n"
-"PO-Revision-Date: 2008-03-13 01:00+0800\n"
-"Last-Translator: Hialan Liu <hialan liu gmail com>\n"
+"POT-Creation-Date: 2010-02-17 19:26+0800\n"
+"PO-Revision-Date: 2010-02-17 17:05+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,9 +68,9 @@ 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 "anjuta ç?¡æ³?è?ªå??å?¤æ?·æ?¨æ?³è¦?é??å??æª?æ¡?ç??編碼ç?ºä½?ã??"
+msgstr "Anjuta ç?¡æ³?è?ªå??å?¤æ?·æ?¨æ?³è¦?é??å??æª?æ¡?ç??編碼ç?ºä½?ã??"
 
 #: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
 #: ../libanjuta/anjuta-encodings.c:184 ../libanjuta/anjuta-encodings.c:186
@@ -184,36 +184,39 @@ 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:191
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3267
 #: ../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:802
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1150 ../libanjuta/resources.c:267
+#: ../libanjuta/anjuta-launcher.c:1154 ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1151
+#: ../libanjuta/anjuta-launcher.c:1155
 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 "Anjuta Shell"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "å?«æ??æ­¤å¤?æ??ç¨?å¼?ç?? Anjuta shell"
 
 #: ../libanjuta/anjuta-plugin-manager.c:733
 #, c-format
-msgid "Plugin '%s' do not want to be deactivated"
+msgid "Plugin '%s' does not want to be deactivated"
 msgstr "å¤?æ??ç¨?å¼?ã??%sã??ä¸?æ?³è¦?被å??止使ç?¨"
 
 #: ../libanjuta/anjuta-plugin-manager.c:764
@@ -234,7 +237,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,64 +264,65 @@ 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 "è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
-msgid "No plugin able to load other plugins in %s"
+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
-msgid "Anjuta shell for which the plugins are"
+#: ../libanjuta/anjuta-plugin-manager.c:2313
+#, fuzzy
+msgid "Anjuta shell for which the plugins are made"
 msgstr "Anjuta shell å¤?æ??ç¨?å¼?ç?º"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2319
+#: ../libanjuta/anjuta-plugin-manager.c:2321
 msgid "Anjuta Status"
 msgstr "Anjuta ç??æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2320
+#: ../libanjuta/anjuta-plugin-manager.c:2322
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "Anjuta ç??æ??ï¼?ç?¨æ?¼å¤?æ??ç¨?å¼?ç??è¼?å?¥è??å?¸è¼?"
 
 #. 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,8 +355,8 @@ msgid "Synchronization file"
 msgstr "å??æ­¥æª?æ¡?"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
-msgstr "ç?¨ä¾?å??步設å®?çµ?å?? xml ç??æª?æ¡?"
+msgid "File to syncronize the profile XML"
+msgstr "ç?¨ä¾?å??步設å®?çµ?å?? XML ç??æª?æ¡?"
 
 #: ../libanjuta/anjuta-profile.c:508
 msgid "Please select a plugin from the list"
@@ -361,9 +365,9 @@ 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 解æ??é?¯èª¤ã??ç?¡æ??æ??æ??å£?ç?? anjuta å¤?æ??ç¨?å¼?設å®?çµ?å??ã??"
+msgstr "è®?å??ã??%sã??失æ??ï¼?XML 解æ??é?¯èª¤ã??ç?¡æ??æ??æ??å£?ç?? Anjuta å¤?æ??ç¨?å¼?設å®?çµ?å??ã??"
 
 #. <Pluginname>: Install it from <some location on the web>
 #: ../libanjuta/anjuta-profile.c:699
@@ -390,7 +394,7 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:415
+#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "é??ç½®(_R)"
 
@@ -402,8 +406,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 +415,24 @@ msgstr "��"
 msgid "Anjuta Preferences"
 msgstr "Anjuta å??好設å®?"
 
-#: ../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 "æ??æ£?æ?´æ?¹(_D)"
 
@@ -462,11 +466,34 @@ msgid "Shortcut"
 msgstr "å¿«æ?·é?µ"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:355
+#: ../libanjuta/anjuta-utils.c:359
 msgid "System:"
 msgstr "系統�"
 
-#: ../libanjuta/anjuta-utils.c:493
+#: ../libanjuta/anjuta-utils.c:505
+msgid ""
+"You do not seem to have PackageKit installed. PackageKit is required for "
+"installing missing packages. Please install \"packagekit-gnome\" package "
+"from your distribution, or install the missing packages manually."
+msgstr ""
+"æ?¨ä¼¼ä¹?æ²?æ??å®?è£? PackageKitã??å¿?é ?æ?? PackageKit æ??è?½å®?è£?缺å°?ç??å¥?件ã??è«?å¾?æ?¨ç??ç?¼è¡?"
+"ç??æ?¬å®?è£?ã??packagekit-gnomeã??å¥?件ï¼?æ??æ??å??å®?è£?缺å°?ç??å¥?件ã??"
+
+#: ../libanjuta/anjuta-utils.c:515
+#, c-format
+msgid "Installation failed: %s"
+msgstr "å®?è£?ä½?æ?¯å¤±æ??ï¼?%s"
+
+#: ../libanjuta/anjuta-utils.c:575
+#, c-format
+msgid ""
+"The \"%s\" package is not installed.\n"
+"Please install it."
+msgstr ""
+"æ?¨å°?æ?ªå®?è£?ã??%sã??å¥?件ã??\n"
+"è«?å®?è£?å®?ã??"
+
+#: ../libanjuta/anjuta-utils.c:593
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -476,69 +503,71 @@ msgstr ""
 "è«?å®?è£?å®?ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:986
-msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr "æ?¾ä¸?å?°çµ?端æ©?ï¼?使ç?¨ xtermï¼?ä¸?管å®?è?½ä¸?è?½é??ä½?"
+#: ../libanjuta/anjuta-utils.c:1086
+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:1122 ../libanjuta/anjuta-utils.c:1126
+#: ../libanjuta/anjuta-utils.c:1154 ../libanjuta/anjuta-utils.c:1158
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?%sï¼?使ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1692
+#: ../libanjuta/anjuta-utils.c:1790
 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 ""
-"ç?¡æ³?顯示æ±?å?©ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??ä»?å?¯ä»¥å¾? http://anjuta.org ä¸?è¼?"
+"ç?¡æ³?顯示æ±?å?©æ??件ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??æ?¨å?¯ä»¥å¾? http://anjuta.org ä¸?"
+"è¼?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:2131
+#: ../libanjuta/anjuta-utils.c:2229
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:65
+#: ../plugins/file-manager/file-view.c:75
 msgid "Modified"
 msgstr "已修�"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:69
+#: ../plugins/file-manager/file-view.c:79
 msgid "Added"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:67
+#: ../plugins/file-manager/file-view.c:77
 msgid "Deleted"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:71
+#: ../plugins/file-manager/file-view.c:81
 msgid "Conflicted"
 msgstr "æ??è¡?çª?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
-msgstr "æ??æ?°ç??"
+#: ../plugins/file-manager/file-view.c:83
+msgid "Up-to-date"
+msgstr "æ??æ?°ç??"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:85
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:87
 msgid "Missing"
 msgstr "�失"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:89
 msgid "Unversioned"
 msgstr "æ?ªè¨?ç??æ?¬"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:91
 msgid "Ignored"
 msgstr "已忽�"
 
@@ -558,8 +587,8 @@ msgstr "Pixbuf �件"
 msgid "The pixbuf to render."
 msgstr "æº?å??æ??繪ç?? pixbufã??"
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3031
-#: ../plugins/glade/plugin.c:3066
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3029
+#: ../plugins/glade/plugin.c:3064
 #, c-format
 msgid "Widget not found: %s"
 msgstr "ç?¡æ³?æ?¾å?°å??件ï¼?%s"
@@ -570,95 +599,93 @@ msgid "Could not find application pixmap file: %s"
 msgstr "ç?¡æ³?æ?¾å?°ç¨?å¼?å??示æª?ï¼?%s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-#, fuzzy
-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
-#, fuzzy
-msgid "Build Directory:"
-msgstr "建置��(_B)"
-
-#: ../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
 #, fuzzy
 msgid "Continue on errors"
-msgstr "ä¸?æ??ç??é?¯èª¤ã??"
+msgstr "å?³æ?? ECC é?¯èª¤ç??次æ?¸"
 
-#: ../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 "以 root ���"
 
-#: ../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
-#, fuzzy
 msgid "Select a build directory"
-msgstr "é?¸æ??ç?®é??"
+msgstr "é?¸æ??ä¸?å??çµ?建ç?®é??"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:17
 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 "��"
+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 "æ??ä½³å??"
 
@@ -666,39 +693,42 @@ msgstr "æ??ä½³å??"
 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/build-basic-autotools/executer.c:157
+#: ../plugins/gbf-am/gbf-am-project.c:196
+#: ../plugins/gbf-am/gbf-am-project.c:3362
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:194
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3261
 msgid "Program"
 msgstr "��"
 
-#: ../plugins/build-basic-autotools/executer.c:255
+#: ../plugins/build-basic-autotools/executer.c:258
 msgid "No file or project currently opened."
 msgstr "ç?®å??æ²?æ??é??å??ä»»ä½?æª?æ¡?æ??å°?æ¡?ã??"
 
 #. Only local program are supported
-#: ../plugins/build-basic-autotools/executer.c:295
+#: ../plugins/build-basic-autotools/executer.c:298
 #: ../plugins/run-program/execute.c:70
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "�� '%s' ������"
 
-#: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/build-basic-autotools/executer.c:313
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
-msgstr "�� '%s' ���"
+msgid "Program '%s' does not exist"
+msgstr "ç¨?å¼?ã??%sã??ä¸?å­?å?¨"
 
-#: ../plugins/build-basic-autotools/executer.c:318
+#: ../plugins/build-basic-autotools/executer.c:321
 #: ../plugins/run-program/execute.c:80
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "ç¨?å¼? '%s' ä¸?å?·æ??å?·è¡?æ¬?é??"
 
-#: ../plugins/build-basic-autotools/executer.c:350
+#: ../plugins/build-basic-autotools/executer.c:353
 msgid "No executable for this file."
 msgstr "é??ä¸?æ?¯ä¸?å??å?¯å?·è¡?ç??æª?æ¡?ã??"
 
-#: ../plugins/build-basic-autotools/executer.c:356
+#: ../plugins/build-basic-autotools/executer.c:359
 #, c-format
 msgid "Executable '%s' is not up-to-date."
 msgstr "å?¯å?·è¡?æª? '%s' 並ä¸?æ?¯æ??æ?°ç??ã??"
@@ -729,272 +759,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 ""
-"Using this new configuration, need to to remove the default one. Do you want "
-"to do it ?"
-msgstr ""
+"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:1800
+#: ../plugins/build-basic-autotools/plugin.c:1820
 #, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
-msgstr "ç?¡æ³?編譯 \"%s\"ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
+msgstr "ç?¡æ³?編譯ã??%sã??ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1926
+#: ../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:2392
-#: ../plugins/build-basic-autotools/plugin.c:2466
-#: ../plugins/build-basic-autotools/plugin.c:2476
-#: ../plugins/build-basic-autotools/plugin.c:2494
-#: ../plugins/build-basic-autotools/plugin.c:2504
-#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2432
+#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../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 "建置(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2396
+#: ../plugins/build-basic-autotools/plugin.c:2436
 msgid "_Build Project"
 msgstr "建置��(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2397
+#: ../plugins/build-basic-autotools/plugin.c:2437
 msgid "Build whole project"
 msgstr "建置æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2402
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Install Project"
 msgstr "����(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2403
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2408
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2409
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2414
-msgid "C_onfigure Project..."
+#: ../plugins/build-basic-autotools/plugin.c:2454
+msgid "C_onfigure Projectâ?¦"
 msgstr "設���(_O)..."
 
-#: ../plugins/build-basic-autotools/plugin.c:2415
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Configure project"
 msgstr "設���"
 
-#: ../plugins/build-basic-autotools/plugin.c:2420
+#: ../plugins/build-basic-autotools/plugin.c:2460
 msgid "Build _Tarball"
 msgstr "建置 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2421
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Build project tarball distribution"
 msgstr "建置�� tarball ���件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2426
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "_Build Module"
 msgstr "建置模�(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2427
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build module associated with current file"
 msgstr "建置è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2432
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Install Module"
 msgstr "��模�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2433
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2438
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Clean Module"
 msgstr "��模�(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2439
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2444
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "Co_mpile File"
 msgstr "編譯��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2445
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Compile current editor file"
 msgstr "編譯ç?®å??編輯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2450
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2451
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2456
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Remove Configuration"
 msgstr "移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2457
+#: ../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:2470
-#: ../plugins/build-basic-autotools/plugin.c:2498
+#: ../plugins/build-basic-autotools/plugin.c:2510
+#: ../plugins/build-basic-autotools/plugin.c:2538
 msgid "_Compile"
 msgstr "編譯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2471
-#: ../plugins/build-basic-autotools/plugin.c:2499
+#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2539
 msgid "Compile file"
 msgstr "編譯��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2477
-#: ../plugins/build-basic-autotools/plugin.c:2505
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Build module"
 msgstr "建置模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
-#: ../plugins/build-basic-autotools/plugin.c:2510
-#: ../plugins/build-basic-autotools/plugin.c:2568
+#: ../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 "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2483
-#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Install module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
-#: ../plugins/build-basic-autotools/plugin.c:2516
-#: ../plugins/build-basic-autotools/plugin.c:2575
+#: ../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 "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2489
-#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Clean module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2562
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??令(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Cancel build command"
 msgstr "å??æ¶?建置æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2601
 #, c-format
 msgid "_Build (%s)"
 msgstr "建置(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2568
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2575
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "編譯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile"
 msgstr "編譯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3119
+#: ../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:3128
+#: ../plugins/build-basic-autotools/plugin.c:3168
 msgid "Build popup commands"
 msgstr "建置å½?å?ºå¼?æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:3510
-#: ../plugins/build-basic-autotools/plugin.c:3518
+#: ../plugins/build-basic-autotools/plugin.c:3550
+#: ../plugins/build-basic-autotools/plugin.c:3558
 msgid "Build Autotools"
 msgstr "建置 Autotools"
 
@@ -1003,49 +1033,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 +1098,61 @@ 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
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è¨±å?¯è­? (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 "�� 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 ""
 
-#: ../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
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU 寬é??ç?¨å?¬å?±è¨±å?¯è­? (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:4436
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/glade/plugin.c:4433
 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 ""
-
 #: ../plugins/class-gen/generator.c:132
 #, c-format
 msgid "Header or source file has not been created"
@@ -1154,46 +1175,88 @@ 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:1127
 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 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??æ?¨å?¯ä»¥å¾? http://autogen.";
-"sourceforge.net å??å¾?"
+"æ?¾ä¸?å?° autogen 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??æ?¨å?¯ä»¥å¾? http://autogen.";
+"sourceforge.net å??å¾?ã??"
 
-#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
+#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
 #, 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:1914
+#: ../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:754
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+msgid "ParamSpec"
+msgstr "å??æ?¸ï¼?"
+
+#. 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 ""
+
+#: ../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 ""
@@ -1201,170 +1264,194 @@ msgstr ""
 "æ??ä¸?確å®?æ??å?ªé?¤ç£?ç¢?è?? CVS ä¸?ç??æª?æ¡?ã??ç?¶ç?¶å?¨æ?¨ä½¿ç?¨ CVS Commit å??é??ä¸?æ??移é?¤ CVS "
 "ä¸?ç??æª?æ¡?ã??<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..."
+#: ../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ï¼?æ??交æª?æ¡?/ç?®é??"
 
-#: ../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: å·®ç?°æª?æ¡?/ç?®é??"
 
-#: ../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 "é?¸å??æ??交ç??æª?æ¡?æ??ç?®é??ï¼?"
 
-#: ../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 ""
 
-#: ../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/symbol-db/plugin.c:2332 ../plugins/symbol-db/plugin.c:2396
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2320
+#: ../plugins/symbol-db/plugin.c:2390
 msgid "Local"
 msgstr "å??å??"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:62
+#: ../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:3085
+#: ../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 "Patchå¼? 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:89
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ä¿®è¨?ç??ï¼?"
 
@@ -1377,7 +1464,7 @@ msgid "Unified format instead of context format"
 msgstr "以統ä¸?æ ¼å¼?代æ?¿é??è?¯æ ¼å¼?"
 
 #: ../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 "使ç?¨ä¿®è¨?ç??/æ¨?籤ï¼?"
 
@@ -1386,7 +1473,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 "使ç?¨è??å??稱ï¼?"
 
@@ -1396,7 +1483,7 @@ msgstr "å» å??æ¨?籤ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
 #: ../plugins/git/anjuta-git.ui.h:123
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "æ?´å??å°?æ¡?"
 
@@ -1430,7 +1517,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 "模�"
 
@@ -1447,18 +1534,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
@@ -1512,14 +1599,13 @@ msgstr "æ??交æ?¨ç??ä¿®æ?¹è?³ CVS 樹"
 #. Stock icon, if any
 #: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
-#: ../plugins/gdb/anjuta-gdb.glade.h:38
 msgid "_Update"
 msgstr "_Update"
 
 #. 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"
+msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?æ?¨æ?¬æ©?ç??è¤?æ?¬è?? CVS 樹å??æ­¥"
 
 #. Action name
@@ -1579,152 +1665,133 @@ 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 ""
 
-#: ../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/gdb/anjuta-gdb.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "è¦?è??ç??ç??é??å? æª?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
-#: ../plugins/gdb/anjuta-gdb.glade.h:3
+#: ../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/breakpoints.c:1980
-#: ../plugins/gdb/anjuta-gdb.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/breakpoints.c:1987
 msgid "Breakpoints"
 msgstr "中��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
-#: ../plugins/gdb/anjuta-gdb.glade.h:5
+#: ../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/gdb/anjuta-gdb.glade.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
-msgstr "å?µé?¯å·¥å?·æ??令"
+msgstr "é?¤é?¯å·¥å?·æ??令"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
-#: ../plugins/gdb/anjuta-gdb.glade.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
-msgstr "å?µé?¯å·¥å?·æ??令ï¼?"
+msgstr "é?¤é?¯å·¥å?·æ??令ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
-#: ../plugins/gdb/anjuta-gdb.glade.h:9
-#: ../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
 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/gdb/anjuta-gdb.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "顯示��樹(_T)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
-#, fuzzy
-#| msgid "_Do not show again"
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Do not show again"
-msgstr "ä¸?å??顯示(_D)"
+msgstr "ä¸?å??顯示"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
-#: ../plugins/gdb/anjuta-gdb.glade.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "å?¨é?¨å??ç?¨(_A)"
 
-#: ../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/gdb/anjuta-gdb.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "é?±è??è¡?ç¨?å??æ?¸(_M)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
-#: ../plugins/gdb/anjuta-gdb.glade.h:15
+#: ../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 ../plugins/gdb/anjuta-gdb.glade.h:16
+#: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "å?§æ ¸è¨?è??"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/gdb/anjuta-gdb.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/breakpoints.c:1914
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
-#: ../plugins/debug-manager/memory.c:180 ../plugins/gdb/anjuta-gdb.glade.h:18
+#: ../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/gdb/anjuta-gdb.glade.h:19
+#: ../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/gdb/anjuta-gdb.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "å??å?°ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
-#: ../plugins/gdb/anjuta-gdb.glade.h:21
+#: ../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
-#: ../plugins/gdb/anjuta-gdb.glade.h:23
 msgid "SIGINT"
 msgstr "SIGINT"
 
@@ -1737,32 +1804,27 @@ msgid "Serial Line Connection"
 msgstr "åº?å??å? é?£ç·?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:35
-#: ../plugins/gdb/anjuta-gdb.glade.h:24
 msgid "Set Signal Property"
 msgstr "編輯è¨?è??å?§å®¹"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
 #: ../plugins/debug-manager/sharedlib.c:214
-#: ../plugins/gdb/anjuta-gdb.glade.h:25
 msgid "Shared libraries"
 msgstr "�享��庫"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:37
-#: ../plugins/gdb/anjuta-gdb.glade.h:26
 msgid "Signal:"
 msgstr "è¨?è??ï¼?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:38
-#: ../plugins/gdb/anjuta-gdb.glade.h:27
 msgid "Source Directories"
 msgstr "æº?代碼ç?®é??"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
 msgid "Start Debugger"
-msgstr "å??å??å?µé?¯å?¨"
+msgstr "å??å??é?¤é?¯å?¨"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:40
-#: ../plugins/gdb/anjuta-gdb.glade.h:28
 msgid "Stop:"
 msgstr "å??æ­¢ï¼?"
 
@@ -1771,13 +1833,11 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/gdb/anjuta-gdb.glade.h:29
-#: ../plugins/project-wizard/property.c:286
+#: ../plugins/project-wizard/property.c:309
 msgid "Yes"
 msgstr "æ?¯"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:43
-#: ../plugins/gdb/anjuta-gdb.glade.h:30
 msgid "_Attach"
 msgstr "é??å? (_A)"
 
@@ -1786,22 +1846,18 @@ msgid "_Automatic update"
 msgstr "è?ªå??æ?´æ?°(_A)"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:45
-#: ../plugins/gdb/anjuta-gdb.glade.h:31
 msgid "_Condition:"
 msgstr "�件(_C)�"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:46
-#: ../plugins/gdb/anjuta-gdb.glade.h:32
 msgid "_Disable all"
 msgstr "å?¨é?¨å??ç?¨(_D)ï¼?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:47
-#: ../plugins/gdb/anjuta-gdb.glade.h:33
 msgid "_Hide paths"
 msgstr "é?±è??è·¯å¾?(_H)"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:48
-#: ../plugins/gdb/anjuta-gdb.glade.h:34
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
@@ -1815,12 +1871,10 @@ msgid "_Pass count:"
 msgstr "é??é??次æ?¸(_P):"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:52
-#: ../plugins/gdb/anjuta-gdb.glade.h:36
 msgid "_Process to attach to:"
 msgstr "è¦?é??å? ç??ç¨?åº?(_P):"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:53
-#: ../plugins/gdb/anjuta-gdb.glade.h:37
 msgid "_Remove all"
 msgstr "��移�(_R)"
 
@@ -1828,180 +1882,174 @@ msgstr "��移�(_R)"
 msgid "_Value:"
 msgstr "��(_V):"
 
-#: ../plugins/debug-manager/breakpoints.c:1673
+#: ../plugins/debug-manager/breakpoints.c:1680
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??中æ?·é»?ï¼?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1770
+#: ../plugins/debug-manager/breakpoints.c:1777
 msgid "_Breakpoints"
 msgstr "中��(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1778
+#: ../plugins/debug-manager/breakpoints.c:1785
 msgid "Toggle Breakpoint"
 msgstr "å??æ??中æ?·é»?ç??æ³?"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1780
+#: ../plugins/debug-manager/breakpoints.c:1787
 msgid "Toggle breakpoint at the current location"
 msgstr "å??æ??ç?®å??ä½?ç½®ç??中æ?·é»?ç??æ³?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1786
-msgid "Add Breakpoint..."
-msgstr "��中��..."
+#: ../plugins/debug-manager/breakpoints.c:1793
+msgid "Add Breakpointâ?¦"
+msgstr "��中��..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1788
+#: ../plugins/debug-manager/breakpoints.c:1795
 msgid "Add a breakpoint"
 msgstr "��中��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1794
+#: ../plugins/debug-manager/breakpoints.c:1801
 msgid "Remove Breakpoint"
 msgstr "移�中��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1796
+#: ../plugins/debug-manager/breakpoints.c:1803
 msgid "Remove a breakpoint"
 msgstr "移�中��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1802
+#: ../plugins/debug-manager/breakpoints.c:1809
 msgid "Edit Breakpoint"
 msgstr "編輯中��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1804
+#: ../plugins/debug-manager/breakpoints.c:1811
 msgid "Edit breakpoint properties"
 msgstr "編輯中��屬�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1810
-#: ../plugins/debug-manager/breakpoints.c:1881
+#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1888
 msgid "Enable Breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1812
-#: ../plugins/debug-manager/breakpoints.c:1882
+#: ../plugins/debug-manager/breakpoints.c:1819
+#: ../plugins/debug-manager/breakpoints.c:1889
 msgid "Enable a breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1818
+#: ../plugins/debug-manager/breakpoints.c:1825
 msgid "Disable All Breakpoints"
 msgstr "å??ç?¨å?¨é?¨ä¸­æ?·é»?"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1820
+#: ../plugins/debug-manager/breakpoints.c:1827
 msgid "Deactivate all breakpoints"
 msgstr "å°?å?¨é?¨ä¸­æ?·é»?設ç?ºå??止使ç?¨"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1826
+#: ../plugins/debug-manager/breakpoints.c:1833
 msgid "R_emove All Breakpoints"
 msgstr "����中��(_E)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1828
+#: ../plugins/debug-manager/breakpoints.c:1835
 msgid "Remove all breakpoints"
 msgstr "����中��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1837
+#: ../plugins/debug-manager/breakpoints.c:1844
 msgid "Jump to Breakpoint"
 msgstr "跳�中��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1839
+#: ../plugins/debug-manager/breakpoints.c:1846
 msgid "Jump to breakpoint location"
 msgstr "跳�中���置"
 
-#: ../plugins/debug-manager/breakpoints.c:1876
+#: ../plugins/debug-manager/breakpoints.c:1883
 msgid "Disable Breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1884
 msgid "Disable a breakpoint"
 msgstr "å??ç?¨ä¸­æ?·é»?"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/debug-manager/breakpoints.c:1914
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/breakpoints.c:1914
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 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
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Condition"
 msgstr "ç??æ³?"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "Pass count"
 msgstr "é??é??次æ?¸"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1915
 msgid "State"
 msgstr "ç??æ??"
 
-#: ../plugins/debug-manager/breakpoints.c:1957
-#: ../plugins/debug-manager/breakpoints.c:1963
+#: ../plugins/debug-manager/breakpoints.c:1964
+#: ../plugins/debug-manager/breakpoints.c:1970
 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 "移è?³ä½?å??(_G)"
 
 #: ../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:763 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "���"
 
 #: ../plugins/debug-manager/disassemble.c:851
-#, fuzzy
 msgid "Disassembly"
-msgstr "å·²å??ç?¨"
+msgstr "å??çµ?è­¯"
 
 #: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
-#: ../plugins/project-wizard/druid.c:135
+#: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "��"
 
@@ -2016,14 +2064,14 @@ msgstr "å?°å??è®?æ?¸"
 
 #: ../plugins/debug-manager/plugin.c:315
 msgid "Debugger Log"
-msgstr "å?µé?¯å·¥å?·ç´?é??"
+msgstr "é?¤é?¯å·¥å?·ç´?é??"
 
 #: ../plugins/debug-manager/plugin.c:389 ../plugins/debug-manager/plugin.c:409
 #: ../plugins/debug-manager/plugin.c:429 ../plugins/debug-manager/plugin.c:451
 #: ../plugins/debug-manager/plugin.c:485 ../plugins/debug-manager/plugin.c:520
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
-msgstr "��工�"
+msgstr "��工�"
 
 #: ../plugins/debug-manager/plugin.c:389
 msgid "Started"
@@ -2034,8 +2082,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,7 +2096,7 @@ msgstr "���"
 #: ../plugins/debug-manager/plugin.c:529
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
-msgstr "å?µé?¯ç¨?å¼?å?  %d é?¯èª¤è??中止ï¼?%s\n"
+msgstr "é?¤é?¯ç¨?å¼?å?  %d é?¯èª¤è??中止ï¼?%s\n"
 
 #: ../plugins/debug-manager/plugin.c:542
 #, c-format
@@ -2059,31 +2107,31 @@ msgstr "ç¨?å¼?æ?¥æ?¶å?°ä¿¡è??ï¼?%s\n"
 #. Stock icon, if any
 #: ../plugins/debug-manager/plugin.c:829
 msgid "_Debug"
-msgstr "��(_D)"
+msgstr "��(_D)"
 
 #: ../plugins/debug-manager/plugin.c:837
 msgid "_Start Debugger"
-msgstr "å??å??å?µé?¯å?¨(_S)"
+msgstr "å??å??é?¤é?¯å?¨(_S)"
 
 #: ../plugins/debug-manager/plugin.c:845
 msgid "_Debug Program"
-msgstr "�����(_D)"
+msgstr "�����(_D)"
 
 #: ../plugins/debug-manager/plugin.c:847
 msgid "Start debugger and load the program"
-msgstr "å??å??å?µé?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
+msgstr "å??å??é?¤é?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
 
 #: ../plugins/debug-manager/plugin.c:853
-msgid "_Debug Process..."
-msgstr "�����(_D)..."
+msgid "_Debug Processâ?¦"
+msgstr "����(_D)..."
 
 #: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
-msgstr "å??å??å?µé?¯å?¨ä¸¦å°?æ­£å?¨å?·è¡?中ç??ç¨?å¼?é?²è¡?å?µé?¯"
+msgstr "å??å??é?¤é?¯å?¨ä¸¦å°?æ­£å?¨å?·è¡?中ç??ç¨?å¼?é?²è¡?é?¤é?¯"
 
 #: ../plugins/debug-manager/plugin.c:861
-msgid "Debug _Remote Target..."
-msgstr "��端����..."
+msgid "Debug _Remote Targetâ?¦"
+msgstr "��端����(_R)�"
 
 #: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
@@ -2091,15 +2139,15 @@ msgstr "é?£æ?¥å?°é? ç«¯è¦?é?¤é?¯ç??ç?®æ¨?"
 
 #: ../plugins/debug-manager/plugin.c:869
 msgid "Stop Debugger"
-msgstr "å??æ­¢å?µé?¯å·¥å?·"
+msgstr "å??æ­¢é?¤é?¯å·¥å?·"
 
 #: ../plugins/debug-manager/plugin.c:871
 msgid "Say goodbye to the debugger"
-msgstr "è·?å?µé?¯å·¥å?·èªªè?²å??è¦?"
+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"
@@ -2108,14 +2156,14 @@ 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
 #: ../plugins/debug-manager/plugin.c:891 ../plugins/debug-manager/plugin.c:999
 msgid "Custom debugger command"
-msgstr "è?ªè¨?å?µé?¯å?¨æ??令"
+msgstr "è?ªè¨?é?¤é?¯å?¨æ??令"
 
 #: ../plugins/debug-manager/plugin.c:897
 #: ../plugins/debug-manager/plugin.c:1005
@@ -2128,7 +2176,7 @@ msgstr "����(_T)"
 
 #: ../plugins/debug-manager/plugin.c:907
 msgid "Display information on the files the debugger is active with"
-msgstr "顯示ç?®å??æ­£å?¨è¢«å?µé?¯ç??ç¨?å¼?ç??å?·è¡?ç?°å¢?ç??è³?è¨?"
+msgstr "顯示ç?®å??æ­£å?¨è¢«é?¤é?¯ç??ç¨?å¼?ç??å?·è¡?ç?°å¢?ç??è³?è¨?"
 
 #: ../plugins/debug-manager/plugin.c:913
 msgid "Info _Program"
@@ -2153,7 +2201,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
@@ -2194,7 +2242,8 @@ msgid "Step _Out"
 msgstr "步�(_O)"
 
 #: ../plugins/debug-manager/plugin.c:983
-msgid "Single step out of the function"
+#, fuzzy
+msgid "Single step out of function"
 msgstr "å?·è¡?ç?®å??å?½å¼?å?§é¤?ä¸?ç¨?å¼?碼å¾?é??å??"
 
 #: ../plugins/debug-manager/plugin.c:989
@@ -2246,13 +2295,12 @@ msgstr "æ?«å??å?·è¡?ç¨?å¼?"
 #: ../plugins/debug-manager/plugin.c:1111
 #: ../plugins/debug-manager/plugin.c:1117
 msgid "Debugger operations"
-msgstr "å?µé?¯å·¥å?·æ??ä½?"
+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 "æ?¾ä¸?å?°ä»»ä½?å?µé?¯å·¥å?·å¤?æ??ç¨?å¼?å?¯ä»¥æ?¯æ?´ %s mime é¡?å??ç??ç?®æ¨?"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
+msgstr "æ?¾ä¸?å?°ä»»ä½?é?¤é?¯å·¥å?·å¤?æ??ç¨?å¼?å?¯ä»¥æ?¯æ?´ %s MIME é¡?å??ç??ç?®æ¨?"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2271,7 +2319,7 @@ msgstr "æ?´æ?°"
 msgid "Shared Object"
 msgstr "�享�件"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "èµ·å§?ä½?å??"
 
@@ -2283,7 +2331,7 @@ msgstr "çµ?æ??ä½?å??"
 msgid "Symbols read"
 msgstr "è®?å??符è??"
 
-#: ../plugins/debug-manager/sharedlib.c:338
+#: ../plugins/debug-manager/sharedlib.c:341
 msgid "Shared library operations"
 msgstr "å?±äº«ç¨?å¼?庫æ??ä½?"
 
@@ -2317,24 +2365,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 "æ?¯å?¦é¡¯ç¤ºè¡¨ç¤ºæ¯?è¡?é??å§?ç?? pixbuf æ¨?è¨?"
 
@@ -2368,7 +2416,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:943
 msgid "Line"
 msgstr "è¡?"
 
@@ -2377,10 +2425,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 "å ?ç??"
@@ -2389,53 +2433,53 @@ msgstr "å ?ç??"
 msgid "Stack frame operations"
 msgstr "å ?ç??ç·¨è??æ??ä½?"
 
-#: ../plugins/debug-manager/start.c:98
-msgid "Pid"
-msgstr "é?²ç¨?ç·¨è??"
+#: ../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:630
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "ç?¡æ³?å?·è¡?ï¼?%sã??"
 
-#: ../plugins/debug-manager/start.c:641
+#: ../plugins/debug-manager/start.c:644
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼?%s\n"
 
-#: ../plugins/debug-manager/start.c:965
+#: ../plugins/debug-manager/start.c:968
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
-msgstr "ç?¡æ³?å?¨é??å?? %sã??å?µé?¯å·¥å?·ä¸?è?½å??å??ã??"
+msgstr "ç?¡æ³?å?¨é??å?? %sã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:975
+#: ../plugins/debug-manager/start.c:978
 #, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
-msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? mime-é¡?å??ã??å?µé?¯å·¥å?·ä¸?è?½å??å??ã??"
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
+msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:1336
+#: ../plugins/debug-manager/start.c:1339
 msgid "Path"
 msgstr "路�"
 
-#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1388 ../plugins/gdb/debugger.c:1738
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
 msgstr ""
 "ç¨?å¼?ä»?å?¨å?·è¡?中ã??\n"
-"æ?¯å?¦ç¢ºå®?è¦?å??æ­¢å?µé?¯å·¥å?·ï¼?"
+"æ?¯å?¦ç¢ºå®?è¦?å??æ­¢é?¤é?¯å·¥å?·ï¼?"
 
 #. Action name
 #. Stock icon, if any
@@ -2444,8 +2488,8 @@ msgid "Set current thread"
 msgstr "設å®?ç?®å??å?·è¡?çº?"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "Id"
+msgid "ID"
+msgstr "ID"
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2458,8 +2502,8 @@ msgstr "å?·è¡?ç·?æ??ä½?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/watch.c:372
-msgid "Ins_pect/Evaluate..."
-msgstr "é©?証å??測試 (_P)..."
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "��/�估(_P)�"
 
 #. Display label
 #. short-cut
@@ -2468,8 +2512,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"
@@ -2509,10 +2553,10 @@ 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"
-msgstr "å??å¾?(_G)"
+#: ../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 "移�(_G)"
 
 #: ../plugins/devhelp/plugin.c:231
 msgid "_API Reference"
@@ -2546,12 +2590,12 @@ msgstr "æ±?å?©æ??ä½?"
 msgid "Contents"
 msgstr "�容"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1034
-#: ../plugins/search/search-replace.c:1710
+#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
 #: ../plugins/search/search-replace.c:1717
-#: ../plugins/search/search-replace.c:1729
-#: ../plugins/search/search-replace.c:2058 ../plugins/symbol-db/plugin.c:2334
-#: ../plugins/symbol-db/plugin.c:2446
+#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1736
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2324
+#: ../plugins/symbol-db/plugin.c:2440
 msgid "Search"
 msgstr "æ??å°?"
 
@@ -2568,7 +2612,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"
@@ -2577,44 +2621,53 @@ msgstr ""
 "æ?¯å?¦ç¢ºå®?è¦?é??æ?°è¼?å?¥ã?? %sã??ï¼?\n"
 "ä¹?å??å°?æ?ªå?²å­?ç??è®?æ?´å°?æ??æ¶?失ã??"
 
-#: ../plugins/document-manager/action-callbacks.c:285
+#: ../plugins/document-manager/action-callbacks.c:286
 msgid "_Reload"
 msgstr "é??æ?°è¼?å?¥(_R)"
 
-#: ../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"
@@ -2623,46 +2676,46 @@ msgstr ""
 "æª?æ¡?â??%sâ??å·²ç¶?å­?å?¨ã??\n"
 "æ?¨æ?¯å?¦è¦?以ç?¾å?¨æº?å??å?²å­?ç??æª?æ¡?è¦?寫å®?ï¼?"
 
-#: ../plugins/document-manager/anjuta-docman.c:674
+#: ../plugins/document-manager/anjuta-docman.c:673
 msgid "_Replace"
 msgstr "å??代(_R)"
 
-#: ../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 ""
+msgstr "å·¦"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h: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 "å?³"
 
@@ -2687,172 +2740,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 "����(_S)"
 
-#: ../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 "����(_A)..."
+#: ../plugins/document-manager/plugin.c:152
+msgid "Save _Asâ?¦"
+msgstr "���(_A)�"
 
-#: ../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 "����(_L)"
 
-#: ../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 "é??é??æª?æ¡?(_C)"
 
-#: ../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 "é??æ?°è¼?å?¥æª?æ¡?(_I)"
 
-#: ../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 "æ??è¿?é??å??æª?æ¡? (_F)"
 
-#: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "å??å?°(_P)..."
+#: ../plugins/document-manager/plugin.c:171
+msgid "_Printâ?¦"
+msgstr "å??å?°(_P)â?¦"
 
-#: ../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 "é ?覽å??å?°(_P)"
 
-#: ../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 "è½?æ??(_T)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:183
+#: ../plugins/document-manager/plugin.c:186
 msgid "_Make Selection Uppercase"
 msgstr "é?¸å®?ç¯?å??ç?ºå¤§å¯« (_M)"
 
-#: ../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 "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?º DOS EOL (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 "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?º Unix 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 "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?º Mac OS EOL (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 "é?¸å??(_S)"
 
-#: ../plugins/document-manager/plugin.c:206
+#: ../plugins/document-manager/plugin.c:209
 msgid "Select _All"
 msgstr "å?¨é?¨é?¸å??(_A)"
 
-#: ../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 "é?¸æ??å??å§?碼å??å¡?(_C)"
 
-#: ../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 "å??註(_M)"
 
 #. 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 "å??å¡?å? ä¸?/å??æ¶?å??註(_B)"
 
-#: ../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 "æ?¹å¡?å? ä¸?/å??æ¶?å??註(_X)"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:227
 msgid "Box comment the selected text"
 msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?æ?¹å¡?註解"
 
@@ -2860,432 +2913,440 @@ 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
 #, fuzzy
 msgid "_Stream Comment/Uncomment"
-msgstr "註解�缺� )"
+msgstr "å??å¡?å? ä¸?/å??æ¶?å??註(_B)"
 
-#: ../plugins/document-manager/plugin.c:231
+#: ../plugins/document-manager/plugin.c:234
 #, fuzzy
 msgid "Stream comment the selected text"
-msgstr "�詢已���(_L)"
+msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?å??å¡?註解"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
-msgstr "è¡?è??(_L)..."
+#: ../plugins/document-manager/plugin.c:240
+msgid "_Line Numberâ?¦"
+msgstr "è¡?è??(_L)â?¦"
 
-#: ../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 "å??å¾?å°?æ??æ?¬è?? (_B)"
 
-#: ../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 "å??å¡?é??é ­(_S)"
 
-#: ../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 "å??å¡?çµ?å°¾(_E)"
 
-#: ../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 "ä¸?ä¸?å??æ­·å?²ç´?é??(_P)"
 
-#: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
-msgstr "å??å¾?ä¸?ä¸?å??æ­·å?²ç´?é??"
+#: ../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 "ä¸?ä¸?å??æ­·å?²ç´?é??(_Y)"
 
-#: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
-msgstr "å??å¾?ä¸?ä¸?å??æ­·å?²ç´?é??"
+#: ../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 "æ??å°?(_S)"
 
-#: ../plugins/document-manager/plugin.c:259
+#: ../plugins/document-manager/plugin.c:262
 msgid "_Quick Search"
 msgstr "å¿«é??æ??å°?(_Q)"
 
-#: ../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 "å¿«é??é??æ?°æ??å°?(_R)"
 
-#: ../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 "編輯(_E)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:269
+#: ../plugins/document-manager/plugin.c:272
 msgid "_Editor"
 msgstr "編輯��(_E)"
 
-#: ../plugins/document-manager/plugin.c:276
+#: ../plugins/document-manager/plugin.c:279
 msgid "_Add Editor View"
 msgstr "��編輯�檢�(_A)"
 
-#: ../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 "移�編輯�檢�(_R)"
 
-#: ../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 "復å??(_N)"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4079
+#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4076
 msgid "Undo the last action"
 msgstr "å??æ¶?å??å®?æ??ç??å??ä½?"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "_Redo"
 msgstr "é??è¤?(_R)"
 
-#: ../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 "��(_U)"
 
-#: ../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 "�製(_C)"
 
-#: ../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 "貼�(_P)"
 
-#: ../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 "��(_C)"
 
-#: ../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 "è?ªå??è£?é½?(_A)"
+
+#: ../plugins/document-manager/plugin.c:311
+msgid "Auto-complete the current word"
+msgstr "è?ªå??è£?é½?ç?®å??ç??å­?"
+
+#: ../plugins/document-manager/plugin.c:316
 msgid "_Line Number Margin"
 msgstr "è¡?è??å??(_L)"
 
-#: ../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 "æ¨?è??å??(_M)"
 
-#: ../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 "ç¨?å¼?碼å±?ç??å??(_C)"
 
-#: ../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 "縮æ??æ??å¼?(_I)"
 
-#: ../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 "空ç?½å­?å??(_W)"
 
-#: ../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 "å?¥å­?çµ?æ??å­?å??(_L)"
 
-#: ../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 "æ??è¡?(_W)"
 
-#: ../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 "���示模�(_H)"
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Close All Folds"
 msgstr "å?½å¼?å?¨é?¨æ?ºç??(_C)"
 
-#: ../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 "å?½å¼?å?¨é?¨å±?é??(_O)"
 
-#: ../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 "å??æ??ç?®å??æ??ç??ç??æ??(_T)"
 
-#: ../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 "æ??件(_D)"
 
-#: ../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 "�籤(_K)"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:376
 msgid "_Add Bookmark"
 msgstr "���籤(_A)"
 
-#: ../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 "ä¸?ä¸?å??æ?¸ç±¤(_P)"
 
-#: ../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 "ä¸?ä¸?å??æ?¸ç±¤(_N)"
 
-#: ../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 "æ¸?é?¤æ??æ??æ?¸ç±¤(_C)"
 
-#: ../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:1734
+#: ../plugins/document-manager/plugin.c:2151
+#: ../plugins/document-manager/plugin.c:2161
 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"
-msgstr "å??å¾?"
+#: ../plugins/document-manager/plugin.c:613
+msgid "Go to"
+msgstr "移�"
 
-#: ../plugins/document-manager/plugin.c:909
+#: ../plugins/document-manager/plugin.c:928
 msgid "OVR"
 msgstr "�寫"
 
-#: ../plugins/document-manager/plugin.c:913
+#: ../plugins/document-manager/plugin.c:932
 msgid "INS"
 msgstr "æ??å?¥"
 
-#: ../plugins/document-manager/plugin.c:917
-#: ../plugins/document-manager/plugin.c:919
+#: ../plugins/document-manager/plugin.c:938
+#: ../plugins/document-manager/plugin.c:941
 msgid "Zoom"
 msgstr "æ??é? "
 
-#: ../plugins/document-manager/plugin.c:922
+#: ../plugins/document-manager/plugin.c:944
 msgid "Col"
 msgstr "�"
 
-#: ../plugins/document-manager/plugin.c:923
+#: ../plugins/document-manager/plugin.c:945
 msgid "Mode"
 msgstr "模�"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1003
+#: ../plugins/document-manager/plugin.c:1025
 msgid "Automatic"
 msgstr "è?ªå??"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1537
+#: ../plugins/document-manager/plugin.c:1558
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå??å?²å­? %s 失æ??"
 
-#: ../plugins/document-manager/plugin.c:1551
+#: ../plugins/document-manager/plugin.c:1572
 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."
-msgstr "æ??å°?ã??%sã??å·²é??çµ?尾並å°?å¾?é ­é??å§?ï¼?ä½?å·²æ?¾ä¸?å?°ç¬¦å??é ?ç?®ã??"
+"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 "å??å??大å°?寫"
 
@@ -3306,8 +3367,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
@@ -3328,28 +3389,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 ""
@@ -3365,7 +3424,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 ""
@@ -3373,7 +3432,7 @@ msgstr ""
 "\n"
 "æ²?æ??å¤?æ??ç¨?å¼?ã??é ?設å??ä½?æ??æ??ç?¨ç¨?å¼?æ?¯è¨­å®?ä¾?è??ç??é??å??æª?æ¡?é¡?å??ç??ã??\n"
 "\n"
-"Mime é¡?å??ï¼? %s\n"
+"MIME é¡?å??ï¼? %s\n"
 "\n"
 "æ?¨å?¯ä»¥é?¸æ??試è??使ç?¨ä¸?å??å¤?æ??ç¨?å¼?æ??æ??ç?¨ç¨?å¼?ä¾?é??å??å®?ã??"
 
@@ -3425,11 +3484,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 "Shell �令稿��"
 
 #: ../plugins/file-loader/plugin.c:569
@@ -3458,8 +3517,8 @@ msgid "New empty file"
 msgstr "��空���"
 
 #: ../plugins/file-loader/plugin.c:892
-msgid "_Open..."
-msgstr "é??å??(_O)..."
+msgid "_Openâ?¦"
+msgstr "é??å??(_O)â?¦"
 
 #: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
@@ -3473,51 +3532,51 @@ msgstr "é??å??以(_W)"
 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 "æ??è¿?é??å??(_R)"
 
-#: ../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> ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../plugins/file-loader/plugin.c:1445
+#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "以此é??å??"
 
@@ -3546,7 +3605,8 @@ msgid "Filter"
 msgstr "é??濾æ¢?件"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2333 ../plugins/symbol-db/plugin.c:2422
+#: ../plugins/symbol-db/plugin.c:2322 ../plugins/symbol-db/plugin.c:2416
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å??"
 
@@ -3554,25 +3614,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:567
 msgid "Filename"
 msgstr "æª?æ¡?å??稱"
 
-#: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
-msgstr "�� URI"
+#: ../plugins/file-manager/file-view.c:654
+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:655
+msgid "URI of the top-most path displayed"
 msgstr "æ??ä¸?層路å¾?顯示ç?? URI"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3583,40 +3638,36 @@ msgstr "é??æ?°å?½å??(_R)"
 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."
@@ -3624,20 +3675,24 @@ msgstr ""
 "輸å?¥æª?æ¡?å??稱ã??\n"
 "延伸æª?å??æ??æ ¹æ??å?¶é¡?å??è?ªå??å? å?¥ã??"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:67 ../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 "é¡?å??ï¼?"
 
@@ -3645,47 +3700,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 "Shell �令稿��"
 
-#: ../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 "ç?¡æ³?建ç«?æ?°æª?æ¡?ç??使ç?¨è??ä»?é?¢"
 
@@ -3694,21 +3749,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 "���件(_P)"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "��模�(_M)"
 
-#: ../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 "é?¸æ??å¥?件"
@@ -3717,362 +3772,423 @@ 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:197
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3253
+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:200
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3255
+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:203
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3257
+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:206
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3259
+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:209
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3263
+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:212
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3265
+msgid "Info Documentation"
+msgstr "Info æ??件"
+
+#: ../plugins/gbf-am/gbf-am-project.c:217
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:215
+msgid "Lisp Module"
+msgstr "Lisp 模�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:220
+#: ../plugins/gbf-am/gbf-am-project.c:3356
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:218
+msgid "Header Files"
+msgstr "�頭�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:223
+#: ../plugins/gbf-am/gbf-am-project.c:3368
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:221
+msgid "Java Module"
+msgstr "Java 模�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:226
+#: ../plugins/gbf-am/gbf-am-project.c:3370
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:224
+msgid "Python Module"
+msgstr "Python 模�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:229
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:227
+msgid "Generic rule"
+msgstr "ä¸?è?¬è¦?å??"
+
+#: ../plugins/gbf-am/gbf-am-project.c:232
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:230
+msgid "Extra target"
+msgstr "����"
+
+#: ../plugins/gbf-am/gbf-am-project.c:235
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:233
+msgid "Configure file"
+msgstr "設���"
+
+#: ../plugins/gbf-am/gbf-am-project.c:238
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:236
+msgid "Interface file"
+msgstr "����"
+
+#: ../plugins/gbf-am/gbf-am-project.c:241
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:239
+msgid "GLib mkenums"
+msgstr ""
+
+#: ../plugins/gbf-am/gbf-am-project.c:244
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
+msgid "GLib genmarshal"
+msgstr ""
+
+#: ../plugins/gbf-am/gbf-am-project.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:245
+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:2506
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2584
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2812
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2998
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3146
 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:2526
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2629
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3041
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3221
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3407
 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:2560
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2604
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2647
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2959
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3019
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3182
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3242
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3474
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3535
 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:2692
 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:2713
+#: ../plugins/dir-project/dir-project.c:693
+#: ../plugins/dir-project/dir-project.c:765
+#, 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:2727
 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:2925
 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:2936
 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:2946
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2973
 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:3159
 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 "Java 模�"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3202
-msgid "Python Module"
-msgstr "Python 模�"
-
-#: ../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:3317
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3512
 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:3520
 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-mkfile/gbf-mkfile-project.c:3450
+#: ../plugins/gbf-am/gbf-am-project.c:4111
+#: ../plugins/gbf-am/gbf-am-project.c:4112
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3830
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3831
 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
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
-msgstr "網å??:"
+#: ../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 "C 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1331
+#: ../plugins/gbf-am/gbf-am-properties.c:1334
 msgid "C preprocessor flags:"
 msgstr "C é ?è??ç??å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1333
+#: ../plugins/gbf-am/gbf-am-properties.c:1336
 msgid "C++ compiler flags:"
 msgstr "C++ 編譯å?¨æ??æ¨?:"
 
-#: ../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 "Java 編譯å?¨æ??æ¨? (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 "Fortran 編譯å?¨æ??æ¨?:"
 
-#: ../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 "C é ?è??ç??å?¨æ??æ¨?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1423
+#: ../plugins/gbf-am/gbf-am-properties.c:1426
 msgid "C++ compiler flags"
 msgstr "C++ 編譯å?¨æ??æ¨?"
 
-#: ../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..."
+#: ../plugins/gbf-am/gbf-am-properties.c:1586
+msgid "Advancedâ?¦"
 msgstr "é?²é??..."
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
@@ -4080,81 +4196,53 @@ msgstr "é?²é??..."
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "ç?¡æ??ç?? GbfMkfileConfigValue é¡?å??"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2699
 msgid "Project doesn't exist"
 msgstr "�����"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3006
 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:3169
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3196
 msgid "Target couldn't be created"
 msgstr "��建���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3229
 msgid "Target coudn't be removed"
 msgstr "��移���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3427
 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:3439
 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:3456
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3488
 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 "å??å?«:"
 
-#: ../plugins/gdb/anjuta-gdb.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:6
-msgid "Command Line Parameters"
-msgstr "æ??令å??æ?¸"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:12
-msgid "Enter a Hexa adress or select one in the data"
-msgstr "輸å?¥ Hexa ä½?å??æ??å?¨è³?æ??中é?¸æ??ä¸?å??"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:13
-msgid "Execute Program"
-msgstr "����"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:22
-msgid "Run in Terminal"
-msgstr "��端����"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:35
-msgid "_Pass:"
-msgstr "é??é??(_P):"
-
 #. 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"
@@ -4162,71 +4250,71 @@ msgid ""
 "Make sure Anjuta is installed correctly."
 msgstr ""
 "æ?¾ä¸?å?°ï¼?%sã??\n"
-"ç?¡æ³?å??å§?å??å?µé?¯å·¥å?·ã??\n"
+"ç?¡æ³?å??å§?å??é?¤é?¯å·¥å?·ã??\n"
 "è«?確å®? Anjuta æ?¯å?¦å®?è£?正確ã??"
 
-#: ../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"
+msgstr "è«?é??å??ä¸?å??å?·è¡?æª?æ??å°?ä¸?å??æ­£å?¨å?·è¡?中ç??é?²ç¨?é?²è¡?é?¤é?¯ã??\n"
 
-#: ../plugins/gdb/debugger.c:960
+#: ../plugins/gdb/debugger.c:1000
 msgid "There was an error whilst launching the debugger.\n"
-msgstr "ç?¶å?·è¡?å?µé?¯å·¥å?·æ??ç?¼ç??é?¯èª¤ã??\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?"
 msgstr ""
 "ç¨?å¼?ä»?å?¨å?·è¡?中ã??\n"
-"æ?¯å?¦ä»?è¦?å??æ­¢å?µé?¯å·¥ä½?ï¼?"
+"æ?¯å?¦ä»?è¦?å??æ­¢é?¤é?¯å·¥ä½?ï¼?"
 
 #. 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"
@@ -4235,556 +4323,507 @@ msgstr ""
 "������端���%s\n"
 "æ?¯å?¦è¦?å??試ä¸?次ï¼?"
 
-#: ../plugins/gdb/debugger.c:1875
+#: ../plugins/gdb/debugger.c:1914
 msgid "Debugger connected\n"
-msgstr "��工�已��\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?"
 msgstr ""
 "å·²æ??ä¸?å??é?²ç¨?æ­£å?¨å?·è¡?ã??\n"
-"æ?¯å?¦å??å°?å®?çµ?æ­¢å¾?å??å°?æ?°ç??é?²ç¨?é?²è¡?é?²ç¨?å?µé?¯ï¼?"
+"æ?¯å?¦å??å°?å®?çµ?æ­¢å¾?å??å°?æ?°ç??é?²ç¨?é?²è¡?é?²ç¨?é?¤é?¯ï¼?"
 
-#: ../plugins/gdb/debugger.c:2013
+#: ../plugins/gdb/debugger.c:2052
 msgid "Anjuta is unable to attach to itself."
 msgstr "Anjuta ç?¡æ³?ä¾?é??å?¨è?ªå·±ä¸?ã??"
 
-#: ../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 "建ç«?å??ç?º %s ç?? fifo æª?æ¡?失æ??ã??該ç¨?å¼?æ??以ä¸?使ç?¨çµ?端æ©?ç??æ?¹å¼?å?·è¡?ã??"
+"Failed to create FIFO file named %s. The program will run without a terminal."
+msgstr "建ç«?å??ç?º %s ç?? FIFO æª?æ¡?失æ??ã??該ç¨?å¼?æ??以ä¸?使ç?¨çµ?端æ©?ç??æ?¹å¼?å?·è¡?ã??"
 
 #: ../plugins/gdb/plugin.c:198
 msgid "Cannot start terminal for debugging."
-msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?å?µé?¯ã??"
-
-#: ../plugins/git/anjuta-git.ui.h:2
-#, fuzzy
-#| msgid "<b>Messages options</b>"
-msgid "<b>Stash Message (Optional)</b>"
-msgstr "<b>����</b>"
+msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?é?¤é?¯ã??"
 
-#: ../plugins/git/anjuta-git.ui.h:3
-#, fuzzy
-#| msgid "<b>Scope</b>"
-msgid "<b>Stash to Apply</b>"
-msgstr "<b>ç¯?å??</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:4
-#, fuzzy
-#| msgid "<b>Tag:</b> %s"
-msgid "<b>Tags</b>"
-msgstr "<b>�籤:</b> %s"
-
-#: ../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"
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "Add signed-off-by line"
 msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:5
 #, fuzzy
 msgid "Amend the previous commit"
-msgstr "Subversion: æ??交å®?æ??ã??"
+msgstr "ä¸?ä¸?å??æ??交è¨?æ?¯ï¼?"
 
-#: ../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 "æ·»å? å??å??ç??è³?æ??"
 
-#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "Apply Stash"
-msgstr ""
+msgstr "�� Stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:247
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "��信箱��"
 
-#: ../plugins/git/anjuta-git.ui.h:16
-#, fuzzy
-#| msgid "Copy the selection"
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Apply the selected stash"
-msgstr "è¤?製é?¸å??å??å??"
+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
 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 "å??å?ºæª?æ¡?"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "Check out all local changes"
-msgstr ""
+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 "å?¨å??æ?¯å»ºç«?å¾?å??å?ºå®?"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "Cherry Pick"
-msgstr ""
+msgstr "Cherry Pick"
 
-#: ../plugins/git/anjuta-git.ui.h:33
-#, fuzzy
-#| msgid "Mark all matches"
+#: ../plugins/git/anjuta-git.ui.h:28
 msgid "Clear all stashes"
-msgstr "æ¨?è¨?æ??æ??符å??ç??é ?ç?®"
+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:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "æ??交修æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
-msgstr ""
+msgstr "å?¨ fast-forward å??ä½µä¸? commit"
 
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "Commit to Cherry Pick:"
-msgstr ""
+msgstr "Commit è?³ Cherry Pickï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "Commit to revert:"
 msgstr "è¦?æ??交ç?ºå¾©å??ç??ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "建ç«?å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "建��籤"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "建ç«?è£?é??ç³»å??"
 
-#: ../plugins/git/anjuta-git.ui.h:41 ../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:42
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "å?ªé?¤å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "å?ªé?¤é? ç«¯å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:44
-#, fuzzy
-#| msgid "Deleted: %s"
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
-msgstr "已��� %s"
+msgstr "���籤"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "ä¸?è¦?æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "�����籤"
 
-#: ../plugins/git/anjuta-git.ui.h:47
-#, fuzzy
-#| msgid "Copy the selection"
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Drop the selected stash"
-msgstr "è¤?製é?¸å??å??å??"
+msgstr "æ?¾æ£?é?¸å??ç?? stash"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "���件�"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "å?¨å»ºç«?å¾?å??å??é? ç«¯å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "é??濾æ¢?件"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "ç?¨ä¾?建ç«?ä¿®è£?æª?ç??ç?®é??ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "å¼·å?¶"
 
-#: ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "å¾?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Generate patches relative to:"
 msgstr "ç?¢ç??ç?¸å°?æ?¼æ­¤ç??ä¿®è£?æª?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Good revision:"
 msgstr "è?¯å¥½ç??ç??æ?¬ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.ui.h:58
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
-msgstr "å?°é?£"
+msgstr "Hard"
 
-#: ../plugins/git/anjuta-git.ui.h:59
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
-msgstr "Document head"
+msgstr "Head"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "忽���:"
 
-#: ../plugins/git/anjuta-git.ui.h:61
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "ç´?é??è¨?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Mailbox file containing patches:"
 msgstr "å??å?«ä¿®è£?ç??ä¿¡ç®±æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "å??ä½µ"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "æ··å??ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Mode:"
 msgstr "模��"
 
-#: ../plugins/git/anjuta-git.ui.h:68
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
-#: ../plugins/subversion/anjuta-subversion.ui.h:23
-msgid "Options"
-msgstr "��"
-
-#: ../plugins/git/anjuta-git.ui.h:69
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-msgid "Options:"
-msgstr "���"
-
-#: ../plugins/git/anjuta-git.ui.h:70
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "å??ä¸?次æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:71
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Pull"
 
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
 msgstr "Push"
 
-#: ../plugins/git/anjuta-git.ui.h:73
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
-msgstr "æ??æ??æ?¯æ?´ç??é¡?å??"
+msgstr "Push æ??æ??ç??å??æ?¯è??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:74
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Push all tags"
-msgstr "API �籤"
+msgstr "Push æ??æ??ç??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "é??建å?ºç¤?"
 
-#: ../plugins/git/anjuta-git.ui.h:76
-#, fuzzy
-#| msgid "Remove"
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Remote"
-msgstr "移�"
+msgstr "�端"
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Remote to delete:"
 msgstr "è¦?å?ªé?¤ç??é? ç«¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:79
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "移���"
 
-#: ../plugins/git/anjuta-git.ui.h:80
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Repository origin"
 msgstr "��庫�頭"
 
-#: ../plugins/git/anjuta-git.ui.h:81
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Repository to pull from:"
 msgstr "è¦?é?²è¡? pull ç??æª?æ¡?庫ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:82
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Repository to push to:"
 msgstr "� push ���庫�"
 
-#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "é??設æª?æ¡?樹"
 
-#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "é??設ç?ºï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:85
-#, fuzzy
-#| msgid "Reset Tree"
+#: ../plugins/git/anjuta-git.ui.h:82
 msgid "Restore index"
-msgstr "é??設æª?æ¡?樹"
+msgstr "é??å??ç´¢å¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../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:87
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "å??復æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "ä¿®è¨?ç??/æ¨?籤:"
 
-#: ../plugins/git/anjuta-git.ui.h:90
-msgid "Select A Folder"
-msgstr "é?¸å??è³?æ??夾"
-
-#: ../plugins/git/anjuta-git.ui.h:91
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "é?¸æ??è¦?å??å??ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:92
-#: ../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 "é?¸æ??è¦?æ??交ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "é?¸æ??è¦?忽ç?¥ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:94
-#: ../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:95
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:91
 msgid "Select Files to Unstage:"
-msgstr "é?¸å??å¤?å??è¦?é??å??ç??æª?æ¡?"
+msgstr "é?¸æ??è¦? Unstage ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "é?¸æ??ä¿¡ç®±æª?æ¡?"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../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:98
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "é?¸æ??è¦?移é?¤ç??æª?æ¡?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:99
-#: ../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:100
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "å?¨ç´?é??è¨?æ?¯ä¸­é¡¯ç¤ºä¾?æº?ç??ä¿®è¨?ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:101
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
-msgstr "�詢已���(_L)"
+msgstr "顯示å?¨ç·¨è¼¯å?¨ä¸­é?¸å?? stash ç??å?§å®¹"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
 msgstr "å? è¨»é??å??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:103
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "Soft"
 
-#: ../plugins/git/anjuta-git.ui.h:104
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
-msgstr "西ç?­ç??æ??"
+msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.ui.h:105 ../plugins/git/plugin.c:776
-#, fuzzy
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
 msgid "Stash"
-msgstr "西ç?­ç??æ??"
+msgstr "Stash"
 
-#: ../plugins/git/anjuta-git.ui.h:106
-#, fuzzy
-#| msgid "Show uncommitted changes"
+#: ../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 "顯示æ?ªæ??交ç??è®?æ?´"
+msgstr "Stash æ?ªæ??交ç??è®?æ?´"
 
-#: ../plugins/git/anjuta-git.ui.h:107
-#, fuzzy
-#| msgid "Show uncommitted changes"
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Stash indexed changes"
-msgstr "顯示æ?ªæ??交ç??è®?æ?´"
+msgstr "Stash 已索å¼?ç??è®?æ?´"
 
-#: ../plugins/git/anjuta-git.ui.h:108
-#, fuzzy
-#| msgid "Show uncommitted changes"
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Stash the working tree's uncommitted changes"
-msgstr "顯示æ?ªæ??交ç??è®?æ?´"
+msgstr "Stash working tree 中æ?ªæ??交ç??è®?æ?´"
 
-#: ../plugins/git/anjuta-git.ui.h:109
+#: ../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:110
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "æ¨?籤å??稱ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "æ¨?籤/æ??交"
 
+#. 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
-#, fuzzy
-#| msgid "Branches to delete:"
 msgid "Tags to delete:"
-msgstr "è¦?å?ªé?¤ç??å??æ?¯ï¼?"
+msgstr "è¦?å?ªé?¤ç??æ¨?籤ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "é??次æ??交ç?±æ?¼å??併失æ??è??çµ?æ­¢ï¼?使ç?¨ -iï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:115
-#, fuzzy
 msgid "To:"
-msgstr "å?°:"
+msgstr "å?°ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:116
-#, fuzzy
-#| msgid "URL:"
 msgid "URL"
-msgstr "URL:"
+msgstr "網å??"
 
 #: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/git/anjuta-git.ui.h:118
-#, fuzzy
 msgid "Unstage Files"
-msgstr "æ?¥å??æª?æ¡?(_A):"
+msgstr "Unstage ��"
 
 #: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
@@ -4799,21 +4838,21 @@ msgid "View log"
 msgstr "檢è¦?ç´?é??"
 
 #: ../plugins/git/anjuta-git.ui.h:122
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "檢è¦?æª?æ¡?/è³?æ??夾ç??ç´?é??æª?ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:124
 msgid "page 1"
-msgstr ""
+msgstr "é ? 1"
 
 #: ../plugins/git/anjuta-git.ui.h:125
 msgid "page 2"
-msgstr ""
+msgstr "é ? 2"
 
 #: ../plugins/git/anjuta-git.ui.h:126
 msgid "page 3"
-msgstr ""
+msgstr "é ? 3"
 
 #: ../plugins/git/git-add-dialog.c:36
 msgid "Git: File staged for add."
@@ -4839,7 +4878,7 @@ msgstr "è«?輸å?¥ URLã??"
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
+msgid "Git: Fetchingâ?¦"
 msgstr "Gitï¼?æ­£å?¨å??å??..."
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
@@ -4894,10 +4933,12 @@ msgstr "è«?輸å?¥æ¨?籤å??稱ã??"
 msgid "Git: Deleted selected branches."
 msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
 
+#: ../plugins/git/git-delete-branch-dialog.c:106
+msgid "Please select branches to delete"
+msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
+
 #: ../plugins/git/git-delete-tag-dialog.c:37
-#, fuzzy
-#| msgid "Git: Deleted selected branches."
-msgid "Git: Deleted selected tages."
+msgid "Git: Deleted selected tags."
 msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
 
 #: ../plugins/git/git-fetch-dialog.c:40
@@ -4918,8 +4959,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
@@ -4948,9 +4989,9 @@ msgstr "<b>�籤:</b> %s"
 msgid "<b>Remote:</b> %s"
 msgstr "<b>�端:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:832
+#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
+#: ../plugins/git/plugin.c:867
 #, fuzzy
-#| msgid "Branch:"
 msgid "Branch"
 msgstr "å??æ?¯ï¼?"
 
@@ -4962,30 +5003,33 @@ msgstr "Gitï¼?å??ä½µå®?æ??ã??"
 msgid "Git: Pull complete."
 msgstr "Gitï¼? Pull å·²å®?æ??ã??"
 
-#: ../plugins/git/git-pull-dialog.c:87
-#, fuzzy
+#. The "input widget" is the widget that should receive focus if the
+#. * user does not properly enter anything
+#: ../plugins/git/git-pull-dialog.c:124
+msgid "Please select a remote to pull from."
+msgstr "è«?輸å?¥è¦? pull ç??é? ç«¯ã??"
+
+#: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
-msgstr "è«?輸å?¥çµ?æ??ä¿®è¨?ç??ã??"
+msgstr "è«?輸å?¥è¦? pull ç??æª?æ¡?庫 URLã??"
 
 #: ../plugins/git/git-push-dialog.c:36
 msgid "Git: Push complete."
 msgstr "Git: Push complete."
 
-#. The "focus widget" is the widget that should receive focus if the
+#. The "input widget" is the widget that should receive focus if the
 #. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:194
-#, fuzzy
+#: ../plugins/git/git-push-dialog.c:144
 msgid "Please select a remote to push to."
-msgstr "è«?輸å?¥çµ?æ??ä¿®è¨?ç??ã??"
+msgstr "è«?é?¸æ??è¦? push ç??é? ç«¯ã??"
 
-#: ../plugins/git/git-push-dialog.c:212
-#, fuzzy
+#: ../plugins/git/git-push-dialog.c:162
 msgid "Please enter the URL of the repository to push to."
-msgstr "è«?輸å?¥çµ?æ??ä¿®è¨?ç??ã??"
+msgstr "è«?輸å?¥è¦? push å?°ç??æª?æ¡?庫 URLã??"
 
-#: ../plugins/git/git-push-dialog.c:246
-msgid "Git: Pushing..."
-msgstr "Git�正� Push..."
+#: ../plugins/git/git-push-dialog.c:197
+msgid "Git: Pushingâ?¦"
+msgstr "Gitï¼?Pushingâ?¦"
 
 #: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
@@ -5000,14 +5044,12 @@ msgid "Git: Resolve complete."
 msgstr "Gitï¼?調解已å®?æ??ã??"
 
 #: ../plugins/git/git-stash-widget.c:219
-#, fuzzy
-#| msgid "Git: Push complete."
 msgid "Git: Stash dropped."
-msgstr "Git: Push complete."
+msgstr "Gitï¼?Stash å·²æ?¾æ£?ã??"
 
 #: ../plugins/git/git-stash-widget.c:275
 msgid "Git: All stashes cleared."
-msgstr ""
+msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
 
 #: ../plugins/git/git-switch-dialog.c:36
 msgid "Git: Branch checkout complete."
@@ -5020,677 +5062,674 @@ msgstr "Git"
 
 #: ../plugins/git/git-ui-utils.c:158
 msgid "There are no branches available."
-msgstr ""
+msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
 
 #: ../plugins/git/git-ui-utils.c:194
-#, fuzzy
-#| msgid "Please select a file."
 msgid "Please select a stash"
-msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
+msgstr "è«?é?¸æ??ä¸?å?? stash"
 
-#: ../plugins/git/git-ui-utils.c:533
+#: ../plugins/git/git-ui-utils.c:604
 msgid "Git: Changes stored in a stash."
-msgstr ""
+msgstr "Gitï¼?å?²å­?å?¨ stash ç??è®?æ?´ã??"
 
-#: ../plugins/git/git-ui-utils.c:549
+#: ../plugins/git/git-ui-utils.c:620
+#, fuzzy
 msgid "Git: Stashed changes applied."
-msgstr ""
+msgstr "å¥?ç?¨å·² stash ç??è®?æ?´å?° working tree"
 
-#: ../plugins/git/git-ui-utils.c:626
+#: ../plugins/git/git-ui-utils.c:744
 msgid "Git: Diff complete."
 msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
 
+#: ../plugins/git/git-ui-utils.c:760
+#, c-format
+msgid "Column %i"
+msgstr "� %i"
+
 #: ../plugins/git/git-unstage-dialog.c:36
-#, fuzzy
 msgid "Git: Files unstaged."
-msgstr "�寫����"
+msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:543
+#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:79 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "_Commit..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:81
-msgid "Commit changes to the local repository"
-msgstr "æ??交è®?æ?´è?³æ?¬å?°ç«¯æª?æ¡?庫"
+#: ../plugins/git/plugin.c:79
+msgid "_Changes"
+msgstr "è®?æ?´(_C)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:87
-msgid "_Fetch"
-msgstr "_Fetch"
+#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+msgid "_Commitâ?¦"
+msgstr "_Commitâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:89
-msgid "Update remote branches"
-msgstr "æ?´æ?°é? ç«¯å??æ?¯"
+msgid "Commit changes to the local repository"
+msgstr "æ??交è®?æ?´è?³æ?¬å?°ç«¯æª?æ¡?庫"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:95
-msgid "_Rebase"
-msgstr "_Rebase"
+msgid "_Diff uncommitted changes"
+msgstr "_Diff uncommitted changes"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:97
-msgid "Merge your changes with an upstream remote branch"
-msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+msgid "Show uncommitted changes"
+msgstr "顯示æ?ªæ??交ç??è®?æ?´"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:103 ../plugins/git/plugin.c:407
-msgid "_Start..."
-msgstr "_Start..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:105
-#, fuzzy
-msgid "Start a rebase"
-msgstr "å??å??å?µé?¯å?¨(_S)"
+#: ../plugins/git/plugin.c:103
+msgid "_Stash"
+msgstr "_Stash"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:111
-msgid "_Continue"
-msgstr "_Continue"
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "_Stash æ?ªæ??交ç??è®?æ?´â?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:113
-msgid "Continue a rebase that stopped because of conflicts"
-msgstr ""
+msgid "Save uncommitted changes and re-apply them later"
+msgstr "å°?æ?ªæ??交ç??è®?æ?´å?²å­?並å?¨ç¨?å¾?é??æ?°å¥?ç?¨å®?å??"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:119
-msgid "_Skip"
-msgstr "_Skip"
+msgid "_Apply stashed changesâ?¦"
+msgstr "��已 stash ��(_A)�"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:121
-msgid "Skip the current conflicted commmit and continue"
-msgstr "ç?¥é??ç?®å??è¡?çª?ç??æ??交"
+msgid "Apply stashed changes to the working tree"
+msgstr "å¥?ç?¨å·² stash ç??è®?æ?´å?° working tree"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:279
-msgid "_Abort"
-msgstr "_Abort"
+#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+msgid "_View logâ?¦"
+msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:129
-msgid "Abort the rebase and put the repository in its original state"
-msgstr ""
+msgid "View change history"
+msgstr "檢è¦?è®?æ?´æ­·å?²ç´?é??"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:135
-msgid "_Push..."
-msgstr "_Push..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:137
-#, fuzzy
-msgid "Push changes to a remote repository"
-msgstr "Subversion: æ­£å?¨æ??交è®?æ?´è?³æª?æ¡?庫..."
+msgid "_Remote repository"
+msgstr "�端��庫(_R)"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:143
-msgid "_Pull..."
-msgstr "_Pull..."
+msgid "_Pushâ?¦"
+msgstr "_Pushâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:145
-msgid "Update the working copy"
-msgstr "��工���"
+msgid "Push changes to a remote repository"
+msgstr "��� push ��端��庫"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:151
-msgid "_Diff uncommitted changes"
-msgstr "_Diff uncommitted changes"
+msgid "_Pullâ?¦"
+msgstr "_Pullâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:153
-msgid "Show uncommitted changes"
-msgstr "顯示æ?ªæ??交ç??è®?æ?´"
+msgid "Update the working copy"
+msgstr "��工���"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:159
-#, fuzzy
-msgid "_Stash"
-msgstr "西ç?­ç??æ??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:167
-#, fuzzy
-#| msgid "Show uncommitted changes"
-msgid "_Stash uncommitted changes..."
-msgstr "顯示æ?ªæ??交ç??è®?æ?´"
+msgid "_Fetch"
+msgstr "_Fetch"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:169
-#, fuzzy
-#| msgid "Revert uncommitted changes to files"
-msgid "Save ucommitted changes and re-apply them later"
-msgstr "å°?æ?ªæ??交ç??è®?æ?´é??å??ç?ºæª?æ¡?"
+#: ../plugins/git/plugin.c:161
+msgid "Update remote branches"
+msgstr "æ?´æ?°é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:175
-msgid "_Apply stashed changes..."
-msgstr ""
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:177
-#, fuzzy
-#| msgid "Commit your changes to the Subversion tree"
-msgid "Apply stashed changes to the working tree"
-msgstr "æ??交æ?¨ç??ä¿®æ?¹è?³ Subversion 樹"
+#: ../plugins/git/plugin.c:167
+msgid "_Files"
+msgstr "��(_F)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:343
-#: ../plugins/git/plugin.c:559 ../plugins/subversion/plugin.c:60
+#: ../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 "_Add..."
+msgid "_Addâ?¦"
+msgstr "å? å?¥(_A)â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:185
+#: ../plugins/git/plugin.c:177
 msgid "Add files to the repository"
 msgstr "�������庫"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:191 ../plugins/git/plugin.c:567
+#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_Remove..."
+msgid "_Removeâ?¦"
+msgstr "移�(_R)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:193
+#: ../plugins/git/plugin.c:185
 msgid "Remove files from the repository"
 msgstr "���庫移���"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:199
-msgid "_Ignore..."
-msgstr "_Ignore..."
+#: ../plugins/git/plugin.c:191
+msgid "_Ignoreâ?¦"
+msgstr "忽�(_I)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:201
+#: ../plugins/git/plugin.c:193
 msgid "Ignore files"
 msgstr "忽���"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:207
-msgid "_Check out files..."
-msgstr "_Check out files..."
+#: ../plugins/git/plugin.c:199
+msgid "_Check out filesâ?¦"
+msgstr "_Check out ���"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:209
+#: ../plugins/git/plugin.c:201
 msgid "Revert uncommitted changes to files"
 msgstr "å°?æ?ªæ??交ç??è®?æ?´é??å??ç?ºæª?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:215
-#, fuzzy
-msgid "_Unstage files..."
-msgstr "æ?¥å??æª?æ¡?(_A):"
+#: ../plugins/git/plugin.c:207
+msgid "_Unstage filesâ?¦"
+msgstr "��� _Unstage�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:217
+#: ../plugins/git/plugin.c:209
 msgid "Remove files from the commit index"
 msgstr "å¾?æ??交索å¼?中移é?¤æª?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:223
-msgid "_Resolve conflicts..."
-msgstr "_Resolve conflicts..."
+#: ../plugins/git/plugin.c:215
+msgid "_Resolve conflictsâ?¦"
+msgstr "_Resolve conflictsâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:225
+#: ../plugins/git/plugin.c:217
 msgid "Mark conflicted files as resolved"
 msgstr "å°?è¡?çª?ç??æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:231 ../plugins/patch/patch-plugin.c:117
+#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
 msgid "Patches"
 msgstr "修�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:239
-msgid "Create patch series..."
-msgstr "建ç«?ä¿®è£?ç³»å??..."
+#: ../plugins/git/plugin.c:231
+msgid "Create patch seriesâ?¦"
+msgstr "建� patch series�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:241
+#: ../plugins/git/plugin.c:233
 msgid "Generate patch files for submission upstream"
 msgstr "å¾?æ??交ä¸?游ç?¢ç??ä¿®è£?æª?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:255
-msgid "_Apply..."
-msgstr "��(_A)..."
+#: ../plugins/git/plugin.c:247
+msgid "_Applyâ?¦"
+msgstr "��(_A)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:257
-#, fuzzy
+#: ../plugins/git/plugin.c:249
 msgid "Start applying a patch series"
-msgstr "建ç«?è£?é??ç³»å??"
+msgstr "é??å§?å¥?ç?¨ patch series"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:263
+#: ../plugins/git/plugin.c:255
 msgid "_Continue with resolved conflicts"
 msgstr "以解決å¾?ç??è¡?çª?ç¹¼çº?(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:265
+#: ../plugins/git/plugin.c:257
 msgid "Continue applying a series after resolving conflicts"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:271
+#: ../plugins/git/plugin.c:263
 msgid "_Skip current patch"
 msgstr "忽ç?¥ç?®å??ç??ä¿®è£?æª?(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:273
+#: ../plugins/git/plugin.c:265
 msgid "Skip the current patch in the series and continue"
 msgstr ""
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+msgid "_Abort"
+msgstr "_Abort"
+
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:281
+#: ../plugins/git/plugin.c:273
 msgid ""
 "Stop applying the series and return the repository to its original state"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:287
+#: ../plugins/git/plugin.c:279
 msgid "_Branches"
 msgstr "å??æ?¯(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:295 ../plugins/git/plugin.c:475
-msgid "_Create branch..."
-msgstr "_Create branch..."
+#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+msgid "_Create branchâ?¦"
+msgstr "建� bran_ch�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:297
+#: ../plugins/git/plugin.c:289
 msgid "Create a branch"
 msgstr "建ç«?å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:303
-msgid "_Delete branch..."
-msgstr "_Delete branch..."
+#: ../plugins/git/plugin.c:295
+msgid "_Delete branchâ?¦"
+msgstr "�� branch(_D)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:305
+#: ../plugins/git/plugin.c:297
 msgid "Delete branches"
 msgstr "å?ªé?¤å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:311
-msgid "_Switch to another branch..."
-msgstr "_Switch to another branch..."
+#: ../plugins/git/plugin.c:303
+msgid "_Switch to another branchâ?¦"
+msgstr "å??æ??è?³å?¦ä¸?å?? branch(_S)â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:313
+#: ../plugins/git/plugin.c:305
 msgid "Switch to another branch"
 msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:319
-msgid "_Merge..."
-msgstr "_Merge..."
+#: ../plugins/git/plugin.c:311
+msgid "_Mergeâ?¦"
+msgstr "_Mergeâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:321
+#: ../plugins/git/plugin.c:313
 msgid "Merge changes from another branch into the current one"
 msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µè®?æ?´è?³ç?®å??ç??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:507
-msgid "_Cherry pick..."
-msgstr ""
+#: ../plugins/git/plugin.c:319
+msgid "_Rebase"
+msgstr "_Rebase"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:321
+msgid "Merge your changes with an upstream remote branch"
+msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+msgid "_Startâ?¦"
+msgstr "é??å§?(_S)..."
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:329
+msgid "Start a rebase"
+msgstr "é??å§? rebase"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:335
+msgid "_Continue"
+msgstr "_Continue"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:337
+msgid "Continue a rebase that stopped because of conflicts"
+msgstr ""
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:343
+msgid "_Skip"
+msgstr "_Skip"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:345
+msgid "Skip the current conflicted commit and continue"
+msgstr "ç?¥é??ç?®å??è¡?çª?ç?? commit 並繼çº?"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:353
+msgid "Abort the rebase and put the repository in its original state"
+msgstr ""
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+msgid "_Cherry pickâ?¦"
+msgstr "_Cherry pickâ?¦"
+
+#. 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
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:335
+#: ../plugins/git/plugin.c:367
 msgid "_Remote branches"
 msgstr "_Remote branches"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:345
+#: ../plugins/git/plugin.c:377
 msgid "Add a remote branch"
 msgstr "å? å?¥é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:351
-msgid "_Delete..."
-msgstr "_Delete..."
+#: ../plugins/git/plugin.c:383
+msgid "_Deleteâ?¦"
+msgstr "��(_D)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:353
+#: ../plugins/git/plugin.c:385
 msgid "Delete a remote branch"
 msgstr "å?ªé?¤é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:359
-#, fuzzy
-#| msgid "Tabs"
-msgid "Tags"
-msgstr "å??é ?"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:367 ../plugins/git/plugin.c:483
-msgid "_Create tag..."
-msgstr "_Create tag..."
+#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+msgid "_Create tagâ?¦"
+msgstr "建��籤(_C)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:369
+#: ../plugins/git/plugin.c:401
 msgid "Create a tag"
 msgstr "建��籤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:375
-#, fuzzy
-#| msgid "_Delete..."
-msgid "_Delete tag..."
-msgstr "_Delete..."
+#: ../plugins/git/plugin.c:407
+msgid "_Delete tagâ?¦"
+msgstr "���籤(_D)�"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:377
-#, fuzzy
-#| msgid "Deleted: %s"
+#: ../plugins/git/plugin.c:409
 msgid "Delete tags"
-msgstr "已��� %s"
+msgstr "���籤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:383 ../plugins/git/plugin.c:491
-msgid "_Reset tree..."
-msgstr "_Reset tree..."
+#: ../plugins/git/plugin.c:415
+msgid "_Reset/Revert"
+msgstr "_Reset/Revert"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+msgid "_Reset treeâ?¦"
+msgstr "_Reset treeâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:385
+#: ../plugins/git/plugin.c:425
 msgid "Reset repository head to any past state"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391 ../plugins/git/plugin.c:499
-msgid "_Revert commit..."
-msgstr "_Revert commit..."
+#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+msgid "_Revert commitâ?¦"
+msgstr "_Revert commitâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:393
+#: ../plugins/git/plugin.c:433
 msgid "Revert a commit"
 msgstr "復å??æ??交"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:399
-#, fuzzy
+#: ../plugins/git/plugin.c:439
 msgid "Bisect"
-msgstr "é??ç½®(_R)"
+msgstr "Bisect"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:409
-#, fuzzy
+#: ../plugins/git/plugin.c:449
 msgid "Start a bisect operation"
-msgstr "å ?ç??ç·¨è??æ??ä½?"
+msgstr "é??å§? bisect æ??ä½?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:417
+#: ../plugins/git/plugin.c:457
 msgid "Stop the bisect and bring the tree back to normal"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:423
+#: ../plugins/git/plugin.c:463
 msgid "_Good"
 msgstr "_Good"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:425
+#: ../plugins/git/plugin.c:465
 msgid "Mark the current head revision as good"
-msgstr ""
+msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º good"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:431
+#: ../plugins/git/plugin.c:471
 msgid "_Bad"
 msgstr "_Bad"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:433
+#: ../plugins/git/plugin.c:473
 msgid "Mark the current head revision as bad"
-msgstr ""
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:439 ../plugins/git/plugin.c:551
-msgid "_View log..."
-msgstr "_View log..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:441
-msgid "View change history"
-msgstr "檢è¦?è®?æ?´æ­·å?²ç´?é??"
+msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º bad"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:447
-#, fuzzy
-#| msgid "Add to repository"
+#: ../plugins/git/plugin.c:479
 msgid "_Initialize repository"
-msgstr "�����庫"
+msgstr "å??å§?å??æª?æ¡?庫(_I)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:449
+#: ../plugins/git/plugin.c:481
 msgid "Create a new git repository or reinitialize an existing one"
-msgstr ""
+msgstr "建ç«?æ?° git æª?æ¡?庫æ??é??æ?°å??å§?å??ç?¾æ??ç??æª?æ¡?庫"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:459
+#: ../plugins/git/plugin.c:491
 msgid "_Show commit diff"
 msgstr "_Show commit diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:461
+#: ../plugins/git/plugin.c:493
 msgid "Show changes introduced by this commit"
 msgstr "顯示ä»?ç´¹é??次æ??交ç??è®?æ?´"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:467
+#: ../plugins/git/plugin.c:499
 msgid "_View selected revision"
 msgstr "_View selected revision"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:469
+#: ../plugins/git/plugin.c:501
 msgid "View a copy of this file at this revision"
 msgstr "檢è¦?é??次修è¨?ç??ç??æª?æ¡?è¤?æ?¬"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:477
+#: ../plugins/git/plugin.c:509
 msgid "Create a branch with the selected revision as its head"
 msgstr ""
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:485
+#: ../plugins/git/plugin.c:517
 msgid "Create a tag at this revision"
 msgstr "建ç«?此修è¨?ç??ç??æ¨?籤"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:493
-#, fuzzy
+#: ../plugins/git/plugin.c:525
 msgid "Reset repository head to this revision"
-msgstr "è«?輸å?¥èµ·å§?ä¿®è¨?ç??ã??"
+msgstr "é??設é??å??ä¿®è¨?ç??ç??æª?æ¡?庫"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:501
+#: ../plugins/git/plugin.c:533
 msgid "Revert this commit"
 msgstr "復å??此次æ??交"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:509
+#: ../plugins/git/plugin.c:541
 msgid "Merge this commit into the current branch"
 msgstr "å°?é??次æ??交å??ä½µå?°ç?®å??ç??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:515
-#, fuzzy
+#: ../plugins/git/plugin.c:547
 msgid "_Bisect"
-msgstr "é??ç½®(_R)"
+msgstr "_Bisect"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:523
+#: ../plugins/git/plugin.c:555
 msgid "_Set good revision"
 msgstr "_Set good revision"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:525
+#: ../plugins/git/plugin.c:557
 msgid "Mark this revision as good"
-msgstr ""
+msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º good"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:531
+#: ../plugins/git/plugin.c:563
 msgid "_Set bad revision"
 msgstr "_Set bad revision"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:533
+#: ../plugins/git/plugin.c:565
 msgid "Mark this revision as bad"
-msgstr ""
+msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º bad"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:553
+#: ../plugins/git/plugin.c:585
 msgid "View changes to this file or folder"
 msgstr "檢è¦?å?¨é??å??æª?æ¡?æ??è³?æ??夾ç??è®?æ?´"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:561
+#: ../plugins/git/plugin.c:593
 msgid "Add this file or folder to the repository"
 msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å? å?¥æª?æ¡?庫"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:569
+#: ../plugins/git/plugin.c:601
 msgid "Remove this file or folder from the repository"
 msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å¾?æª?æ¡?庫移é?¤"
 
-#: ../plugins/git/plugin.c:731
+#: ../plugins/git/plugin.c:766
 msgid "Top level git menu item"
-msgstr ""
+msgstr "�端層� git ����"
 
-#: ../plugins/git/plugin.c:739
+#: ../plugins/git/plugin.c:774
 msgid "Git operations"
 msgstr "Git æ??ä½?"
 
-#: ../plugins/git/plugin.c:744
+#: ../plugins/git/plugin.c:779
 msgid "Git log operations"
 msgstr "Git ç´?é??æª?æ??ä½?"
 
-#: ../plugins/git/plugin.c:749
+#: ../plugins/git/plugin.c:784
 msgid "Git FM operations"
 msgstr "Git FM æ??ä½?"
 
-#: ../plugins/git/plugin.c:764
+#: ../plugins/git/plugin.c:799
 msgid "Git Log"
 msgstr "Git ç´?é??æª?"
 
@@ -5706,52 +5745,46 @@ msgstr "<b>管ç??é??è?¯</b>"
 msgid "<b>New association</b>"
 msgstr "<b>æ?°å¢?é??è?¯</b>"
 
-#: ../plugins/glade/anjuta-glade.glade.h:4
+#. Link a file with a widget
+#: ../plugins/glade/anjuta-glade.glade.h:5
 msgid "Associate"
 msgstr "é??è?¯"
 
-#: ../plugins/glade/anjuta-glade.glade.h:5
+#: ../plugins/glade/anjuta-glade.glade.h:6
 msgid "Automatically add resources"
 msgstr "è?ªå??å? å?¥ä¾?æº?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:6 ../plugins/glade/plugin.c:755
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:762
+#: ../plugins/glade/plugin.c:3082
 msgid "Designer"
 msgstr "設�師"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3084
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "編輯�"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8
+#: ../plugins/glade/anjuta-glade.glade.h:9
 #, fuzzy
 msgid "Insert handler on edit"
 msgstr "編輯å?¨ç??å­?å??å??é¡?è?²"
 
-#: ../plugins/glade/anjuta-glade.glade.h:9
+#: ../plugins/glade/anjuta-glade.glade.h:10
 msgid "Position type"
 msgstr "ä½?ç½®é¡?å??"
 
-#: ../plugins/glade/anjuta-glade.glade.h:10
+#: ../plugins/glade/anjuta-glade.glade.h:11
 msgid "Separated designer layout"
 msgstr "å??é?¢å¼?設è¨?師é??ç½®"
 
-#: ../plugins/glade/anjuta-glade.glade.h:11
+#: ../plugins/glade/anjuta-glade.glade.h:12
 msgid "Special regexp"
 msgstr "��正�表示�"
 
-#: ../plugins/glade/anjuta-glade.glade.h:12
+#: ../plugins/glade/anjuta-glade.glade.h:13
 msgid "Widget name"
 msgstr "å??件å??稱"
 
-#: ../plugins/glade/anjuta-glade.glade.h:13
-msgid "on_widget_signal"
-msgstr "on_widget_signal"
-
-#: ../plugins/glade/anjuta-glade.glade.h:14
-msgid "widget_signal_cb"
-msgstr "widget_signal_cb"
-
 #: ../plugins/glade/designer-associations-item.c:243
 #, c-format
 msgid "Association item has no designer"
@@ -5782,203 +5815,230 @@ msgstr "ç?¡æ??ç?? %s 屬æ?§æ?¸å?¼"
 msgid "Association item filename has no path"
 msgstr "é??è?¯é ?ç?®æª?æ¡?å??稱æ²?æ??è·¯å¾?"
 
-#: ../plugins/glade/plugin.c:847
+#: ../plugins/glade/plugin.c:856
 #, c-format
-msgid "No associations initialized, nothing to save"
-msgstr "æ²?æ??é??è?¯å®?æ??å??å§?å??ï¼?ä¸?é?²è¡?å?²å­?"
+msgid "No associations initialized: nothing to save"
+msgstr "æ²?æ??é??è?¯å®?æ??å??å§?å??ï¼?ä¸?é?²è¡?å?²å­?"
 
-#: ../plugins/glade/plugin.c:854
+#: ../plugins/glade/plugin.c:863
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr "å? ç?ºå°?æ¡?æ ¹ç?®é??å°?æ?ªè¨­å®?ï¼?ç?¡æ³?å?²å­?é??è?¯"
 
-#: ../plugins/glade/plugin.c:876
+#: ../plugins/glade/plugin.c:885
 #, c-format
 msgid "Failed to save associations"
 msgstr "ç?¡æ³?å?²å­?é??è?¯"
 
-#: ../plugins/glade/plugin.c:1360
+#. iptCurrent:
+#: ../plugins/glade/plugin.c:1184
+msgid "Current"
+msgstr "ç?®å??ç??"
+
+#. iptBeforeEnd:
+#: ../plugins/glade/plugin.c:1185
+msgid "Before end"
+msgstr "æ?¼çµ?æ??å??"
+
+#. iptAfterBegin:
+#: ../plugins/glade/plugin.c:1186
+msgid "After begin"
+msgstr "æ?¼é??å§?å¾?"
+
+#. ipEOF:
+#: ../plugins/glade/plugin.c:1187
+msgid "End of file"
+msgstr "æª?æ¡?ç??çµ?å°¾"
+
+#: ../plugins/glade/plugin.c:1356
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "ç?¡æ³?è?ªæ??ç??å¯?此信è??"
 
-#: ../plugins/glade/plugin.c:1382
+#: ../plugins/glade/plugin.c:1378
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "Python ������"
 
-#: ../plugins/glade/plugin.c:1395
+#: ../plugins/glade/plugin.c:1391
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "Vala ������"
 
-#: ../plugins/glade/plugin.c:1954
+#: ../plugins/glade/plugin.c:1950
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "此設è¨?師æ²?æ??é??è?¯ç??編輯å?¨"
 
-#: ../plugins/glade/plugin.c:1972
+#: ../plugins/glade/plugin.c:1968
 #, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "編輯å?¨ã??%sã??ç??èª?è¨?ä¸?æ??"
+msgid "Unknown editor language \"%s\""
+msgstr "ä¸?æ??ç??編輯å?¨ç??èª?è¨?ã??%sã??"
 
-#: ../plugins/glade/plugin.c:2039 ../plugins/glade/plugin.c:2116
-#: ../plugins/glade/plugin.c:2241
+#: ../plugins/glade/plugin.c:2035 ../plugins/glade/plugin.c:2112
+#: ../plugins/glade/plugin.c:2237
 #, fuzzy, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "å¾?æª?æ¡?è®?å??æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/glade/plugin.c:2046 ../plugins/glade/plugin.c:2130
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2042 ../plugins/glade/plugin.c:2126
+msgid "Couldn't find signal information"
 msgstr "æ?¾ä¸?å?°ä¿¡è??è³?è¨?"
 
-#: ../plugins/glade/plugin.c:2073
+#: ../plugins/glade/plugin.c:2069
 msgid "Error while adding a new handler stub: No current editor"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:2244
+#: ../plugins/glade/plugin.c:2242
 #, c-format
 msgid ""
-"To avoid this messages turn off \"Insert handler on edit\" flag in "
-"Preferences->Glade GUI Designer"
-msgstr ""
+"To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
+msgstr "è¦?é?¿å??é??å??è¨?æ?¯è«?é??é?? å??好設å®?->Glade ä»?é?¢è¨­è¨?師 ç??ã??%sã??"
+
+#: ../plugins/glade/plugin.c:2312
+msgid "Couldn't find an associated document"
+msgstr "æ?¾ä¸?å?°é??è?¯ç??æ??件"
 
-#: ../plugins/glade/plugin.c:2380
+#: ../plugins/glade/plugin.c:2378
 msgid "Those documents are already associated"
 msgstr "é??äº?æ??件已æ??é??è?¯"
 
-#: ../plugins/glade/plugin.c:2418
+#: ../plugins/glade/plugin.c:2416
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "ç?¡æ³?è®?å??æª?æ¡?ï¼?%sã??"
 
-#: ../plugins/glade/plugin.c:3676
+#: ../plugins/glade/plugin.c:3083
+msgid "Top level widget"
+msgstr "é ?端層ç´?è¦?çª?å??件"
+
+#: ../plugins/glade/plugin.c:3674
 msgid "Couldn't find a default signal name"
 msgstr "æ?¾ä¸?å?°é ?設ç??ä¿¡è??å??稱"
 
-#: ../plugins/glade/plugin.c:3886
+#: ../plugins/glade/plugin.c:3883
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "å°?æ¡? %s æ²?æ??廢æ£?ç??è¦?çª?å??件æ??ç??æ?¬ä¸?符ã??"
 
-#: ../plugins/glade/plugin.c:3903
+#: ../plugins/glade/plugin.c:3900
 msgid "There is no Glade project"
 msgstr "æ²?æ?? Glade å°?æ¡?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3989
+#: ../plugins/glade/plugin.c:3986
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:3997 ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:3994 ../plugins/glade/plugin.c:3996
 msgid "Switch between designer/code"
 msgstr "å?¨è¨­è¨?師è??å??å§?碼ä¹?é??å??æ??"
 
-#: ../plugins/glade/plugin.c:4005 ../plugins/glade/plugin.c:4007
+#: ../plugins/glade/plugin.c:4002 ../plugins/glade/plugin.c:4004
 #, fuzzy
 msgid "Insert handler stub"
 msgstr "å? å?¥ä¿¡è??è??ç??å?¨ %s"
 
-#: ../plugins/glade/plugin.c:4013 ../plugins/glade/plugin.c:4015
+#: ../plugins/glade/plugin.c:4010 ../plugins/glade/plugin.c:4012
 msgid "Insert handler stub, autoposition"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:4021
+#: ../plugins/glade/plugin.c:4018
 msgid "Associate last designer and last editor"
 msgstr "å°?æ??å¾?ç??設è¨?師è??æ??å¾?ç??編輯å?¨é??è?¯"
 
-#: ../plugins/glade/plugin.c:4023
+#: ../plugins/glade/plugin.c:4020
 msgid "Associate last designer and editor"
 msgstr "å°?æ??å¾?ç??設è¨?師è??編輯å?¨é??è?¯"
 
-#: ../plugins/glade/plugin.c:4029 ../plugins/glade/plugin.c:4031
-msgid "Associations dialog..."
-msgstr "é??è?¯æ?§å°?話ç??..."
+#: ../plugins/glade/plugin.c:4026 ../plugins/glade/plugin.c:4028
+msgid "Associations dialogâ?¦"
+msgstr "é??è?¯å°?話ç??â?¦"
 
-#: ../plugins/glade/plugin.c:4037
-msgid "Versioning..."
-msgstr "æ­£å?¨å®?ç??..."
+#: ../plugins/glade/plugin.c:4034
+msgid "Versioningâ?¦"
+msgstr "æ­£å?¨å®?ç??â?¦"
 
-#: ../plugins/glade/plugin.c:4039
+#: ../plugins/glade/plugin.c:4036
 msgid "Switch between library versions and check deprecations"
 msgstr "å?¨ç¨?å¼?庫ç??æ?¬è??檢æ?¥å»¢æ£?ä¹?é??å??æ??"
 
-#: ../plugins/glade/plugin.c:4045 ../plugins/glade/plugin.c:4047
+#: ../plugins/glade/plugin.c:4042 ../plugins/glade/plugin.c:4044
 msgid "Set as default resource target"
 msgstr "設ç?ºé ?設ç??è³?æº?ç?®æ¨?"
 
-#: ../plugins/glade/plugin.c:4055
+#: ../plugins/glade/plugin.c:4052
 msgid "Current default target"
 msgstr "ç?®å??ç??é ?設ç?®æ¨?"
 
-#: ../plugins/glade/plugin.c:4063
+#: ../plugins/glade/plugin.c:4060
 msgid "Close the current file"
 msgstr "é??é??ç?®å??æª?æ¡?"
 
-#: ../plugins/glade/plugin.c:4071
+#: ../plugins/glade/plugin.c:4068
 msgid "Save the current file"
 msgstr "å?²å­?ç?®å??æª?æ¡?"
 
-#: ../plugins/glade/plugin.c:4087
+#: ../plugins/glade/plugin.c:4084
 msgid "Redo the last action"
 msgstr "é??æ?°é?²è¡?å??é??å??ç??ä¸?æ­¥"
 
-#: ../plugins/glade/plugin.c:4095
+#: ../plugins/glade/plugin.c:4092
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??å??å??"
 
-#: ../plugins/glade/plugin.c:4103
+#: ../plugins/glade/plugin.c:4100
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å??å??å??"
 
-#: ../plugins/glade/plugin.c:4111
+#: ../plugins/glade/plugin.c:4108
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../plugins/glade/plugin.c:4119
+#: ../plugins/glade/plugin.c:4116
 msgid "Delete the selection"
 msgstr "æ¸?é?¤é?¸å??å??å??"
 
-#: ../plugins/glade/plugin.c:4297
+#: ../plugins/glade/plugin.c:4294
 msgid "Glade designer operations"
 msgstr "Glade 設è¨?師æ??ä½?"
 
-#: ../plugins/glade/plugin.c:4397
+#: ../plugins/glade/plugin.c:4394
 msgid "Go back in undo history"
 msgstr "å?¨å¾©å??ç´?é??中å¾?å¾?"
 
-#: ../plugins/glade/plugin.c:4399
+#: ../plugins/glade/plugin.c:4396
 msgid "Go forward in undo history"
 msgstr "å?¨å¾©å??ç´?é??中å¾?å??"
 
-#: ../plugins/glade/plugin.c:4421
+#: ../plugins/glade/plugin.c:4418
 msgid "Glade Clipboard"
 msgstr "Glade �貼簿"
 
-#: ../plugins/glade/plugin.c:4426
+#: ../plugins/glade/plugin.c:4423
 msgid "Widgets"
 msgstr "è¦?çª?å??件"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4428
 msgid "Palette"
 msgstr "å??件ä¸?覽表"
 
-#: ../plugins/glade/plugin.c:4685
+#: ../plugins/glade/plugin.c:4682
 #, c-format
 msgid "Not local file: %s"
 msgstr "�������%s"
 
-#: ../plugins/glade/plugin.c:4706
+#: ../plugins/glade/plugin.c:4703
 #, c-format
 msgid "Could not open %s"
 msgstr "ç?¡æ³?é??å?? %s"
 
-#: ../plugins/glade/plugin.c:4757
+#: ../plugins/glade/plugin.c:4754
 msgid "Could not create a new glade project."
 msgstr "ç?¡æ³?建ç«?æ?° Glade å°?æ¡?ã??"
 
-#: ../plugins/glade/plugin.c:5027 ../plugins/glade/plugin.c:5052
+#: ../plugins/glade/plugin.c:5025 ../plugins/glade/plugin.c:5050
 msgid "Glade GUI Designer"
 msgstr "Glade ��設�師"
 
@@ -5990,8 +6050,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"
@@ -6011,7 +6071,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 "å??é¡?:"
 
@@ -6052,8 +6112,8 @@ 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"
-msgstr "n/a"
+msgid "N/A"
+msgstr "N/A"
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -6061,27 +6121,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 "æ?¨é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
 
 #: ../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 "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
 
-#: ../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 "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
 
 #: ../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 "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
 
 #: ../plugins/gtodo/export.c:47
@@ -6153,8 +6209,8 @@ msgstr "ç?¡æ³?è®?å??æª?æ¡?"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
-msgid "Failed to parse xml structure"
-msgstr "å??æ?? xml çµ?æ§?失æ??"
+msgid "Failed to parse XML structure"
+msgstr "å??æ?? XML çµ?æ§?失æ??"
 
 #: ../plugins/gtodo/libgtodo.c:646
 #, c-format
@@ -6210,18 +6266,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 "ä¸?å??顯示(_D)"
 
@@ -6234,8 +6290,8 @@ msgid "Hide _Completed Items"
 msgstr "é?±è??å·²å®?æ??é ?ç?®(_C)"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
-msgstr "é?±è??å·²å®?æ??é ?ç?®"
+msgid "Hide completed to-do items"
+msgstr "é?±è??å·²å®?æ??ç??å¾?辦äº?é ?"
 
 #: ../plugins/gtodo/plugin.c:83
 msgid "Hide Items Past _Due Date"
@@ -6254,11 +6310,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
@@ -6266,12 +6322,12 @@ msgid "Tasks"
 msgstr "工�"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "å¾?辦äº?é ?管ç??å?¡"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
-msgstr "å¾?辦äº?é ?å??好設å®?"
+msgid "To-do List Preferences"
+msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
 
 #: ../plugins/gtodo/preferences.c:84
 msgid "Interface"
@@ -6319,11 +6375,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"
@@ -6337,7 +6393,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
@@ -6346,8 +6402,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] "å??許å¾?辦äº?é ?å?¨å?°æ??ç?? %i å??é??å??é??ç?¥æ??"
 
 #: ../plugins/gtodo/tasklists.c:10
@@ -6362,29 +6418,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"
@@ -6409,15 +6465,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 "å? å?¥/編輯巨é??"
 
@@ -6436,24 +6492,24 @@ msgid "Macros"
 msgstr "å·¨é??"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
-msgstr "æ??å?¥å·¨é??(_I)..."
+msgid "_Insert Macroâ?¦"
+msgstr "æ??å?¥å·¨é??(_I)â?¦"
 
 #: ../plugins/macro/plugin.c:44
 msgid "Insert a macro using a shortcut"
 msgstr "使ç?¨å¿«æ?·é?µæ??å?¥å·¨é??"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
-msgstr "å? å?¥å·¨é??(_A)..."
+msgid "_Add Macroâ?¦"
+msgstr "å? å?¥å·¨é??(_A)â?¦"
 
 #: ../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"
@@ -6463,74 +6519,80 @@ 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
 #, fuzzy
 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 ""
+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 ""
+msgstr "è¦?顯示ç??æ??å¾?å­?å??æ?¸ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
-#, fuzzy
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
-msgstr "步�(_O)"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
-msgstr "Tabs �置�"
+msgstr "���"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+msgid "Tab position:"
+msgstr "Tab �置�"
+
+#: ../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
+#, fuzzy
 msgid "Underline-Plain"
-msgstr ""
+msgstr "ç´?æ??å­? (ASCII)"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
+#, fuzzy
 msgid "Underline-Squiggle"
-msgstr ""
+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
 #, fuzzy
 msgid "Underline-TT"
-msgstr "æ?ªè¨?ç??æ?¬"
+msgstr "使���"
 
-#: ../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 "è­¦å??ï¼?"
 
@@ -6538,56 +6600,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"
@@ -6651,16 +6713,16 @@ msgid "Patching %s using %s\n"
 msgstr "使� %2$s 修� %1$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 ""
@@ -6679,7 +6741,7 @@ msgstr "ä¿®è£?å®?æ??"
 #: ../plugins/patch/patch-plugin.ui.h:1
 #: ../plugins/subversion/anjuta-subversion.ui.h:14
 msgid "Dry run"
-msgstr ""
+msgstr "Dry run"
 
 #: ../plugins/patch/patch-plugin.ui.h:2
 msgid "File/Directory to patch:"
@@ -6702,75 +6764,79 @@ msgstr "工�(_T)"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "修�(_P)..."
+msgid "_Patchâ?¦"
+msgstr "_Patchâ?¦"
 
 #: ../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 ""
 "ç?¢ç??å°?æ¡?æª?æ¡?失æ??ã??æ?¾ä¸?å?°é?©å??ç??å°?æ¡?ç¯?æ?¬å?¯ç?¨ã??è«?確å®?æ?¨ç?? Anjuta ç??æ?¬æ?¯æ??æ?°ç??ã??"
 
-#: ../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) 中æ?¾ä¸?å?°æ??æ??ç??å°?æ¡?å¾?端ç¨?å¼?ã??è«?é?¸æ??ä¸?å??ç??ç?®é??ï¼?æ??å??試å??ç´?ç?ºæ?´"
-"æ?°ç?? Anjuta ç??æ?¬ã??"
+"æ?°ç?? Anjutaã??"
 
-#: ../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 ""
+"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/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 "����"
@@ -6824,130 +6890,152 @@ msgid "_Group name:"
 msgstr "群çµ?å??稱(_G):"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)..."
+msgid "_Select file to addâ?¦"
+msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)â?¦"
 
-#: ../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:231
+#: ../plugins/project-manager/plugin.c:1430
+#: ../plugins/project-manager/plugin.c:1513
+#: ../plugins/project-manager/plugin.c:1689
 #: ../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:232
 msgid "GbfProject Object"
 msgstr "GbfProject �件"
 
-#: ../plugins/project-manager/gbf-project-model.c:251
+#: ../plugins/project-manager/gbf-project-model.c:677
 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"
-msgstr "����群�"
+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"
-msgstr "��������"
+#: ../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:907
+msgid "Project properties"
+msgstr "��屬�"
+
+#: ../plugins/project-manager/plugin.c:511
+#, fuzzy
+msgid "Refreshing symbol treeâ?¦"
+msgstr "å??å¾?符è??宣å??"
+
+#: ../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:696
 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
+#: ../plugins/project-manager/plugin.c:699
 msgid ""
-"Group: %s\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
-"The group will not be deleted from file system."
 msgstr ""
-"群��%s\n"
+"æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
-"該群çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:667
+#: ../plugins/project-manager/plugin.c:702
 msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
-"æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
+"æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?碼æª?å¾?å°?æ¡?中移é?¤ï¼?\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:705
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following elements from the project?\n"
 "\n"
 msgstr ""
-"æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?æª?å¾?å°?æ¡?中移é?¤ï¼?\n"
+"æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??ç´ å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:672
+#: ../plugins/project-manager/plugin.c:722
 #, c-format
-msgid ""
-"Source: %s\n"
-"\n"
-"The source file will not be deleted from file system."
-msgstr ""
-"���%s\n"
-"\n"
-"該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+msgid "Group: %s\n"
+msgstr "群��%s\n"
+
+#: ../plugins/project-manager/plugin.c:725
+#, c-format
+msgid "Target: %s\n"
+msgstr "���%s\n"
+
+#: ../plugins/project-manager/plugin.c:728
+#, c-format
+msgid "Source: %s\n"
+msgstr "���%s\n"
+
+#: ../plugins/project-manager/plugin.c:731
+#, c-format
+msgid "Shortcut: %s\n"
+msgstr "æ?·å¾?ï¼?%s\n"
+
+#: ../plugins/project-manager/plugin.c:743
+msgid "The group will not be deleted from the file system."
+msgstr "é??å??群çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:745
+msgid "The source file will not be deleted from the file system."
+msgstr "該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:750
+msgid "Confirm remove"
+msgstr "確�移�"
 
-#: ../plugins/project-manager/plugin.c:727
+#: ../plugins/project-manager/plugin.c:795
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6956,151 +7044,147 @@ msgstr ""
 "移é?¤â??%sâ??失æ??ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:784
+#: ../plugins/project-manager/plugin.c:865
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "å??å?? %s ç?? URI è³?è¨?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:822
+#: ../plugins/project-manager/plugin.c:903
 msgid "_Project"
 msgstr "å°?æ¡?(_P)"
 
-#: ../plugins/project-manager/plugin.c:826
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:907
+#: ../plugins/project-manager/plugin.c:941
 msgid "_Properties"
 msgstr "屬�(_P)"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "_Refresh"
 msgstr "é??æ?°æ?´ç??(_R)"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:912
 msgid "Refresh project manager tree"
 msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
 
-#: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "��群�(_G)..."
+#: ../plugins/project-manager/plugin.c:917
+msgid "Add _Groupâ?¦"
+msgstr "��群�(_G)�"
 
-#: ../plugins/project-manager/plugin.c:836
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add a group to project"
 msgstr "��群����"
 
-#: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "����(_T)..."
+#: ../plugins/project-manager/plugin.c:922
+msgid "Add _Targetâ?¦"
+msgstr "����(_T)�"
 
-#: ../plugins/project-manager/plugin.c:841
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:922
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add a target to project"
 msgstr "�������"
 
-#: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "å? å?¥å??å§?æª?(_S)"
+#: ../plugins/project-manager/plugin.c:927
+msgid "Add _Source Fileâ?¦"
+msgstr "������(_S)�"
 
-#: ../plugins/project-manager/plugin.c:846
-#: ../plugins/project-manager/plugin.c:865
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:927
+#: ../plugins/project-manager/plugin.c:946
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add a source file to project"
 msgstr "å? å?¥å??å§?æª?è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close Pro_ject"
 msgstr "é??é??å°?æ¡? (_J)"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:932
 msgid "Close project"
 msgstr "é??é??å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:941
 msgid "Properties of group/target/source"
 msgstr "群çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
 
-#: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
+#: ../plugins/project-manager/plugin.c:946
+msgid "_Add to Project"
 msgstr "�����(_A)"
 
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:951
 msgid "Add _Group"
 msgstr "��群�(_G)"
 
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:956
 msgid "Add _Target"
 msgstr "����(_T)"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:961
 msgid "Add _Source File"
 msgstr "å? å?¥å??å§?æª?(_S)"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Re_move"
 msgstr "移�(_M)"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:966
 msgid "Remove from project"
 msgstr "���中移�"
 
-#: ../plugins/project-manager/plugin.c:1259
+#: ../plugins/project-manager/plugin.c:1387
 #, c-format
 msgid "Loading project: %s"
 msgstr "正������%s"
 
-#: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
-msgstr "已建���檢�..."
+#: ../plugins/project-manager/plugin.c:1395
+msgid "Created project viewâ?¦"
+msgstr "已建���檢��"
 
-#: ../plugins/project-manager/plugin.c:1280
+#: ../plugins/project-manager/plugin.c:1408
 #, 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:1601
 #, c-format
 msgid "Error closing project: %s"
 msgstr "é??é??å°?æ¡?æ??é?¯èª¤ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1536
+#: ../plugins/project-manager/plugin.c:1668
 msgid "Project manager actions"
 msgstr "å°?æ¡?管ç??å?¡å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:1544
+#: ../plugins/project-manager/plugin.c:1676
 msgid "Project manager popup actions"
 msgstr "å°?æ¡?管ç??å?¡å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
-msgstr "å??å§?å??å°?æ¡?..."
+#: ../plugins/project-manager/plugin.c:2471
+msgid "Initializing Projectâ?¦"
+msgstr "å??å§?å??å°?æ¡?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2644
+#: ../plugins/project-manager/plugin.c:2474
 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
+#: ../plugins/project-wizard/druid.c:150
 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
+#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../plugins/project-wizard/druid.c:150
+#: ../plugins/project-wizard/druid.c:153
 msgid "Message"
 msgstr "��"
 
-#: ../plugins/project-wizard/druid.c:216
+#: ../plugins/project-wizard/druid.c:232
 msgid ""
 "<b>Confirm the following information:</b>\n"
 "\n"
@@ -7110,17 +7194,17 @@ msgstr ""
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:220
+#: ../plugins/project-wizard/druid.c:236
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "å°?æ¡?é¡?å??ï¼?%s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:393
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "����任���樣�� %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:594
 #, c-format
 msgid ""
 "\n"
@@ -7129,21 +7213,31 @@ msgstr ""
 "\n"
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?輸å?¥å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:590
+#: ../plugins/project-wizard/druid.c:609
 #, 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:614
+#, 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:619
 #, c-format
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:646
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
@@ -7152,20 +7246,20 @@ msgstr ""
 "ç?®é??ã??%sã??ä¸?æ?¯ç©ºç??ã??å¦?æ??æ??äº?æª?æ¡?ç?¡æ³?寫å?¥ï¼?å°?æ¡?ç??建ç«?å?¯è?½æ??失æ??ã??確å®?è¦?ç¹¼çº?"
 "å??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:648
 #, 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:679
 msgid "Invalid entry"
 msgstr "ç?¡æ??ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:690
 msgid "Dubious entry"
 msgstr "ä¸?確å®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:851
 #, c-format
 msgid ""
 "\n"
@@ -7174,7 +7268,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:862
 #, c-format
 msgid ""
 "\n"
@@ -7183,7 +7277,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?件ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:871
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -7192,25 +7286,29 @@ msgstr ""
 "編譯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?件é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??確å®?å®?å??å·²ç¶?æ­£"
 "確ç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:879
+msgid "Install missing packages"
+msgstr "å®?è£?缺å°?ç??å¥?件"
+
+#: ../plugins/project-wizard/druid.c:887
 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:895
 msgid "Missing components"
 msgstr "é?ºå¤±å??件"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:1027
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?建ç«?å°?æ¡?å?©ç??使ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7230,18 +7328,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
@@ -7254,466 +7352,37 @@ 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 "é?¸å??æª?æ¡?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:1
-msgid "A GNOME applet project"
-msgstr "GNOME ������"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:2
-msgid "A generic C++ project"
-msgstr "�� C++ ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:3
-msgid "A generic GTK+ project"
-msgstr "�� GTK+ ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:4
-msgid "A generic GTKmm (C++) project"
-msgstr "�� GTKmm (C++) ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:5
-msgid "A generic Xlib dock applet"
-msgstr "�� Xlib dock ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:6
-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 å°?æ¡?管ç??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:8
-msgid "A generic minimal and flat project"
-msgstr "é??ç?¨ã??æ??å°?å??ç??å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:9
-msgid ""
-"A generic natively compiled java project using the GNU Java Compiler (gcj)"
-msgstr "ä¸?è?¬å??ç??編譯 java å°?æ¡?ï¼?使ç?¨ GNU Java 編譯å?¨ (gcj)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:10
-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 å°?æ¡?管ç??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wx Widgets project"
-msgstr "�� wx Widgets ��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:13
-msgid "A sample SDL project"
-msgstr "SDL 樣���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:14
-msgid "Add C++ support:"
-msgstr "�� C++ ���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:15
-msgid "Add gtk-doc system:"
-msgstr "�� gtk-doc 系統�"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:16
-msgid "Add internationalization:"
-msgstr "å? å?¥å??é??å??å??è?½:"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:17
-msgid "Add shared library support:"
-msgstr "���享��庫���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:18
-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
-msgid "Adds support for building shared libraries in your project"
-msgstr "å?¨æ?¨ç??å°?æ¡?中å? å?¥ç·¨è­¯å?±äº«ç¨?å¼?庫ç??æ?¯æ?´"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:20
-msgid ""
-"Adds support for internationalization so that your project can have "
-"translations in different languages"
-msgstr "å? å?¥å??é??å??æ?¯æ?´ï¼?è®?æ?¨ç??å°?æ¡?å?¯ä»¥ç¿»è­¯æ??ä¸?å??ç??èª?è¨?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:21
-msgid "Anjuta Plugin"
-msgstr "Anjuta å¤?æ??ç¨?å¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:22
-msgid "Anjuta plugin project that uses libanjuta framework"
-msgstr "使ç?¨ libanjuta æ?¶æ§?ç?? Anjuta å¤?æ??ç¨?å¼?å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:23
-msgid "Applet Title:"
-msgstr "������:"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:25
-msgid "Basic information"
-msgstr "����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:26
-msgid "Berkeley Software Distribution License (BSD)"
-msgstr "æ??å??è??è»?é«?æ?£ä½?許å?¯è­? ï¼?BSDï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:27
-msgid ""
-"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
-msgid "Configure external packages"
-msgstr "設����件"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:29
-msgid "Configure external packages:"
-msgstr "設����件�"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:30
-#, fuzzy
-#| msgid "Create glade interface file"
-msgid "Create Gtk Builder interface file"
-msgstr "建� glade ���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:31
-#, fuzzy
-#| msgid "Create a template glade interface file"
-msgid "Create a template Gtk Builder interface file"
-msgstr "建� Glade ��樣��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:32
-#, fuzzy
-#| msgid "Create a template glade interface file"
-msgid "Create a template gtk builder interface file"
-msgstr "建� Glade ��樣��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
-msgid "Display description of the applet"
-msgstr "顯示é?¢æ?¿ç¨?å¼?ç??æ??è¿°"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
-msgid "Display description of the plugin"
-msgstr "顯示å¤?æ??ç¨?å¼?ç??æ??è¿°"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
-msgid "Display title of the applet"
-msgstr "顯示é?¢æ?¿ç¨?å¼?ç??æ¨?é¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
-msgid "Display title of the plugin"
-msgstr "顯示å¤?æ??ç¨?å¼?ç??æ¨?é¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
-msgid "Django Project"
-msgstr "Django å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
-msgid "Django Project information"
-msgstr "Django ����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
-msgid "Email address:"
-msgstr "Email å?°å??ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
-msgid "GCJ needs to know which class contains the main() function"
-msgstr "GCJ é??è¦?ç?¥é??å?ªå??é¡?å?¥(class)å?«æ?? main() å?½å¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
-msgid "GNOME Applet"
-msgstr "GNOME ����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
-msgid "GTK+"
-msgstr "GTK+"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
-msgid "GTKmm"
-msgstr "GTKmm"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
-msgid "General Project Information"
-msgstr "������"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
-msgid "Generic"
-msgstr "��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
-msgid "Generic (Minimal)"
-msgstr "ä¸?è?¬(æ??å°?)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
-msgid "Generic C++"
-msgstr "ç?¢ç?? C++"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
-msgid "Generic gcj compiled java"
-msgstr "ä¸?è?¬ gcj 編譯ç?? java"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
-msgid "Generic java (automake)"
-msgstr "�� java (automake)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
-msgid "Generic python (automake)"
-msgstr "�� python (automake)"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
-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 "
-"'libgnomeui-2.0 >= 2.2.0'"
-msgstr ""
-"æ??å®?æ?¨ç??å°?æ¡?é??è¦?ç??å¥?件å??稱ã??æ?¨ä¹?å?¯ä»¥æ??å?ºè©²å¥?件æ??é??ç??ç??æ?¬ã??ä¾?å¦?ã??libgnomeui-"
-"2.0ã??æ??ã??libgnomeui-2.0 >= 2.2.0ã??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
-msgid "Icon File:"
-msgstr "å??示æª?ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
-msgid "Icon file for the plugin"
-msgstr "å¤?æ??ç¨?å¼?ç??å??示æª?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
-msgid "Implement plugin interfaces"
-msgstr "實å??å¤?æ??ç¨?å¼?ä»?é?¢"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
-msgid "Interface implemented by the plugin"
-msgstr "實ä½?ä»?é?¢ç??å¤?æ??ç¨?å¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
-msgid "Interface:"
-msgstr "���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
-msgid "License"
-msgstr "æ??æ¬?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
-msgid "Main Class:"
-msgstr "主���"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
-msgid "Main class"
-msgstr "主��"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
-msgid "Makefile project"
-msgstr "Makefile å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
-msgid "Makefile-based project"
-msgstr "å?ºæ?¼ Makefile ç??å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
-msgid "Mininum SDL version required"
-msgstr "é??è¦?æ??å°? SDL ç??æ?¬"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
-msgid "Name of the value to watch"
-msgstr "è¦?ç?£æ?§ç??æ?¸å?¼å??稱"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
-msgid "No license"
-msgstr "æ²?æ??æ??æ¬?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
-msgid "Options for project build system"
-msgstr "å°?æ¡?編譯系統ç??é?¸é ?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
-msgid "Plugin Class Name:"
-msgstr "å¤?æ??ç¨?å¼?é¡?å?¥å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
-msgid "Plugin Dependencies:"
-msgstr "å¤?æ??ç¨?å¼?æ??è¿°ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
-msgid "Plugin Description:"
-msgstr "å¤?æ??ç¨?å¼?æ??è¿°ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
-msgid "Plugin Title:"
-msgstr "å¤?æ??ç¨?å¼?æ¨?é¡?ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
-msgid "Plugin class name"
-msgstr "å¤?æ??ç¨?å¼?é¡?å?¥å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
-msgid "Plugin has menus or/and toolbars"
-msgstr "å¤?æ??ç¨?å¼?å?·æ??é?¸å?®æ??/å??å·¥å?·å??"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
-msgid "Plugin interfaces to implement"
-msgstr "欲實å??ç??å¤?æ??ç¨?å¼?ä»?é?¢"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
-msgid "Project Name:"
-msgstr "å°?æ¡?å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
-msgid "Project directory, output file etc."
-msgstr "å°?æ¡?ç?®é??ï¼?輸å?ºæª?æ¡?ç­?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
-msgid "Project directory:"
-msgstr "å°?æ¡?ç?®é??ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
-msgid ""
-"Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
-msgstr ""
-"å°?æ¡?å??稱ä¸?è?½å?«æ??空ç?½ï¼?å? ç?ºå®?æ??æ??ç?ºè©²å°?æ¡?編譯ç?®æ¨?(å?¯å?·è¡?æª?ã??ç¨?å¼?庫ç­?)ç??å??稱"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
-msgid "Project name:"
-msgstr "å°?æ¡?å??稱ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
-msgid "Project options"
-msgstr "����"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
-msgid "Python webproject using Django Web Framework"
-msgstr "使ç?¨ Django Web æ?¶æ§?ç?? Python 網路å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
-msgid "Require Package:"
-msgstr "é??è¦?å¥?件ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
-msgid "Require SDL version:"
-msgstr "é??è¦? SDL ç??æ?¬ï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
-msgid "Require SDL_gfx library"
-msgstr "é??è¦? SDL_gfx å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
-msgid "Require SDL_gfx:"
-msgstr "é??è¦? SDL_gfxï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
-msgid "Require SDL_image library"
-msgstr "é??è¦? SDL_image å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
-msgid "Require SDL_image:"
-msgstr "é??è¦? SDL_imageï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
-msgid "Require SDL_mixer library"
-msgstr "é??è¦? SDL_mixer å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
-msgid "Require SDL_mixer:"
-msgstr "é??è¦? SDL_mixerï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
-msgid "Require SDL_net library"
-msgstr "é??è¦? SDL_net å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
-msgid "Require SDL_net:"
-msgstr "é??è¦? SDL_netï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
-msgid "Require SDL_ttf library"
-msgstr "é??è¦? SDL_ttf å?½å¼?庫"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
-msgid "Require SDL_ttf:"
-msgstr "é??è¦? SDL_ttfï¼?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
-msgid "SDL"
-msgstr "SDL"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
-msgid "Select code license"
-msgstr "é?¸æ??å??å§?碼æ??æ¬?"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
-msgid "Shell values to watch"
-msgstr "è¦?ç?£æ?§ç?? Shell æ?¸å?¼"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
-msgid "Use pkg-config to add library support from other packages"
-msgstr "使� pkg"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
-msgid "Value Name:"
-msgstr "æ?¸å?¼å??稱:"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
-msgid "Values to watch"
-msgstr "è¦?ç?£æ?§ç??æ?¸å?¼"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
-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:105
-msgid "Xlib"
-msgstr "Xlib"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
-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 æ?¯ç?¨ä¾?編譯以 GObject ç?ºå?ºç¤?ç??é¡?å?¥ä¹? API æ??件"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
-msgid "project name"
-msgstr "å°?æ¡?å??稱"
-
 #: ../plugins/run-program/anjuta-run-program.ui.h:2
 msgid "Choose a working directory"
 msgstr "é?¸æ??ä¸?å??å·¥ä½?ç?®é??"
@@ -7731,18 +7400,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
@@ -7753,16 +7417,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"
@@ -7773,191 +7432,190 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:229
+#: ../plugins/run-program/plugin.c:231
 msgid "_Run"
 msgstr "å?·è¡?(_R)"
 
-#: ../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 "�使���工������"
+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:280
+#: ../plugins/run-program/plugin.c:257
+msgid "Set current program, arguments, etc."
+msgstr "設å®?ç?®å??ç??ç¨?å¼?ã??å¼?æ?¸ç­?ç­?ã??"
+
+#: ../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 ""
+msgstr "Greedy matching"
 
-#: ../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 "æ??å°?(_F)..."
+msgid "_Findâ?¦"
+msgstr "å°?æ?¾(_F)â?¦"
 
 #: ../plugins/search/plugin.c:69
 msgid "Search for a string or regular expression in the editor"
@@ -7976,8 +7634,8 @@ msgid "Find _Previous"
 msgstr "æ?¾ä¸?ä¸?å??(_P)"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
-msgstr "æ??å°?å??å??代(_E)..."
+msgid "Find and R_eplaceâ?¦"
+msgstr "å°?æ?¾è??å??代(_R)â?¦"
 
 #: ../plugins/search/plugin.c:80
 msgid ""
@@ -7989,16 +7647,16 @@ msgid "Search and Replace"
 msgstr "æ??å°?å??å??代"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
-msgstr "���中��(_D)..."
+msgid "Fin_d in Filesâ?¦"
+msgstr "���中��(_D)�"
 
 #: ../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"
@@ -8070,76 +7728,76 @@ msgstr "å??代"
 msgid "Search complete"
 msgstr "æ??å°?å®?æ??"
 
-#: ../plugins/search/search-replace.c:1037
-#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1044
+#: ../plugins/search/search-replace.c:1731
 msgid "Replace All"
 msgstr "å?¨é?¨å??代"
 
-#: ../plugins/search/search-replace.c:1076
+#: ../plugins/search/search-replace.c:1083
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??å?¥å­?ã??æ?¯å?¦è¦?å¾?é ­é??å§?æ??å°?ï¼?"
 
-#: ../plugins/search/search-replace.c:1096
+#: ../plugins/search/search-replace.c:1103
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??é ?ç?®ã??"
 
-#: ../plugins/search/search-replace.c:1111
+#: ../plugins/search/search-replace.c:1118
 msgid "The maximum number of results has been reached."
 msgstr "å·²é??å?°çµ?æ??ç??æ??大æ?¸é??ã??"
 
-#: ../plugins/search/search-replace.c:1124
+#: ../plugins/search/search-replace.c:1131
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "å·²å??代 %d å??符å??é ?ã??"
 
-#: ../plugins/search/search-replace.c:1291
-msgid "Unable to build user interface for Search And Replace"
+#: ../plugins/search/search-replace.c:1298
+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"
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. 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?"
+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"
@@ -8157,115 +7815,119 @@ msgid "Create backup files"
 msgstr "建ç«?å??份æª?æ¡?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+msgid "Enable autocompletion for document words"
+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 "Tab 大�(空��):"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
 msgid "Use tabs for indentation"
 msgstr "使ç?¨ tabs 縮æ??"
 
-#: ../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
 #, fuzzy
 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 "Anjuta ç??é¦?é ?"
 
-#: ../plugins/starter/starter.c:475
+#: ../plugins/starter/starter.c:480
 msgid "Anjuta Manual"
 msgstr "Anjuta æ??å??"
 
-#: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
-msgstr "Gnome ç·?ä¸? API æ??件"
+#: ../plugins/starter/starter.c:486
+msgid "GNOME Online API Documentation"
+msgstr "GNOME ç·?ä¸? API æ??件"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "Add file/directory"
@@ -8288,9 +7950,8 @@ msgid "Diff file/directory"
 msgstr "æ¯?å°?æª?æ¡?/ç?®é??å·®ç?°"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:12
-#, fuzzy
 msgid "Diff to Previous"
-msgstr "æ?¾ä¸?ä¸?å??(_P)"
+msgstr "Diff è?³å??ä¸?å??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:15
 msgid "End Revision:"
@@ -8311,7 +7972,7 @@ msgstr "第�路��"
 #: ../plugins/subversion/anjuta-subversion.ui.h:20
 #, fuzzy
 msgid "Ignore ancestry"
-msgstr "忽���:"
+msgstr "忽ç?¥é?±è??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:22
 msgid "Merge changes into working copy"
@@ -8326,14 +7987,12 @@ msgid "Previous Commit Messages:"
 msgstr "ä¸?ä¸?å??æ??交è¨?æ?¯ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:28
-#, fuzzy
 msgid "Realm:"
-msgstr "é??æ?°å?½å??(_R)"
+msgstr "é ?å??ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:29
-#, fuzzy
 msgid "Recurse"
-msgstr "é??ç½®(_R)"
+msgstr "é??è¿´"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:30
 msgid "Remember Password"
@@ -8348,94 +8007,96 @@ msgid "Remove file/directory"
 msgstr "移é?¤æª?æ¡?/ç?®é??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:33
-#, fuzzy
 msgid "Repository Head"
-msgstr "<b>��庫�</b>"
+msgstr "��庫 Head"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:34
 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
-#, fuzzy
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
-msgstr "ç·¨è??"
+msgstr "é ?å??"
 
 #. Action name
 #. Stock icon, if any
@@ -8464,8 +8125,8 @@ msgstr "æ??交æ?¨ç??ä¿®æ?¹è?³ Subversion 樹"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
-msgstr "�復(_R)..."
+msgid "_Revertâ?¦"
+msgstr "_Revertâ?¦"
 
 #. Display label
 #. short-cut
@@ -8476,8 +8137,8 @@ msgstr "å??復è®?æ?´è?³æ?¨ç??å·¥ä½?è¤?æ?¬ã??"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
-msgstr "調解��(_R)..."
+msgid "_Resolve Conflictsâ?¦"
+msgstr "_Resolve Conflictsâ?¦"
 
 #. Display label
 #. short-cut
@@ -8488,20 +8149,20 @@ msgstr "調解æ?¨å·¥ä½?è¤?æ?¬ä¸­ç??è¡?çª?ã??"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "æ?´æ?°(_U)..."
+msgid "_Updateâ?¦"
+msgstr "_Updateâ?¦"
 
 #. 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 樹å??æ­¥"
 
 #. 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
@@ -8512,8 +8173,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
@@ -8524,8 +8185,8 @@ msgstr "å??æ??æ?¨ç??æ?¬å?°ç«¯è¤?æ?¬å?°æª?æ¡?庫中ç??å??æ?¯æ??æ¨?籤"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "å??ä½µ..."
+msgid "Mergeâ?¦"
+msgstr "Mergeâ?¦"
 
 #. Display label
 #. short-cut
@@ -8536,8 +8197,8 @@ msgstr "å??ä½µè®?æ?´è?³ä½ ç??å·¥ä½?è¤?æ?¬ä¸­"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "檢è¦?ç´?é??(_V)..."
+msgid "_View Logâ?¦"
+msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
 
 #. Display label
 #. short-cut
@@ -8548,8 +8209,8 @@ msgstr "檢���歷�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "差�(_D)..."
+msgid "_Diffâ?¦"
+msgstr "_Diffâ?¦"
 
 #. Display label
 #. short-cut
@@ -8560,14 +8221,14 @@ msgstr "æ¯?å°?æ?¬å?°ç«¯æª?æ¡?樹è??æª?æ¡?庫ç??å·®ç?°"
 #. 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 "差�..."
+msgid "Diffâ?¦"
+msgstr "Diffâ?¦"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8590,8 +8251,8 @@ msgid "Subversion: Commit complete."
 msgstr "Subversion: æ??交å®?æ??ã??"
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
-msgstr "Subversion: æ­£å?¨æ??交è®?æ?´è?³æª?æ¡?庫..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
+msgstr "Subversionï¼?æ­£å?¨æ??交è®?æ?´è?³æª?æ¡?庫â?¦"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
 msgid "Subversion: Copy complete."
@@ -8612,8 +8273,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"
@@ -8628,16 +8289,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."
@@ -8779,64 +8440,68 @@ msgstr "�失� %s"
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
 
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/symbol-db/plugin.c:317
 msgid "Tag De_claration"
 msgstr "æ¨?籤宣å??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
-msgstr "å??å¾?符è??宣å??"
+#: ../plugins/symbol-db/plugin.c:319
+#, fuzzy
+msgid "Go to symbol declaration"
+msgstr "å¾?ä¸?ä¸?å¹?ç?¸ç??"
 
-#: ../plugins/symbol-db/plugin.c:321
+#. Translators: Go to the line where the tag is implemented
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag _Implementation"
 msgstr "�籤實�(_I)"
 
-#: ../plugins/symbol-db/plugin.c:323
-msgid "Goto symbol definition"
-msgstr "å??å¾?符è??å®?義"
+#: ../plugins/symbol-db/plugin.c:328
+#, fuzzy
+msgid "Go to symbol definition"
+msgstr "å??å¾?ä¸?ä¸?å??å­?è©?ç??解é??"
 
-#: ../plugins/symbol-db/plugin.c:330
-msgid "_Find Symbol..."
-msgstr "å°?æ?¾ç¬¦è??(_F)..."
+#: ../plugins/symbol-db/plugin.c:335
+#, fuzzy
+msgid "_Find Symbolâ?¦"
+msgstr "æ?¾ä¸?ä¸?å??(_P)"
 
-#: ../plugins/symbol-db/plugin.c:331
+#: ../plugins/symbol-db/plugin.c:336
 msgid "Find Symbol"
 msgstr "å°?æ?¾ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:1169
+#: ../plugins/symbol-db/plugin.c:1175
 #, c-format
-msgid "%s: Generating inheritances..."
-msgstr "%sï¼?æ­£å?¨ç?¢ç??ç¹¼æ?¿..."
+msgid "%s: Generating inheritancesâ?¦"
+msgstr "%sï¼?æ­£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1174
+#: ../plugins/symbol-db/plugin.c:1180
 #, fuzzy, c-format
 msgid "%s: %d files scanned out of %d"
-msgstr "<b>ã??ä¸?å?¨è¾¦å?¬å®¤ã??è¨?æ?¯ï¼?</b>"
+msgstr "å??å?ºæª?æ¡?"
 
-#: ../plugins/symbol-db/plugin.c:1205
+#: ../plugins/symbol-db/plugin.c:1211
 #, c-format
-msgid "Generating inheritances..."
-msgstr "æ­£å?¨ç?¢ç??ç¹¼æ?¿..."
+msgid "Generating inheritancesâ?¦"
+msgstr "æ­£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1207
+#: ../plugins/symbol-db/plugin.c:1213
 #, fuzzy, c-format
 msgid "%d files scanned out of %d"
-msgstr "<b>ã??ä¸?å?¨è¾¦å?¬å®¤ã??è¨?æ?¯ï¼?</b>"
+msgstr "å??å?ºæª?æ¡?"
 
-#: ../plugins/symbol-db/plugin.c:1967
+#: ../plugins/symbol-db/plugin.c:1981
 #, fuzzy
-msgid "Populating symbols' db..."
-msgstr "顯示æ??æ??符è??"
+msgid "Populating symbol databaseâ?¦"
+msgstr "å??å¾?符è??宣å??"
 
-#: ../plugins/symbol-db/plugin.c:2351 ../plugins/symbol-db/plugin.c:2479
+#: ../plugins/symbol-db/plugin.c:2345 ../plugins/symbol-db/plugin.c:2473
 msgid "Symbols"
 msgstr "符è??"
 
-#: ../plugins/symbol-db/plugin.c:2488
+#: ../plugins/symbol-db/plugin.c:2482
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2496
+#: ../plugins/symbol-db/plugin.c:2490
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
@@ -8863,29 +8528,31 @@ 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>å?¨å??</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 "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??..."
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
-msgid "Ctags executable:"
-msgstr "Ctags �����"
+msgid "Checking if package is parseableâ?¦"
+msgstr "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??â?¦"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
@@ -8894,93 +8561,99 @@ msgstr ""
 #: ../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 ""
-"é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? glib å?? "
-"gtk+ (å?¯è?½é??è¦?æ?´å¤? cpu é??ç®?æ??é??)"
+"é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? "
+"GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
 
 #: ../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:10
-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 "é??é??æ??å°?æ??令ç?¶æ?? Anjuta ç??å?½ä»¤ç¨¿ç·¨è¼¯"
 
-#: ../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
-#, fuzzy
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
-msgstr "å¿«æ?·é?µ"
+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 "����"
@@ -8990,8 +8663,8 @@ msgid "Working directory:"
 msgstr "å·¥ä½?ç?®é??ï¼?"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "è®?æ?¸(_V)..."
+msgid "_Variableâ?¦"
+msgstr "è®?æ?¸(_V)â?¦"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -9041,8 +8714,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
@@ -9068,8 +8741,8 @@ msgstr "��誤�"
 #. 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
@@ -9077,12 +8750,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
@@ -9111,11 +8784,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"
@@ -9193,8 +8861,8 @@ msgid "Currently edited file directory"
 msgstr "ç?®å??編輯ç??æª?æ¡?ç?®é??"
 
 #: ../plugins/tools/variable.c:103
-msgid "Currently selection in editor"
-msgstr "ç?®å??編輯å?¨ä¸­ç??é?¸æ??å??å??"
+msgid "Currently selected text in editor"
+msgstr "編輯å?¨ä¸­ç?®å??é?¸å??ç??æ??å­?"
 
 #: ../plugins/tools/variable.c:104
 msgid "Current word in editor"
@@ -9208,7 +8876,7 @@ msgstr "ç?®å??編輯å?¨ä¸­ç??è¡?"
 msgid "Ask the user to get additional parameters"
 msgstr "è©¢å??使ç?¨è??以å??å¾?é¡?å¤?ç??å??æ?¸"
 
-#: ../plugins/tools/variable.c:493
+#: ../plugins/tools/variable.c:499
 msgid "Command line parameters"
 msgstr "æ??令å??æ?¸"
 
@@ -9233,8 +8901,8 @@ msgid "Replace buffer"
 msgstr "å??代緩è¡?å??"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
-msgstr "æ??å?¥ç·©è¡?å??"
+msgid "Insert into buffer"
+msgstr "æ??å?¥è?³ç·©è¡?å??"
 
 #: ../plugins/tools/tool.c:87
 msgid "Append to buffer"
@@ -9273,9 +8941,9 @@ msgstr "�串"
 msgid "Copyright (c) Naba Kumar"
 msgstr "ç??æ¬?æ??æ?? © 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"
@@ -9402,7 +9070,7 @@ msgid "About External _Plugins"
 msgstr "é??æ?¼å¤?é?¨å¤?æ??ç¨?å¼?(_P)"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+msgid "About third-party Anjuta plugins"
 msgstr "é??æ?¼ç¬¬ä¸?æ?¹ Anjuta å¤?æ??ç¨?å¼?"
 
 #: ../src/anjuta-app.c:489
@@ -9433,11 +9101,11 @@ msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
 #: ../src/main.c:70
-msgid "Do not show the splashscreen"
-msgstr "ä¸?è¦?顯示起å§?å??å??"
+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
@@ -9449,14 +9117,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 "é??é?? anjuta 並é?©ç?¶ç??é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
+msgstr "é?©ç?¶ç??é??é?? Anjuta 並é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
 
 #: ../src/main.c:156
 msgid "- Integrated Development Environment"
 msgstr "- æ?´å??å¼?é??ç?¼ç?°å¢?"
 
-#: ../src/main.c:216
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9489,9 +9157,9 @@ msgstr "ä¸?è¦?å?¨å??å??æ??è¼?å?¥æ??å¾?ä¸?次ä½?業é??段"
 msgid "Dock switcher style:"
 msgstr "å??é§?å??æ??å?¨æ¨£å¼?:"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
-msgstr "Gnome å·¥å?·å??設å®?å?¼"
+#: ../src/preferences.ui.h:10
+msgid "GNOME toolbar setting"
+msgstr "GNOME å·¥å?·å??設å®?å?¼"
 
 #: ../src/preferences.ui.h:12
 msgid "Icons"
@@ -9506,7 +9174,7 @@ msgid "Project Defaults"
 msgstr "���設�"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "é?¸æ??å°?æ¡?ç?®é??"
 
 #: ../src/preferences.ui.h:16
@@ -9538,6 +9206,10 @@ msgstr "å?ªæ??æ??å­?"
 msgid "Toolbar button labels:"
 msgstr "å·¥å?·å??æ??é??æ¨?籤:"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+msgid "Do not display warning if not using a Debug configuration"
+msgstr "å¦?æ??ä¸?使ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?顯示警å??"
+
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?¨å?½å¼?å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ '('"
@@ -9547,7 +9219,7 @@ msgid "Add a space after function call autocompletion"
 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
@@ -9567,98 +9239,88 @@ msgid "Calltips"
 msgstr "å?¼å?«æ??示"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
-msgid "Enable adaptive indentation"
-msgstr "å??ç?¨å??é?©ç¸®æ??"
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable code completion"
 msgstr "å??ç?¨ç¨?å¼?碼è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart brace completion"
 msgstr "å??ç?¨æ?ºæ?§å??æ?¬å¼§è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart indentation"
 msgstr "å??ç?¨æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Indent:"
 msgstr "縮æ??ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Indentation parameters"
 msgstr "縮æ??å??æ?¸"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#, fuzzy
 msgid "Line up parentheses"
-msgstr ""
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
-msgid "Parenthese indentation"
-msgstr ""
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
-msgid "Pressing tab indents"
-msgstr "æ??å£? tab 縮æ??"
+msgstr "å??ä¸?移å??æ??å®?ç??æ?¸å­?æ?¹å¡?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 #, fuzzy
+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 "顯示ç??æ??(_S)"
+msgstr "顯示å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??縮æ??大å°?(空ç?½å­?å??)ï¼?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
-msgid "_AutoComplete"
-msgstr "è?ªå??è£?å®?(_A)"
-
-#: ../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"
+#: ../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:1071
+msgid "C/C++"
+msgstr "C/C++"
+
 #: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView 編輯�"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "GNU Debugger å¤?æ??ç¨?å¼?"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb plugin."
-msgstr "Gdb å¤?æ??ç¨?å¼?ã??"
+msgid "Gdb"
+msgstr "Gdb"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -9753,24 +9415,24 @@ msgid "CVS Plugin"
 msgstr "CVS å¤?æ??ç¨?å¼?"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
-msgstr "å?¯å?¥å·²å­?å?¨ç?? Autotools å°?æ¡?è?³ Anjuta"
+msgid "Import an existing autotools project to Anjuta"
+msgstr "å?¯å?¥å·²å­?å?¨ç?? autotools å°?æ¡?è?³ Anjuta"
 
 #: ../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."
@@ -9781,8 +9443,8 @@ 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."
-msgstr "C++ å?? Java æ?¯æ?´å¤?æ??ç¨?å¼?ï¼?æ??ä¾?ç¨?å¼?碼è?ªå??è£?å®?ã??è?ªå??縮æ??ç­?å??è?½ã??"
+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
 msgid "Project Assistant"
@@ -9804,10 +9466,6 @@ msgstr "Anjuta é¡?å?¥ç?¢ç??å?¨å¤?æ??ç¨?å¼?"
 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 "å°?æ¡?管ç??å?¡"
@@ -9817,10 +9475,8 @@ msgid "Project Manager Plugin for Anjuta."
 msgstr "Anjuta ç??å°?æ¡?管ç??å?¡å¤?æ??ç¨?å¼?"
 
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:2
-#, fuzzy
-#| msgid "Symbol Database Plugin for Anjuta (unstable)."
 msgid "Symbol Database Plugin for Anjuta."
-msgstr "Anjuta ç??符è??è³?æ??庫å¤?æ??ç¨?å¼?(ä¸?ç©©å®?ç??)ã??"
+msgstr "Anjuta ç??符è??è³?æ??庫å¤?æ??ç¨?å¼?"
 
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
@@ -9840,7 +9496,7 @@ msgstr "é?¤é?¯ç®¡ç??å?¡å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/run-program/anjuta-run-program.plugin.in.h:1
 msgid "Allow to execute program without debugger."
-msgstr "å??許ä¸?使ç?¨å?µé?¯ç¨?å¼?è??å?·è¡?ç¨?å¼?ã??"
+msgstr "å??許ä¸?使ç?¨é?¤é?¯ç¨?å¼?è??å?·è¡?ç¨?å¼?ã??"
 
 #: ../plugins/run-program/anjuta-run-program.plugin.in.h:2
 msgid "Run Program"
@@ -9870,8 +9526,152 @@ msgstr "Autotools �端��"
 msgid "Autotools backend for project manager"
 msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Autotools å¾?端ç¨?å¼?"
 
-#~ msgid "Unable to build user interface for tool variable"
-#~ msgstr "ç?¡æ³?ç?ºå·¥å?·è®?æ?¸å»ºç«?使ç?¨è??ä»?é?¢"
+#: ../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 "�誤��������"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:1
+msgid "Anjuta JS Debugger Plugin"
+msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:2
+msgid "Javascript Debugger Plugin"
+msgstr "Javascript Debugger å¤?æ??ç¨?å¼?"
+
+#: ../plugins/language-support-js/plugin.c:332
+#: ../plugins/language-support-js/plugin.c:341
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: ../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 "JavaScript æ?¯æ?´å¤?æ??ç¨?å¼?"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
+msgid "<b>JS Find dirs</b>"
+msgstr "<b>JS Find ç?®é??</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 "æ¨?示æ¼?æ??ç??å??è??"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
+msgid "Min character for completion "
+msgstr "è?ªå??è£?é½?ç??æ??å°?å­?å??"
+
+#~ msgid "Up to date"
+#~ msgstr "æ??æ?°ç??"
+
+#, fuzzy
+#~ 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 "設���(_O)..."
+
+#~ msgid "private"
+#~ msgstr "private"
+
+#~ msgid "protected"
+#~ msgstr "protected"
+
+#~ 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 "é?²ç¨?ç·¨è??"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "é©?証å??測試 (_P)..."
+
+#~ msgid "Add Watch..."
+#~ msgstr "æ?°å¢?ç?£ç??..."
+
+#~ msgid "_Print..."
+#~ msgstr "å??å?°(_P)..."
+
+#~ msgid "recent menu label|_%d. %s"
+#~ msgstr "_%d. %s"
+
+#~ msgid "recent menu label|%d. %s"
+#~ msgstr "%d. %s"
+
+#~ msgid "_Open..."
+#~ msgstr "é??å??(_O)..."
+
+#~ msgid "Url:"
+#~ msgstr "網å??:"
+
+#~ msgid "Advanced..."
+#~ msgstr "é?²é??..."
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Command Line Parameters"
+#~ msgstr "æ??令å??æ?¸"
+
+#~ msgid "Enter a Hexa adress or select one in the data"
+#~ msgstr "輸å?¥ Hexa ä½?å??æ??å?¨è³?æ??中é?¸æ??ä¸?å??"
+
+#~ msgid "Execute Program"
+#~ msgstr "����"
 
-#~ msgid "Unable to build user interface for tool editor"
-#~ msgstr "ç?¡æ³?ç?ºå·¥å?·ç·¨è¼¯å?¨å»ºç«?使ç?¨è??ä»?é?¢"
+#~ msgid "_Pass:"
+#~ msgstr "é??é??(_P):"



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