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



commit 002267ba7482e537f8fb854db159027e7d54233e
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Dec 4 19:34:53 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2983 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 2985 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 3113 insertions(+), 2855 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8533e07..4bfcfb9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -4,13 +4,14 @@
 # Abel Cheung <maddog linux org hk>, 2003-2005.
 # Hialan Liu <hialan liu gmail com>, 2008.
 # Tryneeds translation team, 2009.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta 2.31.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-09-21 21:22+0000\n"
-"PO-Revision-Date: 2010-09-22 19:36+0800\n"
+"POT-Creation-Date: 2010-11-21 11:57+0000\n"
+"PO-Revision-Date: 2010-12-04 19:32+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"
@@ -79,24 +80,24 @@ msgstr "Anjuta ç?¡æ³?è?ªå??å?¤æ?·ä½ æ?³è¦?é??å??æª?æ¡?ç??編碼ç?ºä½?ã??"
 #: ../libanjuta/anjuta-encodings.c:186
 #: ../libanjuta/anjuta-encodings.c:188
 msgid "Unicode"
-msgstr "統�碼(Unicode)"
+msgstr "è?¬å??碼"
 
 #: ../libanjuta/anjuta-encodings.c:151
 #: ../libanjuta/anjuta-encodings.c:177
 #: ../libanjuta/anjuta-encodings.c:223
 #: ../libanjuta/anjuta-encodings.c:266
 msgid "Western"
-msgstr "西�"
+msgstr "西��系"
 
 #: ../libanjuta/anjuta-encodings.c:153
 #: ../libanjuta/anjuta-encodings.c:225
 #: ../libanjuta/anjuta-encodings.c:262
 msgid "Central European"
-msgstr "中�"
+msgstr "中��系"
 
 #: ../libanjuta/anjuta-encodings.c:155
 msgid "South European"
-msgstr "å??æ­?"
+msgstr "å??æ­?èª?ç³»"
 
 #: ../libanjuta/anjuta-encodings.c:157
 #: ../libanjuta/anjuta-encodings.c:173
@@ -111,50 +112,50 @@ msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
 #: ../libanjuta/anjuta-encodings.c:246
 #: ../libanjuta/anjuta-encodings.c:264
 msgid "Cyrillic"
-msgstr "æ?¯æ??夫æ??"
+msgstr "æ?¯æ??夫èª?"
 
 #: ../libanjuta/anjuta-encodings.c:161
 #: ../libanjuta/anjuta-encodings.c:233
 #: ../libanjuta/anjuta-encodings.c:274
 msgid "Arabic"
-msgstr "é?¿æ??伯æ??"
+msgstr "é?¿æ??伯èª?"
 
 #: ../libanjuta/anjuta-encodings.c:163
 #: ../libanjuta/anjuta-encodings.c:268
 msgid "Greek"
-msgstr "å¸?è??æ??"
+msgstr "å¸?è??èª?"
 
 #: ../libanjuta/anjuta-encodings.c:165
 msgid "Hebrew Visual"
-msgstr "å¸?伯ä¾?æ??"
+msgstr "�伯��(左��)"
 
 #: ../libanjuta/anjuta-encodings.c:167
 #: ../libanjuta/anjuta-encodings.c:231
 #: ../libanjuta/anjuta-encodings.c:272
 msgid "Hebrew"
-msgstr "å¸?伯ä¾?æ??"
+msgstr "�伯��"
 
 #: ../libanjuta/anjuta-encodings.c:169
 #: ../libanjuta/anjuta-encodings.c:229
 #: ../libanjuta/anjuta-encodings.c:270
 msgid "Turkish"
-msgstr "å??è?³å?¶æ??"
+msgstr "å??è?³å?¶èª?"
 
 #: ../libanjuta/anjuta-encodings.c:171
 msgid "Nordic"
-msgstr "å??æ­?"
+msgstr "å??æ­?èª?ç³»"
 
 #: ../libanjuta/anjuta-encodings.c:175
 msgid "Celtic"
-msgstr "Celtic"
+msgstr "����"
 
 #: ../libanjuta/anjuta-encodings.c:179
 msgid "Romanian"
-msgstr "ç¾?馬尼äº?æ??"
+msgstr "�馬尼��"
 
 #: ../libanjuta/anjuta-encodings.c:191
 msgid "Armenian"
-msgstr "é?¿ç¾?å°¼äº?æ??"
+msgstr "��尼��"
 
 #: ../libanjuta/anjuta-encodings.c:193
 #: ../libanjuta/anjuta-encodings.c:195
@@ -164,7 +165,7 @@ msgstr "ç¹?é«?中æ??"
 
 #: ../libanjuta/anjuta-encodings.c:197
 msgid "Cyrillic/Russian"
-msgstr "æ?¯æ??夫æ??/ä¿?æ??"
+msgstr "æ?¯æ??夫èª?ç³»/ä¿?èª?"
 
 #: ../libanjuta/anjuta-encodings.c:200
 #: ../libanjuta/anjuta-encodings.c:202
@@ -172,14 +173,14 @@ msgstr "æ?¯æ??夫æ??/ä¿?æ??"
 #: ../libanjuta/anjuta-encodings.c:236
 #: ../libanjuta/anjuta-encodings.c:251
 msgid "Japanese"
-msgstr "æ?¥æ??"
+msgstr "��"
 
 #: ../libanjuta/anjuta-encodings.c:207
 #: ../libanjuta/anjuta-encodings.c:238
 #: ../libanjuta/anjuta-encodings.c:242
 #: ../libanjuta/anjuta-encodings.c:257
 msgid "Korean"
-msgstr "é??æ??"
+msgstr "é??èª?"
 
 #: ../libanjuta/anjuta-encodings.c:212
 #: ../libanjuta/anjuta-encodings.c:214
@@ -190,36 +191,32 @@ msgstr "ç°¡é«?中æ??"
 
 #: ../libanjuta/anjuta-encodings.c:218
 msgid "Georgian"
-msgstr "格魯å??äº?æ??"
+msgstr "格魯å??äº?èª?"
 
 #: ../libanjuta/anjuta-encodings.c:248
 msgid "Cyrillic/Ukrainian"
-msgstr "æ?¯æ??夫æ??/ç??é»?è?­æ??"
+msgstr "æ?¯æ??夫èª?ç³»/ç??å??è?­èª?"
 
 #: ../libanjuta/anjuta-encodings.c:253
 #: ../libanjuta/anjuta-encodings.c:259
 #: ../libanjuta/anjuta-encodings.c:278
 msgid "Vietnamese"
-msgstr "è¶?å??æ??"
+msgstr "è¶?å??èª?"
 
 #: ../libanjuta/anjuta-encodings.c:255
 msgid "Thai"
-msgstr "æ³°æ??"
-
-#: ../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:130
-#: ../plugins/gbf-am/gbf-am-properties.c:177
-#: ../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:151
-#: ../plugins/dir-project/dir-project.c:802
+msgstr "泰�"
+
+#. Translator: Unknown refers to a character encoding like UTF8,
+#. * ISO8859-1
+#. Translator: Unknown here is a target type, if not unknown it can
+#. * be a program or a shared library by example
+#: ../libanjuta/anjuta-encodings.c:443
+#: ../plugins/am-project/am-project.c:107
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1169
+#: ../libanjuta/anjuta-launcher.c:1170
 #: ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276
 #: ../plugins/gdb/utilities.c:282
@@ -227,12 +224,12 @@ msgstr "��"
 msgid "Cannot execute command: \"%s\""
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1170
+#: ../libanjuta/anjuta-launcher.c:1171
 msgid "execvp failed"
 msgstr "execvp 已失æ??"
 
 #: ../libanjuta/anjuta-plugin.c:326
-#: ../libanjuta/anjuta-plugin-manager.c:2312
+#: ../libanjuta/anjuta-plugin-manager.c:2364
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -257,17 +254,17 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:463
+#: ../plugins/symbol-db/symbol-db-prefs.c:464
 msgid "Load"
 msgstr "è¼?å?¥"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1943
+#: ../libanjuta/anjuta-plugin-manager.c:1987
 msgid "Available Plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1036
-#: ../src/anjuta-app.c:934
+#: ../src/anjuta-app.c:933
 msgid "Preferred plugins"
 msgstr "å??好ç??å¤?æ??ç¨?å¼?"
 
@@ -292,58 +289,58 @@ msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:530
-msgid "Please select a plugin to activate"
-msgstr "è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?"
+#| msgid "Please select a plugin to activate"
+msgid "<b>Please select a plugin to activate</b>"
+msgstr "<b>è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?</b>"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
 msgid "No plugin is able to load other plugins in %s"
 msgstr "å?¨ %s 中æ²?æ??å¤?æ??ç¨?å¼?å?¯ä»¥è¼?å?¥å?¶ä»?ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1962
+#: ../libanjuta/anjuta-plugin-manager.c:2014
 msgid "Remember this selection"
 msgstr "è¨?å¾?æ­¤é?¸æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2293
+#: ../libanjuta/anjuta-plugin-manager.c:2345
 msgid "Profiles"
 msgstr "設å®?çµ?å??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2294
+#: ../libanjuta/anjuta-plugin-manager.c:2346
 msgid "Current stack of profiles"
 msgstr "設å®?çµ?å??ç??ç?®å??å ?ç??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2299
+#: ../libanjuta/anjuta-plugin-manager.c:2351
 msgid "Available plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2300
+#: ../libanjuta/anjuta-plugin-manager.c:2352
 msgid "Currently available plugins found in plugin paths"
 msgstr "ç?®å??å?¨å¤?æ??ç¨?å¼?è·¯å¾?中æ?¾å?°å?¯ä½¿ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2306
+#: ../libanjuta/anjuta-plugin-manager.c:2358
 msgid "Activated plugins"
 msgstr "已使ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2307
+#: ../libanjuta/anjuta-plugin-manager.c:2359
 msgid "Currently activated plugins"
 msgstr "ç?®å??使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2313
+#: ../libanjuta/anjuta-plugin-manager.c:2365
 msgid "Anjuta shell for which the plugins are made"
 msgstr "製ä½?å¤?æ??ç¨?å¼?ç?? Anjuta shell"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2321
+#: ../libanjuta/anjuta-plugin-manager.c:2373
 msgid "Anjuta Status"
 msgstr "Anjuta ç??æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2322
+#: ../libanjuta/anjuta-plugin-manager.c:2374
 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:2482
+#: ../libanjuta/anjuta-plugin-manager.c:2534
 msgid "Loaded:"
 msgstr "已���"
 
@@ -403,23 +400,8 @@ msgstr ""
 "è®?å??ã??%sã??失æ??ï¼?ä¸?å??å¿?è¦?ç??å¤?æ??ç¨?å¼?é?ºå¤±ï¼?\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences.c:1534
-msgid ""
-"Are you sure you want to reset the preferences to\n"
-"their default settings?"
-msgstr ""
-"æ?¯å?¦ç¢ºå®?è¦?å°?å??好設å®?å?§ç??å?¨é?¨è¨­å®?\n"
-"å??復æ??é ?設ï¼?"
-
-#. Action name
-#. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538
-#: ../plugins/git/plugin.c:455
-msgid "_Reset"
-msgstr "é??ç½®(_R)"
-
 #: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:219
+#: ../plugins/gtodo/interface.c:202
 #: ../plugins/gtodo/mcategory.c:36
 msgid "Category"
 msgstr "å??é¡?"
@@ -427,9 +409,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:3
-#: ../src/anjuta-app.c:921
-#: ../src/preferences.ui.h:11
+#: ../src/anjuta-app.c:920
+#: ../src/preferences.ui.h:8
 msgid "General"
 msgstr "��"
 
@@ -446,7 +427,7 @@ msgid "If you do not save, all your changes will be lost."
 msgstr "å¦?æ??ä½ æ²?æ??å?²å­?ï¼?å°?é?ºå¤±æ??æ??ä¿®æ?¹ã??"
 
 #: ../libanjuta/anjuta-save-prompt.c:189
-#: ../plugins/document-manager/plugin.c:605
+#: ../plugins/document-manager/plugin.c:611
 #: ../plugins/snippets-manager/snippets-editor.ui.h:11
 msgid "Save"
 msgstr "��"
@@ -461,7 +442,6 @@ msgstr "æ??æ£?æ?´æ?¹(_D)"
 
 #: ../libanjuta/anjuta-save-prompt.c:296
 #, c-format
-#| msgid "There is an item with unsaved changes. Save changes before closing?"
 msgid "There is %d item with unsaved changes. Save changes before closing?"
 msgid_plural "There are %d items with unsaved changes. Save changes before closing?"
 msgstr[0] "é??è£?æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å­?ç??æ?´æ?¹ã??æ?¯å?¦å?¨é??é??å??å?²å­?æ?´æ?¹ï¼?"
@@ -487,20 +467,20 @@ msgid "Shortcut"
 msgstr "å¿«æ?·é?µ"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:359
+#: ../libanjuta/anjuta-utils.c:357
 msgid "System:"
 msgstr "系統�"
 
-#: ../libanjuta/anjuta-utils.c:505
+#: ../libanjuta/anjuta-utils.c:503
 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:514
+#: ../libanjuta/anjuta-utils.c:512
 #, c-format
 msgid "Installation failed: %s"
 msgstr "å®?è£?ä½?æ?¯å¤±æ??ï¼?%s"
 
-#: ../libanjuta/anjuta-utils.c:582
+#: ../libanjuta/anjuta-utils.c:580
 #, c-format
 msgid ""
 "The \"%s\" package is not installed.\n"
@@ -509,7 +489,7 @@ msgstr ""
 "ä½ å°?æ?ªå®?è£?ã??%sã??å¥?件ã??\n"
 "è«?å®?è£?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:600
+#: ../libanjuta/anjuta-utils.c:598
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -519,23 +499,23 @@ msgstr ""
 "è«?å®?è£?å®?ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:1179
+#: ../libanjuta/anjuta-utils.c:1171
 msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ?¾ä¸?å?°çµ?端æ©?ï¼?使ç?¨ xtermï¼?ä¸?管å®?è?½ä¸?è?½é??ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1215
-#: ../libanjuta/anjuta-utils.c:1219
-#: ../libanjuta/anjuta-utils.c:1247
-#: ../libanjuta/anjuta-utils.c:1251
+#: ../libanjuta/anjuta-utils.c:1207
+#: ../libanjuta/anjuta-utils.c:1211
+#: ../libanjuta/anjuta-utils.c:1239
+#: ../libanjuta/anjuta-utils.c:1243
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?%sï¼?使ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1901
+#: ../libanjuta/anjuta-utils.c:1893
 msgid "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:2340
+#: ../libanjuta/anjuta-utils.c:2332
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
@@ -585,22 +565,22 @@ msgstr "æ?ªè¨?ç??æ?¬"
 msgid "Ignored"
 msgstr "已忽�"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:218
+#: ../libanjuta/cell-renderer-captioned-image.c:215
 #: ../libfoocanvas/foo-canvas-text.c:177
-#: ../src/preferences.ui.h:18
+#: ../src/preferences.ui.h:13
 msgid "Text"
 msgstr "æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:219
+#: ../libanjuta/cell-renderer-captioned-image.c:216
 #: ../libfoocanvas/foo-canvas-text.c:178
 msgid "Text to render"
 msgstr "æº?å??æ??繪ç??æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:225
+#: ../libanjuta/cell-renderer-captioned-image.c:222
 msgid "Pixbuf Object"
 msgstr "Pixbuf �件"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:226
+#: ../libanjuta/cell-renderer-captioned-image.c:223
 msgid "The pixbuf to render."
 msgstr "æº?å??æ??繪ç?? pixbufã??"
 
@@ -907,9 +887,16 @@ msgstr "é?¸æ??ä¸?å??çµ?建ç?®é??"
 msgid "Translate messages"
 msgstr "翻譯��"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:18
+msgid "su -c"
+msgstr "su -c"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:19
+msgid "sudo"
+msgstr "sudo"
+
 #: ../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:1
 #: ../src/preferences.ui.h:2
 msgid "Default"
@@ -933,10 +920,7 @@ msgid "No executables in this project!"
 msgstr "å°?æ¡?中æ²?æ??å?¯å?·è¡?æª?ã??"
 
 #: ../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
+#: ../plugins/am-project/am-project.c:128
 msgid "Program"
 msgstr "��"
 
@@ -946,19 +930,19 @@ msgstr "ç?®å??æ²?æ??é??å??ä»»ä½?æª?æ¡?æ??å°?æ¡?ã??"
 
 #. Only local program are supported
 #: ../plugins/build-basic-autotools/executer.c:298
-#: ../plugins/run-program/execute.c:70
+#: ../plugins/run-program/execute.c:71
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "�� '%s' ������"
 
 #: ../plugins/build-basic-autotools/executer.c:313
-#: ../plugins/run-program/execute.c:76
+#: ../plugins/run-program/execute.c:77
 #, c-format
 msgid "Program '%s' does not exist"
 msgstr "ç¨?å¼?ã??%sã??ä¸?å­?å?¨"
 
 #: ../plugins/build-basic-autotools/executer.c:321
-#: ../plugins/run-program/execute.c:80
+#: ../plugins/run-program/execute.c:81
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "ç¨?å¼? '%s' ä¸?å?·æ??å?·è¡?æ¬?é??"
@@ -977,11 +961,11 @@ msgstr "å?¯å?·è¡?æª? '%s' 並ä¸?æ?¯æ??æ?°ç??ã??"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:168
+#: ../plugins/build-basic-autotools/plugin.c:169
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:169
+#: ../plugins/build-basic-autotools/plugin.c:170
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 
@@ -990,277 +974,297 @@ msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:177
+#: ../plugins/build-basic-autotools/plugin.c:178
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:178
+#: ../plugins/build-basic-autotools/plugin.c:179
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:846
+#: ../plugins/build-basic-autotools/plugin.c:858
 #, c-format
 msgid "Entering: %s"
 msgstr "正���� %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:882
+#: ../plugins/build-basic-autotools/plugin.c:894
 #, c-format
 msgid "Leaving: %s"
 msgstr "æ­£å?¨é?¢é??ï¼? %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:915
+#. The translations should match that of 'gcc' program.
+#. * The second string with -old should be used for an older
+#. * version of 'gcc' if necessary. If you update one string,
+#. * move the first one to translate the -old string and then
+#. * replace the first string only.
+#: ../plugins/build-basic-autotools/plugin.c:932
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "è­¦å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:921
+#: ../plugins/build-basic-autotools/plugin.c:933
+#| msgid "warning:"
+msgid "warning:-old"
+msgstr "è­¦å??:-old"
+
+#. The translations should match that of 'gcc' program.
+#. * The second string with -old should be used for an older
+#. * version of 'gcc' if necessary. If you update one string,
+#. * move the first one to translate the -old string and then
+#. * replace the first string only.
+#: ../plugins/build-basic-autotools/plugin.c:944
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "�誤�"
 
-#: ../plugins/build-basic-autotools/plugin.c:1038
+#: ../plugins/build-basic-autotools/plugin.c:945
+#| msgid "error:"
+msgid "error:-old"
+msgstr "�誤:-old"
+
+#: ../plugins/build-basic-autotools/plugin.c:1062
 #, c-format
 msgid "Command exited with status %d"
 msgstr "æ??令以 %d ç??æ??é?¢é??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1048
-#: ../plugins/build-basic-autotools/plugin.c:1527
+#: ../plugins/build-basic-autotools/plugin.c:1072
+#: ../plugins/build-basic-autotools/plugin.c:1551
 #, c-format
 msgid "Command canceled by user"
 msgstr "æ??令被使ç?¨è??å??æ¶?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1053
+#: ../plugins/build-basic-autotools/plugin.c:1077
 #, c-format
 msgid "Command aborted by user"
 msgstr "æ??令被使ç?¨è??中止"
 
-#: ../plugins/build-basic-autotools/plugin.c:1058
+#: ../plugins/build-basic-autotools/plugin.c:1082
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "æ??令以信è?? %d çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1066
+#: ../plugins/build-basic-autotools/plugin.c:1090
 msgid "Command terminated for an unknown reason"
 msgstr "æ??令以ä¸?æ??ç??ç??ç?±çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1084
+#: ../plugins/build-basic-autotools/plugin.c:1108
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "總å?±è²»æ??ï¼?%lu ç§?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1091
+#: ../plugins/build-basic-autotools/plugin.c:1115
 msgid "Completed unsuccessfully\n"
 msgstr "æ?ªè?½æ??å??å®?æ??\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1099
+#: ../plugins/build-basic-autotools/plugin.c:1123
 #: ../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:1187
+#: ../plugins/build-basic-autotools/plugin.c:1211
 #, c-format
 msgid "Build %d: %s"
 msgstr "建置 %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1522
+#: ../plugins/build-basic-autotools/plugin.c:1546
 msgid "Before using this new configuration, the default one needs to be removed. Do you want to do that ?"
 msgstr "å?¨ä½¿ç?¨é??å??æ?°çµ?æ??ä¹?å??ï¼?é??è¦?å??移é?¤é ?設ç??çµ?æ??ã??æ?¯å?¦è¦?é??麼å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1823
+#: ../plugins/build-basic-autotools/plugin.c:1843
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ç?¡æ³?編譯ã??%sã??ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1958
+#: ../plugins/build-basic-autotools/plugin.c:1978
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½è¨­å®?å°?æ¡?ï¼?%s 中é?ºå¤±è¨­å®?å?½ä»¤ç¨¿ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2439
-#: ../plugins/build-basic-autotools/plugin.c:2513
-#: ../plugins/build-basic-autotools/plugin.c:2523
-#: ../plugins/build-basic-autotools/plugin.c:2541
-#: ../plugins/build-basic-autotools/plugin.c:2551
-#: ../plugins/build-basic-autotools/plugin.c:2608
+#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2533
+#: ../plugins/build-basic-autotools/plugin.c:2543
+#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2571
+#: ../plugins/build-basic-autotools/plugin.c:2628
 #, c-format
 msgid "_Build"
 msgstr "建置(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2443
+#: ../plugins/build-basic-autotools/plugin.c:2463
 msgid "_Build Project"
 msgstr "建置��(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2444
+#: ../plugins/build-basic-autotools/plugin.c:2464
 msgid "Build whole project"
 msgstr "建置æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2449
+#: ../plugins/build-basic-autotools/plugin.c:2469
 msgid "_Install Project"
 msgstr "����(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2450
+#: ../plugins/build-basic-autotools/plugin.c:2470
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2475
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2456
+#: ../plugins/build-basic-autotools/plugin.c:2476
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2461
+#: ../plugins/build-basic-autotools/plugin.c:2481
 msgid "C_onfigure Projectâ?¦"
-msgstr "設���(_O)..."
+msgstr "設���(_O)�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2462
+#: ../plugins/build-basic-autotools/plugin.c:2482
 msgid "Configure project"
 msgstr "設���"
 
-#: ../plugins/build-basic-autotools/plugin.c:2467
+#: ../plugins/build-basic-autotools/plugin.c:2487
 msgid "Build _Tarball"
 msgstr "建置 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2468
+#: ../plugins/build-basic-autotools/plugin.c:2488
 msgid "Build project tarball distribution"
 msgstr "建置�� tarball ���件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2473
+#: ../plugins/build-basic-autotools/plugin.c:2493
 msgid "_Build Module"
 msgstr "建置模�(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2474
+#: ../plugins/build-basic-autotools/plugin.c:2494
 msgid "Build module associated with current file"
 msgstr "建置è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2499
 msgid "_Install Module"
 msgstr "��模�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2480
+#: ../plugins/build-basic-autotools/plugin.c:2500
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2505
 msgid "_Clean Module"
 msgstr "��模�(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2486
+#: ../plugins/build-basic-autotools/plugin.c:2506
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2511
 msgid "Co_mpile File"
 msgstr "編譯��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2492
+#: ../plugins/build-basic-autotools/plugin.c:2512
 msgid "Compile current editor file"
 msgstr "編譯ç?®å??編輯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2497
+#: ../plugins/build-basic-autotools/plugin.c:2517
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2498
+#: ../plugins/build-basic-autotools/plugin.c:2518
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2503
+#: ../plugins/build-basic-autotools/plugin.c:2523
 msgid "Remove Configuration"
 msgstr "移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2504
+#: ../plugins/build-basic-autotools/plugin.c:2524
 msgid "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??å°?æ¡? (distclean)ï¼?å?¯è?½ç??話ä¸?併移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
-#: ../plugins/build-basic-autotools/plugin.c:2545
+#: ../plugins/build-basic-autotools/plugin.c:2537
+#: ../plugins/build-basic-autotools/plugin.c:2565
 msgid "_Compile"
 msgstr "編譯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2518
-#: ../plugins/build-basic-autotools/plugin.c:2546
+#: ../plugins/build-basic-autotools/plugin.c:2538
+#: ../plugins/build-basic-autotools/plugin.c:2566
 msgid "Compile file"
 msgstr "編譯��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
-#: ../plugins/build-basic-autotools/plugin.c:2552
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2572
 msgid "Build module"
 msgstr "建置模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2529
-#: ../plugins/build-basic-autotools/plugin.c:2557
-#: ../plugins/build-basic-autotools/plugin.c:2615
+#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2635
 #, c-format
 msgid "_Install"
 msgstr "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2530
-#: ../plugins/build-basic-autotools/plugin.c:2558
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2578
 msgid "Install module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2535
-#: ../plugins/build-basic-autotools/plugin.c:2563
-#: ../plugins/build-basic-autotools/plugin.c:2622
+#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2642
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2536
-#: ../plugins/build-basic-autotools/plugin.c:2564
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2584
 msgid "Clean module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2569
+#: ../plugins/build-basic-autotools/plugin.c:2589
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??令(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2570
+#: ../plugins/build-basic-autotools/plugin.c:2590
 msgid "Cancel build command"
 msgstr "å??æ¶?建置æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:2608
+#: ../plugins/build-basic-autotools/plugin.c:2628
 #, c-format
 msgid "_Build (%s)"
 msgstr "建置(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2615
+#: ../plugins/build-basic-autotools/plugin.c:2635
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2622
+#: ../plugins/build-basic-autotools/plugin.c:2642
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2630
+#: ../plugins/build-basic-autotools/plugin.c:2650
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "編譯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2630
+#: ../plugins/build-basic-autotools/plugin.c:2650
 #, c-format
 msgid "Co_mpile"
 msgstr "編譯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3166
+#: ../plugins/build-basic-autotools/plugin.c:3184
 msgid "Build commands"
 msgstr "建置�令"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3175
+#: ../plugins/build-basic-autotools/plugin.c:3193
 msgid "Build popup commands"
 msgstr "建置å½?å?ºå¼?æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:3557
-#: ../plugins/build-basic-autotools/plugin.c:3565
+#: ../plugins/build-basic-autotools/plugin.c:3582
+#: ../plugins/build-basic-autotools/plugin.c:3590
 msgid "Build Autotools"
 msgstr "建置 Autotools"
 
@@ -1338,7 +1342,7 @@ msgid "General Class Properties"
 msgstr "����屬�"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
-#: ../plugins/file-wizard/file.c:103
+#: ../plugins/file-wizard/file.c:104
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
@@ -1371,7 +1375,7 @@ msgid "Inline the declaration and implementation"
 msgstr "è¡?å?§å®£å??è??實ä½?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
-#: ../plugins/file-wizard/file.c:104
+#: ../plugins/file-wizard/file.c:105
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:17
@@ -1444,7 +1448,7 @@ msgid "Failed to write autogen definition file"
 msgstr "寫å?¥ autogen å®?義æª?æ¡?失æ??"
 
 #: ../plugins/class-gen/plugin.c:98
-#: ../plugins/project-wizard/druid.c:1160
+#: ../plugins/project-wizard/druid.c:1141
 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 å??å¾?ã??"
 
@@ -1460,7 +1464,7 @@ msgstr "å¾?é¡?å??æ?¨æ¸¬"
 
 #: ../plugins/class-gen/window.c:499
 #: ../plugins/class-gen/window.c:510
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
 msgid "Scope"
 msgstr "ç¯?å??"
 
@@ -1481,9 +1485,9 @@ msgstr "é¡?å??"
 #: ../plugins/class-gen/window.c:512
 #: ../plugins/class-gen/window.c:520
 #: ../plugins/class-gen/window.c:534
+#: ../plugins/project-manager/dialogs.c:434
 #: ../plugins/run-program/parameters.c:754
-#: ../plugins/search/search_preferences.c:534
-#: ../plugins/snippets-manager/plugin.c:751
+#: ../plugins/snippets-manager/plugin.c:757
 #: ../plugins/snippets-manager/snippets-browser.c:530
 #: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
@@ -1559,7 +1563,7 @@ msgstr "使�詳細模�"
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
 #: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "Browseâ?¦"
-msgstr "ç??覽..."
+msgstr "ç??覽â?¦"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
 msgid "CVS Options"
@@ -1670,8 +1674,8 @@ msgstr "忽� .cvsrc ��建議�"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
 #: ../plugins/git/anjuta-git.ui.h:57
-#: ../plugins/symbol-db/plugin.c:2055
-#: ../plugins/symbol-db/plugin.c:2097
+#: ../plugins/symbol-db/plugin.c:2116
+#: ../plugins/symbol-db/plugin.c:2158
 msgid "Local"
 msgstr "å??å??"
 
@@ -1691,7 +1695,7 @@ msgstr "模çµ?å??稱ï¼?"
 #: ../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/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:22
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
 msgid "Options"
@@ -1804,7 +1808,7 @@ msgid "CVSROOT"
 msgstr "CVSROOT"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/gbf-am/gbf-am-properties.c:1156
+#: ../plugins/am-project/am-project.c:191
 msgid "Module"
 msgstr "模�"
 
@@ -1836,130 +1840,130 @@ msgstr "CVS æ??令正å?¨å?·è¡? â?? è«?ç­?å??ç?´å?°å®?çµ?æ??ï¼?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
 #: ../plugins/cvs-plugin/cvs-execute.c:233
-#: ../plugins/cvs-plugin/plugin.c:467
 #: ../plugins/cvs-plugin/plugin.c:474
+#: ../plugins/cvs-plugin/plugin.c:481
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:44
-#: ../plugins/cvs-plugin/plugin.c:119
+#: ../plugins/cvs-plugin/plugin.c:46
+#: ../plugins/cvs-plugin/plugin.c:121
 msgid "_CVS"
 msgstr "_CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:52
+#: ../plugins/cvs-plugin/plugin.c:54
 msgid "_Add"
 msgstr "_Add"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:54
+#: ../plugins/cvs-plugin/plugin.c:56
 msgid "Add a new file/directory to the CVS tree"
 msgstr "å? å?¥æ?°æª?æ¡?/ç?®é??è?³ CVS 樹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:60
+#: ../plugins/cvs-plugin/plugin.c:62
 msgid "_Remove"
 msgstr "_Remove"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:62
+#: ../plugins/cvs-plugin/plugin.c:64
 msgid "Remove a file/directory from CVS tree"
 msgstr "å¾? CVS 樹移é?¤æª?æ¡?/ç?®é??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:68
-#: ../plugins/cvs-plugin/plugin.c:127
+#: ../plugins/cvs-plugin/plugin.c:70
+#: ../plugins/cvs-plugin/plugin.c:129
 msgid "_Commit"
 msgstr "_Commit"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:70
-#: ../plugins/cvs-plugin/plugin.c:129
+#: ../plugins/cvs-plugin/plugin.c:72
+#: ../plugins/cvs-plugin/plugin.c:131
 msgid "Commit your changes to the CVS tree"
 msgstr "æ??交你ç??ä¿®æ?¹è?³ CVS 樹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:76
-#: ../plugins/cvs-plugin/plugin.c:135
+#: ../plugins/cvs-plugin/plugin.c:78
+#: ../plugins/cvs-plugin/plugin.c:137
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "_Update"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:78
-#: ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:80
+#: ../plugins/cvs-plugin/plugin.c:139
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?ä½ æ?¬æ©?ç??è¤?æ?¬è?? CVS 樹å??æ­¥"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:84
-#: ../plugins/cvs-plugin/plugin.c:143
+#: ../plugins/cvs-plugin/plugin.c:86
+#: ../plugins/cvs-plugin/plugin.c:145
 msgid "_Diff"
 msgstr "_Diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:86
-#: ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:88
+#: ../plugins/cvs-plugin/plugin.c:147
 msgid "Show differences between your local copy and the tree"
 msgstr "顯示你ç??æ?¬å?°ç«¯è¤?æ?¬è?? CVS 樹ä¹?é??ç??å·®ç?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:92
-#: ../plugins/cvs-plugin/plugin.c:151
+#: ../plugins/cvs-plugin/plugin.c:94
+#: ../plugins/cvs-plugin/plugin.c:153
 msgid "_Show Status"
 msgstr "顯示ç??æ??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:94
-#: ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:96
+#: ../plugins/cvs-plugin/plugin.c:155
 msgid "Show the status of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:100
-#: ../plugins/cvs-plugin/plugin.c:159
+#: ../plugins/cvs-plugin/plugin.c:102
+#: ../plugins/cvs-plugin/plugin.c:161
 msgid "_Show Log"
 msgstr "顯示ç´?é??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:102
-#: ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:104
+#: ../plugins/cvs-plugin/plugin.c:163
 msgid "Show the log of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç´?é??æª?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:108
+#: ../plugins/cvs-plugin/plugin.c:110
 msgid "_Import Tree"
 msgstr "��樹(_I)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:110
+#: ../plugins/cvs-plugin/plugin.c:112
 msgid "Import a new source tree to CVS"
 msgstr "�����樹� CVS"
 
-#: ../plugins/cvs-plugin/plugin.c:360
+#: ../plugins/cvs-plugin/plugin.c:362
 msgid "CVS operations"
 msgstr "CVS æ??ä½?"
 
-#: ../plugins/cvs-plugin/plugin.c:366
+#: ../plugins/cvs-plugin/plugin.c:368
 msgid "CVS popup operations"
 msgstr "CVS å½?å?ºå¼?æ??ä½?"
 
@@ -2132,7 +2136,7 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:341
+#: ../plugins/project-wizard/property.c:336
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2207,7 +2211,7 @@ msgstr "å??æ??ç?®å??ä½?ç½®ç??中æ?·é»?ç??æ³?"
 #. Stock icon, if any
 #: ../plugins/debug-manager/breakpoints.c:1831
 msgid "Add Breakpointâ?¦"
-msgstr "��中��..."
+msgstr "��中���"
 
 #. Display label
 #. short-cut
@@ -2327,19 +2331,18 @@ msgstr "中æ?·é»?æ??ä½?"
 
 #. create goto menu_item.
 #: ../plugins/debug-manager/data_view.c:392
-#: ../plugins/debug-manager/sparse_view.c:497
+#: ../plugins/debug-manager/sparse_view.c:501
 msgid "_Go to address"
 msgstr "移è?³ä½?å??(_G)"
 
 #: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/gbf-am/gbf-am-properties.c:893
 #: ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "è®?æ?¸"
 
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/debug-manager/registers.c:469
-#: ../plugins/gbf-am/gbf-am-properties.c:903
+#: ../plugins/project-manager/dialogs.c:441
 #: ../plugins/run-program/parameters.c:763
 #: ../plugins/tools/editor.c:474
 msgid "Value"
@@ -2357,7 +2360,7 @@ msgstr "��"
 
 #: ../plugins/debug-manager/info.c:127
 msgid "Lines"
-msgstr "è¡?"
+msgstr "å??"
 
 #. This is the list of local variables.
 #: ../plugins/debug-manager/locals.c:102
@@ -2456,7 +2459,7 @@ msgstr "å??å??é?¤é?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
 
 #: ../plugins/debug-manager/plugin.c:937
 msgid "_Debug Processâ?¦"
-msgstr "����(_D)..."
+msgstr "����(_D)�"
 
 #: ../plugins/debug-manager/plugin.c:939
 msgid "Start debugger and attach to a running program"
@@ -2527,7 +2530,7 @@ msgstr "���核(_K)"
 
 #: ../plugins/debug-manager/plugin.c:1007
 msgid "Display the contents of kernel 'struct user' for current child"
-msgstr "顯示ç?®å??é?²ç¨?ç?? CPU æ?«å­?å?¨æ?¸å?¼ï¼?ç¨?å¼?å ?ç??ï¼?è³?æ??å??ç??ä½?å??å??大å°?ç­?ç­?..."
+msgstr "顯示ç?®å??é?²ç¨?ç?? CPU æ?«å­?å?¨æ?¸å?¼ï¼?ç¨?å¼?å ?ç??ï¼?è³?æ??å??ç??ä½?å??å??大å°?ç­?ç­?â?¦"
 
 #: ../plugins/debug-manager/plugin.c:1021
 #: ../plugins/debug-manager/plugin.c:1137
@@ -2628,6 +2631,10 @@ msgstr "é?¤é?¯å·¥å?·æ??ä½?"
 msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr "æ?¾ä¸?å?°ä»»ä½?é?¤é?¯å·¥å?·å¤?æ??ç¨?å¼?å?¯ä»¥æ?¯æ?´ %s MIME é¡?å??ç??ç?®æ¨?"
 
+#: ../plugins/debug-manager/queue.c:530
+msgid "Please select a plugin to activate"
+msgstr "è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?"
+
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
 msgstr "æ?«å­?å?¨"
@@ -2693,21 +2700,21 @@ msgstr "å?§æ ¸è¨?è??"
 msgid "Signal operations"
 msgstr "è¨?è??æ??ä½?"
 
-#: ../plugins/debug-manager/sparse_view.c:1206
+#: ../plugins/debug-manager/sparse_view.c:1132
 msgid "Show Line Numbers"
-msgstr "顯示è¡?è??"
+msgstr "顯示å??è??"
 
-#: ../plugins/debug-manager/sparse_view.c:1207
+#: ../plugins/debug-manager/sparse_view.c:1133
 msgid "Whether to display line numbers"
-msgstr "æ?¯å?¦é¡¯ç¤ºè¡?è??"
+msgstr "æ?¯å?¦é¡¯ç¤ºå??è??"
 
-#: ../plugins/debug-manager/sparse_view.c:1214
+#: ../plugins/debug-manager/sparse_view.c:1140
 msgid "Show Line Markers"
-msgstr "顯示è¡?è??å??"
+msgstr "顯示å??è??å??"
 
-#: ../plugins/debug-manager/sparse_view.c:1215
+#: ../plugins/debug-manager/sparse_view.c:1141
 msgid "Whether to display line marker pixbufs"
-msgstr "æ?¯å?¦é¡¯ç¤ºè¡¨ç¤ºæ¯?è¡?é??å§?ç?? pixbuf æ¨?è¨?"
+msgstr "æ?¯å?¦é¡¯ç¤ºè¡¨ç¤ºæ¯?å??é??å§?ç?? pixbuf æ¨?è¨?"
 
 #. Action name
 #. Stock icon, if any
@@ -2738,14 +2745,14 @@ msgstr "ç·¨è??"
 #: ../plugins/debug-manager/threads.c:451
 #: ../plugins/gdb/preferences.c:363
 #: ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:621
+#: ../src/anjuta-app.c:623
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "��"
 
 #: ../plugins/debug-manager/stack_trace.c:675
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:945
+#: ../plugins/document-manager/plugin.c:951
 msgid "Line"
 msgstr "è¡?"
 
@@ -2778,31 +2785,31 @@ msgstr "æ??é??"
 msgid "Command"
 msgstr "æ??令"
 
-#: ../plugins/debug-manager/start.c:628
+#: ../plugins/debug-manager/start.c:629
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "ç?¡æ³?å?·è¡?ï¼?%sã??"
 
-#: ../plugins/debug-manager/start.c:642
+#: ../plugins/debug-manager/start.c:643
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼?%s\n"
 
-#: ../plugins/debug-manager/start.c:966
+#: ../plugins/debug-manager/start.c:969
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "ç?¡æ³?å?¨é??å?? %sã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:976
+#: ../plugins/debug-manager/start.c:979
 #, c-format
 msgid "Unable to detect MIME type of %s. Debugger cannot start."
 msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:1337
+#: ../plugins/debug-manager/start.c:1340
 msgid "Path"
 msgstr "路�"
 
-#: ../plugins/debug-manager/start.c:1386
+#: ../plugins/debug-manager/start.c:1389
 #: ../plugins/gdb/debugger.c:1929
 msgid ""
 "The program is running.\n"
@@ -2885,9 +2892,9 @@ msgid "Search Help:"
 msgstr "æ??å°?說æ??ï¼?"
 
 #: ../plugins/devhelp/plugin.c:223
-#: ../plugins/document-manager/plugin.c:241
-#: ../plugins/message-view/plugin.c:76
-#: ../plugins/symbol-db/plugin.c:311
+#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/message-view/plugin.c:77
+#: ../plugins/symbol-db/plugin.c:313
 msgid "_Go to"
 msgstr "移�(_G)"
 
@@ -2921,7 +2928,7 @@ msgstr "æ±?å?©æ??ä½?"
 
 #: ../plugins/devhelp/plugin.c:345
 #: ../plugins/devhelp/plugin.c:462
-#: ../src/anjuta-app.c:638
+#: ../src/anjuta-app.c:640
 msgid "Help"
 msgstr "æ±?å?©"
 
@@ -2930,13 +2937,13 @@ msgid "Contents"
 msgstr "�容"
 
 #: ../plugins/devhelp/plugin.c:362
-#: ../plugins/search/search-replace.c:1041
-#: ../plugins/search/search-replace.c:1717
-#: ../plugins/search/search-replace.c:1724
-#: ../plugins/search/search-replace.c:1736
-#: ../plugins/search/search-replace.c:2065
-#: ../plugins/symbol-db/plugin.c:2065
-#: ../plugins/symbol-db/plugin.c:2117
+#: ../plugins/search/search-replace.c:1034
+#: ../plugins/search/search-replace.c:1700
+#: ../plugins/search/search-replace.c:1707
+#: ../plugins/search/search-replace.c:1719
+#: ../plugins/search/search-replace.c:2037
+#: ../plugins/symbol-db/plugin.c:2126
+#: ../plugins/symbol-db/plugin.c:2178
 msgid "Search"
 msgstr "æ??å°?"
 
@@ -2968,7 +2975,7 @@ msgstr "移��籤"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:331
 #: ../plugins/document-manager/anjuta-bookmarks.c:404
-#: ../plugins/document-manager/plugin.c:420
+#: ../plugins/document-manager/plugin.c:422
 msgid "Bookmarks"
 msgstr "�籤"
 
@@ -2977,8 +2984,8 @@ msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:20
-#: ../plugins/gtodo/callback.c:101
+#: ../plugins/gtodo/callback.c:23
+#: ../plugins/gtodo/callback.c:106
 #: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "移�"
@@ -3000,7 +3007,7 @@ msgid "Open file"
 msgstr "é??å??æª?æ¡?"
 
 #: ../plugins/document-manager/anjuta-docman.c:641
-#: ../plugins/message-view/message-view.c:97
+#: ../plugins/message-view/message-view.c:100
 msgid "Save file as"
 msgstr "�����"
 
@@ -3052,7 +3059,7 @@ msgid "Position:"
 msgstr "�置�"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Right"
 msgstr "å?³"
 
@@ -3077,180 +3084,180 @@ msgid "Sorted in opening order"
 msgstr "以é??å??é ?åº?æ??åº?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Top"
 msgstr "�"
 
-#: ../plugins/document-manager/plugin.c:149
+#: ../plugins/document-manager/plugin.c:151
 msgid "_Save"
 msgstr "����(_S)"
 
-#: ../plugins/document-manager/plugin.c:150
+#: ../plugins/document-manager/plugin.c:152
 msgid "Save current file"
 msgstr "å?²å­?ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:151
+#: ../plugins/document-manager/plugin.c:153
 msgid "Save _Asâ?¦"
 msgstr "���(_A)�"
 
-#: ../plugins/document-manager/plugin.c:152
+#: ../plugins/document-manager/plugin.c:154
 msgid "Save the current file with a different name"
 msgstr "ç?¨å?¦ä¸?å??稱å?²å­?ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:154
+#: ../plugins/document-manager/plugin.c:156
 msgid "Save A_ll"
 msgstr "����(_L)"
 
-#: ../plugins/document-manager/plugin.c:155
+#: ../plugins/document-manager/plugin.c:157
 msgid "Save all currently open files, except new files"
 msgstr "å°?å?¨é?¨ç?®å??é??å??ç??æª?æ¡?å?²å­?ï¼?æ?°å¢?ç??æª?æ¡?é?¤å¤?"
 
-#: ../plugins/document-manager/plugin.c:157
+#: ../plugins/document-manager/plugin.c:159
 msgid "_Close File"
 msgstr "é??é??æª?æ¡?(_C)"
 
-#: ../plugins/document-manager/plugin.c:158
+#: ../plugins/document-manager/plugin.c:160
 msgid "Close current file"
 msgstr "é??é??ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:160
+#: ../plugins/document-manager/plugin.c:162
 msgid "Close All"
 msgstr "å?¨é?¨é??é??"
 
-#: ../plugins/document-manager/plugin.c:161
+#: ../plugins/document-manager/plugin.c:163
 msgid "Close all files"
 msgstr "é??é??å?¨é?¨æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:163
+#: ../plugins/document-manager/plugin.c:165
 msgid "Close Other"
 msgstr "é??é??å?¶ä»?ç??"
 
-#: ../plugins/document-manager/plugin.c:164
+#: ../plugins/document-manager/plugin.c:166
 msgid "Close other documents"
 msgstr "é??é??å?¶ä»?ç??æ??件"
 
-#: ../plugins/document-manager/plugin.c:166
+#: ../plugins/document-manager/plugin.c:168
 msgid "Reload F_ile"
 msgstr "é??æ?°è¼?å?¥æª?æ¡?(_I)"
 
-#: ../plugins/document-manager/plugin.c:167
+#: ../plugins/document-manager/plugin.c:169
 msgid "Reload current file"
 msgstr "é??æ?°è¼?å?¥ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:169
+#: ../plugins/document-manager/plugin.c:171
 msgid "Recent _Files"
-msgstr "æ??è¿?é??å??æª?æ¡? (_F)"
+msgstr "æ??è¿?é??å??æª?æ¡?(_F)"
 
-#: ../plugins/document-manager/plugin.c:173
+#: ../plugins/document-manager/plugin.c:175
 msgid "_Printâ?¦"
 msgstr "æ??å?°(_P)â?¦"
 
-#: ../plugins/document-manager/plugin.c:174
+#: ../plugins/document-manager/plugin.c:176
 msgid "Print the current file"
 msgstr "æ??å?°ç?®å??æª?æ¡?ç??å?§å®¹"
 
-#: ../plugins/document-manager/plugin.c:181
+#: ../plugins/document-manager/plugin.c:183
 msgid "_Print Preview"
 msgstr "é ?覽æ??å?°(_P)"
 
-#: ../plugins/document-manager/plugin.c:182
+#: ../plugins/document-manager/plugin.c:184
 msgid "Preview the current file in print format"
 msgstr "以æ??å?°å¾?ç??æ ¼å¼?é ?覽ç?®å??ç??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:189
 msgid "_Transform"
 msgstr "è½?æ??(_T)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:188
+#: ../plugins/document-manager/plugin.c:190
 msgid "_Make Selection Uppercase"
-msgstr "é?¸å®?ç¯?å??ç?ºå¤§å¯« (_M)"
+msgstr "é?¸å®?ç¯?å??ç?ºå¤§å¯«(_M)"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:191
 msgid "Make the selected text uppercase"
 msgstr "å°?é?¸å®?ç¯?å??å?§ç??å­?æ¯?è½?ç?ºå¤§å¯«å­?æ¯?"
 
-#: ../plugins/document-manager/plugin.c:191
+#: ../plugins/document-manager/plugin.c:193
 msgid "Make Selection Lowercase"
 msgstr "é?¸å®?ç¯?å??ç?ºå°?寫"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:194
 msgid "Make the selected text lowercase"
 msgstr "å°?é?¸å®?ç¯?å??å?§ç??å­?æ¯?è½?ç?ºå°?寫å­?æ¯?"
 
-#: ../plugins/document-manager/plugin.c:194
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert EOL to CRLF"
 msgstr "è½?æ?? EOL å­?符æ?? CRLF"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:197
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?º DOS EOL (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:197
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert EOL to LF"
 msgstr "è½?æ?? EOL ç?º LF"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:200
 msgid "Convert End Of Line characters to Unix EOL (LF)"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?º Unix EOL (LF)"
 
-#: ../plugins/document-manager/plugin.c:200
+#: ../plugins/document-manager/plugin.c:202
 msgid "Convert EOL to CR"
 msgstr "è½?æ?? EOL ç?º CR"
 
-#: ../plugins/document-manager/plugin.c:201
+#: ../plugins/document-manager/plugin.c:203
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?º Mac OS EOL (CR)"
 
-#: ../plugins/document-manager/plugin.c:203
+#: ../plugins/document-manager/plugin.c:205
 msgid "Convert EOL to Majority EOL"
 msgstr "è½?æ?? EOL ç?ºå¤?æ?¸ EOL"
 
-#: ../plugins/document-manager/plugin.c:204
+#: ../plugins/document-manager/plugin.c:206
 msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?符è½?æ??ç?ºè©²æª?æ¡?中å?ºç?¾æ¬¡æ?¸æ??å¤?ç?? EOL å??å¼?"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:211
 msgid "_Select"
 msgstr "é?¸å??(_S)"
 
-#: ../plugins/document-manager/plugin.c:211
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select _All"
 msgstr "å?¨é?¨é?¸å??(_A)"
 
-#: ../plugins/document-manager/plugin.c:212
+#: ../plugins/document-manager/plugin.c:214
 msgid "Select all text in the editor"
 msgstr "é?¸å??æ??件å?§ç??å?¨é?¨æ??å­?"
 
-#: ../plugins/document-manager/plugin.c:214
+#: ../plugins/document-manager/plugin.c:216
 msgid "Select _Code Block"
 msgstr "é?¸æ??å??å§?碼å??å¡?(_C)"
 
-#: ../plugins/document-manager/plugin.c:215
+#: ../plugins/document-manager/plugin.c:217
 msgid "Select the current code block"
 msgstr "é?¸å??ç?®å??å?½æ?¸å?§ç??å??å§?碼"
 
-#: ../plugins/document-manager/plugin.c:220
+#: ../plugins/document-manager/plugin.c:222
 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:223
+#: ../plugins/document-manager/plugin.c:225
 msgid "_Block Comment/Uncomment"
 msgstr "å??å¡?å? ä¸?/å??æ¶?å??註(_B)"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:226
 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:228
+#: ../plugins/document-manager/plugin.c:230
 msgid "Bo_x Comment/Uncomment"
 msgstr "æ?¹å¡?å? ä¸?/å??æ¶?å??註(_X)"
 
-#: ../plugins/document-manager/plugin.c:229
+#: ../plugins/document-manager/plugin.c:231
 msgid "Box comment the selected text"
 msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?æ?¹å¡?註解"
 
@@ -3258,426 +3265,426 @@ 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:235
+#: ../plugins/document-manager/plugin.c:237
 msgid "_Stream Comment/Uncomment"
 msgstr "å??å¡?å? ä¸?/å??æ¶?å??註(_S)"
 
-#: ../plugins/document-manager/plugin.c:236
+#: ../plugins/document-manager/plugin.c:238
 msgid "Stream comment the selected text"
 msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?å??å¡?註解"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:242
+#: ../plugins/document-manager/plugin.c:244
 msgid "_Line Numberâ?¦"
-msgstr "è¡?è??(_L)â?¦"
+msgstr "å??è??(_L)â?¦"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:245
 msgid "Go to a particular line in the editor"
-msgstr "å??å¾?æ??件å?§ç??æ??å®?è¡?è??"
+msgstr "å??å¾?æ??件å?§ç??æ??å®?å??è??"
 
-#: ../plugins/document-manager/plugin.c:245
+#: ../plugins/document-manager/plugin.c:247
 msgid "Matching _Brace"
-msgstr "å??å¾?å°?æ??æ?¬è?? (_B)"
+msgstr "å??å¾?å°?æ??æ?¬è??(_B)"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:248
 msgid "Go to the matching brace in the editor"
 msgstr "å¾?ç?®å??æ?¬è??å??å¾?å?¦ä¸?é?¢å°?æ??ç??æ?¬è??"
 
-#: ../plugins/document-manager/plugin.c:248
+#: ../plugins/document-manager/plugin.c:250
 msgid "_Start of Block"
 msgstr "å??å¡?é??é ­(_S)"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:251
 msgid "Go to the start of the current block"
 msgstr "å??å¾?ç?®å??å??å¡?ç??é??å§?ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:251
+#: ../plugins/document-manager/plugin.c:253
 msgid "_End of Block"
 msgstr "å??å¡?çµ?å°¾(_E)"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:254
 msgid "Go to the end of the current block"
 msgstr "å??å¾?ç?®å??å??å¡?ç??çµ?æ??ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:254
+#: ../plugins/document-manager/plugin.c:256
 msgid "Previous _History"
 msgstr "ä¸?ä¸?å??æ­·å?²ç´?é??(_P)"
 
-#: ../plugins/document-manager/plugin.c:255
+#: ../plugins/document-manager/plugin.c:257
 msgid "Go to previous history"
 msgstr "移è?³ä¸?ä¸?å??æ­·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:257
+#: ../plugins/document-manager/plugin.c:259
 msgid "Next Histor_y"
 msgstr "ä¸?ä¸?å??æ­·å?²ç´?é??(_Y)"
 
-#: ../plugins/document-manager/plugin.c:258
+#: ../plugins/document-manager/plugin.c:260
 msgid "Go to next history"
 msgstr "移è?³ä¸?ä¸?å??æ­·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:265
 #: ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../plugins/document-manager/plugin.c:264
+#: ../plugins/document-manager/plugin.c:266
 msgid "_Quick Search"
 msgstr "å¿«é??æ??å°?(_Q)"
 
-#: ../plugins/document-manager/plugin.c:265
+#: ../plugins/document-manager/plugin.c:267
 msgid "Quick editor embedded search"
 msgstr "å¿«é??ç??編輯å?¨å?§åµ?æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:267
+#: ../plugins/document-manager/plugin.c:269
 msgid "Quick _ReSearch"
 msgstr "å¿«é??é??æ?°æ??å°?(_R)"
 
-#: ../plugins/document-manager/plugin.c:268
+#: ../plugins/document-manager/plugin.c:270
 msgid "Repeat quick search"
 msgstr "é??è¤?å¿«é??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:273
-#: ../plugins/gtodo/interface.c:158
+#: ../plugins/document-manager/plugin.c:275
+#: ../plugins/gtodo/interface.c:141
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1876
-#: ../plugins/language-support-python/plugin.c:1176
+#: ../plugins/language-support-cpp-java/plugin.c:1914
+#: ../plugins/language-support-python/plugin.c:1179
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:274
+#: ../plugins/document-manager/plugin.c:276
 msgid "_Editor"
 msgstr "編輯��(_E)"
 
-#: ../plugins/document-manager/plugin.c:281
+#: ../plugins/document-manager/plugin.c:283
 msgid "_Add Editor View"
 msgstr "��編輯�檢�(_A)"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:284
 msgid "Add one more view of current document"
 msgstr "ç?ºç?®å??æ??件å??å¢?å? ä¸?å??檢è¦?ç?«é?¢"
 
-#: ../plugins/document-manager/plugin.c:284
+#: ../plugins/document-manager/plugin.c:286
 msgid "_Remove Editor View"
 msgstr "移�編輯�檢�(_R)"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:287
 msgid "Remove current view of the document"
 msgstr "移é?¤æ­¤æ??件ç??ç?¶å??檢è¦?ç?«é?¢"
 
-#: ../plugins/document-manager/plugin.c:287
+#: ../plugins/document-manager/plugin.c:289
 msgid "U_ndo"
 msgstr "復å??(_N)"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:290
 msgid "Undo the last action"
 msgstr "å??æ¶?å??å®?æ??ç??å??ä½?"
 
-#: ../plugins/document-manager/plugin.c:290
+#: ../plugins/document-manager/plugin.c:292
 msgid "_Redo"
 msgstr "é??è¤?(_R)"
 
-#: ../plugins/document-manager/plugin.c:291
+#: ../plugins/document-manager/plugin.c:293
 msgid "Redo the last undone action"
 msgstr "é??è¤?å??å??æ¶?ç??å??ä½?"
 
-#: ../plugins/document-manager/plugin.c:293
+#: ../plugins/document-manager/plugin.c:295
 msgid "C_ut"
 msgstr "��(_U)"
 
-#: ../plugins/document-manager/plugin.c:294
+#: ../plugins/document-manager/plugin.c:296
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "å?ªä¸?編輯å?¨ä¸­é?¸å®?ç??æ??å­?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:296
-#: ../plugins/terminal/terminal.c:616
+#: ../plugins/document-manager/plugin.c:298
+#: ../plugins/terminal/terminal.c:561
 msgid "_Copy"
 msgstr "�製(_C)"
 
-#: ../plugins/document-manager/plugin.c:297
+#: ../plugins/document-manager/plugin.c:299
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å­?è¤?製å?°å?ªè²¼ç°¿"
 
-#: ../plugins/document-manager/plugin.c:299
-#: ../plugins/terminal/terminal.c:624
+#: ../plugins/document-manager/plugin.c:301
+#: ../plugins/terminal/terminal.c:569
 msgid "_Paste"
 msgstr "貼�(_P)"
 
-#: ../plugins/document-manager/plugin.c:300
+#: ../plugins/document-manager/plugin.c:302
 msgid "Paste the content of clipboard at the current position"
 msgstr "å°?å?ªè²¼ç°¿ä¸?ç??æ??å­?è¤?製å?°ç?®å??é??æ¨?ç??ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:308
+#: ../plugins/document-manager/plugin.c:310
 msgid "_Clear"
 msgstr "��(_C)"
 
-#: ../plugins/document-manager/plugin.c:309
+#: ../plugins/document-manager/plugin.c:311
 msgid "Delete the selected text from the editor"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å­?å?ªé?¤"
 
-#: ../plugins/document-manager/plugin.c:312
+#: ../plugins/document-manager/plugin.c:314
 msgid "_Auto-Complete"
 msgstr "è?ªå??è£?é½?(_A)"
 
-#: ../plugins/document-manager/plugin.c:313
+#: ../plugins/document-manager/plugin.c:315
 msgid "Auto-complete the current word"
 msgstr "è?ªå??è£?é½?ç?®å??ç??å­?"
 
-#: ../plugins/document-manager/plugin.c:318
+#: ../plugins/document-manager/plugin.c:320
 msgid "_Line Number Margin"
-msgstr "è¡?è??å??(_L)"
+msgstr "å??è??å??(_L)"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:321
 msgid "Show/Hide line numbers"
-msgstr "顯示 / é?±è??è¡?è??å??"
+msgstr "顯示 / é?±è??å??è??å??"
 
-#: ../plugins/document-manager/plugin.c:321
+#: ../plugins/document-manager/plugin.c:323
 msgid "_Marker Margin"
 msgstr "æ¨?è??å??(_M)"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:324
 msgid "Show/Hide marker margin"
 msgstr "顯示/é?±è??æ¨?è??å??"
 
-#: ../plugins/document-manager/plugin.c:324
+#: ../plugins/document-manager/plugin.c:326
 msgid "_Code Fold Margin"
 msgstr "ç¨?å¼?碼å±?ç??å??(_C)"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:327
 msgid "Show/Hide code fold margin"
 msgstr "顯示 / é?±è??å?½æ?¸å±?ç??å??"
 
-#: ../plugins/document-manager/plugin.c:327
+#: ../plugins/document-manager/plugin.c:329
 msgid "_Indentation Guides"
 msgstr "縮æ??æ??å¼?(_I)"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:330
 msgid "Show/Hide indentation guides"
 msgstr "顯示 / é?±è??縮æ??æ??å¼?"
 
-#: ../plugins/document-manager/plugin.c:330
+#: ../plugins/document-manager/plugin.c:332
 msgid "_White Space"
 msgstr "空��符(_W)"
 
-#: ../plugins/document-manager/plugin.c:331
+#: ../plugins/document-manager/plugin.c:333
 msgid "Show/Hide white spaces"
 msgstr "顯示 / é?±è??空ç?½å­?符"
 
-#: ../plugins/document-manager/plugin.c:333
+#: ../plugins/document-manager/plugin.c:335
 msgid "_Line End Characters"
 msgstr "å?¥å­?çµ?æ??å­?符(_L)"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:336
 msgid "Show/Hide line end characters"
 msgstr "顯示 / é?±è??å?¥å­?çµ?æ??å­?符"
 
-#: ../plugins/document-manager/plugin.c:336
+#: ../plugins/document-manager/plugin.c:338
 msgid "Line _Wrapping"
-msgstr "æ??è¡?(_W)"
+msgstr "æ??å??(_W)"
 
-#: ../plugins/document-manager/plugin.c:337
+#: ../plugins/document-manager/plugin.c:339
 msgid "Enable/disable line wrapping"
-msgstr "å??ç?¨/å??ç?¨æ??è¡?"
+msgstr "å??ç?¨/å??ç?¨æ??å??"
 
-#: ../plugins/document-manager/plugin.c:342
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom In"
 msgstr "æ??è¿?"
 
-#: ../plugins/document-manager/plugin.c:343
+#: ../plugins/document-manager/plugin.c:345
 msgid "Zoom in: Increase font size"
 msgstr "æ??è¿?ï¼?å¢?å? å­?å??大å°?"
 
-#: ../plugins/document-manager/plugin.c:345
+#: ../plugins/document-manager/plugin.c:347
 msgid "Zoom Out"
 msgstr "æ??é? "
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:348
 msgid "Zoom out: Decrease font size"
 msgstr "æ??é? ï¼?æ¸?å°?å­?å??大å°?"
 
-#: ../plugins/document-manager/plugin.c:351
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Highlight Mode"
 msgstr "���示模�(_H)"
 
-#: ../plugins/document-manager/plugin.c:355
+#: ../plugins/document-manager/plugin.c:357
 msgid "_Close All Folds"
 msgstr "å?½æ?¸å?¨é?¨æ?ºç??(_C)"
 
-#: ../plugins/document-manager/plugin.c:356
+#: ../plugins/document-manager/plugin.c:358
 msgid "Close all code folds in the editor"
 msgstr "å°?å?¨é?¨å?½æ?¸ç??å??å§?碼æ?ºç??"
 
-#: ../plugins/document-manager/plugin.c:358
+#: ../plugins/document-manager/plugin.c:360
 msgid "_Open All Folds"
 msgstr "å?½æ?¸å?¨é?¨å±?é??(_O)"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:361
 msgid "Open all code folds in the editor"
 msgstr "å°?å?¨é?¨å?½æ?¸ç??å??å§?碼å±?é??"
 
-#: ../plugins/document-manager/plugin.c:361
+#: ../plugins/document-manager/plugin.c:363
 msgid "_Toggle Current Fold"
 msgstr "å??æ??ç?®å??æ??ç??ç??æ??(_T)"
 
-#: ../plugins/document-manager/plugin.c:362
+#: ../plugins/document-manager/plugin.c:364
 msgid "Toggle current code fold in the editor"
 msgstr "å??æ??ç?®å??編輯å?¨ä¸­ç¨?å¼?碼ç??æ?ºç??ç??æ??"
 
-#: ../plugins/document-manager/plugin.c:367
+#: ../plugins/document-manager/plugin.c:369
 msgid "_Documents"
 msgstr "æ??件(_D)"
 
-#: ../plugins/document-manager/plugin.c:368
+#: ../plugins/document-manager/plugin.c:370
 msgid "Previous Document"
 msgstr "ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:371
 msgid "Switch to previous document"
 msgstr "å??æ??å?°ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:371
+#: ../plugins/document-manager/plugin.c:373
 msgid "Next Document"
 msgstr "ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:372
+#: ../plugins/document-manager/plugin.c:374
 msgid "Switch to next document"
 msgstr "å??æ??å?°ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:377
+#: ../plugins/document-manager/plugin.c:379
 msgid "Bookmar_k"
 msgstr "�籤(_K)"
 
-#: ../plugins/document-manager/plugin.c:378
+#: ../plugins/document-manager/plugin.c:380
 msgid "_Add Bookmark"
 msgstr "���籤(_A)"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:381
 msgid "Add a bookmark at the current line position"
 msgstr "å°?ç?®å??æ??å?¨è¡?ç??ä½?ç½®å? å?¥æ?¸ç±¤"
 
-#: ../plugins/document-manager/plugin.c:381
+#: ../plugins/document-manager/plugin.c:383
 msgid "_Previous Bookmark"
 msgstr "ä¸?ä¸?å??æ?¸ç±¤(_P)"
 
-#: ../plugins/document-manager/plugin.c:382
+#: ../plugins/document-manager/plugin.c:384
 msgid "Jump to the previous bookmark in the file"
 msgstr "è·³è?³æª?æ¡?中å??ä¸?å??æ?¸ç±¤"
 
-#: ../plugins/document-manager/plugin.c:384
+#: ../plugins/document-manager/plugin.c:386
 msgid "_Next Bookmark"
 msgstr "ä¸?ä¸?å??æ?¸ç±¤(_N)"
 
-#: ../plugins/document-manager/plugin.c:385
+#: ../plugins/document-manager/plugin.c:387
 msgid "Jump to the next bookmark in the file"
 msgstr "è·³è?³æª?æ¡?中ä¸?ä¸?å??æ?¸ç±¤"
 
-#: ../plugins/document-manager/plugin.c:387
+#: ../plugins/document-manager/plugin.c:389
 msgid "_Clear All Bookmarks"
 msgstr "æ¸?é?¤æ??æ??æ?¸ç±¤(_C)"
 
-#: ../plugins/document-manager/plugin.c:388
+#: ../plugins/document-manager/plugin.c:390
 msgid "Clear bookmarks"
 msgstr "���籤"
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:409
 msgid "Editor file operations"
 msgstr "編輯å?¨æª?æ¡?æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor print operations"
 msgstr "編輯å?¨æ??å?°æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:409
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor text transformation"
 msgstr "編輯å?¨æ??å­?è½?æ??"
 
-#: ../plugins/document-manager/plugin.c:410
+#: ../plugins/document-manager/plugin.c:412
 msgid "Editor text selection"
 msgstr "編輯å?¨æ??å­?é?¸å??"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:412
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor code commenting"
 msgstr "編輯å??å§?碼å??註"
 
-#: ../plugins/document-manager/plugin.c:413
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor navigations"
 msgstr "編輯��覽"
 
-#: ../plugins/document-manager/plugin.c:414
+#: ../plugins/document-manager/plugin.c:416
 msgid "Editor edit operations"
 msgstr "編輯å?¨ç·¨è¼¯æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:417
 msgid "Editor zoom operations"
 msgstr "編輯å?¨ç¸®æ?¾æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:416
+#: ../plugins/document-manager/plugin.c:418
 msgid "Editor syntax highlighting styles"
 msgstr "編輯����示風格"
 
-#: ../plugins/document-manager/plugin.c:417
+#: ../plugins/document-manager/plugin.c:419
 msgid "Editor text formating"
 msgstr "編輯å?¨æ??å­?æ ¼å¼?"
 
-#: ../plugins/document-manager/plugin.c:418
+#: ../plugins/document-manager/plugin.c:420
 msgid "Simple searching"
 msgstr "ç°¡æ??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:419
-#: ../plugins/document-manager/plugin.c:1736
-#: ../plugins/document-manager/plugin.c:2153
-#: ../plugins/document-manager/plugin.c:2163
+#: ../plugins/document-manager/plugin.c:421
+#: ../plugins/document-manager/plugin.c:1750
+#: ../plugins/document-manager/plugin.c:2172
+#: ../plugins/document-manager/plugin.c:2181
 msgid "Documents"
 msgstr "æ??件"
 
-#: ../plugins/document-manager/plugin.c:424
+#: ../plugins/document-manager/plugin.c:426
 msgid "Editor view settings"
 msgstr "設�編輯�檢�"
 
-#: ../plugins/document-manager/plugin.c:609
+#: ../plugins/document-manager/plugin.c:615
 msgid "Reload"
 msgstr "é??æ?°è¼?å?¥"
 
-#: ../plugins/document-manager/plugin.c:615
+#: ../plugins/document-manager/plugin.c:621
 msgid "Go to"
 msgstr "移�"
 
-#: ../plugins/document-manager/plugin.c:930
+#: ../plugins/document-manager/plugin.c:936
 msgid "OVR"
 msgstr "�寫"
 
-#: ../plugins/document-manager/plugin.c:934
+#: ../plugins/document-manager/plugin.c:940
 msgid "INS"
 msgstr "æ??å?¥"
 
-#: ../plugins/document-manager/plugin.c:940
-#: ../plugins/document-manager/plugin.c:943
+#: ../plugins/document-manager/plugin.c:946
+#: ../plugins/document-manager/plugin.c:949
 msgid "Zoom"
 msgstr "æ??é? "
 
-#: ../plugins/document-manager/plugin.c:946
+#: ../plugins/document-manager/plugin.c:952
 msgid "Col"
 msgstr "�"
 
-#: ../plugins/document-manager/plugin.c:947
+#: ../plugins/document-manager/plugin.c:953
 msgid "Mode"
 msgstr "模�"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1027
+#: ../plugins/document-manager/plugin.c:1033
 msgid "Automatic"
 msgstr "è?ªå??"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1560
+#: ../plugins/document-manager/plugin.c:1592
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå??å?²å­? %s 失æ??"
 
-#: ../plugins/document-manager/plugin.c:1574
+#: ../plugins/document-manager/plugin.c:1606
 msgid "Autosave completed"
 msgstr "è?ªå??å?²å­?å®?ç?¢"
 
@@ -3692,7 +3699,7 @@ msgid "Search for \"%s\" reached the end and was continued at the top but no new
 msgstr "æ??å°?ã??%sã??å·²é??çµ?尾並已å¾?é ­é??å§?ï¼?ä½?å·²æ?¾ä¸?å?°ç¬¦å??é ?ç?®ã??"
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match case"
 msgstr "å??å??大å°?寫"
 
@@ -3931,9 +3938,9 @@ msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? <b>%s</b> ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/file-loader/plugin.c:1441
-#: ../plugins/project-import/plugin.c:205
-msgid "Open With"
-msgstr "以此é??å??"
+#| msgid "Open With"
+msgid "<b>Open With</b>"
+msgstr "<b>以此é??å??</b>"
 
 #: ../plugins/file-manager/file-manager.ui.h:1
 msgid "Choose Directory to show if no project is open"
@@ -3960,8 +3967,8 @@ msgid "Filter"
 msgstr "é??濾æ¢?件"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2060
-#: ../plugins/symbol-db/plugin.c:2109
+#: ../plugins/symbol-db/plugin.c:2121
+#: ../plugins/symbol-db/plugin.c:2170
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å??"
@@ -3972,7 +3979,7 @@ msgstr "å¦?æ??æ²?æ??é??å??å°?æ¡?æ??ç??æ ¹ç?®é??ï¼?"
 
 #: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
-msgstr "正���..."
+msgstr "正����"
 
 #: ../plugins/file-manager/file-view.c:569
 msgid "Filename"
@@ -3986,24 +3993,24 @@ msgstr "�� URI"
 msgid "URI of the top-most path displayed"
 msgstr "æ??ä¸?層路å¾?顯示ç?? URI"
 
-#: ../plugins/file-manager/plugin.c:74
+#: ../plugins/file-manager/plugin.c:75
 msgid "_Rename"
 msgstr "é??æ?°å?½å??(_R)"
 
-#: ../plugins/file-manager/plugin.c:74
+#: ../plugins/file-manager/plugin.c:75
 msgid "Rename file or directory"
 msgstr "é??æ?°å?½å??æª?æ¡?æ??ç?®é??"
 
-#: ../plugins/file-manager/plugin.c:297
+#: ../plugins/file-manager/plugin.c:294
 msgid "File manager popup actions"
 msgstr "æª?æ¡?管ç??ç¨?å¼?å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/file-manager/plugin.c:330
+#: ../plugins/file-manager/plugin.c:327
 msgid "Files"
 msgstr "��"
 
-#: ../plugins/file-manager/plugin.c:460
-#: ../plugins/file-manager/plugin.c:469
+#: ../plugins/file-manager/plugin.c:457
+#: ../plugins/file-manager/plugin.c:466
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "æª?æ¡?管ç??å?¡"
@@ -4037,19 +4044,19 @@ msgid "File Information"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/am-project/am-properties.c:45
 #: ../plugins/git/anjuta-git.ui.h:64
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??稱ï¼?"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/starter/starter.c:422
+#: ../plugins/starter/starter.c:413
 msgid "New File"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
-#: ../plugins/gbf-am/gbf-am-properties.c:1446
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:353
+#: ../plugins/project-manager/dialogs.c:542
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
@@ -4090,10 +4097,15 @@ msgid "Shell Script File"
 msgstr "Shell �令稿��"
 
 #: ../plugins/file-wizard/file.c:92
+#| msgid "Java Source File"
+msgid "Vala Source File"
+msgstr "Vala å??å§?æª?"
+
+#: ../plugins/file-wizard/file.c:93
 msgid "Other"
 msgstr "��"
 
-#: ../plugins/file-wizard/file.c:105
+#: ../plugins/file-wizard/file.c:106
 msgid "BSD Public License"
 msgstr "BSD ��許��"
 
@@ -4101,332 +4113,121 @@ msgstr "BSD ��許��"
 msgid "Unable to build user interface for New File"
 msgstr "ç?¡æ³?建ç«?æ?°æª?æ¡?ç??使ç?¨è??ä»?é?¢"
 
-#: ../plugins/gbf-am/gbf-am-config.c:98
-#: ../plugins/gbf-am/gbf-am-config.c:132
-msgid "Invalid GbfAmConfigValue type"
-msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
-msgid "Add _Package"
-msgstr "���件(_P)"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
-msgid "Add _module"
-msgstr "��模�(_M)"
-
-#: ../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 "é?¸æ??å¥?件"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:7
-msgid "Variables"
-msgstr "è®?æ?¸"
-
-#: ../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/dir-project/dir-project.c:133
+#: ../plugins/dir-project/dir-project.c:156
+#, c-format
+#| msgid "Missing tool name"
+msgid "Missing name"
+msgstr "缺å°?å??稱"
 
-#: ../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 "GLib mkenums"
-
-#: ../plugins/gbf-am/gbf-am-project.c:244
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
-msgid "GLib genmarshal"
-msgstr "GLib genmarshal"
-
-#: ../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: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: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: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:2751
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2713
-#: ../plugins/dir-project/dir-project.c:693
-#: ../plugins/dir-project/dir-project.c:765
+#: ../plugins/dir-project/dir-project.c:649
+#: ../plugins/dir-project/dir-project.c:762
+#: ../plugins/am-project/am-project.c:1627
+#: ../plugins/am-project/am-project.c:1658
+#: ../plugins/am-project/am-project.c:1767
+#: ../plugins/am-project/am-project.c:1843
 #, c-format
 msgid "Project doesn't exist or invalid path"
 msgstr "å°?æ¡?ä¸?å­?å?¨æ??ç?¡æ??ç??è·¯å¾?"
 
-#: ../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:2959
-msgid "Please specify group name"
-msgstr "è«?æ??å®?ç¾£çµ?å??稱"
-
-#: ../plugins/gbf-am/gbf-am-project.c:2973
-msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr "ç¾£çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?符"
+#: ../plugins/dir-project/dir-project.c:773
+#: ../plugins/am-project/am-project.c:91
+#| msgid "Group:"
+msgid "Group"
+msgstr "羣�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2982
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2925
-msgid "Parent group doesn't exist"
-msgstr "�層羣����"
+#: ../plugins/dir-project/dir-project.c:776
+#: ../plugins/am-project/am-project.c:98
+#| msgid "Source:"
+msgid "Source"
+msgstr "��"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2993
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2936
-msgid "Group already exists"
-msgstr "羣�已���"
+#: ../plugins/dir-project/dir-project.c:877
+#: ../plugins/dir-project/dir-project.c:887
+#, c-format
+#| msgid "Project doesn't exist"
+msgid "Project doesn't allow to set properties"
+msgstr "å°?æ¡?ä¸?å??許設å®?屬æ?§"
 
-#: ../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/am-project/am-node.c:750
+msgid "Please specify group name"
+msgstr "è«?æ??å®?ç¾£çµ?å??稱"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3063
-msgid "Group couldn't be removed"
-msgstr "��移�羣�"
+#: ../plugins/am-project/am-node.c:764
+#| msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
+msgstr "ç¾£çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?æ?? \"#$:%+,- = ^_`~\" å­?符"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3213
+#: ../plugins/am-project/am-node.c:918
 msgid "Please specify target name"
 msgstr "è«?æ??å®?ç?®æ¨?å??稱"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3227
-msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?符"
+#: ../plugins/am-project/am-node.c:932
+#| msgid ""
+#| "Target name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
+msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-'ã??'/' æ?? '.' å­?符"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3236
+#: ../plugins/am-project/am-node.c:947
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr "å?±äº«ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.laã??"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3245
+#: ../plugins/am-project/am-node.c:956
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr "é??æ??ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.aã??"
 
-#: ../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:3267
-msgid "General failure in target creation"
-msgstr "ç?®æ¨?建ç«?ç¨?åº?ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3295
-msgid "Newly created target could not be identified"
-msgstr "æ??æ?°å»ºç«?ç??ç?®æ¨?ç?¡æ³?辨è­?"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3328
-msgid "Target couldn't be removed"
-msgstr "��移���"
-
-#: ../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/am-project/am-project.c:114
+msgid "Shared Library"
+msgstr "�享��庫"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3532
-msgid "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr "ä¾?æº?æª?æ¡?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?符"
+#: ../plugins/am-project/am-project.c:121
+msgid "Static Library"
+msgstr "é??æ??ç¨?å¼?庫"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3612
-msgid "Source file is already in given target"
-msgstr "ä¾?æº?æª?æ¡?å·²å?¨æ??å®?ç??ç?®æ¨?中"
+#: ../plugins/am-project/am-project.c:135
+msgid "Python Module"
+msgstr "Python 模�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3630
-msgid "General failure in adding source file"
-msgstr "å? å?¥ä¾?æº?æª?æ¡?æ??ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
+#: ../plugins/am-project/am-project.c:142
+msgid "Java Module"
+msgstr "Java 模�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3664
-msgid "Newly added source file could not be identified"
-msgstr "æ??æ?°å? å?¥ç??ä¾?æº?æª?æ¡?ç?¡æ³?辨è­?"
+#: ../plugins/am-project/am-project.c:149
+msgid "Lisp Module"
+msgstr "Lisp 模�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3695
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3520
-msgid "Source couldn't be removed"
-msgstr "��移���"
+#: ../plugins/am-project/am-project.c:156
+msgid "Header Files"
+msgstr "�頭�"
 
-#: ../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/am-project/am-project.c:163
+msgid "Man Documentation"
+msgstr "Man æ??件"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:289
-#: ../plugins/gbf-am/gbf-am-properties.c:341
-msgid "Enter new module"
-msgstr "輸å?¥æ?°ç??模çµ?"
+#: ../plugins/am-project/am-project.c:170
+msgid "Info Documentation"
+msgstr "Info æ??件"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:449
-#, c-format
-msgid "Are you sure you want to remove module \"%s\" and all its associated packages?"
-msgstr "æ?¯å?¦ç¢ºå®?è¦?移é?¤æ¨¡çµ?ã??%sã??è??æ??æ??è??å®?é??è?¯ç??å¥?件ï¼?"
+#: ../plugins/am-project/am-project.c:177
+msgid "Miscellaneous Data"
+msgstr "é??é ?è³?æ??"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:451
-#, c-format
-msgid "Are you sure you want to remove package \"%s\"?"
-msgstr "æ?¯å?¦ç¢ºå®?移é?¤å¥?件ã??%sã??ï¼?"
+#: ../plugins/am-project/am-project.c:184
+msgid "Script"
+msgstr "�令稿"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:509
-#: ../plugins/gbf-am/gbf-am-properties.c:591
-msgid "Enter new variable"
-msgstr "輸å?¥æ?°ç??è®?æ?¸"
+#: ../plugins/am-project/am-project.c:198
+#| msgid "Packages"
+msgid "Package"
+msgstr "�件"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:622
+#: ../plugins/am-project/am-project.c:1644
 #, c-format
-msgid "Are you sure you want to remove variable \"%s\"?"
-msgstr "æ?¯å?¦ç¢ºå®?移é?¤è®?æ?¸ã??%sã??ï¼?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:776
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:180
-msgid "Project:"
-msgstr "å°?æ¡?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:779
-msgid "Package name:"
-msgstr "å°?æ¡?å??稱:"
+#| msgid "Unable to update project"
+msgid "Unable to parse project file"
+msgstr "ç?¡æ³?解æ??å°?æ¡?æª?æ¡?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:782
+#: ../plugins/am-project/am-properties.c:46
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:26
@@ -4446,158 +4247,128 @@ msgstr "å°?æ¡?å??稱:"
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:785
-msgid "URI:"
-msgstr "URIï¼?"
+#: ../plugins/am-project/am-properties.c:47
+msgid "Bug report URL:"
+msgstr "é?¯èª¤å ±å?? URLï¼?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:852
-msgid "Module/Packages"
-msgstr "模�/�件"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:861
-msgid "Version"
-msgstr "ç??æ?¬"
+#: ../plugins/am-project/am-properties.c:48
+msgid "Package name:"
+msgstr "å°?æ¡?å??稱:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1151
-msgid "Use"
-msgstr "使�"
+#: ../plugins/am-project/am-properties.c:49
+#: ../plugins/git/anjuta-git.ui.h:117
+msgid "URL:"
+msgstr "URL:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1243
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
-msgid "Group name:"
-msgstr "ç¾£çµ?å??稱:"
+#: ../plugins/am-project/am-properties.c:56
+#: ../plugins/am-project/am-properties.c:75
+msgid "Linker flags:"
+msgstr "é?£çµ?å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1246
-msgid "Advanced"
-msgstr "é?²é??"
+#: ../plugins/am-project/am-properties.c:57
+#: ../plugins/am-project/am-properties.c:78
+msgid "C preprocessor flags:"
+msgstr "C é ?è??ç??å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1251
-#: ../plugins/gbf-am/gbf-am-properties.c:1341
+#: ../plugins/am-project/am-properties.c:58
+#: ../plugins/am-project/am-properties.c:79
 msgid "C compiler flags:"
 msgstr "C 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1253
-msgid "C preprocessor flags:"
-msgstr "C é ?è??ç??å?¨æ??æ¨?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1255
+#: ../plugins/am-project/am-properties.c:59
+#: ../plugins/am-project/am-properties.c:80
 msgid "C++ compiler flags:"
 msgstr "C++ 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1257
-msgid "gcj compiler flags (ahead-of-time):"
-msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time):"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1259
-msgid "Java compiler flags (just-in-time):"
-msgstr "Java 編譯å?¨æ??æ¨? (just-in-time):"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1261
-#: ../plugins/gbf-am/gbf-am-properties.c:1349
-msgid "Fortran compiler flags:"
-msgstr "Fortran 編譯å?¨æ??æ¨?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1264
-msgid "Includes (deprecated):"
-msgstr "å??å?«ï¼?已廢æ£?ï¼?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1275
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:261
+#: ../plugins/am-project/am-properties.c:60
+#: ../plugins/am-project/am-properties.c:81
+#| msgid "C compiler flags:"
+msgid "Java compiler flags:"
+msgstr "Java 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:61
+#: ../plugins/am-project/am-properties.c:82
+#| msgid "C compiler flags:"
+msgid "Vala compiler flags:"
+msgstr "Vala 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:62
+#: ../plugins/am-project/am-properties.c:83
+#| msgid "Fortran compiler flags:"
+msgid "Fortan compiler flags:"
+msgstr "Fortran 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:63
+#: ../plugins/am-project/am-properties.c:84
+#| msgid "C compiler flags:"
+msgid "Objective C compiler flags:"
+msgstr "Objective C 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:64
+#: ../plugins/am-project/am-properties.c:85
+#| msgid "Linker flags:"
+msgid "Lex/Flex flags:"
+msgstr "Lex/Flex æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:65
+#: ../plugins/am-project/am-properties.c:86
+#| msgid "Linker flags:"
+msgid "Yacc/Bison flags:"
+msgstr "Yacc/Bison æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:66
 msgid "Install directories:"
-msgstr "å®?è£?ç?®é??:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1343
-msgid "C preprocessor flags"
-msgstr "C é ?è??ç??å?¨æ??æ¨?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1345
-msgid "C++ compiler flags"
-msgstr "C++ 編譯å?¨æ??æ¨?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1347
-msgid "gcj compiler flags (ahead-of-time)"
-msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time)"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1353
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:413
-msgid "Linker flags:"
-msgstr "é?£çµ?å?¨æ??æ¨?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1359
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:419
-msgid "Libraries:"
-msgstr "��庫:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1365
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:425
-msgid "Dependencies:"
-msgstr "ç?¸æ ¹æ??é??ä¿?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1368
-msgid "Advanced options"
-msgstr "é?²é??é?¸é ?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1443
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
-msgid "Target name:"
-msgstr "ç?®æ¨?å??稱:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1452
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:359
-msgid "Group:"
-msgstr "羣�:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1470
-#: ../plugins/gbf-am/gbf-am-properties.c:1486
-#: ../plugins/gbf-am/gbf-am-properties.c:1493
-#: ../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:1505
-msgid "Advancedâ?¦"
-msgstr "é?²é??..."
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
-#: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
-msgid "Invalid GbfMkfileConfigValue type"
-msgstr "ç?¡æ??ç?? GbfMkfileConfigValue é¡?å??"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2699
-msgid "Project doesn't exist"
-msgstr "�����"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3006
-msgid "Group coudn't be removed"
-msgstr "��移�羣�"
-
-#: ../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:3229
-msgid "Target coudn't be removed"
-msgstr "��移���"
-
-#: ../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:3439
-msgid "Source is already in target"
-msgstr "��已����中"
-
-#: ../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-properties.c:250
-msgid "Includes:"
-msgstr "å??å?«:"
+msgstr "å®?è£?ç?®é??ï¼?"
+
+#: ../plugins/am-project/am-properties.c:73
+#| msgid "Do not show tabs"
+msgid "Do not install:"
+msgstr "�����"
+
+#: ../plugins/am-project/am-properties.c:74
+#| msgid "Install directory:"
+msgid "Installation directory:"
+msgstr "å®?è£?ç?®é??ï¼?"
+
+#: ../plugins/am-project/am-properties.c:76
+#| msgid "Add internationalization:"
+msgid "Additional libraries:"
+msgstr "é¡?å¤?ç??ç¨?å¼?庫ï¼?"
+
+#: ../plugins/am-project/am-properties.c:77
+#| msgid "Add to Project"
+msgid "Additional objects:"
+msgstr "é¡?å¤?ç??ç?©ä»¶ï¼?"
+
+#: ../plugins/am-project/am-properties.c:87
+#: ../plugins/am-project/am-properties.c:97
+#| msgid "Plugin Dependencies:"
+msgid "Additional dependencies:"
+msgstr "é¡?å¤?ç??ç?¸æ ¹æ??æ?§ï¼?"
+
+#: ../plugins/am-project/am-properties.c:88
+#| msgid "Plugin Description:"
+msgid "Include in distribution:"
+msgstr "å??å?«æ?¼æ??è¿°ï¼?"
+
+#: ../plugins/am-project/am-properties.c:89
+#| msgid "Build Directory:"
+msgid "Build for check only:"
+msgstr "�編譯�檢����"
+
+#: ../plugins/am-project/am-properties.c:90
+#: ../plugins/am-project/am-properties.c:98
+msgid "Do not use prefix:"
+msgstr "ä¸?使ç?¨å??綴ï¼?"
+
+#: ../plugins/am-project/am-properties.c:91
+msgid "Keep target path:"
+msgstr "ä¿?ç??ç?®æ¨?è·¯å¾?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:99
+#| msgid "Maximum Actions"
+msgid "Manual section:"
+msgstr "æ??å??ç« ç¯?ï¼?"
 
 #: ../plugins/gdb/anjuta-gdb.ui.h:1
 msgid "Available pretty printers"
@@ -4751,12 +4522,12 @@ msgstr "å?³é??è¨?è?? %s 給è¡?ç¨?ï¼?%d"
 msgid "Error whilst signaling the process."
 msgstr "å?³é??ä¸?å??è¨?è??給ç¨?åº?æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../plugins/gdb/plugin.c:117
+#: ../plugins/gdb/plugin.c:118
 #, c-format
 msgid "Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr "建ç«?å??ç?º %s ç?? FIFO æª?æ¡?失æ??ã??該ç¨?å¼?æ??以ä¸?使ç?¨çµ?端æ©?ç??æ?¹å¼?å?·è¡?ã??"
 
-#: ../plugins/gdb/plugin.c:203
+#: ../plugins/gdb/plugin.c:202
 msgid "Cannot start terminal for debugging."
 msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?é?¤é?¯ã??"
 
@@ -5247,10 +5018,6 @@ msgstr "å?°ï¼?"
 msgid "URL"
 msgstr "網å??"
 
-#: ../plugins/git/anjuta-git.ui.h:117
-msgid "URL:"
-msgstr "URL:"
-
 #: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Unstage ��"
@@ -5310,7 +5077,7 @@ msgstr "è«?輸å?¥ URLã??"
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
 msgid "Git: Fetchingâ?¦"
-msgstr "Gitï¼?æ­£å?¨å??å??..."
+msgstr "Gitï¼?æ­£å?¨å??å??â?¦"
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
 msgid "Please select a mailbox file."
@@ -5373,6 +5140,19 @@ msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
 msgid "Git: Deleted selected tags."
 msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
 
+#. Translators: default file name for git diff's output
+#: ../plugins/git/git-diff-dialog.c:42
+#| msgid "Stash Uncommitted Changes"
+msgid "Uncommitted Changes.diff"
+msgstr "Uncommitted Changes.diff"
+
+#. Translators: file name for an existing commits diff, %s is an SHASUM of a commit
+#: ../plugins/git/git-diff-dialog.c:77
+#, c-format
+#| msgid "_Show commit diff"
+msgid "Commit %s.diff"
+msgstr "Commit %s.diff"
+
 #: ../plugins/git/git-fetch-dialog.c:40
 msgid "Git: Fetch complete."
 msgstr "Gitï¼?å??å??å·²å®?æ??ã??"
@@ -5501,19 +5281,19 @@ msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
 msgid "Please select a stash"
 msgstr "è«?é?¸æ??ä¸?å?? stash"
 
-#: ../plugins/git/git-ui-utils.c:604
+#: ../plugins/git/git-ui-utils.c:603
 msgid "Git: Changes stored in a stash."
 msgstr "Gitï¼?å?²å­?å?¨ stash ç??æ?´æ?¹ã??"
 
-#: ../plugins/git/git-ui-utils.c:620
+#: ../plugins/git/git-ui-utils.c:619
 msgid "Git: Stashed changes applied."
 msgstr "Gitï¼?å¥?ç?¨å·² stash ç??æ?´æ?¹ã??"
 
-#: ../plugins/git/git-ui-utils.c:744
+#: ../plugins/git/git-ui-utils.c:743
 msgid "Git: Diff complete."
 msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
 
-#: ../plugins/git/git-ui-utils.c:760
+#: ../plugins/git/git-ui-utils.c:759
 #, c-format
 msgid "Column %i"
 msgstr "� %i"
@@ -5870,7 +5650,7 @@ msgstr "å°?ä½ ç??æ?´æ?¹è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
 #: ../plugins/git/plugin.c:327
 #: ../plugins/git/plugin.c:447
 msgid "_Startâ?¦"
-msgstr "é??å§?(_S)..."
+msgstr "é??å§?(_S)â?¦"
 
 #. Display label
 #. short-cut
@@ -6014,6 +5794,12 @@ msgstr "Bisect"
 msgid "Start a bisect operation"
 msgstr "é??å§? bisect æ??ä½?"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:455
+msgid "_Reset"
+msgstr "é??ç½®(_R)"
+
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:457
@@ -6289,20 +6075,20 @@ msgstr "N/A"
 msgid "stopped:"
 msgstr "å·²å??æ­¢ï¼?"
 
-#: ../plugins/gtodo/callback.c:17
+#: ../plugins/gtodo/callback.c:20
 msgid "You need to select a to-do item before you can remove it"
 msgstr "ä½ é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
 
-#: ../plugins/gtodo/callback.c:20
+#: ../plugins/gtodo/callback.c:23
 msgid "Are you sure you want to remove the selected to-do item?"
 msgstr "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
 
-#: ../plugins/gtodo/callback.c:98
+#: ../plugins/gtodo/callback.c:103
 #, c-format
 msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
 
-#: ../plugins/gtodo/callback.c:99
+#: ../plugins/gtodo/callback.c:104
 #, c-format
 msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
@@ -6329,7 +6115,6 @@ msgid "Export current category only"
 msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
 
 #: ../plugins/gtodo/export.c:172
-#| msgid "<b>HTML export options:</b>"
 msgid "HTML export options:"
 msgstr "HTML �����"
 
@@ -6341,28 +6126,23 @@ msgstr "����設 (CSS) 樣�表"
 msgid "Custom (CSS) style sheet"
 msgstr "�� (CSS) 樣�表"
 
-#: ../plugins/gtodo/interface.c:35
-#: ../src/anjuta-actions.h:38
-msgid "_View"
-msgstr "檢�(_V)"
-
-#: ../plugins/gtodo/interface.c:136
+#: ../plugins/gtodo/interface.c:119
 msgid "All"
 msgstr "��"
 
-#: ../plugins/gtodo/interface.c:161
+#: ../plugins/gtodo/interface.c:144
 msgid "_Export"
 msgstr "��(_E)"
 
-#: ../plugins/gtodo/interface.c:205
+#: ../plugins/gtodo/interface.c:188
 msgid "Priority"
 msgstr "å?ªå??ç­?ç´?"
 
-#: ../plugins/gtodo/interface.c:212
+#: ../plugins/gtodo/interface.c:195
 msgid "Due date"
 msgstr "å?°æ??æ?¥"
 
-#: ../plugins/gtodo/interface.c:226
+#: ../plugins/gtodo/interface.c:209
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -6503,82 +6283,78 @@ msgstr "å¾?辦äº?é ?管ç??å?¡"
 msgid "To-do List Preferences"
 msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
 
-#: ../plugins/gtodo/preferences.c:84
+#: ../plugins/gtodo/preferences.c:89
 msgid "Interface"
 msgstr "ä»?é?¢"
 
-#: ../plugins/gtodo/preferences.c:88
+#: ../plugins/gtodo/preferences.c:93
 msgid "Show due date column"
 msgstr "顯示å?°æ??æ?¥æ¬?ä½?"
 
-#: ../plugins/gtodo/preferences.c:96
+#: ../plugins/gtodo/preferences.c:101
 msgid "Show category column"
 msgstr "顯示å??é¡?æ¬?ä½?"
 
-#: ../plugins/gtodo/preferences.c:101
+#: ../plugins/gtodo/preferences.c:107
 msgid "Show priority column"
 msgstr "顯示å?ªå??é ?åº?æ¬?ä½?"
 
-#: ../plugins/gtodo/preferences.c:106
-msgid "Tooltips in list"
-msgstr "æ¸?å?®ä¸­ç??å·¥å?·æ??示"
-
+#: ../plugins/gtodo/preferences.c:115
 #: ../plugins/gtodo/preferences.c:117
-#: ../plugins/gtodo/preferences.c:119
 msgid "Show in main window"
 msgstr "顯示�主��中"
 
+#: ../plugins/gtodo/preferences.c:128
 #: ../plugins/gtodo/preferences.c:130
-#: ../plugins/gtodo/preferences.c:132
 msgid "Highlight"
 msgstr "�示"
 
 #. tb for highlighting due today
-#: ../plugins/gtodo/preferences.c:142
+#: ../plugins/gtodo/preferences.c:140
 msgid "Items that are due today"
 msgstr "å?¨ä»?æ?¥å?°æ??ç??é ?ç?®"
 
 #. tb for highlighting due
-#: ../plugins/gtodo/preferences.c:148
+#: ../plugins/gtodo/preferences.c:146
 msgid "Items that are past due"
 msgstr "é??å?»å?°æ??ç??é ?ç?®"
 
 #. tb for highlighting in x days
-#: ../plugins/gtodo/preferences.c:154
+#: ../plugins/gtodo/preferences.c:152
 #, c-format
 msgid "Items that are due in the next %i day"
 msgid_plural "Items that are due in the next %i days"
 msgstr[0] "é ?ç?®å?¨æ?ªä¾? %i 天å?§å?°æ??"
 
-#: ../plugins/gtodo/preferences.c:168
+#: ../plugins/gtodo/preferences.c:166
 msgid "Miscellaneous"
 msgstr "é??é ?"
 
-#: ../plugins/gtodo/preferences.c:171
+#: ../plugins/gtodo/preferences.c:169
 msgid "Auto-purge completed items"
 msgstr "è?ªå??æ¸?é?¤å·²å®?æ??ç??é ?ç?®"
 
 #. Translators: First part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:177
+#: ../plugins/gtodo/preferences.c:175
 msgid "Purge items after"
 msgstr "��"
 
 #. Translators: Second part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:182
+#: ../plugins/gtodo/preferences.c:180
 msgid "days."
 msgstr "天å??ç??é ?ç?®ã??"
 
+#: ../plugins/gtodo/preferences.c:193
 #: ../plugins/gtodo/preferences.c:195
-#: ../plugins/gtodo/preferences.c:197
 msgid "Auto-Purge"
 msgstr "è?ªå??æ¸?é?¤"
 
+#: ../plugins/gtodo/preferences.c:207
 #: ../plugins/gtodo/preferences.c:209
-#: ../plugins/gtodo/preferences.c:211
 msgid "Notification"
 msgstr "é??ç?¥"
 
-#: ../plugins/gtodo/preferences.c:218
+#: ../plugins/gtodo/preferences.c:216
 #, c-format
 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"
@@ -6600,7 +6376,7 @@ msgstr "æ²?æ??æ?¥æ??"
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 #, fuzzy
 msgid "Diagonal"
-msgstr "è¨?è??"
+msgstr "���"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
@@ -6619,53 +6395,37 @@ 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:11
-msgid "Number of first characters to show:"
-msgstr "è¦?顯示ç??第ä¸?å­?符æ?¸ï¼?"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
-msgid "Number of last characters to show:"
-msgstr "è¦?顯示ç??æ??å¾?å­?符æ?¸ï¼?"
-
 #. text style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Strike-Out"
 msgstr "���"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
-msgid "Truncate long messages"
-msgstr "æ?ªç?­é??é?·ç??è¨?æ?¯"
-
 #. text style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 #, fuzzy
 msgid "Underline-Plain"
-msgstr "ç´?æ??å­?"
+msgstr "ç´?æ??å­? (ASCII)"
 
 #. text style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 #, fuzzy
 msgid "Underline-Squiggle"
-msgstr "����"
+msgstr "使���"
 
 #. text style in editor, TT is for typewriter text
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:23
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
 #, fuzzy
 msgid "Underline-TT"
-msgstr "����"
+msgstr "使���"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Warning message indicator style:"
 msgstr "è­¦å??è¨?æ?¯æ??示å?¨æ¨£å¼?ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
 msgid "Warnings:"
 msgstr "è­¦å??ï¼?"
 
@@ -6673,78 +6433,78 @@ msgstr "è­¦å??ï¼?"
 msgid "Close all message tabs"
 msgstr "é??é??æ??æ??è¨?æ?¯å??é ?"
 
-#: ../plugins/message-view/message-view.c:498
+#: ../plugins/message-view/message-view.c:497
 msgid "Icon"
 msgstr "å??示"
 
-#: ../plugins/message-view/message-view.c:512
-#: ../plugins/message-view/plugin.c:455
-#: ../plugins/message-view/plugin.c:468
-#: ../plugins/message-view/plugin.c:588
-#: ../plugins/message-view/plugin.c:600
+#: ../plugins/message-view/message-view.c:511
+#: ../plugins/message-view/plugin.c:383
+#: ../plugins/message-view/plugin.c:396
+#: ../plugins/message-view/plugin.c:515
+#: ../plugins/message-view/plugin.c:526
 msgid "Messages"
 msgstr "��"
 
-#: ../plugins/message-view/message-view.c:857
+#: ../plugins/message-view/message-view.c:856
 #, c-format
 msgid "Error writing %s"
 msgstr "寫å?¥è³?æ??å?° %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/message-view/plugin.c:78
+#: ../plugins/message-view/plugin.c:79
 msgid "_Copy Message"
 msgstr "�製��(_C)"
 
-#: ../plugins/message-view/plugin.c:79
+#: ../plugins/message-view/plugin.c:80
 msgid "Copy message"
 msgstr "�製��"
 
-#: ../plugins/message-view/plugin.c:82
+#: ../plugins/message-view/plugin.c:83
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯(_N)"
 
-#: ../plugins/message-view/plugin.c:83
+#: ../plugins/message-view/plugin.c:84
 msgid "Next message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:86
+#: ../plugins/message-view/plugin.c:87
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯(_P)"
 
-#: ../plugins/message-view/plugin.c:87
+#: ../plugins/message-view/plugin.c:88
 msgid "Previous message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:90
+#: ../plugins/message-view/plugin.c:91
 msgid "_Save Message"
 msgstr "����(_S)"
 
-#: ../plugins/message-view/plugin.c:91
+#: ../plugins/message-view/plugin.c:92
 msgid "Save message"
 msgstr "����"
 
-#: ../plugins/message-view/plugin.c:228
+#: ../plugins/message-view/plugin.c:169
 msgid "Next/Previous Message"
 msgstr "ä¸?ä¸?å??/ä¸?ä¸?å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:341
+#: ../plugins/message-view/plugin.c:269
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
 msgstr[0] "%d å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:350
+#: ../plugins/message-view/plugin.c:278
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
 msgstr[0] "%d å??è³?è¨?"
 
-#: ../plugins/message-view/plugin.c:359
+#: ../plugins/message-view/plugin.c:287
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
 msgstr[0] "%d å??è­¦å??"
 
-#: ../plugins/message-view/plugin.c:368
+#: ../plugins/message-view/plugin.c:296
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
@@ -6818,7 +6578,7 @@ msgstr "修�層��"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:53
-#: ../plugins/tools/plugin.c:130
+#: ../plugins/tools/plugin.c:131
 msgid "_Tools"
 msgstr "工�(_T)"
 
@@ -6851,6 +6611,10 @@ msgstr "æ??ä¸?å??å??ç?ºã??%sã??ç??æª?æ¡?ç?¡æ³?寫å?¥ï¼?%sã??è«?檢æ?¥ä½ æ?¯å?¦
 msgid "Please select a project backend to open %s."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? %s ç??å°?æ¡?å¾?端ç¨?å¼?ã??"
 
+#: ../plugins/project-import/plugin.c:205
+msgid "Open With"
+msgstr "以此é??å??"
+
 #: ../plugins/project-import/plugin.c:220
 #, c-format
 msgid "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."
@@ -6912,132 +6676,121 @@ msgstr "����"
 msgid "Import"
 msgstr "��"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:1
+#: ../plugins/project-manager/pm_dialogs.ui.h:1
+#| msgid "Add _module"
+msgid "Add Module"
+msgstr "��模�"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:2
+#| msgid "Add _Package"
+msgid "Add Package"
+msgstr "���件"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:3
 msgid "Add Source"
 msgstr "����"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:2
+#: ../plugins/project-manager/pm_dialogs.ui.h:4
+#| msgid "Module"
+msgid "Modules:"
+msgstr "模��"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:5
+#| msgid "Import options"
+msgid "More options:"
+msgstr "�����"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:6
 msgid "New Group"
 msgstr "��羣�"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:3
+#: ../plugins/project-manager/pm_dialogs.ui.h:7
 msgid "New Target"
 msgstr "����"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:4
+#: ../plugins/project-manager/pm_dialogs.ui.h:8
+#| msgid "Packages"
+msgid "Package list:"
+msgstr "�件���"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:9
+#| msgid "Select the _target for the new source files:"
+msgid "Select the _target for the module:"
+msgstr "é?¸æ??模çµ?ç??ç?®æ¨?(_T):"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:10
 msgid "Select the _target for the new source files:"
 msgstr "é?¸æ??æ?°ä¾?æº?æª?æ¡?ç??ç?®æ¨?(_T):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:5
+#: ../plugins/project-manager/pm_dialogs.ui.h:11
 msgid "Source files:"
 msgstr "�����"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:6
+#: ../plugins/project-manager/pm_dialogs.ui.h:12
 msgid "Specify _where to create the group:"
 msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç¾£çµ?(_W):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:7
+#: ../plugins/project-manager/pm_dialogs.ui.h:13
 msgid "Specify _where to create the target:"
 msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç?®æ¨?(_W):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:8
+#: ../plugins/project-manager/pm_dialogs.ui.h:14
 msgid "Target _name:"
 msgstr "ç?®æ¨?å??稱(_N):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:9
+#: ../plugins/project-manager/pm_dialogs.ui.h:15
 msgid "Target _type:"
 msgstr "ç?®æ¨?é¡?å??(_T):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:10
+#: ../plugins/project-manager/pm_dialogs.ui.h:16
 msgid "TargetTypes"
 msgstr "ç?®æ¨?é¡?å??"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:11
+#: ../plugins/project-manager/pm_dialogs.ui.h:17
+#| msgid "Add _Package"
+msgid "_Add package&#x2026;"
+msgstr "���件(_A)&#x2026;"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:18
 msgid "_Group name:"
 msgstr "ç¾£çµ?å??稱(_G):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to addâ?¦"
-msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)â?¦"
+#: ../plugins/project-manager/pm_dialogs.ui.h:19
+#| msgid "Module name:"
+msgid "_Module name:"
+msgstr "模çµ?å??稱(_M):"
 
-#: ../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-manager/pm_dialogs.ui.h:20
+#| msgid "Select file to add:"
+msgid "_Select file to add&#x2026;"
+msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)&#x2026;"
+
+#: ../plugins/project-manager/project-model.c:233
+#: ../plugins/project-manager/plugin.c:1389
+#: ../plugins/project-manager/plugin.c:1507
+#: ../plugins/project-manager/plugin.c:1684
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "å°?æ¡?"
 
-#: ../plugins/project-manager/gbf-project-model.c:232
+#: ../plugins/project-manager/project-model.c:234
 msgid "GbfProject Object"
 msgstr "GbfProject �件"
 
-#: ../plugins/project-manager/gbf-project-model.c:677
+#: ../plugins/project-manager/project-model.c:763
 msgid "No project loaded"
 msgstr "������"
 
-#: ../plugins/project-manager/gbf-project-util.c:229
-#: ../plugins/project-manager/gbf-project-util.c:236
-msgid "Cannot add group"
-msgstr "����羣�"
-
-#: ../plugins/project-manager/gbf-project-util.c:237
-msgid "No parent group selected"
-msgstr "æ²?æ??é?¸æ??ä¸?層羣çµ?"
-
-#: ../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:415
-msgid "No group selected"
-msgstr "æ²?æ??é?¸å??ç¾£çµ?"
-
-#: ../plugins/project-manager/gbf-project-util.c:510
-msgid "Select sourcesâ?¦"
-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:752
-msgid "No target has been selected"
-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:451
-msgid "Target properties"
-msgstr "��屬�"
-
-#: ../plugins/project-manager/plugin.c:460
-msgid "No properties available for this target"
-msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦æ­¤ç?®æ¨?"
-
-#: ../plugins/project-manager/plugin.c:492
-#: ../plugins/project-manager/plugin.c:907
-msgid "Project properties"
-msgstr "��屬�"
-
-#: ../plugins/project-manager/plugin.c:511
+#: ../plugins/project-manager/plugin.c:385
 msgid "Refreshing symbol treeâ?¦"
 msgstr "æ­£å?¨é??æ?°æ?´ç??符è??樹â?¦"
 
-#: ../plugins/project-manager/plugin.c:518
+#: ../plugins/project-manager/plugin.c:392
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "é??æ?°æ?´ç??å°?æ¡?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:696
+#: ../plugins/project-manager/plugin.c:646
 msgid ""
 "Are you sure you want to remove the following group from the project?\n"
 "\n"
@@ -7045,7 +6798,7 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç¾£çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:699
+#: ../plugins/project-manager/plugin.c:649
 msgid ""
 "Are you sure you want to remove the following target from the project?\n"
 "\n"
@@ -7053,7 +6806,7 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:702
+#: ../plugins/project-manager/plugin.c:652
 msgid ""
 "Are you sure you want to remove the following source file from the project?\n"
 "\n"
@@ -7061,7 +6814,29 @@ msgstr ""
 "æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?碼æª?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:705
+#: ../plugins/project-manager/plugin.c:655
+#| msgid ""
+#| "Are you sure you want to remove the following target from the project?\n"
+#| "\n"
+msgid ""
+"Are you sure you want to remove the following package from the project?\n"
+"\n"
+msgstr ""
+"ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??å¥?件å¾?å°?æ¡?中移é?¤ï¼?\n"
+"\n"
+
+#: ../plugins/project-manager/plugin.c:658
+#| msgid ""
+#| "Are you sure you want to remove the following group from the project?\n"
+#| "\n"
+msgid ""
+"Are you sure you want to remove the following module from the project?\n"
+"\n"
+msgstr ""
+"ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??模çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
+"\n"
+
+#: ../plugins/project-manager/plugin.c:661
 msgid ""
 "Are you sure you want to remove the following elements from the project?\n"
 "\n"
@@ -7069,39 +6844,61 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??ç´ å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:722
+#: ../plugins/project-manager/plugin.c:678
 #, c-format
 msgid "Group: %s\n"
 msgstr "羣��%s\n"
 
-#: ../plugins/project-manager/plugin.c:725
+#: ../plugins/project-manager/plugin.c:681
 #, c-format
 msgid "Target: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:728
+#: ../plugins/project-manager/plugin.c:684
 #, c-format
 msgid "Source: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:731
+#: ../plugins/project-manager/plugin.c:687
 #, c-format
 msgid "Shortcut: %s\n"
 msgstr "æ?·å¾?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:743
+#: ../plugins/project-manager/plugin.c:690
+#, c-format
+#| msgid "Source: %s\n"
+msgid "Module: %s\n"
+msgstr "模��%s\n"
+
+#: ../plugins/project-manager/plugin.c:693
+#, c-format
+#| msgid "Packages"
+msgid "Package: %s\n"
+msgstr "�件�%s\n"
+
+#: ../plugins/project-manager/plugin.c:705
+#| msgid "The group will not be deleted from the file system."
+msgid "The group will be deleted from the file system."
+msgstr "é??å??ç¾£çµ?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:707
 msgid "The group will not be deleted from the file system."
 msgstr "é??å??ç¾£çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:745
+#: ../plugins/project-manager/plugin.c:709
+#| msgid "The source file will not be deleted from the file system."
+msgid "The source file will be deleted from the file system."
+msgstr "該ä¾?æº?æª?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:711
 msgid "The source file will not be deleted from the file system."
 msgstr "該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:750
+#: ../plugins/project-manager/plugin.c:716
 msgid "Confirm remove"
 msgstr "確�移�"
 
-#: ../plugins/project-manager/plugin.c:795
+#: ../plugins/project-manager/plugin.c:762
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -7110,127 +6907,245 @@ msgstr ""
 "移é?¤â??%sâ??失æ??ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:865
+#: ../plugins/project-manager/plugin.c:828
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "å??å?? %s ç?? URI è³?è¨?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:903
+#: ../plugins/project-manager/plugin.c:866
 msgid "_Project"
 msgstr "å°?æ¡?(_P)"
 
-#: ../plugins/project-manager/plugin.c:907
-#: ../plugins/project-manager/plugin.c:941
-msgid "_Properties"
-msgstr "屬�(_P)"
-
-#: ../plugins/project-manager/plugin.c:912
-msgid "_Refresh"
-msgstr "é??æ?°æ?´ç??(_R)"
-
-#: ../plugins/project-manager/plugin.c:912
-msgid "Refresh project manager tree"
-msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
-
-#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:870
 msgid "Add _Groupâ?¦"
 msgstr "��羣�(_G)�"
 
-#: ../plugins/project-manager/plugin.c:917
-#: ../plugins/project-manager/plugin.c:951
+#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:914
 msgid "Add a group to project"
 msgstr "��羣����"
 
-#: ../plugins/project-manager/plugin.c:922
+#: ../plugins/project-manager/plugin.c:875
 msgid "Add _Targetâ?¦"
 msgstr "����(_T)�"
 
-#: ../plugins/project-manager/plugin.c:922
-#: ../plugins/project-manager/plugin.c:956
+#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:919
 msgid "Add a target to project"
 msgstr "�������"
 
-#: ../plugins/project-manager/plugin.c:927
+#: ../plugins/project-manager/plugin.c:880
 msgid "Add _Source Fileâ?¦"
 msgstr "������(_S)�"
 
-#: ../plugins/project-manager/plugin.c:927
-#: ../plugins/project-manager/plugin.c:946
-#: ../plugins/project-manager/plugin.c:961
+#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:924
+#: ../plugins/project-manager/plugin.c:939
 msgid "Add a source file to project"
 msgstr "å? å?¥å??å§?æª?è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:932
+#: ../plugins/project-manager/plugin.c:885
+#| msgid "Add _module"
+msgid "Add _Moduleâ?¦"
+msgstr "��模�(_M)�"
+
+#: ../plugins/project-manager/plugin.c:885
+#| msgid "Add a source file to project"
+msgid "Add a module to a target"
+msgstr "�模������"
+
+#: ../plugins/project-manager/plugin.c:890
+#| msgid "Add _Package"
+msgid "Add _Packageâ?¦"
+msgstr "���件(_P)�"
+
+#: ../plugins/project-manager/plugin.c:890
+#: ../plugins/project-manager/plugin.c:934
+#| msgid "Add a target to project"
+msgid "Add a package to project"
+msgstr "��件�����"
+
+#: ../plugins/project-manager/plugin.c:895
+#: ../plugins/project-manager/plugin.c:944
+msgid "_Properties"
+msgstr "屬�(_P)"
+
+#: ../plugins/project-manager/plugin.c:895
+#: ../plugins/project-manager/dialogs.c:666
+msgid "Project properties"
+msgstr "��屬�"
+
+#: ../plugins/project-manager/plugin.c:900
+msgid "_Refresh"
+msgstr "é??æ?°æ?´ç??(_R)"
+
+#: ../plugins/project-manager/plugin.c:900
+msgid "Refresh project manager tree"
+msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
+
+#: ../plugins/project-manager/plugin.c:905
 msgid "Close Pro_ject"
-msgstr "é??é??å°?æ¡? (_J)"
+msgstr "é??é??å°?æ¡?(_J)"
 
-#: ../plugins/project-manager/plugin.c:932
+#: ../plugins/project-manager/plugin.c:905
 msgid "Close project"
 msgstr "é??é??å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:941
-msgid "Properties of group/target/source"
-msgstr "ç¾£çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
-
-#: ../plugins/project-manager/plugin.c:946
-msgid "_Add to Project"
-msgstr "�����(_A)"
-
-#: ../plugins/project-manager/plugin.c:951
+#: ../plugins/project-manager/plugin.c:914
 msgid "Add _Group"
 msgstr "��羣�(_G)"
 
-#: ../plugins/project-manager/plugin.c:956
+#: ../plugins/project-manager/plugin.c:919
 msgid "Add _Target"
 msgstr "����(_T)"
 
-#: ../plugins/project-manager/plugin.c:961
+#: ../plugins/project-manager/plugin.c:924
 msgid "Add _Source File"
 msgstr "å? å?¥å??å§?æª?(_S)"
 
-#: ../plugins/project-manager/plugin.c:966
+#: ../plugins/project-manager/plugin.c:929
+#| msgid "Add _module"
+msgid "Add _Module"
+msgstr "��模�(_M)"
+
+#: ../plugins/project-manager/plugin.c:929
+#| msgid "Add a group to project"
+msgid "Add a module to target"
+msgstr "�模������"
+
+#: ../plugins/project-manager/plugin.c:934
+msgid "Add _Package"
+msgstr "���件(_P)"
+
+#: ../plugins/project-manager/plugin.c:939
+msgid "_Add to Project"
+msgstr "�����(_A)"
+
+#: ../plugins/project-manager/plugin.c:944
+msgid "Properties of group/target/source"
+msgstr "ç¾£çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
+
+#: ../plugins/project-manager/plugin.c:949
 msgid "Re_move"
 msgstr "移�(_M)"
 
-#: ../plugins/project-manager/plugin.c:966
+#: ../plugins/project-manager/plugin.c:949
 msgid "Remove from project"
 msgstr "���中移�"
 
-#: ../plugins/project-manager/plugin.c:1387
+#: ../plugins/project-manager/plugin.c:1343
 #, c-format
-msgid "Loading project: %s"
-msgstr "正������%s"
+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:1395
-msgid "Created project viewâ?¦"
-msgstr "已建���檢��"
+#: ../plugins/project-manager/plugin.c:1384
+#| msgid "Created project viewâ?¦"
+msgid "Update project viewâ?¦"
+msgstr "����檢��"
 
-#: ../plugins/project-manager/plugin.c:1408
+#: ../plugins/project-manager/plugin.c:1425
 #, 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"
+msgid "Loading project: %s"
+msgstr "正������%s"
 
-#: ../plugins/project-manager/plugin.c:1601
+#: ../plugins/project-manager/plugin.c:1595
 #, c-format
 msgid "Error closing project: %s"
 msgstr "é??é??å°?æ¡?æ??é?¯èª¤ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1668
+#: ../plugins/project-manager/plugin.c:1663
 msgid "Project manager actions"
 msgstr "å°?æ¡?管ç??å?¡å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:1676
+#: ../plugins/project-manager/plugin.c:1671
 msgid "Project manager popup actions"
 msgstr "å°?æ¡?管ç??å?¡å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:2471
+#: ../plugins/project-manager/plugin.c:2384
 msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??å°?æ¡?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2474
+#: ../plugins/project-manager/plugin.c:2387
 msgid "Project Loaded"
 msgstr "��已��"
 
+#. if (gtk_tree_model_get_iter_first(model, &iter))
+#. {
+#. gtk_tree_model_get(model, &iter, COLUMN_URI, &file, -1);
+#. uri = g_strdup(file);
+#. }
+#. else
+#. uri = g_strdup("");
+#: ../plugins/project-manager/dialogs.c:316
+msgid "Select sourcesâ?¦"
+msgstr "é?¸æ??ä¾?æº?â?¦"
+
+#: ../plugins/project-manager/dialogs.c:521
+#| msgid "Class Name:"
+msgid "Full Name:"
+msgstr "å?¨å??ï¼?"
+
+#: ../plugins/project-manager/dialogs.c:669
+msgid "Group properties"
+msgstr "羣�屬�"
+
+#: ../plugins/project-manager/dialogs.c:672
+msgid "Target properties"
+msgstr "��屬�"
+
+#: ../plugins/project-manager/dialogs.c:675
+#| msgid "Group properties"
+msgid "Source properties"
+msgstr "ä¾?æº?ç??屬æ?§"
+
+#: ../plugins/project-manager/dialogs.c:776
+#: ../plugins/project-manager/dialogs.c:787
+msgid "Cannot add group"
+msgstr "����羣�"
+
+#: ../plugins/project-manager/dialogs.c:788
+msgid "No parent group selected"
+msgstr "æ²?æ??é?¸æ??ä¸?層羣çµ?"
+
+#: ../plugins/project-manager/dialogs.c:998
+#: ../plugins/project-manager/dialogs.c:1008
+msgid "Cannot add source files"
+msgstr "������碼��"
+
+#: ../plugins/project-manager/dialogs.c:1009
+msgid "The selected node cannot contains source files."
+msgstr "é?¸å??ç??ç¯?é»?ä¸?è?½å??å?«ä¾?æº?æª?ã??"
+
+#: ../plugins/project-manager/dialogs.c:1191
+#: ../plugins/project-manager/dialogs.c:1202
+msgid "Cannot add target"
+msgstr "������"
+
+#: ../plugins/project-manager/dialogs.c:1203
+msgid "No group selected"
+msgstr "æ²?æ??é?¸å??ç¾£çµ?"
+
+#: ../plugins/project-manager/dialogs.c:1354
+#: ../plugins/project-manager/dialogs.c:1365
+#| msgid "Cannot add source files"
+msgid "Cannot add modules"
+msgstr "����模�"
+
+#: ../plugins/project-manager/dialogs.c:1366
+msgid "No target has been selected"
+msgstr "å°?æ?ªé?¸æ??ç?®æ¨?"
+
+#. Missing module name
+#: ../plugins/project-manager/dialogs.c:1569
+#| msgid "Missing tool name"
+msgid "Missing module name"
+msgstr "缺å°?模çµ?å??稱"
+
+#: ../plugins/project-manager/dialogs.c:1631
+#| msgid "Cannot add target"
+msgid "Cannot add packages"
+msgstr "�����件"
+
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
 msgid "Details"
 msgstr "詳細è³?æ??"
@@ -7250,9 +7165,6 @@ msgid "Message"
 msgstr "��"
 
 #: ../plugins/project-wizard/druid.c:233
-#| msgid ""
-#| "<b>Confirm the following information:</b>\n"
-#| "\n"
 msgid "Confirm the following information:"
 msgstr "確�以����"
 
@@ -7278,14 +7190,12 @@ msgstr ""
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?輸å?¥å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:642
-#, c-format
-msgid "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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?æ??åº?ç·?é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?ã??æ¸?è??å??é»?ã??è«?修正å®?ã??"
+msgid "Field \"%s\" must contains only letters, digits or the following characters \"#$:%+, = ^_`~\". In addition you cannot have a leading dash. Please fix it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?æ??ä¸?å??å­?符 \"#$:%+, = ^_`~\"ã??æ­¤å¤?ä½ ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:647
-#, 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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?æ??ç?®é??å??é??å­?符é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?ã??ç?®é??å??é??å­?符ã??æ¸?è??å??é»?ã??è«?修正å®?ã??"
+msgid "Field \"%s\" must contains only letters, digits, the following characters \"#$:%+, = ^_`~\" or directory separators. In addition you cannot have a leading dash. Please fix it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?ã??ä¸?å??å­?符 \"#$:%+, = ^_`~\" æ??ç?®é??å??é??符ã??æ­¤å¤?ä½ ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:652
 #, c-format
@@ -7310,7 +7220,7 @@ msgstr "ç?¡æ??ç??é ?ç?®"
 msgid "Dubious entry"
 msgstr "ä¸?確å®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:884
+#: ../plugins/project-wizard/druid.c:881
 #, c-format
 msgid ""
 "\n"
@@ -7319,7 +7229,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:895
+#: ../plugins/project-wizard/druid.c:892
 #, c-format
 msgid ""
 "\n"
@@ -7328,23 +7238,23 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?件ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:904
+#: ../plugins/project-wizard/druid.c:901
 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:912
+#: ../plugins/project-wizard/druid.c:909
 msgid "Install missing packages"
 msgstr "å®?è£?缺å°?ç??å¥?件"
 
-#: ../plugins/project-wizard/druid.c:920
+#: ../plugins/project-wizard/druid.c:917
 msgid "The missing programs are usually part of some distrubution packages and can 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:928
+#: ../plugins/project-wizard/druid.c:925
 msgid "Missing components"
 msgstr "é?ºå¤±å??件"
 
-#: ../plugins/project-wizard/druid.c:1060
+#: ../plugins/project-wizard/druid.c:1057
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?建ç«?å°?æ¡?å?©ç??使ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7386,7 +7296,6 @@ msgstr "正����%s"
 
 #: ../plugins/project-wizard/plugin.c:50
 #, c-format
-#| msgid "Unable to find any project template in %s"
 msgid "Unable to extract project template %s: %s"
 msgstr "ç?¡æ³?解é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 
@@ -7394,36 +7303,36 @@ msgstr "ç?¡æ³?解é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 msgid "New Project Assistant"
 msgstr "æ?°å°?æ¡?å?©ç??"
 
-#: ../plugins/project-wizard/property.c:343
-#: ../plugins/project-wizard/property.c:454
+#: ../plugins/project-wizard/property.c:338
+#: ../plugins/project-wizard/property.c:449
 msgid "No"
 msgstr "å?¦"
 
-#: ../plugins/project-wizard/property.c:354
+#: ../plugins/project-wizard/property.c:349
 msgid "Select directory"
 msgstr "é?¸æ??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:362
+#: ../plugins/project-wizard/property.c:357
 msgid "Select file"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:412
+#: ../plugins/project-wizard/property.c:407
 #: ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é?¸æ??å??ç??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:437
-#: ../plugins/project-wizard/property.c:527
+#: ../plugins/project-wizard/property.c:432
+#: ../plugins/project-wizard/property.c:522
 #: ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é?¸æ??å??示"
 
-#: ../plugins/project-wizard/property.c:497
+#: ../plugins/project-wizard/property.c:492
 msgid "Choose directory"
 msgstr "é?¸å??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:501
+#: ../plugins/project-wizard/property.c:496
 msgid "Choose file"
 msgstr "é?¸å??æª?æ¡?"
 
@@ -7516,7 +7425,7 @@ msgstr "����"
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:8
 #: ../plugins/project-wizard/templates/library.wiz.in.h:8
 msgid "Berkeley Software Distribution License (BSD)"
-msgstr "æ??å??è??è»?件æ?£ä½?許å?¯è­? ï¼?BSDï¼?"
+msgstr "æ??å??è??è»?件æ?£å¸?許å?¯è­? ï¼?BSDï¼?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:9
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:9
@@ -7721,7 +7630,6 @@ msgstr "����"
 #: ../plugins/project-wizard/templates/python.wiz.in.h:24
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/library.wiz.in.h:26
-#| msgid "Require Package:"
 msgid "Required Packages:"
 msgstr "é??è¦?ç??å¥?件ï¼?"
 
@@ -8044,12 +7952,10 @@ msgid "Generic python (automake)"
 msgstr "�� python (automake)"
 
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:19
-#| msgid "Generic java (automake)"
 msgid "PyGTK (automake)"
 msgstr "PyGTK (automake)"
 
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:20
-#| msgid "Project name"
 msgid "PyGTK project using automake"
 msgstr "PyGTK å°?æ¡?ï¼?使ç?¨ automake å°?æ¡?管ç??"
 
@@ -8182,7 +8088,7 @@ msgid "Working Directory:"
 msgstr "å·¥ä½?ç?®é??ï¼?"
 
 #. Only local directory are supported
-#: ../plugins/run-program/execute.c:107
+#: ../plugins/run-program/execute.c:108
 #, c-format
 msgid "Program directory '%s' is not local"
 msgstr "ç¨?å¼?ç?®é??ã??%sã??ä¸?å?¨æ?¬å?°ç«¯"
@@ -8239,154 +8145,142 @@ msgstr "設å®?ç?®å??ç??ç¨?å¼?ã??å¼?æ?¸ç­?ç­?ã??"
 msgid "Run operations"
 msgstr "å?·è¡?æ??ä½?"
 
+#: ../plugins/run-program/org.gnome.anjuta.run.gschema.xml.in.h:1
+msgid "Command used for starting a terminal"
+msgstr "ç?¨ä¾?å??å??çµ?端æ©?ç??æ??令"
+
 #: ../plugins/search/anjuta-search.ui.h:1
 msgid "Actions"
 msgstr "å??ä½?"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-#: ../plugins/search/search-replace.c:92
+#: ../plugins/search/search-replace.c:91
 msgid "Backward"
 msgstr "å??å¾?"
 
 #: ../plugins/search/anjuta-search.ui.h:3
-msgid "Basic Search & Replace"
-msgstr "å?ºæ?¬æ??å°?å??å??代"
-
-#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "é?¸æ??ç?®é??ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:5
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Files:"
 msgstr "é?¸æ??æª?æ¡?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:6
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Expand regex back references"
 msgstr "æ?´å??æ­£è¦?表示å¼?å??å??å??ç?§"
 
-#: ../plugins/search/anjuta-search.ui.h:7
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "File Filter"
 msgstr "æª?æ¡?é??濾æ¢?件"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:7
 msgid "Find & Replace"
 msgstr "æ??å°?å??å??代"
 
-#: ../plugins/search/anjuta-search.ui.h:9
-#: ../plugins/search/search-replace.c:91
+#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/search-replace.c:90
 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:10
-#: ../plugins/search/search-replace.c:90
+#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/search-replace.c:89
 msgid "Full Buffer"
 msgstr "ç·©è¡?å??å?¨é?¨"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:10
 msgid "Greedy matching"
 msgstr "Greedy matching"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Ignore Binary Files"
 msgstr "忽ç?¥äº?å??æª?æ¡?"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Directories:"
 msgstr "忽ç?¥ç?®é??ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Files:"
 msgstr "忽����"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Hidden Directories"
 msgstr "忽ç?¥é?±è??ç??ç?®é??"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Files"
 msgstr "忽ç?¥é?±è??ç??æª?æ¡?"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Match at start of word"
 msgstr "æ¯?å°?å­?ç??é??é ­"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match complete lines"
-msgstr "����"
+msgstr "æ¯?å°?æ?´å??"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete words"
 msgstr "æ¯?å°?æ?´å??å­?"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Maximum Actions"
 msgstr "æ??大å??ä½?æ?¸"
 
-#: ../plugins/search/anjuta-search.ui.h:22
-msgid "Modify"
-msgstr "修�"
-
-#: ../plugins/search/anjuta-search.ui.h:23
-msgid "New Name:"
-msgstr "æ?°å??稱ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "No Limit"
 msgstr "ä¸?é??å?¶"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "Parameters"
 msgstr "å??æ?¸"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "Regular expression"
 msgstr "正�表示�"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:25
 msgid "Replace With:"
 msgstr "å??代ç?ºï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Search Action:"
 msgstr "æ??å°?å??ä½?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Search Direction:"
 msgstr "æ??å°?æ?¹å??ï¼?"
 
 #. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.ui.h:33
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Expression"
 msgstr "æ??å°?è©?å?¥"
 
 #. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:32
 msgid "Search Expression:"
 msgstr "æ??å°?è©?å?¥ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search In:"
 msgstr "æ??å°?æ?¼ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:34
 msgid "Search Recursively"
 msgstr "é??è¿´æ??å°?"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Target"
 msgstr "æ??å°?ç?®æ¨?"
 
 #. User can select variables that contain lists of files, so this is a combined noun
-#: ../plugins/search/anjuta-search.ui.h:40
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search variable"
 msgstr "æ??å°?è®?æ?¸"
 
-#: ../plugins/search/anjuta-search.ui.h:41
-msgid "Setting"
-msgstr "設��"
-
 #: ../plugins/search/plugin.c:68
 msgid "_Findâ?¦"
 msgstr "å°?æ?¾(_F)â?¦"
@@ -8397,7 +8291,7 @@ msgstr "å?¨ç·¨è¼¯å?¨æ??å°?å­?串æ??æ­£è¦?表示å¼?"
 
 #: ../plugins/search/plugin.c:71
 msgid "Find _Next"
-msgstr "æ??å°?ä¸?ä¸?å?? (_N)"
+msgstr "æ??å°?ä¸?ä¸?å??(_N)"
 
 #: ../plugins/search/plugin.c:72
 #: ../plugins/search/plugin.c:76
@@ -8433,107 +8327,103 @@ msgstr "å?¨å¤?å??æª?æ¡?æ??ç?®é??å?§æ??å°?æ??å®?å?¥å­?"
 msgid "Searchingâ?¦"
 msgstr "æ??å°?中â?¦"
 
-#: ../plugins/search/search_preferences.c:44
-msgid "Basic Search"
-msgstr "å?ºæ?¬æ??å°?"
-
-#: ../plugins/search/search-replace.c:97
+#: ../plugins/search/search-replace.c:96
 msgid "Current Buffer"
 msgstr "ç?®å??ç??ç·©è¡?å??"
 
-#: ../plugins/search/search-replace.c:98
+#: ../plugins/search/search-replace.c:97
 msgid "Current Selection"
 msgstr "ç?®å??é?¸å??å??å??"
 
-#: ../plugins/search/search-replace.c:99
+#: ../plugins/search/search-replace.c:98
 msgid "Current Block"
 msgstr "ç?®å??æ??å?¨å??å¡?"
 
-#: ../plugins/search/search-replace.c:100
+#: ../plugins/search/search-replace.c:99
 msgid "Current Function"
 msgstr "ç?®å??æ??å?¨å?½æ?¸"
 
-#: ../plugins/search/search-replace.c:101
+#: ../plugins/search/search-replace.c:100
 msgid "All Open Buffers"
 msgstr "æ??æ??å·²é??å??ç??ç·©è¡?å??"
 
-#: ../plugins/search/search-replace.c:102
+#: ../plugins/search/search-replace.c:101
 msgid "All Project Files"
 msgstr "å°?æ¡?中ç??å?¨é?¨æª?æ¡?"
 
 #. {SR_VARIABLE, N_("Specify File List")},
-#: ../plugins/search/search-replace.c:104
+#: ../plugins/search/search-replace.c:103
 msgid "Specify File Patterns"
 msgstr "æ??å®?æª?æ¡?樣å¼?"
 
-#: ../plugins/search/search-replace.c:109
+#: ../plugins/search/search-replace.c:108
 msgid "Select next match"
 msgstr "é?¸æ??ä¸?ä¸?å??符å??ç??é ?ç?®"
 
-#: ../plugins/search/search-replace.c:110
+#: ../plugins/search/search-replace.c:109
 msgid "Bookmark all matched lines"
-msgstr "å°?æ??æ??符å??ç??è¡?å? ä¸?æ?¸ç±¤"
+msgstr "å°?æ??æ??符å??ç??å??å? ä¸?æ?¸ç±¤"
 
-#: ../plugins/search/search-replace.c:111
+#: ../plugins/search/search-replace.c:110
 msgid "Mark all matches"
 msgstr "æ¨?è¨?æ??æ??符å??ç??é ?ç?®"
 
-#: ../plugins/search/search-replace.c:112
+#: ../plugins/search/search-replace.c:111
 msgid "List matches in find pane"
 msgstr "å?¨å°?æ?¾çª?格中å??å?ºç¬¦å??é ?"
 
-#: ../plugins/search/search-replace.c:113
+#: ../plugins/search/search-replace.c:112
 msgid "Replace next match"
 msgstr "å??代ä¸?ä¸?å??符å??ç??é ?ç?®"
 
-#: ../plugins/search/search-replace.c:114
+#: ../plugins/search/search-replace.c:113
 msgid "Replace all matches"
 msgstr "å?¨é?¨å??代符å??ç??é ?ç?®"
 
 #. Avoid space in translated string
-#: ../plugins/search/search-replace.c:319
+#: ../plugins/search/search-replace.c:312
 msgid "Find:"
 msgstr "å°?æ?¾:"
 
-#: ../plugins/search/search-replace.c:501
+#: ../plugins/search/search-replace.c:494
 msgid "Replace"
 msgstr "å??代"
 
-#: ../plugins/search/search-replace.c:630
+#: ../plugins/search/search-replace.c:623
 msgid "Search complete"
 msgstr "æ??å°?å®?æ??"
 
-#: ../plugins/search/search-replace.c:1044
-#: ../plugins/search/search-replace.c:1731
+#: ../plugins/search/search-replace.c:1037
+#: ../plugins/search/search-replace.c:1714
 msgid "Replace All"
 msgstr "å?¨é?¨å??代"
 
-#: ../plugins/search/search-replace.c:1083
+#: ../plugins/search/search-replace.c:1076
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??å?¥å­?ã??æ?¯å?¦è¦?å¾?é ­é??å§?æ??å°?ï¼?"
 
-#: ../plugins/search/search-replace.c:1103
+#: ../plugins/search/search-replace.c:1096
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??é ?ç?®ã??"
 
-#: ../plugins/search/search-replace.c:1118
+#: ../plugins/search/search-replace.c:1111
 msgid "The maximum number of results has been reached."
 msgstr "å·²é??å?°çµ?æ??ç??æ??大æ?¸é??ã??"
 
-#: ../plugins/search/search-replace.c:1131
+#: ../plugins/search/search-replace.c:1124
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "å·²å??代 %d å??符å??é ?ã??"
 
-#: ../plugins/search/search-replace.c:1298
+#: ../plugins/search/search-replace.c:1289
 msgid "Unable to build user interface for Search and Replace"
 msgstr "ç?¡æ³?建ç«?æ??å°?è??å??代使ç?¨è??ä»?é?¢"
 
-#: ../plugins/snippets-manager/plugin.c:60
-#: ../plugins/snippets-manager/plugin.c:302
+#: ../plugins/snippets-manager/plugin.c:62
+#: ../plugins/snippets-manager/plugin.c:304
 #: ../plugins/snippets-manager/snippets-browser.c:208
 msgid "Snippets"
 msgstr "æ??å­?ç??段"
@@ -8542,11 +8432,11 @@ msgstr "æ??å­?ç??段"
 #. shortcut for the trigger-key based insertion of snippets. It's called like this
 #. because you type the trigger-key in the editor, followed by Trigger Insert and
 #. the snippet gets inserted.
-#: ../plugins/snippets-manager/plugin.c:71
+#: ../plugins/snippets-manager/plugin.c:73
 msgid "_Trigger insert"
 msgstr "觸ç?¼æ??å?¥(_T)"
 
-#: ../plugins/snippets-manager/plugin.c:73
+#: ../plugins/snippets-manager/plugin.c:75
 msgid "Insert a snippet using the trigger-key"
 msgstr "使ç?¨è§¸ç?¼é?µæ??å?¥æ??å­?ç??段"
 
@@ -8556,55 +8446,49 @@ msgstr "使ç?¨è§¸ç?¼é?µæ??å?¥æ??å­?ç??段"
 #. most relevant snippets are returned in a pop-up like the auto-complete one
 #. (they are showed by their names). After selecting one of them, the snippet gets
 #. inserted.
-#: ../plugins/snippets-manager/plugin.c:84
-#| msgid "Auto-complete"
+#: ../plugins/snippets-manager/plugin.c:86
 msgid "_Auto complete insert"
 msgstr "è?ªå??è£?é½?æ??å?¥(_A)"
 
-#: ../plugins/snippets-manager/plugin.c:86
-#| msgid "Add a space after function call autocompletion"
+#: ../plugins/snippets-manager/plugin.c:88
 msgid "Insert a snippet using auto-completion"
 msgstr "使ç?¨è?ªå??è£?é½?æ??å?¥æ??å­?ç??段"
 
-#: ../plugins/snippets-manager/plugin.c:91
+#: ../plugins/snippets-manager/plugin.c:93
 msgid "_Import snippets â?¦"
 msgstr "å?¯å?¥æ??å­?ç??段(_I)â?¦"
 
-#: ../plugins/snippets-manager/plugin.c:93
+#: ../plugins/snippets-manager/plugin.c:95
 msgid "Import snippets to the database"
 msgstr "å°?æ??å­?ç??段å?¯å?¥è³?æ??庫"
 
-#: ../plugins/snippets-manager/plugin.c:98
+#: ../plugins/snippets-manager/plugin.c:100
 msgid "_Export snippets â?¦"
 msgstr "å?¯å?ºæ??å­?ç??段(_E)â?¦"
 
-#: ../plugins/snippets-manager/plugin.c:100
+#: ../plugins/snippets-manager/plugin.c:102
 msgid "Export snippets from the database"
 msgstr "å¾?è³?æ??庫å?¯å?ºæ??å­?ç??段"
 
-#: ../plugins/snippets-manager/plugin.c:327
-#| msgid "Project manager actions"
+#: ../plugins/snippets-manager/plugin.c:329
 msgid "Snippets Manager actions"
 msgstr "æ??å­?管ç??å?¡å??ä½?"
 
-#: ../plugins/snippets-manager/plugin.c:767
-#| msgid "Command"
+#: ../plugins/snippets-manager/plugin.c:773
 msgid "Command?"
 msgstr "æ??令ï¼?"
 
-#: ../plugins/snippets-manager/plugin.c:783
-#| msgid "Variable list"
+#: ../plugins/snippets-manager/plugin.c:789
 msgid "Variable text"
 msgstr "è®?æ?¸æ??å­?"
 
-#: ../plugins/snippets-manager/plugin.c:801
+#: ../plugins/snippets-manager/plugin.c:807
 #: ../plugins/snippets-manager/snippets-editor.c:40
-#| msgid "Inspect/Evaluate"
 msgid "Instant value"
 msgstr "å?³æ??æ?¸å?¼"
 
-#: ../plugins/snippets-manager/plugin.c:929
-#: ../plugins/snippets-manager/plugin.c:966
+#: ../plugins/snippets-manager/plugin.c:936
+#: ../plugins/snippets-manager/plugin.c:973
 #: ../plugins/snippets-manager/snippets-provider.c:753
 #: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:2
 msgid "Code Snippets"
@@ -8615,24 +8499,20 @@ msgid "Trigger"
 msgstr "觸�"
 
 #: ../plugins/snippets-manager/snippets-browser.c:560
-#| msgid "Language Manager"
 msgid "Languages"
 msgstr "��"
 
 #. Insert the Add Snippet menu item
 #: ../plugins/snippets-manager/snippets-browser.c:808
-#| msgid "Add _Targetâ?¦"
 msgid "Add Snippet â?¦"
 msgstr "å? å?¥æ??å­?ç??段â?¦"
 
 #. Insert the Add Snippets Group menu item
 #: ../plugins/snippets-manager/snippets-browser.c:818
-#| msgid "Add _Groupâ?¦"
 msgid "Add Snippets Group â?¦"
 msgstr "å? å?¥æ??å­?ç??段羣çµ?â?¦"
 
 #: ../plugins/snippets-manager/snippets-editor.c:39
-#| msgid "Default"
 msgid "Default value"
 msgstr "�設�"
 
@@ -8645,8 +8525,6 @@ msgid "<b>Error:</b> The trigger key is already in use for one of the languages!
 msgstr "<b>é?¯èª¤ï¼?</b>é??å??觸ç?¼é?µå·²ç¶?ç?¨æ?¼å?¶ä¸­ä¸?種èª?è¨?ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.c:50
-#| msgid ""
-#| "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgid "<b>Error:</b> The trigger key can only contain alphanumeric characters and _ !"
 msgstr "<b>é?¯èª¤ï¼?</b>觸ç?¼é?µå?ªè?½å??å?«è?±æ??å­?æ¯?å?? _ï¼?"
 
@@ -8663,12 +8541,10 @@ msgid "<b>Warning:</b> You should choose a name for the snippet!"
 msgstr "<b>è­¦å??ï¼?</b>ä½ æ??該ç?ºæ??å­?ç??段é?¸æ??ä¸?å??å??稱ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:3
-#| msgid "_Add"
 msgid "Add"
 msgstr "å? å?¥"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:4
-#| msgid "Close All"
 msgid "Close"
 msgstr "é??é??"
 
@@ -8685,12 +8561,10 @@ msgid "Keywords:"
 msgstr "é??é?µå­?ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:8
-#| msgid "Changes:"
 msgid "Languages:"
 msgstr "���"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:9
-#| msgid "_Print Preview"
 msgid "Preview"
 msgstr "�覽"
 
@@ -8711,22 +8585,18 @@ msgstr ""
 "å??稱ç??ä½?ç?¨å®?å?¨æ?¯ç?¨ä¾?辦è­?è??å·²ã??"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:16
-#| msgid "Contents"
 msgid "Snippet Content"
 msgstr "æ??å­?ç??段å?§å®¹"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:17
-#| msgid "New Name:"
 msgid "Snippet Name:"
 msgstr "æ??å­?ç??段å??稱ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:18
-#| msgid "Properties"
 msgid "Snippet Properties"
 msgstr "æ??å­?ç??段屬æ?§"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:19
-#| msgid "Environment Variables:"
 msgid "Snippet Variables"
 msgstr "æ??å­?ç??段è®?æ?¸"
 
@@ -8747,12 +8617,10 @@ msgid "Trigger Key:"
 msgstr "觸���"
 
 #: ../plugins/snippets-manager/snippets-manager-preferences.ui.h:1
-#| msgid "Anjuta macros"
 msgid "Anjuta variables"
 msgstr "Anjuta è®?æ?¸"
 
 #: ../plugins/snippets-manager/snippets-import-export.c:145
-#| msgid "Import options"
 msgid "Import Snippets"
 msgstr "å?¯å?¥æ??å­?ç??段"
 
@@ -8760,7 +8628,7 @@ msgstr "å?¯å?¥æ??å­?ç??段"
 msgid "Export Snippets"
 msgstr "å?¯å?ºæ??å­?ç??段"
 
-#: ../plugins/sourceview/sourceview.c:478
+#: ../plugins/sourceview/sourceview.c:481
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8769,7 +8637,7 @@ msgstr ""
 "å?¨ç¡¬ç¢?å?§æª?æ¡?ã?? %sã?? ç??å?§å®¹æ¯?ç?®å??ç??ç·©è¡?å??å?§å®¹é??è¦?æ?°ã??\n"
 "æ?¯å?¦è¦?é??æ?°è¼?å?¥å®?ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:515
+#: ../plugins/sourceview/sourceview.c:518
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8779,18 +8647,18 @@ msgstr ""
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:552
+#: ../plugins/sourceview/sourceview.c:555
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "ç?¡æ³?é??å?? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview.c:606
+#: ../plugins/sourceview/sourceview.c:609
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æª?æ¡?ã??%sã??æ?¯å?¯è®?ç??ï¼?ä»?ç?¶è¦?編輯å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:665
+#: ../plugins/sourceview/sourceview.c:668
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "������ %s�%s"
@@ -8809,6 +8677,30 @@ msgstr "���� %d"
 msgid "Preparing pages for printing"
 msgstr "æ­£å?¨æº?å??é ?é?¢ä»¥æ??ä¾?æ??å?°"
 
+#: ../plugins/sourceview/sourceview-print.c:111
+msgid "Wrap lines"
+msgstr "æ??å??"
+
+#: ../plugins/sourceview/sourceview-print.c:113
+#| msgid "Show Line Numbers"
+msgid "Line numbers"
+msgstr "å??è??"
+
+#: ../plugins/sourceview/sourceview-print.c:115
+#| msgid "Head"
+msgid "Header"
+msgstr "��"
+
+#: ../plugins/sourceview/sourceview-print.c:117
+#| msgid "Filter"
+msgid "Footer"
+msgstr "é ?å°¾"
+
+#: ../plugins/sourceview/sourceview-print.c:119
+#| msgid "_Highlight Mode"
+msgid "Highlight source code"
+msgstr "æ¨?示å??å§?碼"
+
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:1
 msgid "Color scheme:"
 msgstr "é¡?è?²é??ç½®ï¼?"
@@ -8846,90 +8738,66 @@ msgid "Indentation and auto-format options"
 msgstr "縮æ??è??è?ªå??æ ¼å¼?é?¸é ?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
-msgid "Print line numbers"
-msgstr "æ??å?°è¡?è??"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
-msgid "Print options"
-msgstr "æ??å?°é?¸é ?"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
-msgid "Print page footer"
-msgstr "æ??å?°é ?å°¾"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
-msgid "Print page header"
-msgstr "æ??å?°é ?é¦?"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
-msgid "Printing"
-msgstr "æ­£å?¨æ??å?°"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Right margin position in characters"
 msgstr "å?³é??ç??ä½?ç½®(以å­?符è¨?)"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
 msgid "Show line numbers"
-msgstr "顯示è¡?è??"
+msgstr "顯示å??è??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
 msgid "Show marks"
 msgstr "顯示��"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
 msgid "Show right margin"
 msgstr "顯示å?³é??ç??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
 msgid "Tab size in spaces:"
 msgstr "Tab 大�(空��):"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Use tabs for indentation"
 msgstr "使ç?¨ tabs 縮æ??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Use theme font"
 msgstr "使ç?¨ä¸»é¡?ç??å­?å??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
-#: ../src/anjuta-app.c:629
-#: ../src/anjuta-app.c:634
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../src/anjuta-app.c:631
+#: ../src/anjuta-app.c:636
 msgid "View"
 msgstr "顯示"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:25
-msgid "Wrap long lines to fit on paper"
-msgstr "æ ¹æ??é ?é?¢å°?é??é?·ç??æ??å­?æ??è¡?"
-
 #: ../plugins/starter/plugin.c:70
-#: ../plugins/starter/starter.c:362
+#: ../plugins/starter/starter.c:353
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "èµ·æ­¥"
 
-#: ../plugins/starter/starter.c:403
+#: ../plugins/starter/starter.c:394
 msgid "Create File/Project"
 msgstr "建���/��"
 
-#: ../plugins/starter/starter.c:437
+#: ../plugins/starter/starter.c:428
 msgid "Recent Projects"
 msgstr "æ??è¿?é??å??ç??å°?æ¡?"
 
-#: ../plugins/starter/starter.c:468
+#: ../plugins/starter/starter.c:459
 msgid "Links"
 msgstr "��"
 
-#: ../plugins/starter/starter.c:487
+#: ../plugins/starter/starter.c:478
 msgid "Anjuta Home Page"
 msgstr "Anjuta ç??é¦?é ?"
 
-#: ../plugins/starter/starter.c:493
+#: ../plugins/starter/starter.c:484
 msgid "Anjuta Manual"
 msgstr "Anjuta æ??å??"
 
-#: ../plugins/starter/starter.c:499
+#: ../plugins/starter/starter.c:490
 msgid "GNOME Online API Documentation"
 msgstr "GNOME 網ä¸? API æ??件"
 
@@ -9384,7 +9252,7 @@ msgstr "主æ©?å??稱:"
 
 #: ../plugins/subversion/svn-command.c:205
 msgid "Fingerprint:"
-msgstr "æ?¸ç¢¼æ??ç´?"
+msgstr "æ?¸ç¢¼æ??ç´?ï¼?"
 
 #: ../plugins/subversion/svn-command.c:206
 msgid "Valid from:"
@@ -9454,65 +9322,65 @@ msgstr "�失� %s"
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
 
-#: ../plugins/symbol-db/plugin.c:315
+#: ../plugins/symbol-db/plugin.c:317
 msgid "Tag De_claration"
 msgstr "æ¨?籤宣å??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:319
 msgid "Go to symbol declaration"
 msgstr "移è?³ä¸?ä¸?å??符è??宣å??"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:324
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag _Implementation"
 msgstr "�籤實�(_I)"
 
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:328
 msgid "Go to symbol definition"
 msgstr "移è?³ä¸?ä¸?å??符è??å®?義"
 
-#: ../plugins/symbol-db/plugin.c:333
+#: ../plugins/symbol-db/plugin.c:335
 msgid "_Find Symbolâ?¦"
 msgstr "å°?æ?¾ç¬¦è??(_F)â?¦"
 
-#: ../plugins/symbol-db/plugin.c:334
+#: ../plugins/symbol-db/plugin.c:336
 msgid "Find Symbol"
 msgstr "å°?æ?¾ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:1011
+#: ../plugins/symbol-db/plugin.c:1013
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ­£å?¨ç?¢ç??å¯?碼å??ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1016
+#: ../plugins/symbol-db/plugin.c:1018
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?%3$d å??æª?æ¡?中已æ??æ?? %2$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1047
+#: ../plugins/symbol-db/plugin.c:1049
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "æ­£å?¨ç?¢ç??å¯?碼å??ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1049
+#: ../plugins/symbol-db/plugin.c:1051
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%2$d å??æª?æ¡?中已æ??æ?? %1$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1726
+#: ../plugins/symbol-db/plugin.c:1786
 msgid "Populating symbol databaseâ?¦"
 msgstr "æ­£å?¨é?·ç§»ç¬¦è??è³?æ??庫â?¦"
 
-#: ../plugins/symbol-db/plugin.c:2045
-#: ../plugins/symbol-db/plugin.c:2130
+#: ../plugins/symbol-db/plugin.c:2106
+#: ../plugins/symbol-db/plugin.c:2191
 msgid "Symbols"
 msgstr "符è??"
 
-#: ../plugins/symbol-db/plugin.c:2139
+#: ../plugins/symbol-db/plugin.c:2200
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2147
+#: ../plugins/symbol-db/plugin.c:2208
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
@@ -9520,13 +9388,13 @@ msgstr "SymbolDb é?¸å?®å??ä½?"
 msgid "Package is not parseable"
 msgstr "å¥?件æ?¯ç?¡æ³?解æ??ç??"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:374
+#: ../plugins/symbol-db/symbol-db-prefs.c:375
 #: ../plugins/symbol-db/symbol-db-prefs.c:522
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "符è??è³?æ??庫"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:471
+#: ../plugins/symbol-db/symbol-db-prefs.c:472
 msgid "API Tags"
 msgstr "API �籤"
 
@@ -9578,30 +9446,30 @@ msgstr "使ç?¨ GNOME çµ?端æ©?設å®?çµ?å??ï¼?"
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "使ç?¨ç?®å??å?¨ GNOME çµ?端æ©?中é?¸å??ç??設å®?çµ?å??"
 
-#: ../plugins/terminal/terminal.c:633
+#: ../plugins/terminal/terminal.c:578
 msgid "Ctrl-C"
 msgstr "Ctrl-C"
 
-#: ../plugins/terminal/terminal.c:641
+#: ../plugins/terminal/terminal.c:586
 msgid "Ctrl-X"
 msgstr "Ctrl-X"
 
-#: ../plugins/terminal/terminal.c:649
+#: ../plugins/terminal/terminal.c:594
 msgid "Ctrl-Z"
 msgstr "Ctrl-Z"
 
-#: ../plugins/terminal/terminal.c:788
+#: ../plugins/terminal/terminal.c:732
 msgid "terminal operations"
 msgstr "çµ?端æ©?æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:806
-#: ../plugins/terminal/terminal.c:982
-#: ../plugins/terminal/terminal.c:1035
+#: ../plugins/terminal/terminal.c:750
+#: ../plugins/terminal/terminal.c:944
+#: ../plugins/terminal/terminal.c:995
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "�端�"
 
-#: ../plugins/terminal/terminal.c:931
+#: ../plugins/terminal/terminal.c:877
 #, c-format
 msgid "Unable to execute command"
 msgstr "ç?¡æ³?å?·è¡?æ??令"
@@ -9650,8 +9518,8 @@ msgid "Tool Editor"
 msgstr "工�編輯�"
 
 #: ../plugins/tools/anjuta-tools.ui.h:18
-#: ../plugins/tools/plugin.c:256
 #: ../plugins/tools/plugin.c:263
+#: ../plugins/tools/plugin.c:270
 #: ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "工�"
@@ -9780,7 +9648,7 @@ msgstr "è¼?å?¥å¤?é?¨å·¥å?·æ??é?¯èª¤"
 msgid "Unable to open %s for writing"
 msgstr "ç?¡æ³?å?¨é??å?? %s ä¾?寫å?¥"
 
-#: ../plugins/tools/plugin.c:179
+#: ../plugins/tools/plugin.c:187
 msgid "Tool operations"
 msgstr "å·¥å?·æ??ä½?"
 
@@ -9965,6 +9833,10 @@ msgstr "å??好設å®?(_P)"
 msgid "Do you prefer coffee to tea? Check it out."
 msgstr "編輯æ?¬ç¨?å¼?ç??æ??é??設å®?ã??"
 
+#: ../src/anjuta-actions.h:38
+msgid "_View"
+msgstr "檢�(_V)"
+
 #: ../src/anjuta-actions.h:40
 msgid "_Reset Dock Layout"
 msgstr "é??設å??é§?é??ç½®(_R)"
@@ -10073,58 +9945,58 @@ msgstr "é??æ?¼å¤?é?¨å¤?æ??ç¨?å¼?(_P)"
 msgid "About third-party Anjuta plugins"
 msgstr "é??æ?¼ç¬¬ä¸?æ?¹ Anjuta å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:625
+#: ../src/anjuta-app.c:627
 msgid "Edit"
 msgstr "編輯"
 
-#: ../src/anjuta-app.c:932
+#: ../src/anjuta-app.c:931
 msgid "Installed plugins"
 msgstr "å·²å®?è£?ç??å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:936
+#: ../src/anjuta-app.c:935
 msgid "Shortcuts"
 msgstr "å¿«æ?·é?µ"
 
-#: ../src/anjuta-app.c:1008
+#: ../src/anjuta-app.c:1007
 #, c-format
 msgid "Value doesn't exist"
 msgstr "����"
 
-#: ../src/main.c:74
+#: ../src/main.c:70
 msgid "Specify the size and location of the main window"
 msgstr "æ??å®?主è¦?è¦?çª?ç??大å°?å??ä½?ç½®"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:77
+#: ../src/main.c:73
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
-#: ../src/main.c:82
+#: ../src/main.c:78
 msgid "Do not show the splash screen"
 msgstr "��顯示歡���"
 
-#: ../src/main.c:88
+#: ../src/main.c:84
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "å??å??æ?°ç??實é«?è??ä¸?å?¨æ?¢å­?ç??實é«?中é??å??æª?æ¡?"
 
-#: ../src/main.c:94
+#: ../src/main.c:90
 msgid "Do not open last session on startup"
 msgstr "å??å??æ??ä¸?è¦?é??å??æ??å¾?ä¸?次ä½?業é??段"
 
-#: ../src/main.c:100
+#: ../src/main.c:96
 msgid "Do not open last project and files on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??é??å??æ??å¾?ä¸?次編輯ç??å°?æ¡?å??æª?æ¡?"
 
-#: ../src/main.c:106
+#: ../src/main.c:102
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "é?©ç?¶ç??é??é?? Anjuta 並é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
 
-#: ../src/main.c:174
+#: ../src/main.c:170
 msgid "- Integrated Development Environment"
 msgstr "- æ?´å??å¼?é??ç?¼ç?°å¢?"
 
-#: ../src/main.c:249
+#: ../src/main.c:245
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -10133,80 +10005,60 @@ msgid "Appearance"
 msgstr "��"
 
 #: ../src/preferences.ui.h:3
-msgid "Default project directory:"
-msgstr "é ?設ç??å°?æ¡?ç?®é??ï¼?"
-
-#: ../src/preferences.ui.h:4
-msgid "Developer email address:"
-msgstr "é??ç?¼è??ç??é?»é?µå?°å??ï¼?"
-
-#: ../src/preferences.ui.h:5
-msgid "Developer name:"
-msgstr "é??ç?¼è??å??稱ï¼?"
-
-#: ../src/preferences.ui.h:6
 msgid "Do not load last project and files on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??è¼?å?¥æ??å¾?ä¸?次å°?æ¡?å??æª?æ¡?"
 
-#: ../src/preferences.ui.h:7
+#: ../src/preferences.ui.h:4
 msgid "Do not load last session on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??è¼?å?¥æ??å¾?ä¸?次ä½?業é??段"
 
 #. Style of the buttons/tabs used to select docked windows in anjuta
-#: ../src/preferences.ui.h:9
+#: ../src/preferences.ui.h:6
 msgid "Dock switcher style:"
 msgstr "å??é§?å??æ??å?¨æ¨£å¼?:"
 
-#: ../src/preferences.ui.h:10
+#: ../src/preferences.ui.h:7
 msgid "GNOME toolbar setting"
 msgstr "GNOME å·¥å?·å??設å®?å?¼"
 
-#: ../src/preferences.ui.h:12
+#: ../src/preferences.ui.h:9
 msgid "Icons"
 msgstr "å??示"
 
-#: ../src/preferences.ui.h:13
+#: ../src/preferences.ui.h:10
 msgid "Icons only"
 msgstr "å?ªæ??å??示"
 
-#: ../src/preferences.ui.h:14
-msgid "Project Defaults"
-msgstr "���設�"
-
-#: ../src/preferences.ui.h:15
-msgid "Select project directory"
-msgstr "é?¸æ??å°?æ¡?ç?®é??"
-
-#: ../src/preferences.ui.h:16
+#: ../src/preferences.ui.h:11
 msgid "Session"
 msgstr "ä½?業é??段"
 
-#: ../src/preferences.ui.h:17
+#: ../src/preferences.ui.h:12
 msgid "Tabs"
 msgstr "å??é ?"
 
-#: ../src/preferences.ui.h:19
+#: ../src/preferences.ui.h:14
 msgid "Text + Icons"
 msgstr "æ??å­? + å??示"
 
-#: ../src/preferences.ui.h:20
+#: ../src/preferences.ui.h:15
 msgid "Text below icons"
 msgstr "æ??å­?å?¨å??示ä¸?æ?¹"
 
-#: ../src/preferences.ui.h:21
+#: ../src/preferences.ui.h:16
 msgid "Text beside icons"
 msgstr "æ??å­?å?¨å??示æ??"
 
-#: ../src/preferences.ui.h:22
+#: ../src/preferences.ui.h:17
 msgid "Text only"
 msgstr "å?ªæ??æ??å­?"
 
 #. translators: translate the same as in gnome-control-center
-#: ../src/preferences.ui.h:24
+#: ../src/preferences.ui.h:19
 msgid "Toolbar button labels:"
 msgstr "å·¥å?·å??æ??é??æ¨?籤:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+#: ../plugins/debug-manager/org.gnome.anjuta.debug-manager.gschema.xml.in.h:1
 msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??ä¸?使ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?顯示警å??"
 
@@ -10226,7 +10078,6 @@ msgstr "è?ªå??è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:4
-#| msgid "Auto-complete"
 msgid "Autocompletion"
 msgstr "è?ªå??è£?é½?"
 
@@ -10264,66 +10115,74 @@ msgid "Indentation parameters"
 msgstr "縮æ??å??æ?¸"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+msgid "Leading asterisk in multi-line comment"
+msgstr "å¤?è¡?註解ç??é??é ­æ??è??"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 msgid "Line up parentheses"
 msgstr "å°?é½?æ?¬è??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 msgid "Parenthesis indentation"
 msgstr "æ?¬è??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+msgid "Prefer vim/emacs modelines over indentation settings"
+msgstr "å??好 vim/emacs modelines å??æ?¼ç¸®æ??設å®?å?¼"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "顯示å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:15
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??縮æ??大å°?(空ç?½å­?符)ï¼?"
 
 #. ANJUTA_STOCK_AUTOINDENT,
-#: ../plugins/language-support-cpp-java/plugin.c:1882
-#: ../plugins/language-support-python/plugin.c:1182
+#: ../plugins/language-support-cpp-java/plugin.c:1920
+#: ../plugins/language-support-python/plugin.c:1185
 msgid "Auto-Indent"
 msgstr "è?ªå??縮æ??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1883
-#: ../plugins/language-support-python/plugin.c:1183
+#: ../plugins/language-support-cpp-java/plugin.c:1921
+#: ../plugins/language-support-python/plugin.c:1186
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "æ ¹æ??縮æ??設å®?å?¼è?ªå??縮æ??ç?®å??ç??è¡?æ??é?¸æ??å??å??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1888
+#: ../plugins/language-support-cpp-java/plugin.c:1926
 msgid "Swap .h/.c"
 msgstr "ç?¸äº?å??æ?? .h /.c æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1889
+#: ../plugins/language-support-cpp-java/plugin.c:1927
 msgid "Swap C header and source files"
 msgstr "å??æ?? C æ¨?é ­æª?è??å??å§?æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1930
+#: ../plugins/language-support-cpp-java/plugin.c:1967
 msgid "C++/Java Assistance"
 msgstr "C++/Java æ?´å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2042
-#: ../plugins/language-support-cpp-java/plugin.c:2055
+#: ../plugins/language-support-cpp-java/plugin.c:2085
+#: ../plugins/language-support-cpp-java/plugin.c:2098
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
-#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1258
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1284
 msgid "C/C++"
 msgstr "C/C++"
 
-#: ../plugins/language-support-python/plugin.c:907
+#: ../plugins/language-support-python/plugin.c:909
 msgid "Python support warning"
 msgstr "Python æ?¯æ?´è­¦å??"
 
-#: ../plugins/language-support-python/plugin.c:915
+#: ../plugins/language-support-python/plugin.c:917
 msgid ""
 "Either python path is wrong or python-rope (http://rope.sf.net) libraries\n"
 "aren't installed. Both are required for autocompletion in python files.\n"
@@ -10333,50 +10192,42 @@ msgstr ""
 "å°?æ?ªå®?è£?ã??é??å?©è??é?½æ?¯ python æª?æ¡?è?ªå??è£?é½?æ??é??ã??\n"
 "è«?å®?è£?å®?å??並ä¸?å?¨å??好設å®?中檢æ?¥ python è·¯å¾?ã??"
 
-#: ../plugins/language-support-python/plugin.c:918
-#| msgid "Do not show again"
+#: ../plugins/language-support-python/plugin.c:920
 msgid "Do not show that warning again"
 msgstr "ä¸?å??顯示é??å??è­¦å??"
 
-#: ../plugins/language-support-python/plugin.c:1264
-#| msgid "Project Assistant"
+#: ../plugins/language-support-python/plugin.c:1267
 msgid "Python Assistance"
 msgstr "Python å?©ç??"
 
-#: ../plugins/language-support-python/plugin.c:1364
-#: ../plugins/language-support-python/plugin.c:1373
-#: ../plugins/language-support-python/python-assist.c:937
-#| msgid "Python Module"
+#: ../plugins/language-support-python/plugin.c:1376
+#: ../plugins/language-support-python/plugin.c:1385
+#: ../plugins/language-support-python/python-assist.c:934
 msgid "Python"
 msgstr "Python"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:3
-#| msgid "Auto-complete"
 msgid "Autocomplete"
 msgstr "è?ªå??å®?æ??"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:7
-#| msgid "Enable smart indentation"
 msgid "Enable adaptive indentation"
 msgstr "å??ç?¨é?©æ??å??縮æ??"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:10
-#| msgid "Environment Variables:"
 msgid "Environment"
 msgstr "��"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:12
-#| msgid "Interface"
 msgid "Interpreter"
 msgstr "�譯�"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:13
-#| msgid "Path:"
 msgid "Path: "
 msgstr "路��"
 
-#: ../plugins/sourceview/plugin.c:232
-#: ../plugins/sourceview/plugin.c:273
+#: ../plugins/sourceview/plugin.c:238
+#: ../plugins/sourceview/plugin.c:279
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView 編輯�"
 
@@ -10580,21 +10431,14 @@ msgstr "èª?è¨?管ç??ç¨?å¼?"
 msgid "Plugin to keep track of multiple programming languages"
 msgstr "ç?¨ä¾?ä¿?æ??å¤?種ç¨?å¼?èª?è¨?è»?è·¡ç??å¤?æ??ç¨?å¼?"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile.plugin.in.h:1
-msgid "Makefile backend"
-msgstr "Makefile �端��"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile.plugin.in.h:2
-msgid "Makefile backend for project manager"
-msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Makefile å¾?端ç¨?å¼?"
-
-#: ../plugins/gbf-am/gbf-am.plugin.in.h:1
+#: ../plugins/am-project/am-project.plugin.in.h:1
 msgid "Autotools backend"
 msgstr "Autotools �端��"
 
-#: ../plugins/gbf-am/gbf-am.plugin.in.h:2
-msgid "Autotools backend for project manager"
-msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Autotools å¾?端ç¨?å¼?"
+#: ../plugins/am-project/am-project.plugin.in.h:2
+#| msgid "Autotools backend for project manager"
+msgid "New Autotools backend for project manager"
+msgstr "å°?æ¡?管ç??ç¨?å¼?ç??æ?° Autotools å¾?端ç¨?å¼?"
 
 #: ../plugins/js-debugger/plugin.c:122
 #, c-format
@@ -10614,12 +10458,12 @@ msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
 msgid "Javascript Debugger Plugin"
 msgstr "Javascript Debugger å¤?æ??ç¨?å¼?"
 
-#: ../plugins/language-support-js/plugin.c:332
-#: ../plugins/language-support-js/plugin.c:341
+#: ../plugins/language-support-js/plugin.c:329
+#: ../plugins/language-support-js/plugin.c:338
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: ../plugins/language-support-js/plugin.c:397
+#: ../plugins/language-support-js/plugin.c:394
 msgid "JS"
 msgstr "JS"
 
@@ -10648,7 +10492,6 @@ msgid "Highlight missed semicolon"
 msgstr "æ¨?示æ¼?æ??ç??å??è??"
 
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
-#| msgid "<b>JS Find dirs</b>"
 msgid "JS Find dirs"
 msgstr "JS Find ç?®é??"
 
@@ -10661,6 +10504,292 @@ msgid "Symbol"
 msgstr "符è??"
 
 #~ msgid ""
+#~ "Are you sure you want to reset the preferences to\n"
+#~ "their default settings?"
+#~ msgstr ""
+#~ "æ?¯å?¦ç¢ºå®?è¦?å°?å??好設å®?å?§ç??å?¨é?¨è¨­å®?\n"
+#~ "å??復æ??é ?設ï¼?"
+
+#~ msgid "Invalid GbfAmConfigValue type"
+#~ msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
+
+#~ msgid "Select Package to add:"
+#~ msgstr "é?¸æ??è¦?å? å?¥ç??å¥?件ï¼?"
+
+#~ msgid "Select package"
+#~ msgstr "é?¸æ??å¥?件"
+
+#~ msgid "Variables"
+#~ msgstr "è®?æ?¸"
+
+#~ msgid "Generic rule"
+#~ msgstr "ä¸?è?¬è¦?å??"
+
+#~ msgid "Extra target"
+#~ msgstr "����"
+
+#~ msgid "Configure file"
+#~ msgstr "設���"
+
+#~ msgid "Interface file"
+#~ msgstr "����"
+
+#~ msgid "GLib mkenums"
+#~ msgstr "GLib mkenums"
+
+#~ msgid "GLib genmarshal"
+#~ msgstr "GLib genmarshal"
+
+#~ msgid "Intl rule"
+#~ msgstr "Intl è¦?å??"
+
+#~ msgid "Group doesn't exist"
+#~ msgstr "群����"
+
+#~ msgid "Target doesn't exist"
+#~ msgstr "�����"
+
+#~ msgid "Invalid or remote path (only local paths supported)"
+#~ msgstr "ç?¡æ??æ??é? ç«¯ç??è·¯å¾?ï¼?å?ªæ?¯æ?´æ?¬å?°ç«¯è·¯å¾?ï¼?"
+
+#~ msgid "Malformed project"
+#~ msgstr "æ ¼å¼?ä¸?正確ç??å°?æ¡?"
+
+#~ msgid "Parent group doesn't exist"
+#~ msgstr "�層群����"
+
+#~ msgid "Group already exists"
+#~ msgstr "群�已���"
+
+#~ msgid "Group couldn't be created"
+#~ msgstr "��建�群�"
+
+#~ msgid "Group couldn't be removed"
+#~ msgstr "��移�群�"
+
+#~ msgid "Target already exists"
+#~ msgstr "��已���"
+
+#~ msgid "General failure in target creation"
+#~ msgstr "ç?®æ¨?建ç«?ç¨?åº?ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
+
+#~ msgid "Newly created target could not be identified"
+#~ msgstr "æ??æ?°å»ºç«?ç??ç?®æ¨?ç?¡æ³?辨è­?"
+
+#~ msgid "Target couldn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "Source doesn't exist"
+#~ msgstr "�����"
+
+#~ msgid ""
+#~ "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+#~ msgstr "ä¾?æº?æª?æ¡?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?å??"
+
+#~ msgid "Source file is already in given target"
+#~ msgstr "ä¾?æº?æª?æ¡?å·²å?¨æ??å®?ç??ç?®æ¨?中"
+
+#~ msgid "General failure in adding source file"
+#~ msgstr "å? å?¥ä¾?æº?æª?æ¡?æ??ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
+
+#~ msgid "Newly added source file could not be identified"
+#~ msgstr "æ??æ?°å? å?¥ç??ä¾?æº?æª?æ¡?ç?¡æ³?辨è­?"
+
+#~ msgid "Source couldn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "Project directory"
+#~ msgstr "å°?æ¡?ç?®é??"
+
+#~ msgid "Enter new module"
+#~ msgstr "輸å?¥æ?°ç??模çµ?"
+
+#~ msgid ""
+#~ "Are you sure you want to remove module \"%s\" and all its associated "
+#~ "packages?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?è¦?移é?¤æ¨¡çµ?ã??%sã??è??æ??æ??è??å®?é??è?¯ç??å¥?件ï¼?"
+
+#~ msgid "Are you sure you want to remove package \"%s\"?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?移é?¤å¥?件ã??%sã??ï¼?"
+
+#~ msgid "Enter new variable"
+#~ msgstr "輸å?¥æ?°ç??è®?æ?¸"
+
+#~ msgid "Are you sure you want to remove variable \"%s\"?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?移é?¤è®?æ?¸ã??%sã??ï¼?"
+
+#~ msgid "Project:"
+#~ msgstr "å°?æ¡?:"
+
+#~ msgid "URI:"
+#~ msgstr "URIï¼?"
+
+#~ msgid "Module/Packages"
+#~ msgstr "模�/�件"
+
+#~ msgid "Version"
+#~ msgstr "ç??æ?¬"
+
+#~ msgid "Use"
+#~ msgstr "使�"
+
+#~ msgid "Group name:"
+#~ msgstr "群çµ?å??稱:"
+
+#~ msgid "Advanced"
+#~ msgstr "é?²é??"
+
+#~ msgid "gcj compiler flags (ahead-of-time):"
+#~ msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time):"
+
+#~ msgid "Java compiler flags (just-in-time):"
+#~ msgstr "Java 編譯å?¨æ??æ¨? (just-in-time):"
+
+#~ msgid "Includes (deprecated):"
+#~ msgstr "å??å?«ï¼?已廢æ£?ï¼?:"
+
+#~ msgid "C preprocessor flags"
+#~ msgstr "C é ?è??ç??å?¨æ??æ¨?"
+
+#~ msgid "C++ compiler flags"
+#~ msgstr "C++ 編譯å?¨æ??æ¨?"
+
+#~ msgid "gcj compiler flags (ahead-of-time)"
+#~ msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time)"
+
+#~ msgid "Libraries:"
+#~ msgstr "��庫:"
+
+#~ msgid "Dependencies:"
+#~ msgstr "ç?¸ä¾?é??ä¿?:"
+
+#~ msgid "Advanced options"
+#~ msgstr "é?²é??é?¸é ?"
+
+#~ msgid "Target name:"
+#~ msgstr "ç?®æ¨?å??稱:"
+
+#~ msgid "Advancedâ?¦"
+#~ msgstr "é?²é??â?¦"
+
+#~ msgid "Invalid GbfMkfileConfigValue type"
+#~ msgstr "ç?¡æ??ç?? GbfMkfileConfigValue é¡?å??"
+
+#~ msgid "Group coudn't be removed"
+#~ msgstr "��移�群�"
+
+#~ msgid "Target couldn't be created"
+#~ msgstr "��建���"
+
+#~ msgid "Target coudn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "Source file must be inside the project directory"
+#~ msgstr "ä¾?æº?æª?æ¡?å¿?é ?å?¨å°?æ¡?ç?®é??中"
+
+#~ msgid "Source is already in target"
+#~ msgstr "��已����中"
+
+#~ msgid "Source couldn't be added"
+#~ msgstr "������"
+
+#~ msgid "Includes:"
+#~ msgstr "å??å?«:"
+
+#~ msgid "Tooltips in list"
+#~ msgstr "æ¸?å?®ä¸­ç??å·¥å?·æ??示"
+
+#~ msgid "Messages options"
+#~ msgstr "����"
+
+#~ msgid "Number of first characters to show:"
+#~ msgstr "è¦?顯示ç??第ä¸?å­?å??æ?¸ï¼?"
+
+#~ msgid "Number of last characters to show:"
+#~ msgstr "è¦?顯示ç??æ??å¾?å­?å??æ?¸ï¼?"
+
+#~ msgid "Truncate long messages"
+#~ msgstr "æ?ªç?­é??é?·ç??è¨?æ?¯"
+
+#~ msgid "_Select file to addâ?¦"
+#~ msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)â?¦"
+
+#~ msgid "No properties available for this group"
+#~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦é??å??群çµ?"
+
+#~ msgid "No properties available for this target"
+#~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦æ­¤ç?®æ¨?"
+
+#~ msgid ""
+#~ "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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?æ??åº?ç·?é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?ã??"
+#~ "æ¸?è??å??é»?ã??è«?修正å®?ã??"
+
+#~ 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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?æ??ç?®é??å??é??å­?å??é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?"
+#~ "æ¯?ã??æ?¸å­?ã??åº?ç·?ã??ç?®é??å??é??å­?å??ã??æ¸?è??å??é»?ã??è«?修正å®?ã??"
+
+#~ msgid "Basic Search & Replace"
+#~ msgstr "å?ºæ?¬æ??å°?å??å??代"
+
+#~ msgid "Modify"
+#~ msgstr "修�"
+
+#~ msgid "New Name:"
+#~ msgstr "æ?°å??稱ï¼?"
+
+#~ msgid "Setting"
+#~ msgstr "設��"
+
+#~ msgid "Basic Search"
+#~ msgstr "å?ºæ?¬æ??å°?"
+
+#~ msgid "Print line numbers"
+#~ msgstr "å??å?°å??è??"
+
+#~ msgid "Print options"
+#~ msgstr "å??å?°é?¸é ?"
+
+#~ msgid "Print page footer"
+#~ msgstr "å??å?°é ?å°¾"
+
+#~ msgid "Print page header"
+#~ msgstr "å??å?°é ?é¦?"
+
+#~ msgid "Printing"
+#~ msgstr "æ­£å?¨å??å?°"
+
+#~ msgid "Wrap long lines to fit on paper"
+#~ msgstr "ä¾?é ?é?¢å°?é??é?·ç??æ??å­?æ??å??"
+
+#~ msgid "Default project directory:"
+#~ msgstr "é ?設ç??å°?æ¡?ç?®é??ï¼?"
+
+#~ msgid "Developer email address:"
+#~ msgstr "é??ç?¼è??ç??é?»é?µå?°å??ï¼?"
+
+#~ msgid "Developer name:"
+#~ msgstr "é??ç?¼è??å??稱ï¼?"
+
+#~ msgid "Project Defaults"
+#~ msgstr "���設�"
+
+#~ msgid "Select project directory"
+#~ msgstr "é?¸æ??å°?æ¡?ç?®é??"
+
+#~ msgid "Makefile backend"
+#~ msgstr "Makefile �端��"
+
+#~ msgid "Makefile backend for project manager"
+#~ msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Makefile å¾?端ç¨?å¼?"
+
+#~ msgid ""
 #~ "<b>There is %d item with unsaved changes. Save changes before closing?</b>"
 
 #~ msgid_plural ""
@@ -10998,7 +11127,7 @@ msgstr "符è??"
 #~ msgstr "�� '%s' ���"
 
 #~ msgid "C_onfigure Project..."
-#~ msgstr "設���(_O)..."
+#~ msgstr "設���(_O)�"
 
 #~ msgid "private"
 #~ msgstr "private"
@@ -11022,7 +11151,7 @@ msgstr "符è??"
 #~ msgstr "<b>��工��</b>"
 
 #~ msgid "Debugger Command..."
-#~ msgstr "é?¤é?¯å·¥å?·æ??令..."
+#~ msgstr "é?¤é?¯å·¥å?·æ??令â?¦"
 
 #~ msgid "Pid"
 #~ msgstr "é?²ç¨?ç·¨è??"
@@ -11031,13 +11160,13 @@ msgstr "符è??"
 #~ msgstr "Id"
 
 #~ msgid "Ins_pect/Evaluate..."
-#~ msgstr "é©?証å??測試 (_P)..."
+#~ msgstr "é©?証å??測試(_P)â?¦"
 
 #~ msgid "Add Watch..."
-#~ msgstr "æ?°å¢?ç?£ç??..."
+#~ msgstr "æ?°å¢?ç?£ç??â?¦"
 
 #~ msgid "_Print..."
-#~ msgstr "å??å?°(_P)..."
+#~ msgstr "å??å?°(_P)â?¦"
 
 #~ msgid "recent menu label|_%d. %s"
 #~ msgstr "_%d. %s"
@@ -11046,13 +11175,13 @@ msgstr "符è??"
 #~ msgstr "%d. %s"
 
 #~ msgid "_Open..."
-#~ msgstr "é??å??(_O)..."
+#~ msgstr "é??å??(_O)â?¦"
 
 #~ msgid "Url:"
 #~ msgstr "網å??:"
 
 #~ msgid "Advanced..."
-#~ msgstr "é?²é??..."
+#~ msgstr "é?²é??â?¦"
 
 #~ msgid "Source coudn't be removed"
 #~ msgstr "��移���"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 632abab..7931447 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,13 +4,14 @@
 # Abel Cheung <maddog linux org hk>, 2003-2005.
 # Hialan Liu <hialan liu gmail com>, 2008.
 # Tryneeds translation team, 2009.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta 2.31.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-09-21 21:22+0000\n"
-"PO-Revision-Date: 2010-09-22 09:14+0800\n"
+"POT-Creation-Date: 2010-11-21 11:57+0000\n"
+"PO-Revision-Date: 2010-12-03 19:46+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"
@@ -79,24 +80,24 @@ msgstr "Anjuta ç?¡æ³?è?ªå??å?¤æ?·æ?¨æ?³è¦?é??å??æª?æ¡?ç??編碼ç?ºä½?ã??"
 #: ../libanjuta/anjuta-encodings.c:186
 #: ../libanjuta/anjuta-encodings.c:188
 msgid "Unicode"
-msgstr "統�碼(Unicode)"
+msgstr "è?¬å??碼"
 
 #: ../libanjuta/anjuta-encodings.c:151
 #: ../libanjuta/anjuta-encodings.c:177
 #: ../libanjuta/anjuta-encodings.c:223
 #: ../libanjuta/anjuta-encodings.c:266
 msgid "Western"
-msgstr "西�"
+msgstr "西��系"
 
 #: ../libanjuta/anjuta-encodings.c:153
 #: ../libanjuta/anjuta-encodings.c:225
 #: ../libanjuta/anjuta-encodings.c:262
 msgid "Central European"
-msgstr "中�"
+msgstr "中��系"
 
 #: ../libanjuta/anjuta-encodings.c:155
 msgid "South European"
-msgstr "å??æ­?"
+msgstr "å??æ­?èª?ç³»"
 
 #: ../libanjuta/anjuta-encodings.c:157
 #: ../libanjuta/anjuta-encodings.c:173
@@ -111,60 +112,60 @@ msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
 #: ../libanjuta/anjuta-encodings.c:246
 #: ../libanjuta/anjuta-encodings.c:264
 msgid "Cyrillic"
-msgstr "æ?¯æ??夫æ??"
+msgstr "æ?¯æ??夫èª?"
 
 #: ../libanjuta/anjuta-encodings.c:161
 #: ../libanjuta/anjuta-encodings.c:233
 #: ../libanjuta/anjuta-encodings.c:274
 msgid "Arabic"
-msgstr "é?¿æ??伯æ??"
+msgstr "é?¿æ??伯èª?"
 
 #: ../libanjuta/anjuta-encodings.c:163
 #: ../libanjuta/anjuta-encodings.c:268
 msgid "Greek"
-msgstr "å¸?è??æ??"
+msgstr "å¸?è??èª?"
 
 #: ../libanjuta/anjuta-encodings.c:165
 msgid "Hebrew Visual"
-msgstr "å¸?伯ä¾?æ??"
+msgstr "�伯��(左��)"
 
 #: ../libanjuta/anjuta-encodings.c:167
 #: ../libanjuta/anjuta-encodings.c:231
 #: ../libanjuta/anjuta-encodings.c:272
 msgid "Hebrew"
-msgstr "å¸?伯ä¾?æ??"
+msgstr "�伯��"
 
 #: ../libanjuta/anjuta-encodings.c:169
 #: ../libanjuta/anjuta-encodings.c:229
 #: ../libanjuta/anjuta-encodings.c:270
 msgid "Turkish"
-msgstr "å??è?³å?¶æ??"
+msgstr "å??è?³å?¶èª?"
 
 #: ../libanjuta/anjuta-encodings.c:171
 msgid "Nordic"
-msgstr "å??æ­?"
+msgstr "å??æ­?èª?ç³»"
 
 #: ../libanjuta/anjuta-encodings.c:175
 msgid "Celtic"
-msgstr "Celtic"
+msgstr "����"
 
 #: ../libanjuta/anjuta-encodings.c:179
 msgid "Romanian"
-msgstr "ç¾?馬尼äº?æ??"
+msgstr "�馬尼��"
 
 #: ../libanjuta/anjuta-encodings.c:191
 msgid "Armenian"
-msgstr "é?¿ç¾?å°¼äº?æ??"
+msgstr "��尼��"
 
 #: ../libanjuta/anjuta-encodings.c:193
 #: ../libanjuta/anjuta-encodings.c:195
 #: ../libanjuta/anjuta-encodings.c:209
 msgid "Chinese Traditional"
-msgstr "ç¹?é«?中æ??"
+msgstr "æ­£é«?中æ??"
 
 #: ../libanjuta/anjuta-encodings.c:197
 msgid "Cyrillic/Russian"
-msgstr "æ?¯æ??夫æ??/ä¿?æ??"
+msgstr "æ?¯æ??夫èª?ç³»/ä¿?èª?"
 
 #: ../libanjuta/anjuta-encodings.c:200
 #: ../libanjuta/anjuta-encodings.c:202
@@ -172,14 +173,14 @@ msgstr "æ?¯æ??夫æ??/ä¿?æ??"
 #: ../libanjuta/anjuta-encodings.c:236
 #: ../libanjuta/anjuta-encodings.c:251
 msgid "Japanese"
-msgstr "æ?¥æ??"
+msgstr "��"
 
 #: ../libanjuta/anjuta-encodings.c:207
 #: ../libanjuta/anjuta-encodings.c:238
 #: ../libanjuta/anjuta-encodings.c:242
 #: ../libanjuta/anjuta-encodings.c:257
 msgid "Korean"
-msgstr "é??æ??"
+msgstr "é??èª?"
 
 #: ../libanjuta/anjuta-encodings.c:212
 #: ../libanjuta/anjuta-encodings.c:214
@@ -190,36 +191,32 @@ msgstr "ç°¡é«?中æ??"
 
 #: ../libanjuta/anjuta-encodings.c:218
 msgid "Georgian"
-msgstr "å?¬æ²»äº?æ??"
+msgstr "�治��"
 
 #: ../libanjuta/anjuta-encodings.c:248
 msgid "Cyrillic/Ukrainian"
-msgstr "æ?¯æ??夫æ??/ç??é»?è?­æ??"
+msgstr "æ?¯æ??夫èª?ç³»/ç??å??è?­èª?"
 
 #: ../libanjuta/anjuta-encodings.c:253
 #: ../libanjuta/anjuta-encodings.c:259
 #: ../libanjuta/anjuta-encodings.c:278
 msgid "Vietnamese"
-msgstr "è¶?å??æ??"
+msgstr "è¶?å??èª?"
 
 #: ../libanjuta/anjuta-encodings.c:255
 msgid "Thai"
-msgstr "æ³°æ??"
-
-#: ../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:130
-#: ../plugins/gbf-am/gbf-am-properties.c:177
-#: ../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:151
-#: ../plugins/dir-project/dir-project.c:802
+msgstr "泰�"
+
+#. Translator: Unknown refers to a character encoding like UTF8,
+#. * ISO8859-1
+#. Translator: Unknown here is a target type, if not unknown it can
+#. * be a program or a shared library by example
+#: ../libanjuta/anjuta-encodings.c:443
+#: ../plugins/am-project/am-project.c:107
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1169
+#: ../libanjuta/anjuta-launcher.c:1170
 #: ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276
 #: ../plugins/gdb/utilities.c:282
@@ -227,12 +224,12 @@ msgstr "��"
 msgid "Cannot execute command: \"%s\""
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1170
+#: ../libanjuta/anjuta-launcher.c:1171
 msgid "execvp failed"
 msgstr "execvp 已失æ??"
 
 #: ../libanjuta/anjuta-plugin.c:326
-#: ../libanjuta/anjuta-plugin-manager.c:2312
+#: ../libanjuta/anjuta-plugin-manager.c:2364
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -257,17 +254,17 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:463
+#: ../plugins/symbol-db/symbol-db-prefs.c:464
 msgid "Load"
 msgstr "è¼?å?¥"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1943
+#: ../libanjuta/anjuta-plugin-manager.c:1987
 msgid "Available Plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1036
-#: ../src/anjuta-app.c:934
+#: ../src/anjuta-app.c:933
 msgid "Preferred plugins"
 msgstr "å??好ç??å¤?æ??ç¨?å¼?"
 
@@ -292,58 +289,58 @@ msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:530
-msgid "Please select a plugin to activate"
-msgstr "è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?"
+#| msgid "Please select a plugin to activate"
+msgid "<b>Please select a plugin to activate</b>"
+msgstr "<b>è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?</b>"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
 #, c-format
 msgid "No plugin is able to load other plugins in %s"
 msgstr "å?¨ %s 中æ²?æ??å¤?æ??ç¨?å¼?å?¯ä»¥è¼?å?¥å?¶ä»?ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1962
+#: ../libanjuta/anjuta-plugin-manager.c:2014
 msgid "Remember this selection"
 msgstr "è¨?å¾?æ­¤é?¸æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2293
+#: ../libanjuta/anjuta-plugin-manager.c:2345
 msgid "Profiles"
 msgstr "設å®?çµ?å??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2294
+#: ../libanjuta/anjuta-plugin-manager.c:2346
 msgid "Current stack of profiles"
 msgstr "設å®?çµ?å??ç??ç?®å??å ?ç??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2299
+#: ../libanjuta/anjuta-plugin-manager.c:2351
 msgid "Available plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2300
+#: ../libanjuta/anjuta-plugin-manager.c:2352
 msgid "Currently available plugins found in plugin paths"
 msgstr "ç?®å??å?¨å¤?æ??ç¨?å¼?è·¯å¾?中æ?¾å?°å?¯ä½¿ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2306
+#: ../libanjuta/anjuta-plugin-manager.c:2358
 msgid "Activated plugins"
 msgstr "已使ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2307
+#: ../libanjuta/anjuta-plugin-manager.c:2359
 msgid "Currently activated plugins"
 msgstr "ç?®å??使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2313
+#: ../libanjuta/anjuta-plugin-manager.c:2365
 msgid "Anjuta shell for which the plugins are made"
 msgstr "製ä½?å¤?æ??ç¨?å¼?ç?? Anjuta shell"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2321
+#: ../libanjuta/anjuta-plugin-manager.c:2373
 msgid "Anjuta Status"
 msgstr "Anjuta ç??æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2322
+#: ../libanjuta/anjuta-plugin-manager.c:2374
 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:2482
+#: ../libanjuta/anjuta-plugin-manager.c:2534
 msgid "Loaded:"
 msgstr "已���"
 
@@ -403,23 +400,8 @@ msgstr ""
 "è®?å??ã??%sã??失æ??ï¼?ä¸?å??å¿?è¦?ç??å¤?æ??ç¨?å¼?é?ºå¤±ï¼?\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences.c:1534
-msgid ""
-"Are you sure you want to reset the preferences to\n"
-"their default settings?"
-msgstr ""
-"æ?¯å?¦ç¢ºå®?è¦?å°?å??好設å®?å?§ç??å?¨é?¨è¨­å®?\n"
-"å??復æ??é ?設ï¼?"
-
-#. Action name
-#. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538
-#: ../plugins/git/plugin.c:455
-msgid "_Reset"
-msgstr "é??ç½®(_R)"
-
 #: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:219
+#: ../plugins/gtodo/interface.c:202
 #: ../plugins/gtodo/mcategory.c:36
 msgid "Category"
 msgstr "å??é¡?"
@@ -427,9 +409,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:3
-#: ../src/anjuta-app.c:921
-#: ../src/preferences.ui.h:11
+#: ../src/anjuta-app.c:920
+#: ../src/preferences.ui.h:8
 msgid "General"
 msgstr "��"
 
@@ -446,7 +427,7 @@ msgid "If you do not save, all your changes will be lost."
 msgstr "å¦?æ??æ?¨æ²?æ??å?²å­?ï¼?å°?é?ºå¤±æ??æ??ä¿®æ?¹ã??"
 
 #: ../libanjuta/anjuta-save-prompt.c:189
-#: ../plugins/document-manager/plugin.c:605
+#: ../plugins/document-manager/plugin.c:611
 #: ../plugins/snippets-manager/snippets-editor.ui.h:11
 msgid "Save"
 msgstr "��"
@@ -461,7 +442,6 @@ msgstr "æ??æ£?æ?´æ?¹(_D)"
 
 #: ../libanjuta/anjuta-save-prompt.c:296
 #, c-format
-#| msgid "There is an item with unsaved changes. Save changes before closing?"
 msgid "There is %d item with unsaved changes. Save changes before closing?"
 msgid_plural "There are %d items with unsaved changes. Save changes before closing?"
 msgstr[0] "é??裡æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å­?ç??è®?æ?´ã??æ?¯å?¦å?¨é??é??å??å?²å­?è®?æ?´ï¼?"
@@ -487,20 +467,20 @@ msgid "Shortcut"
 msgstr "å¿«æ?·é?µ"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:359
+#: ../libanjuta/anjuta-utils.c:357
 msgid "System:"
 msgstr "系統�"
 
-#: ../libanjuta/anjuta-utils.c:505
+#: ../libanjuta/anjuta-utils.c:503
 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:514
+#: ../libanjuta/anjuta-utils.c:512
 #, c-format
 msgid "Installation failed: %s"
 msgstr "å®?è£?ä½?æ?¯å¤±æ??ï¼?%s"
 
-#: ../libanjuta/anjuta-utils.c:582
+#: ../libanjuta/anjuta-utils.c:580
 #, c-format
 msgid ""
 "The \"%s\" package is not installed.\n"
@@ -509,7 +489,7 @@ msgstr ""
 "æ?¨å°?æ?ªå®?è£?ã??%sã??å¥?件ã??\n"
 "è«?å®?è£?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:600
+#: ../libanjuta/anjuta-utils.c:598
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -519,23 +499,23 @@ msgstr ""
 "è«?å®?è£?å®?ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:1179
+#: ../libanjuta/anjuta-utils.c:1171
 msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ?¾ä¸?å?°çµ?端æ©?ï¼?使ç?¨ xtermï¼?ä¸?管å®?è?½ä¸?è?½é??ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1215
-#: ../libanjuta/anjuta-utils.c:1219
-#: ../libanjuta/anjuta-utils.c:1247
-#: ../libanjuta/anjuta-utils.c:1251
+#: ../libanjuta/anjuta-utils.c:1207
+#: ../libanjuta/anjuta-utils.c:1211
+#: ../libanjuta/anjuta-utils.c:1239
+#: ../libanjuta/anjuta-utils.c:1243
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?%sï¼?使ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1901
+#: ../libanjuta/anjuta-utils.c:1893
 msgid "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:2340
+#: ../libanjuta/anjuta-utils.c:2332
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
@@ -585,22 +565,22 @@ msgstr "æ?ªè¨?ç??æ?¬"
 msgid "Ignored"
 msgstr "已忽�"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:218
+#: ../libanjuta/cell-renderer-captioned-image.c:215
 #: ../libfoocanvas/foo-canvas-text.c:177
-#: ../src/preferences.ui.h:18
+#: ../src/preferences.ui.h:13
 msgid "Text"
 msgstr "æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:219
+#: ../libanjuta/cell-renderer-captioned-image.c:216
 #: ../libfoocanvas/foo-canvas-text.c:178
 msgid "Text to render"
 msgstr "æº?å??æ??繪ç??æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:225
+#: ../libanjuta/cell-renderer-captioned-image.c:222
 msgid "Pixbuf Object"
 msgstr "Pixbuf �件"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:226
+#: ../libanjuta/cell-renderer-captioned-image.c:223
 msgid "The pixbuf to render."
 msgstr "æº?å??æ??繪ç?? pixbufã??"
 
@@ -907,9 +887,16 @@ msgstr "é?¸æ??ä¸?å??çµ?建ç?®é??"
 msgid "Translate messages"
 msgstr "翻譯��"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:18
+msgid "su -c"
+msgstr "su -c"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:19
+msgid "sudo"
+msgstr "sudo"
+
 #: ../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:1
 #: ../src/preferences.ui.h:2
 msgid "Default"
@@ -933,10 +920,7 @@ msgid "No executables in this project!"
 msgstr "å°?æ¡?中æ²?æ??å?¯å?·è¡?æª?ã??"
 
 #: ../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
+#: ../plugins/am-project/am-project.c:128
 msgid "Program"
 msgstr "��"
 
@@ -946,19 +930,19 @@ msgstr "ç?®å??æ²?æ??é??å??ä»»ä½?æª?æ¡?æ??å°?æ¡?ã??"
 
 #. Only local program are supported
 #: ../plugins/build-basic-autotools/executer.c:298
-#: ../plugins/run-program/execute.c:70
+#: ../plugins/run-program/execute.c:71
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "�� '%s' ������"
 
 #: ../plugins/build-basic-autotools/executer.c:313
-#: ../plugins/run-program/execute.c:76
+#: ../plugins/run-program/execute.c:77
 #, c-format
 msgid "Program '%s' does not exist"
 msgstr "ç¨?å¼?ã??%sã??ä¸?å­?å?¨"
 
 #: ../plugins/build-basic-autotools/executer.c:321
-#: ../plugins/run-program/execute.c:80
+#: ../plugins/run-program/execute.c:81
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "ç¨?å¼? '%s' ä¸?å?·æ??å?·è¡?æ¬?é??"
@@ -977,11 +961,11 @@ msgstr "å?¯å?·è¡?æª? '%s' 並ä¸?æ?¯æ??æ?°ç??ã??"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:168
+#: ../plugins/build-basic-autotools/plugin.c:169
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:169
+#: ../plugins/build-basic-autotools/plugin.c:170
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 
@@ -990,277 +974,297 @@ msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:177
+#: ../plugins/build-basic-autotools/plugin.c:178
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:178
+#: ../plugins/build-basic-autotools/plugin.c:179
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:846
+#: ../plugins/build-basic-autotools/plugin.c:858
 #, c-format
 msgid "Entering: %s"
 msgstr "正���� %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:882
+#: ../plugins/build-basic-autotools/plugin.c:894
 #, c-format
 msgid "Leaving: %s"
 msgstr "æ­£å?¨é?¢é??ï¼? %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:915
+#. The translations should match that of 'gcc' program.
+#. * The second string with -old should be used for an older
+#. * version of 'gcc' if necessary. If you update one string,
+#. * move the first one to translate the -old string and then
+#. * replace the first string only.
+#: ../plugins/build-basic-autotools/plugin.c:932
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "è­¦å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:921
+#: ../plugins/build-basic-autotools/plugin.c:933
+#| msgid "warning:"
+msgid "warning:-old"
+msgstr "è­¦å??:-old"
+
+#. The translations should match that of 'gcc' program.
+#. * The second string with -old should be used for an older
+#. * version of 'gcc' if necessary. If you update one string,
+#. * move the first one to translate the -old string and then
+#. * replace the first string only.
+#: ../plugins/build-basic-autotools/plugin.c:944
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "�誤�"
 
-#: ../plugins/build-basic-autotools/plugin.c:1038
+#: ../plugins/build-basic-autotools/plugin.c:945
+#| msgid "error:"
+msgid "error:-old"
+msgstr "�誤:-old"
+
+#: ../plugins/build-basic-autotools/plugin.c:1062
 #, c-format
 msgid "Command exited with status %d"
 msgstr "æ??令以 %d ç??æ??é?¢é??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1048
-#: ../plugins/build-basic-autotools/plugin.c:1527
+#: ../plugins/build-basic-autotools/plugin.c:1072
+#: ../plugins/build-basic-autotools/plugin.c:1551
 #, c-format
 msgid "Command canceled by user"
 msgstr "æ??令被使ç?¨è??å??æ¶?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1053
+#: ../plugins/build-basic-autotools/plugin.c:1077
 #, c-format
 msgid "Command aborted by user"
 msgstr "æ??令被使ç?¨è??中止"
 
-#: ../plugins/build-basic-autotools/plugin.c:1058
+#: ../plugins/build-basic-autotools/plugin.c:1082
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "æ??令以信è?? %d çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1066
+#: ../plugins/build-basic-autotools/plugin.c:1090
 msgid "Command terminated for an unknown reason"
 msgstr "æ??令以ä¸?æ??ç??ç??ç?±çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1084
+#: ../plugins/build-basic-autotools/plugin.c:1108
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "總å?±è²»æ??ï¼?%lu ç§?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1091
+#: ../plugins/build-basic-autotools/plugin.c:1115
 msgid "Completed unsuccessfully\n"
 msgstr "æ?ªè?½æ??å??å®?æ??\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1099
+#: ../plugins/build-basic-autotools/plugin.c:1123
 #: ../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:1187
+#: ../plugins/build-basic-autotools/plugin.c:1211
 #, c-format
 msgid "Build %d: %s"
 msgstr "建置 %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1522
+#: ../plugins/build-basic-autotools/plugin.c:1546
 msgid "Before using this new configuration, the default one needs to be removed. Do you want to do that ?"
 msgstr "å?¨ä½¿ç?¨é??å??æ?°çµ?æ??ä¹?å??ï¼?é??è¦?å??移é?¤é ?設ç??çµ?æ??ã??æ?¯å?¦è¦?é??麼å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1823
+#: ../plugins/build-basic-autotools/plugin.c:1843
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ç?¡æ³?編譯ã??%sã??ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1958
+#: ../plugins/build-basic-autotools/plugin.c:1978
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½è¨­å®?å°?æ¡?ï¼?%s 中é?ºå¤±è¨­å®?å?½ä»¤ç¨¿ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2439
-#: ../plugins/build-basic-autotools/plugin.c:2513
-#: ../plugins/build-basic-autotools/plugin.c:2523
-#: ../plugins/build-basic-autotools/plugin.c:2541
-#: ../plugins/build-basic-autotools/plugin.c:2551
-#: ../plugins/build-basic-autotools/plugin.c:2608
+#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2533
+#: ../plugins/build-basic-autotools/plugin.c:2543
+#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2571
+#: ../plugins/build-basic-autotools/plugin.c:2628
 #, c-format
 msgid "_Build"
 msgstr "建置(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2443
+#: ../plugins/build-basic-autotools/plugin.c:2463
 msgid "_Build Project"
 msgstr "建置��(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2444
+#: ../plugins/build-basic-autotools/plugin.c:2464
 msgid "Build whole project"
 msgstr "建置æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2449
+#: ../plugins/build-basic-autotools/plugin.c:2469
 msgid "_Install Project"
 msgstr "����(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2450
+#: ../plugins/build-basic-autotools/plugin.c:2470
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2475
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2456
+#: ../plugins/build-basic-autotools/plugin.c:2476
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2461
+#: ../plugins/build-basic-autotools/plugin.c:2481
 msgid "C_onfigure Projectâ?¦"
-msgstr "設���(_O)..."
+msgstr "設���(_O)�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2462
+#: ../plugins/build-basic-autotools/plugin.c:2482
 msgid "Configure project"
 msgstr "設���"
 
-#: ../plugins/build-basic-autotools/plugin.c:2467
+#: ../plugins/build-basic-autotools/plugin.c:2487
 msgid "Build _Tarball"
 msgstr "建置 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2468
+#: ../plugins/build-basic-autotools/plugin.c:2488
 msgid "Build project tarball distribution"
 msgstr "建置�� tarball ���件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2473
+#: ../plugins/build-basic-autotools/plugin.c:2493
 msgid "_Build Module"
 msgstr "建置模�(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2474
+#: ../plugins/build-basic-autotools/plugin.c:2494
 msgid "Build module associated with current file"
 msgstr "建置è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2499
 msgid "_Install Module"
 msgstr "��模�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2480
+#: ../plugins/build-basic-autotools/plugin.c:2500
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2505
 msgid "_Clean Module"
 msgstr "��模�(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2486
+#: ../plugins/build-basic-autotools/plugin.c:2506
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2511
 msgid "Co_mpile File"
 msgstr "編譯��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2492
+#: ../plugins/build-basic-autotools/plugin.c:2512
 msgid "Compile current editor file"
 msgstr "編譯ç?®å??編輯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2497
+#: ../plugins/build-basic-autotools/plugin.c:2517
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2498
+#: ../plugins/build-basic-autotools/plugin.c:2518
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2503
+#: ../plugins/build-basic-autotools/plugin.c:2523
 msgid "Remove Configuration"
 msgstr "移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2504
+#: ../plugins/build-basic-autotools/plugin.c:2524
 msgid "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??å°?æ¡? (distclean)ï¼?å?¯è?½ç??話ä¸?併移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
-#: ../plugins/build-basic-autotools/plugin.c:2545
+#: ../plugins/build-basic-autotools/plugin.c:2537
+#: ../plugins/build-basic-autotools/plugin.c:2565
 msgid "_Compile"
 msgstr "編譯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2518
-#: ../plugins/build-basic-autotools/plugin.c:2546
+#: ../plugins/build-basic-autotools/plugin.c:2538
+#: ../plugins/build-basic-autotools/plugin.c:2566
 msgid "Compile file"
 msgstr "編譯��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
-#: ../plugins/build-basic-autotools/plugin.c:2552
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2572
 msgid "Build module"
 msgstr "建置模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2529
-#: ../plugins/build-basic-autotools/plugin.c:2557
-#: ../plugins/build-basic-autotools/plugin.c:2615
+#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2635
 #, c-format
 msgid "_Install"
 msgstr "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2530
-#: ../plugins/build-basic-autotools/plugin.c:2558
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2578
 msgid "Install module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2535
-#: ../plugins/build-basic-autotools/plugin.c:2563
-#: ../plugins/build-basic-autotools/plugin.c:2622
+#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2642
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2536
-#: ../plugins/build-basic-autotools/plugin.c:2564
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2584
 msgid "Clean module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2569
+#: ../plugins/build-basic-autotools/plugin.c:2589
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??令(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2570
+#: ../plugins/build-basic-autotools/plugin.c:2590
 msgid "Cancel build command"
 msgstr "å??æ¶?建置æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:2608
+#: ../plugins/build-basic-autotools/plugin.c:2628
 #, c-format
 msgid "_Build (%s)"
 msgstr "建置(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2615
+#: ../plugins/build-basic-autotools/plugin.c:2635
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2622
+#: ../plugins/build-basic-autotools/plugin.c:2642
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2630
+#: ../plugins/build-basic-autotools/plugin.c:2650
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "編譯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2630
+#: ../plugins/build-basic-autotools/plugin.c:2650
 #, c-format
 msgid "Co_mpile"
 msgstr "編譯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3166
+#: ../plugins/build-basic-autotools/plugin.c:3184
 msgid "Build commands"
 msgstr "建置�令"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3175
+#: ../plugins/build-basic-autotools/plugin.c:3193
 msgid "Build popup commands"
 msgstr "建置å½?å?ºå¼?æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:3557
-#: ../plugins/build-basic-autotools/plugin.c:3565
+#: ../plugins/build-basic-autotools/plugin.c:3582
+#: ../plugins/build-basic-autotools/plugin.c:3590
 msgid "Build Autotools"
 msgstr "建置 Autotools"
 
@@ -1338,7 +1342,7 @@ msgid "General Class Properties"
 msgstr "����屬�"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
-#: ../plugins/file-wizard/file.c:103
+#: ../plugins/file-wizard/file.c:104
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
@@ -1371,7 +1375,7 @@ msgid "Inline the declaration and implementation"
 msgstr "è¡?å?§å®£å??è??實ä½?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
-#: ../plugins/file-wizard/file.c:104
+#: ../plugins/file-wizard/file.c:105
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:17
@@ -1444,7 +1448,7 @@ msgid "Failed to write autogen definition file"
 msgstr "寫å?¥ autogen å®?義æª?æ¡?失æ??"
 
 #: ../plugins/class-gen/plugin.c:98
-#: ../plugins/project-wizard/druid.c:1160
+#: ../plugins/project-wizard/druid.c:1141
 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 å??å¾?ã??"
 
@@ -1460,7 +1464,7 @@ msgstr "å¾?é¡?å??æ?¨æ¸¬"
 
 #: ../plugins/class-gen/window.c:499
 #: ../plugins/class-gen/window.c:510
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
 msgid "Scope"
 msgstr "ç¯?å??"
 
@@ -1481,9 +1485,9 @@ msgstr "é¡?å??"
 #: ../plugins/class-gen/window.c:512
 #: ../plugins/class-gen/window.c:520
 #: ../plugins/class-gen/window.c:534
+#: ../plugins/project-manager/dialogs.c:434
 #: ../plugins/run-program/parameters.c:754
-#: ../plugins/search/search_preferences.c:534
-#: ../plugins/snippets-manager/plugin.c:751
+#: ../plugins/snippets-manager/plugin.c:757
 #: ../plugins/snippets-manager/snippets-browser.c:530
 #: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
@@ -1559,7 +1563,7 @@ msgstr "使�詳細模�"
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
 #: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "Browseâ?¦"
-msgstr "ç??覽..."
+msgstr "ç??覽â?¦"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
 msgid "CVS Options"
@@ -1670,8 +1674,8 @@ msgstr "忽� .cvsrc ��建議�"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
 #: ../plugins/git/anjuta-git.ui.h:57
-#: ../plugins/symbol-db/plugin.c:2055
-#: ../plugins/symbol-db/plugin.c:2097
+#: ../plugins/symbol-db/plugin.c:2116
+#: ../plugins/symbol-db/plugin.c:2158
 msgid "Local"
 msgstr "å??å??"
 
@@ -1691,7 +1695,7 @@ msgstr "模çµ?å??稱ï¼?"
 #: ../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/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:22
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
 msgid "Options"
@@ -1804,7 +1808,7 @@ msgid "CVSROOT"
 msgstr "CVSROOT"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/gbf-am/gbf-am-properties.c:1156
+#: ../plugins/am-project/am-project.c:191
 msgid "Module"
 msgstr "模�"
 
@@ -1836,130 +1840,130 @@ msgstr "CVS æ??令正å?¨å?·è¡? â?? è«?ç­?å??ç?´å?°å®?çµ?æ??ï¼?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
 #: ../plugins/cvs-plugin/cvs-execute.c:233
-#: ../plugins/cvs-plugin/plugin.c:467
 #: ../plugins/cvs-plugin/plugin.c:474
+#: ../plugins/cvs-plugin/plugin.c:481
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:44
-#: ../plugins/cvs-plugin/plugin.c:119
+#: ../plugins/cvs-plugin/plugin.c:46
+#: ../plugins/cvs-plugin/plugin.c:121
 msgid "_CVS"
 msgstr "_CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:52
+#: ../plugins/cvs-plugin/plugin.c:54
 msgid "_Add"
 msgstr "_Add"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:54
+#: ../plugins/cvs-plugin/plugin.c:56
 msgid "Add a new file/directory to the CVS tree"
 msgstr "å? å?¥æ?°æª?æ¡?/ç?®é??è?³ CVS 樹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:60
+#: ../plugins/cvs-plugin/plugin.c:62
 msgid "_Remove"
 msgstr "_Remove"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:62
+#: ../plugins/cvs-plugin/plugin.c:64
 msgid "Remove a file/directory from CVS tree"
 msgstr "å¾? CVS 樹移é?¤æª?æ¡?/ç?®é??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:68
-#: ../plugins/cvs-plugin/plugin.c:127
+#: ../plugins/cvs-plugin/plugin.c:70
+#: ../plugins/cvs-plugin/plugin.c:129
 msgid "_Commit"
 msgstr "_Commit"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:70
-#: ../plugins/cvs-plugin/plugin.c:129
+#: ../plugins/cvs-plugin/plugin.c:72
+#: ../plugins/cvs-plugin/plugin.c:131
 msgid "Commit your changes to the CVS tree"
 msgstr "æ??交æ?¨ç??ä¿®æ?¹è?³ CVS 樹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:76
-#: ../plugins/cvs-plugin/plugin.c:135
+#: ../plugins/cvs-plugin/plugin.c:78
+#: ../plugins/cvs-plugin/plugin.c:137
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "_Update"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:78
-#: ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:80
+#: ../plugins/cvs-plugin/plugin.c:139
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?æ?¨æ?¬æ©?ç??è¤?æ?¬è?? CVS 樹å??æ­¥"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:84
-#: ../plugins/cvs-plugin/plugin.c:143
+#: ../plugins/cvs-plugin/plugin.c:86
+#: ../plugins/cvs-plugin/plugin.c:145
 msgid "_Diff"
 msgstr "_Diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:86
-#: ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:88
+#: ../plugins/cvs-plugin/plugin.c:147
 msgid "Show differences between your local copy and the tree"
 msgstr "顯示æ?¨ç??æ?¬å?°ç«¯è¤?æ?¬è?? CVS 樹ä¹?é??ç??å·®ç?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:92
-#: ../plugins/cvs-plugin/plugin.c:151
+#: ../plugins/cvs-plugin/plugin.c:94
+#: ../plugins/cvs-plugin/plugin.c:153
 msgid "_Show Status"
 msgstr "顯示ç??æ??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:94
-#: ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:96
+#: ../plugins/cvs-plugin/plugin.c:155
 msgid "Show the status of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:100
-#: ../plugins/cvs-plugin/plugin.c:159
+#: ../plugins/cvs-plugin/plugin.c:102
+#: ../plugins/cvs-plugin/plugin.c:161
 msgid "_Show Log"
 msgstr "顯示ç´?é??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:102
-#: ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:104
+#: ../plugins/cvs-plugin/plugin.c:163
 msgid "Show the log of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç´?é??æª?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:108
+#: ../plugins/cvs-plugin/plugin.c:110
 msgid "_Import Tree"
 msgstr "��樹(_I)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:110
+#: ../plugins/cvs-plugin/plugin.c:112
 msgid "Import a new source tree to CVS"
 msgstr "�����樹� CVS"
 
-#: ../plugins/cvs-plugin/plugin.c:360
+#: ../plugins/cvs-plugin/plugin.c:362
 msgid "CVS operations"
 msgstr "CVS æ??ä½?"
 
-#: ../plugins/cvs-plugin/plugin.c:366
+#: ../plugins/cvs-plugin/plugin.c:368
 msgid "CVS popup operations"
 msgstr "CVS å½?å?ºå¼?æ??ä½?"
 
@@ -2132,7 +2136,7 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:341
+#: ../plugins/project-wizard/property.c:336
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2207,7 +2211,7 @@ msgstr "å??æ??ç?®å??ä½?ç½®ç??中æ?·é»?ç??æ³?"
 #. Stock icon, if any
 #: ../plugins/debug-manager/breakpoints.c:1831
 msgid "Add Breakpointâ?¦"
-msgstr "��中��..."
+msgstr "��中���"
 
 #. Display label
 #. short-cut
@@ -2327,19 +2331,18 @@ msgstr "中æ?·é»?æ??ä½?"
 
 #. create goto menu_item.
 #: ../plugins/debug-manager/data_view.c:392
-#: ../plugins/debug-manager/sparse_view.c:497
+#: ../plugins/debug-manager/sparse_view.c:501
 msgid "_Go to address"
 msgstr "移è?³ä½?å??(_G)"
 
 #: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/gbf-am/gbf-am-properties.c:893
 #: ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "è®?æ?¸"
 
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/debug-manager/registers.c:469
-#: ../plugins/gbf-am/gbf-am-properties.c:903
+#: ../plugins/project-manager/dialogs.c:441
 #: ../plugins/run-program/parameters.c:763
 #: ../plugins/tools/editor.c:474
 msgid "Value"
@@ -2357,7 +2360,7 @@ msgstr "��"
 
 #: ../plugins/debug-manager/info.c:127
 msgid "Lines"
-msgstr "è¡?"
+msgstr "å??"
 
 #. This is the list of local variables.
 #: ../plugins/debug-manager/locals.c:102
@@ -2456,7 +2459,7 @@ msgstr "å??å??é?¤é?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
 
 #: ../plugins/debug-manager/plugin.c:937
 msgid "_Debug Processâ?¦"
-msgstr "����(_D)..."
+msgstr "����(_D)�"
 
 #: ../plugins/debug-manager/plugin.c:939
 msgid "Start debugger and attach to a running program"
@@ -2527,7 +2530,7 @@ msgstr "���核(_K)"
 
 #: ../plugins/debug-manager/plugin.c:1007
 msgid "Display the contents of kernel 'struct user' for current child"
-msgstr "顯示ç?®å??é?²ç¨?ç?? CPU æ?«å­?å?¨æ?¸å?¼ï¼?ç¨?å¼?å ?ç??ï¼?è³?æ??å??ç??ä½?å??å??大å°?ç­?ç­?..."
+msgstr "顯示ç?®å??é?²ç¨?ç?? CPU æ?«å­?å?¨æ?¸å?¼ï¼?ç¨?å¼?å ?ç??ï¼?è³?æ??å??ç??ä½?å??å??大å°?ç­?ç­?â?¦"
 
 #: ../plugins/debug-manager/plugin.c:1021
 #: ../plugins/debug-manager/plugin.c:1137
@@ -2628,6 +2631,10 @@ msgstr "é?¤é?¯å·¥å?·æ??ä½?"
 msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr "æ?¾ä¸?å?°ä»»ä½?é?¤é?¯å·¥å?·å¤?æ??ç¨?å¼?å?¯ä»¥æ?¯æ?´ %s MIME é¡?å??ç??ç?®æ¨?"
 
+#: ../plugins/debug-manager/queue.c:530
+msgid "Please select a plugin to activate"
+msgstr "è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?"
+
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
 msgstr "æ?«å­?å?¨"
@@ -2693,21 +2700,21 @@ msgstr "å?§æ ¸è¨?è??"
 msgid "Signal operations"
 msgstr "è¨?è??æ??ä½?"
 
-#: ../plugins/debug-manager/sparse_view.c:1206
+#: ../plugins/debug-manager/sparse_view.c:1132
 msgid "Show Line Numbers"
-msgstr "顯示è¡?è??"
+msgstr "顯示å??è??"
 
-#: ../plugins/debug-manager/sparse_view.c:1207
+#: ../plugins/debug-manager/sparse_view.c:1133
 msgid "Whether to display line numbers"
-msgstr "æ?¯å?¦é¡¯ç¤ºè¡?è??"
+msgstr "æ?¯å?¦é¡¯ç¤ºå??è??"
 
-#: ../plugins/debug-manager/sparse_view.c:1214
+#: ../plugins/debug-manager/sparse_view.c:1140
 msgid "Show Line Markers"
-msgstr "顯示è¡?è??å??"
+msgstr "顯示å??è??å??"
 
-#: ../plugins/debug-manager/sparse_view.c:1215
+#: ../plugins/debug-manager/sparse_view.c:1141
 msgid "Whether to display line marker pixbufs"
-msgstr "æ?¯å?¦é¡¯ç¤ºè¡¨ç¤ºæ¯?è¡?é??å§?ç?? pixbuf æ¨?è¨?"
+msgstr "æ?¯å?¦é¡¯ç¤ºè¡¨ç¤ºæ¯?å??é??å§?ç?? pixbuf æ¨?è¨?"
 
 #. Action name
 #. Stock icon, if any
@@ -2738,14 +2745,14 @@ msgstr "ç·¨è??"
 #: ../plugins/debug-manager/threads.c:451
 #: ../plugins/gdb/preferences.c:363
 #: ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:621
+#: ../src/anjuta-app.c:623
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "��"
 
 #: ../plugins/debug-manager/stack_trace.c:675
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:945
+#: ../plugins/document-manager/plugin.c:951
 msgid "Line"
 msgstr "è¡?"
 
@@ -2778,31 +2785,31 @@ msgstr "æ??é??"
 msgid "Command"
 msgstr "æ??令"
 
-#: ../plugins/debug-manager/start.c:628
+#: ../plugins/debug-manager/start.c:629
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "ç?¡æ³?å?·è¡?ï¼?%sã??"
 
-#: ../plugins/debug-manager/start.c:642
+#: ../plugins/debug-manager/start.c:643
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼?%s\n"
 
-#: ../plugins/debug-manager/start.c:966
+#: ../plugins/debug-manager/start.c:969
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "ç?¡æ³?å?¨é??å?? %sã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:976
+#: ../plugins/debug-manager/start.c:979
 #, c-format
 msgid "Unable to detect MIME type of %s. Debugger cannot start."
 msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 
-#: ../plugins/debug-manager/start.c:1337
+#: ../plugins/debug-manager/start.c:1340
 msgid "Path"
 msgstr "路�"
 
-#: ../plugins/debug-manager/start.c:1386
+#: ../plugins/debug-manager/start.c:1389
 #: ../plugins/gdb/debugger.c:1929
 msgid ""
 "The program is running.\n"
@@ -2885,9 +2892,9 @@ msgid "Search Help:"
 msgstr "æ??å°?說æ??ï¼?"
 
 #: ../plugins/devhelp/plugin.c:223
-#: ../plugins/document-manager/plugin.c:241
-#: ../plugins/message-view/plugin.c:76
-#: ../plugins/symbol-db/plugin.c:311
+#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/message-view/plugin.c:77
+#: ../plugins/symbol-db/plugin.c:313
 msgid "_Go to"
 msgstr "移�(_G)"
 
@@ -2921,7 +2928,7 @@ msgstr "æ±?å?©æ??ä½?"
 
 #: ../plugins/devhelp/plugin.c:345
 #: ../plugins/devhelp/plugin.c:462
-#: ../src/anjuta-app.c:638
+#: ../src/anjuta-app.c:640
 msgid "Help"
 msgstr "æ±?å?©"
 
@@ -2930,13 +2937,13 @@ msgid "Contents"
 msgstr "�容"
 
 #: ../plugins/devhelp/plugin.c:362
-#: ../plugins/search/search-replace.c:1041
-#: ../plugins/search/search-replace.c:1717
-#: ../plugins/search/search-replace.c:1724
-#: ../plugins/search/search-replace.c:1736
-#: ../plugins/search/search-replace.c:2065
-#: ../plugins/symbol-db/plugin.c:2065
-#: ../plugins/symbol-db/plugin.c:2117
+#: ../plugins/search/search-replace.c:1034
+#: ../plugins/search/search-replace.c:1700
+#: ../plugins/search/search-replace.c:1707
+#: ../plugins/search/search-replace.c:1719
+#: ../plugins/search/search-replace.c:2037
+#: ../plugins/symbol-db/plugin.c:2126
+#: ../plugins/symbol-db/plugin.c:2178
 msgid "Search"
 msgstr "æ??å°?"
 
@@ -2968,7 +2975,7 @@ msgstr "移��籤"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:331
 #: ../plugins/document-manager/anjuta-bookmarks.c:404
-#: ../plugins/document-manager/plugin.c:420
+#: ../plugins/document-manager/plugin.c:422
 msgid "Bookmarks"
 msgstr "�籤"
 
@@ -2977,8 +2984,8 @@ msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:20
-#: ../plugins/gtodo/callback.c:101
+#: ../plugins/gtodo/callback.c:23
+#: ../plugins/gtodo/callback.c:106
 #: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "移�"
@@ -3000,7 +3007,7 @@ msgid "Open file"
 msgstr "é??å??æª?æ¡?"
 
 #: ../plugins/document-manager/anjuta-docman.c:641
-#: ../plugins/message-view/message-view.c:97
+#: ../plugins/message-view/message-view.c:100
 msgid "Save file as"
 msgstr "�����"
 
@@ -3052,7 +3059,7 @@ msgid "Position:"
 msgstr "�置�"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Right"
 msgstr "å?³"
 
@@ -3077,180 +3084,180 @@ msgid "Sorted in opening order"
 msgstr "以é??å??é ?åº?æ??åº?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Top"
 msgstr "�"
 
-#: ../plugins/document-manager/plugin.c:149
+#: ../plugins/document-manager/plugin.c:151
 msgid "_Save"
 msgstr "����(_S)"
 
-#: ../plugins/document-manager/plugin.c:150
+#: ../plugins/document-manager/plugin.c:152
 msgid "Save current file"
 msgstr "å?²å­?ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:151
+#: ../plugins/document-manager/plugin.c:153
 msgid "Save _Asâ?¦"
 msgstr "���(_A)�"
 
-#: ../plugins/document-manager/plugin.c:152
+#: ../plugins/document-manager/plugin.c:154
 msgid "Save the current file with a different name"
 msgstr "ç?¨å?¦ä¸?å??稱å?²å­?ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:154
+#: ../plugins/document-manager/plugin.c:156
 msgid "Save A_ll"
 msgstr "����(_L)"
 
-#: ../plugins/document-manager/plugin.c:155
+#: ../plugins/document-manager/plugin.c:157
 msgid "Save all currently open files, except new files"
 msgstr "å°?å?¨é?¨ç?®å??é??å??ç??æª?æ¡?å?²å­?ï¼?æ?°å¢?ç??æª?æ¡?é?¤å¤?"
 
-#: ../plugins/document-manager/plugin.c:157
+#: ../plugins/document-manager/plugin.c:159
 msgid "_Close File"
 msgstr "é??é??æª?æ¡?(_C)"
 
-#: ../plugins/document-manager/plugin.c:158
+#: ../plugins/document-manager/plugin.c:160
 msgid "Close current file"
 msgstr "é??é??ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:160
+#: ../plugins/document-manager/plugin.c:162
 msgid "Close All"
 msgstr "å?¨é?¨é??é??"
 
-#: ../plugins/document-manager/plugin.c:161
+#: ../plugins/document-manager/plugin.c:163
 msgid "Close all files"
 msgstr "é??é??å?¨é?¨æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:163
+#: ../plugins/document-manager/plugin.c:165
 msgid "Close Other"
 msgstr "é??é??å?¶ä»?ç??"
 
-#: ../plugins/document-manager/plugin.c:164
+#: ../plugins/document-manager/plugin.c:166
 msgid "Close other documents"
 msgstr "é??é??å?¶ä»?ç??æ??件"
 
-#: ../plugins/document-manager/plugin.c:166
+#: ../plugins/document-manager/plugin.c:168
 msgid "Reload F_ile"
 msgstr "é??æ?°è¼?å?¥æª?æ¡?(_I)"
 
-#: ../plugins/document-manager/plugin.c:167
+#: ../plugins/document-manager/plugin.c:169
 msgid "Reload current file"
 msgstr "é??æ?°è¼?å?¥ç?®å??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:169
+#: ../plugins/document-manager/plugin.c:171
 msgid "Recent _Files"
-msgstr "æ??è¿?é??å??æª?æ¡? (_F)"
+msgstr "æ??è¿?é??å??æª?æ¡?(_F)"
 
-#: ../plugins/document-manager/plugin.c:173
+#: ../plugins/document-manager/plugin.c:175
 msgid "_Printâ?¦"
 msgstr "å??å?°(_P)â?¦"
 
-#: ../plugins/document-manager/plugin.c:174
+#: ../plugins/document-manager/plugin.c:176
 msgid "Print the current file"
 msgstr "å??å?°ç?®å??æª?æ¡?ç??å?§å®¹"
 
-#: ../plugins/document-manager/plugin.c:181
+#: ../plugins/document-manager/plugin.c:183
 msgid "_Print Preview"
 msgstr "é ?覽å??å?°(_P)"
 
-#: ../plugins/document-manager/plugin.c:182
+#: ../plugins/document-manager/plugin.c:184
 msgid "Preview the current file in print format"
 msgstr "以å??å?°å¾?ç??æ ¼å¼?é ?覽ç?®å??ç??æª?æ¡?"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:189
 msgid "_Transform"
 msgstr "è½?æ??(_T)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:188
+#: ../plugins/document-manager/plugin.c:190
 msgid "_Make Selection Uppercase"
-msgstr "é?¸å®?ç¯?å??ç?ºå¤§å¯« (_M)"
+msgstr "é?¸å®?ç¯?å??ç?ºå¤§å¯«(_M)"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:191
 msgid "Make the selected text uppercase"
 msgstr "å°?é?¸å®?ç¯?å??å?§ç??å­?æ¯?è½?ç?ºå¤§å¯«å­?æ¯?"
 
-#: ../plugins/document-manager/plugin.c:191
+#: ../plugins/document-manager/plugin.c:193
 msgid "Make Selection Lowercase"
 msgstr "é?¸å®?ç¯?å??ç?ºå°?寫"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:194
 msgid "Make the selected text lowercase"
 msgstr "å°?é?¸å®?ç¯?å??å?§ç??å­?æ¯?è½?ç?ºå°?寫å­?æ¯?"
 
-#: ../plugins/document-manager/plugin.c:194
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert EOL to CRLF"
 msgstr "è½?æ?? EOL å­?å??æ?? CRLF"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:197
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?º DOS EOL (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:197
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert EOL to LF"
 msgstr "è½?æ?? EOL ç?º LF"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:200
 msgid "Convert End Of Line characters to Unix EOL (LF)"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?º Unix EOL (LF)"
 
-#: ../plugins/document-manager/plugin.c:200
+#: ../plugins/document-manager/plugin.c:202
 msgid "Convert EOL to CR"
 msgstr "è½?æ?? EOL ç?º CR"
 
-#: ../plugins/document-manager/plugin.c:201
+#: ../plugins/document-manager/plugin.c:203
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?º Mac OS EOL (CR)"
 
-#: ../plugins/document-manager/plugin.c:203
+#: ../plugins/document-manager/plugin.c:205
 msgid "Convert EOL to Majority EOL"
 msgstr "è½?æ?? EOL ç?ºå¤?æ?¸ EOL"
 
-#: ../plugins/document-manager/plugin.c:204
+#: ../plugins/document-manager/plugin.c:206
 msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr "å°?å?¥å­?ç??çµ?æ??å­?å??è½?æ??ç?ºè©²æª?æ¡?中å?ºç?¾æ¬¡æ?¸æ??å¤?ç?? EOL å??å¼?"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:211
 msgid "_Select"
 msgstr "é?¸å??(_S)"
 
-#: ../plugins/document-manager/plugin.c:211
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select _All"
 msgstr "å?¨é?¨é?¸å??(_A)"
 
-#: ../plugins/document-manager/plugin.c:212
+#: ../plugins/document-manager/plugin.c:214
 msgid "Select all text in the editor"
 msgstr "é?¸å??æ??件å?§ç??å?¨é?¨æ??å­?"
 
-#: ../plugins/document-manager/plugin.c:214
+#: ../plugins/document-manager/plugin.c:216
 msgid "Select _Code Block"
 msgstr "é?¸æ??å??å§?碼å??å¡?(_C)"
 
-#: ../plugins/document-manager/plugin.c:215
+#: ../plugins/document-manager/plugin.c:217
 msgid "Select the current code block"
 msgstr "é?¸å??ç?®å??å?½å¼?å?§ç??å??å§?碼"
 
-#: ../plugins/document-manager/plugin.c:220
+#: ../plugins/document-manager/plugin.c:222
 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:223
+#: ../plugins/document-manager/plugin.c:225
 msgid "_Block Comment/Uncomment"
 msgstr "å??å¡?å? ä¸?/å??æ¶?å??註(_B)"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:226
 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:228
+#: ../plugins/document-manager/plugin.c:230
 msgid "Bo_x Comment/Uncomment"
 msgstr "æ?¹å¡?å? ä¸?/å??æ¶?å??註(_X)"
 
-#: ../plugins/document-manager/plugin.c:229
+#: ../plugins/document-manager/plugin.c:231
 msgid "Box comment the selected text"
 msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?æ?¹å¡?註解"
 
@@ -3258,426 +3265,426 @@ 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:235
+#: ../plugins/document-manager/plugin.c:237
 msgid "_Stream Comment/Uncomment"
 msgstr "å??å¡?å? ä¸?/å??æ¶?å??註(_S)"
 
-#: ../plugins/document-manager/plugin.c:236
+#: ../plugins/document-manager/plugin.c:238
 msgid "Stream comment the selected text"
 msgstr "å°?é?¸å??ç??æ??å­?å? ä¸?å??å¡?註解"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:242
+#: ../plugins/document-manager/plugin.c:244
 msgid "_Line Numberâ?¦"
-msgstr "è¡?è??(_L)â?¦"
+msgstr "å??è??(_L)â?¦"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:245
 msgid "Go to a particular line in the editor"
-msgstr "å??å¾?æ??件å?§ç??æ??å®?è¡?è??"
+msgstr "å??å¾?æ??件å?§ç??æ??å®?å??è??"
 
-#: ../plugins/document-manager/plugin.c:245
+#: ../plugins/document-manager/plugin.c:247
 msgid "Matching _Brace"
-msgstr "å??å¾?å°?æ??æ?¬è?? (_B)"
+msgstr "å??å¾?å°?æ??æ?¬è??(_B)"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:248
 msgid "Go to the matching brace in the editor"
 msgstr "å¾?ç?®å??æ?¬è??å??å¾?å?¦ä¸?é?¢å°?æ??ç??æ?¬è??"
 
-#: ../plugins/document-manager/plugin.c:248
+#: ../plugins/document-manager/plugin.c:250
 msgid "_Start of Block"
 msgstr "å??å¡?é??é ­(_S)"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:251
 msgid "Go to the start of the current block"
 msgstr "å??å¾?ç?®å??å??å¡?ç??é??å§?ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:251
+#: ../plugins/document-manager/plugin.c:253
 msgid "_End of Block"
 msgstr "å??å¡?çµ?å°¾(_E)"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:254
 msgid "Go to the end of the current block"
 msgstr "å??å¾?ç?®å??å??å¡?ç??çµ?æ??ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:254
+#: ../plugins/document-manager/plugin.c:256
 msgid "Previous _History"
 msgstr "ä¸?ä¸?å??æ­·å?²ç´?é??(_P)"
 
-#: ../plugins/document-manager/plugin.c:255
+#: ../plugins/document-manager/plugin.c:257
 msgid "Go to previous history"
 msgstr "移è?³ä¸?ä¸?å??æ­·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:257
+#: ../plugins/document-manager/plugin.c:259
 msgid "Next Histor_y"
 msgstr "ä¸?ä¸?å??æ­·å?²ç´?é??(_Y)"
 
-#: ../plugins/document-manager/plugin.c:258
+#: ../plugins/document-manager/plugin.c:260
 msgid "Go to next history"
 msgstr "移è?³ä¸?ä¸?å??æ­·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:265
 #: ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../plugins/document-manager/plugin.c:264
+#: ../plugins/document-manager/plugin.c:266
 msgid "_Quick Search"
 msgstr "å¿«é??æ??å°?(_Q)"
 
-#: ../plugins/document-manager/plugin.c:265
+#: ../plugins/document-manager/plugin.c:267
 msgid "Quick editor embedded search"
 msgstr "å¿«é??ç??編輯å?¨å?§åµ?æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:267
+#: ../plugins/document-manager/plugin.c:269
 msgid "Quick _ReSearch"
 msgstr "å¿«é??é??æ?°æ??å°?(_R)"
 
-#: ../plugins/document-manager/plugin.c:268
+#: ../plugins/document-manager/plugin.c:270
 msgid "Repeat quick search"
 msgstr "é??è¤?å¿«é??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:273
-#: ../plugins/gtodo/interface.c:158
+#: ../plugins/document-manager/plugin.c:275
+#: ../plugins/gtodo/interface.c:141
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1876
-#: ../plugins/language-support-python/plugin.c:1176
+#: ../plugins/language-support-cpp-java/plugin.c:1914
+#: ../plugins/language-support-python/plugin.c:1179
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:274
+#: ../plugins/document-manager/plugin.c:276
 msgid "_Editor"
 msgstr "編輯��(_E)"
 
-#: ../plugins/document-manager/plugin.c:281
+#: ../plugins/document-manager/plugin.c:283
 msgid "_Add Editor View"
 msgstr "��編輯�檢�(_A)"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:284
 msgid "Add one more view of current document"
 msgstr "ç?ºç?®å??æ??件å??å¢?å? ä¸?å??檢è¦?ç?«é?¢"
 
-#: ../plugins/document-manager/plugin.c:284
+#: ../plugins/document-manager/plugin.c:286
 msgid "_Remove Editor View"
 msgstr "移�編輯�檢�(_R)"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:287
 msgid "Remove current view of the document"
 msgstr "移é?¤æ­¤æ??件ç??ç?¶å??檢è¦?ç?«é?¢"
 
-#: ../plugins/document-manager/plugin.c:287
+#: ../plugins/document-manager/plugin.c:289
 msgid "U_ndo"
 msgstr "復å??(_N)"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:290
 msgid "Undo the last action"
 msgstr "å??æ¶?å??å®?æ??ç??å??ä½?"
 
-#: ../plugins/document-manager/plugin.c:290
+#: ../plugins/document-manager/plugin.c:292
 msgid "_Redo"
 msgstr "é??è¤?(_R)"
 
-#: ../plugins/document-manager/plugin.c:291
+#: ../plugins/document-manager/plugin.c:293
 msgid "Redo the last undone action"
 msgstr "é??è¤?å??å??æ¶?ç??å??ä½?"
 
-#: ../plugins/document-manager/plugin.c:293
+#: ../plugins/document-manager/plugin.c:295
 msgid "C_ut"
 msgstr "��(_U)"
 
-#: ../plugins/document-manager/plugin.c:294
+#: ../plugins/document-manager/plugin.c:296
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "å?ªä¸?編輯å?¨ä¸­é?¸å®?ç??æ??å­?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:296
-#: ../plugins/terminal/terminal.c:616
+#: ../plugins/document-manager/plugin.c:298
+#: ../plugins/terminal/terminal.c:561
 msgid "_Copy"
 msgstr "�製(_C)"
 
-#: ../plugins/document-manager/plugin.c:297
+#: ../plugins/document-manager/plugin.c:299
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å­?è¤?製å?°å?ªè²¼ç°¿"
 
-#: ../plugins/document-manager/plugin.c:299
-#: ../plugins/terminal/terminal.c:624
+#: ../plugins/document-manager/plugin.c:301
+#: ../plugins/terminal/terminal.c:569
 msgid "_Paste"
 msgstr "貼�(_P)"
 
-#: ../plugins/document-manager/plugin.c:300
+#: ../plugins/document-manager/plugin.c:302
 msgid "Paste the content of clipboard at the current position"
 msgstr "å°?å?ªè²¼ç°¿ä¸?ç??æ??å­?è¤?製å?°ç?®å??é??æ¨?ç??ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:308
+#: ../plugins/document-manager/plugin.c:310
 msgid "_Clear"
 msgstr "��(_C)"
 
-#: ../plugins/document-manager/plugin.c:309
+#: ../plugins/document-manager/plugin.c:311
 msgid "Delete the selected text from the editor"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å­?å?ªé?¤"
 
-#: ../plugins/document-manager/plugin.c:312
+#: ../plugins/document-manager/plugin.c:314
 msgid "_Auto-Complete"
 msgstr "è?ªå??è£?é½?(_A)"
 
-#: ../plugins/document-manager/plugin.c:313
+#: ../plugins/document-manager/plugin.c:315
 msgid "Auto-complete the current word"
 msgstr "è?ªå??è£?é½?ç?®å??ç??å­?"
 
-#: ../plugins/document-manager/plugin.c:318
+#: ../plugins/document-manager/plugin.c:320
 msgid "_Line Number Margin"
-msgstr "è¡?è??å??(_L)"
+msgstr "å??è??å??(_L)"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:321
 msgid "Show/Hide line numbers"
-msgstr "顯示 / é?±è??è¡?è??å??"
+msgstr "顯示 / é?±è??å??è??å??"
 
-#: ../plugins/document-manager/plugin.c:321
+#: ../plugins/document-manager/plugin.c:323
 msgid "_Marker Margin"
 msgstr "æ¨?è??å??(_M)"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:324
 msgid "Show/Hide marker margin"
 msgstr "顯示/é?±è??æ¨?è??å??"
 
-#: ../plugins/document-manager/plugin.c:324
+#: ../plugins/document-manager/plugin.c:326
 msgid "_Code Fold Margin"
 msgstr "ç¨?å¼?碼å±?ç??å??(_C)"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:327
 msgid "Show/Hide code fold margin"
 msgstr "顯示 / é?±è??å?½å¼?å±?ç??å??"
 
-#: ../plugins/document-manager/plugin.c:327
+#: ../plugins/document-manager/plugin.c:329
 msgid "_Indentation Guides"
 msgstr "縮æ??æ??å¼?(_I)"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:330
 msgid "Show/Hide indentation guides"
 msgstr "顯示 / é?±è??縮æ??æ??å¼?"
 
-#: ../plugins/document-manager/plugin.c:330
+#: ../plugins/document-manager/plugin.c:332
 msgid "_White Space"
 msgstr "空ç?½å­?å??(_W)"
 
-#: ../plugins/document-manager/plugin.c:331
+#: ../plugins/document-manager/plugin.c:333
 msgid "Show/Hide white spaces"
 msgstr "顯示 / é?±è??空ç?½å­?å??"
 
-#: ../plugins/document-manager/plugin.c:333
+#: ../plugins/document-manager/plugin.c:335
 msgid "_Line End Characters"
 msgstr "å?¥å­?çµ?æ??å­?å??(_L)"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:336
 msgid "Show/Hide line end characters"
 msgstr "顯示 / é?±è??å?¥å­?çµ?æ??å­?å??"
 
-#: ../plugins/document-manager/plugin.c:336
+#: ../plugins/document-manager/plugin.c:338
 msgid "Line _Wrapping"
-msgstr "æ??è¡?(_W)"
+msgstr "æ??å??(_W)"
 
-#: ../plugins/document-manager/plugin.c:337
+#: ../plugins/document-manager/plugin.c:339
 msgid "Enable/disable line wrapping"
-msgstr "å??ç?¨/å??ç?¨æ??è¡?"
+msgstr "å??ç?¨/å??ç?¨æ??å??"
 
-#: ../plugins/document-manager/plugin.c:342
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom In"
 msgstr "æ??è¿?"
 
-#: ../plugins/document-manager/plugin.c:343
+#: ../plugins/document-manager/plugin.c:345
 msgid "Zoom in: Increase font size"
 msgstr "æ??è¿?ï¼?å¢?å? å­?å??大å°?"
 
-#: ../plugins/document-manager/plugin.c:345
+#: ../plugins/document-manager/plugin.c:347
 msgid "Zoom Out"
 msgstr "æ??é? "
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:348
 msgid "Zoom out: Decrease font size"
 msgstr "æ??é? ï¼?æ¸?å°?å­?å??大å°?"
 
-#: ../plugins/document-manager/plugin.c:351
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Highlight Mode"
 msgstr "���示模�(_H)"
 
-#: ../plugins/document-manager/plugin.c:355
+#: ../plugins/document-manager/plugin.c:357
 msgid "_Close All Folds"
 msgstr "å?½å¼?å?¨é?¨æ?ºç??(_C)"
 
-#: ../plugins/document-manager/plugin.c:356
+#: ../plugins/document-manager/plugin.c:358
 msgid "Close all code folds in the editor"
 msgstr "å°?å?¨é?¨å?½å¼?ç??å??å§?碼æ?ºç??"
 
-#: ../plugins/document-manager/plugin.c:358
+#: ../plugins/document-manager/plugin.c:360
 msgid "_Open All Folds"
 msgstr "å?½å¼?å?¨é?¨å±?é??(_O)"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:361
 msgid "Open all code folds in the editor"
 msgstr "å°?å?¨é?¨å?½å¼?ç??å??å§?碼å±?é??"
 
-#: ../plugins/document-manager/plugin.c:361
+#: ../plugins/document-manager/plugin.c:363
 msgid "_Toggle Current Fold"
 msgstr "å??æ??ç?®å??æ??ç??ç??æ??(_T)"
 
-#: ../plugins/document-manager/plugin.c:362
+#: ../plugins/document-manager/plugin.c:364
 msgid "Toggle current code fold in the editor"
 msgstr "å??æ??ç?®å??編輯å?¨ä¸­ç¨?å¼?碼ç??æ?ºç??ç??æ??"
 
-#: ../plugins/document-manager/plugin.c:367
+#: ../plugins/document-manager/plugin.c:369
 msgid "_Documents"
 msgstr "æ??件(_D)"
 
-#: ../plugins/document-manager/plugin.c:368
+#: ../plugins/document-manager/plugin.c:370
 msgid "Previous Document"
 msgstr "ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:371
 msgid "Switch to previous document"
 msgstr "å??æ??å?°ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:371
+#: ../plugins/document-manager/plugin.c:373
 msgid "Next Document"
 msgstr "ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:372
+#: ../plugins/document-manager/plugin.c:374
 msgid "Switch to next document"
 msgstr "å??æ??å?°ä¸?ä¸?å??æ??件"
 
-#: ../plugins/document-manager/plugin.c:377
+#: ../plugins/document-manager/plugin.c:379
 msgid "Bookmar_k"
 msgstr "�籤(_K)"
 
-#: ../plugins/document-manager/plugin.c:378
+#: ../plugins/document-manager/plugin.c:380
 msgid "_Add Bookmark"
 msgstr "���籤(_A)"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:381
 msgid "Add a bookmark at the current line position"
 msgstr "å°?ç?®å??æ??å?¨è¡?ç??ä½?ç½®å? å?¥æ?¸ç±¤"
 
-#: ../plugins/document-manager/plugin.c:381
+#: ../plugins/document-manager/plugin.c:383
 msgid "_Previous Bookmark"
 msgstr "ä¸?ä¸?å??æ?¸ç±¤(_P)"
 
-#: ../plugins/document-manager/plugin.c:382
+#: ../plugins/document-manager/plugin.c:384
 msgid "Jump to the previous bookmark in the file"
 msgstr "è·³è?³æª?æ¡?中å??ä¸?å??æ?¸ç±¤"
 
-#: ../plugins/document-manager/plugin.c:384
+#: ../plugins/document-manager/plugin.c:386
 msgid "_Next Bookmark"
 msgstr "ä¸?ä¸?å??æ?¸ç±¤(_N)"
 
-#: ../plugins/document-manager/plugin.c:385
+#: ../plugins/document-manager/plugin.c:387
 msgid "Jump to the next bookmark in the file"
 msgstr "è·³è?³æª?æ¡?中ä¸?ä¸?å??æ?¸ç±¤"
 
-#: ../plugins/document-manager/plugin.c:387
+#: ../plugins/document-manager/plugin.c:389
 msgid "_Clear All Bookmarks"
 msgstr "æ¸?é?¤æ??æ??æ?¸ç±¤(_C)"
 
-#: ../plugins/document-manager/plugin.c:388
+#: ../plugins/document-manager/plugin.c:390
 msgid "Clear bookmarks"
 msgstr "���籤"
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:409
 msgid "Editor file operations"
 msgstr "編輯å?¨æª?æ¡?æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor print operations"
 msgstr "編輯å?¨å??å?°æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:409
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor text transformation"
 msgstr "編輯å?¨æ??å­?è½?æ??"
 
-#: ../plugins/document-manager/plugin.c:410
+#: ../plugins/document-manager/plugin.c:412
 msgid "Editor text selection"
 msgstr "編輯å?¨æ??å­?é?¸å??"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:412
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor code commenting"
 msgstr "編輯å??å§?碼å??註"
 
-#: ../plugins/document-manager/plugin.c:413
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor navigations"
 msgstr "編輯��覽"
 
-#: ../plugins/document-manager/plugin.c:414
+#: ../plugins/document-manager/plugin.c:416
 msgid "Editor edit operations"
 msgstr "編輯å?¨ç·¨è¼¯æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:417
 msgid "Editor zoom operations"
 msgstr "編輯å?¨ç¸®æ?¾æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:416
+#: ../plugins/document-manager/plugin.c:418
 msgid "Editor syntax highlighting styles"
 msgstr "編輯����示風格"
 
-#: ../plugins/document-manager/plugin.c:417
+#: ../plugins/document-manager/plugin.c:419
 msgid "Editor text formating"
 msgstr "編輯å?¨æ??å­?æ ¼å¼?"
 
-#: ../plugins/document-manager/plugin.c:418
+#: ../plugins/document-manager/plugin.c:420
 msgid "Simple searching"
 msgstr "ç°¡æ??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:419
-#: ../plugins/document-manager/plugin.c:1736
-#: ../plugins/document-manager/plugin.c:2153
-#: ../plugins/document-manager/plugin.c:2163
+#: ../plugins/document-manager/plugin.c:421
+#: ../plugins/document-manager/plugin.c:1750
+#: ../plugins/document-manager/plugin.c:2172
+#: ../plugins/document-manager/plugin.c:2181
 msgid "Documents"
 msgstr "æ??件"
 
-#: ../plugins/document-manager/plugin.c:424
+#: ../plugins/document-manager/plugin.c:426
 msgid "Editor view settings"
 msgstr "設�編輯�檢�"
 
-#: ../plugins/document-manager/plugin.c:609
+#: ../plugins/document-manager/plugin.c:615
 msgid "Reload"
 msgstr "é??æ?°è¼?å?¥"
 
-#: ../plugins/document-manager/plugin.c:615
+#: ../plugins/document-manager/plugin.c:621
 msgid "Go to"
 msgstr "移�"
 
-#: ../plugins/document-manager/plugin.c:930
+#: ../plugins/document-manager/plugin.c:936
 msgid "OVR"
 msgstr "�寫"
 
-#: ../plugins/document-manager/plugin.c:934
+#: ../plugins/document-manager/plugin.c:940
 msgid "INS"
 msgstr "æ??å?¥"
 
-#: ../plugins/document-manager/plugin.c:940
-#: ../plugins/document-manager/plugin.c:943
+#: ../plugins/document-manager/plugin.c:946
+#: ../plugins/document-manager/plugin.c:949
 msgid "Zoom"
 msgstr "æ??é? "
 
-#: ../plugins/document-manager/plugin.c:946
+#: ../plugins/document-manager/plugin.c:952
 msgid "Col"
 msgstr "�"
 
-#: ../plugins/document-manager/plugin.c:947
+#: ../plugins/document-manager/plugin.c:953
 msgid "Mode"
 msgstr "模�"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1027
+#: ../plugins/document-manager/plugin.c:1033
 msgid "Automatic"
 msgstr "è?ªå??"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1560
+#: ../plugins/document-manager/plugin.c:1592
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå??å?²å­? %s 失æ??"
 
-#: ../plugins/document-manager/plugin.c:1574
+#: ../plugins/document-manager/plugin.c:1606
 msgid "Autosave completed"
 msgstr "è?ªå??å?²å­?å®?ç?¢"
 
@@ -3692,7 +3699,7 @@ msgid "Search for \"%s\" reached the end and was continued at the top but no new
 msgstr "æ??å°?ã??%sã??å·²é??çµ?尾並已å¾?é ­é??å§?ï¼?ä½?å·²æ?¾ä¸?å?°ç¬¦å??é ?ç?®ã??"
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match case"
 msgstr "å??å??大å°?寫"
 
@@ -3931,9 +3938,9 @@ msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? <b>%s</b> ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/file-loader/plugin.c:1441
-#: ../plugins/project-import/plugin.c:205
-msgid "Open With"
-msgstr "以此é??å??"
+#| msgid "Open With"
+msgid "<b>Open With</b>"
+msgstr "<b>以此é??å??</b>"
 
 #: ../plugins/file-manager/file-manager.ui.h:1
 msgid "Choose Directory to show if no project is open"
@@ -3960,8 +3967,8 @@ msgid "Filter"
 msgstr "é??濾æ¢?件"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2060
-#: ../plugins/symbol-db/plugin.c:2109
+#: ../plugins/symbol-db/plugin.c:2121
+#: ../plugins/symbol-db/plugin.c:2170
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å??"
@@ -3972,7 +3979,7 @@ msgstr "å¦?æ??æ²?æ??é??å??å°?æ¡?æ??ç??æ ¹ç?®é??ï¼?"
 
 #: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
-msgstr "正���..."
+msgstr "正����"
 
 #: ../plugins/file-manager/file-view.c:569
 msgid "Filename"
@@ -3986,24 +3993,24 @@ msgstr "�� URI"
 msgid "URI of the top-most path displayed"
 msgstr "æ??ä¸?層路å¾?顯示ç?? URI"
 
-#: ../plugins/file-manager/plugin.c:74
+#: ../plugins/file-manager/plugin.c:75
 msgid "_Rename"
 msgstr "é??æ?°å?½å??(_R)"
 
-#: ../plugins/file-manager/plugin.c:74
+#: ../plugins/file-manager/plugin.c:75
 msgid "Rename file or directory"
 msgstr "é??æ?°å?½å??æª?æ¡?æ??ç?®é??"
 
-#: ../plugins/file-manager/plugin.c:297
+#: ../plugins/file-manager/plugin.c:294
 msgid "File manager popup actions"
 msgstr "æª?æ¡?管ç??ç¨?å¼?å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/file-manager/plugin.c:330
+#: ../plugins/file-manager/plugin.c:327
 msgid "Files"
 msgstr "��"
 
-#: ../plugins/file-manager/plugin.c:460
-#: ../plugins/file-manager/plugin.c:469
+#: ../plugins/file-manager/plugin.c:457
+#: ../plugins/file-manager/plugin.c:466
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "æª?æ¡?管ç??å?¡"
@@ -4037,19 +4044,19 @@ msgid "File Information"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/am-project/am-properties.c:45
 #: ../plugins/git/anjuta-git.ui.h:64
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??稱ï¼?"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/starter/starter.c:422
+#: ../plugins/starter/starter.c:413
 msgid "New File"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
-#: ../plugins/gbf-am/gbf-am-properties.c:1446
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:353
+#: ../plugins/project-manager/dialogs.c:542
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
@@ -4090,10 +4097,15 @@ msgid "Shell Script File"
 msgstr "Shell �令稿��"
 
 #: ../plugins/file-wizard/file.c:92
+#| msgid "Java Source File"
+msgid "Vala Source File"
+msgstr "Vala å??å§?æª?"
+
+#: ../plugins/file-wizard/file.c:93
 msgid "Other"
 msgstr "��"
 
-#: ../plugins/file-wizard/file.c:105
+#: ../plugins/file-wizard/file.c:106
 msgid "BSD Public License"
 msgstr "BSD ��許��"
 
@@ -4101,332 +4113,121 @@ msgstr "BSD ��許��"
 msgid "Unable to build user interface for New File"
 msgstr "ç?¡æ³?建ç«?æ?°æª?æ¡?ç??使ç?¨è??ä»?é?¢"
 
-#: ../plugins/gbf-am/gbf-am-config.c:98
-#: ../plugins/gbf-am/gbf-am-config.c:132
-msgid "Invalid GbfAmConfigValue type"
-msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
-msgid "Add _Package"
-msgstr "���件(_P)"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
-msgid "Add _module"
-msgstr "��模�(_M)"
-
-#: ../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 "é?¸æ??å¥?件"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:7
-msgid "Variables"
-msgstr "è®?æ?¸"
-
-#: ../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/dir-project/dir-project.c:133
+#: ../plugins/dir-project/dir-project.c:156
+#, c-format
+#| msgid "Missing tool name"
+msgid "Missing name"
+msgstr "缺å°?å??稱"
 
-#: ../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 "GLib mkenums"
-
-#: ../plugins/gbf-am/gbf-am-project.c:244
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
-msgid "GLib genmarshal"
-msgstr "GLib genmarshal"
-
-#: ../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: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: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: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:2751
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2713
-#: ../plugins/dir-project/dir-project.c:693
-#: ../plugins/dir-project/dir-project.c:765
+#: ../plugins/dir-project/dir-project.c:649
+#: ../plugins/dir-project/dir-project.c:762
+#: ../plugins/am-project/am-project.c:1627
+#: ../plugins/am-project/am-project.c:1658
+#: ../plugins/am-project/am-project.c:1767
+#: ../plugins/am-project/am-project.c:1843
 #, c-format
 msgid "Project doesn't exist or invalid path"
 msgstr "å°?æ¡?ä¸?å­?å?¨æ??ç?¡æ??ç??è·¯å¾?"
 
-#: ../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:2959
-msgid "Please specify group name"
-msgstr "è«?æ??å®?群çµ?å??稱"
-
-#: ../plugins/gbf-am/gbf-am-project.c:2973
-msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr "群çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?å??"
+#: ../plugins/dir-project/dir-project.c:773
+#: ../plugins/am-project/am-project.c:91
+#| msgid "Group:"
+msgid "Group"
+msgstr "群�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2982
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2925
-msgid "Parent group doesn't exist"
-msgstr "�層群����"
+#: ../plugins/dir-project/dir-project.c:776
+#: ../plugins/am-project/am-project.c:98
+#| msgid "Source:"
+msgid "Source"
+msgstr "��"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2993
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2936
-msgid "Group already exists"
-msgstr "群�已���"
+#: ../plugins/dir-project/dir-project.c:877
+#: ../plugins/dir-project/dir-project.c:887
+#, c-format
+#| msgid "Project doesn't exist"
+msgid "Project doesn't allow to set properties"
+msgstr "å°?æ¡?ä¸?å??許設å®?屬æ?§"
 
-#: ../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/am-project/am-node.c:750
+msgid "Please specify group name"
+msgstr "è«?æ??å®?群çµ?å??稱"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3063
-msgid "Group couldn't be removed"
-msgstr "��移�群�"
+#: ../plugins/am-project/am-node.c:764
+#| msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
+msgstr "群çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?æ?? \"#$:%+,- = ^_`~\" å­?å??"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3213
+#: ../plugins/am-project/am-node.c:918
 msgid "Please specify target name"
 msgstr "è«?æ??å®?ç?®æ¨?å??稱"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3227
-msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?å??"
+#: ../plugins/am-project/am-node.c:932
+#| msgid ""
+#| "Target name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
+msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-'ã??'/' æ?? '.' å­?å??"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3236
+#: ../plugins/am-project/am-node.c:947
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr "å?±äº«ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.laã??"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3245
+#: ../plugins/am-project/am-node.c:956
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr "é??æ??ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.aã??"
 
-#: ../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:3267
-msgid "General failure in target creation"
-msgstr "ç?®æ¨?建ç«?ç¨?åº?ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3295
-msgid "Newly created target could not be identified"
-msgstr "æ??æ?°å»ºç«?ç??ç?®æ¨?ç?¡æ³?辨è­?"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3328
-msgid "Target couldn't be removed"
-msgstr "��移���"
-
-#: ../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/am-project/am-project.c:114
+msgid "Shared Library"
+msgstr "�享��庫"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3532
-msgid "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
-msgstr "ä¾?æº?æª?æ¡?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?å??"
+#: ../plugins/am-project/am-project.c:121
+msgid "Static Library"
+msgstr "é??æ??ç¨?å¼?庫"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3612
-msgid "Source file is already in given target"
-msgstr "ä¾?æº?æª?æ¡?å·²å?¨æ??å®?ç??ç?®æ¨?中"
+#: ../plugins/am-project/am-project.c:135
+msgid "Python Module"
+msgstr "Python 模�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3630
-msgid "General failure in adding source file"
-msgstr "å? å?¥ä¾?æº?æª?æ¡?æ??ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
+#: ../plugins/am-project/am-project.c:142
+msgid "Java Module"
+msgstr "Java 模�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3664
-msgid "Newly added source file could not be identified"
-msgstr "æ??æ?°å? å?¥ç??ä¾?æº?æª?æ¡?ç?¡æ³?辨è­?"
+#: ../plugins/am-project/am-project.c:149
+msgid "Lisp Module"
+msgstr "Lisp 模�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3695
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3520
-msgid "Source couldn't be removed"
-msgstr "��移���"
+#: ../plugins/am-project/am-project.c:156
+msgid "Header Files"
+msgstr "�頭�"
 
-#: ../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/am-project/am-project.c:163
+msgid "Man Documentation"
+msgstr "Man æ??件"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:289
-#: ../plugins/gbf-am/gbf-am-properties.c:341
-msgid "Enter new module"
-msgstr "輸å?¥æ?°ç??模çµ?"
+#: ../plugins/am-project/am-project.c:170
+msgid "Info Documentation"
+msgstr "Info æ??件"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:449
-#, c-format
-msgid "Are you sure you want to remove module \"%s\" and all its associated packages?"
-msgstr "æ?¯å?¦ç¢ºå®?è¦?移é?¤æ¨¡çµ?ã??%sã??è??æ??æ??è??å®?é??è?¯ç??å¥?件ï¼?"
+#: ../plugins/am-project/am-project.c:177
+msgid "Miscellaneous Data"
+msgstr "é??é ?è³?æ??"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:451
-#, c-format
-msgid "Are you sure you want to remove package \"%s\"?"
-msgstr "æ?¯å?¦ç¢ºå®?移é?¤å¥?件ã??%sã??ï¼?"
+#: ../plugins/am-project/am-project.c:184
+msgid "Script"
+msgstr "�令稿"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:509
-#: ../plugins/gbf-am/gbf-am-properties.c:591
-msgid "Enter new variable"
-msgstr "輸å?¥æ?°ç??è®?æ?¸"
+#: ../plugins/am-project/am-project.c:198
+#| msgid "Packages"
+msgid "Package"
+msgstr "�件"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:622
+#: ../plugins/am-project/am-project.c:1644
 #, c-format
-msgid "Are you sure you want to remove variable \"%s\"?"
-msgstr "æ?¯å?¦ç¢ºå®?移é?¤è®?æ?¸ã??%sã??ï¼?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:776
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:180
-msgid "Project:"
-msgstr "å°?æ¡?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:779
-msgid "Package name:"
-msgstr "å°?æ¡?å??稱:"
+#| msgid "Unable to update project"
+msgid "Unable to parse project file"
+msgstr "ç?¡æ³?解æ??å°?æ¡?æª?æ¡?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:782
+#: ../plugins/am-project/am-properties.c:46
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:26
@@ -4446,158 +4247,128 @@ msgstr "å°?æ¡?å??稱:"
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:785
-msgid "URI:"
-msgstr "URIï¼?"
+#: ../plugins/am-project/am-properties.c:47
+msgid "Bug report URL:"
+msgstr "é?¯èª¤å ±å?? URLï¼?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:852
-msgid "Module/Packages"
-msgstr "模�/�件"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:861
-msgid "Version"
-msgstr "ç??æ?¬"
+#: ../plugins/am-project/am-properties.c:48
+msgid "Package name:"
+msgstr "å°?æ¡?å??稱:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1151
-msgid "Use"
-msgstr "使�"
+#: ../plugins/am-project/am-properties.c:49
+#: ../plugins/git/anjuta-git.ui.h:117
+msgid "URL:"
+msgstr "URL:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1243
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
-msgid "Group name:"
-msgstr "群çµ?å??稱:"
+#: ../plugins/am-project/am-properties.c:56
+#: ../plugins/am-project/am-properties.c:75
+msgid "Linker flags:"
+msgstr "é?£çµ?å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1246
-msgid "Advanced"
-msgstr "é?²é??"
+#: ../plugins/am-project/am-properties.c:57
+#: ../plugins/am-project/am-properties.c:78
+msgid "C preprocessor flags:"
+msgstr "C é ?è??ç??å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1251
-#: ../plugins/gbf-am/gbf-am-properties.c:1341
+#: ../plugins/am-project/am-properties.c:58
+#: ../plugins/am-project/am-properties.c:79
 msgid "C compiler flags:"
 msgstr "C 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1253
-msgid "C preprocessor flags:"
-msgstr "C é ?è??ç??å?¨æ??æ¨?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1255
+#: ../plugins/am-project/am-properties.c:59
+#: ../plugins/am-project/am-properties.c:80
 msgid "C++ compiler flags:"
 msgstr "C++ 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1257
-msgid "gcj compiler flags (ahead-of-time):"
-msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time):"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1259
-msgid "Java compiler flags (just-in-time):"
-msgstr "Java 編譯å?¨æ??æ¨? (just-in-time):"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1261
-#: ../plugins/gbf-am/gbf-am-properties.c:1349
-msgid "Fortran compiler flags:"
-msgstr "Fortran 編譯å?¨æ??æ¨?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1264
-msgid "Includes (deprecated):"
-msgstr "å??å?«ï¼?已廢æ£?ï¼?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1275
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:261
+#: ../plugins/am-project/am-properties.c:60
+#: ../plugins/am-project/am-properties.c:81
+#| msgid "C compiler flags:"
+msgid "Java compiler flags:"
+msgstr "Java 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:61
+#: ../plugins/am-project/am-properties.c:82
+#| msgid "C compiler flags:"
+msgid "Vala compiler flags:"
+msgstr "Vala 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:62
+#: ../plugins/am-project/am-properties.c:83
+#| msgid "Fortran compiler flags:"
+msgid "Fortan compiler flags:"
+msgstr "Fortran 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:63
+#: ../plugins/am-project/am-properties.c:84
+#| msgid "C compiler flags:"
+msgid "Objective C compiler flags:"
+msgstr "Objective C 編譯å?¨æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:64
+#: ../plugins/am-project/am-properties.c:85
+#| msgid "Linker flags:"
+msgid "Lex/Flex flags:"
+msgstr "Lex/Flex æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:65
+#: ../plugins/am-project/am-properties.c:86
+#| msgid "Linker flags:"
+msgid "Yacc/Bison flags:"
+msgstr "Yacc/Bison æ??æ¨?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:66
 msgid "Install directories:"
-msgstr "å®?è£?ç?®é??:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1343
-msgid "C preprocessor flags"
-msgstr "C é ?è??ç??å?¨æ??æ¨?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1345
-msgid "C++ compiler flags"
-msgstr "C++ 編譯å?¨æ??æ¨?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1347
-msgid "gcj compiler flags (ahead-of-time)"
-msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time)"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1353
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:413
-msgid "Linker flags:"
-msgstr "é?£çµ?å?¨æ??æ¨?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1359
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:419
-msgid "Libraries:"
-msgstr "��庫:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1365
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:425
-msgid "Dependencies:"
-msgstr "ç?¸ä¾?é??ä¿?:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1368
-msgid "Advanced options"
-msgstr "é?²é??é?¸é ?"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1443
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
-msgid "Target name:"
-msgstr "ç?®æ¨?å??稱:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1452
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:359
-msgid "Group:"
-msgstr "群�:"
-
-#: ../plugins/gbf-am/gbf-am-properties.c:1470
-#: ../plugins/gbf-am/gbf-am-properties.c:1486
-#: ../plugins/gbf-am/gbf-am-properties.c:1493
-#: ../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:1505
-msgid "Advancedâ?¦"
-msgstr "é?²é??..."
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
-#: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
-msgid "Invalid GbfMkfileConfigValue type"
-msgstr "ç?¡æ??ç?? GbfMkfileConfigValue é¡?å??"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2699
-msgid "Project doesn't exist"
-msgstr "�����"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3006
-msgid "Group coudn't be removed"
-msgstr "��移�群�"
-
-#: ../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:3229
-msgid "Target coudn't be removed"
-msgstr "��移���"
-
-#: ../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:3439
-msgid "Source is already in target"
-msgstr "��已����中"
-
-#: ../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-properties.c:250
-msgid "Includes:"
-msgstr "å??å?«:"
+msgstr "å®?è£?ç?®é??ï¼?"
+
+#: ../plugins/am-project/am-properties.c:73
+#| msgid "Do not show tabs"
+msgid "Do not install:"
+msgstr "�����"
+
+#: ../plugins/am-project/am-properties.c:74
+#| msgid "Install directory:"
+msgid "Installation directory:"
+msgstr "å®?è£?ç?®é??ï¼?"
+
+#: ../plugins/am-project/am-properties.c:76
+#| msgid "Add internationalization:"
+msgid "Additional libraries:"
+msgstr "é¡?å¤?ç??ç¨?å¼?庫ï¼?"
+
+#: ../plugins/am-project/am-properties.c:77
+#| msgid "Add to Project"
+msgid "Additional objects:"
+msgstr "é¡?å¤?ç??ç?©ä»¶ï¼?"
+
+#: ../plugins/am-project/am-properties.c:87
+#: ../plugins/am-project/am-properties.c:97
+#| msgid "Plugin Dependencies:"
+msgid "Additional dependencies:"
+msgstr "é¡?å¤?ç??ç?¸ä¾?æ?§ï¼?"
+
+#: ../plugins/am-project/am-properties.c:88
+#| msgid "Plugin Description:"
+msgid "Include in distribution:"
+msgstr "å??å?«æ?¼æ??è¿°ï¼?"
+
+#: ../plugins/am-project/am-properties.c:89
+#| msgid "Build Directory:"
+msgid "Build for check only:"
+msgstr "�編譯�檢����"
+
+#: ../plugins/am-project/am-properties.c:90
+#: ../plugins/am-project/am-properties.c:98
+msgid "Do not use prefix:"
+msgstr "ä¸?使ç?¨å??綴ï¼?"
+
+#: ../plugins/am-project/am-properties.c:91
+msgid "Keep target path:"
+msgstr "ä¿?ç??ç?®æ¨?è·¯å¾?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:99
+#| msgid "Maximum Actions"
+msgid "Manual section:"
+msgstr "æ??å??ç« ç¯?ï¼?"
 
 #: ../plugins/gdb/anjuta-gdb.ui.h:1
 msgid "Available pretty printers"
@@ -4751,12 +4522,12 @@ msgstr "å?³é??è¨?è?? %s 給è¡?ç¨?ï¼?%d"
 msgid "Error whilst signaling the process."
 msgstr "å?³é??ä¸?å??è¨?è??給ç¨?åº?æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../plugins/gdb/plugin.c:117
+#: ../plugins/gdb/plugin.c:118
 #, c-format
 msgid "Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr "建ç«?å??ç?º %s ç?? FIFO æª?æ¡?失æ??ã??該ç¨?å¼?æ??以ä¸?使ç?¨çµ?端æ©?ç??æ?¹å¼?å?·è¡?ã??"
 
-#: ../plugins/gdb/plugin.c:203
+#: ../plugins/gdb/plugin.c:202
 msgid "Cannot start terminal for debugging."
 msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?é?¤é?¯ã??"
 
@@ -5247,10 +5018,6 @@ msgstr "å?°ï¼?"
 msgid "URL"
 msgstr "網å??"
 
-#: ../plugins/git/anjuta-git.ui.h:117
-msgid "URL:"
-msgstr "URL:"
-
 #: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Unstage ��"
@@ -5310,7 +5077,7 @@ msgstr "è«?輸å?¥ URLã??"
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
 msgid "Git: Fetchingâ?¦"
-msgstr "Gitï¼?æ­£å?¨å??å??..."
+msgstr "Gitï¼?æ­£å?¨å??å??â?¦"
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
 msgid "Please select a mailbox file."
@@ -5373,6 +5140,19 @@ msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
 msgid "Git: Deleted selected tags."
 msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
 
+#. Translators: default file name for git diff's output
+#: ../plugins/git/git-diff-dialog.c:42
+#| msgid "Stash Uncommitted Changes"
+msgid "Uncommitted Changes.diff"
+msgstr "Uncommitted Changes.diff"
+
+#. Translators: file name for an existing commits diff, %s is an SHASUM of a commit
+#: ../plugins/git/git-diff-dialog.c:77
+#, c-format
+#| msgid "_Show commit diff"
+msgid "Commit %s.diff"
+msgstr "Commit %s.diff"
+
 #: ../plugins/git/git-fetch-dialog.c:40
 msgid "Git: Fetch complete."
 msgstr "Gitï¼?å??å??å·²å®?æ??ã??"
@@ -5501,19 +5281,19 @@ msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
 msgid "Please select a stash"
 msgstr "è«?é?¸æ??ä¸?å?? stash"
 
-#: ../plugins/git/git-ui-utils.c:604
+#: ../plugins/git/git-ui-utils.c:603
 msgid "Git: Changes stored in a stash."
 msgstr "Gitï¼?å?²å­?å?¨ stash ç??è®?æ?´ã??"
 
-#: ../plugins/git/git-ui-utils.c:620
+#: ../plugins/git/git-ui-utils.c:619
 msgid "Git: Stashed changes applied."
 msgstr "Gitï¼?å¥?ç?¨å·² stash ç??è®?æ?´ã??"
 
-#: ../plugins/git/git-ui-utils.c:744
+#: ../plugins/git/git-ui-utils.c:743
 msgid "Git: Diff complete."
 msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
 
-#: ../plugins/git/git-ui-utils.c:760
+#: ../plugins/git/git-ui-utils.c:759
 #, c-format
 msgid "Column %i"
 msgstr "� %i"
@@ -5870,7 +5650,7 @@ msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
 #: ../plugins/git/plugin.c:327
 #: ../plugins/git/plugin.c:447
 msgid "_Startâ?¦"
-msgstr "é??å§?(_S)..."
+msgstr "é??å§?(_S)â?¦"
 
 #. Display label
 #. short-cut
@@ -6014,6 +5794,12 @@ msgstr "Bisect"
 msgid "Start a bisect operation"
 msgstr "é??å§? bisect æ??ä½?"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:455
+msgid "_Reset"
+msgstr "é??ç½®(_R)"
+
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:457
@@ -6289,20 +6075,20 @@ msgstr "N/A"
 msgid "stopped:"
 msgstr "å·²å??æ­¢ï¼?"
 
-#: ../plugins/gtodo/callback.c:17
+#: ../plugins/gtodo/callback.c:20
 msgid "You need to select a to-do item before you can remove it"
 msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
 
-#: ../plugins/gtodo/callback.c:20
+#: ../plugins/gtodo/callback.c:23
 msgid "Are you sure you want to remove the selected to-do item?"
 msgstr "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
 
-#: ../plugins/gtodo/callback.c:98
+#: ../plugins/gtodo/callback.c:103
 #, c-format
 msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
 
-#: ../plugins/gtodo/callback.c:99
+#: ../plugins/gtodo/callback.c:104
 #, c-format
 msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
@@ -6329,7 +6115,6 @@ msgid "Export current category only"
 msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
 
 #: ../plugins/gtodo/export.c:172
-#| msgid "<b>HTML export options:</b>"
 msgid "HTML export options:"
 msgstr "HTML �����"
 
@@ -6341,28 +6126,23 @@ msgstr "����設 (CSS) 樣�表"
 msgid "Custom (CSS) style sheet"
 msgstr "�� (CSS) 樣�表"
 
-#: ../plugins/gtodo/interface.c:35
-#: ../src/anjuta-actions.h:38
-msgid "_View"
-msgstr "檢�(_V)"
-
-#: ../plugins/gtodo/interface.c:136
+#: ../plugins/gtodo/interface.c:119
 msgid "All"
 msgstr "��"
 
-#: ../plugins/gtodo/interface.c:161
+#: ../plugins/gtodo/interface.c:144
 msgid "_Export"
 msgstr "��(_E)"
 
-#: ../plugins/gtodo/interface.c:205
+#: ../plugins/gtodo/interface.c:188
 msgid "Priority"
 msgstr "å?ªå??ç­?ç´?"
 
-#: ../plugins/gtodo/interface.c:212
+#: ../plugins/gtodo/interface.c:195
 msgid "Due date"
 msgstr "å?°æ??æ?¥"
 
-#: ../plugins/gtodo/interface.c:226
+#: ../plugins/gtodo/interface.c:209
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -6503,82 +6283,78 @@ msgstr "å¾?辦äº?é ?管ç??å?¡"
 msgid "To-do List Preferences"
 msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
 
-#: ../plugins/gtodo/preferences.c:84
+#: ../plugins/gtodo/preferences.c:89
 msgid "Interface"
 msgstr "ä»?é?¢"
 
-#: ../plugins/gtodo/preferences.c:88
+#: ../plugins/gtodo/preferences.c:93
 msgid "Show due date column"
 msgstr "顯示å?°æ??æ?¥æ¬?ä½?"
 
-#: ../plugins/gtodo/preferences.c:96
+#: ../plugins/gtodo/preferences.c:101
 msgid "Show category column"
 msgstr "顯示å??é¡?æ¬?ä½?"
 
-#: ../plugins/gtodo/preferences.c:101
+#: ../plugins/gtodo/preferences.c:107
 msgid "Show priority column"
 msgstr "顯示å?ªå??é ?åº?æ¬?ä½?"
 
-#: ../plugins/gtodo/preferences.c:106
-msgid "Tooltips in list"
-msgstr "æ¸?å?®ä¸­ç??å·¥å?·æ??示"
-
+#: ../plugins/gtodo/preferences.c:115
 #: ../plugins/gtodo/preferences.c:117
-#: ../plugins/gtodo/preferences.c:119
 msgid "Show in main window"
 msgstr "顯示�主��中"
 
+#: ../plugins/gtodo/preferences.c:128
 #: ../plugins/gtodo/preferences.c:130
-#: ../plugins/gtodo/preferences.c:132
 msgid "Highlight"
 msgstr "�示"
 
 #. tb for highlighting due today
-#: ../plugins/gtodo/preferences.c:142
+#: ../plugins/gtodo/preferences.c:140
 msgid "Items that are due today"
 msgstr "å?¨ä»?æ?¥å?°æ??ç??é ?ç?®"
 
 #. tb for highlighting due
-#: ../plugins/gtodo/preferences.c:148
+#: ../plugins/gtodo/preferences.c:146
 msgid "Items that are past due"
 msgstr "é??å?»å?°æ??ç??é ?ç?®"
 
 #. tb for highlighting in x days
-#: ../plugins/gtodo/preferences.c:154
+#: ../plugins/gtodo/preferences.c:152
 #, c-format
 msgid "Items that are due in the next %i day"
 msgid_plural "Items that are due in the next %i days"
 msgstr[0] "é ?ç?®å?¨æ?ªä¾? %i 天å?§å?°æ??"
 
-#: ../plugins/gtodo/preferences.c:168
+#: ../plugins/gtodo/preferences.c:166
 msgid "Miscellaneous"
 msgstr "é??é ?"
 
-#: ../plugins/gtodo/preferences.c:171
+#: ../plugins/gtodo/preferences.c:169
 msgid "Auto-purge completed items"
 msgstr "è?ªå??æ¸?é?¤å·²å®?æ??ç??é ?ç?®"
 
 #. Translators: First part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:177
+#: ../plugins/gtodo/preferences.c:175
 msgid "Purge items after"
 msgstr "��"
 
 #. Translators: Second part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:182
+#: ../plugins/gtodo/preferences.c:180
 msgid "days."
 msgstr "天å??ç??é ?ç?®ã??"
 
+#: ../plugins/gtodo/preferences.c:193
 #: ../plugins/gtodo/preferences.c:195
-#: ../plugins/gtodo/preferences.c:197
 msgid "Auto-Purge"
 msgstr "è?ªå??æ¸?é?¤"
 
+#: ../plugins/gtodo/preferences.c:207
 #: ../plugins/gtodo/preferences.c:209
-#: ../plugins/gtodo/preferences.c:211
 msgid "Notification"
 msgstr "é??ç?¥"
 
-#: ../plugins/gtodo/preferences.c:218
+#: ../plugins/gtodo/preferences.c:216
 #, c-format
 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"
@@ -6600,7 +6376,7 @@ msgstr "æ²?æ??æ?¥æ??"
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 #, fuzzy
 msgid "Diagonal"
-msgstr "è¨?è??"
+msgstr "���"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
@@ -6619,53 +6395,37 @@ 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:11
-msgid "Number of first characters to show:"
-msgstr "è¦?顯示ç??第ä¸?å­?å??æ?¸ï¼?"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
-msgid "Number of last characters to show:"
-msgstr "è¦?顯示ç??æ??å¾?å­?å??æ?¸ï¼?"
-
 #. text style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Strike-Out"
 msgstr "���"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
-msgid "Truncate long messages"
-msgstr "æ?ªç?­é??é?·ç??è¨?æ?¯"
-
 #. text style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 #, fuzzy
 msgid "Underline-Plain"
-msgstr "ç´?æ??å­?"
+msgstr "ç´?æ??å­? (ASCII)"
 
 #. text style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 #, fuzzy
 msgid "Underline-Squiggle"
-msgstr "����"
+msgstr "使���"
 
 #. text style in editor, TT is for typewriter text
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:23
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
 #, fuzzy
 msgid "Underline-TT"
-msgstr "����"
+msgstr "使���"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Warning message indicator style:"
 msgstr "è­¦å??è¨?æ?¯æ??示å?¨æ¨£å¼?ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
 msgid "Warnings:"
 msgstr "è­¦å??ï¼?"
 
@@ -6673,78 +6433,78 @@ msgstr "è­¦å??ï¼?"
 msgid "Close all message tabs"
 msgstr "é??é??æ??æ??è¨?æ?¯å??é ?"
 
-#: ../plugins/message-view/message-view.c:498
+#: ../plugins/message-view/message-view.c:497
 msgid "Icon"
 msgstr "å??示"
 
-#: ../plugins/message-view/message-view.c:512
-#: ../plugins/message-view/plugin.c:455
-#: ../plugins/message-view/plugin.c:468
-#: ../plugins/message-view/plugin.c:588
-#: ../plugins/message-view/plugin.c:600
+#: ../plugins/message-view/message-view.c:511
+#: ../plugins/message-view/plugin.c:383
+#: ../plugins/message-view/plugin.c:396
+#: ../plugins/message-view/plugin.c:515
+#: ../plugins/message-view/plugin.c:526
 msgid "Messages"
 msgstr "��"
 
-#: ../plugins/message-view/message-view.c:857
+#: ../plugins/message-view/message-view.c:856
 #, c-format
 msgid "Error writing %s"
 msgstr "寫å?¥è³?æ??å?° %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/message-view/plugin.c:78
+#: ../plugins/message-view/plugin.c:79
 msgid "_Copy Message"
 msgstr "�製��(_C)"
 
-#: ../plugins/message-view/plugin.c:79
+#: ../plugins/message-view/plugin.c:80
 msgid "Copy message"
 msgstr "�製��"
 
-#: ../plugins/message-view/plugin.c:82
+#: ../plugins/message-view/plugin.c:83
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯(_N)"
 
-#: ../plugins/message-view/plugin.c:83
+#: ../plugins/message-view/plugin.c:84
 msgid "Next message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:86
+#: ../plugins/message-view/plugin.c:87
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯(_P)"
 
-#: ../plugins/message-view/plugin.c:87
+#: ../plugins/message-view/plugin.c:88
 msgid "Previous message"
 msgstr "ä¸?ä¸?å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:90
+#: ../plugins/message-view/plugin.c:91
 msgid "_Save Message"
 msgstr "����(_S)"
 
-#: ../plugins/message-view/plugin.c:91
+#: ../plugins/message-view/plugin.c:92
 msgid "Save message"
 msgstr "����"
 
-#: ../plugins/message-view/plugin.c:228
+#: ../plugins/message-view/plugin.c:169
 msgid "Next/Previous Message"
 msgstr "ä¸?ä¸?å??/ä¸?ä¸?å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:341
+#: ../plugins/message-view/plugin.c:269
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
 msgstr[0] "%d å??è¨?æ?¯"
 
-#: ../plugins/message-view/plugin.c:350
+#: ../plugins/message-view/plugin.c:278
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
 msgstr[0] "%d å??è³?è¨?"
 
-#: ../plugins/message-view/plugin.c:359
+#: ../plugins/message-view/plugin.c:287
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
 msgstr[0] "%d å??è­¦å??"
 
-#: ../plugins/message-view/plugin.c:368
+#: ../plugins/message-view/plugin.c:296
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
@@ -6818,7 +6578,7 @@ msgstr "修�層��"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:53
-#: ../plugins/tools/plugin.c:130
+#: ../plugins/tools/plugin.c:131
 msgid "_Tools"
 msgstr "工�(_T)"
 
@@ -6851,6 +6611,10 @@ msgstr "æ??ä¸?å??å??ç?ºã??%sã??ç??æª?æ¡?ç?¡æ³?寫å?¥ï¼?%sã??è«?檢æ?¥æ?¨æ?¯å?¦
 msgid "Please select a project backend to open %s."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? %s ç??å°?æ¡?å¾?端ç¨?å¼?ã??"
 
+#: ../plugins/project-import/plugin.c:205
+msgid "Open With"
+msgstr "以此é??å??"
+
 #: ../plugins/project-import/plugin.c:220
 #, c-format
 msgid "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."
@@ -6912,132 +6676,121 @@ msgstr "����"
 msgid "Import"
 msgstr "��"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:1
+#: ../plugins/project-manager/pm_dialogs.ui.h:1
+#| msgid "Add _module"
+msgid "Add Module"
+msgstr "��模�"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:2
+#| msgid "Add _Package"
+msgid "Add Package"
+msgstr "���件"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:3
 msgid "Add Source"
 msgstr "����"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:2
+#: ../plugins/project-manager/pm_dialogs.ui.h:4
+#| msgid "Module"
+msgid "Modules:"
+msgstr "模��"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:5
+#| msgid "Import options"
+msgid "More options:"
+msgstr "�����"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:6
 msgid "New Group"
 msgstr "��群�"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:3
+#: ../plugins/project-manager/pm_dialogs.ui.h:7
 msgid "New Target"
 msgstr "����"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:4
+#: ../plugins/project-manager/pm_dialogs.ui.h:8
+#| msgid "Packages"
+msgid "Package list:"
+msgstr "�件���"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:9
+#| msgid "Select the _target for the new source files:"
+msgid "Select the _target for the module:"
+msgstr "é?¸æ??模çµ?ç??ç?®æ¨?(_T):"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:10
 msgid "Select the _target for the new source files:"
 msgstr "é?¸æ??æ?°ä¾?æº?æª?æ¡?ç??ç?®æ¨?(_T):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:5
+#: ../plugins/project-manager/pm_dialogs.ui.h:11
 msgid "Source files:"
 msgstr "�����"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:6
+#: ../plugins/project-manager/pm_dialogs.ui.h:12
 msgid "Specify _where to create the group:"
 msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?群çµ?(_W):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:7
+#: ../plugins/project-manager/pm_dialogs.ui.h:13
 msgid "Specify _where to create the target:"
 msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç?®æ¨?(_W):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:8
+#: ../plugins/project-manager/pm_dialogs.ui.h:14
 msgid "Target _name:"
 msgstr "ç?®æ¨?å??稱(_N):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:9
+#: ../plugins/project-manager/pm_dialogs.ui.h:15
 msgid "Target _type:"
 msgstr "ç?®æ¨?é¡?å??(_T):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:10
+#: ../plugins/project-manager/pm_dialogs.ui.h:16
 msgid "TargetTypes"
 msgstr "ç?®æ¨?é¡?å??"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:11
+#: ../plugins/project-manager/pm_dialogs.ui.h:17
+#| msgid "Add _Package"
+msgid "_Add package&#x2026;"
+msgstr "���件(_A)&#x2026;"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:18
 msgid "_Group name:"
 msgstr "群çµ?å??稱(_G):"
 
-#: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to addâ?¦"
-msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)â?¦"
+#: ../plugins/project-manager/pm_dialogs.ui.h:19
+#| msgid "Module name:"
+msgid "_Module name:"
+msgstr "模çµ?å??稱(_M):"
 
-#: ../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-manager/pm_dialogs.ui.h:20
+#| msgid "Select file to add:"
+msgid "_Select file to add&#x2026;"
+msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)&#x2026;"
+
+#: ../plugins/project-manager/project-model.c:233
+#: ../plugins/project-manager/plugin.c:1389
+#: ../plugins/project-manager/plugin.c:1507
+#: ../plugins/project-manager/plugin.c:1684
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "å°?æ¡?"
 
-#: ../plugins/project-manager/gbf-project-model.c:232
+#: ../plugins/project-manager/project-model.c:234
 msgid "GbfProject Object"
 msgstr "GbfProject �件"
 
-#: ../plugins/project-manager/gbf-project-model.c:677
+#: ../plugins/project-manager/project-model.c:763
 msgid "No project loaded"
 msgstr "������"
 
-#: ../plugins/project-manager/gbf-project-util.c:229
-#: ../plugins/project-manager/gbf-project-util.c:236
-msgid "Cannot add group"
-msgstr "����群�"
-
-#: ../plugins/project-manager/gbf-project-util.c:237
-msgid "No parent group selected"
-msgstr "æ²?æ??é?¸æ??ä¸?層群çµ?"
-
-#: ../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:415
-msgid "No group selected"
-msgstr "æ²?æ??é?¸å??群çµ?"
-
-#: ../plugins/project-manager/gbf-project-util.c:510
-msgid "Select sourcesâ?¦"
-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:752
-msgid "No target has been selected"
-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:451
-msgid "Target properties"
-msgstr "��屬�"
-
-#: ../plugins/project-manager/plugin.c:460
-msgid "No properties available for this target"
-msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦æ­¤ç?®æ¨?"
-
-#: ../plugins/project-manager/plugin.c:492
-#: ../plugins/project-manager/plugin.c:907
-msgid "Project properties"
-msgstr "��屬�"
-
-#: ../plugins/project-manager/plugin.c:511
+#: ../plugins/project-manager/plugin.c:385
 msgid "Refreshing symbol treeâ?¦"
 msgstr "æ­£å?¨é??æ?°æ?´ç??符è??樹â?¦"
 
-#: ../plugins/project-manager/plugin.c:518
+#: ../plugins/project-manager/plugin.c:392
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "é??æ?°æ?´ç??å°?æ¡?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:696
+#: ../plugins/project-manager/plugin.c:646
 msgid ""
 "Are you sure you want to remove the following group from the project?\n"
 "\n"
@@ -7045,7 +6798,7 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??群çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:699
+#: ../plugins/project-manager/plugin.c:649
 msgid ""
 "Are you sure you want to remove the following target from the project?\n"
 "\n"
@@ -7053,7 +6806,7 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:702
+#: ../plugins/project-manager/plugin.c:652
 msgid ""
 "Are you sure you want to remove the following source file from the project?\n"
 "\n"
@@ -7061,7 +6814,29 @@ msgstr ""
 "æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?碼æª?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:705
+#: ../plugins/project-manager/plugin.c:655
+#| msgid ""
+#| "Are you sure you want to remove the following target from the project?\n"
+#| "\n"
+msgid ""
+"Are you sure you want to remove the following package from the project?\n"
+"\n"
+msgstr ""
+"æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??å¥?件å¾?å°?æ¡?中移é?¤ï¼?\n"
+"\n"
+
+#: ../plugins/project-manager/plugin.c:658
+#| msgid ""
+#| "Are you sure you want to remove the following group from the project?\n"
+#| "\n"
+msgid ""
+"Are you sure you want to remove the following module from the project?\n"
+"\n"
+msgstr ""
+"æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??模çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
+"\n"
+
+#: ../plugins/project-manager/plugin.c:661
 msgid ""
 "Are you sure you want to remove the following elements from the project?\n"
 "\n"
@@ -7069,39 +6844,61 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??ç´ å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:722
+#: ../plugins/project-manager/plugin.c:678
 #, c-format
 msgid "Group: %s\n"
 msgstr "群��%s\n"
 
-#: ../plugins/project-manager/plugin.c:725
+#: ../plugins/project-manager/plugin.c:681
 #, c-format
 msgid "Target: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:728
+#: ../plugins/project-manager/plugin.c:684
 #, c-format
 msgid "Source: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:731
+#: ../plugins/project-manager/plugin.c:687
 #, c-format
 msgid "Shortcut: %s\n"
 msgstr "æ?·å¾?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:743
+#: ../plugins/project-manager/plugin.c:690
+#, c-format
+#| msgid "Source: %s\n"
+msgid "Module: %s\n"
+msgstr "模��%s\n"
+
+#: ../plugins/project-manager/plugin.c:693
+#, c-format
+#| msgid "Packages"
+msgid "Package: %s\n"
+msgstr "�件�%s\n"
+
+#: ../plugins/project-manager/plugin.c:705
+#| msgid "The group will not be deleted from the file system."
+msgid "The group will be deleted from the file system."
+msgstr "é??å??群çµ?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:707
 msgid "The group will not be deleted from the file system."
 msgstr "é??å??群çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:745
+#: ../plugins/project-manager/plugin.c:709
+#| msgid "The source file will not be deleted from the file system."
+msgid "The source file will be deleted from the file system."
+msgstr "該ä¾?æº?æª?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
+
+#: ../plugins/project-manager/plugin.c:711
 msgid "The source file will not be deleted from the file system."
 msgstr "該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:750
+#: ../plugins/project-manager/plugin.c:716
 msgid "Confirm remove"
 msgstr "確�移�"
 
-#: ../plugins/project-manager/plugin.c:795
+#: ../plugins/project-manager/plugin.c:762
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -7110,127 +6907,245 @@ msgstr ""
 "移é?¤â??%sâ??失æ??ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:865
+#: ../plugins/project-manager/plugin.c:828
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "å??å?? %s ç?? URI è³?è¨?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:903
+#: ../plugins/project-manager/plugin.c:866
 msgid "_Project"
 msgstr "å°?æ¡?(_P)"
 
-#: ../plugins/project-manager/plugin.c:907
-#: ../plugins/project-manager/plugin.c:941
-msgid "_Properties"
-msgstr "屬�(_P)"
-
-#: ../plugins/project-manager/plugin.c:912
-msgid "_Refresh"
-msgstr "é??æ?°æ?´ç??(_R)"
-
-#: ../plugins/project-manager/plugin.c:912
-msgid "Refresh project manager tree"
-msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
-
-#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:870
 msgid "Add _Groupâ?¦"
 msgstr "��群�(_G)�"
 
-#: ../plugins/project-manager/plugin.c:917
-#: ../plugins/project-manager/plugin.c:951
+#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:914
 msgid "Add a group to project"
 msgstr "��群����"
 
-#: ../plugins/project-manager/plugin.c:922
+#: ../plugins/project-manager/plugin.c:875
 msgid "Add _Targetâ?¦"
 msgstr "����(_T)�"
 
-#: ../plugins/project-manager/plugin.c:922
-#: ../plugins/project-manager/plugin.c:956
+#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:919
 msgid "Add a target to project"
 msgstr "�������"
 
-#: ../plugins/project-manager/plugin.c:927
+#: ../plugins/project-manager/plugin.c:880
 msgid "Add _Source Fileâ?¦"
 msgstr "������(_S)�"
 
-#: ../plugins/project-manager/plugin.c:927
-#: ../plugins/project-manager/plugin.c:946
-#: ../plugins/project-manager/plugin.c:961
+#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:924
+#: ../plugins/project-manager/plugin.c:939
 msgid "Add a source file to project"
 msgstr "å? å?¥å??å§?æª?è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:932
+#: ../plugins/project-manager/plugin.c:885
+#| msgid "Add _module"
+msgid "Add _Moduleâ?¦"
+msgstr "��模�(_M)�"
+
+#: ../plugins/project-manager/plugin.c:885
+#| msgid "Add a source file to project"
+msgid "Add a module to a target"
+msgstr "�模������"
+
+#: ../plugins/project-manager/plugin.c:890
+#| msgid "Add _Package"
+msgid "Add _Packageâ?¦"
+msgstr "���件(_P)�"
+
+#: ../plugins/project-manager/plugin.c:890
+#: ../plugins/project-manager/plugin.c:934
+#| msgid "Add a target to project"
+msgid "Add a package to project"
+msgstr "��件�����"
+
+#: ../plugins/project-manager/plugin.c:895
+#: ../plugins/project-manager/plugin.c:944
+msgid "_Properties"
+msgstr "屬�(_P)"
+
+#: ../plugins/project-manager/plugin.c:895
+#: ../plugins/project-manager/dialogs.c:666
+msgid "Project properties"
+msgstr "��屬�"
+
+#: ../plugins/project-manager/plugin.c:900
+msgid "_Refresh"
+msgstr "é??æ?°æ?´ç??(_R)"
+
+#: ../plugins/project-manager/plugin.c:900
+msgid "Refresh project manager tree"
+msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
+
+#: ../plugins/project-manager/plugin.c:905
 msgid "Close Pro_ject"
-msgstr "é??é??å°?æ¡? (_J)"
+msgstr "é??é??å°?æ¡?(_J)"
 
-#: ../plugins/project-manager/plugin.c:932
+#: ../plugins/project-manager/plugin.c:905
 msgid "Close project"
 msgstr "é??é??å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:941
-msgid "Properties of group/target/source"
-msgstr "群çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
-
-#: ../plugins/project-manager/plugin.c:946
-msgid "_Add to Project"
-msgstr "�����(_A)"
-
-#: ../plugins/project-manager/plugin.c:951
+#: ../plugins/project-manager/plugin.c:914
 msgid "Add _Group"
 msgstr "��群�(_G)"
 
-#: ../plugins/project-manager/plugin.c:956
+#: ../plugins/project-manager/plugin.c:919
 msgid "Add _Target"
 msgstr "����(_T)"
 
-#: ../plugins/project-manager/plugin.c:961
+#: ../plugins/project-manager/plugin.c:924
 msgid "Add _Source File"
 msgstr "å? å?¥å??å§?æª?(_S)"
 
-#: ../plugins/project-manager/plugin.c:966
+#: ../plugins/project-manager/plugin.c:929
+#| msgid "Add _module"
+msgid "Add _Module"
+msgstr "��模�(_M)"
+
+#: ../plugins/project-manager/plugin.c:929
+#| msgid "Add a group to project"
+msgid "Add a module to target"
+msgstr "�模������"
+
+#: ../plugins/project-manager/plugin.c:934
+msgid "Add _Package"
+msgstr "���件(_P)"
+
+#: ../plugins/project-manager/plugin.c:939
+msgid "_Add to Project"
+msgstr "�����(_A)"
+
+#: ../plugins/project-manager/plugin.c:944
+msgid "Properties of group/target/source"
+msgstr "群çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
+
+#: ../plugins/project-manager/plugin.c:949
 msgid "Re_move"
 msgstr "移�(_M)"
 
-#: ../plugins/project-manager/plugin.c:966
+#: ../plugins/project-manager/plugin.c:949
 msgid "Remove from project"
 msgstr "���中移�"
 
-#: ../plugins/project-manager/plugin.c:1387
+#: ../plugins/project-manager/plugin.c:1343
 #, c-format
-msgid "Loading project: %s"
-msgstr "正������%s"
+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:1395
-msgid "Created project viewâ?¦"
-msgstr "已建���檢��"
+#: ../plugins/project-manager/plugin.c:1384
+#| msgid "Created project viewâ?¦"
+msgid "Update project viewâ?¦"
+msgstr "����檢��"
 
-#: ../plugins/project-manager/plugin.c:1408
+#: ../plugins/project-manager/plugin.c:1425
 #, 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"
+msgid "Loading project: %s"
+msgstr "正������%s"
 
-#: ../plugins/project-manager/plugin.c:1601
+#: ../plugins/project-manager/plugin.c:1595
 #, c-format
 msgid "Error closing project: %s"
 msgstr "é??é??å°?æ¡?æ??é?¯èª¤ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1668
+#: ../plugins/project-manager/plugin.c:1663
 msgid "Project manager actions"
 msgstr "å°?æ¡?管ç??å?¡å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:1676
+#: ../plugins/project-manager/plugin.c:1671
 msgid "Project manager popup actions"
 msgstr "å°?æ¡?管ç??å?¡å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:2471
+#: ../plugins/project-manager/plugin.c:2384
 msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??å°?æ¡?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2474
+#: ../plugins/project-manager/plugin.c:2387
 msgid "Project Loaded"
 msgstr "��已��"
 
+#. if (gtk_tree_model_get_iter_first(model, &iter))
+#. {
+#. gtk_tree_model_get(model, &iter, COLUMN_URI, &file, -1);
+#. uri = g_strdup(file);
+#. }
+#. else
+#. uri = g_strdup("");
+#: ../plugins/project-manager/dialogs.c:316
+msgid "Select sourcesâ?¦"
+msgstr "é?¸æ??ä¾?æº?â?¦"
+
+#: ../plugins/project-manager/dialogs.c:521
+#| msgid "Class Name:"
+msgid "Full Name:"
+msgstr "å?¨å??ï¼?"
+
+#: ../plugins/project-manager/dialogs.c:669
+msgid "Group properties"
+msgstr "群�屬�"
+
+#: ../plugins/project-manager/dialogs.c:672
+msgid "Target properties"
+msgstr "��屬�"
+
+#: ../plugins/project-manager/dialogs.c:675
+#| msgid "Group properties"
+msgid "Source properties"
+msgstr "ä¾?æº?ç??屬æ?§"
+
+#: ../plugins/project-manager/dialogs.c:776
+#: ../plugins/project-manager/dialogs.c:787
+msgid "Cannot add group"
+msgstr "����群�"
+
+#: ../plugins/project-manager/dialogs.c:788
+msgid "No parent group selected"
+msgstr "æ²?æ??é?¸æ??ä¸?層群çµ?"
+
+#: ../plugins/project-manager/dialogs.c:998
+#: ../plugins/project-manager/dialogs.c:1008
+msgid "Cannot add source files"
+msgstr "������碼��"
+
+#: ../plugins/project-manager/dialogs.c:1009
+msgid "The selected node cannot contains source files."
+msgstr "é?¸å??ç??ç¯?é»?ä¸?è?½å??å?«ä¾?æº?æª?ã??"
+
+#: ../plugins/project-manager/dialogs.c:1191
+#: ../plugins/project-manager/dialogs.c:1202
+msgid "Cannot add target"
+msgstr "������"
+
+#: ../plugins/project-manager/dialogs.c:1203
+msgid "No group selected"
+msgstr "æ²?æ??é?¸å??群çµ?"
+
+#: ../plugins/project-manager/dialogs.c:1354
+#: ../plugins/project-manager/dialogs.c:1365
+#| msgid "Cannot add source files"
+msgid "Cannot add modules"
+msgstr "����模�"
+
+#: ../plugins/project-manager/dialogs.c:1366
+msgid "No target has been selected"
+msgstr "å°?æ?ªé?¸æ??ç?®æ¨?"
+
+#. Missing module name
+#: ../plugins/project-manager/dialogs.c:1569
+#| msgid "Missing tool name"
+msgid "Missing module name"
+msgstr "缺å°?模çµ?å??稱"
+
+#: ../plugins/project-manager/dialogs.c:1631
+#| msgid "Cannot add target"
+msgid "Cannot add packages"
+msgstr "�����件"
+
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
 msgid "Details"
 msgstr "詳細è³?æ??"
@@ -7250,9 +7165,6 @@ msgid "Message"
 msgstr "��"
 
 #: ../plugins/project-wizard/druid.c:233
-#| msgid ""
-#| "<b>Confirm the following information:</b>\n"
-#| "\n"
 msgid "Confirm the following information:"
 msgstr "確�以����"
 
@@ -7278,14 +7190,12 @@ msgstr ""
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?輸å?¥å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:642
-#, c-format
-msgid "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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?æ??åº?ç·?é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?ã??æ¸?è??å??é»?ã??è«?修正å®?ã??"
+msgid "Field \"%s\" must contains only letters, digits or the following characters \"#$:%+, = ^_`~\". In addition you cannot have a leading dash. Please fix it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?æ??ä¸?å??å­?å?? \"#$:%+, = ^_`~\"ã??æ­¤å¤?æ?¨ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:647
-#, 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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?æ??ç?®é??å??é??å­?å??é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?ã??ç?®é??å??é??å­?å??ã??æ¸?è??å??é»?ã??è«?修正å®?ã??"
+msgid "Field \"%s\" must contains only letters, digits, the following characters \"#$:%+, = ^_`~\" or directory separators. In addition you cannot have a leading dash. Please fix it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?ã??ä¸?å??å­?å?? \"#$:%+, = ^_`~\" æ??ç?®é??å??é??符ã??æ­¤å¤?æ?¨ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:652
 #, c-format
@@ -7310,7 +7220,7 @@ msgstr "ç?¡æ??ç??é ?ç?®"
 msgid "Dubious entry"
 msgstr "ä¸?確å®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:884
+#: ../plugins/project-wizard/druid.c:881
 #, c-format
 msgid ""
 "\n"
@@ -7319,7 +7229,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:895
+#: ../plugins/project-wizard/druid.c:892
 #, c-format
 msgid ""
 "\n"
@@ -7328,23 +7238,23 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?件ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:904
+#: ../plugins/project-wizard/druid.c:901
 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:912
+#: ../plugins/project-wizard/druid.c:909
 msgid "Install missing packages"
 msgstr "å®?è£?缺å°?ç??å¥?件"
 
-#: ../plugins/project-wizard/druid.c:920
+#: ../plugins/project-wizard/druid.c:917
 msgid "The missing programs are usually part of some distrubution packages and can 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:928
+#: ../plugins/project-wizard/druid.c:925
 msgid "Missing components"
 msgstr "é?ºå¤±å??件"
 
-#: ../plugins/project-wizard/druid.c:1060
+#: ../plugins/project-wizard/druid.c:1057
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?建ç«?å°?æ¡?å?©ç??使ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7386,7 +7296,6 @@ msgstr "正����%s"
 
 #: ../plugins/project-wizard/plugin.c:50
 #, c-format
-#| msgid "Unable to find any project template in %s"
 msgid "Unable to extract project template %s: %s"
 msgstr "ç?¡æ³?解é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 
@@ -7394,36 +7303,36 @@ msgstr "ç?¡æ³?解é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 msgid "New Project Assistant"
 msgstr "æ?°å°?æ¡?å?©ç??"
 
-#: ../plugins/project-wizard/property.c:343
-#: ../plugins/project-wizard/property.c:454
+#: ../plugins/project-wizard/property.c:338
+#: ../plugins/project-wizard/property.c:449
 msgid "No"
 msgstr "å?¦"
 
-#: ../plugins/project-wizard/property.c:354
+#: ../plugins/project-wizard/property.c:349
 msgid "Select directory"
 msgstr "é?¸æ??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:362
+#: ../plugins/project-wizard/property.c:357
 msgid "Select file"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:412
+#: ../plugins/project-wizard/property.c:407
 #: ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é?¸æ??å??ç??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:437
-#: ../plugins/project-wizard/property.c:527
+#: ../plugins/project-wizard/property.c:432
+#: ../plugins/project-wizard/property.c:522
 #: ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é?¸æ??å??示"
 
-#: ../plugins/project-wizard/property.c:497
+#: ../plugins/project-wizard/property.c:492
 msgid "Choose directory"
 msgstr "é?¸å??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:501
+#: ../plugins/project-wizard/property.c:496
 msgid "Choose file"
 msgstr "é?¸å??æª?æ¡?"
 
@@ -7516,7 +7425,7 @@ msgstr "����"
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:8
 #: ../plugins/project-wizard/templates/library.wiz.in.h:8
 msgid "Berkeley Software Distribution License (BSD)"
-msgstr "æ??å??è??è»?é«?æ?£ä½?許å?¯è­? ï¼?BSDï¼?"
+msgstr "æ??å??è??è»?é«?æ?£å¸?許å?¯è­? ï¼?BSDï¼?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:9
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:9
@@ -7721,7 +7630,6 @@ msgstr "����"
 #: ../plugins/project-wizard/templates/python.wiz.in.h:24
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/library.wiz.in.h:26
-#| msgid "Require Package:"
 msgid "Required Packages:"
 msgstr "é??è¦?ç??å¥?件ï¼?"
 
@@ -8044,12 +7952,10 @@ msgid "Generic python (automake)"
 msgstr "�� python (automake)"
 
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:19
-#| msgid "Generic java (automake)"
 msgid "PyGTK (automake)"
 msgstr "PyGTK (automake)"
 
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:20
-#| msgid "Project name"
 msgid "PyGTK project using automake"
 msgstr "PyGTK å°?æ¡?ï¼?使ç?¨ automake å°?æ¡?管ç??"
 
@@ -8182,7 +8088,7 @@ msgid "Working Directory:"
 msgstr "å·¥ä½?ç?®é??ï¼?"
 
 #. Only local directory are supported
-#: ../plugins/run-program/execute.c:107
+#: ../plugins/run-program/execute.c:108
 #, c-format
 msgid "Program directory '%s' is not local"
 msgstr "ç¨?å¼?ç?®é??ã??%sã??ä¸?å?¨æ?¬å?°ç«¯"
@@ -8239,154 +8145,142 @@ msgstr "設å®?ç?®å??ç??ç¨?å¼?ã??å¼?æ?¸ç­?ç­?ã??"
 msgid "Run operations"
 msgstr "å?·è¡?æ??ä½?"
 
+#: ../plugins/run-program/org.gnome.anjuta.run.gschema.xml.in.h:1
+msgid "Command used for starting a terminal"
+msgstr "ç?¨ä¾?å??å??çµ?端æ©?ç??æ??令"
+
 #: ../plugins/search/anjuta-search.ui.h:1
 msgid "Actions"
 msgstr "å??ä½?"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-#: ../plugins/search/search-replace.c:92
+#: ../plugins/search/search-replace.c:91
 msgid "Backward"
 msgstr "å??å¾?"
 
 #: ../plugins/search/anjuta-search.ui.h:3
-msgid "Basic Search & Replace"
-msgstr "å?ºæ?¬æ??å°?å??å??代"
-
-#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "é?¸æ??ç?®é??ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:5
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Files:"
 msgstr "é?¸æ??æª?æ¡?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:6
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Expand regex back references"
 msgstr "æ?´å??æ­£è¦?表示å¼?å??å??å??ç?§"
 
-#: ../plugins/search/anjuta-search.ui.h:7
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "File Filter"
 msgstr "æª?æ¡?é??濾æ¢?件"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:7
 msgid "Find & Replace"
 msgstr "æ??å°?å??å??代"
 
-#: ../plugins/search/anjuta-search.ui.h:9
-#: ../plugins/search/search-replace.c:91
+#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/search-replace.c:90
 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:10
-#: ../plugins/search/search-replace.c:90
+#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/search-replace.c:89
 msgid "Full Buffer"
 msgstr "ç·©è¡?å??å?¨é?¨"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:10
 msgid "Greedy matching"
 msgstr "Greedy matching"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Ignore Binary Files"
 msgstr "忽ç?¥äº?å??æª?æ¡?"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Directories:"
 msgstr "忽ç?¥ç?®é??ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Files:"
 msgstr "忽����"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Hidden Directories"
 msgstr "忽ç?¥é?±è??ç??ç?®é??"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Files"
 msgstr "忽ç?¥é?±è??ç??æª?æ¡?"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Match at start of word"
 msgstr "æ¯?å°?å­?ç??é??é ­"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match complete lines"
-msgstr "����"
+msgstr "æ¯?å°?æ?´å??"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete words"
 msgstr "æ¯?å°?æ?´å??å­?"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Maximum Actions"
 msgstr "æ??大å??ä½?æ?¸"
 
-#: ../plugins/search/anjuta-search.ui.h:22
-msgid "Modify"
-msgstr "修�"
-
-#: ../plugins/search/anjuta-search.ui.h:23
-msgid "New Name:"
-msgstr "æ?°å??稱ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "No Limit"
 msgstr "ä¸?é??å?¶"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "Parameters"
 msgstr "å??æ?¸"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "Regular expression"
 msgstr "正�表示�"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:25
 msgid "Replace With:"
 msgstr "å??代ç?ºï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Search Action:"
 msgstr "æ??å°?å??ä½?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Search Direction:"
 msgstr "æ??å°?æ?¹å??ï¼?"
 
 #. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.ui.h:33
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Expression"
 msgstr "æ??å°?è©?å?¥"
 
 #. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:32
 msgid "Search Expression:"
 msgstr "æ??å°?è©?å?¥ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search In:"
 msgstr "æ??å°?æ?¼ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:34
 msgid "Search Recursively"
 msgstr "é??è¿´æ??å°?"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Target"
 msgstr "æ??å°?ç?®æ¨?"
 
 #. User can select variables that contain lists of files, so this is a combined noun
-#: ../plugins/search/anjuta-search.ui.h:40
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search variable"
 msgstr "æ??å°?è®?æ?¸"
 
-#: ../plugins/search/anjuta-search.ui.h:41
-msgid "Setting"
-msgstr "設��"
-
 #: ../plugins/search/plugin.c:68
 msgid "_Findâ?¦"
 msgstr "å°?æ?¾(_F)â?¦"
@@ -8397,7 +8291,7 @@ msgstr "å?¨ç·¨è¼¯å?¨æ??å°?å­?串æ??æ­£è¦?表示å¼?"
 
 #: ../plugins/search/plugin.c:71
 msgid "Find _Next"
-msgstr "æ??å°?ä¸?ä¸?å?? (_N)"
+msgstr "æ??å°?ä¸?ä¸?å??(_N)"
 
 #: ../plugins/search/plugin.c:72
 #: ../plugins/search/plugin.c:76
@@ -8433,107 +8327,103 @@ msgstr "å?¨å¤?å??æª?æ¡?æ??ç?®é??å?§æ??å°?æ??å®?å?¥å­?"
 msgid "Searchingâ?¦"
 msgstr "æ??å°?中â?¦"
 
-#: ../plugins/search/search_preferences.c:44
-msgid "Basic Search"
-msgstr "å?ºæ?¬æ??å°?"
-
-#: ../plugins/search/search-replace.c:97
+#: ../plugins/search/search-replace.c:96
 msgid "Current Buffer"
 msgstr "ç?®å??ç??ç·©è¡?å??"
 
-#: ../plugins/search/search-replace.c:98
+#: ../plugins/search/search-replace.c:97
 msgid "Current Selection"
 msgstr "ç?®å??é?¸å??å??å??"
 
-#: ../plugins/search/search-replace.c:99
+#: ../plugins/search/search-replace.c:98
 msgid "Current Block"
 msgstr "ç?®å??æ??å?¨å??å¡?"
 
-#: ../plugins/search/search-replace.c:100
+#: ../plugins/search/search-replace.c:99
 msgid "Current Function"
 msgstr "ç?®å??æ??å?¨å?½å¼?"
 
-#: ../plugins/search/search-replace.c:101
+#: ../plugins/search/search-replace.c:100
 msgid "All Open Buffers"
 msgstr "æ??æ??å·²é??å??ç??ç·©è¡?å??"
 
-#: ../plugins/search/search-replace.c:102
+#: ../plugins/search/search-replace.c:101
 msgid "All Project Files"
 msgstr "å°?æ¡?中ç??å?¨é?¨æª?æ¡?"
 
 #. {SR_VARIABLE, N_("Specify File List")},
-#: ../plugins/search/search-replace.c:104
+#: ../plugins/search/search-replace.c:103
 msgid "Specify File Patterns"
 msgstr "æ??å®?æª?æ¡?樣å¼?"
 
-#: ../plugins/search/search-replace.c:109
+#: ../plugins/search/search-replace.c:108
 msgid "Select next match"
 msgstr "é?¸æ??ä¸?ä¸?å??符å??ç??é ?ç?®"
 
-#: ../plugins/search/search-replace.c:110
+#: ../plugins/search/search-replace.c:109
 msgid "Bookmark all matched lines"
-msgstr "å°?æ??æ??符å??ç??è¡?å? ä¸?æ?¸ç±¤"
+msgstr "å°?æ??æ??符å??ç??å??å? ä¸?æ?¸ç±¤"
 
-#: ../plugins/search/search-replace.c:111
+#: ../plugins/search/search-replace.c:110
 msgid "Mark all matches"
 msgstr "æ¨?è¨?æ??æ??符å??ç??é ?ç?®"
 
-#: ../plugins/search/search-replace.c:112
+#: ../plugins/search/search-replace.c:111
 msgid "List matches in find pane"
 msgstr "å?¨å°?æ?¾çª?格中å??å?ºç¬¦å??é ?"
 
-#: ../plugins/search/search-replace.c:113
+#: ../plugins/search/search-replace.c:112
 msgid "Replace next match"
 msgstr "å??代ä¸?ä¸?å??符å??ç??é ?ç?®"
 
-#: ../plugins/search/search-replace.c:114
+#: ../plugins/search/search-replace.c:113
 msgid "Replace all matches"
 msgstr "å?¨é?¨å??代符å??ç??é ?ç?®"
 
 #. Avoid space in translated string
-#: ../plugins/search/search-replace.c:319
+#: ../plugins/search/search-replace.c:312
 msgid "Find:"
 msgstr "å°?æ?¾:"
 
-#: ../plugins/search/search-replace.c:501
+#: ../plugins/search/search-replace.c:494
 msgid "Replace"
 msgstr "å??代"
 
-#: ../plugins/search/search-replace.c:630
+#: ../plugins/search/search-replace.c:623
 msgid "Search complete"
 msgstr "æ??å°?å®?æ??"
 
-#: ../plugins/search/search-replace.c:1044
-#: ../plugins/search/search-replace.c:1731
+#: ../plugins/search/search-replace.c:1037
+#: ../plugins/search/search-replace.c:1714
 msgid "Replace All"
 msgstr "å?¨é?¨å??代"
 
-#: ../plugins/search/search-replace.c:1083
+#: ../plugins/search/search-replace.c:1076
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??å?¥å­?ã??æ?¯å?¦è¦?å¾?é ­é??å§?æ??å°?ï¼?"
 
-#: ../plugins/search/search-replace.c:1103
+#: ../plugins/search/search-replace.c:1096
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "æ?¾ä¸?å?°ç¬¦å??ã??%sã??ç??é ?ç?®ã??"
 
-#: ../plugins/search/search-replace.c:1118
+#: ../plugins/search/search-replace.c:1111
 msgid "The maximum number of results has been reached."
 msgstr "å·²é??å?°çµ?æ??ç??æ??大æ?¸é??ã??"
 
-#: ../plugins/search/search-replace.c:1131
+#: ../plugins/search/search-replace.c:1124
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "å·²å??代 %d å??符å??é ?ã??"
 
-#: ../plugins/search/search-replace.c:1298
+#: ../plugins/search/search-replace.c:1289
 msgid "Unable to build user interface for Search and Replace"
 msgstr "ç?¡æ³?建ç«?æ??å°?è??å??代使ç?¨è??ä»?é?¢"
 
-#: ../plugins/snippets-manager/plugin.c:60
-#: ../plugins/snippets-manager/plugin.c:302
+#: ../plugins/snippets-manager/plugin.c:62
+#: ../plugins/snippets-manager/plugin.c:304
 #: ../plugins/snippets-manager/snippets-browser.c:208
 msgid "Snippets"
 msgstr "æ??å­?ç??段"
@@ -8542,11 +8432,11 @@ msgstr "æ??å­?ç??段"
 #. shortcut for the trigger-key based insertion of snippets. It's called like this
 #. because you type the trigger-key in the editor, followed by Trigger Insert and
 #. the snippet gets inserted.
-#: ../plugins/snippets-manager/plugin.c:71
+#: ../plugins/snippets-manager/plugin.c:73
 msgid "_Trigger insert"
 msgstr "觸ç?¼æ??å?¥(_T)"
 
-#: ../plugins/snippets-manager/plugin.c:73
+#: ../plugins/snippets-manager/plugin.c:75
 msgid "Insert a snippet using the trigger-key"
 msgstr "使ç?¨è§¸ç?¼é?µæ??å?¥æ??å­?ç??段"
 
@@ -8556,55 +8446,49 @@ msgstr "使ç?¨è§¸ç?¼é?µæ??å?¥æ??å­?ç??段"
 #. most relevant snippets are returned in a pop-up like the auto-complete one
 #. (they are showed by their names). After selecting one of them, the snippet gets
 #. inserted.
-#: ../plugins/snippets-manager/plugin.c:84
-#| msgid "Auto-complete"
+#: ../plugins/snippets-manager/plugin.c:86
 msgid "_Auto complete insert"
 msgstr "è?ªå??è£?é½?æ??å?¥(_A)"
 
-#: ../plugins/snippets-manager/plugin.c:86
-#| msgid "Add a space after function call autocompletion"
+#: ../plugins/snippets-manager/plugin.c:88
 msgid "Insert a snippet using auto-completion"
 msgstr "使ç?¨è?ªå??è£?é½?æ??å?¥æ??å­?ç??段"
 
-#: ../plugins/snippets-manager/plugin.c:91
+#: ../plugins/snippets-manager/plugin.c:93
 msgid "_Import snippets â?¦"
 msgstr "å?¯å?¥æ??å­?ç??段(_I)â?¦"
 
-#: ../plugins/snippets-manager/plugin.c:93
+#: ../plugins/snippets-manager/plugin.c:95
 msgid "Import snippets to the database"
 msgstr "å°?æ??å­?ç??段å?¯å?¥è³?æ??庫"
 
-#: ../plugins/snippets-manager/plugin.c:98
+#: ../plugins/snippets-manager/plugin.c:100
 msgid "_Export snippets â?¦"
 msgstr "å?¯å?ºæ??å­?ç??段(_E)â?¦"
 
-#: ../plugins/snippets-manager/plugin.c:100
+#: ../plugins/snippets-manager/plugin.c:102
 msgid "Export snippets from the database"
 msgstr "å¾?è³?æ??庫å?¯å?ºæ??å­?ç??段"
 
-#: ../plugins/snippets-manager/plugin.c:327
-#| msgid "Project manager actions"
+#: ../plugins/snippets-manager/plugin.c:329
 msgid "Snippets Manager actions"
 msgstr "æ??å­?管ç??å?¡å??ä½?"
 
-#: ../plugins/snippets-manager/plugin.c:767
-#| msgid "Command"
+#: ../plugins/snippets-manager/plugin.c:773
 msgid "Command?"
 msgstr "æ??令ï¼?"
 
-#: ../plugins/snippets-manager/plugin.c:783
-#| msgid "Variable list"
+#: ../plugins/snippets-manager/plugin.c:789
 msgid "Variable text"
 msgstr "è®?æ?¸æ??å­?"
 
-#: ../plugins/snippets-manager/plugin.c:801
+#: ../plugins/snippets-manager/plugin.c:807
 #: ../plugins/snippets-manager/snippets-editor.c:40
-#| msgid "Inspect/Evaluate"
 msgid "Instant value"
 msgstr "å?³æ??æ?¸å?¼"
 
-#: ../plugins/snippets-manager/plugin.c:929
-#: ../plugins/snippets-manager/plugin.c:966
+#: ../plugins/snippets-manager/plugin.c:936
+#: ../plugins/snippets-manager/plugin.c:973
 #: ../plugins/snippets-manager/snippets-provider.c:753
 #: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:2
 msgid "Code Snippets"
@@ -8615,24 +8499,20 @@ msgid "Trigger"
 msgstr "觸�"
 
 #: ../plugins/snippets-manager/snippets-browser.c:560
-#| msgid "Language Manager"
 msgid "Languages"
 msgstr "��"
 
 #. Insert the Add Snippet menu item
 #: ../plugins/snippets-manager/snippets-browser.c:808
-#| msgid "Add _Targetâ?¦"
 msgid "Add Snippet â?¦"
 msgstr "å? å?¥æ??å­?ç??段â?¦"
 
 #. Insert the Add Snippets Group menu item
 #: ../plugins/snippets-manager/snippets-browser.c:818
-#| msgid "Add _Groupâ?¦"
 msgid "Add Snippets Group â?¦"
 msgstr "å? å?¥æ??å­?ç??段群çµ?â?¦"
 
 #: ../plugins/snippets-manager/snippets-editor.c:39
-#| msgid "Default"
 msgid "Default value"
 msgstr "�設�"
 
@@ -8645,8 +8525,6 @@ msgid "<b>Error:</b> The trigger key is already in use for one of the languages!
 msgstr "<b>é?¯èª¤ï¼?</b>é??å??觸ç?¼é?µå·²ç¶?ç?¨æ?¼å?¶ä¸­ä¸?種èª?è¨?ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.c:50
-#| msgid ""
-#| "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgid "<b>Error:</b> The trigger key can only contain alphanumeric characters and _ !"
 msgstr "<b>é?¯èª¤ï¼?</b>觸ç?¼é?µå?ªè?½å??å?«è?±æ??å­?æ¯?å?? _ï¼?"
 
@@ -8663,12 +8541,10 @@ msgid "<b>Warning:</b> You should choose a name for the snippet!"
 msgstr "<b>è­¦å??ï¼?</b>æ?¨æ??該ç?ºæ??å­?ç??段é?¸æ??ä¸?å??å??稱ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:3
-#| msgid "_Add"
 msgid "Add"
 msgstr "å? å?¥"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:4
-#| msgid "Close All"
 msgid "Close"
 msgstr "é??é??"
 
@@ -8685,12 +8561,10 @@ msgid "Keywords:"
 msgstr "é??é?µå­?ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:8
-#| msgid "Changes:"
 msgid "Languages:"
 msgstr "���"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:9
-#| msgid "_Print Preview"
 msgid "Preview"
 msgstr "�覽"
 
@@ -8711,22 +8585,18 @@ msgstr ""
 "å??稱ç??ä½?ç?¨å®?å?¨æ?¯ç?¨ä¾?辦è­?è??å·²ã??"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:16
-#| msgid "Contents"
 msgid "Snippet Content"
 msgstr "æ??å­?ç??段å?§å®¹"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:17
-#| msgid "New Name:"
 msgid "Snippet Name:"
 msgstr "æ??å­?ç??段å??稱ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:18
-#| msgid "Properties"
 msgid "Snippet Properties"
 msgstr "æ??å­?ç??段屬æ?§"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:19
-#| msgid "Environment Variables:"
 msgid "Snippet Variables"
 msgstr "æ??å­?ç??段è®?æ?¸"
 
@@ -8747,12 +8617,10 @@ msgid "Trigger Key:"
 msgstr "觸���"
 
 #: ../plugins/snippets-manager/snippets-manager-preferences.ui.h:1
-#| msgid "Anjuta macros"
 msgid "Anjuta variables"
 msgstr "Anjuta è®?æ?¸"
 
 #: ../plugins/snippets-manager/snippets-import-export.c:145
-#| msgid "Import options"
 msgid "Import Snippets"
 msgstr "å?¯å?¥æ??å­?ç??段"
 
@@ -8760,7 +8628,7 @@ msgstr "å?¯å?¥æ??å­?ç??段"
 msgid "Export Snippets"
 msgstr "å?¯å?ºæ??å­?ç??段"
 
-#: ../plugins/sourceview/sourceview.c:478
+#: ../plugins/sourceview/sourceview.c:481
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8769,7 +8637,7 @@ msgstr ""
 "å?¨ç¡¬ç¢?å?§æª?æ¡?ã?? %sã?? ç??å?§å®¹æ¯?ç?®å??ç??ç·©è¡?å??å?§å®¹é??è¦?æ?°ã??\n"
 "æ?¯å?¦è¦?é??æ?°è¼?å?¥å®?ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:515
+#: ../plugins/sourceview/sourceview.c:518
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8779,18 +8647,18 @@ msgstr ""
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:552
+#: ../plugins/sourceview/sourceview.c:555
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "ç?¡æ³?é??å?? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview.c:606
+#: ../plugins/sourceview/sourceview.c:609
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æª?æ¡?ã??%sã??æ?¯å?¯è®?ç??ï¼?ä»?ç?¶è¦?編輯å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:665
+#: ../plugins/sourceview/sourceview.c:668
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "������ %s�%s"
@@ -8809,6 +8677,30 @@ msgstr "���� %d"
 msgid "Preparing pages for printing"
 msgstr "æ­£å?¨æº?å??é ?é?¢ä»¥æ??ä¾?å??å?°"
 
+#: ../plugins/sourceview/sourceview-print.c:111
+msgid "Wrap lines"
+msgstr "æ??å??"
+
+#: ../plugins/sourceview/sourceview-print.c:113
+#| msgid "Show Line Numbers"
+msgid "Line numbers"
+msgstr "å??è??"
+
+#: ../plugins/sourceview/sourceview-print.c:115
+#| msgid "Head"
+msgid "Header"
+msgstr "��"
+
+#: ../plugins/sourceview/sourceview-print.c:117
+#| msgid "Filter"
+msgid "Footer"
+msgstr "é ?å°¾"
+
+#: ../plugins/sourceview/sourceview-print.c:119
+#| msgid "_Highlight Mode"
+msgid "Highlight source code"
+msgstr "æ¨?示å??å§?碼"
+
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:1
 msgid "Color scheme:"
 msgstr "é¡?è?²é??ç½®ï¼?"
@@ -8846,90 +8738,66 @@ msgid "Indentation and auto-format options"
 msgstr "縮æ??è??è?ªå??æ ¼å¼?é?¸é ?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
-msgid "Print line numbers"
-msgstr "å??å?°è¡?è??"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
-msgid "Print options"
-msgstr "å??å?°é?¸é ?"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
-msgid "Print page footer"
-msgstr "å??å?°é ?å°¾"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
-msgid "Print page header"
-msgstr "å??å?°é ?é¦?"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
-msgid "Printing"
-msgstr "æ­£å?¨å??å?°"
-
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Right margin position in characters"
 msgstr "å?³é??ç??ä½?ç½®(以å­?å??è¨?)"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
 msgid "Show line numbers"
-msgstr "顯示è¡?è??"
+msgstr "顯示å??è??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
 msgid "Show marks"
 msgstr "顯示��"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
 msgid "Show right margin"
 msgstr "顯示å?³é??ç??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
 msgid "Tab size in spaces:"
 msgstr "Tab 大�(空��):"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Use tabs for indentation"
 msgstr "使ç?¨ tabs 縮æ??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Use theme font"
 msgstr "使ç?¨ä¸»é¡?ç??å­?å??"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
-#: ../src/anjuta-app.c:629
-#: ../src/anjuta-app.c:634
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../src/anjuta-app.c:631
+#: ../src/anjuta-app.c:636
 msgid "View"
 msgstr "顯示"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:25
-msgid "Wrap long lines to fit on paper"
-msgstr "ä¾?é ?é?¢å°?é??é?·ç??æ??å­?æ??è¡?"
-
 #: ../plugins/starter/plugin.c:70
-#: ../plugins/starter/starter.c:362
+#: ../plugins/starter/starter.c:353
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "èµ·æ­¥"
 
-#: ../plugins/starter/starter.c:403
+#: ../plugins/starter/starter.c:394
 msgid "Create File/Project"
 msgstr "建���/��"
 
-#: ../plugins/starter/starter.c:437
+#: ../plugins/starter/starter.c:428
 msgid "Recent Projects"
 msgstr "æ??è¿?é??å??ç??å°?æ¡?"
 
-#: ../plugins/starter/starter.c:468
+#: ../plugins/starter/starter.c:459
 msgid "Links"
 msgstr "��"
 
-#: ../plugins/starter/starter.c:487
+#: ../plugins/starter/starter.c:478
 msgid "Anjuta Home Page"
 msgstr "Anjuta ç??é¦?é ?"
 
-#: ../plugins/starter/starter.c:493
+#: ../plugins/starter/starter.c:484
 msgid "Anjuta Manual"
 msgstr "Anjuta æ??å??"
 
-#: ../plugins/starter/starter.c:499
+#: ../plugins/starter/starter.c:490
 msgid "GNOME Online API Documentation"
 msgstr "GNOME ç·?ä¸? API æ??件"
 
@@ -9384,7 +9252,7 @@ msgstr "主æ©?å??稱:"
 
 #: ../plugins/subversion/svn-command.c:205
 msgid "Fingerprint:"
-msgstr "æ?¸ä½?æ??ç´?"
+msgstr "æ?¸ä½?æ??ç´?ï¼?"
 
 #: ../plugins/subversion/svn-command.c:206
 msgid "Valid from:"
@@ -9454,65 +9322,65 @@ msgstr "�失� %s"
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
 
-#: ../plugins/symbol-db/plugin.c:315
+#: ../plugins/symbol-db/plugin.c:317
 msgid "Tag De_claration"
 msgstr "æ¨?籤宣å??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:319
 msgid "Go to symbol declaration"
 msgstr "移è?³ä¸?ä¸?å??符è??宣å??"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:324
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag _Implementation"
 msgstr "�籤實�(_I)"
 
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:328
 msgid "Go to symbol definition"
 msgstr "移è?³ä¸?ä¸?å??符è??å®?義"
 
-#: ../plugins/symbol-db/plugin.c:333
+#: ../plugins/symbol-db/plugin.c:335
 msgid "_Find Symbolâ?¦"
 msgstr "å°?æ?¾ç¬¦è??(_F)â?¦"
 
-#: ../plugins/symbol-db/plugin.c:334
+#: ../plugins/symbol-db/plugin.c:336
 msgid "Find Symbol"
 msgstr "å°?æ?¾ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:1011
+#: ../plugins/symbol-db/plugin.c:1013
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ­£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1016
+#: ../plugins/symbol-db/plugin.c:1018
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?%3$d å??æª?æ¡?中已æ??æ?? %2$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1047
+#: ../plugins/symbol-db/plugin.c:1049
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "æ­£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1049
+#: ../plugins/symbol-db/plugin.c:1051
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%2$d å??æª?æ¡?中已æ??æ?? %1$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1726
+#: ../plugins/symbol-db/plugin.c:1786
 msgid "Populating symbol databaseâ?¦"
 msgstr "æ­£å?¨é?·ç§»ç¬¦è??è³?æ??庫â?¦"
 
-#: ../plugins/symbol-db/plugin.c:2045
-#: ../plugins/symbol-db/plugin.c:2130
+#: ../plugins/symbol-db/plugin.c:2106
+#: ../plugins/symbol-db/plugin.c:2191
 msgid "Symbols"
 msgstr "符è??"
 
-#: ../plugins/symbol-db/plugin.c:2139
+#: ../plugins/symbol-db/plugin.c:2200
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2147
+#: ../plugins/symbol-db/plugin.c:2208
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
@@ -9520,13 +9388,13 @@ msgstr "SymbolDb é?¸å?®å??ä½?"
 msgid "Package is not parseable"
 msgstr "å¥?件æ?¯ç?¡æ³?解æ??ç??"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:374
+#: ../plugins/symbol-db/symbol-db-prefs.c:375
 #: ../plugins/symbol-db/symbol-db-prefs.c:522
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "符è??è³?æ??庫"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:471
+#: ../plugins/symbol-db/symbol-db-prefs.c:472
 msgid "API Tags"
 msgstr "API �籤"
 
@@ -9578,30 +9446,30 @@ msgstr "使ç?¨ GNOME çµ?端æ©?設å®?çµ?å??ï¼?"
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "使ç?¨ç?®å??å?¨ GNOME çµ?端æ©?中é?¸å??ç??設å®?çµ?å??"
 
-#: ../plugins/terminal/terminal.c:633
+#: ../plugins/terminal/terminal.c:578
 msgid "Ctrl-C"
 msgstr "Ctrl-C"
 
-#: ../plugins/terminal/terminal.c:641
+#: ../plugins/terminal/terminal.c:586
 msgid "Ctrl-X"
 msgstr "Ctrl-X"
 
-#: ../plugins/terminal/terminal.c:649
+#: ../plugins/terminal/terminal.c:594
 msgid "Ctrl-Z"
 msgstr "Ctrl-Z"
 
-#: ../plugins/terminal/terminal.c:788
+#: ../plugins/terminal/terminal.c:732
 msgid "terminal operations"
 msgstr "çµ?端æ©?æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:806
-#: ../plugins/terminal/terminal.c:982
-#: ../plugins/terminal/terminal.c:1035
+#: ../plugins/terminal/terminal.c:750
+#: ../plugins/terminal/terminal.c:944
+#: ../plugins/terminal/terminal.c:995
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "�端�"
 
-#: ../plugins/terminal/terminal.c:931
+#: ../plugins/terminal/terminal.c:877
 #, c-format
 msgid "Unable to execute command"
 msgstr "ç?¡æ³?å?·è¡?æ??令"
@@ -9650,8 +9518,8 @@ msgid "Tool Editor"
 msgstr "工�編輯�"
 
 #: ../plugins/tools/anjuta-tools.ui.h:18
-#: ../plugins/tools/plugin.c:256
 #: ../plugins/tools/plugin.c:263
+#: ../plugins/tools/plugin.c:270
 #: ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "工�"
@@ -9780,7 +9648,7 @@ msgstr "è¼?å?¥å¤?é?¨å·¥å?·æ??é?¯èª¤"
 msgid "Unable to open %s for writing"
 msgstr "ç?¡æ³?å?¨é??å?? %s ä¾?寫å?¥"
 
-#: ../plugins/tools/plugin.c:179
+#: ../plugins/tools/plugin.c:187
 msgid "Tool operations"
 msgstr "å·¥å?·æ??ä½?"
 
@@ -9965,6 +9833,10 @@ msgstr "å??好設å®?(_P)"
 msgid "Do you prefer coffee to tea? Check it out."
 msgstr "編輯æ?¬ç¨?å¼?ç??æ??é??設å®?ã??"
 
+#: ../src/anjuta-actions.h:38
+msgid "_View"
+msgstr "檢�(_V)"
+
 #: ../src/anjuta-actions.h:40
 msgid "_Reset Dock Layout"
 msgstr "é??設å??é§?é??ç½®(_R)"
@@ -10073,58 +9945,58 @@ msgstr "é??æ?¼å¤?é?¨å¤?æ??ç¨?å¼?(_P)"
 msgid "About third-party Anjuta plugins"
 msgstr "é??æ?¼ç¬¬ä¸?æ?¹ Anjuta å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:625
+#: ../src/anjuta-app.c:627
 msgid "Edit"
 msgstr "編輯"
 
-#: ../src/anjuta-app.c:932
+#: ../src/anjuta-app.c:931
 msgid "Installed plugins"
 msgstr "å·²å®?è£?ç??å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:936
+#: ../src/anjuta-app.c:935
 msgid "Shortcuts"
 msgstr "å¿«æ?·é?µ"
 
-#: ../src/anjuta-app.c:1008
+#: ../src/anjuta-app.c:1007
 #, c-format
 msgid "Value doesn't exist"
 msgstr "����"
 
-#: ../src/main.c:74
+#: ../src/main.c:70
 msgid "Specify the size and location of the main window"
 msgstr "æ??å®?主è¦?è¦?çª?ç??大å°?å??ä½?ç½®"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:77
+#: ../src/main.c:73
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
-#: ../src/main.c:82
+#: ../src/main.c:78
 msgid "Do not show the splash screen"
 msgstr "��顯示歡���"
 
-#: ../src/main.c:88
+#: ../src/main.c:84
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "å??å??æ?°ç??實é«?è??ä¸?å?¨æ?¢å­?ç??實é«?中é??å??æª?æ¡?"
 
-#: ../src/main.c:94
+#: ../src/main.c:90
 msgid "Do not open last session on startup"
 msgstr "å??å??æ??ä¸?è¦?é??å??æ??å¾?ä¸?次ä½?業é??段"
 
-#: ../src/main.c:100
+#: ../src/main.c:96
 msgid "Do not open last project and files on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??é??å??æ??å¾?ä¸?次編輯ç??å°?æ¡?å??æª?æ¡?"
 
-#: ../src/main.c:106
+#: ../src/main.c:102
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "é?©ç?¶ç??é??é?? Anjuta 並é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
 
-#: ../src/main.c:174
+#: ../src/main.c:170
 msgid "- Integrated Development Environment"
 msgstr "- æ?´å??å¼?é??ç?¼ç?°å¢?"
 
-#: ../src/main.c:249
+#: ../src/main.c:245
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -10133,80 +10005,60 @@ msgid "Appearance"
 msgstr "��"
 
 #: ../src/preferences.ui.h:3
-msgid "Default project directory:"
-msgstr "é ?設ç??å°?æ¡?ç?®é??ï¼?"
-
-#: ../src/preferences.ui.h:4
-msgid "Developer email address:"
-msgstr "é??ç?¼è??ç??é?»é?µå?°å??ï¼?"
-
-#: ../src/preferences.ui.h:5
-msgid "Developer name:"
-msgstr "é??ç?¼è??å??稱ï¼?"
-
-#: ../src/preferences.ui.h:6
 msgid "Do not load last project and files on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??è¼?å?¥æ??å¾?ä¸?次å°?æ¡?å??æª?æ¡?"
 
-#: ../src/preferences.ui.h:7
+#: ../src/preferences.ui.h:4
 msgid "Do not load last session on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??è¼?å?¥æ??å¾?ä¸?次ä½?業é??段"
 
 #. Style of the buttons/tabs used to select docked windows in anjuta
-#: ../src/preferences.ui.h:9
+#: ../src/preferences.ui.h:6
 msgid "Dock switcher style:"
 msgstr "å??é§?å??æ??å?¨æ¨£å¼?:"
 
-#: ../src/preferences.ui.h:10
+#: ../src/preferences.ui.h:7
 msgid "GNOME toolbar setting"
 msgstr "GNOME å·¥å?·å??設å®?å?¼"
 
-#: ../src/preferences.ui.h:12
+#: ../src/preferences.ui.h:9
 msgid "Icons"
 msgstr "å??示"
 
-#: ../src/preferences.ui.h:13
+#: ../src/preferences.ui.h:10
 msgid "Icons only"
 msgstr "å?ªæ??å??示"
 
-#: ../src/preferences.ui.h:14
-msgid "Project Defaults"
-msgstr "���設�"
-
-#: ../src/preferences.ui.h:15
-msgid "Select project directory"
-msgstr "é?¸æ??å°?æ¡?ç?®é??"
-
-#: ../src/preferences.ui.h:16
+#: ../src/preferences.ui.h:11
 msgid "Session"
 msgstr "ä½?業é??段"
 
-#: ../src/preferences.ui.h:17
+#: ../src/preferences.ui.h:12
 msgid "Tabs"
 msgstr "å??é ?"
 
-#: ../src/preferences.ui.h:19
+#: ../src/preferences.ui.h:14
 msgid "Text + Icons"
 msgstr "æ??å­? + å??示"
 
-#: ../src/preferences.ui.h:20
+#: ../src/preferences.ui.h:15
 msgid "Text below icons"
 msgstr "æ??å­?å?¨å??示ä¸?æ?¹"
 
-#: ../src/preferences.ui.h:21
+#: ../src/preferences.ui.h:16
 msgid "Text beside icons"
 msgstr "æ??å­?å?¨å??示æ??"
 
-#: ../src/preferences.ui.h:22
+#: ../src/preferences.ui.h:17
 msgid "Text only"
 msgstr "å?ªæ??æ??å­?"
 
 #. translators: translate the same as in gnome-control-center
-#: ../src/preferences.ui.h:24
+#: ../src/preferences.ui.h:19
 msgid "Toolbar button labels:"
 msgstr "å·¥å?·å??æ??é??æ¨?籤:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+#: ../plugins/debug-manager/org.gnome.anjuta.debug-manager.gschema.xml.in.h:1
 msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??ä¸?使ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?顯示警å??"
 
@@ -10226,7 +10078,6 @@ msgstr "è?ªå??è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:4
-#| msgid "Auto-complete"
 msgid "Autocompletion"
 msgstr "è?ªå??è£?é½?"
 
@@ -10264,66 +10115,74 @@ msgid "Indentation parameters"
 msgstr "縮æ??å??æ?¸"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+msgid "Leading asterisk in multi-line comment"
+msgstr "å¤?è¡?註解ç??é??é ­æ??è??"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 msgid "Line up parentheses"
 msgstr "å°?é½?æ?¬è??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 msgid "Parenthesis indentation"
 msgstr "æ?¬è??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+msgid "Prefer vim/emacs modelines over indentation settings"
+msgstr "å??好 vim/emacs modelines å??æ?¼ç¸®æ??設å®?å?¼"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "顯示å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:15
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??縮æ??大å°?(空ç?½å­?å??)ï¼?"
 
 #. ANJUTA_STOCK_AUTOINDENT,
-#: ../plugins/language-support-cpp-java/plugin.c:1882
-#: ../plugins/language-support-python/plugin.c:1182
+#: ../plugins/language-support-cpp-java/plugin.c:1920
+#: ../plugins/language-support-python/plugin.c:1185
 msgid "Auto-Indent"
 msgstr "è?ªå??縮æ??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1883
-#: ../plugins/language-support-python/plugin.c:1183
+#: ../plugins/language-support-cpp-java/plugin.c:1921
+#: ../plugins/language-support-python/plugin.c:1186
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "ä¾?縮æ??設å®?å?¼è?ªå??縮æ??ç?®å??ç??è¡?æ??é?¸æ??å??å??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1888
+#: ../plugins/language-support-cpp-java/plugin.c:1926
 msgid "Swap .h/.c"
 msgstr "ç?¸äº?å??æ?? .h /.c æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1889
+#: ../plugins/language-support-cpp-java/plugin.c:1927
 msgid "Swap C header and source files"
 msgstr "å??æ?? C æ¨?é ­æª?è??å??å§?æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1930
+#: ../plugins/language-support-cpp-java/plugin.c:1967
 msgid "C++/Java Assistance"
 msgstr "C++/Java æ?´å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2042
-#: ../plugins/language-support-cpp-java/plugin.c:2055
+#: ../plugins/language-support-cpp-java/plugin.c:2085
+#: ../plugins/language-support-cpp-java/plugin.c:2098
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
-#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1258
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1284
 msgid "C/C++"
 msgstr "C/C++"
 
-#: ../plugins/language-support-python/plugin.c:907
+#: ../plugins/language-support-python/plugin.c:909
 msgid "Python support warning"
 msgstr "Python æ?¯æ?´è­¦å??"
 
-#: ../plugins/language-support-python/plugin.c:915
+#: ../plugins/language-support-python/plugin.c:917
 msgid ""
 "Either python path is wrong or python-rope (http://rope.sf.net) libraries\n"
 "aren't installed. Both are required for autocompletion in python files.\n"
@@ -10333,50 +10192,42 @@ msgstr ""
 "å°?æ?ªå®?è£?ã??é??å?©è??é?½æ?¯ python æª?æ¡?è?ªå??è£?é½?æ??é??ã??\n"
 "è«?å®?è£?å®?å??並ä¸?å?¨å??好設å®?中檢æ?¥ python è·¯å¾?ã??"
 
-#: ../plugins/language-support-python/plugin.c:918
-#| msgid "Do not show again"
+#: ../plugins/language-support-python/plugin.c:920
 msgid "Do not show that warning again"
 msgstr "ä¸?å??顯示é??å??è­¦å??"
 
-#: ../plugins/language-support-python/plugin.c:1264
-#| msgid "Project Assistant"
+#: ../plugins/language-support-python/plugin.c:1267
 msgid "Python Assistance"
 msgstr "Python å?©ç??"
 
-#: ../plugins/language-support-python/plugin.c:1364
-#: ../plugins/language-support-python/plugin.c:1373
-#: ../plugins/language-support-python/python-assist.c:937
-#| msgid "Python Module"
+#: ../plugins/language-support-python/plugin.c:1376
+#: ../plugins/language-support-python/plugin.c:1385
+#: ../plugins/language-support-python/python-assist.c:934
 msgid "Python"
 msgstr "Python"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:3
-#| msgid "Auto-complete"
 msgid "Autocomplete"
 msgstr "è?ªå??å®?æ??"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:7
-#| msgid "Enable smart indentation"
 msgid "Enable adaptive indentation"
 msgstr "å??ç?¨é?©æ??å??縮æ??"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:10
-#| msgid "Environment Variables:"
 msgid "Environment"
 msgstr "��"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:12
-#| msgid "Interface"
 msgid "Interpreter"
 msgstr "�譯�"
 
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:13
-#| msgid "Path:"
 msgid "Path: "
 msgstr "路��"
 
-#: ../plugins/sourceview/plugin.c:232
-#: ../plugins/sourceview/plugin.c:273
+#: ../plugins/sourceview/plugin.c:238
+#: ../plugins/sourceview/plugin.c:279
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView 編輯�"
 
@@ -10580,21 +10431,14 @@ msgstr "èª?è¨?管ç??ç¨?å¼?"
 msgid "Plugin to keep track of multiple programming languages"
 msgstr "ç?¨ä¾?ä¿?æ??å¤?種ç¨?å¼?èª?è¨?è»?è·¡ç??å¤?æ??ç¨?å¼?"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile.plugin.in.h:1
-msgid "Makefile backend"
-msgstr "Makefile �端��"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile.plugin.in.h:2
-msgid "Makefile backend for project manager"
-msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Makefile å¾?端ç¨?å¼?"
-
-#: ../plugins/gbf-am/gbf-am.plugin.in.h:1
+#: ../plugins/am-project/am-project.plugin.in.h:1
 msgid "Autotools backend"
 msgstr "Autotools �端��"
 
-#: ../plugins/gbf-am/gbf-am.plugin.in.h:2
-msgid "Autotools backend for project manager"
-msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Autotools å¾?端ç¨?å¼?"
+#: ../plugins/am-project/am-project.plugin.in.h:2
+#| msgid "Autotools backend for project manager"
+msgid "New Autotools backend for project manager"
+msgstr "å°?æ¡?管ç??ç¨?å¼?ç??æ?° Autotools å¾?端ç¨?å¼?"
 
 #: ../plugins/js-debugger/plugin.c:122
 #, c-format
@@ -10614,12 +10458,12 @@ msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
 msgid "Javascript Debugger Plugin"
 msgstr "Javascript Debugger å¤?æ??ç¨?å¼?"
 
-#: ../plugins/language-support-js/plugin.c:332
-#: ../plugins/language-support-js/plugin.c:341
+#: ../plugins/language-support-js/plugin.c:329
+#: ../plugins/language-support-js/plugin.c:338
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: ../plugins/language-support-js/plugin.c:397
+#: ../plugins/language-support-js/plugin.c:394
 msgid "JS"
 msgstr "JS"
 
@@ -10648,7 +10492,6 @@ msgid "Highlight missed semicolon"
 msgstr "æ¨?示æ¼?æ??ç??å??è??"
 
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
-#| msgid "<b>JS Find dirs</b>"
 msgid "JS Find dirs"
 msgstr "JS Find ç?®é??"
 
@@ -10661,6 +10504,292 @@ msgid "Symbol"
 msgstr "符è??"
 
 #~ msgid ""
+#~ "Are you sure you want to reset the preferences to\n"
+#~ "their default settings?"
+#~ msgstr ""
+#~ "æ?¯å?¦ç¢ºå®?è¦?å°?å??好設å®?å?§ç??å?¨é?¨è¨­å®?\n"
+#~ "å??復æ??é ?設ï¼?"
+
+#~ msgid "Invalid GbfAmConfigValue type"
+#~ msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
+
+#~ msgid "Select Package to add:"
+#~ msgstr "é?¸æ??è¦?å? å?¥ç??å¥?件ï¼?"
+
+#~ msgid "Select package"
+#~ msgstr "é?¸æ??å¥?件"
+
+#~ msgid "Variables"
+#~ msgstr "è®?æ?¸"
+
+#~ msgid "Generic rule"
+#~ msgstr "ä¸?è?¬è¦?å??"
+
+#~ msgid "Extra target"
+#~ msgstr "����"
+
+#~ msgid "Configure file"
+#~ msgstr "設���"
+
+#~ msgid "Interface file"
+#~ msgstr "����"
+
+#~ msgid "GLib mkenums"
+#~ msgstr "GLib mkenums"
+
+#~ msgid "GLib genmarshal"
+#~ msgstr "GLib genmarshal"
+
+#~ msgid "Intl rule"
+#~ msgstr "Intl è¦?å??"
+
+#~ msgid "Group doesn't exist"
+#~ msgstr "群����"
+
+#~ msgid "Target doesn't exist"
+#~ msgstr "�����"
+
+#~ msgid "Invalid or remote path (only local paths supported)"
+#~ msgstr "ç?¡æ??æ??é? ç«¯ç??è·¯å¾?ï¼?å?ªæ?¯æ?´æ?¬å?°ç«¯è·¯å¾?ï¼?"
+
+#~ msgid "Malformed project"
+#~ msgstr "æ ¼å¼?ä¸?正確ç??å°?æ¡?"
+
+#~ msgid "Parent group doesn't exist"
+#~ msgstr "�層群����"
+
+#~ msgid "Group already exists"
+#~ msgstr "群�已���"
+
+#~ msgid "Group couldn't be created"
+#~ msgstr "��建�群�"
+
+#~ msgid "Group couldn't be removed"
+#~ msgstr "��移�群�"
+
+#~ msgid "Target already exists"
+#~ msgstr "��已���"
+
+#~ msgid "General failure in target creation"
+#~ msgstr "ç?®æ¨?建ç«?ç¨?åº?ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
+
+#~ msgid "Newly created target could not be identified"
+#~ msgstr "æ??æ?°å»ºç«?ç??ç?®æ¨?ç?¡æ³?辨è­?"
+
+#~ msgid "Target couldn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "Source doesn't exist"
+#~ msgstr "�����"
+
+#~ msgid ""
+#~ "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+#~ msgstr "ä¾?æº?æª?æ¡?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-' æ?? '.' å­?å??"
+
+#~ msgid "Source file is already in given target"
+#~ msgstr "ä¾?æº?æª?æ¡?å·²å?¨æ??å®?ç??ç?®æ¨?中"
+
+#~ msgid "General failure in adding source file"
+#~ msgstr "å? å?¥ä¾?æº?æª?æ¡?æ??ç?¼ç??ä¸?è?¬æ?§é?¯èª¤"
+
+#~ msgid "Newly added source file could not be identified"
+#~ msgstr "æ??æ?°å? å?¥ç??ä¾?æº?æª?æ¡?ç?¡æ³?辨è­?"
+
+#~ msgid "Source couldn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "Project directory"
+#~ msgstr "å°?æ¡?ç?®é??"
+
+#~ msgid "Enter new module"
+#~ msgstr "輸å?¥æ?°ç??模çµ?"
+
+#~ msgid ""
+#~ "Are you sure you want to remove module \"%s\" and all its associated "
+#~ "packages?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?è¦?移é?¤æ¨¡çµ?ã??%sã??è??æ??æ??è??å®?é??è?¯ç??å¥?件ï¼?"
+
+#~ msgid "Are you sure you want to remove package \"%s\"?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?移é?¤å¥?件ã??%sã??ï¼?"
+
+#~ msgid "Enter new variable"
+#~ msgstr "輸å?¥æ?°ç??è®?æ?¸"
+
+#~ msgid "Are you sure you want to remove variable \"%s\"?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?移é?¤è®?æ?¸ã??%sã??ï¼?"
+
+#~ msgid "Project:"
+#~ msgstr "å°?æ¡?:"
+
+#~ msgid "URI:"
+#~ msgstr "URIï¼?"
+
+#~ msgid "Module/Packages"
+#~ msgstr "模�/�件"
+
+#~ msgid "Version"
+#~ msgstr "ç??æ?¬"
+
+#~ msgid "Use"
+#~ msgstr "使�"
+
+#~ msgid "Group name:"
+#~ msgstr "群çµ?å??稱:"
+
+#~ msgid "Advanced"
+#~ msgstr "é?²é??"
+
+#~ msgid "gcj compiler flags (ahead-of-time):"
+#~ msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time):"
+
+#~ msgid "Java compiler flags (just-in-time):"
+#~ msgstr "Java 編譯å?¨æ??æ¨? (just-in-time):"
+
+#~ msgid "Includes (deprecated):"
+#~ msgstr "å??å?«ï¼?已廢æ£?ï¼?:"
+
+#~ msgid "C preprocessor flags"
+#~ msgstr "C é ?è??ç??å?¨æ??æ¨?"
+
+#~ msgid "C++ compiler flags"
+#~ msgstr "C++ 編譯å?¨æ??æ¨?"
+
+#~ msgid "gcj compiler flags (ahead-of-time)"
+#~ msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time)"
+
+#~ msgid "Libraries:"
+#~ msgstr "��庫:"
+
+#~ msgid "Dependencies:"
+#~ msgstr "ç?¸ä¾?é??ä¿?:"
+
+#~ msgid "Advanced options"
+#~ msgstr "é?²é??é?¸é ?"
+
+#~ msgid "Target name:"
+#~ msgstr "ç?®æ¨?å??稱:"
+
+#~ msgid "Advancedâ?¦"
+#~ msgstr "é?²é??â?¦"
+
+#~ msgid "Invalid GbfMkfileConfigValue type"
+#~ msgstr "ç?¡æ??ç?? GbfMkfileConfigValue é¡?å??"
+
+#~ msgid "Group coudn't be removed"
+#~ msgstr "��移�群�"
+
+#~ msgid "Target couldn't be created"
+#~ msgstr "��建���"
+
+#~ msgid "Target coudn't be removed"
+#~ msgstr "��移���"
+
+#~ msgid "Source file must be inside the project directory"
+#~ msgstr "ä¾?æº?æª?æ¡?å¿?é ?å?¨å°?æ¡?ç?®é??中"
+
+#~ msgid "Source is already in target"
+#~ msgstr "��已����中"
+
+#~ msgid "Source couldn't be added"
+#~ msgstr "������"
+
+#~ msgid "Includes:"
+#~ msgstr "å??å?«:"
+
+#~ msgid "Tooltips in list"
+#~ msgstr "æ¸?å?®ä¸­ç??å·¥å?·æ??示"
+
+#~ msgid "Messages options"
+#~ msgstr "����"
+
+#~ msgid "Number of first characters to show:"
+#~ msgstr "è¦?顯示ç??第ä¸?å­?å??æ?¸ï¼?"
+
+#~ msgid "Number of last characters to show:"
+#~ msgstr "è¦?顯示ç??æ??å¾?å­?å??æ?¸ï¼?"
+
+#~ msgid "Truncate long messages"
+#~ msgstr "æ?ªç?­é??é?·ç??è¨?æ?¯"
+
+#~ msgid "_Select file to addâ?¦"
+#~ msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)â?¦"
+
+#~ msgid "No properties available for this group"
+#~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦é??å??群çµ?"
+
+#~ msgid "No properties available for this target"
+#~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦æ­¤ç?®æ¨?"
+
+#~ msgid ""
+#~ "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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?æ??åº?ç·?é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?ã??"
+#~ "æ¸?è??å??é»?ã??è«?修正å®?ã??"
+
+#~ 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ã??å¿?é ?以è?±æ??å­?æ¯?ã??æ?¸å­?ã??åº?ç·?æ??ç?®é??å??é??å­?å??é??頭並ä¸?å?ªè?½å??å?«è?±æ??å­?"
+#~ "æ¯?ã??æ?¸å­?ã??åº?ç·?ã??ç?®é??å??é??å­?å??ã??æ¸?è??å??é»?ã??è«?修正å®?ã??"
+
+#~ msgid "Basic Search & Replace"
+#~ msgstr "å?ºæ?¬æ??å°?å??å??代"
+
+#~ msgid "Modify"
+#~ msgstr "修�"
+
+#~ msgid "New Name:"
+#~ msgstr "æ?°å??稱ï¼?"
+
+#~ msgid "Setting"
+#~ msgstr "設��"
+
+#~ msgid "Basic Search"
+#~ msgstr "å?ºæ?¬æ??å°?"
+
+#~ msgid "Print line numbers"
+#~ msgstr "å??å?°å??è??"
+
+#~ msgid "Print options"
+#~ msgstr "å??å?°é?¸é ?"
+
+#~ msgid "Print page footer"
+#~ msgstr "å??å?°é ?å°¾"
+
+#~ msgid "Print page header"
+#~ msgstr "å??å?°é ?é¦?"
+
+#~ msgid "Printing"
+#~ msgstr "æ­£å?¨å??å?°"
+
+#~ msgid "Wrap long lines to fit on paper"
+#~ msgstr "ä¾?é ?é?¢å°?é??é?·ç??æ??å­?æ??å??"
+
+#~ msgid "Default project directory:"
+#~ msgstr "é ?設ç??å°?æ¡?ç?®é??ï¼?"
+
+#~ msgid "Developer email address:"
+#~ msgstr "é??ç?¼è??ç??é?»é?µå?°å??ï¼?"
+
+#~ msgid "Developer name:"
+#~ msgstr "é??ç?¼è??å??稱ï¼?"
+
+#~ msgid "Project Defaults"
+#~ msgstr "���設�"
+
+#~ msgid "Select project directory"
+#~ msgstr "é?¸æ??å°?æ¡?ç?®é??"
+
+#~ msgid "Makefile backend"
+#~ msgstr "Makefile �端��"
+
+#~ msgid "Makefile backend for project manager"
+#~ msgstr "å°?æ¡?管ç??ç¨?å¼?ç?? Makefile å¾?端ç¨?å¼?"
+
+#~ msgid ""
 #~ "<b>There is %d item with unsaved changes. Save changes before closing?</b>"
 
 #~ msgid_plural ""
@@ -10998,7 +11127,7 @@ msgstr "符è??"
 #~ msgstr "�� '%s' ���"
 
 #~ msgid "C_onfigure Project..."
-#~ msgstr "設���(_O)..."
+#~ msgstr "設���(_O)�"
 
 #~ msgid "private"
 #~ msgstr "private"
@@ -11022,7 +11151,7 @@ msgstr "符è??"
 #~ msgstr "<b>��工��</b>"
 
 #~ msgid "Debugger Command..."
-#~ msgstr "é?¤é?¯å·¥å?·æ??令..."
+#~ msgstr "é?¤é?¯å·¥å?·æ??令â?¦"
 
 #~ msgid "Pid"
 #~ msgstr "é?²ç¨?ç·¨è??"
@@ -11031,13 +11160,13 @@ msgstr "符è??"
 #~ msgstr "Id"
 
 #~ msgid "Ins_pect/Evaluate..."
-#~ msgstr "é©?証å??測試 (_P)..."
+#~ msgstr "é©?証å??測試(_P)â?¦"
 
 #~ msgid "Add Watch..."
-#~ msgstr "æ?°å¢?ç?£ç??..."
+#~ msgstr "æ?°å¢?ç?£ç??â?¦"
 
 #~ msgid "_Print..."
-#~ msgstr "å??å?°(_P)..."
+#~ msgstr "å??å?°(_P)â?¦"
 
 #~ msgid "recent menu label|_%d. %s"
 #~ msgstr "_%d. %s"
@@ -11046,13 +11175,13 @@ msgstr "符è??"
 #~ msgstr "%d. %s"
 
 #~ msgid "_Open..."
-#~ msgstr "é??å??(_O)..."
+#~ msgstr "é??å??(_O)â?¦"
 
 #~ msgid "Url:"
 #~ msgstr "網å??:"
 
 #~ msgid "Advanced..."
-#~ msgstr "é?²é??..."
+#~ msgstr "é?²é??â?¦"
 
 #~ msgid "Source coudn't be removed"
 #~ msgstr "��移���"



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