[anjuta] Update Chinese (China) translations.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [anjuta] Update Chinese (China) translations.
Date: Wed, 9 Feb 2011 16:29:36 +0000 (UTC)
commit 06386fd6f8a99b45d0f4dcaffd45fd8b0c117026
Author: Aron Xu <aronxu gnome org>
Date:   Wed Feb 9 16:29:17 2011 +0000

    Update Chinese (China) translations.

 po/zh_CN.po | 4946 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2643 insertions(+), 2303 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e46b325..9b39e27 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,14 +12,16 @@
 # Black Penguin <gnomecn gmail com>, 2010.
 # Dean Lee <xslidian gmail com>, 2010.
 # Xianyou Jin <Jinking this gmail com>, 2010.
+# Aron Xu <aronxu gnome org>, 2010.
+# Lele Long <schemacs gmail com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta 2.2.6\n"
+"Project-Id-Version: anjuta master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-11-21 11:57+0000\n"
-"PO-Revision-Date: 2010-12-25 20:27+0800\n"
+"POT-Creation-Date: 2011-02-05 21:20+0000\n"
+"PO-Revision-Date: 2011-02-10 00:27+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -198,21 +200,22 @@ msgstr "æ³°å?½"
 #. * 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
+#: ../libanjuta/anjuta-encodings.c:443 ../plugins/am-project/am-project.c:105
+#: ../plugins/mk-project/mk-project.c:74
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libanjuta/anjuta-launcher.c:1170 ../libanjuta/resources.c:267
+#: ../libanjuta/anjuta-launcher.c:1172 ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "æ? æ³?æ?§è¡?å?½ä»¤ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1171
+#: ../libanjuta/anjuta-launcher.c:1173
 msgid "execvp failed"
 msgstr "æ?§è¡?æ??ä»¶(execvp)å¤±è´¥"
 
-#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2364
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2365
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -238,16 +241,15 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:464
 msgid "Load"
 msgstr "å? è½½"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1987
+#: ../libanjuta/anjuta-plugin-manager.c:1988
 msgid "Available Plugins"
 msgstr "å?¯ç?¨æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:933
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:940
 msgid "Preferred plugins"
 msgstr "é¦?é??æ??ä»¶"
 
@@ -284,49 +286,49 @@ msgstr "<b>è¯·é??æ?©è¦?æ¿?æ´»ç??æ??ä»¶</b>"
 msgid "No plugin is able to load other plugins in %s"
 msgstr "æ²¡æ??æ??ä»¶å?¯ä»¥å?¨ %s å??å? è½½å?¶å®?æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2014
+#: ../libanjuta/anjuta-plugin-manager.c:2015
 msgid "Remember this selection"
 msgstr "è®°ä½?æ¤é??é¡¹"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2345
+#: ../libanjuta/anjuta-plugin-manager.c:2346
 msgid "Profiles"
 msgstr "é??ç½®æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2346
+#: ../libanjuta/anjuta-plugin-manager.c:2347
 msgid "Current stack of profiles"
 msgstr "å½?å??é??ç½®æ??ä»¶æ ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2351
+#: ../libanjuta/anjuta-plugin-manager.c:2352
 msgid "Available plugins"
 msgstr "å?¯ç?¨æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2352
+#: ../libanjuta/anjuta-plugin-manager.c:2353
 msgid "Currently available plugins found in plugin paths"
 msgstr "å?¨æ??ä»¶è·¯å¾?ä¸?å??ç?°ç??å½?å??å?¯ç?¨æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2358
+#: ../libanjuta/anjuta-plugin-manager.c:2359
 msgid "Activated plugins"
 msgstr "å·²æ¿?æ´»æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2359
+#: ../libanjuta/anjuta-plugin-manager.c:2360
 msgid "Currently activated plugins"
 msgstr "å½?å??å·²æ¿?æ´»ç??æ??ä»¶"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2365
+#: ../libanjuta/anjuta-plugin-manager.c:2366
 msgid "Anjuta shell for which the plugins are made"
 msgstr "å?¶ä½?æ??ä»¶ç?? Anjuta Shell"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2373
+#: ../libanjuta/anjuta-plugin-manager.c:2374
 msgid "Anjuta Status"
 msgstr "Anjuta ç?¶æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2374
+#: ../libanjuta/anjuta-plugin-manager.c:2375
 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:2534
+#: ../libanjuta/anjuta-plugin-manager.c:2535
 msgid "Loaded:"
 msgstr "å·²å? è½½ï¼?"
 
@@ -388,19 +390,20 @@ msgstr ""
 "æ? æ³?è¯»å?¥ %sï¼?ä¸?å??å¿?å¤?æ??ä»¶ç¼ºå¤±ï¼?\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:202 ../plugins/gtodo/mcategory.c:36
+#: ../libanjuta/anjuta-preferences-dialog.c:96
 msgid "Category"
 msgstr "ç±»å?«"
 
 #. FIXME: Make the general page first
-#: ../libanjuta/anjuta-preferences-dialog.c:138
-#: ../libanjuta/anjuta-preferences-dialog.c:141 ../src/anjuta-app.c:920
+#: ../libanjuta/anjuta-preferences-dialog.c:139
+#: ../libanjuta/anjuta-preferences-dialog.c:142
+#: ../plugins/code-analyzer/code-analyzer.ui.h:3
+#: ../plugins/mk-project/mk-project.ui.h:4 ../src/anjuta-app.c:927
 #: ../src/preferences.ui.h:8
 msgid "General"
 msgstr "å¸¸è§?"
 
-#: ../libanjuta/anjuta-preferences-dialog.c:236
+#: ../libanjuta/anjuta-preferences-dialog.c:237
 msgid "Anjuta Preferences"
 msgstr "Anjuta é¦?é??é¡¹"
 
@@ -501,78 +504,122 @@ msgstr "æ? æ³?æ?¾å?°å?¯ç?¨ç??ç»?ç«¯ï¼?ä½¿ç?¨ xtermï¼?å?³ä½¿å®?å?¯è?½æ? æ³?æ£å¸¸
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "æ? æ³?æ?§è¡?å?½ä»¤ï¼?%s(ä½¿ç?¨ Shell %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1893
+#: ../libanjuta/anjuta-utils.c:1892
 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:2332
+#: ../libanjuta/anjuta-utils.c:2330
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "æ? æ³?å? è½½ç?¨æ?·ç??é?¢æ??ä»¶ï¼?%s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:75 ../plugins/git/git-status-pane.c:164
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:79 ../plugins/git/git-status-pane.c:167
 msgid "Added"
 msgstr "å·²æ·»å? "
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:77 ../plugins/git/git-status-pane.c:170
 msgid "Deleted"
 msgstr "å·²å? é?¤"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:81 ../plugins/git/git-status-pane.c:173
 msgid "Conflicted"
 msgstr "å?²çª?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-#: ../plugins/file-manager/file-view.c:83
+#: ../plugins/file-manager/file-view.c:83 ../plugins/git/git-status-pane.c:177
 msgid "Up-to-date"
 msgstr "æ??æ?°"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:85
+#: ../plugins/file-manager/file-view.c:85 ../plugins/git/git-status-pane.c:181
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:87
+#: ../plugins/file-manager/file-view.c:87 ../plugins/git/git-status-pane.c:184
 msgid "Missing"
 msgstr "ç¼ºå°?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:89
+#: ../plugins/file-manager/file-view.c:89 ../plugins/git/git-status-pane.c:187
 msgid "Unversioned"
 msgstr "æ?ªå??ç??æ?¬"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:91
+#: ../plugins/file-manager/file-view.c:91 ../plugins/git/git-status-pane.c:191
 msgid "Ignored"
 msgstr "å·²å¿½ç?¥"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:215
+#: ../libanjuta/anjuta-column-text-view.c:40 ../plugins/git/git-pane.c:123
+#, c-format
+msgid "Column %i"
+msgstr "å?? %i"
+
+#. Column label
+#: ../libanjuta/anjuta-column-text-view.c:69 ../plugins/git/anjuta-git.ui.h:38
+msgid "Column 1"
+msgstr "å?? 1"
+
+#: ../libanjuta/anjuta-entry.c:241
+msgid "Help text"
+msgstr "å¸®å?©æ??æ?¬"
+
+#: ../libanjuta/anjuta-entry.c:242
+#, fuzzy
+msgid "Text to show the user what to enter into the entry"
+msgstr "æ??ç¤ºç?¨æ?·å??è¾?å?¥é¡¹è¾?å?¥å??å®¹"
+
+#: ../libanjuta/anjuta-file-drop-entry.c:206
+#, fuzzy
+msgid "Path that droppedfiles should be relative to"
+msgstr "æ??å?¨æ??ä»¶ç??ç?¸å¯¹è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:101
+msgid "Drop a file or enter a path here"
+msgstr "è¾?å?¥è·¯å¾?æ??æ??å?¨æ??ä»¶è?³æ¤"
+
+#: ../libanjuta/anjuta-file-list.c:274
+msgid "Select Files"
+msgstr "é??æ?©æ??ä»¶"
+
+#: ../libanjuta/anjuta-file-list.c:540
+msgid "Path that all files in the list should be relative to"
+msgstr "å??è¡¨ä¸æ??æ??æ??ä»¶ç??ç?¸å¯¹è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:547
+msgid "Show Add button"
+msgstr "æ?¾ç¤ºæ·»å? æ??é?®"
+
+#: ../libanjuta/anjuta-file-list.c:548
+msgid "Display an Add button"
+msgstr "æ?¾ç¤ºä¸?ä¸ªæ·»å? æ??é?®"
+
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:239
 #: ../libfoocanvas/foo-canvas-text.c:177 ../src/preferences.ui.h:13
 msgid "Text"
 msgstr "æ??æ?¬"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:216
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:240
 #: ../libfoocanvas/foo-canvas-text.c:178
 msgid "Text to render"
 msgstr "è¦?æ?§è¡?ç??æ??æ?¬"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:222
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:246
 msgid "Pixbuf Object"
 msgstr "Pixbuf å¯¹è±¡"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:223
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:247
 msgid "The pixbuf to render."
 msgstr "è¢«ç»?å?¶ç?? Pixbuf å¯¹è±¡ã??"
 
@@ -801,6 +848,45 @@ msgstr "æ¯?ä¾?é??"
 msgid "Whether this tag affects font scaling"
 msgstr "è¿?ä¸ªæ ?ç¾æ?¯å?¦å½±å??æ¯?ä¾?"
 
+#: ../plugins/am-project/amp-group.c:528
+msgid "Please specify group name"
+msgstr "è¯·æ??å®?ç»?å??"
+
+#: ../plugins/am-project/amp-group.c:542
+msgid ""
+"Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
+msgstr "ç»?å??å?ªè?½å??å?«å?æ¯?æ??â??#$:%+,- = ^_`~â??è¿?äº?å?ç¬¦"
+
+#: ../plugins/am-project/amp-group.c:571
+#: ../plugins/dir-project/dir-project.c:656
+#: ../plugins/dir-project/dir-project.c:769
+#: ../plugins/am-project/am-project.c:1569
+#: ../plugins/am-project/am-project.c:1599
+#: ../plugins/am-project/am-project.c:1651
+#: ../plugins/mk-project/mk-project.c:678
+#: ../plugins/mk-project/mk-project.c:755
+#: ../plugins/mk-project/mk-project.c:829
+#, c-format
+msgid "Project doesn't exist or invalid path"
+msgstr "é¡¹ç?®ä¸?å?å?¨æ??é??æ³?è·¯å¾?"
+
+#: ../plugins/am-project/amp-target.c:246
+msgid "Please specify target name"
+msgstr "è¯·æ??å®?ç?®æ ?å??ç§°"
+
+#: ../plugins/am-project/amp-target.c:260
+msgid ""
+"Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
+msgstr "ç?®æ ?å??å?ªè?½ç?±å?æ¯?ã??â??_â??ã??â??-â??ã??â??/â??æ??â??.â??ç»?æ??"
+
+#: ../plugins/am-project/amp-target.c:275
+msgid "Shared library target name must be of the form 'libxxx.la'"
+msgstr "å?±äº«åº?ç?®æ ?å??å¿?é¡»æ?¯â??libxxx.laâ??ç??å½¢å¼?"
+
+#: ../plugins/am-project/amp-target.c:284
+msgid "Static library target name must be of the form 'libxxx.a'"
+msgstr "é??æ??åº?ç?®æ ?å??å¿?é¡»æ?¯â??libxxx.aâ??ç??å½¢å¼?"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
 #: ../plugins/run-program/anjuta-run-program.ui.h:1
 msgid "Arguments:"
@@ -831,8 +917,8 @@ msgid "Continue on errors"
 msgstr "å??ç??é??è¯¯æ?¶ç»§ç»"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
-msgid "Highlight message locations in editor"
-msgstr "å?¨ç¼?è¾?å?¨ä¸é«?äº®æ?¾ç¤ºä¿¡æ?¯ä½?ç½®"
+msgid "Highlight build warnings and errors in editor"
+msgstr "å?¨ç¼?è¾?å?¨ä¸é«?äº®æ?¾ç¤ºè¦å??å??é??è¯¯"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
 msgid "Install"
@@ -880,7 +966,7 @@ msgid "sudo"
 msgstr "sudo"
 
 #: ../plugins/build-basic-autotools/configuration-list.c:68
-#: ../plugins/class-gen/window.c:525
+#: ../plugins/class-gen/window.c:720
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "é»?è®¤"
@@ -903,7 +989,7 @@ msgid "No executables in this project!"
 msgstr "é¡¹ç?®ä¸æ²¡æ??å?¯æ?§è¡?æ??ä»¶ï¼?"
 
 #: ../plugins/build-basic-autotools/executer.c:157
-#: ../plugins/am-project/am-project.c:128
+#: ../plugins/am-project/am-project.c:126
 msgid "Program"
 msgstr "ç¨?åº?"
 
@@ -944,11 +1030,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:169
+#: ../plugins/build-basic-autotools/plugin.c:171
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨è¿?å?¥ç?®å½?\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:170
+#: ../plugins/build-basic-autotools/plugin.c:172
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨è¿?å?¥ç?®å½?\\s+'(.+)'"
 
@@ -957,20 +1043,20 @@ msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨è¿?å?¥ç?®å½?\\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:178
+#: ../plugins/build-basic-autotools/plugin.c:180
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨ç¦»å¼?ç?®å½?\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:179
+#: ../plugins/build-basic-autotools/plugin.c:181
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨ç¦»å¼?ç?®å½?\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:858
+#: ../plugins/build-basic-autotools/plugin.c:871
 #, c-format
 msgid "Entering: %s"
 msgstr "æ£å?¨è¿?å?¥ï¼? %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:894
+#: ../plugins/build-basic-autotools/plugin.c:907
 #, c-format
 msgid "Leaving: %s"
 msgstr "æ£å?¨ç¦»å¼?ï¼?%s"
@@ -980,12 +1066,12 @@ msgstr "æ£å?¨ç¦»å¼?ï¼?%s"
 #. * 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/build-basic-autotools/plugin.c:945
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "è¦å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:933
+#: ../plugins/build-basic-autotools/plugin.c:946
 msgid "warning:-old"
 msgstr "è¦å??ï¼?-old"
 
@@ -994,343 +1080,372 @@ msgstr "è¦å??ï¼?-old"
 #. * 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/build-basic-autotools/plugin.c:957
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "é??è¯¯ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:945
+#: ../plugins/build-basic-autotools/plugin.c:958
 msgid "error:-old"
 msgstr "é??è¯¯ï¼?-old"
 
-#: ../plugins/build-basic-autotools/plugin.c:1062
+#: ../plugins/build-basic-autotools/plugin.c:1075
 #, c-format
 msgid "Command exited with status %d"
 msgstr "å?½ä»¤ä»¥ç?¶æ?? %d é??å?º"
 
-#: ../plugins/build-basic-autotools/plugin.c:1072
-#: ../plugins/build-basic-autotools/plugin.c:1551
+#: ../plugins/build-basic-autotools/plugin.c:1085
+#: ../plugins/build-basic-autotools/plugin.c:1562
 #, c-format
 msgid "Command canceled by user"
 msgstr "å?½ä»¤è¢«ç?¨æ?·ç»?æ¢"
 
-#: ../plugins/build-basic-autotools/plugin.c:1077
+#: ../plugins/build-basic-autotools/plugin.c:1090
 #, c-format
 msgid "Command aborted by user"
 msgstr "å?½ä»¤è¢«ç?¨æ?·é??å?º"
 
-#: ../plugins/build-basic-autotools/plugin.c:1082
+#: ../plugins/build-basic-autotools/plugin.c:1095
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "å?½ä»¤ä»¥ä¿¡å?· %d ç»?æ¢"
 
-#: ../plugins/build-basic-autotools/plugin.c:1090
+#: ../plugins/build-basic-autotools/plugin.c:1103
 msgid "Command terminated for an unknown reason"
 msgstr "å?½ä»¤æ? æ??ç»?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1108
+#: ../plugins/build-basic-autotools/plugin.c:1121
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "æ?»å?±è??æ?¶ï¼?%lu ç§?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1115
+#: ../plugins/build-basic-autotools/plugin.c:1128
 msgid "Completed unsuccessfully\n"
 msgstr "å·²å®?æ??...å¤±è´¥\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1123
+#: ../plugins/build-basic-autotools/plugin.c:1136
 #: ../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:1211
+#: ../plugins/build-basic-autotools/plugin.c:1218
 #, c-format
 msgid "Build %d: %s"
 msgstr "æ??å»º %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1546
+#: ../plugins/build-basic-autotools/plugin.c:1557
 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:1843
+#: ../plugins/build-basic-autotools/plugin.c:1854
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ä¸?è?½ç¼?è¯?â??%sâ??ï¼?æ²¡æ??å®?ä¹?å¯¹æ¤æ??ä»¶ç±»å??ç??ç¼?è¯?è§?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1978
+#: ../plugins/build-basic-autotools/plugin.c:1989
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½é??ç½®é¡¹ç?®ï¼?å?¨ %s ç¼ºå°?é??ç½®è??æ?¬ã??"
 
-#: ../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
+#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2554
+#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2582
+#: ../plugins/build-basic-autotools/plugin.c:2639
 #, c-format
 msgid "_Build"
 msgstr "æ??å»º(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2474
 msgid "_Build Project"
 msgstr "æ??å»ºé¡¹ç?®(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2464
+#: ../plugins/build-basic-autotools/plugin.c:2475
 msgid "Build whole project"
 msgstr "æ??å»ºæ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2469
+#: ../plugins/build-basic-autotools/plugin.c:2480
 msgid "_Install Project"
 msgstr "å®?è£?é¡¹ç?®(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2481
 msgid "Install whole project"
 msgstr "å®?è£?æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2475
+#: ../plugins/build-basic-autotools/plugin.c:2486
 msgid "_Clean Project"
 msgstr "æ¸?ç??é¡¹ç?®(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2476
+#: ../plugins/build-basic-autotools/plugin.c:2487
 msgid "Clean whole project"
 msgstr "æ¸?ç??æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2481
+#: ../plugins/build-basic-autotools/plugin.c:2492
 msgid "C_onfigure Projectâ?¦"
 msgstr "é??ç½®é¡¹ç?®(_O)..."
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
+#: ../plugins/build-basic-autotools/plugin.c:2493
 msgid "Configure project"
 msgstr "é??ç½®é¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2487
+#: ../plugins/build-basic-autotools/plugin.c:2498
 msgid "Build _Tarball"
 msgstr "æ??å»º _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
+#: ../plugins/build-basic-autotools/plugin.c:2499
 msgid "Build project tarball distribution"
 msgstr "æ??å»ºé¡¹ç?® tarball å??è¡?å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2493
+#: ../plugins/build-basic-autotools/plugin.c:2504
 msgid "_Build Module"
 msgstr "æ??å»ºæ¨¡å??(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2494
+#: ../plugins/build-basic-autotools/plugin.c:2505
 msgid "Build module associated with current file"
 msgstr "æ??å»ºä¸?å½?å??æ??ä»¶å?³è??ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2499
+#: ../plugins/build-basic-autotools/plugin.c:2510
 msgid "_Install Module"
 msgstr "å®?è£?æ¨¡å??(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2511
 msgid "Install module associated with current file"
 msgstr "å®?è£?ä¸?å½?å??æ??ä»¶å?³è??ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2505
+#: ../plugins/build-basic-autotools/plugin.c:2516
 msgid "_Clean Module"
 msgstr "æ¸?ç??æ¨¡å??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2517
 msgid "Clean module associated with current file"
 msgstr "æ¸?ç??ä¸?å½?å??æ??ä»¶å?³è??ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2522
 msgid "Co_mpile File"
 msgstr "ç¼?è¯?æ??ä»¶(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2512
+#: ../plugins/build-basic-autotools/plugin.c:2523
 msgid "Compile current editor file"
 msgstr "ç¼?è¯?å½?å??ç¼?è¾?å?¨ä¸ç??æ??ä»¶"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2528
 msgid "Select Configuration"
 msgstr "é??æ?©é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2518
+#: ../plugins/build-basic-autotools/plugin.c:2529
 msgid "Select current configuration"
 msgstr "é??æ?©å½?å??é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2534
 msgid "Remove Configuration"
 msgstr "å? é?¤é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
+#: ../plugins/build-basic-autotools/plugin.c:2535
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??é¡¹ç?®(distclean)å¹¶å?¨å?¯è?½ç??æ??å?µä¸?å? é?¤é??ç½®ç?®å½?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2537
-#: ../plugins/build-basic-autotools/plugin.c:2565
+#: ../plugins/build-basic-autotools/plugin.c:2548
+#: ../plugins/build-basic-autotools/plugin.c:2576
 msgid "_Compile"
 msgstr "ç¼?è¯?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2538
-#: ../plugins/build-basic-autotools/plugin.c:2566
+#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2577
 msgid "Compile file"
 msgstr "ç¼?è¯?æ??ä»¶"
 
-#: ../plugins/build-basic-autotools/plugin.c:2544
-#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2583
 msgid "Build module"
 msgstr "æ??å»ºæ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2549
-#: ../plugins/build-basic-autotools/plugin.c:2577
-#: ../plugins/build-basic-autotools/plugin.c:2635
+#: ../plugins/build-basic-autotools/plugin.c:2560
+#: ../plugins/build-basic-autotools/plugin.c:2588
+#: ../plugins/build-basic-autotools/plugin.c:2646
 #, c-format
 msgid "_Install"
 msgstr "å®?è£?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2550
-#: ../plugins/build-basic-autotools/plugin.c:2578
+#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2589
 msgid "Install module"
 msgstr "å®?è£?æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2555
-#: ../plugins/build-basic-autotools/plugin.c:2583
-#: ../plugins/build-basic-autotools/plugin.c:2642
+#: ../plugins/build-basic-autotools/plugin.c:2566
+#: ../plugins/build-basic-autotools/plugin.c:2594
+#: ../plugins/build-basic-autotools/plugin.c:2653
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2556
-#: ../plugins/build-basic-autotools/plugin.c:2584
+#: ../plugins/build-basic-autotools/plugin.c:2567
+#: ../plugins/build-basic-autotools/plugin.c:2595
 msgid "Clean module"
 msgstr "æ¸?ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2589
+#: ../plugins/build-basic-autotools/plugin.c:2600
 msgid "_Cancel command"
 msgstr "å??æ¶?å?½ä»¤(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2590
+#: ../plugins/build-basic-autotools/plugin.c:2601
 msgid "Cancel build command"
 msgstr "å??æ¶?æ??å»ºå?½ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:2628
+#: ../plugins/build-basic-autotools/plugin.c:2639
 #, c-format
 msgid "_Build (%s)"
 msgstr "æ??å»º(%s)(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2635
+#: ../plugins/build-basic-autotools/plugin.c:2646
 #, c-format
 msgid "_Install (%s)"
 msgstr "å®?è£?(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2642
+#: ../plugins/build-basic-autotools/plugin.c:2653
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2650
+#: ../plugins/build-basic-autotools/plugin.c:2661
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "ç¼?è¯?(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2650
+#: ../plugins/build-basic-autotools/plugin.c:2661
 #, c-format
 msgid "Co_mpile"
 msgstr "ç¼?è¯?(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3184
+#: ../plugins/build-basic-autotools/plugin.c:3195
 msgid "Build commands"
 msgstr "æ??å»ºå?½ä»¤"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3193
+#: ../plugins/build-basic-autotools/plugin.c:3204
 msgid "Build popup commands"
 msgstr "æ??å»ºå¼¹å?ºå?½ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:3582
-#: ../plugins/build-basic-autotools/plugin.c:3590
+#: ../plugins/build-basic-autotools/plugin.c:3593
+#: ../plugins/build-basic-autotools/plugin.c:3601
 msgid "Build Autotools"
 msgstr "æ??å»º Autotools"
 
-#: ../plugins/build-basic-autotools/program.c:326
+#: ../plugins/build-basic-autotools/program.c:269
+#, c-format
+msgid ""
+"Error while setting up build environment:\n"
+" %s"
+msgstr "å»ºç«?æ??å»ºç?¯å¢?å?ºé??ï¼?\n"
+" %s"
+
+#: ../plugins/build-basic-autotools/program.c:342
 msgid "Command aborted"
 msgstr "å?½ä»¤å·²é??å?º"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
+msgid "<b>Class Elements</b>"
+msgstr "<b>ç±»å??ç´ </b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Project"
 msgstr "æ·»å? è?³é¡¹ç?®"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Repository"
 msgstr "æ·»å? å?°ä»?åº?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Email Address:"
 msgstr "ä½?è??ç?µå?é?®ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author Name:"
 msgstr "ä½?è??å§?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date-Time"
 msgstr "ä½?è??/æ?¥æ??-æ?¶é?´"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Author/Date/Time"
 msgstr "ä½?è??/æ?¥æ??/æ?¶é?´"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class Inheritance:"
 msgstr "å?ºç±»ç»§æ?¿ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
 msgid "Base Class:"
 msgstr "å?ºç±»ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Elements"
 msgstr "ç±»å??ç´ "
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 msgid "Class Function Prefix:"
 msgstr "ç±»å?½æ?°å??ç¼?ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "ç±»ç??æ??å?¨"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+msgid "Class Methods"
+msgstr "ç±»æ?¹æ³?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Class Name:"
 msgstr "ç±»å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "Class Options:"
 msgstr "ç±»é??é¡¹ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#, fuzzy
+msgid "Class Scope:"
+msgstr "ç±»å??ï¼?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+msgid "Constants/Variables"
+msgstr "å¸¸é??/å??é??"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 msgid "Create"
 msgstr "å??å»º"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+msgid "GLib.Object"
+msgstr "GLib.Object"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "GObject Class\t"
 msgstr "GObject ç±»\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "GObject Prefix and Type:"
 msgstr "GObject å??ç¼?å??ç±»å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 msgid "General Class Properties"
 msgstr "ä¸?è?¬ç±»å±?æ?§"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
 #: ../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
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
@@ -1346,24 +1461,36 @@ msgstr "ä¸?è?¬ç±»å±?æ?§"
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è®¸å?¯è¯? (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Generic C++ Class"
 msgstr "é??ç?¨ C++ ç±»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 msgid "Header File:"
 msgstr "å¤´æ??ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+msgid "Imports"
+msgstr "å¯¼å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+msgid "Initializer Arguments:"
+msgstr "å??å§?å??å??æ?°ï¼?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Inline the declaration and implementation"
 msgstr "å??åµ?å£°æ??å??å®?ç?°"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+msgid "JavaScript Class"
+msgstr "JavaScript ç±»"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
 #: ../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
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:20
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:25
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:18
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:16
@@ -1379,35 +1506,56 @@ msgstr "å??åµ?å£°æ??å??å®?ç?°"
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU å®½é??ç?¨å?¬å?±è®¸å?¯è¯? (LGPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "è®¸å?¯ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
 msgid "Member Functions/Variables"
 msgstr "æ??å??å?½æ?°/å??é??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:33
+msgid "Methods"
+msgstr "æ?¹æ³?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:34
 msgid "No License"
 msgstr "æ? è®¸å?¯"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:35
 msgid "Properties"
 msgstr "å±?æ?§"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:36
+msgid "Python Class"
+msgstr "Python ç±»"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:37
 msgid "Signals"
 msgstr "ä¿¡å?·"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:38
 msgid "Source File:"
 msgstr "æº?æ??ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:39
 msgid "Source/Header Headings:"
 msgstr "æº?æ??ä»¶/å¤´æ??ä»¶æ?¬å¤´è¡?ï¼?"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:40
+msgid "Vala Class"
+msgstr "Vala ç±»ï¼?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:41
+#: ../plugins/mk-project/mk-project.ui.h:7
+msgid "Variables"
+msgstr "å??é??"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:42
+msgid "is Sub-Class"
+msgstr "æ?¯å?ç±»"
+
 #: ../plugins/class-gen/generator.c:133
 #, c-format
 msgid "Header or source file has not been created"
@@ -1430,7 +1578,7 @@ msgstr "å¤?ç??å??ç??æ¨¡æ?¿å°?è¦?å??å?¥ç??æ??ä»¶"
 msgid "Failed to write autogen definition file"
 msgstr "å??å»º Autogen å®?ä¹?æ??ä»¶å¤±è´¥"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1141
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1155
 msgid ""
 "Could not find autogen version 5; please install the autogen package. You "
 "can get it from http://autogen.sourceforge.net.";
@@ -1438,74 +1586,108 @@ msgstr ""
 "æ?¾ä¸?å?°ç??æ?¬å?·ä¸º5ç?? Autogenï¼?è¯·å®?è£? autogen è½¯ä»¶å??ã??æ?¨å?¯ä»¥å?¨ http://autogen.";
 "sourceforge.net æ?¾å?°å®?"
 
-#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
+#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:453
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "æ? æ³?æ?§è¡? autogenï¼?%s"
 
-#: ../plugins/class-gen/window.c:94
+#: ../plugins/class-gen/window.c:112
 msgid "Guess from type"
 msgstr "ä»?ç±»å??ç??æµ?"
 
-#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/class-gen/window.c:694 ../plugins/class-gen/window.c:705
+#: ../plugins/class-gen/window.c:779 ../plugins/class-gen/window.c:789
+#: ../plugins/class-gen/window.c:802 ../plugins/search/anjuta-search.ui.h:26
 msgid "Scope"
 msgstr "è??å?´"
 
-#: ../plugins/class-gen/window.c:500
+#: ../plugins/class-gen/window.c:695
 msgid "Implementation"
 msgstr "å®?ç?°"
 
-#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
-#: ../plugins/class-gen/window.c:533
+#: ../plugins/class-gen/window.c:696 ../plugins/class-gen/window.c:706
+#: ../plugins/class-gen/window.c:728 ../plugins/class-gen/window.c:780
+#: ../plugins/class-gen/window.c:790
 #: ../plugins/debug-manager/breakpoints.c:1952
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/snippets-manager/snippets-editor.c:38
 msgid "Type"
 msgstr "ç±»å??"
 
-#: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
-#: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
-#: ../plugins/project-manager/dialogs.c:434
-#: ../plugins/run-program/parameters.c:754
+#: ../plugins/class-gen/window.c:697 ../plugins/class-gen/window.c:707
+#: ../plugins/class-gen/window.c:715 ../plugins/class-gen/window.c:729
+#: ../plugins/class-gen/window.c:739 ../plugins/class-gen/window.c:747
+#: ../plugins/class-gen/window.c:755 ../plugins/class-gen/window.c:763
+#: ../plugins/class-gen/window.c:771 ../plugins/class-gen/window.c:781
+#: ../plugins/class-gen/window.c:791 ../plugins/class-gen/window.c:803
+#: ../plugins/project-manager/dialogs.c:426
+#: ../plugins/run-program/parameters.c:757
 #: ../plugins/snippets-manager/plugin.c:757
 #: ../plugins/snippets-manager/snippets-browser.c:530
 #: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
 msgstr "å??ç§°"
 
-#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
-#: ../plugins/class-gen/window.c:535
+#: ../plugins/class-gen/window.c:698 ../plugins/class-gen/window.c:708
+#: ../plugins/class-gen/window.c:730 ../plugins/class-gen/window.c:740
+#: ../plugins/class-gen/window.c:756 ../plugins/class-gen/window.c:782
+#: ../plugins/class-gen/window.c:804
 #: ../plugins/debug-manager/stack_trace.c:712
 msgid "Arguments"
 msgstr "å??æ?°"
 
-#: ../plugins/class-gen/window.c:521
+#: ../plugins/class-gen/window.c:716
 msgid "Nick"
 msgstr "æ?µç§°"
 
-#: ../plugins/class-gen/window.c:522
+#: ../plugins/class-gen/window.c:717
 msgid "Blurb"
 msgstr "ç®?ä»?"
 
-#: ../plugins/class-gen/window.c:523
+#: ../plugins/class-gen/window.c:718
 msgid "GType"
 msgstr "GType"
 
-#: ../plugins/class-gen/window.c:524
+#: ../plugins/class-gen/window.c:719
 msgid "ParamSpec"
 msgstr "ParamSpec"
 
 #. Somehow redundant with marshaller, but required for default handler
-#: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
+#: ../plugins/class-gen/window.c:721 ../plugins/class-gen/window.c:731
 msgid "Flags"
 msgstr "æ ?å¿?"
 
-#: ../plugins/class-gen/window.c:537
+#: ../plugins/class-gen/window.c:732
 msgid "Marshaller"
 msgstr "æ?´ç??å?¨"
 
-#: ../plugins/class-gen/window.c:818
+#: ../plugins/class-gen/window.c:748 ../plugins/class-gen/window.c:764
+#: ../plugins/class-gen/window.c:795 ../plugins/debug-manager/debug_tree.c:128
+#: ../plugins/debug-manager/registers.c:469
+#: ../plugins/project-manager/dialogs.c:433
+#: ../plugins/run-program/parameters.c:766 ../plugins/tools/editor.c:474
+msgid "Value"
+msgstr "æ?°å?¼"
+
+#: ../plugins/class-gen/window.c:772 ../plugins/cvs-plugin/cvs-callbacks.c:438
+#: ../plugins/am-project/am-project.c:189
+msgid "Module"
+msgstr "æ¨¡å??"
+
+#. Automatic highlight menu
+#: ../plugins/class-gen/window.c:792 ../plugins/document-manager/plugin.c:1033
+msgid "Automatic"
+msgstr "è?ªå?¨"
+
+#: ../plugins/class-gen/window.c:793
+msgid "Getter"
+msgstr ""
+
+#: ../plugins/class-gen/window.c:794
+msgid "Setter"
+msgstr ""
+
+#: ../plugins/class-gen/window.c:1208
 msgid "XML description of the user interface"
 msgstr "ç?¨æ?·ç??é?¢ç?? XML è¯è¨?æ??è¿°"
 
@@ -1542,7 +1724,6 @@ msgid "Be verbose"
 msgstr "è¯¦ç»?æ¨¡å¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
-#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
 #: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "Browseâ?¦"
@@ -1656,13 +1837,11 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "å¿½ç?¥ .cvsrc æ??ä»¶(æ?¨è??)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2116
-#: ../plugins/symbol-db/plugin.c:2158
+#: ../plugins/symbol-db/plugin.c:2171
 msgid "Local"
 msgstr "æ?¬å?°"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
-#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "æ?¥å¿?ä¿¡æ?¯ï¼?"
 
@@ -1676,14 +1855,14 @@ 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:22
+#: ../plugins/search/anjuta-search.ui.h:22
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
 msgid "Options"
 msgstr "é??é¡¹"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:50
 #: ../plugins/subversion/anjuta-subversion.ui.h:24
 msgid "Options:"
 msgstr "é??é¡¹ï¼?"
@@ -1722,7 +1901,6 @@ msgid "Reset sticky tags"
 msgstr "é??ç½®ç²?æ»?æ ?ç¾"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:86
 #: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ç??æ?¬ï¼?"
@@ -1754,7 +1932,6 @@ msgid "Vendor tag:"
 msgstr "å??å??æ ?ç¾ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:123
 #: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "æ?´ä¸ªé¡¹ç?®"
@@ -1777,9 +1954,6 @@ msgid "Unable to delete file"
 msgstr "æ? æ³?å? é?¤æ??ä»¶"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:244
-#: ../plugins/git/git-commit-dialog.c:79
-#: ../plugins/git/git-create-tag-dialog.c:130
-#: ../plugins/git/git-merge-dialog.c:91
 #: ../plugins/subversion/subversion-commit-dialog.c:88
 msgid "Are you sure that you want to pass an empty log message?"
 msgstr "æ?¨æ?¯å?¦ç¡®å®?è¦?æ??äº¤ä¸?ä¸ªç©ºç??æ?¥å¿?ä¿¡æ?¯ï¼?"
@@ -1788,11 +1962,6 @@ msgstr "æ?¨æ?¯å?¦ç¡®å®?è¦?æ??äº¤ä¸?ä¸ªç©ºç??æ?¥å¿?ä¿¡æ?¯ï¼?"
 msgid "CVSROOT"
 msgstr "CVSROOT"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/am-project/am-project.c:191
-msgid "Module"
-msgstr "æ¨¡å??"
-
 #: ../plugins/cvs-plugin/cvs-callbacks.c:441
 msgid "Vendor"
 msgstr "æ??ä¾?è??"
@@ -1936,6 +2105,38 @@ msgstr "CVS æ??ä½?"
 msgid "CVS popup operations"
 msgstr "CVS å¼¹å?ºæ??ä½?"
 
+#: ../plugins/code-analyzer/code-analyzer.ui.h:1
+msgid "CLang Paths"
+msgstr "CLang è·¯å¾?"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:2
+msgid "Enable CLang code analyzer"
+msgstr "å?¯ç?¨ CLang ä»£ç ?å??æ??å?¨"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:4
+msgid ""
+"The project needs to be reconfigured after enabling this option. Please run "
+"Build->Configure!"
+msgstr ""
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:5
+msgid "c++-analyzer:"
+msgstr "c++-å??æ??å?¨"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:6
+msgid "ccc-analyzer:"
+msgstr "ccc-å??æ??å?¨"
+
+#: ../plugins/code-analyzer/plugin.c:157
+msgid ""
+"Couldn't find clang analyzer, please check if it is installed and if the "
+"paths are configured correctly in the preferences"
+msgstr "æ?ªæ?¾å?° clang å??æ??å?¨ï¼?è¯·ç¡®è®¤å·²ç»?å®?è£?ï¼?å¹¶ä¸?è·¯å¾?å·²ç»?å?¨å¼?ç?¨ä¸æ£ç¡®é??ç½®"
+
+#: ../plugins/code-analyzer/plugin.c:226 ../plugins/code-analyzer/plugin.c:234
+msgid "CLang Analyzer"
+msgstr "CLang å??æ??å?¨"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
@@ -2033,8 +2234,8 @@ msgid "Inspect/Evaluate"
 msgstr "æ£?æ?¥/æ±?å?¼"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
-#: ../plugins/debug-manager/plugin.c:1029
-#: ../plugins/debug-manager/plugin.c:1145
+#: ../plugins/debug-manager/plugin.c:1031
+#: ../plugins/debug-manager/plugin.c:1147
 msgid "Kernel Signals"
 msgstr "å??æ ¸ä¿¡å?·"
 
@@ -2110,7 +2311,6 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP è¿?æ?¥"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:336
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2313,13 +2513,6 @@ msgstr "è·³è½¬å?°å?°å??(_G)"
 msgid "Variable"
 msgstr "å??é??"
 
-#: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/debug-manager/registers.c:469
-#: ../plugins/project-manager/dialogs.c:441
-#: ../plugins/run-program/parameters.c:763 ../plugins/tools/editor.c:474
-msgid "Value"
-msgstr "æ?°å?¼"
-
 #: ../plugins/debug-manager/disassemble.c:851
 msgid "Disassembly"
 msgstr "æ±?ç¼?"
@@ -2338,259 +2531,259 @@ msgstr "è¡?"
 msgid "Locals"
 msgstr "å±?é?¨å??é??"
 
-#: ../plugins/debug-manager/plugin.c:338
+#: ../plugins/debug-manager/plugin.c:340
 msgid "Debugger Log"
 msgstr "è°?è¯?å?¨æ?¥å¿?"
 
-#: ../plugins/debug-manager/plugin.c:411 ../plugins/debug-manager/plugin.c:433
-#: ../plugins/debug-manager/plugin.c:458 ../plugins/debug-manager/plugin.c:485
-#: ../plugins/debug-manager/plugin.c:519 ../plugins/debug-manager/plugin.c:552
+#: ../plugins/debug-manager/plugin.c:413 ../plugins/debug-manager/plugin.c:435
+#: ../plugins/debug-manager/plugin.c:460 ../plugins/debug-manager/plugin.c:487
+#: ../plugins/debug-manager/plugin.c:521 ../plugins/debug-manager/plugin.c:554
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "è°?è¯?å?¨"
 
-#: ../plugins/debug-manager/plugin.c:411
+#: ../plugins/debug-manager/plugin.c:413
 msgid "Started"
 msgstr "å·²å¼?å§?"
 
-#: ../plugins/debug-manager/plugin.c:433
+#: ../plugins/debug-manager/plugin.c:435
 msgid "Loaded"
 msgstr "å·²å? è½½"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:454
-#: ../plugins/debug-manager/plugin.c:1157
+#: ../plugins/debug-manager/plugin.c:456
+#: ../plugins/debug-manager/plugin.c:1159
 msgid "Pa_use Program"
 msgstr "æ??å??ç¨?åº?(_U)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:455
-#: ../plugins/debug-manager/plugin.c:1159
+#: ../plugins/debug-manager/plugin.c:457
+#: ../plugins/debug-manager/plugin.c:1161
 msgid "Pauses the execution of the program"
 msgstr "æ??å??æ£å?¨æ?§è¡?ç??ç¨?åº?"
 
-#: ../plugins/debug-manager/plugin.c:458
+#: ../plugins/debug-manager/plugin.c:460
 msgid "Runningâ?¦"
 msgstr "æ£å?¨è¿?è¡?..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:481
-#: ../plugins/debug-manager/plugin.c:1049
+#: ../plugins/debug-manager/plugin.c:483
+#: ../plugins/debug-manager/plugin.c:1051
 msgid "Run/_Continue"
 msgstr "è¿?è¡?/ç»§ç»(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:482
-#: ../plugins/debug-manager/plugin.c:1051
+#: ../plugins/debug-manager/plugin.c:484
+#: ../plugins/debug-manager/plugin.c:1053
 msgid "Continue the execution of the program"
 msgstr "ç»§ç»ç¨?åº?æ?§è¡?"
 
-#: ../plugins/debug-manager/plugin.c:485
+#: ../plugins/debug-manager/plugin.c:487
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
-#: ../plugins/debug-manager/plugin.c:519
+#: ../plugins/debug-manager/plugin.c:521
 msgid "Unloaded"
 msgstr "å·²å?¸è½½"
 
-#: ../plugins/debug-manager/plugin.c:561
+#: ../plugins/debug-manager/plugin.c:563
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
 msgstr "è°?è¯?å?¨ç»?æ¢ï¼?é??è¯¯ %d: %s\n"
 
-#: ../plugins/debug-manager/plugin.c:574
+#: ../plugins/debug-manager/plugin.c:576
 #, c-format
 msgid "Program has received signal: %s\n"
 msgstr "ç¨?åº?æ?¥æ?¶å?°ä¿¡å?·ï¼?%s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:913
+#: ../plugins/debug-manager/plugin.c:915
 msgid "_Debug"
 msgstr "è°?è¯?(_D)"
 
-#: ../plugins/debug-manager/plugin.c:921
+#: ../plugins/debug-manager/plugin.c:923
 msgid "_Start Debugger"
 msgstr "å?¯å?¨è°?è¯?å?¨(_S)"
 
-#: ../plugins/debug-manager/plugin.c:929
+#: ../plugins/debug-manager/plugin.c:931
 msgid "_Debug Program"
 msgstr "è°?è¯?ç¨?åº?(_D)"
 
-#: ../plugins/debug-manager/plugin.c:931
+#: ../plugins/debug-manager/plugin.c:933
 msgid "Start debugger and load the program"
 msgstr "å?¯å?¨è°?è¯?å?¨å¹¶å? è½½ç¨?åº?"
 
-#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:939
 msgid "_Debug Processâ?¦"
 msgstr "è°?è¯?è¿?ç¨?(_D)..."
 
-#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:941
 msgid "Start debugger and attach to a running program"
 msgstr "å?¯å?¨è°?è¯?å?¨å¹¶ä¾?é??å?°è¿?è¡?ä¸ç??ç¨?åº?"
 
-#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:947
 msgid "Debug _Remote Targetâ?¦"
 msgstr "è¿?ç¨?è°?è¯?ç?®æ ?(_R)..."
 
-#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:949
 msgid "Connect to a remote debugging target"
 msgstr "è¿?æ?¥å?°è¿?ç¨?è°?è¯?ç?®æ ?"
 
-#: ../plugins/debug-manager/plugin.c:953
+#: ../plugins/debug-manager/plugin.c:955
 msgid "Stop Debugger"
 msgstr "å??æ¢è°?è¯?å?¨(_O)"
 
-#: ../plugins/debug-manager/plugin.c:955
+#: ../plugins/debug-manager/plugin.c:957
 msgid "Say goodbye to the debugger"
 msgstr "å??è°?è¯?å?¨è¯´å??è§?"
 
-#: ../plugins/debug-manager/plugin.c:961
+#: ../plugins/debug-manager/plugin.c:963
 msgid "Add source pathsâ?¦"
 msgstr "æ·»å? æº?ä»£ç ?è·¯å¾?..."
 
-#: ../plugins/debug-manager/plugin.c:963
+#: ../plugins/debug-manager/plugin.c:965
 msgid "Add additional source paths"
 msgstr "æ·»å? å?¶å®?æº?ç ?è·¯å¾?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:973
-#: ../plugins/debug-manager/plugin.c:1097
+#: ../plugins/debug-manager/plugin.c:975
+#: ../plugins/debug-manager/plugin.c:1099
 msgid "Debugger Commandâ?¦"
 msgstr "è°?è¯?å?¨å?½ä»¤..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:975
-#: ../plugins/debug-manager/plugin.c:1099
+#: ../plugins/debug-manager/plugin.c:977
+#: ../plugins/debug-manager/plugin.c:1101
 msgid "Custom debugger command"
 msgstr "å®?å?¶è°?è¯?å?¨å?½ä»¤"
 
-#: ../plugins/debug-manager/plugin.c:981
-#: ../plugins/debug-manager/plugin.c:1105
+#: ../plugins/debug-manager/plugin.c:983
+#: ../plugins/debug-manager/plugin.c:1107
 msgid "_Info"
 msgstr "ä¿¡æ?¯(_I)"
 
-#: ../plugins/debug-manager/plugin.c:989
+#: ../plugins/debug-manager/plugin.c:991
 msgid "Info _Target Files"
 msgstr "ç?®æ ?æ??ä»¶ä¿¡æ?¯(_T)"
 
-#: ../plugins/debug-manager/plugin.c:991
+#: ../plugins/debug-manager/plugin.c:993
 msgid "Display information on the files the debugger is active with"
 msgstr "æ?¾ç¤ºæ??è°?è¯?å?¨æ´»å?¨ç??æ??ä»¶ä¸?ç??ä¿¡æ?¯"
 
-#: ../plugins/debug-manager/plugin.c:997
+#: ../plugins/debug-manager/plugin.c:999
 msgid "Info _Program"
 msgstr "ç¨?åº?ä¿¡æ?¯(_P)"
 
-#: ../plugins/debug-manager/plugin.c:999
+#: ../plugins/debug-manager/plugin.c:1001
 msgid "Display information on the execution status of the program"
 msgstr "æ?¾ç¤ºæ?§è¡?ç?¶æ??ç??ç¨?åº?ç??ä¿¡æ?¯"
 
-#: ../plugins/debug-manager/plugin.c:1005
+#: ../plugins/debug-manager/plugin.c:1007
 msgid "Info _Kernel User Struct"
 msgstr "å??æ ¸ User ç»?æ??ä½?ä¿¡æ?¯(_K)"
 
-#: ../plugins/debug-manager/plugin.c:1007
+#: ../plugins/debug-manager/plugin.c:1009
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr "ä¸ºå½?å??å?è¿?ç¨?æ?¾ç¤ºå??æ ¸â??struct userâ??ç??å??å®¹"
 
-#: ../plugins/debug-manager/plugin.c:1021
-#: ../plugins/debug-manager/plugin.c:1137
+#: ../plugins/debug-manager/plugin.c:1023
+#: ../plugins/debug-manager/plugin.c:1139
 msgid "Shared Libraries"
 msgstr "å?±äº«å?½æ?°åº?"
 
-#: ../plugins/debug-manager/plugin.c:1023
-#: ../plugins/debug-manager/plugin.c:1139
+#: ../plugins/debug-manager/plugin.c:1025
+#: ../plugins/debug-manager/plugin.c:1141
 msgid "Show shared library mappings"
 msgstr "æ?¾ç¤ºå?±äº«å?½æ?°åº?æ? å°?"
 
-#: ../plugins/debug-manager/plugin.c:1031
-#: ../plugins/debug-manager/plugin.c:1147
+#: ../plugins/debug-manager/plugin.c:1033
+#: ../plugins/debug-manager/plugin.c:1149
 msgid "Show kernel signals"
 msgstr "æ?¾ç¤ºå??æ ¸ä¿¡å?·"
 
-#: ../plugins/debug-manager/plugin.c:1037
+#: ../plugins/debug-manager/plugin.c:1039
 msgid "_Continue/Suspend"
 msgstr "ç»§ç»/æ??å??(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1039
+#: ../plugins/debug-manager/plugin.c:1041
 msgid "Continue or suspend the execution of the program"
 msgstr "ç»§ç»æ??æ??å??ç¨?åº?æ?§è¡?"
 
-#: ../plugins/debug-manager/plugin.c:1057
+#: ../plugins/debug-manager/plugin.c:1059
 msgid "Step _In"
 msgstr "æ¥å?¥(_I)"
 
-#: ../plugins/debug-manager/plugin.c:1059
+#: ../plugins/debug-manager/plugin.c:1061
 msgid "Single step into function"
 msgstr "å??æ¥è·¨å?¥å?½æ?°"
 
-#: ../plugins/debug-manager/plugin.c:1065
+#: ../plugins/debug-manager/plugin.c:1067
 msgid "Step O_ver"
 msgstr "æ¥è¿?(_V)"
 
-#: ../plugins/debug-manager/plugin.c:1067
+#: ../plugins/debug-manager/plugin.c:1069
 msgid "Single step over function"
 msgstr "å??æ¥è·¨è¿?å?½æ?°"
 
-#: ../plugins/debug-manager/plugin.c:1073
+#: ../plugins/debug-manager/plugin.c:1075
 msgid "Step _Out"
 msgstr "æ¥å?º(_O)"
 
-#: ../plugins/debug-manager/plugin.c:1075
+#: ../plugins/debug-manager/plugin.c:1077
 msgid "Single step out of function"
 msgstr "å??æ¥è·¨å?ºå?½æ?°"
 
-#: ../plugins/debug-manager/plugin.c:1081
+#: ../plugins/debug-manager/plugin.c:1083
 msgid "_Run to Cursor"
 msgstr "è¿?è¡?è?³å??æ ?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:1083
+#: ../plugins/debug-manager/plugin.c:1085
 msgid "Run to the cursor"
 msgstr "è¿?è¡?è?³å??æ ?"
 
-#: ../plugins/debug-manager/plugin.c:1089
+#: ../plugins/debug-manager/plugin.c:1091
 msgid "_Run from Cursor"
 msgstr "ä»?å??æ ?å¤?å¼?å§?è¿?è¡?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:1091
+#: ../plugins/debug-manager/plugin.c:1093
 msgid "Run from the cursor"
 msgstr "ä»?å??æ ?å¤?å¼?å§?è¿?è¡?"
 
-#: ../plugins/debug-manager/plugin.c:1113
+#: ../plugins/debug-manager/plugin.c:1115
 msgid "Info _Global Variables"
 msgstr "å?¨å±?å??é??ä¿¡æ?¯(_G)"
 
-#: ../plugins/debug-manager/plugin.c:1115
+#: ../plugins/debug-manager/plugin.c:1117
 msgid "Display all global and static variables of the program"
 msgstr "æ?¾ç¤ºæ??æ??å?¨å±?å??é??å??é??æ??å??é??"
 
-#: ../plugins/debug-manager/plugin.c:1121
+#: ../plugins/debug-manager/plugin.c:1123
 msgid "Info _Current Frame"
 msgstr "å½?å??å¸§ä¿¡æ?¯(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1123
+#: ../plugins/debug-manager/plugin.c:1125
 msgid "Display information about the current frame of execution"
 msgstr "æ?¾ç¤ºå½?å??æ?§è¡?ç??å¸§ä¿¡æ?¯"
 
-#: ../plugins/debug-manager/plugin.c:1129
+#: ../plugins/debug-manager/plugin.c:1131
 msgid "Info Function _Arguments"
 msgstr "å?½æ?°å??æ?°ä¿¡æ?¯(_A)"
 
-#: ../plugins/debug-manager/plugin.c:1131
+#: ../plugins/debug-manager/plugin.c:1133
 msgid "Display function arguments of the current frame"
 msgstr "æ?¾ç¤ºå½?å??å¸§ç??å?½æ?°å??æ?°"
 
-#: ../plugins/debug-manager/plugin.c:1199
-#: ../plugins/debug-manager/plugin.c:1205
-#: ../plugins/debug-manager/plugin.c:1211
-#: ../plugins/debug-manager/plugin.c:1217
+#: ../plugins/debug-manager/plugin.c:1201
+#: ../plugins/debug-manager/plugin.c:1207
+#: ../plugins/debug-manager/plugin.c:1213
+#: ../plugins/debug-manager/plugin.c:1219
 msgid "Debugger operations"
 msgstr "è°?è¯?å?¨æ??ä½?"
 
@@ -2615,11 +2808,11 @@ msgstr "å¯?å?å?¨"
 msgid "Shared Object"
 msgstr "å?±äº«å¯¹è±¡"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/debug-manager/sharedlib.c:173
 msgid "From"
 msgstr "ä»?"
 
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
+#: ../plugins/debug-manager/sharedlib.c:180
 msgid "To"
 msgstr "å?°"
 
@@ -2709,7 +2902,8 @@ msgstr "å¸§"
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:664
 #: ../plugins/debug-manager/threads.c:451 ../plugins/gdb/preferences.c:363
-#: ../plugins/tools/tool.c:100 ../src/anjuta-app.c:623
+#: ../plugins/symbol-db/plugin.c:2129 ../plugins/tools/tool.c:100
+#: ../src/anjuta-app.c:625
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "æ??ä»¶"
@@ -2849,64 +3043,63 @@ msgstr "ç??è§?æ??ä½?"
 msgid "Watches"
 msgstr "ç??è§?"
 
-#: ../plugins/devhelp/plugin.c:202
+#: ../plugins/devhelp/plugin.c:206
 msgid "Search Help:"
 msgstr "æ??ç´¢å¸®å?©ï¼?"
 
-#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:243
-#: ../plugins/message-view/plugin.c:77 ../plugins/symbol-db/plugin.c:313
+#: ../plugins/devhelp/plugin.c:227 ../plugins/document-manager/plugin.c:243
+#: ../plugins/message-view/plugin.c:77 ../plugins/symbol-db/plugin.c:322
 msgid "_Go to"
 msgstr "è½¬å?°(_G)"
 
-#: ../plugins/devhelp/plugin.c:232
+#: ../plugins/devhelp/plugin.c:236
 msgid "_API Reference"
 msgstr "API å??è??(_A)"
 
-#: ../plugins/devhelp/plugin.c:234
+#: ../plugins/devhelp/plugin.c:238
 msgid "Browse API Pages"
 msgstr "æµ?è§? API é¡µ"
 
-#: ../plugins/devhelp/plugin.c:244
+#: ../plugins/devhelp/plugin.c:248
 msgid "_Context Help"
 msgstr "ä¸?ä¸?æ??å¸®å?©(_C)"
 
-#: ../plugins/devhelp/plugin.c:246
+#: ../plugins/devhelp/plugin.c:250
 msgid "Search help for the current word in the editor"
 msgstr "å?¨å¸®å?©æ??ä»¶å??æ??ç´¢ç¼?è¾?å?¨ç??å½?å??å??è¯?"
 
-#: ../plugins/devhelp/plugin.c:252
+#: ../plugins/devhelp/plugin.c:260
 msgid "_Search Help"
 msgstr "æ??ç´¢å¸®å?©(_S)"
 
-#: ../plugins/devhelp/plugin.c:254
+#: ../plugins/devhelp/plugin.c:262
 msgid "Search for a term in help"
 msgstr "å?¨å¸®å?©ä¸æ??ç´¢æ?¯è¯"
 
-#: ../plugins/devhelp/plugin.c:326
+#: ../plugins/devhelp/plugin.c:334
 msgid "Help operations"
 msgstr "å¸®å?©æ??ä½?"
 
-#: ../plugins/devhelp/plugin.c:345 ../plugins/devhelp/plugin.c:462
-#: ../src/anjuta-app.c:640
-msgid "Help"
-msgstr "å¸®å?©"
+#: ../plugins/devhelp/plugin.c:353 ../plugins/devhelp/plugin.c:470
+msgid "API Browser"
+msgstr "API æµ?è§?å?¨"
 
-#: ../plugins/devhelp/plugin.c:356
+#: ../plugins/devhelp/plugin.c:364
 msgid "Contents"
 msgstr "ç?®å½?"
 
-#: ../plugins/devhelp/plugin.c:362 ../plugins/search/search-replace.c:1034
+#: ../plugins/devhelp/plugin.c:370 ../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
+#: ../plugins/search/search-replace.c:2037 ../plugins/symbol-db/plugin.c:2139
+#: ../plugins/symbol-db/plugin.c:2191
 msgid "Search"
 msgstr "æ??ç´¢"
 
-#: ../plugins/devhelp/plugin.c:380 ../plugins/devhelp/plugin.c:467
-msgid "Help display"
-msgstr "å¸®å?©æ?¾ç¤º"
+#: ../plugins/devhelp/plugin.c:388 ../plugins/devhelp/plugin.c:475
+msgid "API"
+msgstr "API"
 
 #: ../plugins/document-manager/action-callbacks.c:314
 #, c-format
@@ -2921,26 +3114,26 @@ msgstr ""
 msgid "_Reload"
 msgstr "é??æ?°å? è½½(_R)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:311
+#: ../plugins/document-manager/anjuta-bookmarks.c:334
 msgid "Add bookmark"
 msgstr "æ·»å? ä¹¦ç¾(_A)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:317
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
 msgid "Remove bookmark"
 msgstr "æ¸?é?¤ä¹¦ç¾"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:331
-#: ../plugins/document-manager/anjuta-bookmarks.c:404
+#: ../plugins/document-manager/anjuta-bookmarks.c:354
+#: ../plugins/document-manager/anjuta-bookmarks.c:414
 #: ../plugins/document-manager/plugin.c:422
 msgid "Bookmarks"
 msgstr "ä¹¦ç¾"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:339
+#: ../plugins/document-manager/anjuta-bookmarks.c:362
 msgid "Rename"
 msgstr "é??å?½å??(_R)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:23 ../plugins/gtodo/callback.c:106
+#: ../plugins/document-manager/anjuta-bookmarks.c:363
+#: ../plugins/git/plugin.c:178
 #: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "å? é?¤"
@@ -2950,6 +3143,7 @@ msgid "Close file"
 msgstr "å?³é?æ??ä»¶(_C)"
 
 #: ../plugins/document-manager/anjuta-docman.c:502
+#: ../plugins/project-manager/dialogs.c:563
 msgid "Path:"
 msgstr "è·¯å¾?ï¼?"
 
@@ -3082,11 +3276,11 @@ msgid "Close all files"
 msgstr "å?³é?å?¨é?¨æ??ä»¶"
 
 #: ../plugins/document-manager/plugin.c:165
-msgid "Close Other"
+msgid "Close Others"
 msgstr "å?³é?å?¶å®?"
 
 #: ../plugins/document-manager/plugin.c:166
-msgid "Close other documents"
+msgid "Close others documents"
 msgstr "å?³é?å?¶å®?æ??ä»¶"
 
 #: ../plugins/document-manager/plugin.c:168
@@ -3295,9 +3489,8 @@ msgstr "å¿«é??é??æ?°æ??ç´¢(_R)"
 msgid "Repeat quick search"
 msgstr "é??å¤?å¿«é??æ??ç´¢"
 
-#: ../plugins/document-manager/plugin.c:275 ../plugins/gtodo/interface.c:141
-#: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1914
+#: ../plugins/document-manager/plugin.c:275 ../src/anjuta-actions.h:30
+#: ../plugins/language-support-cpp-java/plugin.c:961
 #: ../plugins/language-support-python/plugin.c:1179
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
@@ -3506,11 +3699,12 @@ msgid "Bookmar_k"
 msgstr "ä¹¦ç¾(_K)"
 
 #: ../plugins/document-manager/plugin.c:380
-msgid "_Add Bookmark"
-msgstr "æ·»å? ä¹¦ç¾(_A)"
+msgid "_Toggle Bookmark"
+msgstr "å??æ?¢ä¹¦ç¾ç?¶æ??(_T)"
 
 #: ../plugins/document-manager/plugin.c:381
-msgid "Add a bookmark at the current line position"
+#, fuzzy
+msgid "Toggle bookmark at the current line position"
 msgstr "å?¨å½?å??è¡?æ·»å? ä¸?ä¸ªä¹¦ç¾"
 
 #: ../plugins/document-manager/plugin.c:383
@@ -3582,10 +3776,11 @@ msgstr "ç¼?è¾?å?¨æ??æ?¬æ ¼å¼?"
 msgid "Simple searching"
 msgstr "ç®?å??æ??ç´¢"
 
+#. DocmanPlugin* plugin = ANJUTA_PLUGIN_DOCMAN (ipref);
 #: ../plugins/document-manager/plugin.c:421
-#: ../plugins/document-manager/plugin.c:1750
-#: ../plugins/document-manager/plugin.c:2172
-#: ../plugins/document-manager/plugin.c:2181
+#: ../plugins/document-manager/plugin.c:1749
+#: ../plugins/document-manager/plugin.c:2171
+#: ../plugins/document-manager/plugin.c:2180
 msgid "Documents"
 msgstr "æ??æ¡£"
 
@@ -3622,18 +3817,13 @@ msgstr "å??"
 msgid "Mode"
 msgstr "æ¨¡å¼?"
 
-#. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1033
-msgid "Automatic"
-msgstr "è?ªå?¨"
-
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1592
+#: ../plugins/document-manager/plugin.c:1591
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå?¨ä¿?å? â??%sâ?? å¤±è´¥"
 
-#: ../plugins/document-manager/plugin.c:1606
+#: ../plugins/document-manager/plugin.c:1605
 msgid "Autosave completed"
 msgstr "è?ªå?¨ä¿?å?å®?æ??"
 
@@ -3752,7 +3942,7 @@ msgid "Document Manager"
 msgstr "æ??æ¡£ç®¡ç??å?¨"
 
 #: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
-#: ../plugins/run-program/parameters.c:308
+#: ../plugins/run-program/parameters.c:311
 msgid "All files"
 msgstr "å?¨é?¨æ??ä»¶"
 
@@ -3910,8 +4100,8 @@ msgid "Filter"
 msgstr "è¿?æ»¤å?¨"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2121 ../plugins/symbol-db/plugin.c:2170
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/plugin.c:2183
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
 msgid "Global"
 msgstr "å?¨å±?"
 
@@ -3919,7 +4109,7 @@ msgstr "å?¨å±?"
 msgid "Root directory if no project is open:"
 msgstr "æ²¡æ??é¡¹ç?®è¢«æ??å¼?æ?¶ç??æ ¹ç?®å½?ï¼?"
 
-#: ../plugins/file-manager/file-model.c:120
+#: ../plugins/file-manager/file-model.c:120 ../plugins/git/anjuta-git.ui.h:46
 msgid "Loading..."
 msgstr "æ£å?¨å? è½½..."
 
@@ -3947,7 +4137,7 @@ msgstr "é??å?½å??æ??ä»¶æ??ç?®å½?"
 msgid "File manager popup actions"
 msgstr "æ??ä»¶ç®¡ç??å?¨å¼¹å?ºå¼?å?¨ä½?"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:327 ../plugins/git/plugin.c:162
 msgid "Files"
 msgstr "æ??ä»¶"
 
@@ -3985,7 +4175,8 @@ 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/am-project/am-properties.c:48 ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/project-manager/dialogs.c:568
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??ç§°ï¼?"
@@ -3996,7 +4187,7 @@ msgid "New File"
 msgstr "æ?°å»ºæ??ä»¶"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
-#: ../plugins/project-manager/dialogs.c:542
+#: ../plugins/project-manager/dialogs.c:590
 msgid "Type:"
 msgstr "ç±»å??ï¼?"
 
@@ -4058,114 +4249,84 @@ msgstr "æ? æ³?ä¸ºæ?°å»ºæ??ä»¶æ??å»ºç?¨æ?·ç??é?¢"
 msgid "Missing name"
 msgstr "ç¼ºå°?å??ç§°"
 
-#: ../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/dir-project/dir-project.c:773
-#: ../plugins/am-project/am-project.c:91
+#: ../plugins/dir-project/dir-project.c:780
+#: ../plugins/am-project/am-project.c:89 ../plugins/mk-project/mk-project.c:66
 msgid "Group"
 msgstr "ç»?"
 
-#: ../plugins/dir-project/dir-project.c:776
-#: ../plugins/am-project/am-project.c:98
+#: ../plugins/dir-project/dir-project.c:783
+#: ../plugins/am-project/am-project.c:96 ../plugins/mk-project/mk-project.c:70
 msgid "Source"
 msgstr "æ?¥æº?"
 
-#: ../plugins/dir-project/dir-project.c:877
-#: ../plugins/dir-project/dir-project.c:887
+#: ../plugins/dir-project/dir-project.c:899
+#: ../plugins/dir-project/dir-project.c:909
+#: ../plugins/mk-project/mk-project.c:977
+#: ../plugins/mk-project/mk-project.c:987
 #, c-format
 msgid "Project doesn't allow to set properties"
 msgstr "é¡¹ç?®ä¸?å??è®¸è®¾ç½®å±?æ?§"
 
-#: ../plugins/am-project/am-node.c:750
-msgid "Please specify group name"
-msgstr "è¯·æ??å®?ç»?å??"
-
-#: ../plugins/am-project/am-node.c:764
-msgid ""
-"Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
-msgstr "ç»?å??å?ªè?½å??å?«å?æ¯?æ??â??#$:%+,- = ^_`~â??è¿?äº?å?ç¬¦"
-
-#: ../plugins/am-project/am-node.c:918
-msgid "Please specify target name"
-msgstr "è¯·æ??å®?ç?®æ ?å??ç§°"
-
-#: ../plugins/am-project/am-node.c:932
-msgid ""
-"Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
-msgstr "ç?®æ ?å??å?ªè?½ç?±å?æ¯?ã??â??_â??ã??â??-â??ã??â??/â??æ??â??.â??ç»?æ??"
-
-#: ../plugins/am-project/am-node.c:947
-msgid "Shared library target name must be of the form 'libxxx.la'"
-msgstr "å?±äº«åº?ç?®æ ?å??å¿?é¡»æ?¯â??libxxx.laâ??ç??å½¢å¼?"
-
-#: ../plugins/am-project/am-node.c:956
-msgid "Static library target name must be of the form 'libxxx.a'"
-msgstr "é??æ??åº?ç?®æ ?å??å¿?é¡»æ?¯â??libxxx.aâ??ç??å½¢å¼?"
-
-#: ../plugins/am-project/am-project.c:114
+#: ../plugins/am-project/am-project.c:112
 msgid "Shared Library"
 msgstr "å?±äº«å?½æ?°åº?"
 
-#: ../plugins/am-project/am-project.c:121
+#: ../plugins/am-project/am-project.c:119
 msgid "Static Library"
 msgstr "é??æ??å?½æ?°åº?"
 
-#: ../plugins/am-project/am-project.c:135
+#: ../plugins/am-project/am-project.c:133
 msgid "Python Module"
 msgstr "Python æ¨¡å??"
 
-#: ../plugins/am-project/am-project.c:142
+#: ../plugins/am-project/am-project.c:140
 msgid "Java Module"
 msgstr "Java æ¨¡å??"
 
-#: ../plugins/am-project/am-project.c:149
+#: ../plugins/am-project/am-project.c:147
 msgid "Lisp Module"
 msgstr "Lisp æ¨¡å??"
 
-#: ../plugins/am-project/am-project.c:156
+#: ../plugins/am-project/am-project.c:154
 msgid "Header Files"
 msgstr "å¤´æ??ä»¶"
 
-#: ../plugins/am-project/am-project.c:163
+#: ../plugins/am-project/am-project.c:161
 msgid "Man Documentation"
 msgstr "Man æ??æ¡£"
 
-#: ../plugins/am-project/am-project.c:170
+#: ../plugins/am-project/am-project.c:168
 msgid "Info Documentation"
 msgstr "Info æ??æ¡£"
 
-#: ../plugins/am-project/am-project.c:177
+#: ../plugins/am-project/am-project.c:175
 msgid "Miscellaneous Data"
 msgstr "æ??é¡¹æ?°æ?®"
 
-#: ../plugins/am-project/am-project.c:184
+#: ../plugins/am-project/am-project.c:182
 msgid "Script"
 msgstr "è??æ?¬"
 
-#: ../plugins/am-project/am-project.c:198
+#: ../plugins/am-project/am-project.c:196
 msgid "Package"
 msgstr "å??"
 
-#: ../plugins/am-project/am-project.c:1644
+#: ../plugins/am-project/am-project.c:1585
 #, c-format
 msgid "Unable to parse project file"
 msgstr "æ? æ³?è§£æ??é¡¹ç?®æ??ä»¶"
 
-#: ../plugins/am-project/am-properties.c:46
+#: ../plugins/am-project/am-properties.c:51
+msgid "Project name, it can contain spaces by example 'GNU Autoconf'"
+msgstr "é¡¹ç?®å??ç§°ï¼?å?¯ä»¥å??å?«ç©ºæ ¼ï¼?ä¾?å¦?â??GNU Autoconfâ??"
+
+#: ../plugins/am-project/am-properties.c:56
 #: ../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
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:31
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:46
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:29
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:25
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:27
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:27
@@ -4179,114 +4340,368 @@ msgstr "æ? æ³?è§£æ??é¡¹ç?®æ??ä»¶"
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../plugins/am-project/am-properties.c:47
+#: ../plugins/am-project/am-properties.c:59
+msgid ""
+"Project version, typically a few numbers separated by dot by example '1.0.0'"
+msgstr "é¡¹ç?®ç??æ?¬ï¼?ä¸?è?¬ä¸ºç?¹å?·å??é??ç??ä¸?ä¸²æ?°å?"
+
+#: ../plugins/am-project/am-properties.c:64
 msgid "Bug report URL:"
-msgstr "Bug æ?¥å?? URLï¼?"
+msgstr "Bug æ?¥å??å?°å??ï¼?"
 
-#: ../plugins/am-project/am-properties.c:48
+#: ../plugins/am-project/am-properties.c:67
+msgid ""
+"An email address or a link to a web page where the user can report bug. It "
+"is optional."
+msgstr "ç?¨æ?·æ?¥å?? Bug ç??é?®ä»¶å?°å??æ??è??ç½?é¡µè¿?æ?¥ï¼?å?¯é??ã??"
+
+#: ../plugins/am-project/am-properties.c:72
 msgid "Package name:"
 msgstr "å??å??ç§°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:49 ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/am-project/am-properties.c:75
+msgid ""
+"Package name, it can contains only alphanumerics and underscore characters."
+"It is generated from the project name if not provided."
+msgstr "å??å??å?ï¼?å?ªè?½å??å?«å?æ¯?ï¼?æ?°å?ï¼?å??ä¸?å??çº¿ã??å¦?æ??æ²¡æ??æ??å®?ï¼?å°?ä»?é¡¹ç?®å??å?ç??æ??ã??"
+
+#: ../plugins/am-project/am-properties.c:81
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/am-project/am-properties.c:56
-#: ../plugins/am-project/am-properties.c:75
+#: ../plugins/am-project/am-properties.c:84
+#, fuzzy
+msgid "An link to the project web page if provided."
+msgstr "æ??å??é¡¹ç?®ä¸»é¡µç??è¿?æ?¥ï¼?å¦?æ??å?å?¨ç??è¯?ã??"
+
+#: ../plugins/am-project/am-properties.c:97
+#: ../plugins/am-project/am-properties.c:208
+#: ../plugins/am-project/am-properties.c:368
+#: ../plugins/am-project/am-properties.c:520
 msgid "Linker flags:"
 msgstr "è¿?æ?¥å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:57
-#: ../plugins/am-project/am-properties.c:78
+#: ../plugins/am-project/am-properties.c:100
+msgid "Common additional linker flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å? é?¾æ?¥é??é¡¹ã??"
+
+#: ../plugins/am-project/am-properties.c:105
+#: ../plugins/am-project/am-properties.c:232
+#: ../plugins/am-project/am-properties.c:384
+#: ../plugins/am-project/am-properties.c:536
 msgid "C preprocessor flags:"
 msgstr "C é¢?å¤?ç??å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:58
-#: ../plugins/am-project/am-properties.c:79
+#: ../plugins/am-project/am-properties.c:108
+msgid "Common additional C preprocessor flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  C é¢?å¤?ç??å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:113
+#: ../plugins/am-project/am-properties.c:240
+#: ../plugins/am-project/am-properties.c:392
+#: ../plugins/am-project/am-properties.c:544
 msgid "C compiler flags:"
 msgstr "C ç¼?è¯?å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:59
-#: ../plugins/am-project/am-properties.c:80
+#: ../plugins/am-project/am-properties.c:116
+msgid "Common additional C compiler flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  C ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:121
+#: ../plugins/am-project/am-properties.c:248
+#: ../plugins/am-project/am-properties.c:400
+#: ../plugins/am-project/am-properties.c:552
 msgid "C++ compiler flags:"
 msgstr "C++ ç¼?è¯?å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:60
-#: ../plugins/am-project/am-properties.c:81
+#: ../plugins/am-project/am-properties.c:124
+msgid "Common additional C++ compiler flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  C++ ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:129
+#: ../plugins/am-project/am-properties.c:256
+#: ../plugins/am-project/am-properties.c:408
+#: ../plugins/am-project/am-properties.c:560
 msgid "Java compiler flags:"
 msgstr "Java ç¼?è¯?å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:61
-#: ../plugins/am-project/am-properties.c:82
+#: ../plugins/am-project/am-properties.c:132
+msgid "Common additional Java compiler flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  Java ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:137
+#: ../plugins/am-project/am-properties.c:264
+#: ../plugins/am-project/am-properties.c:416
+#: ../plugins/am-project/am-properties.c:568
 msgid "Vala compiler flags:"
 msgstr "Vala ç¼?è¯?å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:62
-#: ../plugins/am-project/am-properties.c:83
-msgid "Fortan compiler flags:"
+#: ../plugins/am-project/am-properties.c:140
+msgid "Common additional Vala compiler flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  Vala ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:145
+#: ../plugins/am-project/am-properties.c:272
+#: ../plugins/am-project/am-properties.c:424
+#: ../plugins/am-project/am-properties.c:576
+msgid "Fortran compiler flags:"
 msgstr "Fortran ç¼?è¯?å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:63
-#: ../plugins/am-project/am-properties.c:84
+#: ../plugins/am-project/am-properties.c:148
+msgid "Common additional Fortran compiler flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  Fortran ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:153
+#: ../plugins/am-project/am-properties.c:280
+#: ../plugins/am-project/am-properties.c:432
+#: ../plugins/am-project/am-properties.c:584
 msgid "Objective C compiler flags:"
 msgstr "Objective C ç¼?è¯?å?¨å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:64
-#: ../plugins/am-project/am-properties.c:85
+#: ../plugins/am-project/am-properties.c:156
+msgid ""
+"Common additional Objective C compiler flags for all targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  Object C ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:161
+#: ../plugins/am-project/am-properties.c:288
+#: ../plugins/am-project/am-properties.c:440
+#: ../plugins/am-project/am-properties.c:592
 msgid "Lex/Flex flags:"
 msgstr "Lex/Flex å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:65
-#: ../plugins/am-project/am-properties.c:86
+#: ../plugins/am-project/am-properties.c:164
+msgid ""
+"Common additional Lex or Flex lexical analyser generator flags for all "
+"targets in this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?ç??å?¬å?±é??å?  Lex æ?? Flex è¯?æ³?å??æ??å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:169
+#: ../plugins/am-project/am-properties.c:296
+#: ../plugins/am-project/am-properties.c:448
+#: ../plugins/am-project/am-properties.c:600
 msgid "Yacc/Bison flags:"
 msgstr "Yacc/Bison å??æ?°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:66
-msgid "Install directories:"
+#: ../plugins/am-project/am-properties.c:172
+msgid ""
+"Common additional Yacc or Bison parser generator flags for all targets in "
+"this group."
+msgstr "è¯¥ç»?æ??æ??ç?®æ ?å?¬å?±é??å?  Yacc æ?? Bison è§£æ??å?¨ç??æ??å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:177
+msgid "Installation directories:"
 msgstr "å®?è£?ç?®å½?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:73
+#: ../plugins/am-project/am-properties.c:180
+msgid "List of custom installation directories used by targets in this group."
+msgstr "è¯¥ç»?ç?®æ ?ä½¿ç?¨ç??è?ªå®?ä¹?å®?è£?ç?®å½?ç??å??è¡¨ã??"
+
+#: ../plugins/am-project/am-properties.c:192
+#: ../plugins/am-project/am-properties.c:352
+#: ../plugins/am-project/am-properties.c:504
+#: ../plugins/am-project/am-properties.c:687
 msgid "Do not install:"
 msgstr "ä¸?å®?è£?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:74
+#: ../plugins/am-project/am-properties.c:195
+#: ../plugins/am-project/am-properties.c:355
+#: ../plugins/am-project/am-properties.c:507
+#: ../plugins/am-project/am-properties.c:690
+msgid "Build but do not install the target."
+msgstr "æ??å»ºä½?æ?ªå®?è£?æ¤ç?®æ ?"
+
+#: ../plugins/am-project/am-properties.c:200
+#: ../plugins/am-project/am-properties.c:360
+#: ../plugins/am-project/am-properties.c:512
+#: ../plugins/am-project/am-properties.c:695
 msgid "Installation directory:"
 msgstr "å®?è£?ç?®å½?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:76
+#: ../plugins/am-project/am-properties.c:203
+#: ../plugins/am-project/am-properties.c:363
+#: ../plugins/am-project/am-properties.c:515
+#: ../plugins/am-project/am-properties.c:698
+msgid ""
+"It has to be a standard directory or a custom one defined in group "
+"properties."
+msgstr ""
+
+#: ../plugins/am-project/am-properties.c:211
+#: ../plugins/am-project/am-properties.c:371
+#: ../plugins/am-project/am-properties.c:523
+msgid "Additional linker flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å? é?¾æ?¥é??é¡¹"
+
+#: ../plugins/am-project/am-properties.c:216
 msgid "Additional libraries:"
 msgstr "é??å? åº?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:77
-msgid "Additional objects:"
-msgstr "é??å? ç?®æ ?æ??ä»¶ï¼?"
+#: ../plugins/am-project/am-properties.c:219
+#: ../plugins/am-project/am-properties.c:379
+#: ../plugins/am-project/am-properties.c:531
+msgid "Additional libraries for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å? åº?ã??"
 
-#: ../plugins/am-project/am-properties.c:87
-#: ../plugins/am-project/am-properties.c:97
+#: ../plugins/am-project/am-properties.c:224
+msgid "Additional objects:"
+msgstr "é??å? æ??ä»¶ï¼?"
+
+#: ../plugins/am-project/am-properties.c:227
+msgid "Additional object files for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å? æ??ä»¶ã??"
+
+#: ../plugins/am-project/am-properties.c:235
+#: ../plugins/am-project/am-properties.c:387
+#: ../plugins/am-project/am-properties.c:539
+msgid "Additional C preprocessor flags for this target."
+msgstr "è¯¥ç?®æ ?ç?? C é¢?å¤?ç??å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:243
+#: ../plugins/am-project/am-properties.c:395
+#: ../plugins/am-project/am-properties.c:547
+msgid "Additional C compiler flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  C ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:251
+#: ../plugins/am-project/am-properties.c:403
+#: ../plugins/am-project/am-properties.c:555
+msgid "Additional C++ compiler flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  C++ ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:259
+#: ../plugins/am-project/am-properties.c:411
+#: ../plugins/am-project/am-properties.c:563
+msgid "Additional Java compiler flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  Java ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:267
+#: ../plugins/am-project/am-properties.c:419
+#: ../plugins/am-project/am-properties.c:571
+msgid "Additional Vala compiler flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  Vala ç¼?è¯?å?¨å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:275
+#: ../plugins/am-project/am-properties.c:427
+#: ../plugins/am-project/am-properties.c:579
+msgid "Additional Fortran compiler flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  Fortran å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:283
+#: ../plugins/am-project/am-properties.c:435
+#: ../plugins/am-project/am-properties.c:587
+msgid "Additional Objective C compiler flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  Objective C ç¼?è¯?å?¨å??æ?°ï¼?"
+
+#: ../plugins/am-project/am-properties.c:291
+#: ../plugins/am-project/am-properties.c:443
+#: ../plugins/am-project/am-properties.c:595
+msgid ""
+"Additional Lex or Flex lexical analyser generator flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  Lex æ?? Flex è¯?æ³?å??æ??ç??æ??å?¨å??æ?°ã??"
+
+# Yac here should be Yacc?
+#: ../plugins/am-project/am-properties.c:299
+#: ../plugins/am-project/am-properties.c:451
+#: ../plugins/am-project/am-properties.c:603
+msgid "Additional Yac or Bison parser generator flags for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å?  Yacc æ?? Bison å??æ??å?¨ç??æ??å??æ?°ã??"
+
+#: ../plugins/am-project/am-properties.c:304
+#: ../plugins/am-project/am-properties.c:456
+#: ../plugins/am-project/am-properties.c:608
+#: ../plugins/am-project/am-properties.c:656
+#: ../plugins/am-project/am-properties.c:703
 msgid "Additional dependencies:"
 msgstr "é??å? ä¾?èµ?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:88
+#: ../plugins/am-project/am-properties.c:307
+#: ../plugins/am-project/am-properties.c:459
+#: ../plugins/am-project/am-properties.c:611
+#: ../plugins/am-project/am-properties.c:659
+#: ../plugins/am-project/am-properties.c:706
+msgid "Additional dependencies for this target."
+msgstr "è¯¥ç?®æ ?ç??é??å? ä¾?èµ?ã??"
+
+#: ../plugins/am-project/am-properties.c:312
+#: ../plugins/am-project/am-properties.c:464
+#: ../plugins/am-project/am-properties.c:616
+#: ../plugins/am-project/am-properties.c:711
 msgid "Include in distribution:"
 msgstr "å??å?«å?¨å??è¡?ç??ä¸ï¼?"
 
-#: ../plugins/am-project/am-properties.c:89
+#: ../plugins/am-project/am-properties.c:315
+#: ../plugins/am-project/am-properties.c:467
+#: ../plugins/am-project/am-properties.c:619
+#: ../plugins/am-project/am-properties.c:714
+msgid "Include this target in the distributed package."
+msgstr "å?¨å??è¡?å??ä¸å??å?«æ¤ç?®æ ?ã??"
+
+#: ../plugins/am-project/am-properties.c:320
+#: ../plugins/am-project/am-properties.c:472
+#: ../plugins/am-project/am-properties.c:624
+#: ../plugins/am-project/am-properties.c:719
 msgid "Build for check only:"
 msgstr "å?ªä¸ºæ£?æ?¥è??æ??å»ºï¼?"
 
-#: ../plugins/am-project/am-properties.c:90
-#: ../plugins/am-project/am-properties.c:98
+#: ../plugins/am-project/am-properties.c:323
+#: ../plugins/am-project/am-properties.c:475
+#: ../plugins/am-project/am-properties.c:627
+#: ../plugins/am-project/am-properties.c:722
+msgid "Build this target only when running automatic tests."
+msgstr "å?ªå?¨è?ªå?¨æµ?è¯?ä¸æ??å»ºæ¤ç?®æ ?ã??"
+
+#: ../plugins/am-project/am-properties.c:328
+#: ../plugins/am-project/am-properties.c:480
+#: ../plugins/am-project/am-properties.c:632
+#: ../plugins/am-project/am-properties.c:664
+#: ../plugins/am-project/am-properties.c:727
 msgid "Do not use prefix:"
 msgstr "ä¸?ä½¿ç?¨å??ç¼?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:91
+#: ../plugins/am-project/am-properties.c:331
+#: ../plugins/am-project/am-properties.c:483
+#: ../plugins/am-project/am-properties.c:635
+#: ../plugins/am-project/am-properties.c:667
+#: ../plugins/am-project/am-properties.c:730
+msgid ""
+"Do not rename the target with an optional prefix, used to avoid overwritting "
+"system program. "
+msgstr ""
+
+#: ../plugins/am-project/am-properties.c:336
+#: ../plugins/am-project/am-properties.c:488
+#: ../plugins/am-project/am-properties.c:640
+#: ../plugins/am-project/am-properties.c:735
 msgid "Keep target path:"
 msgstr "ä¿?æ??ç?®æ ?è·¯å¾?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:99
+#: ../plugins/am-project/am-properties.c:339
+#: ../plugins/am-project/am-properties.c:491
+#: ../plugins/am-project/am-properties.c:643
+#: ../plugins/am-project/am-properties.c:738
+msgid ""
+"Keep relative target path for installing it. By example if you have a "
+"program subdir/app installed in bin directory it will be installed in bin/"
+"subdir/app not in bin/app."
+msgstr ""
+
+#: ../plugins/am-project/am-properties.c:376
+#: ../plugins/am-project/am-properties.c:528
+msgid "Libraries:"
+msgstr "å?½æ?°åº?ï¼?"
+
+#: ../plugins/am-project/am-properties.c:672
 msgid "Manual section:"
 msgstr "æ??å??ç« è??ï¼?"
 
+#: ../plugins/am-project/am-properties.c:675
+msgid ""
+"Section where are installed the man pages. Valid section names are the "
+"digits â??0â?? through â??9â??, and the letters â??lâ?? and â??nâ??. "
+msgstr ""
+"man æ??å??é¡µå®?è£?ç??ç« è??ã??æ??æ??ç« è??å??æ?¬æ?°å? 0 å?° 9ï¼?ä»¥å??å?æ¯? l å?? nã??"
+
 #: ../plugins/gdb/anjuta-gdb.ui.h:1
 msgid "Available pretty printers"
 msgstr "å?¯ç?¨ç??ä»£ç ?ç¾?å??å·¥å?·"
@@ -4488,1770 +4903,848 @@ msgid "Gdb Debugger"
 msgstr "GDB è°?è¯?å?¨"
 
 #: ../plugins/git/anjuta-git.ui.h:1
-msgid "Add File"
-msgstr "æ·»å? æ??ä»¶"
+msgid "<b>Add Files:</b>"
+msgstr "<b>æ·»å? æ??ä»¶ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:2
-msgid "Add Remote Branch"
-msgstr "æ·»å? è¿?ç¨?å??æ?¯"
+msgid "<b>Branch name:</b>"
+msgstr "<b>å??æ?¯å??ç§°ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:3
+msgid "<b>Branches:</b>"
+msgstr "<b>å??æ?¯ï¼?</b>"
 
-#. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
 #: ../plugins/git/anjuta-git.ui.h:4
-msgid "Add signed-off-by line"
-msgstr "æ·»å? â??ç¾å??è?ªâ??è¡?"
+msgid "<b>Branches</b>"
+msgstr "<b>å??æ?¯ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:5
-msgid "Amend the previous commit"
-msgstr "ä¿®æ£ä¸?ä¸?æ¬¡æ??äº¤"
+msgid "<b>Commit to cherry pick:</b>"
+msgstr "<b>è¦?ä¼?é??ç?? commitï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:6
-msgid "Annotate this tag"
-msgstr "æ³¨è§£è¿?ä¸ªæ ?ç¾"
+msgid "<b>Commit to revert:</b>"
+msgstr "<b>è¦?æ?¢å¤?ç?? commitï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:7
+msgid "<b>Folder to create patches in:</b>"
+msgstr "<b>è¡¥ä¸?ç?®å½?ï¼?</b>"
 
-#. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
 #: ../plugins/git/anjuta-git.ui.h:8
-msgid "Append fetch data"
-msgstr "æ·»å? æ??å??ç??æ?°æ?®"
+#, fuzzy
+msgid "<b>Generate patches relative to:</b>"
+msgstr "ç??æ??è¡¥ä¸?ç?¸å¯¹äº?ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:9
-msgid "Apply Stash"
-msgstr "åº?ç?¨äº?ä¸´æ?¶å?å?¨"
+msgid "<b>Log Message:</b>"
+msgstr "<b>æ?¥å¿?æ¶?æ?¯ï¼?</b>"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
-msgid "Apply mailbox files"
-msgstr "åº?ç?¨äº?å?¨é?¨æ??ä»¶"
+#: ../plugins/git/anjuta-git.ui.h:10
+msgid "<b>Mailbox files to apply:</b>"
+msgstr "<b>è¦?åº?ç?¨ç?? Mailbox æ??ä»¶ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:11
-msgid "Apply the selected stash"
-msgstr "åº?ç?¨äº?é??ä¸ç??ä¸´æ?¶å?å?¨"
+msgid "<b>Mode:</b>"
+msgstr "<b>æ¨¡å¼?ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:12
+msgid "<b>Options:</b>"
+msgstr "<b>é??é¡¹ï¼?</b>"
 
-#. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
 #: ../plugins/git/anjuta-git.ui.h:13
-msgid "Author/Grep"
-msgstr "ä½?è??/æ?¥æ?¾"
+msgid "<b>Options</b>"
+msgstr "<b>é??é¡¹</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:14
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:6
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:6
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:6
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:9
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:7
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:6
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:8
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:6
-#: ../plugins/project-wizard/templates/java.wiz.in.h:7
-#: ../plugins/project-wizard/templates/js.wiz.in.h:2
-#: ../plugins/project-wizard/templates/python.wiz.in.h:7
-#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
-#: ../plugins/project-wizard/templates/library.wiz.in.h:6
-msgid "Author:"
-msgstr "ä½?è??ï¼?"
+msgid "<b>Remote Repositories:</b>"
+msgstr "<b>è¿?ç¨?ä»?åº?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:15
-msgid "Bad revision:"
-msgstr "å??ç??ç??æ?¬ï¼?"
+msgid "<b>Remote name:</b>"
+msgstr "<b>è¿?ç¨?å??ç§°ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:16
-msgid "Branch name:"
-msgstr "å??æ?¯å??ç§°ï¼?"
+msgid "<b>Remove Files:</b>"
+msgstr "<b>å? é?¤æ??ä»¶ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:17
-msgid "Branch to switch to:"
-msgstr "å??æ?¢å?°å??æ?¯ï¼?"
+msgid "<b>Repository Status:</b>"
+msgstr "<b>ä»?åº?ç?¶æ??ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:18
-msgid "Branch:"
-msgstr "å??æ?¯ï¼?"
+#, fuzzy
+msgid "<b>Repository to pull from:</b>"
+msgstr "è?·å??ä¸?å??å¹¶è?ªä»?åº?ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:19
-msgid "Branches"
-msgstr "å??æ?¯"
+#, fuzzy
+msgid "<b>Repository to push to:</b>"
+msgstr "æ?¨é??è?³ä»?åº?ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:20
-msgid "Branches must be fully merged"
-msgstr "å??æ?¯å¿?é¡»å®?å?¨è¢«å??å¹¶"
+msgid "<b>Revision to merge with:</b>"
+msgstr "<b>è¦?å??å¹¶ç??ç??æ?¬ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:21
-msgid "Branches to delete:"
-msgstr "è¦?å? é?¤ç??å??æ?¯ï¼?"
+msgid "<b>Revision:</b>"
+msgstr "<b>ç??æ?¬ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:22
+msgid "<b>Revision</b>"
+msgstr "<b>ç??æ?¬</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:23
-#: ../plugins/subversion/anjuta-subversion.ui.h:4
-msgid "Changes:"
-msgstr "æ?´æ?¹ï¼?"
+#, fuzzy
+msgid "<b>Stash Message (Optional):</b>"
+msgstr "ä¸´æ?¶å?å?¨æ??è¿° (å?¯é??ç??)"
 
 #: ../plugins/git/anjuta-git.ui.h:24
-msgid "Check Out Files"
-msgstr "ç¾å?ºæ??ä»¶"
+#, fuzzy
+msgid "<b>Stashed Changes:</b>"
+msgstr "ä¸´æ?¶å?å?¨ç´¢å¼?ç??æ?¹å?¨"
 
 #: ../plugins/git/anjuta-git.ui.h:25
-msgid "Check out all local changes"
-msgstr "ç¾å?ºæ??æ??æ?¬å?°æ?¹å??"
+msgid "<b>Tag name:</b>"
+msgstr "<b>æ ?ç¾å??ç§°ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:26
-msgid "Check out the branch after it is created"
-msgstr "å??æ?¯å??å»ºå??å?³ç¾å?º"
+msgid "<b>Tags:</b>"
+msgstr "<b>æ ?ç¾ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:27
-msgid "Cherry Pick"
-msgstr "ä¼?é??(Cherry Pick)"
+msgid "<b>URL:</b>"
+msgstr "<b>URLï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:28
-msgid "Clear all stashes"
-msgstr "æ¸?é?¤å?¨é?¨ä¸´æ?¶å?å?¨"
+msgid "Add signed off by line"
+msgstr ""
 
 #: ../plugins/git/anjuta-git.ui.h:29
-msgid "Column 1"
-msgstr "å?? 1"
+msgid "Amernd the previous commit"
+msgstr "ä¿®æ£ä¸?ä¸?æ¬¡æ??äº¤"
 
 #: ../plugins/git/anjuta-git.ui.h:30
-#: ../plugins/subversion/anjuta-subversion.ui.h:7
-msgid "Commit Changes"
-msgstr "æ??äº¤æ?´æ?¹"
+#, fuzzy
+msgid "Annotate this tag:"
+msgstr "æ³¨è§£è¿?ä¸ªæ ?ç¾"
 
 #: ../plugins/git/anjuta-git.ui.h:31
-msgid "Commit on fast-forward merges"
-msgstr "å¿«è¿?å??å¹¶æ?¶æ??äº¤"
+msgid "Append fetch data"
+msgstr "æ·»å? æ??å??ç??æ?°æ?®"
 
 #: ../plugins/git/anjuta-git.ui.h:32
-msgid "Commit to Cherry Pick:"
-msgstr "æ??äº¤è?³ä¼?é??(Cherry-pick)ï¼?"
+msgid "Append signed-of- by line"
+msgstr ""
 
 #: ../plugins/git/anjuta-git.ui.h:33
-msgid "Commit to revert:"
-msgstr "è¦?è¿?å??ç??æ??äº¤ï¼?"
+msgid "Branch:"
+msgstr "å??æ?¯ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:34
-msgid "Create Branch"
-msgstr "å??å»ºå??æ?¯"
+msgid "Branches must be fully merged"
+msgstr "å??æ?¯å¿?é¡»å®?å?¨è¢«å??å¹¶"
 
 #: ../plugins/git/anjuta-git.ui.h:35
-msgid "Create Tag"
-msgstr "å??å»ºæ ?ç¾"
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
+msgid "Changes:"
+msgstr "æ?´æ?¹ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:36
-msgid "Create patch series"
-msgstr "å??å»ºæ?°ç?®å½?"
-
-#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
-#: ../plugins/subversion/subversion-log-dialog.c:141
-msgid "Date"
-msgstr "æ?¥æ??"
+msgid "Check out the branch after it is created"
+msgstr "å??æ?¯å??å»ºå??å?³ç¾å?º"
 
-#: ../plugins/git/anjuta-git.ui.h:38
-msgid "Delete Branch"
-msgstr "å? é?¤å??æ?¯"
+#: ../plugins/git/anjuta-git.ui.h:37
+msgid "Column 0"
+msgstr "å?? 0"
 
 #: ../plugins/git/anjuta-git.ui.h:39
-msgid "Delete Remote Branch"
-msgstr "å? é?¤è¿?ç¨?å??æ?¯"
+msgid "Commit on fast-forward merges"
+msgstr "å¿«è¿?å??å¹¶æ?¶æ??äº¤"
 
 #: ../plugins/git/anjuta-git.ui.h:40
-msgid "Delete Tags"
-msgstr "å? é?¤æ ?ç¾"
-
-#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "ä¸?æ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not follow tags"
 msgstr "ä¸?è¦?è·?é??æ ?ç¾"
 
-#: ../plugins/git/anjuta-git.ui.h:43
-msgid "Drop the selected stash"
-msgstr "ä¸¢å¼?é??ä¸ç??ä¸´æ?¶å?å?¨"
-
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Fetch remote branches after creation"
 msgstr "å??å»ºå??è?·å??è¿?ç¨?å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:46
-msgid "Filters"
-msgstr "æ??ä»¶"
-
-#: ../plugins/git/anjuta-git.ui.h:47
-msgid "Folder to create patches in:"
-msgstr "é??æ?©ç?®å½?"
-
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:44
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "å¼ºå?¶"
 
-#: ../plugins/git/anjuta-git.ui.h:50
-msgid "From:"
-msgstr "ä»?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:51
-msgid "Generate patches relative to:"
-msgstr "ç??æ??è¡¥ä¸?ç?¸å¯¹äº?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:52
-msgid "Good revision:"
-msgstr "å¥½ç??ç??æ?¬ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:53
-msgid "Grep:"
-msgstr "æ?¥æ?¾ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Hard"
 msgstr "ç¡¬é??ç½®(Hard)"
 
-#: ../plugins/git/anjuta-git.ui.h:55
-msgid "Head"
-msgstr "é¡¶ç«¯"
-
-#: ../plugins/git/anjuta-git.ui.h:56
-msgid "Ignore Files"
-msgstr "å¿½ç?¥æ??ä»¶"
-
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:47
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "æ?¥å¿?ä¿¡æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:60
-msgid "Mailbox file containing patches:"
-msgstr "é?®ç®±æ??ä»¶å??å?«è¡¥ä¸?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:61
-msgid "Merge"
-msgstr "å??å¹¶"
-
-#: ../plugins/git/anjuta-git.ui.h:62
+#: ../plugins/git/anjuta-git.ui.h:48
 msgid "Mixed"
 msgstr "æ··å??é??ç½®(Mixed)"
 
-#: ../plugins/git/anjuta-git.ui.h:63
-msgid "Mode:"
-msgstr "æ¨¡å¼?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:67
-msgid "Previous commit"
-msgstr "ä¸?ä¸?ä¸ªæ??äº¤"
-
-#: ../plugins/git/anjuta-git.ui.h:68
-msgid "Pull"
-msgstr "è?·å??ä¸?å??å¹¶"
-
-#: ../plugins/git/anjuta-git.ui.h:69
-msgid "Push"
-msgstr "æ?¨é??"
-
-#: ../plugins/git/anjuta-git.ui.h:70
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Push all branches and tags"
 msgstr "æ?¨é??æ??æ??ç??å??æ?¯å??æ ?ç¾"
 
-#: ../plugins/git/anjuta-git.ui.h:71
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Push all tags"
 msgstr "æ?¨é??æ??æ??ç??æ ?ç¾"
 
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:53 ../plugins/git/plugin.c:262
 msgid "Rebase"
 msgstr "é??å®?ä½?"
 
-#: ../plugins/git/anjuta-git.ui.h:73
-msgid "Remote"
-msgstr "è¿?ç¨?"
-
-#: ../plugins/git/anjuta-git.ui.h:74
-msgid "Remote branch to rebase from:"
-msgstr "é??å®?ä½?è?ªè¿?ç¨?å??æ?¯ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:75
-msgid "Remote to delete:"
-msgstr "è¦?å? é?¤ç??è¿?ç¨?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:76
-msgid "Remove File"
-msgstr "å? é?¤æ??ä»¶"
-
-#: ../plugins/git/anjuta-git.ui.h:77
-msgid "Repository origin"
-msgstr "ä»?åº?æ?¥æº?"
-
-#: ../plugins/git/anjuta-git.ui.h:78
-msgid "Repository to pull from:"
-msgstr "è?·å??ä¸?å??å¹¶è?ªä»?åº?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:79
-msgid "Repository to push to:"
-msgstr "æ?¨é??è?³ä»?åº?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:80
-msgid "Reset Tree"
-msgstr "é??ç½®æº?ç ?æ ?"
-
-#: ../plugins/git/anjuta-git.ui.h:81
-msgid "Reset to:"
-msgstr "é??ç½®ä¸ºï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:82
-msgid "Restore index"
-msgstr "æ?¢å¤?ç´¢å¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:83
-#: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving statusâ?¦"
-msgstr "æ£å?¨è?·å??ç?¶æ??..."
-
-#: ../plugins/git/anjuta-git.ui.h:84
-msgid "Revert Commit"
-msgstr "è¿?å??æ??äº¤"
-
-#: ../plugins/git/anjuta-git.ui.h:85
-msgid "Revision/Tag:"
-msgstr "ç??æ?¬/æ ?ç¾ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:87
-msgid "Select Files to Check Out:"
-msgstr "é??æ?©è¦?ç¾å?ºç??æ??ä»¶ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:88
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
-msgid "Select Files to Commit:"
-msgstr "é??æ?©è¦?æ??äº¤ç??æ??ä»¶ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:89
-msgid "Select Files to Ignore:"
-msgstr "é??æ?©è¦?å¿½ç?¥ç??æ??ä»¶ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:90
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
-msgid "Select Files to Mark as Resolved:"
-msgstr "é??æ?©è¦?æ ?è®°ä¸ºå·²è§£å?³ç??æ??ä»¶ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:91
-msgid "Select Files to Unstage:"
-msgstr "é??æ?©è¦?å??æ¶?ç¼?å?ç??æ??ä»¶ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select Mailbox File"
-msgstr "é??æ?©é?®ç®±æ??ä»¶"
-
-#: ../plugins/git/anjuta-git.ui.h:93
-msgid "Select a Folder"
-msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹"
-
-#: ../plugins/git/anjuta-git.ui.h:94
-msgid "Select file to add:"
-msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:95
-msgid "Select file to remove:"
-msgstr "é??æ?©è¦?å? é?¤ç??æ??ä»¶ï¼?"
+#: ../plugins/git/anjuta-git.ui.h:54
+#, fuzzy
+msgid "Repository head; Drop or type a different revision here"
+msgstr "é??ç½®ä»?åº?é¡¶ç«¯è?³è¿?ä¸ªç??æ?¬"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
-msgid "Set Conflicts as Resolved"
-msgstr "å°?å?²çª?è®¾ç½®ä¸ºå·²è§£å?³"
+#: ../plugins/git/anjuta-git.ui.h:55
+msgid "Repository origin; Drop or type a different revision here"
+msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Show source revision in log message"
 msgstr "å?¨æ?¥å¿?ä¿¡æ?¯ä¸æ?¾ç¤ºæº?ä»£ç ?ç??æ?¬"
 
-#: ../plugins/git/anjuta-git.ui.h:98
-msgid "Show the contents of the selected stash in an editor"
-msgstr "å?¨ç¼?è¾?å?¨ä¸æ?¾ç¤ºé??ä¸ç??ä¸´æ?¶å?å?¨ç??å??å®¹"
-
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:57
 msgid "Sign this tag"
 msgstr "ç»?è¿?ä¸ªæ ?ç¾ç¾å??"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:58
 msgid "Soft"
 msgstr "è½¯é??ç½®(Soft)"
 
-#: ../plugins/git/anjuta-git.ui.h:101
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Squash"
 msgstr "å??å?¶(Squash)"
 
-#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
-msgid "Stash"
-msgstr "ä¸´æ?¶å?å?¨"
-
-#: ../plugins/git/anjuta-git.ui.h:103
-msgid "Stash Message (Optional)"
-msgstr "ä¸´æ?¶å?å?¨æ??è¿° (å?¯é??ç??)"
-
-#: ../plugins/git/anjuta-git.ui.h:104
-msgid "Stash Uncommitted Changes"
-msgstr "ä¸´æ?¶å?å?¨æ?ªæ??äº¤ç??æ?´æ?¹"
-
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Stash indexed changes"
 msgstr "ä¸´æ?¶å?å?¨ç´¢å¼?ç??æ?¹å?¨"
 
-#: ../plugins/git/anjuta-git.ui.h:106
-msgid "Stash the working tree's uncommitted changes"
-msgstr "ä¸´æ?¶å?å?¨å·¥ä½?æº?ç ?æ ?ä¸ç??æ?ªæ??äº¤å?å?¨"
-
-#: ../plugins/git/anjuta-git.ui.h:107
-msgid "Stash to Apply"
-msgstr "è¦?åº?ç?¨ç??ä¸´æ?¶å?å?¨"
-
-#: ../plugins/git/anjuta-git.ui.h:108
-msgid "Switch to Another Branch"
-msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
-
-#: ../plugins/git/anjuta-git.ui.h:109
-msgid "Tag name:"
-msgstr "æ ?ç¾å??ç§°ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:110
-msgid "Tag/Commit"
-msgstr "æ ?ç¾/æ??äº¤"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "æ ?ç¾"
-
-#: ../plugins/git/anjuta-git.ui.h:112
-msgid "Tags to delete:"
-msgstr "è¦?å? é?¤ç??æ ?ç¾ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:113
-msgid "This commit concludes a failed merge (use -i)"
+#: ../plugins/git/anjuta-git.ui.h:61
+#, fuzzy
+msgid "This commit concludes a failed merged (use -i)"
 msgstr "è¿?ä¸ªæ??äº¤ä»¥å¤±è´¥ç??å??å¹¶ç»?æ?? (ç?¨ -i)"
 
-#: ../plugins/git/anjuta-git.ui.h:115
-msgid "To:"
-msgstr "å?°ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:116
-msgid "URL"
-msgstr "URL"
-
-#: ../plugins/git/anjuta-git.ui.h:118
-msgid "Unstage Files"
-msgstr "å??æ¶?ç¼?å?æ??ä»¶"
-
-#: ../plugins/git/anjuta-git.ui.h:119
-msgid "Use a custom log message"
-msgstr "ä½¿ç?¨å®?å?¶ç??æ?¥å¿?ä¿¡æ?¯"
+#: ../plugins/git/anjuta-git.ui.h:62
+msgid "Use a custom log message:"
+msgstr "ä½¿ç?¨è?ªå®?ä¹?æ?¥å¿?æ¶?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Use custom author information:"
 msgstr "ä½¿ç?¨å®?å?¶ç??ä½?è??ä¿¡æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:121
-msgid "View log"
-msgstr "æ?¥ç??æ?¥å¿?"
-
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:64
 #: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "æ?¥ç??æ??ä»¶/æ??ä»¶å¤¹ç??æ?¥å¿?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:124
+#: ../plugins/git/anjuta-git.ui.h:65
+msgid ""
+"Whole project; Drop a file here or type a path to view a file or folder log"
+msgstr "æ?´ä¸ªå·¥ç¨?ï¼?æ??å?¨æ??ä»¶è?³æ¤æ??è¾?å?¥è·¯å¾?ä»¥æ?¥ç??æ??ä»¶æ??æ??ä»¶å¤¹æ?¥å¿?"
+
+#: ../plugins/git/anjuta-git.ui.h:66
+msgid "Whole project; Drop a file here to view a file or folder log"
+msgstr "æ?´ä¸ªå·¥ç¨?ï¼?æ??å?¨æ??ä»¶è?³æ¤ä»¥æ?¥ç??æ??ä»¶æ??æ??ä»¶å¤¹æ?¥å¿?"
+
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "page 1"
 msgstr "ç¬¬ 1 é¡µ"
 
-#: ../plugins/git/anjuta-git.ui.h:125
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "page 2"
 msgstr "ç¬¬ 2 é¡µ"
 
-#: ../plugins/git/anjuta-git.ui.h:126
-msgid "page 3"
-msgstr "ç¬¬ 3 é¡µ"
-
-#: ../plugins/git/git-add-dialog.c:36
-msgid "Git: File staged for add."
-msgstr "Gitï¼?æ??ä»¶å·²è¢«ç¼?å?ç?¨ä»¥æ·»å? ã??"
-
-#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
-msgid "Please select a file."
-msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶ã??"
-
-#: ../plugins/git/git-add-remote-dialog.c:41
-#, c-format
-msgid "Git: Added remote branch \"%s\"."
-msgstr "Gitï¼?æ·»å? äº?è¿?ç¨?å??æ?¯â??%sâ??ã??"
+#: ../plugins/git/git-add-files-pane.c:157
+msgid "Add Files"
+msgstr "æ·»å? æ??ä»¶"
 
-#: ../plugins/git/git-add-remote-dialog.c:81
-#: ../plugins/git/git-create-branch-dialog.c:117
-msgid "Please enter a branch name."
-msgstr "è¯·è¾?å?¥å??æ?¯å??ç§°ã??"
+#: ../plugins/git/git-add-remote-pane.c:52
+msgid "Please enter a remote name."
+msgstr "è¯·è¾?å?¥ä¸?ä¸ªè¿?ç¨?å??ç§°ã??"
 
-#: ../plugins/git/git-add-remote-dialog.c:91
-msgid "Please enter a URL."
+#: ../plugins/git/git-add-remote-pane.c:55
+msgid "Please enter a URL"
 msgstr "è¯·è¾?å?¥ URL ã??"
 
-#: ../plugins/git/git-add-remote-dialog.c:111
-#: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetchingâ?¦"
-msgstr "Gitï¼?æ£å?¨è?·å??..."
+#: ../plugins/git/git-add-remote-pane.c:179
+msgid "Add Remote"
+msgstr "æ·»å? è¿?ç«¯"
 
-#: ../plugins/git/git-apply-mailbox-dialog.c:45
-msgid "Please select a mailbox file."
-msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶ã??"
+#: ../plugins/git/git-apply-mailbox-pane.c:157
+msgid "Apply Mailbox Files"
+msgstr "åº?ç?¨ Mailbox æ??ä»¶"
 
-#: ../plugins/git/git-bisect-dialog.c:54
-#: ../plugins/git/git-cherry-pick-dialog.c:52
-#: ../plugins/git/git-create-branch-dialog.c:99
-#: ../plugins/git/git-create-tag-dialog.c:102
-#: ../plugins/git/git-reset-dialog.c:57 ../plugins/git/git-revert-dialog.c:46
-#: ../plugins/subversion/subversion-copy-dialog.c:207
-#: ../plugins/subversion/subversion-switch-dialog.c:122
-msgid "Please enter a revision."
-msgstr "è¯·è¾?å?¥ä¸?ä¸ªç??æ?¬ã??"
-
-#: ../plugins/git/git-cat-file-menu.c:36
-msgid "Git: File retrieved."
-msgstr "Gitï¼?æ??ä»¶å·²å??å??ã??"
+#: ../plugins/git/git-apply-stash-pane.c:54
+#: ../plugins/git/git-diff-stash-pane.c:67
+#: ../plugins/git/git-drop-stash-pane.c:48
+#, fuzzy
+msgid "No stash selected."
+msgstr "æ²¡æ??é??æ?©ç»?"
 
-#: ../plugins/git/git-checkout-files-dialog.c:36
-msgid "Git: Files checked out."
-msgstr "Git: æ??ä»¶å·²ç¾å?ºã??"
+#: ../plugins/git/git-checkout-pane.c:147
+msgid "Check Out Files"
+msgstr "ç¾å?ºæ??ä»¶"
 
-#: ../plugins/git/git-commit-dialog.c:36
-msgid "Git: Commit complete."
-msgstr "Gitï¼?æ??äº¤å®?æ??ã??"
+#: ../plugins/git/git-commit-pane.c:123
+#: ../plugins/git/git-create-tag-pane.c:79 ../plugins/git/git-merge-pane.c:70
+msgid "Please enter a log message."
+msgstr "è¯·è¾?å?¥æ?¥å¿?ä¿¡æ?¯ã??"
 
-#: ../plugins/git/git-commit-dialog.c:105
-msgid "Please enter the commit author's name."
+#: ../plugins/git/git-commit-pane.c:144
+msgid "Please enter the commit author's name"
 msgstr "è¯·è¾?å?¥ä½?è??å§?å??ã??"
 
-#: ../plugins/git/git-commit-dialog.c:115
+#: ../plugins/git/git-commit-pane.c:148
 msgid "Please enter the commit author's e-mail address."
 msgstr "è¯·è¾?å?¥ä½?è??ç?µå?é?®ç®±å?°å??ã??"
 
-#: ../plugins/git/git-create-branch-dialog.c:41
-#, c-format
-msgid "Git: Created branch \"%s\"."
-msgstr "Gitï¼?å·²å??å»ºå??æ?¯â??%sâ??ã??"
+#: ../plugins/git/git-commit-pane.c:304 ../plugins/git/plugin.c:146
+msgid "Commit"
+msgstr "æ??äº¤"
 
-#: ../plugins/git/git-create-tag-dialog.c:41
-#, c-format
-msgid "Git: Created tag \"%s\"."
-msgstr "Gitï¼?å·²å??å»ºæ ?ç¾â??%sâ??ã??"
-
-#: ../plugins/git/git-create-tag-dialog.c:111
-msgid "Please enter a tag name."
-msgstr "è¯·è¾?å?¥æ ?ç¾å??ç§°ã??"
-
-#: ../plugins/git/git-delete-branch-dialog.c:37
-msgid "Git: Deleted selected branches."
-msgstr "Gitï¼?å·²å? é?¤å??æ?¯ â??%sâ??ã??"
+#: ../plugins/git/git-cherry-pick-pane.c:53 ../plugins/git/git-merge-pane.c:56
+#: ../plugins/subversion/subversion-copy-dialog.c:207
+#: ../plugins/subversion/subversion-switch-dialog.c:122
+msgid "Please enter a revision."
+msgstr "è¯·è¾?å?¥ä¸?ä¸ªç??æ?¬ã??"
 
-#: ../plugins/git/git-delete-branch-dialog.c:106
-msgid "Please select branches to delete"
-msgstr "è¯·é??æ?©è¦?å? é?¤ç??å??æ?¯"
+#: ../plugins/git/git-cherry-pick-pane.c:173
+msgid "Cherry Pick"
+msgstr "ä¼?é??(Cherry Pick)"
 
-#: ../plugins/git/git-delete-tag-dialog.c:37
-msgid "Git: Deleted selected tags."
-msgstr "Gitï¼?å·²å? é?¤é??ä¸ç??æ ?ç¾ã??"
+#: ../plugins/git/git-diff-pane.c:103
+msgid "No revision selected"
+msgstr "æ²¡æ??é??æ?©ç??æ?¬"
 
-#. Translators: default file name for git diff's output
-#: ../plugins/git/git-diff-dialog.c:42
-msgid "Uncommitted Changes.diff"
-msgstr "æ?ªæ??äº¤ç?? Changes.diff"
+#: ../plugins/git/git-reset-pane.c:167
+msgid "Reset"
+msgstr "é??ç½®(_R)"
 
-#. 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 "Commit %s.diff"
-msgstr "æ??äº¤ %s.diff"
+#: ../plugins/git/git-revert-pane.c:48
+msgid "Please enter a commit."
+msgstr "è¯·è¾?å?¥ä¸?ä¸ª commitã??"
 
-#: ../plugins/git/git-fetch-dialog.c:40
-msgid "Git: Fetch complete."
-msgstr "Gitï¼?è?·å??å®?æ??ã??"
+#: ../plugins/git/git-revert-pane.c:162
+msgid "Revert"
+msgstr "è¿?å??"
 
-#: ../plugins/git/git-log-dialog.c:152
-msgid "Graph"
-msgstr "å?¾è¡¨"
+#: ../plugins/git/git-create-branch-pane.c:51
+msgid "Please enter a branch name."
+msgstr "è¯·è¾?å?¥å??æ?¯å??ç§°ã??"
 
-#: ../plugins/git/git-log-dialog.c:167
-msgid "Short log"
-msgstr "ç²¾ç®?æ?¥å¿?"
+#: ../plugins/git/git-create-tag-pane.c:63
+msgid "Please enter a tag name."
+msgstr "è¯·è¾?å?¥æ ?ç¾å??ç§°ã??"
 
-#: ../plugins/git/git-log-dialog.c:178
-#: ../plugins/subversion/subversion-log-dialog.c:132
-msgid "Author"
-msgstr "ä½?è??"
+#: ../plugins/git/git-create-tag-pane.c:218
+msgid "Create Tag"
+msgstr "å??å»ºæ ?ç¾"
 
-#: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving logâ?¦"
-msgstr "Gitï¼?æ£å?¨å??å??æ?¥å¿?..."
+#: ../plugins/git/git-delete-remote-pane.c:49
+msgid "No remote selected."
+msgstr "æ²¡æ??é??æ?©è¿?ç«¯ã??"
 
-#: ../plugins/git/git-log-dialog.c:360
-#: ../plugins/subversion/subversion-add-dialog.c:65
-#: ../plugins/subversion/subversion-diff-dialog.c:116
-#: ../plugins/subversion/subversion-remove-dialog.c:98
-#: ../plugins/subversion/subversion-update-dialog.c:68
-msgid "Please enter a path."
-msgstr "è¯·è¾?å?¥è·¯å¾?ã??"
+#: ../plugins/git/git-delete-tags-pane.c:49
+msgid "No tags selected."
+msgstr "æ²¡æ??é??æ?©æ ?ç¾ã??"
 
-#: ../plugins/git/git-log-dialog.c:399
-msgid "Select a file"
-msgstr "é??æ?©æ??ä»¶"
+#: ../plugins/git/git-diff-stash-pane.c:40
+#, fuzzy, c-format
+msgid "Stash %i.diff"
+msgstr "æ ?å?? diff"
 
-#: ../plugins/git/git-log-dialog.c:546
+#: ../plugins/git/git-log-pane.c:560
 #, c-format
 msgid "<b>Branch:</b> %s"
 msgstr "<b>å??æ?¯ï¼?</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:551
+#: ../plugins/git/git-log-pane.c:565
 #, c-format
 msgid "<b>Tag:</b> %s"
 msgstr "<b>æ ?ç¾ï¼?</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:556
+#: ../plugins/git/git-log-pane.c:570
 #, c-format
 msgid "<b>Remote:</b> %s"
 msgstr "<b>è¿?ç¨?ï¼?</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
-#: ../plugins/git/plugin.c:867
-msgid "Branch"
-msgstr "å??æ?¯"
-
-#: ../plugins/git/git-merge-dialog.c:36
-msgid "Git: Merge complete."
-msgstr "Gitï¼?å??å¹¶å®?æ??ã??"
-
-#: ../plugins/git/git-pull-dialog.c:36
-msgid "Git: Pull complete."
-msgstr "Gitï¼?è?·å??ä¸?å??å¹¶å®?æ??ã??"
-
-#. The "input widget" is the widget that should receive focus if the
-#. * user does not properly enter anything
-#: ../plugins/git/git-pull-dialog.c:124
-msgid "Please select a remote to pull from."
-msgstr "è¯·é??æ?©ä¸?ä¸ªç?¨äº?è?·å??ä¸?å??å¹¶ç??è¿?ç¨?ã??"
-
-#: ../plugins/git/git-pull-dialog.c:142
-msgid "Please enter the URL of the repository to pull from."
-msgstr "è¯·è¾?å?¥è¦?è?·å??ä¸?å??å¹¶ç??ä»?åº?ç?? URLã??"
-
-#: ../plugins/git/git-push-dialog.c:36
-msgid "Git: Push complete."
-msgstr "Gitï¼?æ?¨é??å®?æ??ã??"
-
-#. The "input widget" is the widget that should receive focus if the
-#. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:144
-msgid "Please select a remote to push to."
-msgstr "è¯·é??æ?©ä¸?ä¸ªç?¨äº?æ?¨é??ç??è¿?ç¨?ã??"
-
-#: ../plugins/git/git-push-dialog.c:162
-msgid "Please enter the URL of the repository to push to."
-msgstr "è¯·è¾?å?¥è¦?æ?¨é??ç??ä»?åº?ç?? URLã??"
-
-#: ../plugins/git/git-push-dialog.c:197
-msgid "Git: Pushingâ?¦"
-msgstr "Gitï¼?æ£å?¨æ?¨é??..."
-
-#: ../plugins/git/git-rebase-dialog.c:60
-msgid "Git: Rebasing"
-msgstr "Gitï¼?æ£å?¨é??å®?ä½?"
-
-#: ../plugins/git/git-remove-dialog.c:36
-msgid "Git: File removed."
-msgstr "Gitï¼?æ??ä»¶å·²å? é?¤ã??"
-
-#: ../plugins/git/git-resolve-dialog.c:36
-msgid "Git: Resolve complete."
-msgstr "Gitï¼?è§£å?³å®?æ??ã??"
-
-#: ../plugins/git/git-stash-widget.c:219
-msgid "Git: Stash dropped."
-msgstr "Gitï¼?å·²ä¸¢å¼?ä¸´æ?¶å?å?¨ã??"
-
-#: ../plugins/git/git-stash-widget.c:275
-msgid "Git: All stashes cleared."
-msgstr "Gitï¼?æ¸?é?¤äº?æ??æ??ç??ä¸´æ?¶å?å?¨ã??"
-
-#: ../plugins/git/git-switch-dialog.c:36
-msgid "Git: Branch checkout complete."
-msgstr "Gitï¼?å??æ?¯ç¾å?ºå®?æ??ã??"
+#: ../plugins/git/git-merge-pane.c:222 ../plugins/git/plugin.c:97
+msgid "Merge"
+msgstr "å??å¹¶"
 
-#: ../plugins/git/git-ui-utils.c:89 ../plugins/git/git-ui-utils.c:94
-#: ../plugins/git/git.plugin.in.h:1
+#: ../plugins/git/git-pane.c:77 ../plugins/git/git-pane.c:82
+#: ../plugins/git/plugin.c:700 ../plugins/git/git.plugin.in.h:1
 msgid "Git"
 msgstr "Git"
 
-#: ../plugins/git/git-ui-utils.c:158
-msgid "There are no branches available."
-msgstr "æ²¡æ??å?¯ç?¨å??æ?¯ã??"
+#: ../plugins/git/git-pane.c:204
+msgid "Git Error"
+msgstr "Git é??è¯¯"
 
-#: ../plugins/git/git-ui-utils.c:194
-msgid "Please select a stash"
-msgstr "è¯·é??æ?©ä¸?ä¸ªä¸´æ?¶å?å?¨"
+#: ../plugins/git/git-pane.c:210
+msgid "Git Warning"
+msgstr "Git è¦å??"
 
-#: ../plugins/git/git-ui-utils.c:603
-msgid "Git: Changes stored in a stash."
-msgstr "Gitï¼?æ?´æ?¹ä¿?å?å?°äº?ä¸´æ?¶å?å?¨ã??"
+#: ../plugins/git/git-patch-series-pane.c:167
+msgid "Generate Patch Series"
+msgstr "å??å»ºè¡¥ä¸?é??"
 
-#: ../plugins/git/git-ui-utils.c:619
-msgid "Git: Stashed changes applied."
-msgstr "Gitï¼?å·²åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹ã??"
+#: ../plugins/git/git-pull-pane.c:66 ../plugins/git/git-push-pane.c:94
+msgid "Please enter a URL."
+msgstr "è¯·è¾?å?¥ URL ã??"
 
-#: ../plugins/git/git-ui-utils.c:743
-msgid "Git: Diff complete."
-msgstr "Gitï¼?Diff å®?æ??ã??"
+#: ../plugins/git/git-pull-pane.c:235 ../plugins/git/plugin.c:246
+msgid "Pull"
+msgstr "è?·å??ä¸?å??å¹¶"
 
-#: ../plugins/git/git-ui-utils.c:759
-#, c-format
-msgid "Column %i"
-msgstr "å?? %i"
+#: ../plugins/git/git-push-pane.c:434 ../plugins/git/plugin.c:238
+msgid "Push"
+msgstr "æ?¨é??"
 
-#: ../plugins/git/git-unstage-dialog.c:36
-msgid "Git: Files unstaged."
-msgstr "Git: æ??ä»¶å·²å??æ¶?ç¼?å?ã??"
+#: ../plugins/git/git-rebase-pane.c:61
+msgid "No remote selected"
+msgstr "æ²¡æ??é??æ?©è¿?ç«¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
-msgid "_Git"
-msgstr "_Git"
+#: ../plugins/git/git-remove-files-pane.c:157
+msgid "Remove Files"
+msgstr "å? é?¤æ??ä»¶"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:79
-msgid "_Changes"
-msgstr "æ?´æ?¹(_C)"
+#: ../plugins/git/git-repository-selector.c:66
+msgid "Remote"
+msgstr "è¿?ç«¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
-msgid "_Commitâ?¦"
-msgstr "æ??äº¤(_C)..."
+#: ../plugins/git/git-repository-selector.c:81
+msgid "URL"
+msgstr "URL"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:89
-msgid "Commit changes to the local repository"
-msgstr "Subversionï¼?æ£å?¨å??ä»?åº?æ??äº¤æ?´æ?¹..."
+#: ../plugins/git/git-repository-selector.c:100
+msgid "<b>Selected Remote:</b>"
+msgstr "<b>é??æ?©è¿?ç¨?ï¼?</b>"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:95
-msgid "_Diff uncommitted changes"
-msgstr "æ¯?è¾?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
+#: ../plugins/git/git-repository-selector.c:199
+msgid ""
+"No remote selected; using origin by default.\n"
+"To push to a different remote, select one from the Remotes list above."
+msgstr ""
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:97
-msgid "Show uncommitted changes"
-msgstr "æ?¾ç¤ºæ?ªæ??äº¤ç??æ?´æ?¹"
+#: ../plugins/git/git-resolve-conflicts-pane.c:50
+msgid "No conflicted files selected."
+msgstr "æ?ªé??æ?©æ??å?²çª?ç??æ??ä»¶ã??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:103
-msgid "_Stash"
-msgstr "ä¸´æ?¶å?å?¨(_S)"
+#: ../plugins/git/git-stash-changes-pane.c:158
+msgid "Stash Uncommitted Changes"
+msgstr "ä¸´æ?¶å?å?¨æ?ªæ??äº¤ç??æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changesâ?¦"
-msgstr "ä¸´æ?¶å?å?¨æ?ªæ??äº¤ç??æ?´æ?¹(_S)..."
+#: ../plugins/git/git-status-pane.c:368
+msgid "Changes to be committed"
+msgstr "é??è¦?æ??äº¤ç??æ?´æ?°"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:113
-msgid "Save uncommitted changes and re-apply them later"
-msgstr "ä¿?å?ä¸ºæ??äº¤ç??æ?´æ?¹å¹¶ä¸?ç¨?å??å??åº?ç?¨å®?ä»¬"
+#: ../plugins/git/git-status-pane.c:377
+msgid "Changed but not updated"
+msgstr "æ?¹å??ä½?æ?ªæ?´æ?°"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changesâ?¦"
-msgstr "åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹(_A)..."
+#: ../plugins/git/git-unstage-pane.c:51
+#, fuzzy
+msgid "No staged files selected."
+msgstr "æ²¡æ??é??ä¸ç??ç?®æ ?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:121
-msgid "Apply stashed changes to the working tree"
-msgstr "åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
+#: ../plugins/git/plugin.c:65
+msgid "Branch tools"
+msgstr "å??æ?¯å·¥å?·"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
-msgid "_View logâ?¦"
-msgstr "æ?¥ç??æ?¥å¿?(_V)..."
+#: ../plugins/git/plugin.c:73 ../plugins/git/plugin.c:74
+msgid "Create a branch"
+msgstr "å??å»ºä¸?ä¸ªå??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:129
-msgid "View change history"
-msgstr "æ?¥ç??æ??ä»¶å??å?²"
+#: ../plugins/git/plugin.c:81 ../plugins/git/plugin.c:82
+msgid "Delete selected branches"
+msgstr "å? é?¤é??ä¸ç??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:135
-msgid "_Remote repository"
-msgstr "è¿?ç¨?ä»?åº?(_R)"
+#: ../plugins/git/plugin.c:89 ../plugins/git/plugin.c:90
+msgid "Switch to the selected branch"
+msgstr "å??æ?¢å?°é??ä¸ç??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:143
-msgid "_Pushâ?¦"
-msgstr "æ?¨é??(_P)..."
+#: ../plugins/git/plugin.c:98
+msgid "Merge a revision into the current branch"
+msgstr "å??å¹¶ä¸?ä¸ªç??æ?¬å?°å½?å??å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:145
-msgid "Push changes to a remote repository"
-msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
+#: ../plugins/git/plugin.c:109
+msgid "Tag tools"
+msgstr "æ ?ç¾å·¥å?·"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:151
-msgid "_Pullâ?¦"
-msgstr "è?·å??ä¸?å??å¹¶(_P)..."
+#: ../plugins/git/plugin.c:117 ../plugins/git/plugin.c:118
+msgid "Create a tag"
+msgstr "å??å»ºä¸?ä¸ªæ ?ç¾"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:153
-msgid "Update the working copy"
-msgstr "æ?´æ?°å½?å??å·¥ä½?å?¯æ?¬"
+#: ../plugins/git/plugin.c:125 ../plugins/git/plugin.c:126
+msgid "Delete selected tags"
+msgstr "å? é?¤é??ä¸ç??æ ?ç¾"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:159
-msgid "_Fetch"
-msgstr "è?·å??(_F)"
+#: ../plugins/git/plugin.c:138
+msgid "Changes"
+msgstr "æ?´æ?¹"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:161
-msgid "Update remote branches"
-msgstr "è¿?ç¨?å??æ?¯(_R)"
+#: ../plugins/git/plugin.c:147
+msgid "Commit changes"
+msgstr "æ??äº¤æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:167
-msgid "_Files"
-msgstr "æ??ä»¶(_F)"
+#: ../plugins/git/plugin.c:154
+msgid "Diff uncommitted changes"
+msgstr "æ¯?è¾?æ?ªæ??äº¤ç??æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
-#: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
-#: ../plugins/subversion/plugin.c:175
-msgid "_Addâ?¦"
-msgstr "æ·»å? (_A)..."
+#: ../plugins/git/plugin.c:155
+msgid "Show a diff of uncommitted changes in an editor"
+msgstr "å?¨ç¼?è¾?å?¨ä¸æ?¾ç¤ºæ?ªæ??äº¤ç??æ?´æ?¹"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:177
-msgid "Add files to the repository"
-msgstr "æ·»å? æ??ä»¶å?°ä»?åº?"
+#: ../plugins/git/plugin.c:170
+#: ../plugins/snippets-manager/snippets-editor.ui.h:3
+msgid "Add"
+msgstr "æ·»å? "
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Removeâ?¦"
-msgstr "å? é?¤(_R)..."
+#: ../plugins/git/plugin.c:171
+msgid "Add files to the index"
+msgstr "æ·»å? æ??ä»¶å?°ç´¢å¼?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:185
+#: ../plugins/git/plugin.c:179
 msgid "Remove files from the repository"
 msgstr "ä»?ä»?åº?ä¸å? é?¤æ??ä»¶"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:191
-msgid "_Ignoreâ?¦"
-msgstr "å¿½ç?¥(_I)..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:193
-msgid "Ignore files"
-msgstr "å¿½ç?¥æ??ä»¶"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:199
-msgid "_Check out filesâ?¦"
-msgstr "ç¾å?ºæ??ä»¶(_C)..."
+#: ../plugins/git/plugin.c:186
+#, fuzzy
+msgid "Check out"
+msgstr "ç¾å?ºæ??ä»¶"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:201
-msgid "Revert uncommitted changes to files"
+#: ../plugins/git/plugin.c:187
+#, fuzzy
+msgid "Revert changes in unstaged files"
 msgstr "è¿?å??æ?ªæ??äº¤ç??æ?´æ?¹è?³æ??ä»¶"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:207
-msgid "_Unstage filesâ?¦"
-msgstr "å??æ¶?ç¼?å?æ??ä»¶(_U)..."
+#: ../plugins/git/plugin.c:194
+#, fuzzy
+msgid "Unstage"
+msgstr "å??æ¶?ç¼?å?æ??ä»¶"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:209
-msgid "Remove files from the commit index"
+#: ../plugins/git/plugin.c:195
+#, fuzzy
+msgid "Remove staged files from the index"
 msgstr "ä»?æ??äº¤ç´¢å¼?ä¸å? é?¤æ??ä»¶"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:215
-msgid "_Resolve conflictsâ?¦"
-msgstr "è§£å?³å?²çª?(_R)..."
+#: ../plugins/git/plugin.c:202
+msgid "Resolve conflicts"
+msgstr "è§£å?³å?²çª?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:217
-msgid "Mark conflicted files as resolved"
-msgstr "å°?å?²çª?è®¾ç½®ä¸ºå·²è§£å?³"
+#: ../plugins/git/plugin.c:203
+msgid "Mark selected conflicted files as resolved"
+msgstr "å°?é??ä¸ç??æ??å?²çª?ç??æ??ä»¶è®¾ç½®ä¸ºå·²è§£å?³"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
-msgid "Patches"
-msgstr "è¡¥ä¸?"
+#: ../plugins/git/plugin.c:214
+msgid "Remote repository tools"
+msgstr "è¿?ç¨?ä»?åº?å·¥å?·"
+
+#: ../plugins/git/plugin.c:222
+msgid "Add a remote"
+msgstr "æ·»å? è¿?ç«¯"
+
+#: ../plugins/git/plugin.c:223
+msgid "Add a remote repository"
+msgstr "æ·»å? è¿?ç¨?ä»?åº?"
+
+#: ../plugins/git/plugin.c:230
+msgid "Delete selected remote"
+msgstr "å? é?¤é??ä¸ç??è¿?ç«¯ã??"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch seriesâ?¦"
-msgstr "å??å»ºè¡¥ä¸?åº?å??..."
+msgid "Delete a remote"
+msgstr "å? é?¤ä¸?ä¸ªè¿?ç«¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:233
-msgid "Generate patch files for submission upstream"
-msgstr "ä¸ºæ??äº¤ç»?ä¸?æ¸¸ç??æ??è¡¥ä¸?æ??ä»¶"
+#: ../plugins/git/plugin.c:239
+msgid "Push changes to a remote repository"
+msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Applyâ?¦"
-msgstr "åº?ç?¨(_A)..."
+#, fuzzy
+msgid "Pull changes from a remote repository"
+msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:249
-msgid "Start applying a patch series"
-msgstr "å¼?å§?åº?ç?¨ä¸?ä¸ªè¡¥ä¸?åº?å??"
+#: ../plugins/git/plugin.c:254
+msgid "Fetch"
+msgstr "è?·å??"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:255
-msgid "_Continue with resolved conflicts"
-msgstr "è§£å?³å?²çª?å??ç»§ç»(_C)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:257
-msgid "Continue applying a series after resolving conflicts"
-msgstr "è§£å?³å?²çª?å??ç»§ç»åº?ç?¨è¡¥ä¸?åº?å??"
+#, fuzzy
+msgid "Fetch changes from remote repositories"
+msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:263
-msgid "_Skip current patch"
-msgstr "è·³è¿?å½?å??è¡¥ä¸?(_S)"
+#: ../plugins/git/plugin.c:270
+msgid "Rebase against selected remote"
+msgstr ""
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:265
-msgid "Skip the current patch in the series and continue"
-msgstr "è·³è¿?åº?å??ä¸å½?å??è¡¥ä¸?å¹¶ä¸?ç»§ç»"
+#: ../plugins/git/plugin.c:271
+msgid "Start a rebase operation relative to the selected remote repository"
+msgstr ""
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
-msgid "_Abort"
-msgstr "å?³äº?(_A)"
+#: ../plugins/git/plugin.c:278 ../plugins/git/plugin.c:446
+msgid "Continue"
+msgstr "ç»§ç»"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:273
-msgid ""
-"Stop applying the series and return the repository to its original state"
-msgstr "å??æ¢åº?ç?¨è¡¥ä¸?åº?å??å¹¶ä¸?è¿?å??å?°ä»?åº?å??å§?ç??ç?¶æ??"
-
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:279
-msgid "_Branches"
-msgstr "å??æ?¯(_B)"
+#, fuzzy
+msgid "Continue a rebase with resolved conflicts"
+msgstr "è§£å?³å?²çª?å??ç»§ç»(_C)"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
-msgid "_Create branchâ?¦"
-msgstr "å??å»ºå??æ?¯(_C)..."
+#: ../plugins/git/plugin.c:286 ../plugins/git/plugin.c:454
+msgid "Skip"
+msgstr "è·³è¿?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:289
-msgid "Create a branch"
-msgstr "å??å»ºä¸?ä¸ªå??æ?¯"
+#: ../plugins/git/plugin.c:287
+msgid "Skip the current revision"
+msgstr "è·³è¿?å½?å??ç??æ?¬"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:295
-msgid "_Delete branchâ?¦"
-msgstr "å? é?¤å??æ?¯(_D)..."
+#: ../plugins/git/plugin.c:294 ../plugins/git/plugin.c:462
+msgid "Abort"
+msgstr "ä¸æ¢"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:297
-msgid "Delete branches"
-msgstr "å? é?¤å??æ?¯"
+#: ../plugins/git/plugin.c:295
+#, fuzzy
+msgid "Abort the rebase and return the repository to its previous state"
+msgstr "æ?¾å¼? Rebase å¹¶ä¸?è®©ä»?åº?å??å?°å??å§?ç?¶æ??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:303
-msgid "_Switch to another branchâ?¦"
-msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯(_S)..."
+#: ../plugins/git/plugin.c:306
+#, fuzzy
+msgid "Stash tools"
+msgstr "è¦?åº?ç?¨ç??ä¸´æ?¶å?å?¨"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:305
-msgid "Switch to another branch"
-msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
+#: ../plugins/git/plugin.c:314
+#, fuzzy
+msgid "Stash uncommitted changes"
+msgstr "ä¸´æ?¶å?å?¨æ?ªæ??äº¤ç??æ?´æ?¹(_S)..."
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:311
-msgid "_Mergeâ?¦"
-msgstr "å??å¹¶(_M)..."
+#: ../plugins/git/plugin.c:315
+#, fuzzy
+msgid "Save uncommitted changes without committing them"
+msgstr "è¿?å??æ?ªæ??äº¤ç??æ?´æ?¹è?³æ??ä»¶"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:313
-msgid "Merge changes from another branch into the current one"
-msgstr "ä»?å?¶å®?å??æ?¯å??å¹¶æ?´æ?¹å?°å½?å??å??æ?¯"
+#: ../plugins/git/plugin.c:322
+#, fuzzy
+msgid "Apply selected stash"
+msgstr "åº?ç?¨äº?é??ä¸ç??ä¸´æ?¶å?å?¨"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:319
-msgid "_Rebase"
-msgstr "é??å®?ä½?(_R)"
+#: ../plugins/git/plugin.c:323
+#, fuzzy
+msgid "Apply stashed changes back into the working tree"
+msgstr "åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:321
-msgid "Merge your changes with an upstream remote branch"
-msgstr "å??å¹¶æ?´æ?¹å?°ä¸?æ¸¸å??æ?¯"
+#: ../plugins/git/plugin.c:330
+#, fuzzy
+msgid "Apply stash and restore index"
+msgstr "åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
-msgid "_Startâ?¦"
-msgstr "å¼?å§?(_S)..."
+#: ../plugins/git/plugin.c:331
+#, fuzzy
+msgid "Apply stashed changes back into the working tree and the index"
+msgstr "åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:329
-msgid "Start a rebase"
-msgstr "å?¯å?¨é??å®?ä½?"
+#: ../plugins/git/plugin.c:338
+#, fuzzy
+msgid "Diff selected stash"
+msgstr "ä¸¢å¼?é??ä¸ç??ä¸´æ?¶å?å?¨"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:335
-msgid "_Continue"
-msgstr "ç»§ç»(_C)"
+#: ../plugins/git/plugin.c:339
+#, fuzzy
+msgid "Show a diff of the selected stash"
+msgstr "ä¸¢å¼?é??ä¸ç??ä¸´æ?¶å?å?¨"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:337
-msgid "Continue a rebase that stopped because of conflicts"
-msgstr "ç»§ç»ç?±äº?å?²çª?è??ç»?æ¢ç?? Rebase"
+#: ../plugins/git/plugin.c:346
+#, fuzzy
+msgid "Drop selected stash"
+msgstr "ä¸¢å¼?é??ä¸ç??ä¸´æ?¶å?å?¨"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:343
-msgid "_Skip"
-msgstr "è·³è¿?(_S)"
+#: ../plugins/git/plugin.c:347
+#, fuzzy
+msgid "Delete the selected stash"
+msgstr "ä¸¢å¼?é??ä¸ç??ä¸´æ?¶å?å?¨"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:345
-msgid "Skip the current conflicted commit and continue"
-msgstr "è·³è¿?å½?å??å?²çª?ç??æ??äº¤å¹¶ä¸?ç»§ç»"
+#: ../plugins/git/plugin.c:354
+msgid "Clear all stashes"
+msgstr "æ¸?é?¤å?¨é?¨ä¸´æ?¶å?å?¨"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:353
-msgid "Abort the rebase and put the repository in its original state"
-msgstr "æ?¾å¼? Rebase å¹¶ä¸?è®©ä»?åº?å??å?°å??å§?ç?¶æ??"
+#: ../plugins/git/plugin.c:355
+#, fuzzy
+msgid "Delete all stashes in this repository"
+msgstr "é??å??ç¼?è¾?å?¨å??ç??å?¨é?¨æ??å?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
-msgid "_Cherry pickâ?¦"
-msgstr "ä¼?é??(_C)..."
+#: ../plugins/git/plugin.c:366
+#, fuzzy
+msgid "Revision tools"
+msgstr "ç??æ?¬ï¼?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:361
-msgid ""
-"Selectively merge individual changes from other branches into the current one"
-msgstr "æ??é??æ?©ç??ä»?å?¶å®?å??æ?¯å??å¹¶ä¸ªå?«ç??æ?´æ?¹å?°å½?å??å??æ?¯"
+#: ../plugins/git/plugin.c:374
+#, fuzzy
+msgid "Show commit diff"
+msgstr "æ?¾ç¤ºæ??äº¤å·®å¼? (_S)"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:367
-msgid "_Remote branches"
-msgstr "è¿?ç¨?å??æ?¯(_R)"
+#: ../plugins/git/plugin.c:375
+#, fuzzy
+msgid "Show a diff of the selected revision"
+msgstr "æ?¥ç??é??ä¸ç??ç??æ?¬(_V)"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:377
-msgid "Add a remote branch"
-msgstr "æ·»å? è¿?ç¨?å??æ?¯"
+#: ../plugins/git/plugin.c:382
+#, fuzzy
+msgid "Cherry pick"
+msgstr "ä¼?é??(Cherry Pick)"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Deleteâ?¦"
-msgstr "å? é?¤(_D)..."
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:385
-msgid "Delete a remote branch"
-msgstr "å? é?¤ä¸?ä¸ªè¿?ç¨?å??æ?¯"
+#, fuzzy
+msgid "Merge an individual commit from another branch"
+msgstr "å??å¹¶æ¤æ??äº¤å?°å½?å??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
-msgid "_Create tagâ?¦"
-msgstr "å??å»ºæ ?ç¾(_C)..."
+#: ../plugins/git/plugin.c:390
+msgid "Reset/Revert"
+msgstr "é??ç½®/è¿?å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:401
-msgid "Create a tag"
-msgstr "å??å»ºä¸?ä¸ªæ ?ç¾"
+#: ../plugins/git/plugin.c:398
+msgid "Reset tree"
+msgstr "é??ç½®æº?ç ?æ ?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:407
-msgid "_Delete tagâ?¦"
-msgstr "å? é?¤æ ?ç¾(_D)..."
+#: ../plugins/git/plugin.c:399
+#, fuzzy
+msgid "Reset tree to a previous revision"
+msgstr "é??ç½®ä»?åº?é¡¶ç«¯è?³è¿?ä¸ªç??æ?¬"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:409
-msgid "Delete tags"
-msgstr "å? é?¤æ ?ç¾"
+#: ../plugins/git/plugin.c:406
+#, fuzzy
+msgid "Revert commit"
+msgstr "è¿?å??ä¸?ä¸ªæ??äº¤"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:415
-msgid "_Reset/Revert"
-msgstr "é??ç½®/è¿?å??(_R)"
+#: ../plugins/git/plugin.c:407
+msgid "Revert a commit"
+msgstr "è¿?å??ä¸?ä¸ª commit"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
-msgid "_Reset treeâ?¦"
-msgstr "é??ç½®æº?ç ?æ ?(_R)..."
+#: ../plugins/git/plugin.c:414
+msgid "Patch series"
+msgstr "è¡¥ä¸?é??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:425
-msgid "Reset repository head to any past state"
-msgstr "é??ç½®ä»?åº?é¡¶ç«¯è?³ä»»æ??ä¹?å??ç??ç?¶æ??"
+#: ../plugins/git/plugin.c:422 ../plugins/git/plugin.c:423
+#, fuzzy
+msgid "Generate a patch series"
+msgstr "å??å»ºæ?°ç?®å½?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
-msgid "_Revert commitâ?¦"
-msgstr "è¿?å??æ??äº¤(_R)..."
+#: ../plugins/git/plugin.c:430
+#, fuzzy
+msgid "Mailbox files"
+msgstr "åº?ç?¨äº?å?¨é?¨æ??ä»¶"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:433
-msgid "Revert a commit"
-msgstr "è¿?å??ä¸?ä¸ªæ??äº¤"
+#: ../plugins/git/plugin.c:438
+msgid "Apply mailbox files"
+msgstr "åº?ç?¨äº?å?¨é?¨æ??ä»¶"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:439
-msgid "Bisect"
-msgstr "å¹³å??"
+#, fuzzy
+msgid "Apply patches from mailbox files"
+msgstr "åº?ç?¨äº?å?¨é?¨æ??ä»¶"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:449
-msgid "Start a bisect operation"
-msgstr "å¼?å§?ä¸?ä¸ªå¹³å??æ??ä½?"
+#: ../plugins/git/plugin.c:447
+#, fuzzy
+msgid "Continue applying patches with resolved conflicts"
+msgstr "è§£å?³å?²çª?å??ç»§ç»åº?ç?¨è¡¥ä¸?åº?å??"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:455
-msgid "_Reset"
-msgstr "é??ç½®(_R)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:457
-msgid "Stop the bisect and bring the tree back to normal"
-msgstr "å??æ¢ bisect å¹¶ä¸?è®©æº?ç ?æ ?å??å?°æ£å¸¸"
+#, fuzzy
+msgid "Skip the current patch in the series"
+msgstr "è·³è¿?åº?å??ä¸å½?å??è¡¥ä¸?å¹¶ä¸?ç»§ç»"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:463
-msgid "_Good"
-msgstr "å¥½ (_G)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:465
-msgid "Mark the current head revision as good"
-msgstr "æ ?è®°å½?å??é¡¶ç«¯ç??æ?¬ä¸ºå¥½ç??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:471
-msgid "_Bad"
-msgstr "å?? (_B)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:473
-msgid "Mark the current head revision as bad"
-msgstr "æ ?è®°å½?å??é¡¶ç«¯ç??æ?¬ä¸ºå??ç??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:479
-msgid "_Initialize repository"
-msgstr "å??å§?å??ä»?åº?(_I)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:481
-msgid "Create a new git repository or reinitialize an existing one"
-msgstr "å??å»ºä¸?ä¸ªæ?°ç?? Git ä»?åº?æ??é??æ?°å??å§?å??ç?°æ??ç??ç??æ?¬åº?"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:491
-msgid "_Show commit diff"
-msgstr "æ?¾ç¤ºæ??äº¤å·®å¼? (_S)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:493
-msgid "Show changes introduced by this commit"
-msgstr "æ?¾ç¤ºè¯¥æ??äº¤æ??å¼?å?¥ç??å??å??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:499
-msgid "_View selected revision"
-msgstr "æ?¥ç??é??ä¸ç??ç??æ?¬(_V)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:501
-msgid "View a copy of this file at this revision"
-msgstr "æ?¾ç¤ºæ¤ç??æ?¬ç??æ??ä»¶å?¯æ?¬"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:509
-msgid "Create a branch with the selected revision as its head"
-msgstr "å??å»ºå??æ?¯ä»¥é??å®?ç??æ?¬ä½?ä¸ºå?¶é¡¶ç«¯"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:517
-msgid "Create a tag at this revision"
-msgstr "å?¨æ¤ç??æ?¬å??å»ºä¸?ä¸ªæ ?ç¾"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:525
-msgid "Reset repository head to this revision"
-msgstr "é??ç½®ä»?åº?é¡¶ç«¯è?³è¿?ä¸ªç??æ?¬"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:533
-msgid "Revert this commit"
-msgstr "è¿?å??æ¤æ??äº¤"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:541
-msgid "Merge this commit into the current branch"
-msgstr "å??å¹¶æ¤æ??äº¤å?°å½?å??å??æ?¯"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:547
-msgid "_Bisect"
-msgstr "å¹³å??(_B)"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:555
-msgid "_Set good revision"
-msgstr "è®¾å®?ä¸ºå¥½ç??ç??æ?¬ (_S)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:557
-msgid "Mark this revision as good"
-msgstr "æ ?è®°è¯¥ç??æ?¬ä¸ºå¥½ç??"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:563
-msgid "_Set bad revision"
-msgstr "è®¾å®?å??ç??ç??æ?¬ (_S)"
+#, fuzzy
+msgid ""
+"Stop applying the patch series and return the tree to its previous state"
+msgstr "å??æ¢åº?ç?¨è¡¥ä¸?åº?å??å¹¶ä¸?è¿?å??å?°ä»?åº?å??å§?ç??ç?¶æ??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:565
-msgid "Mark this revision as bad"
-msgstr "æ ?è®°è¯¥ç??æ?¬ä¸ºå??ç??"
+#: ../plugins/git/plugin.c:554 ../plugins/git/plugin.c:627
+msgid "Branch"
+msgstr "å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:585
-msgid "View changes to this file or folder"
-msgstr "æ?¾ç¤ºæ¤æ??ä»¶æ??æ??ä»¶å¤¹ç??æ?´æ?¹"
+#: ../plugins/git/plugin.c:696
+msgid "Git Tasks"
+msgstr "Git ä»»å?¡"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:593
-msgid "Add this file or folder to the repository"
-msgstr "æ·»å? æ¤æ??ä»¶æ??æ??ä»¶å¤¹å?°ä»?åº?"
+#: ../plugins/git/plugin.c:758
+msgid "Status"
+msgstr "ç?¶æ??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:601
-msgid "Remove this file or folder from the repository"
-msgstr "ä»?ä»?åº?ä¸å? é?¤æ¤æ??ä»¶æ??æ??ä»¶å¤¹"
+#: ../plugins/git/plugin.c:764
+msgid "Log"
+msgstr "æ?¥å¿?"
 
-#: ../plugins/git/plugin.c:766
-msgid "Top level git menu item"
-msgstr "é¡¶çº§ Git è??å??é¡¹"
+#: ../plugins/git/plugin.c:770
+msgid "Branches"
+msgstr "å??æ?¯"
 
-#: ../plugins/git/plugin.c:774
-msgid "Git operations"
-msgstr "Git æ??ä½?"
+#: ../plugins/git/plugin.c:775
+msgid "Tags"
+msgstr "æ ?ç¾"
 
-#: ../plugins/git/plugin.c:779
-msgid "Git log operations"
-msgstr "Git æ?¥å¿?æ??ä½?"
+#: ../plugins/git/plugin.c:781
+msgid "Remotes"
+msgstr "è¿?ç«¯"
 
-#: ../plugins/git/plugin.c:784
-msgid "Git FM operations"
-msgstr "Git FM æ??ä½?"
+#: ../plugins/git/plugin.c:787
+msgid "Stash"
+msgstr "ä¸´æ?¶å?å?¨"
 
-#: ../plugins/git/plugin.c:799
-msgid "Git Log"
-msgstr "Git æ?¥å¿?"
+#: ../plugins/glade/plugin.c:375
+msgid "Loading Gladeâ?¦"
+msgstr "è½½å?¥ Glade..."
 
-#: ../plugins/glade/plugin.c:416
+#: ../plugins/glade/plugin.c:420
 msgid "Widgets"
 msgstr "é?¨ä»¶"
 
-#: ../plugins/glade/plugin.c:421
+#: ../plugins/glade/plugin.c:425
 msgid "Palette"
 msgstr "è°?è?²æ?¿"
 
-#: ../plugins/glade/plugin.c:552
+#: ../plugins/glade/plugin.c:541
 #, c-format
 msgid "Not local file: %s"
 msgstr "ä¸?æ?¯æ?¬å?°æ??ä»¶ï¼?%s"
 
-#: ../plugins/glade/plugin.c:593
+#: ../plugins/glade/plugin.c:587
 #, c-format
 msgid "Could not open %s"
 msgstr "æ? æ³?æ??å¼? %s"
 
-#: ../plugins/glade/plugin.c:646
+#: ../plugins/glade/plugin.c:642
 msgid "Could not create a new glade project."
 msgstr "æ? æ³?å??å»ºæ?°ç?? glade é¡¹ç?®ã??"
 
-#: ../plugins/glade/anjuta-design-document.c:156
-#: ../plugins/glade/anjuta-design-document.c:183
+#: ../plugins/glade/anjuta-design-document.c:166
+#: ../plugins/glade/anjuta-design-document.c:193
 #, c-format
 msgid "Glade project '%s' saved"
 msgstr "Glade é¡¹ç?®â??%sâ??å·²ä¿?å?"
 
-#: ../plugins/glade/anjuta-design-document.c:163
-#: ../plugins/glade/anjuta-design-document.c:190
+#: ../plugins/glade/anjuta-design-document.c:173
+#: ../plugins/glade/anjuta-design-document.c:200
 msgid "Invalid Glade file name"
 msgstr "é??æ³?ç?? Glade æ??ä»¶å??ã??"
 
-#: ../plugins/gtodo/add_edit_item.c:99
-msgid "You need to select a to do item before you can edit it"
-msgstr "ç¼?è¾?ä¹?å??å¿?é¡»é??ä¸ä¸?ä¸ªä»»å?¡é¡¹"
-
-#: ../plugins/gtodo/add_edit_item.c:118
-msgid "Add Item"
-msgstr "æ·»å? é¡¹ç?®"
-
-#: ../plugins/gtodo/add_edit_item.c:121
-msgid "Edit Item"
-msgstr "ç¼?è¾?é¡¹ç?®"
-
-#: ../plugins/gtodo/add_edit_item.c:152 ../plugins/gtodo/add_edit_item.c:153
-#: ../plugins/gtodo/list_tooltip.c:42
-msgid "Summary:"
-msgstr "æ¦?è¦?ï¼?"
-
-#. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172
-msgid "Category:"
-msgstr "ç±»å?«ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:193 ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:76
-msgid "Edit Categories"
-msgstr "ç¼?è¾?ç±»å?«"
-
-#: ../plugins/gtodo/add_edit_item.c:205 ../plugins/gtodo/list_tooltip.c:48
-#: ../plugins/gtodo/list_tooltip.c:54
-msgid "Due date:"
-msgstr "é¢?å®?æ?¥æ??ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:224
-msgid "Notify when due"
-msgstr "å?°æ??æ?¶æ??é??"
-
-#. label
-#: ../plugins/gtodo/add_edit_item.c:237 ../plugins/gtodo/list_tooltip.c:64
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/list_tooltip.c:77
-msgid "Priority:"
-msgstr "ä¼?å??çº§ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:258 ../plugins/gtodo/add_edit_item.c:259
-#: ../plugins/gtodo/list_tooltip.c:81
-msgid "Comment:"
-msgstr "æ³¨é??ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:283
-msgid "Completed"
-msgstr "å·²å®?æ??"
-
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:335
-#: ../plugins/gtodo/add_edit_item.c:448
-msgid "started:"
-msgstr "å¼?å§?äº?ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
-#, c-format
-msgid "N/A"
-msgstr "ä¸?å?¯ç?¨"
-
-#: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
-#: ../plugins/gtodo/add_edit_item.c:448
-msgid "stopped:"
-msgstr "ç»?æ??äº?ï¼?"
-
-#: ../plugins/gtodo/callback.c:20
-msgid "You need to select a to-do item before you can remove it"
-msgstr "å? é?¤å??é??è¦?é??æ?©ä¸?ä¸ªä»»å?¡é¡¹"
-
-#: ../plugins/gtodo/callback.c:23
-msgid "Are you sure you want to remove the selected to-do item?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?å? é?¤é??ä¸ç??ä»»å?¡é¡¹å??ï¼?"
-
-#: ../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:104
-#, c-format
-msgid ""
-"Are you sure you want to remove all the completed to-do items in the "
-"category \"%s\"?"
-msgstr "æ?¨ç??ç??è¦?å? é?¤ç±»å?«â??%sâ??ä¸æ??æ??å·²å®?æ??ç??ä»»å?¡é¡¹å??ï¼?"
-
-#: ../plugins/gtodo/export.c:47
-msgid "Export task list"
-msgstr "å¯¼å?ºä»»å?¡å??è¡¨"
-
-#: ../plugins/gtodo/export.c:159
-msgid "XML"
-msgstr "XML"
-
-#: ../plugins/gtodo/export.c:160
-msgid "Plain Text"
-msgstr "çº¯æ??æ?¬"
-
-#: ../plugins/gtodo/export.c:161
-msgid "HTML"
-msgstr "HTML"
-
-#. add the embed css style sheet tb
-#: ../plugins/gtodo/export.c:168
-msgid "Export current category only"
-msgstr "ä»?å¯¼å?ºå½?å??ç±»å?«"
-
-#: ../plugins/gtodo/export.c:172
-msgid "HTML export options:"
-msgstr "HTML å¯¼å?ºé??é¡¹ï¼?"
-
-#: ../plugins/gtodo/export.c:184
-msgid "Embed default (CSS) style sheet"
-msgstr "åµ?å?¥é»?è®¤(CSS)æ ·å¼?è¡¨"
-
-#: ../plugins/gtodo/export.c:188
-msgid "Custom (CSS) style sheet"
-msgstr "å®?å?¶(CSS)æ ·å¼?è¡¨"
-
-#: ../plugins/gtodo/interface.c:119
-msgid "All"
-msgstr "æ?¾ç¤ºæ??æ??"
-
-#: ../plugins/gtodo/interface.c:144
-msgid "_Export"
-msgstr "å¯¼å?º(_E)"
-
-#: ../plugins/gtodo/interface.c:188
-msgid "Priority"
-msgstr "ä¼?å??çº§"
-
-#: ../plugins/gtodo/interface.c:195
-msgid "Due date"
-msgstr "é¢?å®?æ?¥æ??"
-
-#: ../plugins/gtodo/interface.c:209
-msgid "Summary"
-msgstr "æ¦?è¦?"
-
-#: ../plugins/gtodo/libgtodo.c:603
-#, c-format
-msgid "No permission to read the file."
-msgstr "æ²¡æ??è¯»å??æ??ä»¶ç??æ??é??ã??"
-
-#: ../plugins/gtodo/libgtodo.c:618
-#, c-format
-msgid "Failed to read file"
-msgstr "è¯»å??æ??ä»¶å¤±è´¥"
-
-#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
-#, c-format
-msgid "Failed to parse XML structure"
-msgstr "è§£æ?? XML ç»?æ??å¤±è´¥"
-
-#: ../plugins/gtodo/libgtodo.c:646
-#, c-format
-msgid "File is not a valid gtodo file"
-msgstr "æ??ä»¶ä¸?æ?¯å??æ³?ç?? gtodo æ??ä»¶"
-
-#: ../plugins/gtodo/libgtodo.c:662
-msgid "Personal"
-msgstr "ä¸ªäººç??"
-
-#: ../plugins/gtodo/libgtodo.c:664
-msgid "Business"
-msgstr "å??ä¸?ç??"
-
-#: ../plugins/gtodo/libgtodo.c:666
-msgid "Unfiled"
-msgstr "æ?ªæ?´ç??ç??"
-
-#: ../plugins/gtodo/libgtodo.c:755
-#, c-format
-msgid "No Gtodo Client to save."
-msgstr "æ²¡æ??è¦?ä¿?å?ç?? Gtodo å®¢æ?·ç«¯"
-
-#: ../plugins/gtodo/libgtodo.c:846
-#, c-format
-msgid "No filename supplied."
-msgstr "æ?ªæ??ä¾?æ??ä»¶å??ã??"
-
-#. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
-msgid "Low"
-msgstr "ä½?"
-
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
-msgid "Medium"
-msgstr "ä¸"
-
-#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
-msgid "High"
-msgstr "é«?"
-
-#: ../plugins/gtodo/mcategory.c:145
-#, c-format
-msgid "When you delete the category \"%s\", all containing items are lost"
-msgstr "å? é?¤ç±»å?«â??%sâ??æ?¶ï¼?å°?ä¼?å¤±å?»è¯¥ç±»å?«ä¸?ç??æ??æ??é¡¹ç?®"
-
-#: ../plugins/gtodo/mcategory.c:146
-msgid "Delete"
-msgstr "å? é?¤"
-
-#: ../plugins/gtodo/mcategory.c:173
-#, c-format
-msgid "<New category (%d)>"
-msgstr "<æ?°ç±»å?«(%d)>"
-
-#: ../plugins/gtodo/notification.c:66
-#, c-format
-msgid "The following item is due in %i minute:"
-msgid_plural "The following item is due in %i minutes:"
-msgstr[0] "ä¸?å??é¡¹ç?®å?¨ %i å??é??å??å?°æ??ï¼?"
-
-#: ../plugins/gtodo/notification.c:75
-msgid "The following item is due:"
-msgstr "ä¸?å??é¡¹ç?®å?°æ??äº?ï¼?"
-
-#. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:116
-msgid "_Do not show again"
-msgstr "ä¸?å??æ?¾ç¤º(_D)"
-
-#: ../plugins/gtodo/plugin.c:65
-msgid "_Tasks"
-msgstr "ä»»å?¡(_T)"
-
-#: ../plugins/gtodo/plugin.c:74
-msgid "Hide _Completed Items"
-msgstr "é??è??å·²å®?æ??ç??é¡¹ç?®(_C)"
-
-#: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed to-do items"
-msgstr "é??è??å·²å®?æ??ç??ä»»å?¡é¡¹"
-
-#: ../plugins/gtodo/plugin.c:83
-msgid "Hide Items Past _Due Date"
-msgstr "é??è??è¶?æ??ç??é¡¹ç?®(_D)"
-
-#: ../plugins/gtodo/plugin.c:85
-msgid "Hide items that are past due date"
-msgstr "é??è??è¶?æ??ç??é¡¹ç?®"
-
-#: ../plugins/gtodo/plugin.c:92
-msgid "Hide Items Without _End Date"
-msgstr "é??è??æ? ç»?æ??æ?¥æ??ç??é¡¹ç?®(_E)"
-
-#: ../plugins/gtodo/plugin.c:94
-msgid "Hide items without an end date"
-msgstr "é??è??æ? ç»?æ??æ?¥æ??ç??é¡¹ç?®"
-
-#: ../plugins/gtodo/plugin.c:122
-msgid "Task manager"
-msgstr "ä»»å?¡ç®¡ç??å?¨"
-
-#: ../plugins/gtodo/plugin.c:128
-msgid "Task manager view"
-msgstr "ä»»å?¡ç®¡ç??å?¨è§?å?¾"
-
-#: ../plugins/gtodo/plugin.c:134
-msgid "Tasks"
-msgstr "ä»»å?¡"
-
-#: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "To-do Manager"
-msgstr "ä»»å?¡ç®¡ç??å?¨"
-
-#: ../plugins/gtodo/preferences.c:21
-msgid "To-do List Preferences"
-msgstr "ä»»å?¡å??è¡¨é¦?é??é¡¹"
-
-#: ../plugins/gtodo/preferences.c:89
-msgid "Interface"
-msgstr "ç??é?¢"
-
-#: ../plugins/gtodo/preferences.c:93
-msgid "Show due date column"
-msgstr "æ?¾ç¤ºå?°æ??æ?¶é?´æ ?"
-
-#: ../plugins/gtodo/preferences.c:101
-msgid "Show category column"
-msgstr "æ?¾ç¤ºç±»å?«æ ?"
-
-#: ../plugins/gtodo/preferences.c:107
-msgid "Show priority column"
-msgstr "æ?¾ç¤ºä¼?å??çº§æ ?"
-
-#: ../plugins/gtodo/preferences.c:115 ../plugins/gtodo/preferences.c:117
-msgid "Show in main window"
-msgstr "å?¨ä¸»çª?å?£æ?¾ç¤º"
-
-#: ../plugins/gtodo/preferences.c:128 ../plugins/gtodo/preferences.c:130
-msgid "Highlight"
-msgstr "é«?äº®"
-
-#. tb for highlighting due today
-#: ../plugins/gtodo/preferences.c:140
-msgid "Items that are due today"
-msgstr "ä»?æ?¥å?°æ??ç??ä»»å?¡"
-
-#. tb for highlighting due
-#: ../plugins/gtodo/preferences.c:146
-msgid "Items that are past due"
-msgstr "è¶?æ??ç??ä»»å?¡"
-
-#. tb for highlighting in x days
-#: ../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:166
-msgid "Miscellaneous"
-msgstr "æ??é¡¹"
-
-#: ../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:175
-msgid "Purge items after"
-msgstr "å?¨"
-
-#. Translators: Second part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:180
-msgid "days."
-msgstr "å¤©å??æ¸?é?¤é¡¹ç?®ã??"
-
-#: ../plugins/gtodo/preferences.c:193 ../plugins/gtodo/preferences.c:195
-msgid "Auto-Purge"
-msgstr "è?ªå?¨æ¸?é?¤"
-
-#: ../plugins/gtodo/preferences.c:207 ../plugins/gtodo/preferences.c:209
-msgid "Notification"
-msgstr "æ??é??"
-
-#: ../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"
-msgstr[0] "å??è®¸ä»»å?¡é¡¹å?¨å®?ä»¬å?°æ?? %i å??é??å??æ??é??æ??"
-
-#: ../plugins/gtodo/tasklists.c:10
-msgid "Open a Task List"
-msgstr "æ??å¼?ä»»å?¡å??è¡¨"
-
-#: ../plugins/gtodo/tasklists.c:35
-msgid "Create a Task List"
-msgstr "å??å»ºä»»å?¡å??è¡¨"
-
-#: ../plugins/gtodo/todo_db.c:165
-msgid "No Date"
-msgstr "æ? æ?¥æ??"
-
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 msgid "Diagonal"
@@ -6384,6 +5877,31 @@ msgid "%d Error"
 msgid_plural "%d Errors"
 msgstr[0] "%d ä¸ªé??è¯¯"
 
+#: ../plugins/mk-project/mk-project.c:460
+#, fuzzy, c-format
+msgid "Unable to parse make file"
+msgstr "æ? æ³?è§£æ??é¡¹ç?®æ??ä»¶"
+
+#: ../plugins/mk-project/mk-project.ui.h:1
+msgid "<b>Select Package to add:</b>"
+msgstr "<b>é??æ?©è¦?æ·»å? ç??å??ï¼?</b>"
+
+#: ../plugins/mk-project/mk-project.ui.h:2
+msgid "Add _Package"
+msgstr "æ·»å? å??(_P)"
+
+#: ../plugins/mk-project/mk-project.ui.h:3
+msgid "Add _module"
+msgstr "æ·»å? æ¨¡å??(_M)"
+
+#: ../plugins/mk-project/mk-project.ui.h:5
+msgid "Packages"
+msgstr "å??"
+
+#: ../plugins/mk-project/mk-project.ui.h:6
+msgid "Select package"
+msgstr "é??æ?©å??"
+
 #: ../plugins/patch/patch-plugin.c:94
 msgid "File/Directory to patch"
 msgstr "è¦?æ??è¡¥ä¸?ç??æ??ä»¶/ç?®å½?"
@@ -6392,6 +5910,10 @@ msgstr "è¦?æ??è¡¥ä¸?ç??æ??ä»¶/ç?®å½?"
 msgid "Patch file"
 msgstr "è¡¥ä¸?æ??ä»¶"
 
+#: ../plugins/patch/patch-plugin.c:117
+msgid "Patches"
+msgstr "è¡¥ä¸?"
+
 #: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "è¡¥ä¸?"
@@ -6464,35 +5986,29 @@ msgstr "è¡¥ä¸?(_P)..."
 msgid "Patch files/directories"
 msgstr "è¡¥ä¸?æ??ä»¶/ç?®å½?"
 
-#: ../plugins/project-import/plugin.c:68
-msgid ""
-"Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up-to-date."
-msgstr ""
-"é¡¹ç?®æ??ä»¶ç??æ??å¤±è´¥ã??æ?¾ä¸?å?°å??é??ç??é¡¹ç?®æ¨¡æ?¿ã??è¯·ç¡®è®¤æ?¨ä½¿ç?¨ç?? Anjuta æ?¯æ??æ?°ç??æ?¬ã??"
-
-#: ../plugins/project-import/plugin.c:88
+#: ../plugins/project-import/plugin.c:79
+#: ../plugins/project-import/plugin.c:183
 #, c-format
 msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "æ??ä»¶â??%sâ??å·²å?å?¨ã??è¦?æ?¿æ?¢å®?å??ï¼?"
 
-#: ../plugins/project-import/plugin.c:136
+#: ../plugins/project-import/plugin.c:218
 #, c-format
 msgid ""
 "A file named \"%s\" cannot be written: %s. Check if you have write access to "
 "the project directory."
 msgstr "å??ä¸ºâ??%sâ??ç??æ??ä»¶ä¸?å?¯å??å?¥ï¼?%sã??æ£?æ?¥æ?¨æ?¯å?¦å?·æ??è¯¥é¡¹ç?®ç?®å½?ç??å??æ??é??ã??"
 
-#: ../plugins/project-import/plugin.c:200
+#: ../plugins/project-import/plugin.c:282
 #, c-format
 msgid "Please select a project backend to open %s."
 msgstr "è¯·é??æ?©ç?¨äº?æ??å¼? %s ç??é¡¹ç?®å??ç«¯ã??"
 
-#: ../plugins/project-import/plugin.c:205
+#: ../plugins/project-import/plugin.c:287
 msgid "Open With"
 msgstr "æ??å¼?æ?¹å¼?(_W)"
 
-#: ../plugins/project-import/plugin.c:220
+#: ../plugins/project-import/plugin.c:302
 #, c-format
 msgid ""
 "Could not find a valid project backend for the given directory (%s). Please "
@@ -6501,8 +6017,8 @@ msgstr ""
 "æ??å®?ç??ç?®å½?(%s)ä¸æ?¾ä¸?å?°æ??æ??ç??é¡¹ç?®å??ç«¯ã??è¯·é??æ?©ä¸?å??ç??ç?®å½?ï¼?æ??å°?è¯?å°? Anjuta å??çº§"
 "å?°è¾?æ?°ç??æ?¬ã??"
 
-#: ../plugins/project-import/plugin.c:290
-#: ../plugins/project-import/plugin.c:346
+#: ../plugins/project-import/plugin.c:368
+#: ../plugins/project-import/plugin.c:424
 #, c-format
 msgid ""
 "Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
@@ -6513,7 +6029,7 @@ msgstr "æ??ä¾?ç?? URI â??%sâ??ä¸?è?½ç¾å?ºï¼?è¿?å??é??è¯¯ï¼?â??%sâ??"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
 #: ../plugins/project-wizard/templates/django.wiz.in.h:1
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
@@ -6559,17 +6075,17 @@ msgid "Import"
 msgstr "å¯¼å?¥"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:1
-msgid "Add Module"
-msgstr "æ·»å? æ¨¡å??"
+msgid "Add Library"
+msgstr "æ·»å? åº?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:2
-msgid "Add Package"
-msgstr "æ·»å? å??"
-
-#: ../plugins/project-manager/pm_dialogs.ui.h:3
 msgid "Add Source"
 msgstr "æ·»å? æº?æ??ä»¶"
 
+#: ../plugins/project-manager/pm_dialogs.ui.h:3
+msgid "Browse other nodes"
+msgstr "æµ?è§?å?¶ä»?è??ç?¹"
+
 #: ../plugins/project-manager/pm_dialogs.ui.h:4
 msgid "Modules:"
 msgstr "æ¨¡å??ï¼?"
@@ -6579,91 +6095,97 @@ msgid "More options:"
 msgstr "æ?´å¤?é??é¡¹ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:6
-msgid "New Group"
-msgstr "æ?°å»ºç»?"
+msgid "New Directory"
+msgstr "æ?°å»ºç?®å½?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:7
+msgid "New Library"
+msgstr "æ?°å»ºåº?"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:8
 msgid "New Target"
 msgstr "æ?°å»ºç?®æ ?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:8
+#: ../plugins/project-manager/pm_dialogs.ui.h:9
 msgid "Package list:"
 msgstr "å??å??è¡¨ï¼?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:9
-msgid "Select the _target for the module:"
+#: ../plugins/project-manager/pm_dialogs.ui.h:10
+#, fuzzy
+msgid "Select the _target for the library:"
 msgstr "ä¸ºæ¨¡å??é??æ?©ç?®æ ?(_T)ï¼?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:10
+#: ../plugins/project-manager/pm_dialogs.ui.h:11
 msgid "Select the _target for the new source files:"
 msgstr "ä¸ºæ?°ç??æº?æ??ä»¶é??æ?©ç?®æ ?(_T)ï¼?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:11
+#: ../plugins/project-manager/pm_dialogs.ui.h:12
 msgid "Source files:"
 msgstr "æº?æ??ä»¶ï¼?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:12
-msgid "Specify _where to create the group:"
-msgstr "æ??å®?å??å»ºç»?ç??ä½?ç½®(_W)ï¼?"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:13
-msgid "Specify _where to create the target:"
+#, fuzzy
+msgid "Specify _where to create the directory:"
 msgstr "æ??å®?å??å»ºç?®æ ?ç??ä½?ç½®(_W)ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:14
+msgid "Specify _where to create the target:"
+msgstr "æ??å®?å??å»ºç?®æ ?ç??ä½?ç½®(_W)ï¼?"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:15
 msgid "Target _name:"
 msgstr "ç?®æ ?å??ç§°(_N)ï¼?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:15
+#: ../plugins/project-manager/pm_dialogs.ui.h:16
 msgid "Target _type:"
 msgstr "ç?®æ ?ç±»å??(_T)ï¼?"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:16
+#: ../plugins/project-manager/pm_dialogs.ui.h:17
 msgid "TargetTypes"
 msgstr "ç?®æ ?ç±»å??"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:17
-msgid "_Add package&#x2026;"
-msgstr "æ·»å? å??(_A)..."
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:18
-msgid "_Group name:"
-msgstr "ç»?å??(_G)ï¼?"
+msgid "_Directory name:"
+msgstr "ç?®å½?å??ç§°(_D)ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:19
 msgid "_Module name:"
 msgstr "æ¨¡å??å??ç§°(_M)ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:20
+msgid "_New library&#x2026;"
+msgstr ""
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:21
 msgid "_Select file to add&#x2026;"
 msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶(_S)..."
 
-#: ../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-manager/project-model.c:184
+#: ../plugins/project-manager/plugin.c:1324
+#: ../plugins/project-manager/plugin.c:1446
+#: ../plugins/project-manager/plugin.c:1618 ../plugins/symbol-db/plugin.c:2134
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "é¡¹ç?®"
 
-#: ../plugins/project-manager/project-model.c:234
+#: ../plugins/project-manager/project-model.c:185
 msgid "GbfProject Object"
 msgstr "GbfProject å¯¹è±¡"
 
-#: ../plugins/project-manager/project-model.c:763
+#: ../plugins/project-manager/project-model.c:727
 msgid "No project loaded"
 msgstr "æ²¡æ??é¡¹ç?®è¢«å? è½½"
 
-#: ../plugins/project-manager/plugin.c:385
+#: ../plugins/project-manager/plugin.c:402
 msgid "Refreshing symbol treeâ?¦"
 msgstr "å?·æ?°ç¬¦å?·æ ?..."
 
-#: ../plugins/project-manager/plugin.c:392
+#: ../plugins/project-manager/plugin.c:409
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "é¡¹ç?®å?·æ?°å¤±è´¥ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:646
+#: ../plugins/project-manager/plugin.c:668
 msgid ""
 "Are you sure you want to remove the following group from the project?\n"
 "\n"
@@ -6671,7 +6193,7 @@ msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?ç»?å??ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:649
+#: ../plugins/project-manager/plugin.c:671
 msgid ""
 "Are you sure you want to remove the following target from the project?\n"
 "\n"
@@ -6679,7 +6201,7 @@ msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?ç?®æ ?å??ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:652
+#: ../plugins/project-manager/plugin.c:674
 msgid ""
 "Are you sure you want to remove the following source file from the project?\n"
 "\n"
@@ -6687,7 +6209,7 @@ msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?æº?æ??ä»¶å??ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:655
+#: ../plugins/project-manager/plugin.c:677
 msgid ""
 "Are you sure you want to remove the following package from the project?\n"
 "\n"
@@ -6695,7 +6217,7 @@ msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?å??å??ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:658
+#: ../plugins/project-manager/plugin.c:680
 msgid ""
 "Are you sure you want to remove the following module from the project?\n"
 "\n"
@@ -6703,7 +6225,7 @@ msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?æ¨¡å??å??ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:661
+#: ../plugins/project-manager/plugin.c:683
 msgid ""
 "Are you sure you want to remove the following elements from the project?\n"
 "\n"
@@ -6711,57 +6233,57 @@ msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?å??ç´ å??ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:678
+#: ../plugins/project-manager/plugin.c:700
 #, c-format
 msgid "Group: %s\n"
 msgstr "ç»?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:681
+#: ../plugins/project-manager/plugin.c:703
 #, c-format
 msgid "Target: %s\n"
 msgstr "ç?®æ ?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:684
+#: ../plugins/project-manager/plugin.c:706
 #, c-format
 msgid "Source: %s\n"
 msgstr "æº?æ??ä»¶ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:687
+#: ../plugins/project-manager/plugin.c:709
 #, c-format
 msgid "Shortcut: %s\n"
 msgstr "å¿«æ?·æ?¹å¼?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:690
+#: ../plugins/project-manager/plugin.c:712
 #, c-format
 msgid "Module: %s\n"
 msgstr "æ¨¡å??ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:693
+#: ../plugins/project-manager/plugin.c:715
 #, c-format
 msgid "Package: %s\n"
 msgstr "å??ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:705
+#: ../plugins/project-manager/plugin.c:727
 msgid "The group will be deleted from the file system."
 msgstr "è¯¥ç»?å°?ä»?æ??ä»¶ç³»ç»?ä¸å? é?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:707
+#: ../plugins/project-manager/plugin.c:729
 msgid "The group will not be deleted from the file system."
 msgstr "ç»?ä¸?ä¼?ä»?æ??ä»¶ç³»ç»?ä¸å? é?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:709
+#: ../plugins/project-manager/plugin.c:731
 msgid "The source file will be deleted from the file system."
 msgstr "è¯¥æº?æ??ä»¶å°?ä»?æ??ä»¶ç³»ç»?ä¸å? é?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:711
+#: ../plugins/project-manager/plugin.c:733
 msgid "The source file will not be deleted from the file system."
 msgstr "æº?æ??ä»¶å°?ä¸?ä¼?ä»?æ??ä»¶ç³»ç»?ä¸å? é?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:716
+#: ../plugins/project-manager/plugin.c:738
 msgid "Confirm remove"
 msgstr "ç¡®è®¤å? é?¤"
 
-#: ../plugins/project-manager/plugin.c:762
+#: ../plugins/project-manager/plugin.c:784
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6770,160 +6292,163 @@ msgstr ""
 "å? é?¤â??%sâ??å¤±è´¥ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:828
+#: ../plugins/project-manager/plugin.c:850
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "æ£?ç´¢ URI ä¿¡æ?¯å¤±è´¥ %sï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:866
+#: ../plugins/project-manager/plugin.c:888
 msgid "_Project"
 msgstr "é¡¹ç?®(_P)"
 
-#: ../plugins/project-manager/plugin.c:870
-msgid "Add _Groupâ?¦"
-msgstr "æ·»å? ç»?(_G)..."
+#: ../plugins/project-manager/plugin.c:892
+msgid "New _Directoryâ?¦"
+msgstr "æ?°å»ºç?®å½?(_D)"
 
-#: ../plugins/project-manager/plugin.c:870
-#: ../plugins/project-manager/plugin.c:914
-msgid "Add a group to project"
-msgstr "å??é¡¹ç?®æ·»å? ç»?"
+#: ../plugins/project-manager/plugin.c:892
+#: ../plugins/project-manager/plugin.c:931
+msgid "Add a new directory to the project"
+msgstr "å??é¡¹ç?®æ·»å? æ?°ç?®å½?"
 
-#: ../plugins/project-manager/plugin.c:875
-msgid "Add _Targetâ?¦"
-msgstr "æ·»å? ç?®æ ?(_T)..."
+#: ../plugins/project-manager/plugin.c:897
+msgid "New _Targetâ?¦"
+msgstr "æ?°å»ºç?®æ ?(_T)"
 
-#: ../plugins/project-manager/plugin.c:875
-#: ../plugins/project-manager/plugin.c:919
-msgid "Add a target to project"
+#: ../plugins/project-manager/plugin.c:897
+#: ../plugins/project-manager/plugin.c:936
+msgid "Add a new target to the project"
 msgstr "å??é¡¹ç?®æ·»å? ç?®æ ?"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:902
 msgid "Add _Source Fileâ?¦"
 msgstr "æ·»å? æº?æ??ä»¶(_S)..."
 
-#: ../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:902
+#: ../plugins/project-manager/plugin.c:941
+#: ../plugins/project-manager/plugin.c:956
+msgid "Add a source file to a target"
+msgstr "å??ç?®æ ?æ·»å? æº?æ??ä»¶"
 
-#: ../plugins/project-manager/plugin.c:885
-msgid "Add _Moduleâ?¦"
-msgstr "æ·»å? æ¨¡å??(_M)..."
+#: ../plugins/project-manager/plugin.c:907
+msgid "Add _Libraryâ?¦"
+msgstr "æ·»å? åº?(_L)"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:907
 msgid "Add a module to a target"
 msgstr "å??ç?®æ ?æ·»å? æ¨¡å??"
 
-#: ../plugins/project-manager/plugin.c:890
-msgid "Add _Packageâ?¦"
-msgstr "æ·»å? å??(_P)..."
+#: ../plugins/project-manager/plugin.c:912
+msgid "New _Libraryâ?¦"
+msgstr "æ?°å»ºå?½æ?°åº?(_L)"
 
-#: ../plugins/project-manager/plugin.c:890
-#: ../plugins/project-manager/plugin.c:934
-msgid "Add a package to project"
+#: ../plugins/project-manager/plugin.c:912
+msgid "Add a new package to the project"
 msgstr "å??é¡¹ç?®æ·»å? å??"
 
-#: ../plugins/project-manager/plugin.c:895
-#: ../plugins/project-manager/plugin.c:944
+#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/plugin.c:961
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
-#: ../plugins/project-manager/plugin.c:895
-#: ../plugins/project-manager/dialogs.c:666
+#: ../plugins/project-manager/plugin.c:917
+#: ../plugins/project-manager/dialogs.c:517
 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
+#: ../plugins/project-manager/plugin.c:922
 msgid "Close Pro_ject"
 msgstr "å?³é?é¡¹ç?®(_J)"
 
-#: ../plugins/project-manager/plugin.c:905
+#: ../plugins/project-manager/plugin.c:922
 msgid "Close project"
 msgstr "å?³é?é¡¹ç?®"
 
-#: ../plugins/project-manager/plugin.c:914
-msgid "Add _Group"
-msgstr "æ·»å? ç»?(_G)"
+#: ../plugins/project-manager/plugin.c:931
+msgid "New _Directory"
+msgstr "æ?°å»ºç?®å½?(_D)"
 
-#: ../plugins/project-manager/plugin.c:919
-msgid "Add _Target"
-msgstr "æ·»å? ç?®æ ?(_T)"
+#: ../plugins/project-manager/plugin.c:936
+msgid "New _Target"
+msgstr "æ?°å»ºç?®æ ?(_T)"
 
-#: ../plugins/project-manager/plugin.c:924
+#: ../plugins/project-manager/plugin.c:941
 msgid "Add _Source File"
 msgstr "æ·»å? æº?æ??ä»¶(_S)"
 
-#: ../plugins/project-manager/plugin.c:929
-msgid "Add _Module"
-msgstr "æ·»å? æ¨¡å??(_M)"
+#: ../plugins/project-manager/plugin.c:946
+msgid "Add _Library"
+msgstr "æ·»å? åº?(_L)"
 
-#: ../plugins/project-manager/plugin.c:929
-msgid "Add a module to target"
-msgstr "å??ç?®æ ?æ·»å? æ¨¡å??"
+#: ../plugins/project-manager/plugin.c:946
+msgid "Add a library to a target"
+msgstr "å??ç?®æ ?æ·»å? åº?"
 
-#: ../plugins/project-manager/plugin.c:934
-msgid "Add _Package"
-msgstr "æ·»å? å??(_P)"
+#: ../plugins/project-manager/plugin.c:951
+msgid "New _Library"
+msgstr "æ?°å»ºå?½æ?°åº?(_L)"
 
-#: ../plugins/project-manager/plugin.c:939
+#: ../plugins/project-manager/plugin.c:951
+msgid "Add a new library to the project"
+msgstr "å??é¡¹ç?®æ·»å? æ?°åº?"
+
+#: ../plugins/project-manager/plugin.c:956
 msgid "_Add to Project"
 msgstr "æ·»å? è?³é¡¹ç?®(_A)"
 
-#: ../plugins/project-manager/plugin.c:944
+#: ../plugins/project-manager/plugin.c:961
 msgid "Properties of group/target/source"
 msgstr "ç»?/ç?®æ ?/æº? å±?æ?§"
 
-#: ../plugins/project-manager/plugin.c:949
+#: ../plugins/project-manager/plugin.c:966
 msgid "Re_move"
 msgstr "å? é?¤(_M)"
 
-#: ../plugins/project-manager/plugin.c:949
+#: ../plugins/project-manager/plugin.c:966
 msgid "Remove from project"
 msgstr "ä»?é¡¹ç?®ä¸å? é?¤"
 
-#: ../plugins/project-manager/plugin.c:1343
+#: ../plugins/project-manager/plugin.c:971
+msgid "_Sort"
+msgstr "æ??åº?(_S)"
+
+#: ../plugins/project-manager/plugin.c:971
+msgid "Sort shortcuts"
+msgstr "æ??åº?å¿«æ?·é?®"
+
+#: ../plugins/project-manager/plugin.c:1309
 #, c-format
 msgid ""
 "Failed to parse project (the project is opened, but there will be no project "
 "view) %s: %s\n"
 msgstr "è§£æ??é¡¹ç?®å¤±è´¥(é¡¹ç?®å·²ç»?æ??å¼?ï¼?ä½?ç??ä¸?å?°é¡¹ç?®è§?å?¾) %sï¼? %s\n"
 
-#: ../plugins/project-manager/plugin.c:1384
+#: ../plugins/project-manager/plugin.c:1319
 msgid "Update project viewâ?¦"
 msgstr "æ?´æ?°é¡¹ç?®è§?å?¾..."
 
-#: ../plugins/project-manager/plugin.c:1425
+#: ../plugins/project-manager/plugin.c:1362
 #, c-format
 msgid "Loading project: %s"
 msgstr "æ£å?¨å? è½½é¡¹ç?®ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1595
+#: ../plugins/project-manager/plugin.c:1526
 #, c-format
 msgid "Error closing project: %s"
 msgstr "å?³é?é¡¹ç?®æ?¶å?ºé??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1663
+#: ../plugins/project-manager/plugin.c:1597
 msgid "Project manager actions"
 msgstr "é¡¹ç?®ç®¡ç??å?¨å?¨ä½?"
 
-#: ../plugins/project-manager/plugin.c:1671
+#: ../plugins/project-manager/plugin.c:1605
 msgid "Project manager popup actions"
 msgstr "é¡¹ç?®ç®¡ç??å?¨å¼¹å?ºå¼?å?¨ä½?"
 
-#: ../plugins/project-manager/plugin.c:2384
+#: ../plugins/project-manager/plugin.c:2329
 msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??é¡¹ç?®..."
 
-#: ../plugins/project-manager/plugin.c:2387
+#: ../plugins/project-manager/plugin.c:2332
 msgid "Project Loaded"
 msgstr "é¡¹ç?®å·²è¢«å? è½½"
 
@@ -6934,68 +6459,81 @@ msgstr "é¡¹ç?®å·²è¢«å? è½½"
 #. }
 #. else
 #. uri = g_strdup("");
-#: ../plugins/project-manager/dialogs.c:316
+#: ../plugins/project-manager/dialogs.c:290
 msgid "Select sourcesâ?¦"
 msgstr "é??æ?©æº?..."
 
-#: ../plugins/project-manager/dialogs.c:521
-msgid "Full Name:"
-msgstr "å®?æ?´å??ç§°ï¼?"
+#: ../plugins/project-manager/dialogs.c:369
+msgid " This property is not modifiable."
+msgstr "è¯¥å±?æ?§æ? æ³?æ?´æ?¹ã??"
 
-#: ../plugins/project-manager/dialogs.c:669
-msgid "Group properties"
-msgstr "ç»?å±?æ?§"
+#: ../plugins/project-manager/dialogs.c:520
+msgid "Directory properties"
+msgstr "ç?®å½?å±?æ?§"
 
-#: ../plugins/project-manager/dialogs.c:672
+#: ../plugins/project-manager/dialogs.c:523
 msgid "Target properties"
 msgstr "ç?®æ ?å±?æ?§"
 
-#: ../plugins/project-manager/dialogs.c:675
+#: ../plugins/project-manager/dialogs.c:526
 msgid "Source properties"
 msgstr "æ?¥æº?å±?æ?§"
 
-#: ../plugins/project-manager/dialogs.c:776
-#: ../plugins/project-manager/dialogs.c:787
+#: ../plugins/project-manager/dialogs.c:529
+msgid "Module properties"
+msgstr "æ¨¡å??å±?æ?§"
+
+#: ../plugins/project-manager/dialogs.c:532
+msgid "Package properties"
+msgstr "å??å±?æ?§"
+
+#: ../plugins/project-manager/dialogs.c:535
+msgid "Unknown properties"
+msgstr "æ?ªç?¥å±?æ?§"
+
+#: ../plugins/project-manager/dialogs.c:930
+#: ../plugins/project-manager/dialogs.c:941
 msgid "Cannot add group"
 msgstr "ä¸?è?½æ·»å? ç»?"
 
-#: ../plugins/project-manager/dialogs.c:788
+#: ../plugins/project-manager/dialogs.c:942
 msgid "No parent group selected"
 msgstr "æ²¡æ??é??ä¸ç?¶ç»?"
 
-#: ../plugins/project-manager/dialogs.c:998
-#: ../plugins/project-manager/dialogs.c:1008
+#: ../plugins/project-manager/dialogs.c:1156
+#: ../plugins/project-manager/dialogs.c:1166
 msgid "Cannot add source files"
 msgstr "ä¸?è?½æ·»å? æº?æ??ä»¶"
 
-#: ../plugins/project-manager/dialogs.c:1009
-msgid "The selected node cannot contains source files."
+#: ../plugins/project-manager/dialogs.c:1167
+#, fuzzy
+msgid "The selected node cannot contain source files."
 msgstr "é??æ?©ç??è??ç?¹ä¸?è?½å??å?«æº?æ??ä»¶ã??"
 
-#: ../plugins/project-manager/dialogs.c:1191
-#: ../plugins/project-manager/dialogs.c:1202
+#: ../plugins/project-manager/dialogs.c:1353
+#: ../plugins/project-manager/dialogs.c:1364
 msgid "Cannot add target"
 msgstr "ä¸?è?½æ·»å? ç?®æ ?"
 
-#: ../plugins/project-manager/dialogs.c:1203
+#: ../plugins/project-manager/dialogs.c:1365
 msgid "No group selected"
 msgstr "æ²¡æ??é??æ?©ç»?"
 
-#: ../plugins/project-manager/dialogs.c:1354
-#: ../plugins/project-manager/dialogs.c:1365
+#: ../plugins/project-manager/dialogs.c:1524
+#: ../plugins/project-manager/dialogs.c:1535
 msgid "Cannot add modules"
 msgstr "ä¸?è?½æ·»å? æ¨¡å??"
 
-#: ../plugins/project-manager/dialogs.c:1366
+#: ../plugins/project-manager/dialogs.c:1536
 msgid "No target has been selected"
 msgstr "æ²¡æ??é??ä¸ç??ç?®æ ?"
 
 #. Missing module name
-#: ../plugins/project-manager/dialogs.c:1569
+#: ../plugins/project-manager/dialogs.c:1739
 msgid "Missing module name"
 msgstr "ç¼ºå°?æ¨¡å??å??ç§°"
 
-#: ../plugins/project-manager/dialogs.c:1631
+#: ../plugins/project-manager/dialogs.c:1801
 msgid "Cannot add packages"
 msgstr "ä¸?è?½æ·»å? å??"
 
@@ -7032,7 +6570,7 @@ msgstr "é¡¹ç?®ç±»å??ï¼?%s\n"
 msgid "Unable to find any project template in %s"
 msgstr "å?¨ %s æ?¾ä¸?å?°é¡¹ç?®æ¨¡æ?¿"
 
-#: ../plugins/project-wizard/druid.c:627
+#: ../plugins/project-wizard/druid.c:631
 #, c-format
 msgid ""
 "\n"
@@ -7041,49 +6579,52 @@ msgstr ""
 "\n"
 "â??%sâ??æ?¯å¿?å¡«ç??ã??è¯·å¡«ä¸?å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:642
+#: ../plugins/project-wizard/druid.c:646
+#, fuzzy, c-format
 msgid ""
 "Field \"%s\" must contains only letters, digits or the following characters "
-"\"#$:%+, = ^_`~\". In addition you cannot have a leading dash. Please fix it."
+"\"#$:%%+, = ^_`~\". In addition you cannot have a leading dash. Please fix "
+"it."
 msgstr ""
 "â??%sâ??å?æ®µå?ªè?½å??å?«å?æ¯?ã??æ?°å?æ??ä»¥ä¸?å?ç¬¦â??#$:%+, = ^_`~â??ã??å?¦å¤?æ?¨ä¸?è?½ç?¨ä¸?å??çº¿å¼?å¤´ã??"
 "è¯·æ?´æ£ã??"
 
-#: ../plugins/project-wizard/druid.c:647
+#: ../plugins/project-wizard/druid.c:651
+#, fuzzy, c-format
 msgid ""
 "Field \"%s\" must contains only letters, digits, the following characters \"#"
-"$:%+, = ^_`~\" or directory separators. In addition you cannot have a "
+"$:%%+, = ^_`~\" or directory separators. In addition you cannot have a "
 "leading dash. Please fix it."
 msgstr ""
 "â??%sâ??å?æ®µå?ªè?½å??å?«å?æ¯?ã??æ?°å?ã??ä»¥ä¸?å?ç¬¦â??#$:%+, = ^_`~â??æ??ç?®å½?å??é??ç¬¦ã??å?¦å¤?æ?¨ä¸?è?½ç?¨"
 "ä¸?å??çº¿å¼?å¤´ã??è¯·æ?´æ£ã??"
 
-#: ../plugins/project-wizard/druid.c:652
+#: ../plugins/project-wizard/druid.c:656
 #, c-format
 msgid "Unknown error."
 msgstr "æ?ªç?¥é??è¯¯ã??"
 
-#: ../plugins/project-wizard/druid.c:679
+#: ../plugins/project-wizard/druid.c:683
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
 "cannot be written. Do you want to continue?"
 msgstr "â??%sâ??ç?®å½?é??ç©ºã??å¦?æ??å?å?¨ä¸?è?½å??å?¥ç??æ??ä»¶ï¼?é¡¹ç?®å°?ä¼?å??å»ºå¤±è´¥ã??ä»?ç?¶è¦?ç»§ç»å??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:681
+#: ../plugins/project-wizard/druid.c:685
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "æ??ä»¶â??%sâ??å·²å?å?¨ã??æ?¯å?¦è¦?è¦?ç??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:712
+#: ../plugins/project-wizard/druid.c:716
 msgid "Invalid entry"
 msgstr "æ? æ??ç??æ?¡ç?®"
 
-#: ../plugins/project-wizard/druid.c:723
+#: ../plugins/project-wizard/druid.c:727
 msgid "Dubious entry"
 msgstr "å?«ç³?ç??æ?¡ç?®"
 
-#: ../plugins/project-wizard/druid.c:881
+#: ../plugins/project-wizard/druid.c:892
 #, c-format
 msgid ""
 "\n"
@@ -7092,7 +6633,7 @@ msgstr ""
 "\n"
 "ç¼ºå°?ç¨?åº?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:892
+#: ../plugins/project-wizard/druid.c:903
 #, c-format
 msgid ""
 "\n"
@@ -7101,7 +6642,7 @@ msgstr ""
 "\n"
 "ç¼ºå¤±è¿?äº?å??ï¼? %s."
 
-#: ../plugins/project-wizard/druid.c:901
+#: ../plugins/project-wizard/druid.c:912
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -7110,13 +6651,14 @@ msgstr ""
 "æ??å»ºè¿?ä¸ªé¡¹ç?®æ??é??ç??ä¸?äº?é??è¦?ç¨?åº?æ??å¼?å??å??ç¼ºå¤±ã??è¯·å?¨ç??æ??é¡¹ç?®ä¹?å??ç¡®è®¤å®?ä»¬æ?¯å?¦è¢«æ£"
 "ç¡®ç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:909
+#: ../plugins/project-wizard/druid.c:920
 msgid "Install missing packages"
 msgstr "å®?è£?ç¼ºå¤±ç??è½¯ä»¶å??"
 
-#: ../plugins/project-wizard/druid.c:917
+#: ../plugins/project-wizard/druid.c:928
+#, fuzzy
 msgid ""
-"The missing programs are usually part of some distrubution packages and can "
+"The missing programs are usually part of some distribution 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 \"-"
@@ -7128,11 +6670,11 @@ msgstr ""
 "å??å??ä¸?è?¬ä¼?ä»¥ -dev æ?? -devel å??ç¼?ç»?å°¾ï¼?å¹¶ä¸?å?¯ä»¥å?¨åº?ç?¨ç¨?åº?ç®¡ç??å?¨ä¸é??è¿?æ??ç´¢æ?¾"
 "å?°ã??"
 
-#: ../plugins/project-wizard/druid.c:925
+#: ../plugins/project-wizard/druid.c:936
 msgid "Missing components"
 msgstr "ç¼ºå°?ç»?ä»¶"
 
-#: ../plugins/project-wizard/druid.c:1057
+#: ../plugins/project-wizard/druid.c:1068
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "æ? æ³?æ??å»ºé¡¹ç?®å?©æ??ç?¨æ?·ç??é?¢è¯»å?? %sã??"
@@ -7181,34 +6723,29 @@ msgstr "æ? æ³?æ??å??é¡¹ç?®æ¨¡æ?¿ %sï¼?%s"
 msgid "New Project Assistant"
 msgstr "æ?°å»ºé¡¹ç?®å??å¯¼"
 
-#: ../plugins/project-wizard/property.c:338
-#: ../plugins/project-wizard/property.c:449
-msgid "No"
-msgstr "å?¦"
-
-#: ../plugins/project-wizard/property.c:349
+#: ../plugins/project-wizard/property.c:340
 msgid "Select directory"
 msgstr "é??æ?©ç?®å½?"
 
-#: ../plugins/project-wizard/property.c:357
+#: ../plugins/project-wizard/property.c:348
 msgid "Select file"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../plugins/project-wizard/property.c:407 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:398 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é??æ?©ä¸?ä¸ªå?¾å??æ??ä»¶"
 
-#: ../plugins/project-wizard/property.c:432
-#: ../plugins/project-wizard/property.c:522 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:423
+#: ../plugins/project-wizard/property.c:511 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é??æ?©å?¾æ ?"
 
-#: ../plugins/project-wizard/property.c:492
+#: ../plugins/project-wizard/property.c:481
 msgid "Choose directory"
 msgstr "é??æ?©ç?®å½?"
 
-#: ../plugins/project-wizard/property.c:496
+#: ../plugins/project-wizard/property.c:485
 msgid "Choose file"
 msgstr "é??æ?©æ??ä»¶"
 
@@ -7218,7 +6755,7 @@ msgid "A generic minimal and flat project"
 msgstr "é??ç?¨æ??å°?å??ç??é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:2
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:1
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:1
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:2
@@ -7230,7 +6767,7 @@ msgstr "æ·»å?  C++ æ?¯æ??ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:3
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:3
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:3
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:4
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:4
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:3
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:4
@@ -7242,7 +6779,7 @@ msgid "Add shared library support:"
 msgstr "æ·»å? å?±äº«åº?æ?¯æ??ï¼?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:5
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:5
@@ -7254,7 +6791,7 @@ msgstr "ä¸ºé¡¹ç?®æ·»å?  C++ æ?¯æ??ï¼?ä»¥ä¾¿å??å»º C++ æº?æ??ä»¶ã??"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:5
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:4
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:7
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:6
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:5
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:4
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:6
@@ -7265,10 +6802,29 @@ msgstr "ä¸ºé¡¹ç?®æ·»å?  C++ æ?¯æ??ï¼?ä»¥ä¾¿å??å»º C++ æº?æ??ä»¶ã??"
 msgid "Adds support for building shared libraries in your project"
 msgstr "å?¨æ?¨ç??é¡¹ç?®ä¸æ·»å? æ??å»ºå?±äº«åº?ç??æ?¯æ??"
 
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:6
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:6
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:7
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:6
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:8
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:6
+#: ../plugins/project-wizard/templates/java.wiz.in.h:7
+#: ../plugins/project-wizard/templates/js.wiz.in.h:2
+#: ../plugins/project-wizard/templates/python.wiz.in.h:7
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
+#: ../plugins/project-wizard/templates/library.wiz.in.h:6
+msgid "Author:"
+msgstr "ä½?è??ï¼?"
+
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:7
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:7
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:10
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:9
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:6
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:8
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:7
@@ -7287,7 +6843,7 @@ msgstr "å?ºæ?¬ä¿¡æ?¯"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:8
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:8
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:10
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:7
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:9
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:8
@@ -7322,7 +6878,7 @@ msgstr "é??ä¸æ?¨é¡¹ç?®æ??é??è¦?ç??å??"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:11
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:10
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:11
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:10
@@ -7339,7 +6895,7 @@ msgstr "é??ç½®å¤?é?¨å??"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
@@ -7356,7 +6912,7 @@ msgstr "é??ç½®å¤?é?¨å??ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:17
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:13
@@ -7376,7 +6932,7 @@ msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
 #: ../plugins/project-wizard/templates/django.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:16
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
@@ -7399,7 +6955,7 @@ msgstr "é??ç?¨ (Minimal)"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:21
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:20
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:26
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:19
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:17
@@ -7418,7 +6974,7 @@ msgstr "è®¸å?¯"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:19
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:19
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:22
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:28
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:20
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:18
@@ -7437,7 +6993,7 @@ msgstr "æ? è®¸å?¯"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:20
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:20
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:20
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:23
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:22
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:29
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:21
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:19
@@ -7457,7 +7013,7 @@ msgstr "é¡¹ç?®æ??å»ºç³»ç»?é??é¡¹"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:21
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:21
 #: ../plugins/project-wizard/templates/django.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:24
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:23
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:37
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:22
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:20
@@ -7476,7 +7032,7 @@ msgstr "é¡¹ç?®å??ç§°ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:22
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:22
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:22
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:24
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:39
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:23
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:21
@@ -7512,7 +7068,7 @@ msgstr "é??è¦?ç??å??ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:24
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:41
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:25
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:23
@@ -7531,9 +7087,9 @@ msgstr "é??æ?©ä»£ç ?è®¸å?¯"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:25
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:25
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:25
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:43
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:24
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:26
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:26
@@ -7549,8 +7105,8 @@ msgstr "ä½¿ç?¨ pkg-config ä»¥ä»?å?¶å®?è½¯ä»¶å??ä¸æ·»å? åº?æ?¯æ??"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:27
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:27
 #: ../plugins/project-wizard/templates/django.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:31
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:33
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:31
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:27
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:29
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:29
@@ -7570,7 +7126,7 @@ msgstr "é??ç?¨é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:2
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:3
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:3
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:3
@@ -7586,7 +7142,7 @@ msgstr "æ·»å? å?½é??å??ï¼?"
 
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:5
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:7
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:6
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:7
@@ -7626,22 +7182,18 @@ msgstr "Django é¡¹ç?®ä¿¡æ?¯ "
 msgid "Python webproject using Django Web Framework"
 msgstr "ä½¿ç?¨ Django Web Framework ç?? Python Web é¡¹ç?® "
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:1
-msgid "A generic GTK+ project"
-msgstr "é??ç?¨ GTK+ é¡¹ç?®"
-
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:2
 #: ../plugins/project-wizard/templates/java.wiz.in.h:2
 #: ../plugins/project-wizard/templates/python.wiz.in.h:2
 msgid "Add gtk-doc system:"
 msgstr "æ·»å?  gtk-doc ç³»ç»?ï¼?"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:16
-msgid "GTK+"
-msgstr "GTK+"
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+msgid "GTK+ (simple)"
+msgstr "GTK+ (ç®?å??)"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
 msgid ""
 "Give a package name that your project require. You may also mention what is "
 "the required version of the package. For example, 'libgnomeui-2.0' or "
@@ -7650,12 +7202,28 @@ msgstr ""
 "ç»?å?ºæ?¨ç??é¡¹ç?®æ??é??è¦?ç??å??å??ã??æ?¨è¿?å?¯ä»¥æ??å?ºå??ç??ç??æ?¬ã??ä¾?å¦?ï¼? â??libgnomeui-"
 "2.0â??æ??â??libgnomeui-2.0 >= 2.2.0â??"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
 msgid "Require Package:"
 msgstr "é??è¦?å??ï¼?"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+msgid "Simple GTK+ project"
+msgstr "ç®?å?? GTK+ é¡¹ç?®"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+msgid "Use GtkBuilder for user interface:"
+msgstr "ä½¿ç?¨ GtkBuilder å?¶ä½?ç?¨æ?·ç??é?¢ï¼?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:27
+msgid ""
+"Use GtkBuilder to create the user-interface in a graphical way and load it "
+"from xml files at runtime"
+msgstr "ä½¿ç?¨ GtkBuilder ä»¥è§?å?¾æ?¹å¼?å??å»ºç?¨æ?·ç??é?¢å??å?¨è¿?è¡?æ?¶å? è½½ xml æ??ä»¶"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:32
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:30
 #: ../plugins/project-wizard/templates/java.wiz.in.h:30
 #: ../plugins/project-wizard/templates/python.wiz.in.h:28
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
@@ -7768,12 +7336,12 @@ msgid "Whether the plugin has menus or toolbars"
 msgstr "æ??ä»¶æ?¯å?¦æ??è??å??æ??å·¥å?·æ ?"
 
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:1
-msgid "A generic GTKmm (C++) project"
-msgstr "é??ç?¨ GTKmm (C++) é¡¹ç?®"
+msgid "A minimal GTKmm project"
+msgstr "æ??å°?é??ç½®ç?? GTKmm é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
-msgid "GTKmm"
-msgstr "GTKmm"
+msgid "GTKmm (Simple)"
+msgstr "Gtkmm (ç®?å??)"
 
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:1
 msgid "A generic wx Widgets project"
@@ -7983,11 +7551,11 @@ msgstr "å·¥ä½?ç?®å½?ï¼?"
 msgid "Program directory '%s' is not local"
 msgstr "ç¨?åº?ç?®å½?â??%sâ??æ??ä»¶ä¸?æ?¯æ?¬å?°è·¯å¾?"
 
-#: ../plugins/run-program/parameters.c:300
+#: ../plugins/run-program/parameters.c:303
 msgid "Load Target to run"
 msgstr "å? è½½è°?è¯?ç?®æ ?"
 
-#: ../plugins/run-program/parameters.c:617
+#: ../plugins/run-program/parameters.c:620
 #, c-format
 msgid "Missing file %s"
 msgstr "ç¼ºå°?æ??ä»¶ %s"
@@ -8432,10 +8000,6 @@ msgstr "<b>é??è¯¯ï¼?</b>ä»£ç ?ç??æ®µå¿?é¡»å½?å±?äº?ç»?ä¸ï¼?"
 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"
-msgstr "æ·»å? "
-
 #: ../plugins/snippets-manager/snippets-editor.ui.h:4
 msgid "Close"
 msgstr "å?³é?"
@@ -8525,7 +8089,7 @@ msgstr "å¯¼å?¥ç??æ®µ"
 msgid "Export Snippets"
 msgstr "å¯¼å?ºç??æ®µ"
 
-#: ../plugins/sourceview/sourceview.c:481
+#: ../plugins/sourceview/sourceview.c:480
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8534,7 +8098,7 @@ msgstr ""
 "å?¨ç£?ç??å??æ??ä»¶â??%sâ??ç??å??å®¹æ¯?å½?å??ç??æ??ä»¶å??å®¹è¿?è¦?æ?°ã??\n"
 "æ?¯å?¦é??è¦?é??æ?°å? è½½è¿?ä¸ªæ??ä»¶ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:518
+#: ../plugins/sourceview/sourceview.c:517
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8544,18 +8108,18 @@ msgstr ""
 "è¦?å?³é?å®?å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:555
+#: ../plugins/sourceview/sourceview.c:554
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "æ? æ³?æ??å¼? %sï¼? %s"
 
-#: ../plugins/sourceview/sourceview.c:609
+#: ../plugins/sourceview/sourceview.c:608
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æ??ä»¶â??%sâ??æ?¯å?ªè¯»ç??ï¼?ä»?ç?¶è¦?ç¼?è¾?å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:668
+#: ../plugins/sourceview/sourceview.c:667
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "æ? æ³?ä¿?å? %sï¼?%s"
@@ -8659,7 +8223,7 @@ msgid "Use theme font"
 msgstr "ä½¿ç?¨ä¸»é¢?å?ä½?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
-#: ../src/anjuta-app.c:631 ../src/anjuta-app.c:636
+#: ../src/anjuta-app.c:633 ../src/anjuta-app.c:638
 msgid "View"
 msgstr "æ?¥ç??"
 
@@ -8700,6 +8264,10 @@ msgstr "æ·»å? æ??ä»¶/ç?®å½?"
 msgid "Branch/Tag URL:"
 msgstr "å??æ?¯/æ ?ç¾ URLï¼?"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:7
+msgid "Commit Changes"
+msgstr "æ??äº¤æ?´æ?¹"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:8
 msgid "Copy files/folders"
 msgstr "å¤?å?¶æ??ä»¶/æ??ä»¶å¤¹"
@@ -8776,6 +8344,10 @@ msgstr "ä»?åº?é¡¶ç«¯"
 msgid "Repository authorization"
 msgstr "ä»?åº?æ??æ??"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:35
+msgid "Retrieving statusâ?¦"
+msgstr "æ£å?¨è?·å??ç?¶æ??..."
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
 msgid "Retrieving statusâ?¦â?¦"
 msgstr "æ£å?¨è?·å??ç?¶æ??..."
@@ -8796,6 +8368,18 @@ msgstr "ç¬¬äº?ä¸ªè·¯å¾?ï¼?"
 msgid "Select Changes to Revert:"
 msgstr "é??æ?©è¦?è¿?å??ç??æ?´æ?¹ï¼?"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
+msgid "Select Files to Commit:"
+msgstr "é??æ?©è¦?æ??äº¤ç??æ??ä»¶ï¼?"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
+msgid "Select Files to Mark as Resolved:"
+msgstr "é??æ?©è¦?æ ?è®°ä¸ºå·²è§£å?³ç??æ??ä»¶ï¼?"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
+msgid "Set Conflicts as Resolved"
+msgstr "å°?å?²çª?è®¾ç½®ä¸ºå·²è§£å?³"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "æ?¥æº?/ç?®æ ?ç??è·¯å¾?ï¼?"
@@ -8866,18 +8450,36 @@ msgstr "å??"
 msgid "_Subversion"
 msgstr "_Subversion"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:60 ../plugins/subversion/plugin.c:175
+msgid "_Addâ?¦"
+msgstr "æ·»å? (_A)..."
+
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:62 ../plugins/subversion/plugin.c:177
 msgid "Add a new file/directory to the Subversion tree"
 msgstr "å?? Subversion æº?ç ?æ ?ä¸æ·»å? æ?°ç??æ??ä»¶/ç?®å½?"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+msgid "_Removeâ?¦"
+msgstr "å? é?¤(_R)..."
+
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:70 ../plugins/subversion/plugin.c:185
 msgid "Remove a file/directory from Subversion tree"
 msgstr "ä»? Subversion æº?ç ?æ ?ä¸å? é?¤æ??ä»¶/ç?®å½?"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:76
+msgid "_Commitâ?¦"
+msgstr "æ??äº¤(_C)..."
+
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:78
@@ -9008,6 +8610,13 @@ msgstr "Subversion æ?¥å¿?"
 msgid "Subversion: File will be added on next commit."
 msgstr "Subversionï¼?æ??ä»¶å°?ä¼?å?¨ä¸?æ¬¡æ??äº¤æ?¶è¢«æ·»å? ã??"
 
+#: ../plugins/subversion/subversion-add-dialog.c:65
+#: ../plugins/subversion/subversion-diff-dialog.c:116
+#: ../plugins/subversion/subversion-remove-dialog.c:98
+#: ../plugins/subversion/subversion-update-dialog.c:68
+msgid "Please enter a path."
+msgstr "è¯·è¾?å?¥è·¯å¾?ã??"
+
 #: ../plugins/subversion/subversion-commit-dialog.c:39
 msgid "Subversion: Commit complete."
 msgstr "Subversionï¼?æ??äº¤å®?æ??ã??"
@@ -9042,6 +8651,14 @@ msgstr "Subversionï¼?æ£å?¨è?·å??å·®å¼?..."
 msgid "Diff"
 msgstr "æ¯?è¾?"
 
+#: ../plugins/subversion/subversion-log-dialog.c:132
+msgid "Author"
+msgstr "ä½?è??"
+
+#: ../plugins/subversion/subversion-log-dialog.c:141
+msgid "Date"
+msgstr "æ?¥æ??"
+
 #: ../plugins/subversion/subversion-log-dialog.c:151
 msgid "Revision"
 msgstr "ç??æ?¬"
@@ -9202,120 +8819,91 @@ msgstr "ç¼ºå°?ï¼?%s"
 msgid "Obstructed: %s"
 msgstr "é?»å¡?ï¼? %s"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag De_claration"
 msgstr "æ ?ç¾å£°æ??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:319
+#: ../plugins/symbol-db/plugin.c:328
 msgid "Go to symbol declaration"
 msgstr "è½¬å?°ç¬¦å?·å£°æ??"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:335
 msgid "Tag _Implementation"
 msgstr "æ ?ç¾å®?ä¹?(_I)"
 
-#: ../plugins/symbol-db/plugin.c:328
+#: ../plugins/symbol-db/plugin.c:337
 msgid "Go to symbol definition"
 msgstr "è½¬å?°ç¬¦å?·å®?ä¹?"
 
-#: ../plugins/symbol-db/plugin.c:335
+#: ../plugins/symbol-db/plugin.c:344
 msgid "_Find Symbolâ?¦"
 msgstr "æ?¥æ?¾ç¬¦å?·(_F)..."
 
-#: ../plugins/symbol-db/plugin.c:336
+#: ../plugins/symbol-db/plugin.c:345
 msgid "Find Symbol"
 msgstr "æ?¥æ?¾ç¬¦å?·"
 
-#: ../plugins/symbol-db/plugin.c:1013
+#: ../plugins/symbol-db/plugin.c:1010
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ£å?¨ç??æ??ç»§æ?¿..."
 
-#: ../plugins/symbol-db/plugin.c:1018
+#: ../plugins/symbol-db/plugin.c:1015
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?è?ª %3$d ä¸ªæ??ä»¶ä¸æ?«æ??äº? %2$d ä¸ª"
 
-#: ../plugins/symbol-db/plugin.c:1049
+#: ../plugins/symbol-db/plugin.c:1046
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "æ£å?¨ç??æ??ç»§æ?¿..."
 
-#: ../plugins/symbol-db/plugin.c:1051
+#: ../plugins/symbol-db/plugin.c:1048
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "è?ª %2$d ä¸ªæ??ä»¶ä¸æ?«æ??äº? %1$d ä¸ª"
 
-#: ../plugins/symbol-db/plugin.c:1786
+#: ../plugins/symbol-db/plugin.c:1798
 msgid "Populating symbol databaseâ?¦"
 msgstr "æ£å?¨å¡«å??ç¬¦å?·åº?..."
 
-#: ../plugins/symbol-db/plugin.c:2106 ../plugins/symbol-db/plugin.c:2191
+#: ../plugins/symbol-db/plugin.c:2119 ../plugins/symbol-db/plugin.c:2204
 msgid "Symbols"
 msgstr "ç¬¦å?·"
 
-#: ../plugins/symbol-db/plugin.c:2200
+#: ../plugins/symbol-db/plugin.c:2213
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å¼¹å?ºå?¨ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2208
+#: ../plugins/symbol-db/plugin.c:2221
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb è??å??å?¨ä½?"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:275
-msgid "Package is not parseable"
-msgstr "å??ä¸?å?¯è§£æ??"
-
-#: ../plugins/symbol-db/symbol-db-prefs.c:375
-#: ../plugins/symbol-db/symbol-db-prefs.c:522
+#: ../plugins/symbol-db/plugin.c:2529 ../plugins/symbol-db/plugin.c:2547
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "ç¬¦å?·åº?"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:472
-msgid "API Tags"
-msgstr "API æ ?ç¾"
-
-#: ../plugins/symbol-db/symbol-db-system.c:817
+#: ../plugins/symbol-db/symbol-db-system.c:808
 msgid "Resuming glb scan."
 msgstr "ç»§ç» glb æ?«æ??ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "Automatically scan project's packages"
-msgstr "è?ªå?¨æ?«æ??é¡¹ç?®ç??å??"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
 msgid "Automatically update symbols without saving file"
 msgstr "ä¸?å¿?ä¿?å?æ??ä»¶å°±è?ªå?¨æ?´æ?°ç¬¦å?·"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
 msgid ""
 "Automatically update the file's symbols without saving. The update occurs "
 "after 10 seconds without keypresses by the user."
 msgstr "æ? é??ä¿?å?è??è?ªå?¨æ?´æ?°æ??ä»¶ç¬¦å?·ã??ç?¨æ?·å??æ¢æ??é?®10ç§?é??å??æ?´æ?°å¼?å§?ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Available API tags"
-msgstr "å?¯ç?¨ç?? API æ ?ç¾"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseableâ?¦"
-msgstr "æ£å?¨æ£?æ?¥å??æ?¯å?¦å?¯ä»¥è§£æ??..."
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "å¹¶è¡?æ?«æ??é¡¹ç?®å??å?¨å±?ç¬¦å?·"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-msgid ""
-"This option enables the default packages required by your opened project, e."
-"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
-msgstr ""
-"è¿?ä¸ªé??é¡¹å?¯ç?¨äº?ä½ æ??å¼?é¡¹ç?®æ??é??è¦?ç??é»?è®¤ç??è½¯ä»¶å??ï¼?ä¾?å¦?ï¼?ä½ å??å»ºäº? GTK+ é¡¹ç?®ï¼?å°±é??"
-"è¦? Glib å?? GTK+ã??(å?¯è?½é??è¦?æ?´å¤?ç??å¤?ç??å?¨æ?¶é?´)"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
 msgid ""
 "This option means that the global system packages will be scanned "
 "simultaneously with the project's ones"
@@ -9695,7 +9283,7 @@ msgstr "å?ç¬¦ä¸²"
 msgid "Copyright (c) Naba Kumar"
 msgstr "ç??æ??æ??æ?? Â© Naba Kumar"
 
-#: ../src/anjuta.c:432
+#: ../src/anjuta.c:454
 msgid "Loaded Sessionâ?¦"
 msgstr "å·²å? è½½ä¼?è¯?..."
 
@@ -9831,58 +9419,62 @@ msgstr "å?³äº?å¤?é?¨æ??ä»¶(_P)"
 msgid "About third-party Anjuta plugins"
 msgstr "å?³äº? Anjuta ç¬¬ä¸?æ?¹æ??ä»¶"
 
-#: ../src/anjuta-app.c:627
+#: ../src/anjuta-app.c:629
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../src/anjuta-app.c:931
+#: ../src/anjuta-app.c:642
+msgid "Help"
+msgstr "å¸®å?©"
+
+#: ../src/anjuta-app.c:938
 msgid "Installed plugins"
 msgstr "å·²å®?è£?ç??æ??ä»¶"
 
-#: ../src/anjuta-app.c:935
+#: ../src/anjuta-app.c:942
 msgid "Shortcuts"
 msgstr "å¿«æ?·æ?¹å¼?"
 
-#: ../src/anjuta-app.c:1007
+#: ../src/anjuta-app.c:1014
 #, c-format
 msgid "Value doesn't exist"
 msgstr "å?¼ä¸?å?å?¨"
 
-#: ../src/main.c:70
+#: ../src/main.c:67
 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:73
+#: ../src/main.c:70
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "å®½åº¦xé«?åº¦+æ¨ªå??ç§»+çºµå??ç§»"
 
-#: ../src/main.c:78
+#: ../src/main.c:75
 msgid "Do not show the splash screen"
 msgstr "ä¸?æ?¾ç¤ºå?¯å?¨å±?å¹?"
 
-#: ../src/main.c:84
+#: ../src/main.c:81
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "å?¯å?¨ä¸?ä¸ªæ?°ç??å®?ä¾?ï¼?ä¸?æ??å¼?ç?°æ??å®?ä¾?ä¸æ??æ??å¼?ç??æ??ä»¶"
 
-#: ../src/main.c:90
+#: ../src/main.c:87
 msgid "Do not open last session on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ??å¼?ä¸?ä¸?æ¬¡ä¼?è¯?"
 
-#: ../src/main.c:96
+#: ../src/main.c:93
 msgid "Do not open last project and files on startup"
 msgstr "å?¯å?¨æ?¶ä¸?å??æ??å¼?ä¸?æ¬¡ç??é¡¹ç?®å??æ??ä»¶"
 
-#: ../src/main.c:102
+#: ../src/main.c:99
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "æ£å¸¸å?³é? Anjuta å¹¶é??æ?¾æ??æ??èµ?æº?(ä½?ä¸ºè°?è¯?)"
 
-#: ../src/main.c:170
+#: ../src/main.c:138
 msgid "- Integrated Development Environment"
 msgstr "- é??æ??å¼?å??ç?¯å¢?"
 
-#: ../src/main.c:245
+#: ../src/main.c:181
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -9949,114 +9541,131 @@ msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??æ²¡æ??ä½¿ç?¨è°?è¯?é??é¡¹å°±ä¸?æ?¾ç¤ºè¦å??ä¿¡æ?¯"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
+msgid "API Tags (C/C++)"
+msgstr "API æ ?ç¾(C/C++)"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?½æ?°è°?ç?¨è?ªå?¨è¡¥å?¨å??æ·»å? â??(â??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:2
 msgid "Add a space after function call autocompletion"
 msgstr "å?½æ?°è°?ç?¨è?ªå?¨è¡¥å?¨å??æ·»å? ç©ºæ ¼"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
 msgid "Auto-complete"
 msgstr "è?ªå?¨è¡¥å?¨"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:4
 msgid "Autocompletion"
 msgstr "è?ªå?¨è¡¥å?¨"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+#, fuzzy
+msgid "Automatically load required libraries of the project"
+msgstr "è?ªå?¨æ·»å? èµ?æº?"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:5
 msgid "Brace indentation size in spaces:"
 msgstr "å¤§æ?¬å?·ç¼©è¿?ç??ç©ºç?½é?¿åº¦ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:6
 msgid "Calltips"
 msgstr "è°?ç?¨æ??ç¤º"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:8
 msgid "Enable code completion"
 msgstr "å?¯ç?¨ä»£ç ?è¡¥å?¨"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart brace completion"
 msgstr "å?¯ç?¨æ?ºè?½å¤§æ?¬å?·è¡¥å?¨"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:9
 msgid "Enable smart indentation"
 msgstr "å?¯ç?¨æ?ºè?½ç¼©è¿?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Indent:"
 msgstr "ç¼©è¿?ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:11
 msgid "Indentation parameters"
 msgstr "ç¼©è¿?å??æ?°"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 msgid "Leading asterisk in multi-line comment"
 msgstr "å¤?è¡?æ³¨é??ç?¨æ??å?·å¼?å¤´"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Line up parentheses"
 msgstr "å¯¹é½?æ?¬å?·"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Parenthesis indentation"
 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
 msgid "Prefer vim/emacs modelines over indentation settings"
 msgstr "ä¼?å??ä½¿ç?¨ vim/emacs æ?¹å¼?è¡?ç¼©è¿?ä»£æ?¿ç¼©è¿?è®¾ç½®"
 
-#: ../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: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:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
 #: ../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:18
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:20
 #: ../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:1920
+#: ../plugins/language-support-cpp-java/plugin.c:967
 #: ../plugins/language-support-python/plugin.c:1185
 msgid "Auto-Indent"
 msgstr "è?ªå?¨ç¼©è¿?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
+#: ../plugins/language-support-cpp-java/plugin.c:968
 #: ../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:1926
+#: ../plugins/language-support-cpp-java/plugin.c:974
+msgid "Comment/Uncomment"
+msgstr "æ·»å? /å? é?¤æ³¨é??"
+
+#: ../plugins/language-support-cpp-java/plugin.c:975
+msgid "Comment or uncomment current selection"
+msgstr "è®¾ç½®æ??å??æ¶?æ³¨é??å½?å??æ??é??ä¸ç??ä»£ç ?"
+
+#: ../plugins/language-support-cpp-java/plugin.c:980
 msgid "Swap .h/.c"
 msgstr "å??æ?¢ .h /.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1927
+#: ../plugins/language-support-cpp-java/plugin.c:981
 msgid "Swap C header and source files"
 msgstr "å??æ?¢ C å¤´æ??ä»¶å??æº?æ??ä»¶"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1967
+#: ../plugins/language-support-cpp-java/plugin.c:1021
 msgid "C++/Java Assistance"
 msgstr "C++/Java è¾?å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2085
-#: ../plugins/language-support-cpp-java/plugin.c:2098
+#: ../plugins/language-support-cpp-java/plugin.c:1196
+#: ../plugins/language-support-cpp-java/plugin.c:1226
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -10117,12 +9726,12 @@ msgid "GtkSourceView Editor"
 msgstr "GtkSourceView ç¼?è¾?å?¨"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "GNU Debugger Plugin"
-msgstr "GNU è°?è¯?å?¨(GDB)æ??ä»¶"
+msgid "GNU Debugger"
+msgstr "GDB è°?è¯?å?¨"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "GNU è°?è¯?å?¨(GDB)æ??ä»¶"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -10176,14 +9785,6 @@ msgstr "Anjuta ç?? Glade æ??ä»¶ã??"
 msgid "Glade interface designer"
 msgstr "Glade ç??é?¢è®¾è®¡å?¨"
 
-#: ../plugins/gtodo/anjuta-gtodo.plugin.in.h:1
-msgid "Task Manager"
-msgstr "ä»»å?¡ç®¡ç??å?¨"
-
-#: ../plugins/gtodo/anjuta-gtodo.plugin.in.h:2
-msgid "Todo Plugin for Anjuta."
-msgstr "Anjuta ç?? Todo æ??ä»¶ã??"
-
 #: ../plugins/patch/anjuta-patch.plugin.in.h:1
 msgid "Patch Plugin"
 msgstr "è¡¥ä¸?æ??ä»¶"
@@ -10265,8 +9866,8 @@ msgid "Anjuta Class Generator Plugin"
 msgstr "Anjuta ç±»ç??æ??å?¨æ??ä»¶"
 
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:2
-msgid "C++/GObject Class"
-msgstr "C++/GObject ç±»"
+msgid "Class"
+msgstr "ç±»"
 
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
@@ -10335,8 +9936,8 @@ msgid "Error: cant bind port"
 msgstr "é??è¯¯ï¼?æ? æ³?ç»?å®?ç«¯å?£"
 
 #: ../plugins/js-debugger/js_debugger.plugin.in.h:1
-msgid "Anjuta JS Debugger Plugin"
-msgstr "Anjuta JS è°?è¯?å?¨æ??ä»¶"
+msgid "Javascript Debugger"
+msgstr "JavaScript è°?è¯?å?¨"
 
 #: ../plugins/js-debugger/js_debugger.plugin.in.h:2
 msgid "Javascript Debugger Plugin"
@@ -10387,6 +9988,817 @@ msgstr "ä»£ç ?è¡¥å?¨ç??æ??å°?å?ç¬¦"
 msgid "Symbol"
 msgstr "ç¬¦å?·"
 
+#~ msgid "Help display"
+#~ msgstr "å¸®å?©æ?¾ç¤º"
+
+#~ msgid "_Add Bookmark"
+#~ msgstr "æ·»å? ä¹¦ç¾(_A)"
+
+#~ msgid "Install directories:"
+#~ msgstr "å®?è£?ç?®å½?ï¼?"
+
+#~ msgid "Add Remote Branch"
+#~ msgstr "æ·»å? è¿?ç¨?å??æ?¯"
+
+#~ msgid "Apply Stash"
+#~ msgstr "åº?ç?¨äº?ä¸´æ?¶å?å?¨"
+
+#~ msgid "Author/Grep"
+#~ msgstr "ä½?è??/æ?¥æ?¾"
+
+#~ msgid "Bad revision:"
+#~ msgstr "å??ç??ç??æ?¬ï¼?"
+
+#~ msgid "Branch name:"
+#~ msgstr "å??æ?¯å??ç§°ï¼?"
+
+#~ msgid "Branch to switch to:"
+#~ msgstr "å??æ?¢å?°å??æ?¯ï¼?"
+
+#~ msgid "Branches to delete:"
+#~ msgstr "è¦?å? é?¤ç??å??æ?¯ï¼?"
+
+#~ msgid "Check out all local changes"
+#~ msgstr "ç¾å?ºæ??æ??æ?¬å?°æ?¹å??"
+
+#~ msgid "Create Branch"
+#~ msgstr "å??å»ºå??æ?¯"
+
+#~ msgid "Delete Branch"
+#~ msgstr "å? é?¤å??æ?¯"
+
+#~ msgid "Delete Remote Branch"
+#~ msgstr "å? é?¤è¿?ç¨?å??æ?¯"
+
+#~ msgid "Delete Tags"
+#~ msgstr "å? é?¤æ ?ç¾"
+
+#~ msgid "Filters"
+#~ msgstr "æ??ä»¶"
+
+#~ msgid "From:"
+#~ msgstr "ä»?ï¼?"
+
+#~ msgid "Good revision:"
+#~ msgstr "å¥½ç??ç??æ?¬ï¼?"
+
+#~ msgid "Grep:"
+#~ msgstr "æ?¥æ?¾ï¼?"
+
+#~ msgid "Head"
+#~ msgstr "é¡¶ç«¯"
+
+#~ msgid "Ignore Files"
+#~ msgstr "å¿½ç?¥æ??ä»¶"
+
+#~ msgid "Mailbox file containing patches:"
+#~ msgstr "é?®ç®±æ??ä»¶å??å?«è¡¥ä¸?ï¼?"
+
+#~ msgid "Mode:"
+#~ msgstr "æ¨¡å¼?ï¼?"
+
+#~ msgid "Previous commit"
+#~ msgstr "ä¸?ä¸?ä¸ªæ??äº¤"
+
+#~ msgid "Remote branch to rebase from:"
+#~ msgstr "é??å®?ä½?è?ªè¿?ç¨?å??æ?¯ï¼?"
+
+#~ msgid "Remote to delete:"
+#~ msgstr "è¦?å? é?¤ç??è¿?ç¨?ï¼?"
+
+#~ msgid "Repository origin"
+#~ msgstr "ä»?åº?æ?¥æº?"
+
+#~ msgid "Reset to:"
+#~ msgstr "é??ç½®ä¸ºï¼?"
+
+#~ msgid "Restore index"
+#~ msgstr "æ?¢å¤?ç´¢å¼?"
+
+#~ msgid "Revert Commit"
+#~ msgstr "è¿?å??æ??äº¤"
+
+#~ msgid "Revision/Tag:"
+#~ msgstr "ç??æ?¬/æ ?ç¾ï¼?"
+
+#~ msgid "Select Files to Check Out:"
+#~ msgstr "é??æ?©è¦?ç¾å?ºç??æ??ä»¶ï¼?"
+
+#~ msgid "Select Files to Ignore:"
+#~ msgstr "é??æ?©è¦?å¿½ç?¥ç??æ??ä»¶ï¼?"
+
+#~ msgid "Select Files to Unstage:"
+#~ msgstr "é??æ?©è¦?å??æ¶?ç¼?å?ç??æ??ä»¶ï¼?"
+
+#~ msgid "Select Mailbox File"
+#~ msgstr "é??æ?©é?®ç®±æ??ä»¶"
+
+#~ msgid "Select a Folder"
+#~ msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹"
+
+#~ msgid "Select file to add:"
+#~ msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶ï¼?"
+
+#~ msgid "Select file to remove:"
+#~ msgstr "é??æ?©è¦?å? é?¤ç??æ??ä»¶ï¼?"
+
+#~ msgid "Show the contents of the selected stash in an editor"
+#~ msgstr "å?¨ç¼?è¾?å?¨ä¸æ?¾ç¤ºé??ä¸ç??ä¸´æ?¶å?å?¨ç??å??å®¹"
+
+#~ msgid "Stash the working tree's uncommitted changes"
+#~ msgstr "ä¸´æ?¶å?å?¨å·¥ä½?æº?ç ?æ ?ä¸ç??æ?ªæ??äº¤å?å?¨"
+
+#~ msgid "Switch to Another Branch"
+#~ msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
+
+#~ msgid "Tag name:"
+#~ msgstr "æ ?ç¾å??ç§°ï¼?"
+
+#~ msgid "Tag/Commit"
+#~ msgstr "æ ?ç¾/æ??äº¤"
+
+#~ msgid "Tags to delete:"
+#~ msgstr "è¦?å? é?¤ç??æ ?ç¾ï¼?"
+
+#~ msgid "To:"
+#~ msgstr "å?°ï¼?"
+
+#~ msgid "View log"
+#~ msgstr "æ?¥ç??æ?¥å¿?"
+
+#~ msgid "page 3"
+#~ msgstr "ç¬¬ 3 é¡µ"
+
+#~ msgid "Git: File staged for add."
+#~ msgstr "Gitï¼?æ??ä»¶å·²è¢«ç¼?å?ç?¨ä»¥æ·»å? ã??"
+
+#~ msgid "Please select a file."
+#~ msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶ã??"
+
+#~ msgid "Git: Added remote branch \"%s\"."
+#~ msgstr "Gitï¼?æ·»å? äº?è¿?ç¨?å??æ?¯â??%sâ??ã??"
+
+#~ msgid "Git: Fetchingâ?¦"
+#~ msgstr "Gitï¼?æ£å?¨è?·å??..."
+
+#~ msgid "Please select a mailbox file."
+#~ msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶ã??"
+
+#~ msgid "Git: File retrieved."
+#~ msgstr "Gitï¼?æ??ä»¶å·²å??å??ã??"
+
+#~ msgid "Git: Files checked out."
+#~ msgstr "Git: æ??ä»¶å·²ç¾å?ºã??"
+
+#~ msgid "Git: Commit complete."
+#~ msgstr "Gitï¼?æ??äº¤å®?æ??ã??"
+
+#~ msgid "Git: Created branch \"%s\"."
+#~ msgstr "Gitï¼?å·²å??å»ºå??æ?¯â??%sâ??ã??"
+
+#~ msgid "Git: Created tag \"%s\"."
+#~ msgstr "Gitï¼?å·²å??å»ºæ ?ç¾â??%sâ??ã??"
+
+#~ msgid "Please select branches to delete"
+#~ msgstr "è¯·é??æ?©è¦?å? é?¤ç??å??æ?¯"
+
+#~ msgid "Uncommitted Changes.diff"
+#~ msgstr "æ?ªæ??äº¤ç?? Changes.diff"
+
+#~ msgid "Commit %s.diff"
+#~ msgstr "æ??äº¤ %s.diff"
+
+#~ msgid "Git: Fetch complete."
+#~ msgstr "Gitï¼?è?·å??å®?æ??ã??"
+
+#~ msgid "Graph"
+#~ msgstr "å?¾è¡¨"
+
+#~ msgid "Short log"
+#~ msgstr "ç²¾ç®?æ?¥å¿?"
+
+#~ msgid "Git: Retrieving logâ?¦"
+#~ msgstr "Gitï¼?æ£å?¨å??å??æ?¥å¿?..."
+
+#~ msgid "Select a file"
+#~ msgstr "é??æ?©æ??ä»¶"
+
+#~ msgid "Git: Merge complete."
+#~ msgstr "Gitï¼?å??å¹¶å®?æ??ã??"
+
+#~ msgid "Git: Pull complete."
+#~ msgstr "Gitï¼?è?·å??ä¸?å??å¹¶å®?æ??ã??"
+
+#~ msgid "Please select a remote to pull from."
+#~ msgstr "è¯·é??æ?©ä¸?ä¸ªç?¨äº?è?·å??ä¸?å??å¹¶ç??è¿?ç¨?ã??"
+
+#~ msgid "Please enter the URL of the repository to pull from."
+#~ msgstr "è¯·è¾?å?¥è¦?è?·å??ä¸?å??å¹¶ç??ä»?åº?ç?? URLã??"
+
+#~ msgid "Git: Push complete."
+#~ msgstr "Gitï¼?æ?¨é??å®?æ??ã??"
+
+#~ msgid "Please select a remote to push to."
+#~ msgstr "è¯·é??æ?©ä¸?ä¸ªç?¨äº?æ?¨é??ç??è¿?ç¨?ã??"
+
+#~ msgid "Please enter the URL of the repository to push to."
+#~ msgstr "è¯·è¾?å?¥è¦?æ?¨é??ç??ä»?åº?ç?? URLã??"
+
+#~ msgid "Git: Pushingâ?¦"
+#~ msgstr "Gitï¼?æ£å?¨æ?¨é??..."
+
+#~ msgid "Git: Rebasing"
+#~ msgstr "Gitï¼?æ£å?¨é??å®?ä½?"
+
+#~ msgid "Git: File removed."
+#~ msgstr "Gitï¼?æ??ä»¶å·²å? é?¤ã??"
+
+#~ msgid "Git: Resolve complete."
+#~ msgstr "Gitï¼?è§£å?³å®?æ??ã??"
+
+#~ msgid "Git: Stash dropped."
+#~ msgstr "Gitï¼?å·²ä¸¢å¼?ä¸´æ?¶å?å?¨ã??"
+
+#~ msgid "Git: All stashes cleared."
+#~ msgstr "Gitï¼?æ¸?é?¤äº?æ??æ??ç??ä¸´æ?¶å?å?¨ã??"
+
+#~ msgid "Git: Branch checkout complete."
+#~ msgstr "Gitï¼?å??æ?¯ç¾å?ºå®?æ??ã??"
+
+#~ msgid "There are no branches available."
+#~ msgstr "æ²¡æ??å?¯ç?¨å??æ?¯ã??"
+
+#~ msgid "Please select a stash"
+#~ msgstr "è¯·é??æ?©ä¸?ä¸ªä¸´æ?¶å?å?¨"
+
+#~ msgid "Git: Changes stored in a stash."
+#~ msgstr "Gitï¼?æ?´æ?¹ä¿?å?å?°äº?ä¸´æ?¶å?å?¨ã??"
+
+#~ msgid "Git: Stashed changes applied."
+#~ msgstr "Gitï¼?å·²åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹ã??"
+
+#~ msgid "Git: Diff complete."
+#~ msgstr "Gitï¼?Diff å®?æ??ã??"
+
+#~ msgid "Git: Files unstaged."
+#~ msgstr "Git: æ??ä»¶å·²å??æ¶?ç¼?å?ã??"
+
+#~ msgid "_Git"
+#~ msgstr "_Git"
+
+#~ msgid "_Changes"
+#~ msgstr "æ?´æ?¹(_C)"
+
+#~ msgid "Commit changes to the local repository"
+#~ msgstr "Subversionï¼?æ£å?¨å??ä»?åº?æ??äº¤æ?´æ?¹..."
+
+#~ msgid "_Stash"
+#~ msgstr "ä¸´æ?¶å?å?¨(_S)"
+
+#~ msgid "Save uncommitted changes and re-apply them later"
+#~ msgstr "ä¿?å?ä¸ºæ??äº¤ç??æ?´æ?¹å¹¶ä¸?ç¨?å??å??åº?ç?¨å®?ä»¬"
+
+#~ msgid "_Apply stashed changesâ?¦"
+#~ msgstr "åº?ç?¨ä¸´æ?¶å?å?¨ç??æ?´æ?¹(_A)..."
+
+#~ msgid "_View logâ?¦"
+#~ msgstr "æ?¥ç??æ?¥å¿?(_V)..."
+
+#~ msgid "View change history"
+#~ msgstr "æ?¥ç??æ??ä»¶å??å?²"
+
+#~ msgid "_Pushâ?¦"
+#~ msgstr "æ?¨é??(_P)..."
+
+#~ msgid "_Pullâ?¦"
+#~ msgstr "è?·å??ä¸?å??å¹¶(_P)..."
+
+#~ msgid "Update the working copy"
+#~ msgstr "æ?´æ?°å½?å??å·¥ä½?å?¯æ?¬"
+
+#~ msgid "Update remote branches"
+#~ msgstr "è¿?ç¨?å??æ?¯(_R)"
+
+#~ msgid "_Files"
+#~ msgstr "æ??ä»¶(_F)"
+
+#~ msgid "_Ignoreâ?¦"
+#~ msgstr "å¿½ç?¥(_I)..."
+
+#~ msgid "Ignore files"
+#~ msgstr "å¿½ç?¥æ??ä»¶"
+
+#~ msgid "_Check out filesâ?¦"
+#~ msgstr "ç¾å?ºæ??ä»¶(_C)..."
+
+#~ msgid "_Unstage filesâ?¦"
+#~ msgstr "å??æ¶?ç¼?å?æ??ä»¶(_U)..."
+
+#~ msgid "Create patch seriesâ?¦"
+#~ msgstr "å??å»ºè¡¥ä¸?åº?å??..."
+
+#~ msgid "Generate patch files for submission upstream"
+#~ msgstr "ä¸ºæ??äº¤ç»?ä¸?æ¸¸ç??æ??è¡¥ä¸?æ??ä»¶"
+
+#~ msgid "_Applyâ?¦"
+#~ msgstr "åº?ç?¨(_A)..."
+
+#~ msgid "Start applying a patch series"
+#~ msgstr "å¼?å§?åº?ç?¨ä¸?ä¸ªè¡¥ä¸?åº?å??"
+
+#~ msgid "_Skip current patch"
+#~ msgstr "è·³è¿?å½?å??è¡¥ä¸?(_S)"
+
+#~ msgid "_Branches"
+#~ msgstr "å??æ?¯(_B)"
+
+#~ msgid "_Create branchâ?¦"
+#~ msgstr "å??å»ºå??æ?¯(_C)..."
+
+#~ msgid "_Delete branchâ?¦"
+#~ msgstr "å? é?¤å??æ?¯(_D)..."
+
+#~ msgid "Delete branches"
+#~ msgstr "å? é?¤å??æ?¯"
+
+#~ msgid "_Switch to another branchâ?¦"
+#~ msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯(_S)..."
+
+#~ msgid "_Mergeâ?¦"
+#~ msgstr "å??å¹¶(_M)..."
+
+#~ msgid "Merge changes from another branch into the current one"
+#~ msgstr "ä»?å?¶å®?å??æ?¯å??å¹¶æ?´æ?¹å?°å½?å??å??æ?¯"
+
+#~ msgid "_Rebase"
+#~ msgstr "é??å®?ä½?(_R)"
+
+#~ msgid "Merge your changes with an upstream remote branch"
+#~ msgstr "å??å¹¶æ?´æ?¹å?°ä¸?æ¸¸å??æ?¯"
+
+#~ msgid "_Startâ?¦"
+#~ msgstr "å¼?å§?(_S)..."
+
+#~ msgid "Start a rebase"
+#~ msgstr "å?¯å?¨é??å®?ä½?"
+
+#~ msgid "Continue a rebase that stopped because of conflicts"
+#~ msgstr "ç»§ç»ç?±äº?å?²çª?è??ç»?æ¢ç?? Rebase"
+
+#~ msgid "Skip the current conflicted commit and continue"
+#~ msgstr "è·³è¿?å½?å??å?²çª?ç??æ??äº¤å¹¶ä¸?ç»§ç»"
+
+#~ msgid "_Cherry pickâ?¦"
+#~ msgstr "ä¼?é??(_C)..."
+
+#~ msgid ""
+#~ "Selectively merge individual changes from other branches into the current "
+#~ "one"
+#~ msgstr "æ??é??æ?©ç??ä»?å?¶å®?å??æ?¯å??å¹¶ä¸ªå?«ç??æ?´æ?¹å?°å½?å??å??æ?¯"
+
+#~ msgid "_Remote branches"
+#~ msgstr "è¿?ç¨?å??æ?¯(_R)"
+
+#~ msgid "_Deleteâ?¦"
+#~ msgstr "å? é?¤(_D)..."
+
+#~ msgid "_Create tagâ?¦"
+#~ msgstr "å??å»ºæ ?ç¾(_C)..."
+
+#~ msgid "_Delete tagâ?¦"
+#~ msgstr "å? é?¤æ ?ç¾(_D)..."
+
+#~ msgid "Delete tags"
+#~ msgstr "å? é?¤æ ?ç¾"
+
+#~ msgid "_Reset treeâ?¦"
+#~ msgstr "é??ç½®æº?ç ?æ ?(_R)..."
+
+#~ msgid "Reset repository head to any past state"
+#~ msgstr "é??ç½®ä»?åº?é¡¶ç«¯è?³ä»»æ??ä¹?å??ç??ç?¶æ??"
+
+#~ msgid "_Revert commitâ?¦"
+#~ msgstr "è¿?å??æ??äº¤(_R)..."
+
+#~ msgid "Bisect"
+#~ msgstr "å¹³å??"
+
+#~ msgid "Start a bisect operation"
+#~ msgstr "å¼?å§?ä¸?ä¸ªå¹³å??æ??ä½?"
+
+#~ msgid "Stop the bisect and bring the tree back to normal"
+#~ msgstr "å??æ¢ bisect å¹¶ä¸?è®©æº?ç ?æ ?å??å?°æ£å¸¸"
+
+#~ msgid "_Good"
+#~ msgstr "å¥½ (_G)"
+
+#~ msgid "Mark the current head revision as good"
+#~ msgstr "æ ?è®°å½?å??é¡¶ç«¯ç??æ?¬ä¸ºå¥½ç??"
+
+#~ msgid "_Bad"
+#~ msgstr "å?? (_B)"
+
+#~ msgid "Create a new git repository or reinitialize an existing one"
+#~ msgstr "å??å»ºä¸?ä¸ªæ?°ç?? Git ä»?åº?æ??é??æ?°å??å§?å??ç?°æ??ç??ç??æ?¬åº?"
+
+#~ msgid "Show changes introduced by this commit"
+#~ msgstr "æ?¾ç¤ºè¯¥æ??äº¤æ??å¼?å?¥ç??å??å??"
+
+#~ msgid "View a copy of this file at this revision"
+#~ msgstr "æ?¾ç¤ºæ¤ç??æ?¬ç??æ??ä»¶å?¯æ?¬"
+
+#~ msgid "Create a branch with the selected revision as its head"
+#~ msgstr "å??å»ºå??æ?¯ä»¥é??å®?ç??æ?¬ä½?ä¸ºå?¶é¡¶ç«¯"
+
+#~ msgid "Create a tag at this revision"
+#~ msgstr "å?¨æ¤ç??æ?¬å??å»ºä¸?ä¸ªæ ?ç¾"
+
+#~ msgid "Revert this commit"
+#~ msgstr "è¿?å??æ¤æ??äº¤"
+
+#~ msgid "_Bisect"
+#~ msgstr "å¹³å??(_B)"
+
+#~ msgid "_Set good revision"
+#~ msgstr "è®¾å®?ä¸ºå¥½ç??ç??æ?¬ (_S)"
+
+#~ msgid "Mark this revision as good"
+#~ msgstr "æ ?è®°è¯¥ç??æ?¬ä¸ºå¥½ç??"
+
+#~ msgid "_Set bad revision"
+#~ msgstr "è®¾å®?å??ç??ç??æ?¬ (_S)"
+
+#~ msgid "Mark this revision as bad"
+#~ msgstr "æ ?è®°è¯¥ç??æ?¬ä¸ºå??ç??"
+
+#~ msgid "View changes to this file or folder"
+#~ msgstr "æ?¾ç¤ºæ¤æ??ä»¶æ??æ??ä»¶å¤¹ç??æ?´æ?¹"
+
+#~ msgid "Add this file or folder to the repository"
+#~ msgstr "æ·»å? æ¤æ??ä»¶æ??æ??ä»¶å¤¹å?°ä»?åº?"
+
+#~ msgid "Remove this file or folder from the repository"
+#~ msgstr "ä»?ä»?åº?ä¸å? é?¤æ¤æ??ä»¶æ??æ??ä»¶å¤¹"
+
+#~ msgid "Top level git menu item"
+#~ msgstr "é¡¶çº§ Git è??å??é¡¹"
+
+#~ msgid "Git operations"
+#~ msgstr "Git æ??ä½?"
+
+#~ msgid "Git log operations"
+#~ msgstr "Git æ?¥å¿?æ??ä½?"
+
+#~ msgid "Git FM operations"
+#~ msgstr "Git FM æ??ä½?"
+
+#~ msgid "Git Log"
+#~ msgstr "Git æ?¥å¿?"
+
+#~ msgid "You need to select a to do item before you can edit it"
+#~ msgstr "ç¼?è¾?ä¹?å??å¿?é¡»é??ä¸ä¸?ä¸ªä»»å?¡é¡¹"
+
+#~ msgid "Add Item"
+#~ msgstr "æ·»å? é¡¹ç?®"
+
+#~ msgid "Edit Item"
+#~ msgstr "ç¼?è¾?é¡¹ç?®"
+
+#~ msgid "Summary:"
+#~ msgstr "æ¦?è¦?ï¼?"
+
+#~ msgid "Category:"
+#~ msgstr "ç±»å?«ï¼?"
+
+#~ msgid "Edit Categories"
+#~ msgstr "ç¼?è¾?ç±»å?«"
+
+#~ msgid "Due date:"
+#~ msgstr "é¢?å®?æ?¥æ??ï¼?"
+
+#~ msgid "Notify when due"
+#~ msgstr "å?°æ??æ?¶æ??é??"
+
+#~ msgid "Priority:"
+#~ msgstr "ä¼?å??çº§ï¼?"
+
+#~ msgid "Comment:"
+#~ msgstr "æ³¨é??ï¼?"
+
+#~ msgid "Completed"
+#~ msgstr "å·²å®?æ??"
+
+#~ msgid "started:"
+#~ msgstr "å¼?å§?äº?ï¼?"
+
+#~ msgid "N/A"
+#~ msgstr "ä¸?å?¯ç?¨"
+
+#~ msgid "stopped:"
+#~ msgstr "ç»?æ??äº?ï¼?"
+
+#~ msgid "You need to select a to-do item before you can remove it"
+#~ msgstr "å? é?¤å??é??è¦?é??æ?©ä¸?ä¸ªä»»å?¡é¡¹"
+
+#~ msgid "Are you sure you want to remove the selected to-do item?"
+#~ msgstr "æ?¨ç¡®å®?æ?³è¦?å? é?¤é??ä¸ç??ä»»å?¡é¡¹å??ï¼?"
+
+#~ msgid "Are you sure you want to remove all the completed to-do items?"
+#~ msgstr "æ?¨ç??ç??è¦?å? é?¤æ??æ??å·²å®?æ??ç??ä»»å?¡é¡¹å??ï¼?"
+
+#~ msgid ""
+#~ "Are you sure you want to remove all the completed to-do items in the "
+#~ "category \"%s\"?"
+#~ msgstr "æ?¨ç??ç??è¦?å? é?¤ç±»å?«â??%sâ??ä¸æ??æ??å·²å®?æ??ç??ä»»å?¡é¡¹å??ï¼?"
+
+#~ msgid "Export task list"
+#~ msgstr "å¯¼å?ºä»»å?¡å??è¡¨"
+
+#~ msgid "XML"
+#~ msgstr "XML"
+
+#~ msgid "Plain Text"
+#~ msgstr "çº¯æ??æ?¬"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Export current category only"
+#~ msgstr "ä»?å¯¼å?ºå½?å??ç±»å?«"
+
+#~ msgid "HTML export options:"
+#~ msgstr "HTML å¯¼å?ºé??é¡¹ï¼?"
+
+#~ msgid "Embed default (CSS) style sheet"
+#~ msgstr "åµ?å?¥é»?è®¤(CSS)æ ·å¼?è¡¨"
+
+#~ msgid "Custom (CSS) style sheet"
+#~ msgstr "å®?å?¶(CSS)æ ·å¼?è¡¨"
+
+#~ msgid "All"
+#~ msgstr "æ?¾ç¤ºæ??æ??"
+
+#~ msgid "_Export"
+#~ msgstr "å¯¼å?º(_E)"
+
+#~ msgid "Priority"
+#~ msgstr "ä¼?å??çº§"
+
+#~ msgid "Due date"
+#~ msgstr "é¢?å®?æ?¥æ??"
+
+#~ msgid "Summary"
+#~ msgstr "æ¦?è¦?"
+
+#~ msgid "No permission to read the file."
+#~ msgstr "æ²¡æ??è¯»å??æ??ä»¶ç??æ??é??ã??"
+
+#~ msgid "Failed to read file"
+#~ msgstr "è¯»å??æ??ä»¶å¤±è´¥"
+
+#~ msgid "Failed to parse XML structure"
+#~ msgstr "è§£æ?? XML ç»?æ??å¤±è´¥"
+
+#~ msgid "File is not a valid gtodo file"
+#~ msgstr "æ??ä»¶ä¸?æ?¯å??æ³?ç?? gtodo æ??ä»¶"
+
+#~ msgid "Personal"
+#~ msgstr "ä¸ªäººç??"
+
+#~ msgid "Business"
+#~ msgstr "å??ä¸?ç??"
+
+#~ msgid "Unfiled"
+#~ msgstr "æ?ªæ?´ç??ç??"
+
+#~ msgid "No Gtodo Client to save."
+#~ msgstr "æ²¡æ??è¦?ä¿?å?ç?? Gtodo å®¢æ?·ç«¯"
+
+#~ msgid "No filename supplied."
+#~ msgstr "æ?ªæ??ä¾?æ??ä»¶å??ã??"
+
+#~ msgid "Medium"
+#~ msgstr "ä¸"
+
+#~ msgid "High"
+#~ msgstr "é«?"
+
+#~ msgid "When you delete the category \"%s\", all containing items are lost"
+#~ msgstr "å? é?¤ç±»å?«â??%sâ??æ?¶ï¼?å°?ä¼?å¤±å?»è¯¥ç±»å?«ä¸?ç??æ??æ??é¡¹ç?®"
+
+#~ msgid "Delete"
+#~ msgstr "å? é?¤"
+
+#~ msgid "<New category (%d)>"
+#~ msgstr "<æ?°ç±»å?«(%d)>"
+
+#~ msgid "The following item is due in %i minute:"
+#~ msgid_plural "The following item is due in %i minutes:"
+#~ msgstr[0] "ä¸?å??é¡¹ç?®å?¨ %i å??é??å??å?°æ??ï¼?"
+
+#~ msgid "The following item is due:"
+#~ msgstr "ä¸?å??é¡¹ç?®å?°æ??äº?ï¼?"
+
+#~ msgid "_Do not show again"
+#~ msgstr "ä¸?å??æ?¾ç¤º(_D)"
+
+#~ msgid "_Tasks"
+#~ msgstr "ä»»å?¡(_T)"
+
+#~ msgid "Hide _Completed Items"
+#~ msgstr "é??è??å·²å®?æ??ç??é¡¹ç?®(_C)"
+
+#~ msgid "Hide completed to-do items"
+#~ msgstr "é??è??å·²å®?æ??ç??ä»»å?¡é¡¹"
+
+#~ msgid "Hide Items Past _Due Date"
+#~ msgstr "é??è??è¶?æ??ç??é¡¹ç?®(_D)"
+
+#~ msgid "Hide items that are past due date"
+#~ msgstr "é??è??è¶?æ??ç??é¡¹ç?®"
+
+#~ msgid "Hide Items Without _End Date"
+#~ msgstr "é??è??æ? ç»?æ??æ?¥æ??ç??é¡¹ç?®(_E)"
+
+#~ msgid "Hide items without an end date"
+#~ msgstr "é??è??æ? ç»?æ??æ?¥æ??ç??é¡¹ç?®"
+
+#~ msgid "Task manager"
+#~ msgstr "ä»»å?¡ç®¡ç??å?¨"
+
+#~ msgid "Task manager view"
+#~ msgstr "ä»»å?¡ç®¡ç??å?¨è§?å?¾"
+
+#~ msgid "To-do Manager"
+#~ msgstr "ä»»å?¡ç®¡ç??å?¨"
+
+#~ msgid "To-do List Preferences"
+#~ msgstr "ä»»å?¡å??è¡¨é¦?é??é¡¹"
+
+#~ msgid "Interface"
+#~ msgstr "ç??é?¢"
+
+#~ msgid "Show due date column"
+#~ msgstr "æ?¾ç¤ºå?°æ??æ?¶é?´æ ?"
+
+#~ msgid "Show category column"
+#~ msgstr "æ?¾ç¤ºç±»å?«æ ?"
+
+#~ msgid "Show priority column"
+#~ msgstr "æ?¾ç¤ºä¼?å??çº§æ ?"
+
+#~ msgid "Show in main window"
+#~ msgstr "å?¨ä¸»çª?å?£æ?¾ç¤º"
+
+#~ msgid "Highlight"
+#~ msgstr "é«?äº®"
+
+#~ msgid "Items that are due today"
+#~ msgstr "ä»?æ?¥å?°æ??ç??ä»»å?¡"
+
+#~ msgid "Items that are past due"
+#~ msgstr "è¶?æ??ç??ä»»å?¡"
+
+#~ msgid "Items that are due in the next %i day"
+#~ msgid_plural "Items that are due in the next %i days"
+#~ msgstr[0] "å°?å?¨ %i å¤©å??å?°æ??ç??ä»»å?¡"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "æ??é¡¹"
+
+#~ msgid "Auto-purge completed items"
+#~ msgstr "è?ªå?¨æ¸?é?¤å·²å®?æ??ç??é¡¹ç?®"
+
+#~ msgid "Purge items after"
+#~ msgstr "å?¨"
+
+#~ msgid "days."
+#~ msgstr "å¤©å??æ¸?é?¤é¡¹ç?®ã??"
+
+#~ msgid "Auto-Purge"
+#~ msgstr "è?ªå?¨æ¸?é?¤"
+
+#~ msgid "Notification"
+#~ msgstr "æ??é??"
+
+#~ msgid "Allow to-do items to notify me when they are due in %i minute"
+#~ msgid_plural ""
+#~ "Allow to-do items to notify me when they are due in %i minutes"
+#~ msgstr[0] "å??è®¸ä»»å?¡é¡¹å?¨å®?ä»¬å?°æ?? %i å??é??å??æ??é??æ??"
+
+#~ msgid "Open a Task List"
+#~ msgstr "æ??å¼?ä»»å?¡å??è¡¨"
+
+#~ msgid "Create a Task List"
+#~ msgstr "å??å»ºä»»å?¡å??è¡¨"
+
+#~ msgid "No Date"
+#~ msgstr "æ? æ?¥æ??"
+
+#~ msgid ""
+#~ "Generation of project file failed. Cannot find an appropriate project "
+#~ "template to use. Please make sure your version of Anjuta is up-to-date."
+#~ msgstr ""
+#~ "é¡¹ç?®æ??ä»¶ç??æ??å¤±è´¥ã??æ?¾ä¸?å?°å??é??ç??é¡¹ç?®æ¨¡æ?¿ã??è¯·ç¡®è®¤æ?¨ä½¿ç?¨ç?? Anjuta æ?¯æ??æ?°ç??æ?¬ã??"
+
+#~ msgid "Add Module"
+#~ msgstr "æ·»å? æ¨¡å??"
+
+#~ msgid "Add Package"
+#~ msgstr "æ·»å? å??"
+
+#~ msgid "New Group"
+#~ msgstr "æ?°å»ºç»?"
+
+#~ msgid "Specify _where to create the group:"
+#~ msgstr "æ??å®?å??å»ºç»?ç??ä½?ç½®(_W)ï¼?"
+
+#~ msgid "_Add package&#x2026;"
+#~ msgstr "æ·»å? å??(_A)..."
+
+#~ msgid "_Group name:"
+#~ msgstr "ç»?å??(_G)ï¼?"
+
+#~ msgid "Add _Groupâ?¦"
+#~ msgstr "æ·»å? ç»?(_G)..."
+
+#~ msgid "Add a group to project"
+#~ msgstr "å??é¡¹ç?®æ·»å? ç»?"
+
+#~ msgid "Add _Moduleâ?¦"
+#~ msgstr "æ·»å? æ¨¡å??(_M)..."
+
+#~ msgid "Add _Packageâ?¦"
+#~ msgstr "æ·»å? å??(_P)..."
+
+#~ msgid "_Refresh"
+#~ msgstr "å?·æ?°(_R)"
+
+#~ msgid "Refresh project manager tree"
+#~ msgstr "å?·æ?°é¡¹ç?®ç®¡ç??å?¨æ ?"
+
+#~ msgid "Add _Group"
+#~ msgstr "æ·»å? ç»?(_G)"
+
+#~ msgid "Add _Target"
+#~ msgstr "æ·»å? ç?®æ ?(_T)"
+
+#~ msgid "Add a module to target"
+#~ msgstr "å??ç?®æ ?æ·»å? æ¨¡å??"
+
+#~ msgid "Full Name:"
+#~ msgstr "å®?æ?´å??ç§°ï¼?"
+
+#~ msgid "Group properties"
+#~ msgstr "ç»?å±?æ?§"
+
+#~ msgid "No"
+#~ msgstr "å?¦"
+
+#~ msgid "GTK+"
+#~ msgstr "GTK+"
+
+#~ msgid "A generic GTKmm (C++) project"
+#~ msgstr "é??ç?¨ GTKmm (C++) é¡¹ç?®"
+
+#~ msgid "GTKmm"
+#~ msgstr "GTKmm"
+
+#~ msgid "Package is not parseable"
+#~ msgstr "å??ä¸?å?¯è§£æ??"
+
+#~ msgid "Automatically scan project's packages"
+#~ msgstr "è?ªå?¨æ?«æ??é¡¹ç?®ç??å??"
+
+#~ msgid "Available API tags"
+#~ msgstr "å?¯ç?¨ç?? API æ ?ç¾"
+
+#~ msgid "Checking if package is parseableâ?¦"
+#~ msgstr "æ£å?¨æ£?æ?¥å??æ?¯å?¦å?¯ä»¥è§£æ??..."
+
+#~ msgid ""
+#~ "This option enables the default packages required by your opened project, "
+#~ "e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU "
+#~ "work)"
+#~ msgstr ""
+#~ "è¿?ä¸ªé??é¡¹å?¯ç?¨äº?ä½ æ??å¼?é¡¹ç?®æ??é??è¦?ç??é»?è®¤ç??è½¯ä»¶å??ï¼?ä¾?å¦?ï¼?ä½ å??å»ºäº? GTK+ é¡¹ç?®ï¼?å°±"
+#~ "é??è¦? Glib å?? GTK+ã??(å?¯è?½é??è¦?æ?´å¤?ç??å¤?ç??å?¨æ?¶é?´)"
+
+#~ msgid "Gdb"
+#~ msgstr "Gdb"
+
+#~ msgid "Task Manager"
+#~ msgstr "ä»»å?¡ç®¡ç??å?¨"
+
+#~ msgid "Todo Plugin for Anjuta."
+#~ msgstr "Anjuta ç?? Todo æ??ä»¶ã??"
+
+#~ msgid "C++/GObject Class"
+#~ msgstr "C++/GObject ç±»"
+
+#~ msgid "Anjuta JS Debugger Plugin"
+#~ msgstr "Anjuta JS è°?è¯?å?¨æ??ä»¶"
+
 #~ msgid ""
 #~ "Are you sure you want to reset the preferences to\n"
 #~ "their default settings?"
@@ -10395,15 +10807,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "Invalid GbfAmConfigValue type"
 #~ msgstr "æ? æ??ç?? GbfAmConfigValue ç±»å??"
 
-#~ msgid "Select Package to add:"
-#~ msgstr "é??æ?©è¦?æ·»å? ç??å??ï¼?"
-
-#~ msgid "Select package"
-#~ msgstr "é??æ?©å??"
-
-#~ msgid "Variables"
-#~ msgstr "å??é??"
-
 #~ msgid "Generic rule"
 #~ msgstr "é??ç?¨è§?å??"
 
@@ -10539,9 +10942,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "gcj compiler flags (ahead-of-time)"
 #~ msgstr "gcj ç¼?è¯?å?¨å??æ?° (é¢?å??)"
 
-#~ msgid "Libraries:"
-#~ msgstr "å?½æ?°åº?ï¼?"
-
 #~ msgid "Dependencies:"
 #~ msgstr "ä¾?èµ?å?³ç³»ï¼?"
 
@@ -10599,9 +10999,6 @@ msgstr "ç¬¦å?·"
 #~ 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."
@@ -10806,9 +11203,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "Associate"
 #~ msgstr "å?³è??"
 
-#~ msgid "Automatically add resources"
-#~ msgstr "è?ªå?¨æ·»å? èµ?æº?"
-
 #~ msgid "Designer"
 #~ msgstr "è®¾è®¡å?¨"
 
@@ -10994,10 +11388,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "wxWidgets"
 #~ msgstr "é?¨ä»¶"
 
-#~| msgid "Loading..."
-#~ msgid "Loadingâ?¦"
-#~ msgstr "æ£å?¨è½½å?¥..."
-
 #~ msgid "Autocompletion pop up choices"
 #~ msgstr "è?ªå?¨è¡¥å?¨å¼¹å?ºé??æ?©"
 
@@ -11025,15 +11415,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "<b>CVS Options</b>"
 #~ msgstr "<b>CVS é??é¡¹</b>"
 
-#~ msgid "<b>Options:</b>"
-#~ msgstr "<b>é??é¡¹ï¼?</b>"
-
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>é??é¡¹</b>"
-
-#~ msgid "<b>Repository: </b>"
-#~ msgstr "<b>ä»?åº?ï¼?</b>"
-
 #~ msgid "<b>Debugger:</b>"
 #~ msgstr "<b>è°?è¯?å?¨ï¼?</b>"
 
@@ -11073,9 +11454,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "Source coudn't be removed"
 #~ msgstr "ä¸?è?½å? é?¤æº?æ??ä»¶"
 
-#~ msgid "<b>Tags</b>"
-#~ msgstr "<b>æ ?ç¾ï¼?</b> %s"
-
 #~ msgid "_Commit..."
 #~ msgstr "æ??äº¤(_C)..."
 
@@ -11258,34 +11636,9 @@ msgstr "ç¬¦å?·"
 #~ "å·¦\n"
 #~ "å?³"
 
-#~ msgid "<b>Filter</b>"
-#~ msgstr "<b>è¿?æ»¤å?¨</b>"
-
-#~ msgid "<b>Branch:</b>"
-#~ msgstr "<b>å??æ?¯ï¼?</b>"
-
-#~ msgid "<b>Log Message:</b>"
-#~ msgstr "<b>æ?¥å¿?æ¶?æ?¯ï¼?</b>"
-
 #~ msgid "<b>Log message:</b>"
 #~ msgstr "<b>æ?¥å¿?æ¶?æ?¯ï¼?</b>"
 
-#, fuzzy
-#~ msgid "<b>Mode:</b>"
-#~ msgstr "é??é¡¹"
-
-#~ msgid "<b>Revision:</b>"
-#~ msgstr "<b>ä¿®è®¢ï¼?</b>"
-
-#~ msgid "<b>Select file to add:</b>"
-#~ msgstr "<b>é??æ?©è¦?æ·»å? ç??æ??ä»¶ï¼?</b>"
-
-#~ msgid "<b>Tag name:</b>"
-#~ msgstr "<b>æ ?ç¾å??ç§°ï¼?</b>"
-
-#~ msgid "<b>URL:</b>"
-#~ msgstr "<b>URL:</b>"
-
 #~ msgid ""
 #~ "Underline-Plain\n"
 #~ "Underline-Squiggle\n"
@@ -11321,7 +11674,7 @@ msgstr "ç¬¦å?·"
 #~ msgstr "ä¾¿ç¬ºç??"
 
 #~ msgid "<b>End Revision:</b>"
-#~ msgstr "<b>ç»?æ??ä¿®è®¢ï¼?</b>"
+#~ msgstr "<b>ç»?æ??ç??æ?¬ï¼?</b>"
 
 #~ msgid "<b>Subversion Options</b>"
 #~ msgstr "<b>Subversion é??é¡¹</b>"
@@ -11377,9 +11730,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "Fixed data-view"
 #~ msgstr "å?ºå®?æ?°æ?®è§?å?¾"
 
-#~ msgid "Directory"
-#~ msgstr "ç?®å½?"
-
 #, fuzzy
 #~ msgid "No message details"
 #~ msgstr "æ?®é??æ¶?æ?¯ï¼?"
@@ -11891,9 +12241,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "Unable to complete file copy"
 #~ msgstr "æ? æ³?å®?æ??å¤?å?¶æ??ä»¶"
 
-#~ msgid "Revision: "
-#~ msgstr "ä¿®è®¢ï¼?"
-
 #~ msgid "Command Line Parameters:"
 #~ msgstr "å?½ä»¤è¡?å??æ?°"
 
@@ -11927,9 +12274,6 @@ msgstr "ç¬¦å?·"
 #~ msgid "Books"
 #~ msgstr "ä¹¦ç±?"
 
-#~ msgid "_Toggle Bookmark"
-#~ msgstr "å??æ?¢ä¹¦ç¾ç?¶æ??(_T)"
-
 #~ msgid "_First Bookmark"
 #~ msgstr "ç¬¬ä¸?ä¸ªä¹¦ç¾(_F)"
 
@@ -12038,10 +12382,6 @@ msgstr "ç¬¦å?·"
 #~ msgstr "ç?®å½?"
 
 #, fuzzy
-#~ msgid "Symbol Browser"
-#~ msgstr "ç¬¦å?·"
-
-#, fuzzy
 #~ msgid "No file details"
 #~ msgstr "æ?®é??æ¶?æ?¯ï¼?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]