[anjuta] Update Simplified Chinese translation.



commit 09ec93c599d3f56511827bbdb6b978794688d5d0
Author: Aron Xu <aronxu gnome org>
Date:   Thu Mar 24 04:24:19 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 2093 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1085 insertions(+), 1008 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9b39e27..60980a7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,16 +12,17 @@
 # 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.
+# Aron Xu <aronxu gnome org>, 2010, 2011.
 # Lele Long <schemacs gmail com>, 2011.
+# liwei <lw124124 gmail com>, 2011.
 #
 msgid ""
 msgstr ""
 "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: 2011-02-05 21:20+0000\n"
-"PO-Revision-Date: 2011-02-10 00:27+0800\n"
+"product=anjuta&keywords=I18N+L10N&component=core application\n"
+"POT-Creation-Date: 2011-03-20 23:27+0000\n"
+"PO-Revision-Date: 2011-03-24 12:22+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"
@@ -205,30 +206,42 @@ msgstr "æ³°å?½"
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1172 ../libanjuta/resources.c:267
+#.
+#. * Translators: This regex should match the password prompts of
+#. * at least the "su" and the "sudo" command line utility in your
+#. * language and possible other things like "ssh".
+#. * More information on the regular expression syntax can be
+#. * found at http://library.gnome.org/devel/glib/unstable/glib-regex-syntax.html
+#.
+#: ../libanjuta/anjuta-launcher.c:675
+#| msgid "Password:"
+msgid "[Pp]assword.*:"
+msgstr "[Pp]assword.*ï¼?"
+
+#: ../libanjuta/anjuta-launcher.c:1165 ../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:1173
+#: ../libanjuta/anjuta-launcher.c:1166
 msgid "execvp failed"
 msgstr "æ?§è¡?æ??件(execvp)失败"
 
-#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2365
+#: ../libanjuta/anjuta-plugin.c:331 ../libanjuta/anjuta-plugin-manager.c:2369
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
-#: ../libanjuta/anjuta-plugin.c:327
+#: ../libanjuta/anjuta-plugin.c:332
 msgid "Anjuta shell that will contain the plugin"
 msgstr "Anjuta Shell å??æ?¬æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:733
+#: ../libanjuta/anjuta-plugin-manager.c:737
 #, c-format
 msgid "Plugin '%s' does not want to be deactivated"
-msgstr "æ??件 â??%sâ?? ä¸?è?½è¢«å??æ¶?æ¿?æ´»"
+msgstr "æ??件â??%sâ??ä¸?è?½è¢«å??æ¶?æ¿?æ´»"
 
-#: ../libanjuta/anjuta-plugin-manager.c:764
+#: ../libanjuta/anjuta-plugin-manager.c:768
 #, c-format
 msgid ""
 "Could not load %s\n"
@@ -240,24 +253,24 @@ msgstr ""
 "è¿?é??常æ??å?³ç??æ?¨ç??å®?è£?å·²ç»?被æ??å??ã??以ä¸?æ?¯å¯¼è?´è¿?个é?®é¢?ç??é??误信æ?¯ï¼?\n"
 "%s"
 
-#: ../libanjuta/anjuta-plugin-manager.c:901
+#: ../libanjuta/anjuta-plugin-manager.c:905
 msgid "Load"
 msgstr "å? è½½"
 
-#: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1988
+#: ../libanjuta/anjuta-plugin-manager.c:927
+#: ../libanjuta/anjuta-plugin-manager.c:1992
 msgid "Available Plugins"
 msgstr "å?¯ç?¨æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:940
+#: ../libanjuta/anjuta-plugin-manager.c:1040 ../src/anjuta-app.c:940
 msgid "Preferred plugins"
 msgstr "é¦?é??æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1150
+#: ../libanjuta/anjuta-plugin-manager.c:1154
 msgid "Only show user activatable plugins"
 msgstr "å?ªæ?¾ç¤ºç?¨æ?·å?¯æ¿?æ´»ç??æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1197
+#: ../libanjuta/anjuta-plugin-manager.c:1201
 msgid ""
 "These are the plugins selected by you when Anjuta prompted to choose one of "
 "many suitable plugins. Removing the preferred plugin will let Anjuta prompt "
@@ -266,69 +279,73 @@ msgstr ""
 "è¿?äº?æ?¯ Anjuta æ??示æ?¨é??æ?©å??é??ç??æ??件æ?¶æ?¨é??æ?©ç??æ??件ã??å? é?¤é¦?é??æ??件ä¼?使 Anjuta å??"
 "次æ??示æ?¨é??æ?©å?¦å¤?ä¸?个æ??件ã??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1223
+#: ../libanjuta/anjuta-plugin-manager.c:1227
 msgid "Forget selected plugin"
 msgstr "å¿?è®°å·²ç»?é??æ?©ç??æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1357
-#: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
+#: ../libanjuta/anjuta-plugin-manager.c:1361
+#: ../libanjuta/anjuta-plugin-manager.c:1512 ../libanjuta/anjuta-profile.c:507
 #: ../plugins/debug-manager/queue.c:529
 msgid "Select a plugin"
 msgstr "é??æ?©æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1358
-#: ../libanjuta/anjuta-plugin-manager.c:1509
-msgid "<b>Please select a plugin to activate</b>"
-msgstr "<b>请é??æ?©è¦?æ¿?æ´»ç??æ??件</b>"
+#: ../libanjuta/anjuta-plugin-manager.c:1362
+#: ../plugins/debug-manager/queue.c:530
+msgid "Please select a plugin to activate"
+msgstr "请é??æ?©è¦?æ¿?æ´»ç??æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1372
+#: ../libanjuta/anjuta-plugin-manager.c:1376
 #, c-format
 msgid "No plugin is able to load other plugins in %s"
 msgstr "没æ??æ??件å?¯ä»¥å?¨ %s å??å? è½½å?¶å®?æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2015
+#: ../libanjuta/anjuta-plugin-manager.c:1513
+msgid "<b>Please select a plugin to activate</b>"
+msgstr "<b>请é??æ?©è¦?æ¿?æ´»ç??æ??件</b>"
+
+#: ../libanjuta/anjuta-plugin-manager.c:2019
 msgid "Remember this selection"
 msgstr "è®°ä½?æ­¤é??项"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2346
+#: ../libanjuta/anjuta-plugin-manager.c:2350
 msgid "Profiles"
 msgstr "é??ç½®æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2347
+#: ../libanjuta/anjuta-plugin-manager.c:2351
 msgid "Current stack of profiles"
 msgstr "å½?å??é??ç½®æ??件æ ?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2352
+#: ../libanjuta/anjuta-plugin-manager.c:2356
 msgid "Available plugins"
 msgstr "å?¯ç?¨æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2353
+#: ../libanjuta/anjuta-plugin-manager.c:2357
 msgid "Currently available plugins found in plugin paths"
 msgstr "å?¨æ??件路å¾?ä¸?å??ç?°ç??å½?å??å?¯ç?¨æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2359
+#: ../libanjuta/anjuta-plugin-manager.c:2363
 msgid "Activated plugins"
 msgstr "å·²æ¿?æ´»æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2360
+#: ../libanjuta/anjuta-plugin-manager.c:2364
 msgid "Currently activated plugins"
 msgstr "å½?å??å·²æ¿?æ´»ç??æ??件"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2366
+#: ../libanjuta/anjuta-plugin-manager.c:2370
 msgid "Anjuta shell for which the plugins are made"
 msgstr "å?¶ä½?æ??件ç?? Anjuta Shell"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2374
+#: ../libanjuta/anjuta-plugin-manager.c:2378
 msgid "Anjuta Status"
 msgstr "Anjuta ç?¶æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2375
+#: ../libanjuta/anjuta-plugin-manager.c:2379
 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:2535
+#: ../libanjuta/anjuta-plugin-manager.c:2539
 msgid "Loaded:"
 msgstr "已�载�"
 
@@ -398,7 +415,7 @@ msgstr "类�"
 #: ../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
+#: ../plugins/mk-project/mk-project.ui.h:3 ../src/anjuta-app.c:927
 #: ../src/preferences.ui.h:8
 msgid "General"
 msgstr "常�"
@@ -416,7 +433,7 @@ msgid "If you do not save, all your changes will be lost."
 msgstr "å¦?æ??æ?¨æ²¡æ??è¿?è¡?ä¿?å­?ï¼?æ?ªä¿?å­?ç??ä»»ä½?æ?´æ?¹é?½å°?丢失ã??"
 
 #: ../libanjuta/anjuta-save-prompt.c:189
-#: ../plugins/document-manager/plugin.c:611
+#: ../plugins/document-manager/plugin.c:640
 #: ../plugins/snippets-manager/snippets-editor.ui.h:11
 msgid "Save"
 msgstr "ä¿?å­?"
@@ -567,7 +584,7 @@ msgid "Column %i"
 msgstr "å?? %i"
 
 #. Column label
-#: ../libanjuta/anjuta-column-text-view.c:69 ../plugins/git/anjuta-git.ui.h:38
+#: ../libanjuta/anjuta-column-text-view.c:69
 msgid "Column 1"
 msgstr "å?? 1"
 
@@ -576,13 +593,11 @@ 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"
+msgid "Path that dropped files should be relative to"
 msgstr "æ??å?¨æ??件ç??ç?¸å¯¹è·¯å¾?"
 
 #: ../libanjuta/anjuta-file-list.c:101
@@ -848,21 +863,21 @@ msgstr "æ¯?ä¾?é??"
 msgid "Whether this tag affects font scaling"
 msgstr "è¿?个æ ?ç­¾æ?¯å?¦å½±å??æ¯?ä¾?"
 
-#: ../plugins/am-project/amp-group.c:528
+#: ../plugins/am-project/amp-group.c:541
 msgid "Please specify group name"
 msgstr "请æ??å®?ç»?å??"
 
-#: ../plugins/am-project/amp-group.c:542
+#: ../plugins/am-project/amp-group.c:555
 msgid ""
 "Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
 msgstr "ç»?å??å?ªè?½å??å?«å­?æ¯?æ??â??#$:%+,- = ^_`~â??è¿?äº?å­?符"
 
-#: ../plugins/am-project/amp-group.c:571
+#: ../plugins/am-project/amp-group.c:585
 #: ../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/am-project/am-project.c:1584
+#: ../plugins/am-project/am-project.c:1614
+#: ../plugins/am-project/am-project.c:1666
 #: ../plugins/mk-project/mk-project.c:678
 #: ../plugins/mk-project/mk-project.c:755
 #: ../plugins/mk-project/mk-project.c:829
@@ -870,20 +885,20 @@ msgstr "ç»?å??å?ªè?½å??å?«å­?æ¯?æ??â??#$:%+,- = ^_`~â??è¿?äº?å­?符"
 msgid "Project doesn't exist or invalid path"
 msgstr "项ç?®ä¸?å­?å?¨æ??é??æ³?è·¯å¾?"
 
-#: ../plugins/am-project/amp-target.c:246
+#: ../plugins/am-project/amp-target.c:266
 msgid "Please specify target name"
 msgstr "请æ??å®?ç?®æ ?å??称"
 
-#: ../plugins/am-project/amp-target.c:260
+#: ../plugins/am-project/amp-target.c:280
 msgid ""
 "Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
 msgstr "ç?®æ ?å??å?ªè?½ç?±å­?æ¯?ã??â??_â??ã??â??-â??ã??â??/â??æ??â??.â??ç»?æ??"
 
-#: ../plugins/am-project/amp-target.c:275
+#: ../plugins/am-project/amp-target.c:295
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr "å?±äº«åº?ç?®æ ?å??å¿?é¡»æ?¯â??libxxx.laâ??ç??å½¢å¼?"
 
-#: ../plugins/am-project/amp-target.c:284
+#: ../plugins/am-project/amp-target.c:304
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr "é??æ??åº?ç?®æ ?å??å¿?é¡»æ?¯â??libxxx.aâ??ç??å½¢å¼?"
 
@@ -1142,199 +1157,199 @@ msgid ""
 "you want to do that ?"
 msgstr "å?¨ä½¿ç?¨è¿?个æ?°ç??设置å??ï¼?é??è¦?å? é?¤é»?认ç??设置ã??æ?¨æ?³è¿?æ ·å??å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1854
+#: ../plugins/build-basic-autotools/plugin.c:1856
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ä¸?è?½ç¼?è¯?â??%sâ??ï¼?没æ??å®?ä¹?对此æ??件类å??ç??ç¼?è¯?è§?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1989
+#: ../plugins/build-basic-autotools/plugin.c:1991
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½é??置项ç?®ï¼?å?¨ %s 缺å°?é??ç½®è??æ?¬ã??"
 
-#: ../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
+#: ../plugins/build-basic-autotools/plugin.c:2472
+#: ../plugins/build-basic-autotools/plugin.c:2546
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2574
+#: ../plugins/build-basic-autotools/plugin.c:2584
+#: ../plugins/build-basic-autotools/plugin.c:2641
 #, c-format
 msgid "_Build"
 msgstr "æ??建(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2474
+#: ../plugins/build-basic-autotools/plugin.c:2476
 msgid "_Build Project"
 msgstr "æ??建项ç?®(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2475
+#: ../plugins/build-basic-autotools/plugin.c:2477
 msgid "Build whole project"
 msgstr "æ??建æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2480
+#: ../plugins/build-basic-autotools/plugin.c:2482
 msgid "_Install Project"
 msgstr "��项�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2481
+#: ../plugins/build-basic-autotools/plugin.c:2483
 msgid "Install whole project"
 msgstr "���个项�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2486
+#: ../plugins/build-basic-autotools/plugin.c:2488
 msgid "_Clean Project"
 msgstr "æ¸?ç??项ç?®(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2487
+#: ../plugins/build-basic-autotools/plugin.c:2489
 msgid "Clean whole project"
 msgstr "æ¸?ç??æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2492
+#: ../plugins/build-basic-autotools/plugin.c:2494
 msgid "C_onfigure Projectâ?¦"
 msgstr "é??置项ç?®(_O)..."
 
-#: ../plugins/build-basic-autotools/plugin.c:2493
+#: ../plugins/build-basic-autotools/plugin.c:2495
 msgid "Configure project"
 msgstr "é??置项ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2498
+#: ../plugins/build-basic-autotools/plugin.c:2500
 msgid "Build _Tarball"
 msgstr "æ??建 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2499
+#: ../plugins/build-basic-autotools/plugin.c:2501
 msgid "Build project tarball distribution"
 msgstr "æ??建项ç?® tarball å??è¡?å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2504
+#: ../plugins/build-basic-autotools/plugin.c:2506
 msgid "_Build Module"
 msgstr "æ??建模å??(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2505
+#: ../plugins/build-basic-autotools/plugin.c:2507
 msgid "Build module associated with current file"
 msgstr "æ??建ä¸?å½?å??æ??件å?³è??ç??模å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2510
+#: ../plugins/build-basic-autotools/plugin.c:2512
 msgid "_Install Module"
 msgstr "å®?è£?模å??(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2513
 msgid "Install module associated with current file"
 msgstr "å®?è£?ä¸?å½?å??æ??件å?³è??ç??模å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2516
+#: ../plugins/build-basic-autotools/plugin.c:2518
 msgid "_Clean Module"
 msgstr "æ¸?ç??模å??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2519
 msgid "Clean module associated with current file"
 msgstr "æ¸?ç??ä¸?å½?å??æ??件å?³è??ç??模å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2524
 msgid "Co_mpile File"
 msgstr "ç¼?è¯?æ??件(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2525
 msgid "Compile current editor file"
 msgstr "ç¼?è¯?å½?å??ç¼?è¾?å?¨ä¸­ç??æ??件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2528
+#: ../plugins/build-basic-autotools/plugin.c:2530
 msgid "Select Configuration"
 msgstr "é??æ?©é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2531
 msgid "Select current configuration"
 msgstr "é??æ?©å½?å??é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2534
+#: ../plugins/build-basic-autotools/plugin.c:2536
 msgid "Remove Configuration"
 msgstr "å? é?¤é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2535
+#: ../plugins/build-basic-autotools/plugin.c:2537
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??项ç?®(distclean)并å?¨å?¯è?½ç??æ??å?µä¸?å? é?¤é??ç½®ç?®å½?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2548
-#: ../plugins/build-basic-autotools/plugin.c:2576
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2578
 msgid "_Compile"
 msgstr "��(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2549
-#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2551
+#: ../plugins/build-basic-autotools/plugin.c:2579
 msgid "Compile file"
 msgstr "ç¼?è¯?æ??件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2555
-#: ../plugins/build-basic-autotools/plugin.c:2583
+#: ../plugins/build-basic-autotools/plugin.c:2557
+#: ../plugins/build-basic-autotools/plugin.c:2585
 msgid "Build module"
 msgstr "æ??建模å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2560
-#: ../plugins/build-basic-autotools/plugin.c:2588
-#: ../plugins/build-basic-autotools/plugin.c:2646
+#: ../plugins/build-basic-autotools/plugin.c:2562
+#: ../plugins/build-basic-autotools/plugin.c:2590
+#: ../plugins/build-basic-autotools/plugin.c:2648
 #, c-format
 msgid "_Install"
 msgstr "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2561
-#: ../plugins/build-basic-autotools/plugin.c:2589
+#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2591
 msgid "Install module"
 msgstr "å®?è£?模å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2566
-#: ../plugins/build-basic-autotools/plugin.c:2594
-#: ../plugins/build-basic-autotools/plugin.c:2653
+#: ../plugins/build-basic-autotools/plugin.c:2568
+#: ../plugins/build-basic-autotools/plugin.c:2596
+#: ../plugins/build-basic-autotools/plugin.c:2655
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2567
-#: ../plugins/build-basic-autotools/plugin.c:2595
+#: ../plugins/build-basic-autotools/plugin.c:2569
+#: ../plugins/build-basic-autotools/plugin.c:2597
 msgid "Clean module"
 msgstr "æ¸?ç??模å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2600
+#: ../plugins/build-basic-autotools/plugin.c:2602
 msgid "_Cancel command"
 msgstr "å??æ¶?å?½ä»¤(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2601
+#: ../plugins/build-basic-autotools/plugin.c:2603
 msgid "Cancel build command"
 msgstr "å??æ¶?æ??建å?½ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:2639
+#: ../plugins/build-basic-autotools/plugin.c:2641
 #, c-format
 msgid "_Build (%s)"
 msgstr "æ??建(%s)(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2646
+#: ../plugins/build-basic-autotools/plugin.c:2648
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2653
+#: ../plugins/build-basic-autotools/plugin.c:2655
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2661
+#: ../plugins/build-basic-autotools/plugin.c:2663
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "��(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2661
+#: ../plugins/build-basic-autotools/plugin.c:2663
 #, c-format
 msgid "Co_mpile"
 msgstr "��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3195
+#: ../plugins/build-basic-autotools/plugin.c:3197
 msgid "Build commands"
 msgstr "æ??建å?½ä»¤"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3204
+#: ../plugins/build-basic-autotools/plugin.c:3206
 msgid "Build popup commands"
 msgstr "æ??建弹å?ºå?½ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:3593
-#: ../plugins/build-basic-autotools/plugin.c:3601
+#: ../plugins/build-basic-autotools/plugin.c:3595
+#: ../plugins/build-basic-autotools/plugin.c:3603
 msgid "Build Autotools"
 msgstr "æ??建 Autotools"
 
@@ -1343,7 +1358,8 @@ msgstr "æ??建 Autotools"
 msgid ""
 "Error while setting up build environment:\n"
 " %s"
-msgstr "建ç«?æ??建ç?¯å¢?å?ºé??ï¼?\n"
+msgstr ""
+"建ç«?æ??建ç?¯å¢?å?ºé??ï¼?\n"
 " %s"
 
 #: ../plugins/build-basic-autotools/program.c:342
@@ -1351,96 +1367,91 @@ 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:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "添����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Author Email Address:"
 msgstr "ä½?è??ç?µå­?é?®ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "ä½?è??å§?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "ä½?è??/æ?¥æ??-æ?¶é?´"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "ä½?è??/æ?¥æ??/æ?¶é?´"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "�类继��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "�类�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
 msgid "Class Elements"
 msgstr "ç±»å??ç´ "
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "ç±»å?½æ?°å??ç¼?ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "ç±»ç??æ??å?¨"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Methods"
 msgstr "类��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Name:"
 msgstr "ç±»å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Class Options:"
 msgstr "ç±»é??项ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
-#, fuzzy
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "Class Scope:"
 msgstr "ç±»å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "Constants/Variables"
 msgstr "常é??/å??é??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
 msgid "Create"
 msgstr "å??建"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 msgid "GLib.Object"
 msgstr "GLib.Object"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
 msgid "GObject Class\t"
 msgstr "GObject ç±»\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "GObject Prefix and Type:"
 msgstr "GObject å??ç¼?å??ç±»å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "General Class Properties"
 msgstr "��类��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 #: ../plugins/file-wizard/file.c:104
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
@@ -1458,34 +1469,36 @@ msgstr "��类��"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:12
 #: ../plugins/project-wizard/templates/library.wiz.in.h:16
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:12
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:18
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è®¸å?¯è¯? (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
 msgid "Generic C++ Class"
 msgstr "é??ç?¨ C++ ç±»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Header File:"
 msgstr "头æ??件ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 msgid "Imports"
 msgstr "导�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
 msgid "Initializer Arguments:"
 msgstr "å??å§?å??å??æ?°ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
 msgid "Inline the declaration and implementation"
 msgstr "å??åµ?声æ??å??å®?ç?°"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "JavaScript Class"
 msgstr "JavaScript ç±»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
 #: ../plugins/file-wizard/file.c:105
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:17
@@ -1503,56 +1516,58 @@ msgstr "JavaScript ç±»"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:13
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:13
 #: ../plugins/project-wizard/templates/library.wiz.in.h:17
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:20
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU 宽é??ç?¨å?¬å?±è®¸å?¯è¯? (LGPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "许��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
 msgid "Member Functions/Variables"
 msgstr "æ??å??å?½æ?°/å??é??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:33
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
 msgid "Methods"
 msgstr "��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:34
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:33
 msgid "No License"
 msgstr "�许�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:35
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:34
 msgid "Properties"
 msgstr "å±?æ?§"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:36
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:35
 msgid "Python Class"
 msgstr "Python ç±»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:37
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:36
 msgid "Signals"
 msgstr "ä¿¡å?·"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:38
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:37
 msgid "Source File:"
 msgstr "æº?æ??件ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:39
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:38
 msgid "Source/Header Headings:"
 msgstr "æº?æ??件/头æ??件æ?¬å¤´è¡?ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:40
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:39
 msgid "Vala Class"
 msgstr "Vala 类�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:41
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:40
 #: ../plugins/mk-project/mk-project.ui.h:7
 msgid "Variables"
 msgstr "å??é??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:42
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:41
 msgid "is Sub-Class"
 msgstr "��类"
 
@@ -1597,7 +1612,7 @@ msgstr "ä»?ç±»å??ç??æµ?"
 
 #: ../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
+#: ../plugins/class-gen/window.c:802
 msgid "Scope"
 msgstr "è??å?´"
 
@@ -1620,9 +1635,9 @@ msgstr "ç±»å??"
 #: ../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/project-manager/dialogs.c:438
+#: ../plugins/run-program/parameters.c:758
+#: ../plugins/snippets-manager/plugin.c:762
 #: ../plugins/snippets-manager/snippets-browser.c:530
 #: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
@@ -1664,8 +1679,8 @@ msgstr "æ?´ç??å?¨"
 #: ../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
+#: ../plugins/project-manager/dialogs.c:445
+#: ../plugins/run-program/parameters.c:767 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "æ?°å?¼"
 
@@ -1675,17 +1690,17 @@ msgid "Module"
 msgstr "模å??"
 
 #. Automatic highlight menu
-#: ../plugins/class-gen/window.c:792 ../plugins/document-manager/plugin.c:1033
+#: ../plugins/class-gen/window.c:792 ../plugins/document-manager/plugin.c:1079
 msgid "Automatic"
 msgstr "��"
 
 #: ../plugins/class-gen/window.c:793
 msgid "Getter"
-msgstr ""
+msgstr "Getter"
 
 #: ../plugins/class-gen/window.c:794
 msgid "Setter"
-msgstr ""
+msgstr "Setter"
 
 #: ../plugins/class-gen/window.c:1208
 msgid "XML description of the user interface"
@@ -1837,7 +1852,7 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "忽ç?¥ .cvsrc æ??件(æ?¨è??)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/symbol-db/plugin.c:2171
+#: ../plugins/symbol-db/plugin.c:2161
 msgid "Local"
 msgstr "��"
 
@@ -1855,14 +1870,14 @@ msgstr "模å??å??称ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/search/anjuta-search.ui.h:22
+#: ../plugins/git/anjuta-git.ui.h:36
 #: ../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:50
+#: ../plugins/git/anjuta-git.ui.h:37
 #: ../plugins/subversion/anjuta-subversion.ui.h:24
 msgid "Options:"
 msgstr "é??项ï¼?"
@@ -1901,6 +1916,7 @@ msgid "Reset sticky tags"
 msgstr "é??ç½®ç²?æ»?æ ?ç­¾"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:52
 #: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ç??æ?¬ï¼?"
@@ -2117,7 +2133,7 @@ msgstr "å?¯ç?¨ CLang 代ç ?å??æ??å?¨"
 msgid ""
 "The project needs to be reconfigured after enabling this option. Please run "
 "Build->Configure!"
-msgstr ""
+msgstr "å?¯å?¨æ­¤é??项å??ï¼?该项ç?®é??è¦?é??æ?°é??ç½®ã??请è¿?è¡?æ??建->é??ç½®ï¼?"
 
 #: ../plugins/code-analyzer/code-analyzer.ui.h:5
 msgid "c++-analyzer:"
@@ -2792,10 +2808,6 @@ msgstr "è°?è¯?å?¨æ??ä½?"
 msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr "æ?¾ä¸?å?°æ?¯æ?? %s MIME ç±»å??ç?®æ ?ç??è°?è¯?å?¨æ??件"
 
-#: ../plugins/debug-manager/queue.c:530
-msgid "Please select a plugin to activate"
-msgstr "请é??æ?©è¦?æ¿?æ´»ç??æ??件"
-
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
 msgstr "���"
@@ -2902,7 +2914,7 @@ msgstr "帧"
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:664
 #: ../plugins/debug-manager/threads.c:451 ../plugins/gdb/preferences.c:363
-#: ../plugins/symbol-db/plugin.c:2129 ../plugins/tools/tool.c:100
+#: ../plugins/symbol-db/plugin.c:2119 ../plugins/tools/tool.c:100
 #: ../src/anjuta-app.c:625
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
@@ -2910,7 +2922,7 @@ msgstr "æ??件"
 
 #: ../plugins/debug-manager/stack_trace.c:675
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:951
+#: ../plugins/document-manager/plugin.c:997
 msgid "Line"
 msgstr "è¡?"
 
@@ -2995,51 +3007,51 @@ msgstr "线ç¨?æ??ä½?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:364
+#: ../plugins/debug-manager/watch.c:406
 msgid "Ins_pect/Evaluateâ?¦"
 msgstr "��/��(_P)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/watch.c:366
+#: ../plugins/debug-manager/watch.c:408
 msgid "Inspect or evaluate an expression or variable"
 msgstr "æ£?æ?¥æ??è¯?ä¼°ä¸?个表达å¼?æ??å??é??"
 
-#: ../plugins/debug-manager/watch.c:372
+#: ../plugins/debug-manager/watch.c:414
 msgid "Add Watchâ?¦"
 msgstr "æ·»å? ç??è§?..."
 
-#: ../plugins/debug-manager/watch.c:380
+#: ../plugins/debug-manager/watch.c:422
 msgid "Remove Watch"
 msgstr "å? é?¤ç??è§?"
 
-#: ../plugins/debug-manager/watch.c:388
+#: ../plugins/debug-manager/watch.c:430
 msgid "Update Watch"
 msgstr "æ?´æ?°ç??è§?"
 
-#: ../plugins/debug-manager/watch.c:396
+#: ../plugins/debug-manager/watch.c:438
 msgid "Change Value"
 msgstr "���"
 
-#: ../plugins/debug-manager/watch.c:404
+#: ../plugins/debug-manager/watch.c:446
 msgid "Update all"
 msgstr "����"
 
-#: ../plugins/debug-manager/watch.c:412
+#: ../plugins/debug-manager/watch.c:454
 msgid "Remove all"
 msgstr "����"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:423
+#: ../plugins/debug-manager/watch.c:465
 msgid "Automatic update"
 msgstr "����"
 
-#: ../plugins/debug-manager/watch.c:449 ../plugins/debug-manager/watch.c:455
+#: ../plugins/debug-manager/watch.c:491 ../plugins/debug-manager/watch.c:497
 msgid "Watch operations"
 msgstr "ç??è§?æ??ä½?"
 
-#: ../plugins/debug-manager/watch.c:527
+#: ../plugins/debug-manager/watch.c:572
 msgid "Watches"
 msgstr "ç??è§?"
 
@@ -3088,12 +3100,8 @@ msgstr "API ���"
 msgid "Contents"
 msgstr "��"
 
-#: ../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:2139
-#: ../plugins/symbol-db/plugin.c:2191
+#: ../plugins/devhelp/plugin.c:370 ../plugins/symbol-db/plugin.c:2129
+#: ../plugins/symbol-db/plugin.c:2181
 msgid "Search"
 msgstr "æ??ç´¢"
 
@@ -3124,7 +3132,7 @@ msgstr "��书签"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:354
 #: ../plugins/document-manager/anjuta-bookmarks.c:414
-#: ../plugins/document-manager/plugin.c:422
+#: ../plugins/document-manager/plugin.c:449
 msgid "Bookmarks"
 msgstr "书签"
 
@@ -3143,7 +3151,7 @@ msgid "Close file"
 msgstr "å?³é?­æ??件(_C)"
 
 #: ../plugins/document-manager/anjuta-docman.c:502
-#: ../plugins/project-manager/dialogs.c:563
+#: ../plugins/project-manager/dialogs.c:576
 msgid "Path:"
 msgstr "路��"
 
@@ -3280,7 +3288,7 @@ msgid "Close Others"
 msgstr "����"
 
 #: ../plugins/document-manager/plugin.c:166
-msgid "Close others documents"
+msgid "Close other documents"
 msgstr "å?³é?­å?¶å®?æ??件"
 
 #: ../plugins/document-manager/plugin.c:168
@@ -3469,7 +3477,7 @@ msgstr "ä¸?ä¸?æ?¡å??å?²(_Y)"
 msgid "Go to next history"
 msgstr "转å?°ä¸?ä¸?æ?¡å??å?²"
 
-#: ../plugins/document-manager/plugin.c:265 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:265
 msgid "_Search"
 msgstr "æ??ç´¢(_S)"
 
@@ -3482,367 +3490,445 @@ msgid "Quick editor embedded search"
 msgstr "ç¼?è¾?å?¨å??åµ?ç??å¿«é??æ??ç´¢"
 
 #: ../plugins/document-manager/plugin.c:269
-msgid "Quick _ReSearch"
-msgstr "å¿«é??é??æ?°æ??ç´¢(_R)"
+msgid "Find _Next"
+msgstr "����个(_N)"
 
 #: ../plugins/document-manager/plugin.c:270
-msgid "Repeat quick search"
-msgstr "é??å¤?å¿«é??æ??ç´¢"
+msgid "Search for next appearance of term."
+msgstr "寻æ?¾ä¸?ä¸?个å?ºç?°ç??æ?¯è¯­ã??"
+
+#: ../plugins/document-manager/plugin.c:272
+msgid "Find and R_eplaceâ?¦"
+msgstr "��并��(_E)..."
+
+#: ../plugins/document-manager/plugin.c:273
+msgid "Search and replace"
+msgstr "æ?¥æ?¾å??æ?¿æ?¢"
+
+#: ../plugins/document-manager/plugin.c:275
+msgid "Find _Previous"
+msgstr "����个(_P)"
+
+#: ../plugins/document-manager/plugin.c:277
+msgid "Repeat the last Find command"
+msgstr "é??å¤?ä¸?次æ?¥æ?¾å?½ä»¤"
+
+#: ../plugins/document-manager/plugin.c:279
+msgid "Clear Highlight"
+msgstr "���亮"
+
+#: ../plugins/document-manager/plugin.c:280
+msgid "Clear all highlighted text"
+msgstr "æ¸?é?¤æ??æ??ç??é«?亮æ??æ?¬"
+
+#: ../plugins/document-manager/plugin.c:286
+msgid "Case Sensitive"
+msgstr "å?ºå??大å°?å??"
+
+#: ../plugins/document-manager/plugin.c:287
+msgid "Match case in search results."
+msgstr "å?¨æ??ç´¢ç»?æ??中大å°?å??å?¹é??ã??"
+
+#: ../plugins/document-manager/plugin.c:290
+msgid "Highlight All"
+msgstr "�亮"
 
-#: ../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
+#: ../plugins/document-manager/plugin.c:291
+msgid "Highlight all occurrences"
+msgstr "�亮�示�件"
+
+#: ../plugins/document-manager/plugin.c:294
+msgid "Regular Expression"
+msgstr "æ­£å??表达å¼?"
+
+#: ../plugins/document-manager/plugin.c:295
+msgid "Search using regular expressions"
+msgstr "使ç?¨æ­£å??æ??ç´¢"
+
+#: ../plugins/document-manager/plugin.c:301 ../src/anjuta-actions.h:30
+#: ../plugins/language-support-cpp-java/plugin.c:1197
+#: ../plugins/language-support-python/plugin.c:450
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:276
+#: ../plugins/document-manager/plugin.c:302
 msgid "_Editor"
 msgstr "ç¼?è¾?å?¨(_E)"
 
-#: ../plugins/document-manager/plugin.c:283
+#: ../plugins/document-manager/plugin.c:309
 msgid "_Add Editor View"
 msgstr "添������(_A)"
 
-#: ../plugins/document-manager/plugin.c:284
+#: ../plugins/document-manager/plugin.c:310
 msgid "Add one more view of current document"
 msgstr "为å½?å??æ??档添å? ä¸?个æ??å¤?个è§?å?¾"
 
-#: ../plugins/document-manager/plugin.c:286
+#: ../plugins/document-manager/plugin.c:312
 msgid "_Remove Editor View"
 msgstr "�������(_R)"
 
-#: ../plugins/document-manager/plugin.c:287
+#: ../plugins/document-manager/plugin.c:313
 msgid "Remove current view of the document"
 msgstr "ä»?æ??档中å? é?¤å½?å??è§?å?¾"
 
-#: ../plugins/document-manager/plugin.c:289
+#: ../plugins/document-manager/plugin.c:315
 msgid "U_ndo"
 msgstr "��(_N)"
 
-#: ../plugins/document-manager/plugin.c:290
+#: ../plugins/document-manager/plugin.c:316
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?ä¸?次æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:292
+#: ../plugins/document-manager/plugin.c:318
 msgid "_Redo"
 msgstr "é??å??(_R)"
 
-#: ../plugins/document-manager/plugin.c:293
+#: ../plugins/document-manager/plugin.c:319
 msgid "Redo the last undone action"
 msgstr "é??å¤?å??å??æ¶?ç??å?¨ä½?"
 
-#: ../plugins/document-manager/plugin.c:295
+#: ../plugins/document-manager/plugin.c:321
 msgid "C_ut"
 msgstr "å?ªå??(_U)"
 
-#: ../plugins/document-manager/plugin.c:296
+#: ../plugins/document-manager/plugin.c:322
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "å°?é??中æ??å­?å?ªå??å?°å?ªè´´æ?¿"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:298 ../plugins/terminal/terminal.c:561
+#: ../plugins/document-manager/plugin.c:324 ../plugins/terminal/terminal.c:561
 msgid "_Copy"
 msgstr "��(_C)"
 
-#: ../plugins/document-manager/plugin.c:299
+#: ../plugins/document-manager/plugin.c:325
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é??中æ??å­?å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../plugins/document-manager/plugin.c:301 ../plugins/terminal/terminal.c:569
+#: ../plugins/document-manager/plugin.c:327 ../plugins/terminal/terminal.c:569
 msgid "_Paste"
 msgstr "ç²?è´´(_P)"
 
-#: ../plugins/document-manager/plugin.c:302
+#: ../plugins/document-manager/plugin.c:328
 msgid "Paste the content of clipboard at the current position"
 msgstr "å°?å?ªè´´æ?¿ä¸?ç??æ??å­?å¤?å?¶å?°å½?å??å??æ ?ç??ä½?ç½®"
 
-#: ../plugins/document-manager/plugin.c:310
+#: ../plugins/document-manager/plugin.c:336
 msgid "_Clear"
 msgstr "��(_C)"
 
-#: ../plugins/document-manager/plugin.c:311
+#: ../plugins/document-manager/plugin.c:337
 msgid "Delete the selected text from the editor"
 msgstr "å°?é??中æ??å­?ä»?ç¼?è¾?å?¨å? é?¤"
 
-#: ../plugins/document-manager/plugin.c:314
+#: ../plugins/document-manager/plugin.c:340
 msgid "_Auto-Complete"
 msgstr "��补�(_A)"
 
-#: ../plugins/document-manager/plugin.c:315
+#: ../plugins/document-manager/plugin.c:341
 msgid "Auto-complete the current word"
 msgstr "è?ªå?¨è¡¥å?¨å½?å??ç??è¯?"
 
-#: ../plugins/document-manager/plugin.c:320
+#: ../plugins/document-manager/plugin.c:347
 msgid "_Line Number Margin"
 msgstr "è¡?å?·å?º(_L)"
 
-#: ../plugins/document-manager/plugin.c:321
+#: ../plugins/document-manager/plugin.c:348
 msgid "Show/Hide line numbers"
 msgstr "æ?¾ç¤º/é??è??è¡?å?·å?º"
 
-#: ../plugins/document-manager/plugin.c:323
+#: ../plugins/document-manager/plugin.c:350
 msgid "_Marker Margin"
 msgstr "æ ?å?·å?º(_M)"
 
-#: ../plugins/document-manager/plugin.c:324
+#: ../plugins/document-manager/plugin.c:351
 msgid "Show/Hide marker margin"
 msgstr "æ?¾ç¤º/é??è??æ ?å?·å?º"
 
-#: ../plugins/document-manager/plugin.c:326
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Code Fold Margin"
 msgstr "代����(_C)"
 
-#: ../plugins/document-manager/plugin.c:327
+#: ../plugins/document-manager/plugin.c:354
 msgid "Show/Hide code fold margin"
 msgstr "æ?¾ç¤º/é??è??代ç ?å±?å? å?º"
 
-#: ../plugins/document-manager/plugin.c:329
+#: ../plugins/document-manager/plugin.c:356
 msgid "_Indentation Guides"
 msgstr "缩�导线(_I)"
 
-#: ../plugins/document-manager/plugin.c:330
+#: ../plugins/document-manager/plugin.c:357
 msgid "Show/Hide indentation guides"
 msgstr "æ?¾ç¤º/é??è??缩è¿?导线"
 
-#: ../plugins/document-manager/plugin.c:332
+#: ../plugins/document-manager/plugin.c:359
 msgid "_White Space"
 msgstr "空��符(_W)"
 
-#: ../plugins/document-manager/plugin.c:333
+#: ../plugins/document-manager/plugin.c:360
 msgid "Show/Hide white spaces"
 msgstr "æ?¾ç¤º/é??è??空ç?½å­?符"
 
-#: ../plugins/document-manager/plugin.c:335
+#: ../plugins/document-manager/plugin.c:362
 msgid "_Line End Characters"
 msgstr "�尾�符(_L)"
 
-#: ../plugins/document-manager/plugin.c:336
+#: ../plugins/document-manager/plugin.c:363
 msgid "Show/Hide line end characters"
 msgstr "æ?¾ç¤º/é??è??è¡?å°¾å­?符"
 
-#: ../plugins/document-manager/plugin.c:338
+#: ../plugins/document-manager/plugin.c:365
 msgid "Line _Wrapping"
 msgstr "����(_W)"
 
-#: ../plugins/document-manager/plugin.c:339
+#: ../plugins/document-manager/plugin.c:366
 msgid "Enable/disable line wrapping"
 msgstr "��/������"
 
-#: ../plugins/document-manager/plugin.c:344
+#: ../plugins/document-manager/plugin.c:371
 msgid "Zoom In"
 msgstr "�大"
 
-#: ../plugins/document-manager/plugin.c:345
+#: ../plugins/document-manager/plugin.c:372
 msgid "Zoom in: Increase font size"
 msgstr "�大��大��"
 
-#: ../plugins/document-manager/plugin.c:347
+#: ../plugins/document-manager/plugin.c:374
 msgid "Zoom Out"
 msgstr "缩�"
 
-#: ../plugins/document-manager/plugin.c:348
+#: ../plugins/document-manager/plugin.c:375
 msgid "Zoom out: Decrease font size"
 msgstr "缩å°?ï¼?å??å°?å­?å?·"
 
-#: ../plugins/document-manager/plugin.c:353
+#: ../plugins/document-manager/plugin.c:380
 msgid "_Highlight Mode"
 msgstr "�亮模�(_H)"
 
-#: ../plugins/document-manager/plugin.c:357
+#: ../plugins/document-manager/plugin.c:384
 msgid "_Close All Folds"
 msgstr "å?³é?­å?¨é?¨æ??å? å?ºå??(_C)"
 
-#: ../plugins/document-manager/plugin.c:358
+#: ../plugins/document-manager/plugin.c:385
 msgid "Close all code folds in the editor"
 msgstr "å°?å?¨é?¨æº?代ç ?æ??å? "
 
-#: ../plugins/document-manager/plugin.c:360
+#: ../plugins/document-manager/plugin.c:387
 msgid "_Open All Folds"
 msgstr "æ??å¼?å?¨é?¨æ??å? å?ºå??(_O)"
 
-#: ../plugins/document-manager/plugin.c:361
+#: ../plugins/document-manager/plugin.c:388
 msgid "Open all code folds in the editor"
 msgstr "����代���"
 
-#: ../plugins/document-manager/plugin.c:363
+#: ../plugins/document-manager/plugin.c:390
 msgid "_Toggle Current Fold"
 msgstr "å??æ?¢å½?å??æ??å? å?ºå??(_T)"
 
-#: ../plugins/document-manager/plugin.c:364
+#: ../plugins/document-manager/plugin.c:391
 msgid "Toggle current code fold in the editor"
 msgstr "å??æ?¢å½?å??代ç ?ç??æ??å? ä¸?å±?å¼?ç?¶æ??"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:396
 msgid "_Documents"
 msgstr "æ??æ¡£(_D)"
 
-#: ../plugins/document-manager/plugin.c:370
+#: ../plugins/document-manager/plugin.c:397
 msgid "Previous Document"
 msgstr "ä¸?ä¸?个æ??æ¡£"
 
-#: ../plugins/document-manager/plugin.c:371
+#: ../plugins/document-manager/plugin.c:398
 msgid "Switch to previous document"
 msgstr "å??æ?¢å?°ä¸?ä¸?个æ??æ¡£"
 
-#: ../plugins/document-manager/plugin.c:373
+#: ../plugins/document-manager/plugin.c:400
 msgid "Next Document"
 msgstr "ä¸?ä¸?个æ??æ¡£"
 
-#: ../plugins/document-manager/plugin.c:374
+#: ../plugins/document-manager/plugin.c:401
 msgid "Switch to next document"
 msgstr "å??æ?¢å?°ä¸?ä¸?个æ??æ¡£"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:406
 msgid "Bookmar_k"
 msgstr "书签(_K)"
 
-#: ../plugins/document-manager/plugin.c:380
+#: ../plugins/document-manager/plugin.c:407
 msgid "_Toggle Bookmark"
 msgstr "å??æ?¢ä¹¦ç­¾ç?¶æ??(_T)"
 
-#: ../plugins/document-manager/plugin.c:381
-#, fuzzy
+#: ../plugins/document-manager/plugin.c:408
 msgid "Toggle bookmark at the current line position"
-msgstr "å?¨å½?å??è¡?æ·»å? ä¸?个书签"
+msgstr "å?¨å½?å??è¡?å??æ?¢ä¸?个书签"
 
-#: ../plugins/document-manager/plugin.c:383
+#: ../plugins/document-manager/plugin.c:410
 msgid "_Previous Bookmark"
 msgstr "��个书签(_P)"
 
-#: ../plugins/document-manager/plugin.c:384
+#: ../plugins/document-manager/plugin.c:411
 msgid "Jump to the previous bookmark in the file"
 msgstr "转å?°å½?å??æ??件å??ç??ä¸?ä¸?个书签"
 
-#: ../plugins/document-manager/plugin.c:386
+#: ../plugins/document-manager/plugin.c:413
 msgid "_Next Bookmark"
 msgstr "��个书签(_N)"
 
-#: ../plugins/document-manager/plugin.c:387
+#: ../plugins/document-manager/plugin.c:414
 msgid "Jump to the next bookmark in the file"
 msgstr "转å?°å½?å??æ??件å??ç??ä¸?ä¸?个书签"
 
-#: ../plugins/document-manager/plugin.c:389
+#: ../plugins/document-manager/plugin.c:416
 msgid "_Clear All Bookmarks"
 msgstr "����书签(_C)"
 
-#: ../plugins/document-manager/plugin.c:390
+#: ../plugins/document-manager/plugin.c:417
 msgid "Clear bookmarks"
 msgstr "��书签"
 
-#: ../plugins/document-manager/plugin.c:409
+#: ../plugins/document-manager/plugin.c:436
 msgid "Editor file operations"
 msgstr "ç¼?è¾?å?¨æ??件æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:410
+#: ../plugins/document-manager/plugin.c:437
 msgid "Editor print operations"
 msgstr "ç¼?è¾?å?¨æ??å?°æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:411
+#: ../plugins/document-manager/plugin.c:438
 msgid "Editor text transformation"
 msgstr "ç¼?è¾?å?¨æ??æ?¬è½¬æ?¢"
 
-#: ../plugins/document-manager/plugin.c:412
+#: ../plugins/document-manager/plugin.c:439
 msgid "Editor text selection"
 msgstr "ç¼?è¾?å?¨æ??æ?¬é??æ?©"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:414
+#: ../plugins/document-manager/plugin.c:441
 msgid "Editor code commenting"
 msgstr "ç¼?è¾?å?¨ä»£ç ?注é??"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:442
 msgid "Editor navigations"
 msgstr "���导�"
 
-#: ../plugins/document-manager/plugin.c:416
+#: ../plugins/document-manager/plugin.c:443
 msgid "Editor edit operations"
 msgstr "ç¼?è¾?å?¨ç¼?è¾?æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:417
+#: ../plugins/document-manager/plugin.c:444
 msgid "Editor zoom operations"
 msgstr "ç¼?è¾?å?¨ç¼©æ?¾æ??ä½?"
 
-#: ../plugins/document-manager/plugin.c:418
+#: ../plugins/document-manager/plugin.c:445
 msgid "Editor syntax highlighting styles"
 msgstr "���语��亮样�"
 
-#: ../plugins/document-manager/plugin.c:419
+#: ../plugins/document-manager/plugin.c:446
 msgid "Editor text formating"
 msgstr "ç¼?è¾?å?¨æ??æ?¬æ ¼å¼?"
 
-#: ../plugins/document-manager/plugin.c:420
+#: ../plugins/document-manager/plugin.c:447
 msgid "Simple searching"
 msgstr "ç®?å??æ??ç´¢"
 
 #. DocmanPlugin* plugin = ANJUTA_PLUGIN_DOCMAN (ipref);
-#: ../plugins/document-manager/plugin.c:421
-#: ../plugins/document-manager/plugin.c:1749
-#: ../plugins/document-manager/plugin.c:2171
-#: ../plugins/document-manager/plugin.c:2180
+#: ../plugins/document-manager/plugin.c:448
+#: ../plugins/document-manager/plugin.c:1795
+#: ../plugins/document-manager/plugin.c:2217
+#: ../plugins/document-manager/plugin.c:2226
 msgid "Documents"
 msgstr "æ??æ¡£"
 
-#: ../plugins/document-manager/plugin.c:426
+#: ../plugins/document-manager/plugin.c:453
 msgid "Editor view settings"
 msgstr "�����设置"
 
-#: ../plugins/document-manager/plugin.c:615
+#: ../plugins/document-manager/plugin.c:455
+msgid "Toggle search options"
+msgstr "å??æ?¢æ??ç´¢é??项"
+
+#: ../plugins/document-manager/plugin.c:644
 msgid "Reload"
 msgstr "é??æ?°å? è½½"
 
-#: ../plugins/document-manager/plugin.c:621
+#: ../plugins/document-manager/plugin.c:650
 msgid "Go to"
 msgstr "转�"
 
-#: ../plugins/document-manager/plugin.c:936
+#: ../plugins/document-manager/plugin.c:982
 msgid "OVR"
 msgstr "è¦?ç??"
 
-#: ../plugins/document-manager/plugin.c:940
+#: ../plugins/document-manager/plugin.c:986
 msgid "INS"
 msgstr "æ??å?¥"
 
-#: ../plugins/document-manager/plugin.c:946
-#: ../plugins/document-manager/plugin.c:949
+#: ../plugins/document-manager/plugin.c:992
+#: ../plugins/document-manager/plugin.c:995
 msgid "Zoom"
 msgstr "缩�"
 
-#: ../plugins/document-manager/plugin.c:952
+#: ../plugins/document-manager/plugin.c:998
 msgid "Col"
 msgstr "å??"
 
-#: ../plugins/document-manager/plugin.c:953
+#: ../plugins/document-manager/plugin.c:999
 msgid "Mode"
 msgstr "模�"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1591
+#: ../plugins/document-manager/plugin.c:1637
 #, c-format
 msgid "Autosave failed for %s"
-msgstr "è?ªå?¨ä¿?å­? â??%sâ?? 失败"
+msgstr "è?ªå?¨ä¿?å­?â??%sâ??失败"
 
-#: ../plugins/document-manager/plugin.c:1605
+#: ../plugins/document-manager/plugin.c:1651
 msgid "Autosave completed"
 msgstr "è?ªå?¨ä¿?å­?å®?æ??"
 
-#: ../plugins/document-manager/search-box.c:383
+#: ../plugins/document-manager/search-box.c:494
+#, c-format
+msgid "Search for \"%s\" reached the end and wrapped around."
+msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?顶é?¨ç»§ç»­æ??ç´¢ã??"
+
+#: ../plugins/document-manager/search-box.c:500
+#, c-format
+msgid ""
+"Search for \"%s\" reached the end and wrapped around but no new match was "
+"found."
+msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?顶é?¨ç»§ç»­æ??ç´¢ã??ä½?æ?ªæ?¾å?°æ?°ç??å?¹é??ç»?æ??ã??"
+
+#: ../plugins/document-manager/search-box.c:543
 #, c-format
 msgid "Search for \"%s\" reached the end and was continued at the top."
 msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?顶é?¨ç»§ç»­æ??ç´¢ã??"
 
-#: ../plugins/document-manager/search-box.c:389
+#: ../plugins/document-manager/search-box.c:549
 #, c-format
 msgid ""
 "Search for \"%s\" reached the end and was continued at the top but no new "
 "match was found."
 msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?顶é?¨ç»§ç»­æ??ç´¢ã??ä½?æ?ªæ?¾å?°æ?°ç??å?¹é??ç»?æ??ã??"
 
-#: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:17
-msgid "Match case"
-msgstr "å?ºå??大å°?å??"
+#: ../plugins/document-manager/search-box.c:584
+#, c-format
+msgid "Search for \"%s\" reached top and was continued at the bottom."
+msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?åº?é?¨ç»§ç»­æ??ç´¢ã??"
+
+#: ../plugins/document-manager/search-box.c:590
+#, c-format
+msgid ""
+"Search for \"%s\" reached top and was continued at the bottom but no new "
+"match was found."
+msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?åº?é?¨ç»§ç»­æ??ç´¢ã??ä½?æ?ªæ?¾å?°æ?°ç??å?¹é??ç»?æ??ã??"
+
+#: ../plugins/document-manager/search-box.c:984
+msgid "Replace"
+msgstr "æ?¿æ?¢"
+
+#: ../plugins/document-manager/search-box.c:989
+msgid "Replace all"
+msgstr "æ?¿æ?¢æ??æ??"
 
 #. we create a placeholder menuitem, to be used in case
 #. * the menu is empty. this placeholder will stay around
@@ -3862,7 +3948,7 @@ msgstr "æ?ªæ?¾å?°å?¹é??项"
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
 #, c-format
 msgid "No recently used resource found with URI \"%s\""
-msgstr "å?¨ URI â??%sâ?? å¤?æ?¾ä¸?å?°æ??è¿?使ç?¨ç??èµ?æº?"
+msgstr "å?¨ URIâ??%sâ??å¤?æ?¾ä¸?å?°æ??è¿?使ç?¨ç??èµ?æº?"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:758
@@ -3871,10 +3957,10 @@ msgid "This function is not implemented for widgets of class '%s'"
 msgstr "ç±»â??%sâ??ç??é?¨ä»¶ç??è¿?个å?½æ?°å°?æ?ªè¢«å®?ç?°"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:937
-#: ../plugins/starter/starter.c:111
+#: ../plugins/starter/plugin.c:167
 #, c-format
 msgid "Open '%s'"
-msgstr "æ??å¼? â??%sâ??"
+msgstr "æ??å¼?â??%sâ??"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:967
 msgid "Unknown item"
@@ -3923,7 +4009,7 @@ msgid ""
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
-"<b>æ? æ³?æ??å¼? â??%sâ??</b>.\n"
+"<b>æ? æ³?æ??å¼?â??%sâ??</b>.\n"
 "\n"
 "没æ??ä»»ä½?æ??件ã??é»?认å?¨ä½?æ??åº?ç?¨ç¨?åº?å?¯ä»¥å¤?ç??该æ??件类å??ã??\n"
 "\n"
@@ -3942,7 +4028,7 @@ msgid "Document Manager"
 msgstr "æ??档管ç??å?¨"
 
 #: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
-#: ../plugins/run-program/parameters.c:311
+#: ../plugins/run-program/parameters.c:312
 msgid "All files"
 msgstr "å?¨é?¨æ??件"
 
@@ -4100,7 +4186,7 @@ msgid "Filter"
 msgstr "�滤�"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2183
+#: ../plugins/symbol-db/plugin.c:2173
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
 msgid "Global"
 msgstr "��"
@@ -4109,7 +4195,7 @@ msgstr "��"
 msgid "Root directory if no project is open:"
 msgstr "没æ??项ç?®è¢«æ??å¼?æ?¶ç??æ ¹ç?®å½?ï¼?"
 
-#: ../plugins/file-manager/file-model.c:120 ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/file-manager/file-model.c:120 ../plugins/git/anjuta-git.ui.h:30
 msgid "Loading..."
 msgstr "正��载..."
 
@@ -4117,11 +4203,11 @@ msgstr "正��载..."
 msgid "Filename"
 msgstr "æ??件å??"
 
-#: ../plugins/file-manager/file-view.c:656
+#: ../plugins/file-manager/file-view.c:652
 msgid "Base URI"
 msgstr "�� URI"
 
-#: ../plugins/file-manager/file-view.c:657
+#: ../plugins/file-manager/file-view.c:653
 msgid "URI of the top-most path displayed"
 msgstr "å·²æ?¾ç¤ºå?° URI ç??æ??顶å±?ç?®å½?"
 
@@ -4175,19 +4261,18 @@ msgid "File Information"
 msgstr "æ??件信æ?¯"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
-#: ../plugins/am-project/am-properties.c:48 ../plugins/git/anjuta-git.ui.h:49
-#: ../plugins/project-manager/dialogs.c:568
+#: ../plugins/am-project/am-properties.c:48 ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/project-manager/dialogs.c:581
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??称ï¼?"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/starter/starter.c:413
 msgid "New File"
 msgstr "æ?°å»ºæ??件"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
-#: ../plugins/project-manager/dialogs.c:590
+#: ../plugins/project-manager/dialogs.c:603
 msgid "Type:"
 msgstr "ç±»å??ï¼?"
 
@@ -4311,7 +4396,7 @@ msgstr "è??æ?¬"
 msgid "Package"
 msgstr "å??"
 
-#: ../plugins/am-project/am-project.c:1585
+#: ../plugins/am-project/am-project.c:1600
 #, c-format
 msgid "Unable to parse project file"
 msgstr "æ? æ³?解æ??项ç?®æ??件"
@@ -4334,9 +4419,11 @@ msgstr "项ç?®å??称ï¼?å?¯ä»¥å??å?«ç©ºæ ¼ï¼?ä¾?å¦?â??GNU Autoconfâ??"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:29
 #: ../plugins/project-wizard/templates/js.wiz.in.h:17
 #: ../plugins/project-wizard/templates/python.wiz.in.h:27
-#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:24
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:26
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:33
 #: ../plugins/project-wizard/templates/library.wiz.in.h:31
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:26
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:31
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
@@ -4365,12 +4452,11 @@ msgid ""
 "It is generated from the project name if not provided."
 msgstr "å??å??å­?ï¼?å?ªè?½å??å?«å­?æ¯?ï¼?æ?°å­?ï¼?å??ä¸?å??线ã??å¦?æ??没æ??æ??å®?ï¼?å°?ä»?项ç?®å??å­?ç??æ??ã??"
 
-#: ../plugins/am-project/am-properties.c:81
+#: ../plugins/am-project/am-properties.c:81 ../plugins/git/anjuta-git.ui.h:64
 msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/am-project/am-properties.c:84
-#, fuzzy
 msgid "An link to the project web page if provided."
 msgstr "æ??å??项ç?®ä¸»é¡µç??è¿?æ?¥ï¼?å¦?æ??å­?å?¨ç??è¯?ã??"
 
@@ -4501,6 +4587,7 @@ msgstr "该ç»?ç?®æ ?使ç?¨ç??è?ªå®?ä¹?å®?è£?ç?®å½?ç??å??表ã??"
 #: ../plugins/am-project/am-properties.c:352
 #: ../plugins/am-project/am-properties.c:504
 #: ../plugins/am-project/am-properties.c:687
+#: ../plugins/am-project/am-properties.c:751
 msgid "Do not install:"
 msgstr "����"
 
@@ -4508,6 +4595,7 @@ msgstr "����"
 #: ../plugins/am-project/am-properties.c:355
 #: ../plugins/am-project/am-properties.c:507
 #: ../plugins/am-project/am-properties.c:690
+#: ../plugins/am-project/am-properties.c:754
 msgid "Build but do not install the target."
 msgstr "æ??建ä½?æ?ªå®?è£?æ­¤ç?®æ ?"
 
@@ -4515,6 +4603,7 @@ msgstr "æ??建ä½?æ?ªå®?è£?æ­¤ç?®æ ?"
 #: ../plugins/am-project/am-properties.c:360
 #: ../plugins/am-project/am-properties.c:512
 #: ../plugins/am-project/am-properties.c:695
+#: ../plugins/am-project/am-properties.c:759
 msgid "Installation directory:"
 msgstr "�����"
 
@@ -4522,10 +4611,11 @@ msgstr "�����"
 #: ../plugins/am-project/am-properties.c:363
 #: ../plugins/am-project/am-properties.c:515
 #: ../plugins/am-project/am-properties.c:698
+#: ../plugins/am-project/am-properties.c:762
 msgid ""
 "It has to be a standard directory or a custom one defined in group "
 "properties."
-msgstr ""
+msgstr "å®?å¿?é¡»æ?¯ä¸?个æ ?å??ç??ç?®å½?æ??è??ä¸?个è?ªå®?ä¹?ç??ä¸?ç»?å®?ä¹?å±?æ?§ã??"
 
 #: ../plugins/am-project/am-properties.c:211
 #: ../plugins/am-project/am-properties.c:371
@@ -4604,7 +4694,7 @@ msgstr "该ç?®æ ?ç??é??å?  Lex æ?? Flex è¯?æ³?å??æ??ç??æ??å?¨å??æ?°ã??"
 #: ../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."
+msgid "Additional Yacc or Bison parser generator flags for this target."
 msgstr "该ç?®æ ?ç??é??å?  Yacc æ?? Bison å??æ??å?¨ç??æ??å??æ?°ã??"
 
 #: ../plugins/am-project/am-properties.c:304
@@ -4612,6 +4702,7 @@ msgstr "该ç?®æ ?ç??é??å?  Yacc æ?? Bison å??æ??å?¨ç??æ??å??æ?°ã??"
 #: ../plugins/am-project/am-properties.c:608
 #: ../plugins/am-project/am-properties.c:656
 #: ../plugins/am-project/am-properties.c:703
+#: ../plugins/am-project/am-properties.c:767
 msgid "Additional dependencies:"
 msgstr "é??å? ä¾?èµ?ï¼?"
 
@@ -4620,6 +4711,7 @@ msgstr "é??å? ä¾?èµ?ï¼?"
 #: ../plugins/am-project/am-properties.c:611
 #: ../plugins/am-project/am-properties.c:659
 #: ../plugins/am-project/am-properties.c:706
+#: ../plugins/am-project/am-properties.c:770
 msgid "Additional dependencies for this target."
 msgstr "该ç?®æ ?ç??é??å? ä¾?èµ?ã??"
 
@@ -4627,6 +4719,7 @@ msgstr "该ç?®æ ?ç??é??å? ä¾?èµ?ã??"
 #: ../plugins/am-project/am-properties.c:464
 #: ../plugins/am-project/am-properties.c:616
 #: ../plugins/am-project/am-properties.c:711
+#: ../plugins/am-project/am-properties.c:775
 msgid "Include in distribution:"
 msgstr "å??å?«å?¨å??è¡?ç??中ï¼?"
 
@@ -4634,6 +4727,7 @@ msgstr "å??å?«å?¨å??è¡?ç??中ï¼?"
 #: ../plugins/am-project/am-properties.c:467
 #: ../plugins/am-project/am-properties.c:619
 #: ../plugins/am-project/am-properties.c:714
+#: ../plugins/am-project/am-properties.c:778
 msgid "Include this target in the distributed package."
 msgstr "å?¨å??è¡?å??中å??å?«æ­¤ç?®æ ?ã??"
 
@@ -4641,6 +4735,7 @@ msgstr "å?¨å??è¡?å??中å??å?«æ­¤ç?®æ ?ã??"
 #: ../plugins/am-project/am-properties.c:472
 #: ../plugins/am-project/am-properties.c:624
 #: ../plugins/am-project/am-properties.c:719
+#: ../plugins/am-project/am-properties.c:783
 msgid "Build for check only:"
 msgstr "å?ªä¸ºæ£?æ?¥è??æ??建ï¼?"
 
@@ -4648,6 +4743,7 @@ msgstr "å?ªä¸ºæ£?æ?¥è??æ??建ï¼?"
 #: ../plugins/am-project/am-properties.c:475
 #: ../plugins/am-project/am-properties.c:627
 #: ../plugins/am-project/am-properties.c:722
+#: ../plugins/am-project/am-properties.c:786
 msgid "Build this target only when running automatic tests."
 msgstr "å?ªå?¨è?ªå?¨æµ?è¯?中æ??建此ç?®æ ?ã??"
 
@@ -4656,6 +4752,7 @@ msgstr "å?ªå?¨è?ªå?¨æµ?è¯?中æ??建此ç?®æ ?ã??"
 #: ../plugins/am-project/am-properties.c:632
 #: ../plugins/am-project/am-properties.c:664
 #: ../plugins/am-project/am-properties.c:727
+#: ../plugins/am-project/am-properties.c:791
 msgid "Do not use prefix:"
 msgstr "ä¸?使ç?¨å??ç¼?ï¼?"
 
@@ -4664,15 +4761,17 @@ msgstr "ä¸?使ç?¨å??ç¼?ï¼?"
 #: ../plugins/am-project/am-properties.c:635
 #: ../plugins/am-project/am-properties.c:667
 #: ../plugins/am-project/am-properties.c:730
+#: ../plugins/am-project/am-properties.c:794
 msgid ""
 "Do not rename the target with an optional prefix, used to avoid overwritting "
 "system program. "
-msgstr ""
+msgstr "ä¸?è¦?é??å?½å??ä¸?个å?¯é??ç??å??ç¼?ç?¨æ?¥é?¿å?? overwritting ç³»ç»?ç¨?åº?ã??"
 
 #: ../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
+#: ../plugins/am-project/am-properties.c:799
 msgid "Keep target path:"
 msgstr "ä¿?æ??ç?®æ ?è·¯å¾?ï¼?"
 
@@ -4680,11 +4779,14 @@ msgstr "ä¿?æ??ç?®æ ?è·¯å¾?ï¼?"
 #: ../plugins/am-project/am-properties.c:491
 #: ../plugins/am-project/am-properties.c:643
 #: ../plugins/am-project/am-properties.c:738
+#: ../plugins/am-project/am-properties.c:802
 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
@@ -4699,8 +4801,7 @@ msgstr "æ??å??ç« è??ï¼?"
 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ã??"
+msgstr "man æ??å??页å®?è£?ç??ç« è??ã??æ??æ??ç« è??å??æ?¬æ?°å­? 0 å?° 9ï¼?以å??å­?æ¯? l å?? nã??"
 
 #: ../plugins/gdb/anjuta-gdb.ui.h:1
 msgid "Available pretty printers"
@@ -4903,271 +5004,271 @@ msgid "Gdb Debugger"
 msgstr "GDB ���"
 
 #: ../plugins/git/anjuta-git.ui.h:1
-msgid "<b>Add Files:</b>"
-msgstr "<b>æ·»å? æ??件ï¼?</b>"
+msgid "Add Files:"
+msgstr "æ·»å? æ??件ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:2
-msgid "<b>Branch name:</b>"
-msgstr "<b>å??æ?¯å??称ï¼?</b>"
+msgid "Add signed off by line"
+msgstr "����签�"
 
 #: ../plugins/git/anjuta-git.ui.h:3
-msgid "<b>Branches:</b>"
-msgstr "<b>å??æ?¯ï¼?</b>"
+msgid "Amend the previous commit"
+msgstr "修正ä¸?ä¸?次æ??交"
 
 #: ../plugins/git/anjuta-git.ui.h:4
-msgid "<b>Branches</b>"
-msgstr "<b>å??æ?¯ï¼?</b>"
+msgid "Annotate this tag:"
+msgstr "注解�个�签�"
 
 #: ../plugins/git/anjuta-git.ui.h:5
-msgid "<b>Commit to cherry pick:</b>"
-msgstr "<b>è¦?ä¼?é??ç?? commitï¼?</b>"
+msgid "Append fetch data"
+msgstr "æ·»å? æ??å??ç??æ?°æ?®"
 
 #: ../plugins/git/anjuta-git.ui.h:6
-msgid "<b>Commit to revert:</b>"
-msgstr "<b>è¦?æ?¢å¤?ç?? commitï¼?</b>"
+msgid "Append signed-of- by line"
+msgstr "é??å? ä¸?è¡?ç­¾å­?"
 
 #: ../plugins/git/anjuta-git.ui.h:7
-msgid "<b>Folder to create patches in:</b>"
-msgstr "<b>补����</b>"
+#: ../plugins/subversion/subversion-log-dialog.c:132
+msgid "Author"
+msgstr "ä½?è??"
 
 #: ../plugins/git/anjuta-git.ui.h:8
-#, fuzzy
-msgid "<b>Generate patches relative to:</b>"
-msgstr "ç??æ??è¡¥ä¸?ç?¸å¯¹äº?ï¼?"
+msgid "Branch name:"
+msgstr "å??æ?¯å??称ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:9
-msgid "<b>Log Message:</b>"
-msgstr "<b>�����</b>"
+msgid "Branch:"
+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:10 ../plugins/git/plugin.c:770
+msgid "Branches"
+msgstr "å??æ?¯"
 
 #: ../plugins/git/anjuta-git.ui.h:11
-msgid "<b>Mode:</b>"
-msgstr "<b>模��</b>"
+msgid "Branches must be fully merged"
+msgstr "å??æ?¯å¿?é¡»å®?å?¨è¢«å??并"
 
 #: ../plugins/git/anjuta-git.ui.h:12
-msgid "<b>Options:</b>"
-msgstr "<b>é??项ï¼?</b>"
+msgid "Branches:"
+msgstr "å??æ?¯ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:13
-msgid "<b>Options</b>"
-msgstr "<b>é??项</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
+msgid "Changes:"
+msgstr "���"
 
 #: ../plugins/git/anjuta-git.ui.h:14
-msgid "<b>Remote Repositories:</b>"
-msgstr "<b>�����</b>"
+msgid "Check out the branch after it is created"
+msgstr "å??æ?¯å??建å??å?³ç­¾å?º"
 
 #: ../plugins/git/anjuta-git.ui.h:15
-msgid "<b>Remote name:</b>"
-msgstr "<b>è¿?ç¨?å??称ï¼?</b>"
+msgid "Commit on fast-forward merges"
+msgstr "å¿«è¿?å??并æ?¶æ??交"
 
 #: ../plugins/git/anjuta-git.ui.h:16
-msgid "<b>Remove Files:</b>"
-msgstr "<b>å? é?¤æ??件ï¼?</b>"
+msgid "Commit to cherry pick:"
+msgstr "è¦?ä¼?é??ç?? commitï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:17
-msgid "<b>Repository Status:</b>"
-msgstr "<b>ä»?åº?ç?¶æ??ï¼?</b>"
+msgid "Commit to revert:"
+msgstr "è¦?æ?¢å¤?ç?? commitï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:18
-#, fuzzy
-msgid "<b>Repository to pull from:</b>"
-msgstr "è?·å??ä¸?å??并è?ªä»?åº?ï¼?"
+#: ../plugins/subversion/subversion-log-dialog.c:141
+msgid "Date"
+msgstr "æ?¥æ??"
 
 #: ../plugins/git/anjuta-git.ui.h:19
-#, fuzzy
-msgid "<b>Repository to push to:</b>"
-msgstr "æ?¨é??è?³ä»?åº?ï¼?"
+msgid "Do not commit"
+msgstr "ä¸?æ??交"
 
 #: ../plugins/git/anjuta-git.ui.h:20
-msgid "<b>Revision to merge with:</b>"
-msgstr "<b>è¦?å??并ç??ç??æ?¬ï¼?</b>"
+msgid "Do not follow tags"
+msgstr "ä¸?è¦?è·?é??æ ?ç­¾"
 
 #: ../plugins/git/anjuta-git.ui.h:21
-msgid "<b>Revision:</b>"
-msgstr "<b>ç??æ?¬ï¼?</b>"
+msgid "Drop or enter revision here"
+msgstr "è¾?å?¥æ??æ??å?¨ç??æ?¬è?³æ­¤"
 
 #: ../plugins/git/anjuta-git.ui.h:22
-msgid "<b>Revision</b>"
-msgstr "<b>ç??æ?¬</b>"
+msgid "Drop or type a revision here"
+msgstr "è¾?å?¥æ??æ??å?¨ç??æ?¬è?³æ­¤"
 
 #: ../plugins/git/anjuta-git.ui.h:23
-#, fuzzy
-msgid "<b>Stash Message (Optional):</b>"
-msgstr "临æ?¶å­?å?¨æ??è¿° (å?¯é??ç??)"
+msgid "E-mail:"
+msgstr "���件�"
 
 #: ../plugins/git/anjuta-git.ui.h:24
-#, fuzzy
-msgid "<b>Stashed Changes:</b>"
-msgstr "临æ?¶å­?å?¨ç´¢å¼?ç??æ?¹å?¨"
+msgid "Fetch remote branches after creation"
+msgstr "å??建å??è?·å??è¿?ç¨?å??æ?¯"
 
 #: ../plugins/git/anjuta-git.ui.h:25
-msgid "<b>Tag name:</b>"
-msgstr "<b>æ ?ç­¾å??称ï¼?</b>"
+msgid "Folder to create patches in:"
+msgstr "补����"
 
 #: ../plugins/git/anjuta-git.ui.h:26
-msgid "<b>Tags:</b>"
-msgstr "<b>�签�</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:19
+msgid "Force"
+msgstr "强�"
 
 #: ../plugins/git/anjuta-git.ui.h:27
-msgid "<b>URL:</b>"
-msgstr "<b>URLï¼?</b>"
+msgid "Generate patches relative to:"
+msgstr "ç??æ??è¡¥ä¸?ç?¸å¯¹äº?ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:28
-msgid "Add signed off by line"
-msgstr ""
+msgid "Graph"
+msgstr "�表"
 
 #: ../plugins/git/anjuta-git.ui.h:29
-msgid "Amernd the previous commit"
-msgstr "修正ä¸?ä¸?次æ??交"
-
-#: ../plugins/git/anjuta-git.ui.h:30
-#, fuzzy
-msgid "Annotate this tag:"
-msgstr "注解�个�签"
+msgid "Hard"
+msgstr "硬é??ç½®(Hard)"
 
 #: ../plugins/git/anjuta-git.ui.h:31
-msgid "Append fetch data"
-msgstr "æ·»å? æ??å??ç??æ?°æ?®"
+#: ../plugins/subversion/anjuta-subversion.ui.h:21
+msgid "Log Message:"
+msgstr "��信��"
 
 #: ../plugins/git/anjuta-git.ui.h:32
-msgid "Append signed-of- by line"
-msgstr ""
+msgid "Mailbox files to apply:"
+msgstr "è¦?åº?ç?¨ç?? Mailbox æ??件ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:33
-msgid "Branch:"
-msgstr "å??æ?¯ï¼?"
+msgid "Mixed"
+msgstr "æ··å??é??ç½®(Mixed)"
 
 #: ../plugins/git/anjuta-git.ui.h:34
-msgid "Branches must be fully merged"
-msgstr "å??æ?¯å¿?é¡»å®?å?¨è¢«å??并"
+msgid "Mode:"
+msgstr "模��"
 
-#: ../plugins/git/anjuta-git.ui.h:35
-#: ../plugins/subversion/anjuta-subversion.ui.h:4
-msgid "Changes:"
-msgstr "���"
-
-#: ../plugins/git/anjuta-git.ui.h:36
-msgid "Check out the branch after it is created"
-msgstr "å??æ?¯å??建å??å?³ç­¾å?º"
-
-#: ../plugins/git/anjuta-git.ui.h:37
-msgid "Column 0"
-msgstr "å?? 0"
+#: ../plugins/git/anjuta-git.ui.h:38
+msgid "Previous commit; Drop or enter a different revision here"
+msgstr "å??ä¸?次æ??交ï¼?å?¨è¿?é??æ??å?¨æ??é?®å?¥ä¸?个ä¸?å??ç??ç??æ?¬"
 
 #: ../plugins/git/anjuta-git.ui.h:39
-msgid "Commit on fast-forward merges"
-msgstr "å¿«è¿?å??并æ?¶æ??交"
+msgid "Push all branches and tags"
+msgstr "æ?¨é??æ??æ??ç??å??æ?¯å??æ ?ç­¾"
 
 #: ../plugins/git/anjuta-git.ui.h:40
-msgid "Do not commit"
-msgstr "ä¸?æ??交"
+msgid "Push all tags"
+msgstr "æ?¨é??æ??æ??ç??æ ?ç­¾"
 
-#: ../plugins/git/anjuta-git.ui.h:41
-msgid "Do not follow tags"
-msgstr "ä¸?è¦?è·?é??æ ?ç­¾"
+#: ../plugins/git/anjuta-git.ui.h:41 ../plugins/git/plugin.c:262
+msgid "Rebase"
+msgstr "é??å®?ä½?"
 
 #: ../plugins/git/anjuta-git.ui.h:42
-msgid "E-mail:"
-msgstr "E-mail:"
+msgid "Remote Repositories:"
+msgstr "�����"
 
 #: ../plugins/git/anjuta-git.ui.h:43
-msgid "Fetch remote branches after creation"
-msgstr "å??建å??è?·å??è¿?ç¨?å??æ?¯"
+msgid "Remote name:"
+msgstr "è¿?ç¨?å??称ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:44
-#: ../plugins/subversion/anjuta-subversion.ui.h:19
-msgid "Force"
-msgstr "强�"
+msgid "Remove Files:"
+msgstr "å? é?¤æ??件ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:45
-msgid "Hard"
-msgstr "硬é??ç½®(Hard)"
+msgid "Repository Status:"
+msgstr "ä»?åº?ç?¶æ??ï¼?"
+
+#: ../plugins/git/anjuta-git.ui.h:46
+msgid "Repository head; Drop or type a different revision here"
+msgstr "ç??æ?¬æ?§å?¶é??å??ï¼?å?¨è¿?é??æ??å?¨æ??é?®å?¥ä¸?个ä¸?å??ç??ç??æ?¬"
 
 #: ../plugins/git/anjuta-git.ui.h:47
-#: ../plugins/subversion/anjuta-subversion.ui.h:21
-msgid "Log Message:"
-msgstr "��信��"
+msgid "Repository origin; Drop or type a different revision here"
+msgstr "ç??æ?¬åº?æº?ï¼?å?¨è¿?é??æ??å?¨æ??é?®å?¥ä¸?个ä¸?å??ç??ç??æ?¬"
 
 #: ../plugins/git/anjuta-git.ui.h:48
-msgid "Mixed"
-msgstr "æ··å??é??ç½®(Mixed)"
+msgid "Repository to pull from:"
+msgstr "è¦?æ??å??ç??ç??æ?¬åº?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:51
-msgid "Push all branches and tags"
-msgstr "æ?¨é??æ??æ??ç??å??æ?¯å??æ ?ç­¾"
+#: ../plugins/git/anjuta-git.ui.h:49
+msgid "Repository to push to:"
+msgstr "è¦?æ?¨é??ç??ç??æ?¬åº?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:52
-msgid "Push all tags"
-msgstr "æ?¨é??æ??æ??ç??æ ?ç­¾"
-
-#: ../plugins/git/anjuta-git.ui.h:53 ../plugins/git/plugin.c:262
-msgid "Rebase"
-msgstr "é??å®?ä½?"
+#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/subversion/subversion-log-dialog.c:151
+msgid "Revision"
+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:51
+msgid "Revision to merge with:"
+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:53
+#: ../plugins/subversion/subversion-log-dialog.c:160
+msgid "Short Log"
+msgstr "���"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Show source revision in log message"
 msgstr "å?¨æ?¥å¿?ä¿¡æ?¯ä¸­æ?¾ç¤ºæº?代ç ?ç??æ?¬"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Sign this tag"
 msgstr "ç»?è¿?个æ ?签签å??"
 
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Soft"
 msgstr "软é??ç½®(Soft)"
 
-#: ../plugins/git/anjuta-git.ui.h:59
+#: ../plugins/git/anjuta-git.ui.h:57
 msgid "Squash"
 msgstr "å??å?¶(Squash)"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:58
+msgid "Stash Message (Optional):"
+msgstr "临æ?¶å­?å?¨æ??è¿°(å?¯é??ç??)ï¼?"
+
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Stash indexed changes"
 msgstr "临æ?¶å­?å?¨ç´¢å¼?ç??æ?¹å?¨"
 
+#: ../plugins/git/anjuta-git.ui.h:60
+msgid "Stashed Changes:"
+msgstr "临æ?¶å­?å?¨ç´¢å¼?ç??æ?¹å?¨ï¼?"
+
 #: ../plugins/git/anjuta-git.ui.h:61
-#, fuzzy
-msgid "This commit concludes a failed merged (use -i)"
-msgstr "è¿?个æ??交以失败ç??å??并ç»?æ?? (ç?¨ -i)"
+msgid "Tag name:"
+msgstr "æ ?ç­¾å??称ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:62
+msgid "Tags:"
+msgstr "�签�"
+
+#: ../plugins/git/anjuta-git.ui.h:63
+msgid "This commit concludes a failed merge (use -i)"
+msgstr "è¿?个æ??交以失败ç??å??并ç»?æ??(ç?¨ -i)"
+
+#: ../plugins/git/anjuta-git.ui.h:65
 msgid "Use a custom log message:"
 msgstr "使���������"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:66
 msgid "Use custom author information:"
 msgstr "使ç?¨å®?å?¶ç??ä½?è??ä¿¡æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/git/anjuta-git.ui.h:67
 #: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "æ?¥ç??æ??件/æ??件夹ç??æ?¥å¿?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:68
 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
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Whole project; Drop a file here to view a file or folder log"
 msgstr "æ?´ä¸ªå·¥ç¨?ï¼?æ??å?¨æ??件è?³æ­¤ä»¥æ?¥ç??æ??件æ??æ??件夹æ?¥å¿?"
 
-#: ../plugins/git/anjuta-git.ui.h:67
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "page 1"
 msgstr "第 1 页"
 
-#: ../plugins/git/anjuta-git.ui.h:68
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "page 2"
 msgstr "第 2 页"
 
@@ -5194,28 +5295,27 @@ msgstr "åº?ç?¨ Mailbox æ??件"
 #: ../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 "没æ??é??æ?©ç»?"
+msgstr "没æ??é??æ?©ç»?ã??"
 
 #: ../plugins/git/git-checkout-pane.c:147
 msgid "Check Out Files"
 msgstr "ç­¾å?ºæ??件"
 
-#: ../plugins/git/git-commit-pane.c:123
+#: ../plugins/git/git-commit-pane.c:124
 #: ../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-pane.c:144
+#: ../plugins/git/git-commit-pane.c:145
 msgid "Please enter the commit author's name"
 msgstr "请è¾?å?¥ä½?è??å§?å??ã??"
 
-#: ../plugins/git/git-commit-pane.c:148
+#: ../plugins/git/git-commit-pane.c:149
 msgid "Please enter the commit author's e-mail address."
 msgstr "请è¾?å?¥ä½?è??ç?µå­?é?®ç®±å?°å??ã??"
 
-#: ../plugins/git/git-commit-pane.c:304 ../plugins/git/plugin.c:146
+#: ../plugins/git/git-commit-pane.c:293 ../plugins/git/plugin.c:146
 msgid "Commit"
 msgstr "æ??交"
 
@@ -5229,7 +5329,18 @@ msgstr "请è¾?å?¥ä¸?个ç??æ?¬ã??"
 msgid "Cherry Pick"
 msgstr "ä¼?é??(Cherry Pick)"
 
-#: ../plugins/git/git-diff-pane.c:103
+#. Translators: default file name for git diff's output
+#: ../plugins/git/git-diff-pane.c:33
+msgid "Uncommitted Changes.diff"
+msgstr "æ?ªæ??交ç?? Changes.diff"
+
+#. Translators: file name for an existing commits diff, %s is an SHASUM of a commit
+#: ../plugins/git/git-diff-pane.c:71
+#, c-format
+msgid "Commit %s.diff"
+msgstr "æ??交 %s.diff"
+
+#: ../plugins/git/git-diff-pane.c:104
 msgid "No revision selected"
 msgstr "没æ??é??æ?©ç??æ?¬"
 
@@ -5266,9 +5377,9 @@ msgid "No tags selected."
 msgstr "没æ??é??æ?©æ ?ç­¾ã??"
 
 #: ../plugins/git/git-diff-stash-pane.c:40
-#, fuzzy, c-format
+#, c-format
 msgid "Stash %i.diff"
-msgstr "æ ?å?? diff"
+msgstr "临��� %i.diff"
 
 #: ../plugins/git/git-log-pane.c:560
 #, c-format
@@ -5285,7 +5396,7 @@ msgstr "<b>�签�</b> %s"
 msgid "<b>Remote:</b> %s"
 msgstr "<b>���</b> %s"
 
-#: ../plugins/git/git-merge-pane.c:222 ../plugins/git/plugin.c:97
+#: ../plugins/git/git-merge-pane.c:210 ../plugins/git/plugin.c:97
 msgid "Merge"
 msgstr "å??并"
 
@@ -5343,6 +5454,8 @@ msgid ""
 "No remote selected; using origin by default.\n"
 "To push to a different remote, select one from the Remotes list above."
 msgstr ""
+"没æ??è¿?ç¨?é??æ?©ï¼?é»?认使ç?¨æ?¥æº?ã??\n"
+"æ?¨è¿?å?°ä¸?å??ç??è¿?ç¨?,ä»?å??表中é??æ?©ä¸?è¿°å?¶ä¸­ä¸?个è¿?ç¨?ã??"
 
 #: ../plugins/git/git-resolve-conflicts-pane.c:50
 msgid "No conflicted files selected."
@@ -5361,9 +5474,8 @@ msgid "Changed but not updated"
 msgstr "æ?¹å??ä½?æ?ªæ?´æ?°"
 
 #: ../plugins/git/git-unstage-pane.c:51
-#, fuzzy
 msgid "No staged files selected."
-msgstr "没æ??é??中ç??ç?®æ ?"
+msgstr "没æ??é??中ç??ç?®æ ?ã??"
 
 #: ../plugins/git/plugin.c:65
 msgid "Branch tools"
@@ -5427,22 +5539,18 @@ msgid "Remove files from the repository"
 msgstr "ä»?ä»?åº?中å? é?¤æ??件"
 
 #: ../plugins/git/plugin.c:186
-#, fuzzy
 msgid "Check out"
 msgstr "ç­¾å?ºæ??件"
 
 #: ../plugins/git/plugin.c:187
-#, fuzzy
 msgid "Revert changes in unstaged files"
 msgstr "è¿?å??æ?ªæ??交ç??æ?´æ?¹è?³æ??件"
 
 #: ../plugins/git/plugin.c:194
-#, fuzzy
 msgid "Unstage"
 msgstr "å??æ¶?ç¼?å­?æ??件"
 
 #: ../plugins/git/plugin.c:195
-#, fuzzy
 msgid "Remove staged files from the index"
 msgstr "ä»?æ??交索å¼?中å? é?¤æ??件"
 
@@ -5479,33 +5587,30 @@ msgid "Push changes to a remote repository"
 msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
 
 #: ../plugins/git/plugin.c:247
-#, fuzzy
 msgid "Pull changes from a remote repository"
-msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
+msgstr "è¿?ç¨?ç??æ?¬æ??å?¨ç??å??å??"
 
 #: ../plugins/git/plugin.c:254
 msgid "Fetch"
 msgstr "è?·å??"
 
 #: ../plugins/git/plugin.c:255
-#, fuzzy
 msgid "Fetch changes from remote repositories"
-msgstr "å??è¿?ç¨?ä»?åº?æ?¨é??æ?´æ?¹"
+msgstr "è¿?ç¨?ç??æ?¬æ??å??ç??å??å??"
 
 #: ../plugins/git/plugin.c:270
 msgid "Rebase against selected remote"
-msgstr ""
+msgstr "对é??å®?ç??è¿?ç¨?å??å?º"
 
 #: ../plugins/git/plugin.c:271
 msgid "Start a rebase operation relative to the selected remote repository"
-msgstr ""
+msgstr "ç?¸å¯¹äº?é??å®?ç??è¿?ç¨?åº?å?¯å?¨ä¸?个å??å?ºæ??ä½?"
 
 #: ../plugins/git/plugin.c:278 ../plugins/git/plugin.c:446
 msgid "Continue"
 msgstr "继续"
 
 #: ../plugins/git/plugin.c:279
-#, fuzzy
 msgid "Continue a rebase with resolved conflicts"
 msgstr "解å?³å?²çª?å??继续(_C)"
 
@@ -5522,96 +5627,78 @@ msgid "Abort"
 msgstr "中止"
 
 #: ../plugins/git/plugin.c:295
-#, fuzzy
 msgid "Abort the rebase and return the repository to its previous state"
-msgstr "æ?¾å¼? Rebase 并ä¸?让ä»?åº?å??å?°å??å§?ç?¶æ??"
+msgstr "ç»?æ­¢å??å?ºå¹¶ä¸?è¿?å??å?°å??å§?ç?¶æ??"
 
 #: ../plugins/git/plugin.c:306
-#, fuzzy
 msgid "Stash tools"
-msgstr "è¦?åº?ç?¨ç??临æ?¶å­?å?¨"
+msgstr "临���工�"
 
 #: ../plugins/git/plugin.c:314
-#, fuzzy
 msgid "Stash uncommitted changes"
-msgstr "临æ?¶å­?å?¨æ?ªæ??交ç??æ?´æ?¹(_S)..."
+msgstr "临æ?¶å­?å?¨æ?ªæ??交ç??æ?´æ?¹"
 
 #: ../plugins/git/plugin.c:315
-#, fuzzy
 msgid "Save uncommitted changes without committing them"
 msgstr "è¿?å??æ?ªæ??交ç??æ?´æ?¹è?³æ??件"
 
 #: ../plugins/git/plugin.c:322
-#, fuzzy
 msgid "Apply selected stash"
 msgstr "åº?ç?¨äº?é??中ç??临æ?¶å­?å?¨"
 
 #: ../plugins/git/plugin.c:323
-#, fuzzy
 msgid "Apply stashed changes back into the working tree"
 msgstr "åº?ç?¨ä¸´æ?¶å­?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
 
 #: ../plugins/git/plugin.c:330
-#, fuzzy
 msgid "Apply stash and restore index"
-msgstr "åº?ç?¨ä¸´æ?¶å­?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
+msgstr "åº?ç?¨å­?å?¨å??æ?¢å¤?æ??æ?°"
 
 #: ../plugins/git/plugin.c:331
-#, fuzzy
 msgid "Apply stashed changes back into the working tree and the index"
-msgstr "åº?ç?¨ä¸´æ?¶å­?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?"
+msgstr "åº?ç?¨ä¸´æ?¶å­?å?¨ç??æ?´æ?¹å?°å·¥ä½?æº?ç ?æ ?å??ç´¢å¼?"
 
 #: ../plugins/git/plugin.c:338
-#, fuzzy
 msgid "Diff selected stash"
-msgstr "丢å¼?é??中ç??临æ?¶å­?å?¨"
+msgstr "å·®å¼?ç??临æ?¶å­?å?¨"
 
 #: ../plugins/git/plugin.c:339
-#, fuzzy
 msgid "Show a diff of the selected stash"
-msgstr "丢å¼?é??中ç??临æ?¶å­?å?¨"
+msgstr "æ?¾ç¤ºå·®å¼?ç??临æ?¶å­?å?¨"
 
 #: ../plugins/git/plugin.c:346
-#, fuzzy
 msgid "Drop selected stash"
-msgstr "丢å¼?é??中ç??临æ?¶å­?å?¨"
+msgstr "æ??å?¨é??中ç??临æ?¶å­?å?¨"
 
 #: ../plugins/git/plugin.c:347
-#, fuzzy
 msgid "Delete the selected stash"
-msgstr "丢å¼?é??中ç??临æ?¶å­?å?¨"
+msgstr "å? é?¤é??中ç??临æ?¶å­?å?¨"
 
 #: ../plugins/git/plugin.c:354
 msgid "Clear all stashes"
 msgstr "����临���"
 
 #: ../plugins/git/plugin.c:355
-#, fuzzy
 msgid "Delete all stashes in this repository"
-msgstr "é??å??ç¼?è¾?å?¨å??ç??å?¨é?¨æ??å­?"
+msgstr "å? é?¤è¿?个åº?中ç??æ??æ??å?¨å­?"
 
 #: ../plugins/git/plugin.c:366
-#, fuzzy
 msgid "Revision tools"
-msgstr "ç??æ?¬ï¼?"
+msgstr "修订工�"
 
 #: ../plugins/git/plugin.c:374
-#, fuzzy
 msgid "Show commit diff"
-msgstr "æ?¾ç¤ºæ??交差å¼? (_S)"
+msgstr "æ?¾ç¤ºæ??交差å¼?"
 
 #: ../plugins/git/plugin.c:375
-#, fuzzy
 msgid "Show a diff of the selected revision"
-msgstr "æ?¥ç??é??中ç??ç??æ?¬(_V)"
+msgstr "æ?¾ç¤ºæ??é??ç??æ?¬ç??å·®å¼?"
 
 #: ../plugins/git/plugin.c:382
-#, fuzzy
 msgid "Cherry pick"
-msgstr "ä¼?é??(Cherry Pick)"
+msgstr "ä¼?é??"
 
 #: ../plugins/git/plugin.c:383
-#, fuzzy
 msgid "Merge an individual commit from another branch"
 msgstr "å??并此æ??交å?°å½?å??å??æ?¯"
 
@@ -5624,12 +5711,10 @@ msgid "Reset tree"
 msgstr "é??ç½®æº?ç ?æ ?"
 
 #: ../plugins/git/plugin.c:399
-#, fuzzy
 msgid "Reset tree to a previous revision"
 msgstr "é??ç½®ä»?åº?顶端è?³è¿?个ç??æ?¬"
 
 #: ../plugins/git/plugin.c:406
-#, fuzzy
 msgid "Revert commit"
 msgstr "è¿?å??ä¸?个æ??交"
 
@@ -5642,36 +5727,30 @@ msgid "Patch series"
 msgstr "è¡¥ä¸?é??"
 
 #: ../plugins/git/plugin.c:422 ../plugins/git/plugin.c:423
-#, fuzzy
 msgid "Generate a patch series"
 msgstr "å??建æ?°ç?®å½?"
 
 #: ../plugins/git/plugin.c:430
-#, fuzzy
 msgid "Mailbox files"
-msgstr "åº?ç?¨äº?å?¨é?¨æ??件"
+msgstr "Mailbox æ??件"
 
 #: ../plugins/git/plugin.c:438
 msgid "Apply mailbox files"
 msgstr "åº?ç?¨äº?å?¨é?¨æ??件"
 
 #: ../plugins/git/plugin.c:439
-#, fuzzy
 msgid "Apply patches from mailbox files"
 msgstr "åº?ç?¨äº?å?¨é?¨æ??件"
 
 #: ../plugins/git/plugin.c:447
-#, fuzzy
 msgid "Continue applying patches with resolved conflicts"
 msgstr "解å?³å?²çª?å??继续åº?ç?¨è¡¥ä¸?åº?å??"
 
 #: ../plugins/git/plugin.c:455
-#, fuzzy
 msgid "Skip the current patch in the series"
 msgstr "è·³è¿?åº?å??中å½?å??è¡¥ä¸?并ä¸?继续"
 
 #: ../plugins/git/plugin.c:463
-#, fuzzy
 msgid ""
 "Stop applying the patch series and return the tree to its previous state"
 msgstr "å??æ­¢åº?ç?¨è¡¥ä¸?åº?å??并ä¸?è¿?å??å?°ä»?åº?å??å§?ç??ç?¶æ??"
@@ -5692,10 +5771,6 @@ msgstr "ç?¶æ??"
 msgid "Log"
 msgstr "��"
 
-#: ../plugins/git/plugin.c:770
-msgid "Branches"
-msgstr "å??æ?¯"
-
 #: ../plugins/git/plugin.c:775
 msgid "Tags"
 msgstr "æ ?ç­¾"
@@ -5708,29 +5783,37 @@ msgstr "�端"
 msgid "Stash"
 msgstr "临���"
 
-#: ../plugins/glade/plugin.c:375
+#: ../plugins/glade/plugin.c:460
+msgid "Select widgets in the workspace"
+msgstr "é??å??ç¼?è¾?å?¨å??ç??å?¨é?¨æ??å­?"
+
+#: ../plugins/glade/plugin.c:486
+msgid "Drag and resize widgets in the workspace"
+msgstr "å?¨å·¥ä½?å?ºä¸­æ??å?¨å??è°?æ?´é?¨ä»¶"
+
+#: ../plugins/glade/plugin.c:514
 msgid "Loading Gladeâ?¦"
 msgstr "载� Glade..."
 
-#: ../plugins/glade/plugin.c:420
+#: ../plugins/glade/plugin.c:590
 msgid "Widgets"
 msgstr "�件"
 
-#: ../plugins/glade/plugin.c:425
+#: ../plugins/glade/plugin.c:595
 msgid "Palette"
 msgstr "���"
 
-#: ../plugins/glade/plugin.c:541
+#: ../plugins/glade/plugin.c:718
 #, c-format
 msgid "Not local file: %s"
 msgstr "ä¸?æ?¯æ?¬å?°æ??件ï¼?%s"
 
-#: ../plugins/glade/plugin.c:587
+#: ../plugins/glade/plugin.c:764
 #, c-format
 msgid "Could not open %s"
 msgstr "æ? æ³?æ??å¼? %s"
 
-#: ../plugins/glade/plugin.c:642
+#: ../plugins/glade/plugin.c:821
 msgid "Could not create a new glade project."
 msgstr "æ? æ³?å??建æ?°ç?? glade 项ç?®ã??"
 
@@ -5798,7 +5881,7 @@ msgstr "è­¦å??ä¿¡æ?¯æ??示符样å¼?ï¼?"
 msgid "Warnings:"
 msgstr "è­¦å??ï¼?"
 
-#: ../plugins/message-view/anjuta-msgman.c:75
+#: ../plugins/message-view/anjuta-msgman.c:83
 msgid "Close all message tabs"
 msgstr "å?³é?­æ??æ??æ¶?æ?¯æ ?ç­¾"
 
@@ -5807,12 +5890,12 @@ msgid "Icon"
 msgstr "��"
 
 #: ../plugins/message-view/message-view.c:511
-#: ../plugins/message-view/plugin.c:383 ../plugins/message-view/plugin.c:396
-#: ../plugins/message-view/plugin.c:515 ../plugins/message-view/plugin.c:526
+#: ../plugins/message-view/plugin.c:386 ../plugins/message-view/plugin.c:399
+#: ../plugins/message-view/plugin.c:518 ../plugins/message-view/plugin.c:529
 msgid "Messages"
 msgstr "ä¿¡æ?¯"
 
-#: ../plugins/message-view/message-view.c:856
+#: ../plugins/message-view/message-view.c:869
 #, c-format
 msgid "Error writing %s"
 msgstr "å??å?¥ %s æ?¶å?ºé??"
@@ -5849,55 +5932,55 @@ msgstr "����(_S)"
 msgid "Save message"
 msgstr "����"
 
-#: ../plugins/message-view/plugin.c:169
+#: ../plugins/message-view/plugin.c:168
 msgid "Next/Previous Message"
 msgstr "���/�����"
 
-#: ../plugins/message-view/plugin.c:269
+#: ../plugins/message-view/plugin.c:268
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
 msgstr[0] "%d ���"
 
-#: ../plugins/message-view/plugin.c:278
+#: ../plugins/message-view/plugin.c:277
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
 msgstr[0] "%d æ?¡ä¿¡æ?¯"
 
-#: ../plugins/message-view/plugin.c:287
+#: ../plugins/message-view/plugin.c:286
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
 msgstr[0] "%d 个警å??"
 
-#: ../plugins/message-view/plugin.c:296
+#: ../plugins/message-view/plugin.c:295
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
 msgstr[0] "%d 个é??误"
 
 #: ../plugins/mk-project/mk-project.c:460
-#, fuzzy, c-format
+#, 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
+#: ../plugins/mk-project/mk-project.ui.h:2
 msgid "Add _module"
 msgstr "æ·»å? æ¨¡å??(_M)"
 
-#: ../plugins/mk-project/mk-project.ui.h:5
+#: ../plugins/mk-project/mk-project.ui.h:4
 msgid "Packages"
 msgstr "å??"
 
+#: ../plugins/mk-project/mk-project.ui.h:5
+msgid "Select Package to add:"
+msgstr "é??æ?©è¦?æ·»å? ç??å??ï¼?"
+
 #: ../plugins/mk-project/mk-project.ui.h:6
 msgid "Select package"
 msgstr "é??æ?©å??"
@@ -5914,32 +5997,32 @@ msgstr "è¡¥ä¸?æ??件"
 msgid "Patches"
 msgstr "补�"
 
-#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
-msgid "Patch"
-msgstr "补�"
-
-#: ../plugins/patch/patch-plugin.c:186
+#: ../plugins/patch/patch-plugin.c:170
 msgid "Please select the directory where the patch should be applied"
 msgstr "请é??æ?©è¡¥ä¸?è¦?åº?ç?¨å?°å?ªä¸ªç?®å½?"
 
-#: ../plugins/patch/patch-plugin.c:197
+#: ../plugins/patch/patch-plugin.c:181 ../plugins/patch/patch-plugin.ui.h:3
+msgid "Patch"
+msgstr "补�"
+
+#: ../plugins/patch/patch-plugin.c:198
 #, c-format
 msgid "Patching %s using %s\n"
 msgstr "使ç?¨ %2$s ç»? %1$s æ??è¡¥ä¸?\n"
 
-#: ../plugins/patch/patch-plugin.c:209
+#: ../plugins/patch/patch-plugin.c:210
 msgid "Patchingâ?¦\n"
 msgstr "æ­£å?¨æ??è¡¥ä¸?...\n"
 
-#: ../plugins/patch/patch-plugin.c:219
+#: ../plugins/patch/patch-plugin.c:220
 msgid "Patchingâ?¦"
 msgstr "æ­£å?¨æ??è¡¥ä¸?..."
 
-#: ../plugins/patch/patch-plugin.c:224
+#: ../plugins/patch/patch-plugin.c:225
 msgid "There are unfinished jobs: please wait until they are finished."
 msgstr "ä»?æ??ä¸?äº?æ?ªå®?æ??ç??ä»»å?¡ï¼?请ç­?å??ç?´è?³å·¥ä½?å®?æ??ã??"
 
-#: ../plugins/patch/patch-plugin.c:266
+#: ../plugins/patch/patch-plugin.c:267
 msgid ""
 "Patch failed.\n"
 "Please review the failure messages.\n"
@@ -5949,7 +6032,7 @@ msgstr ""
 "请é¢?è§?失败æ¶?æ?¯ã??\n"
 "请æ£?æ?¥å¹¶å? é?¤è¢«æ??ç»?ç??æ??件ã??\n"
 
-#: ../plugins/patch/patch-plugin.c:272
+#: ../plugins/patch/patch-plugin.c:273
 msgid "Patching complete"
 msgstr "è¡¥ä¸?å®?æ??"
 
@@ -6022,7 +6105,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
-msgstr "æ??ä¾?ç?? URI â??%sâ??ä¸?è?½ç­¾å?ºï¼?è¿?å??é??误ï¼?â??%sâ??"
+msgstr "æ??ä¾?ç?? URIâ??%sâ??ä¸?è?½ç­¾å?ºï¼?è¿?å??é??误ï¼?â??%sâ??"
 
 #: ../plugins/project-import/project-import.ui.h:1
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:12
@@ -6042,6 +6125,8 @@ msgstr "æ??ä¾?ç?? URI â??%sâ??ä¸?è?½ç­¾å?ºï¼?è¿?å??é??误ï¼?â??%sâ??"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:9
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:9
 #: ../plugins/project-wizard/templates/library.wiz.in.h:13
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:13
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "ç?®ç??ï¼?"
@@ -6111,7 +6196,6 @@ msgid "Package list:"
 msgstr "å??å??表ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:10
-#, fuzzy
 msgid "Select the _target for the library:"
 msgstr "为模å??é??æ?©ç?®æ ?(_T)ï¼?"
 
@@ -6124,7 +6208,6 @@ msgid "Source files:"
 msgstr "æº?æ??件ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:13
-#, fuzzy
 msgid "Specify _where to create the directory:"
 msgstr "æ??å®?å??建ç?®æ ?ç??ä½?ç½®(_W)ï¼?"
 
@@ -6153,17 +6236,17 @@ msgid "_Module name:"
 msgstr "模å??å??称(_M)ï¼?"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:20
-msgid "_New library&#x2026;"
-msgstr ""
+msgid "_New libraryâ?¦"
+msgstr "�建���(_L)..."
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:21
-msgid "_Select file to add&#x2026;"
+msgid "_Select file to addâ?¦"
 msgstr "é??æ?©è¦?æ·»å? ç??æ??件(_S)..."
 
 #: ../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-manager/plugin.c:1618 ../plugins/symbol-db/plugin.c:2124
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "项�"
@@ -6351,7 +6434,7 @@ msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
 #: ../plugins/project-manager/plugin.c:917
-#: ../plugins/project-manager/dialogs.c:517
+#: ../plugins/project-manager/dialogs.c:530
 msgid "Project properties"
 msgstr "项���"
 
@@ -6444,11 +6527,11 @@ msgstr "项ç?®ç®¡ç??å?¨å?¨ä½?"
 msgid "Project manager popup actions"
 msgstr "项ç?®ç®¡ç??å?¨å¼¹å?ºå¼?å?¨ä½?"
 
-#: ../plugins/project-manager/plugin.c:2329
+#: ../plugins/project-manager/plugin.c:2347
 msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??项ç?®..."
 
-#: ../plugins/project-manager/plugin.c:2332
+#: ../plugins/project-manager/plugin.c:2350
 msgid "Project Loaded"
 msgstr "项�已被�载"
 
@@ -6463,77 +6546,76 @@ msgstr "项�已被�载"
 msgid "Select sourcesâ?¦"
 msgstr "é??æ?©æº?..."
 
-#: ../plugins/project-manager/dialogs.c:369
+#: ../plugins/project-manager/dialogs.c:372
 msgid " This property is not modifiable."
 msgstr "该å±?æ?§æ? æ³?æ?´æ?¹ã??"
 
-#: ../plugins/project-manager/dialogs.c:520
+#: ../plugins/project-manager/dialogs.c:533
 msgid "Directory properties"
 msgstr "����"
 
-#: ../plugins/project-manager/dialogs.c:523
+#: ../plugins/project-manager/dialogs.c:536
 msgid "Target properties"
 msgstr "����"
 
-#: ../plugins/project-manager/dialogs.c:526
+#: ../plugins/project-manager/dialogs.c:539
 msgid "Source properties"
 msgstr "����"
 
-#: ../plugins/project-manager/dialogs.c:529
+#: ../plugins/project-manager/dialogs.c:542
 msgid "Module properties"
 msgstr "模å??å±?æ?§"
 
-#: ../plugins/project-manager/dialogs.c:532
+#: ../plugins/project-manager/dialogs.c:545
 msgid "Package properties"
 msgstr "å??å±?æ?§"
 
-#: ../plugins/project-manager/dialogs.c:535
+#: ../plugins/project-manager/dialogs.c:548
 msgid "Unknown properties"
 msgstr "����"
 
-#: ../plugins/project-manager/dialogs.c:930
-#: ../plugins/project-manager/dialogs.c:941
+#: ../plugins/project-manager/dialogs.c:946
+#: ../plugins/project-manager/dialogs.c:957
 msgid "Cannot add group"
 msgstr "��添��"
 
-#: ../plugins/project-manager/dialogs.c:942
+#: ../plugins/project-manager/dialogs.c:958
 msgid "No parent group selected"
 msgstr "没æ??é??中ç?¶ç»?"
 
-#: ../plugins/project-manager/dialogs.c:1156
-#: ../plugins/project-manager/dialogs.c:1166
+#: ../plugins/project-manager/dialogs.c:1172
+#: ../plugins/project-manager/dialogs.c:1182
 msgid "Cannot add source files"
 msgstr "ä¸?è?½æ·»å? æº?æ??件"
 
-#: ../plugins/project-manager/dialogs.c:1167
-#, fuzzy
+#: ../plugins/project-manager/dialogs.c:1183
 msgid "The selected node cannot contain source files."
 msgstr "é??æ?©ç??è??ç?¹ä¸?è?½å??å?«æº?æ??件ã??"
 
-#: ../plugins/project-manager/dialogs.c:1353
-#: ../plugins/project-manager/dialogs.c:1364
+#: ../plugins/project-manager/dialogs.c:1369
+#: ../plugins/project-manager/dialogs.c:1380
 msgid "Cannot add target"
 msgstr "��添���"
 
-#: ../plugins/project-manager/dialogs.c:1365
+#: ../plugins/project-manager/dialogs.c:1381
 msgid "No group selected"
 msgstr "没æ??é??æ?©ç»?"
 
-#: ../plugins/project-manager/dialogs.c:1524
-#: ../plugins/project-manager/dialogs.c:1535
+#: ../plugins/project-manager/dialogs.c:1540
+#: ../plugins/project-manager/dialogs.c:1551
 msgid "Cannot add modules"
 msgstr "ä¸?è?½æ·»å? æ¨¡å??"
 
-#: ../plugins/project-manager/dialogs.c:1536
+#: ../plugins/project-manager/dialogs.c:1552
 msgid "No target has been selected"
 msgstr "没æ??é??中ç??ç?®æ ?"
 
 #. Missing module name
-#: ../plugins/project-manager/dialogs.c:1739
+#: ../plugins/project-manager/dialogs.c:1755
 msgid "Missing module name"
 msgstr "缺å°?模å??å??称"
 
-#: ../plugins/project-manager/dialogs.c:1801
+#: ../plugins/project-manager/dialogs.c:1817
 msgid "Cannot add packages"
 msgstr "ä¸?è?½æ·»å? å??"
 
@@ -6580,24 +6662,24 @@ msgstr ""
 "â??%sâ??æ?¯å¿?å¡«ç??ã??请填ä¸?å®?ã??"
 
 #: ../plugins/project-wizard/druid.c:646
-#, fuzzy, c-format
+#, 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."
 msgstr ""
-"â??%sâ??å­?段å?ªè?½å??å?«å­?æ¯?ã??æ?°å­?æ??以ä¸?å­?符â??#$:%+, = ^_`~â??ã??å?¦å¤?æ?¨ä¸?è?½ç?¨ä¸?å??线å¼?头ã??"
-"请æ?´æ­£ã??"
+"â??%sâ??å­?段å?ªè?½å??å?«å­?æ¯?ï¼?æ?°å­?æ??以ä¸?å­?符\"#$:%%+, = ^_`~\"ã??å?¦å¤?æ?¨ä¸?è?½ç?¨ä¸?å??线å¼?"
+"头ã??请æ?´æ­£ã??"
 
 #: ../plugins/project-wizard/druid.c:651
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Field \"%s\" must contains only letters, digits, the following characters \"#"
 "$:%%+, = ^_`~\" or directory separators. In addition you cannot have a "
 "leading dash. Please fix it."
 msgstr ""
-"â??%sâ??å­?段å?ªè?½å??å?«å­?æ¯?ã??æ?°å­?ã??以ä¸?å­?符â??#$:%+, = ^_`~â??æ??ç?®å½?å??é??符ã??å?¦å¤?æ?¨ä¸?è?½ç?¨"
-"ä¸?å??线å¼?头ã??请æ?´æ­£ã??"
+"â??%sâ??å­?段å?ªè?½å??å?«å­?æ¯?ï¼?æ?°å­?ï¼?以ä¸?å­?符\"#$:%%+, = ^_`~\" æ??ç?®å½?å??é??符ã??å?¦å¤?æ?¨"
+"ä¸?è?½ç?¨ä¸?å??线å¼?头ã??请æ?´æ­£ã??"
 
 #: ../plugins/project-wizard/druid.c:656
 #, c-format
@@ -6656,7 +6738,6 @@ msgid "Install missing packages"
 msgstr "å®?è£?缺失ç??软件å??"
 
 #: ../plugins/project-wizard/druid.c:928
-#, fuzzy
 msgid ""
 "The missing programs are usually part of some distribution packages and can "
 "be searched for in your Application Manager. Similarly, the development "
@@ -6723,29 +6804,29 @@ msgstr "æ? æ³?æ??å??项ç?®æ¨¡æ?¿ %sï¼?%s"
 msgid "New Project Assistant"
 msgstr "æ?°å»ºé¡¹ç?®å??导"
 
-#: ../plugins/project-wizard/property.c:340
+#: ../plugins/project-wizard/property.c:341
 msgid "Select directory"
 msgstr "é??æ?©ç?®å½?"
 
-#: ../plugins/project-wizard/property.c:348
+#: ../plugins/project-wizard/property.c:358
 msgid "Select file"
 msgstr "é??æ?©æ??件"
 
-#: ../plugins/project-wizard/property.c:398 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:408 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é??æ?©ä¸?个å?¾å??æ??件"
 
-#: ../plugins/project-wizard/property.c:423
-#: ../plugins/project-wizard/property.c:511 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:433
+#: ../plugins/project-wizard/property.c:521 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é??æ?©å?¾æ ?"
 
-#: ../plugins/project-wizard/property.c:481
+#: ../plugins/project-wizard/property.c:491
 msgid "Choose directory"
 msgstr "é??æ?©ç?®å½?"
 
-#: ../plugins/project-wizard/property.c:485
+#: ../plugins/project-wizard/property.c:495
 msgid "Choose file"
 msgstr "é??æ?©æ??件"
 
@@ -6761,6 +6842,7 @@ msgstr "é??ç?¨æ??å°?å??ç??项ç?®"
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:2
 #: ../plugins/project-wizard/templates/library.wiz.in.h:2
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:1
 msgid "Add C++ support:"
 msgstr "æ·»å?  C++ æ?¯æ??ï¼?"
 
@@ -6775,6 +6857,8 @@ msgstr "æ·»å?  C++ æ?¯æ??ï¼?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:3
 #: ../plugins/project-wizard/templates/java.wiz.in.h:4
 #: ../plugins/project-wizard/templates/python.wiz.in.h:4
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:1
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:4
 msgid "Add shared library support:"
 msgstr "æ·»å? å?±äº«åº?æ?¯æ??ï¼?"
 
@@ -6785,6 +6869,7 @@ msgstr "æ·»å? å?±äº«åº?æ?¯æ??ï¼?"
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:5
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:4
 #: ../plugins/project-wizard/templates/library.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:5
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr "为项ç?®æ·»å?  C++ æ?¯æ??ï¼?以便å??建 C++ æº?æ??件ã??"
 
@@ -6799,6 +6884,8 @@ msgstr "为项ç?®æ·»å?  C++ æ?¯æ??ï¼?以便å??建 C++ æº?æ??件ã??"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:4
 #: ../plugins/project-wizard/templates/java.wiz.in.h:5
 #: ../plugins/project-wizard/templates/python.wiz.in.h:5
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:2
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:6
 msgid "Adds support for building shared libraries in your project"
 msgstr "å?¨æ?¨ç??项ç?®ä¸­æ·»å? æ??建å?±äº«åº?ç??æ?¯æ??"
 
@@ -6818,6 +6905,8 @@ msgstr "å?¨æ?¨ç??项ç?®ä¸­æ·»å? æ??建å?±äº«åº?ç??æ?¯æ??"
 #: ../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
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:8
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
@@ -6837,6 +6926,8 @@ msgstr "ä½?è??ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:4
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:7
 #: ../plugins/project-wizard/templates/library.wiz.in.h:7
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:9
 msgid "Basic information"
 msgstr "��信�"
 
@@ -6856,6 +6947,8 @@ msgstr "��信�"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:5
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:8
 #: ../plugins/project-wizard/templates/library.wiz.in.h:8
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:10
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "Berkeley Software Distribution License (BSD)"
 
@@ -6889,6 +6982,8 @@ msgstr "é??中æ?¨é¡¹ç?®æ??é??è¦?ç??å??"
 #: ../plugins/project-wizard/templates/python.wiz.in.h:11
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:7
 #: ../plugins/project-wizard/templates/library.wiz.in.h:11
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:11
 msgid "Configure external packages"
 msgstr "é??ç½®å¤?é?¨å??"
 
@@ -6906,6 +7001,8 @@ msgstr "é??ç½®å¤?é?¨å??"
 #: ../plugins/project-wizard/templates/python.wiz.in.h:12
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:8
 #: ../plugins/project-wizard/templates/library.wiz.in.h:12
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:7
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:12
 msgid "Configure external packages:"
 msgstr "é??ç½®å¤?é?¨å??ï¼?"
 
@@ -6925,6 +7022,8 @@ msgstr "é??ç½®å¤?é?¨å??ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:10
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:10
 #: ../plugins/project-wizard/templates/library.wiz.in.h:14
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:9
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:14
 msgid "Email address:"
 msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
 
@@ -6945,6 +7044,8 @@ msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:11
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:11
 #: ../plugins/project-wizard/templates/library.wiz.in.h:15
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:17
 msgid "General Project Information"
 msgstr "项�常�信�"
 
@@ -6968,6 +7069,8 @@ msgstr "é??ç?¨ (Minimal)"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:14
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:14
 #: ../plugins/project-wizard/templates/library.wiz.in.h:19
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:15
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:21
 msgid "License"
 msgstr "许�"
 
@@ -6987,6 +7090,8 @@ msgstr "许�"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:15
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:16
 #: ../plugins/project-wizard/templates/library.wiz.in.h:20
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:16
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:22
 msgid "No license"
 msgstr "�许�"
 
@@ -7006,6 +7111,8 @@ msgstr "�许�"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:16
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:17
 #: ../plugins/project-wizard/templates/library.wiz.in.h:23
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:23
 msgid "Options for project build system"
 msgstr "项ç?®æ??建系ç»?é??项"
 
@@ -7026,6 +7133,8 @@ msgstr "项ç?®æ??建系ç»?é??项"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:17
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:18
 #: ../plugins/project-wizard/templates/library.wiz.in.h:24
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:18
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:24
 msgid "Project Name:"
 msgstr "项ç?®å??称ï¼?"
 
@@ -7046,6 +7155,8 @@ msgstr "项ç?®å??称ï¼?"
 #: ../plugins/project-wizard/templates/mkfile.wiz.in.h:6
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:19
 #: ../plugins/project-wizard/templates/library.wiz.in.h:25
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:19
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:25
 msgid "Project options"
 msgstr "项ç?®é??项"
 
@@ -7081,6 +7192,8 @@ msgstr "é??è¦?ç??å??ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:22
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:32
 #: ../plugins/project-wizard/templates/library.wiz.in.h:27
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:21
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:27
 msgid "Select code license"
 msgstr "é??æ?©ä»£ç ?许å?¯"
 
@@ -7096,8 +7209,10 @@ msgstr "é??æ?©ä»£ç ?许å?¯"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:27
 #: ../plugins/project-wizard/templates/java.wiz.in.h:28
 #: ../plugins/project-wizard/templates/python.wiz.in.h:26
-#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:23
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:25
 #: ../plugins/project-wizard/templates/library.wiz.in.h:30
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:25
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:30
 msgid "Use pkg-config to add library support from other packages"
 msgstr "使ç?¨ pkg-config 以ä»?å?¶å®?软件å??中添å? åº?æ?¯æ??"
 
@@ -7114,9 +7229,11 @@ msgstr "使ç?¨ pkg-config 以ä»?å?¶å®?软件å??中添å? åº?æ?¯æ??"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:31
 #: ../plugins/project-wizard/templates/js.wiz.in.h:18
 #: ../plugins/project-wizard/templates/python.wiz.in.h:29
-#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:25
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:27
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:34
 #: ../plugins/project-wizard/templates/library.wiz.in.h:32
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:33
 msgid "project name"
 msgstr "项ç?®å??称"
 
@@ -7137,6 +7254,7 @@ msgstr "é??ç?¨é¡¹ç?®"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:1
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:3
 #: ../plugins/project-wizard/templates/library.wiz.in.h:3
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:3
 msgid "Add internationalization:"
 msgstr "æ·»å? å?½é??å??ï¼?"
 
@@ -7153,6 +7271,7 @@ msgstr "æ·»å? å?½é??å??ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:5
 #: ../plugins/project-wizard/templates/library.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:7
 msgid ""
 "Adds support for internationalization so that your project can have "
 "translations in different languages"
@@ -7186,37 +7305,50 @@ msgstr "使ç?¨ Django Web Framework ç?? Python Web 项ç?® "
 #: ../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
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:2
 msgid "Add gtk-doc system:"
 msgstr "添� gtk-doc 系��"
 
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:10
 msgid "GTK+ (simple)"
 msgstr "GTK+ (ç®?å??)"
 
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:19
 msgid ""
 "Give a package name that your project require. You may also mention what is "
 "the required version of the package. For example, 'libgnomeui-2.0' or "
 "'libgnomeui-2.0 >= 2.2.0'"
 msgstr ""
-"ç»?å?ºæ?¨ç??项ç?®æ??é??è¦?ç??å??å??ã??æ?¨è¿?å?¯ä»¥æ??å?ºå??ç??ç??æ?¬ã??ä¾?å¦?ï¼? â??libgnomeui-"
+"ç»?å?ºæ?¨ç??项ç?®æ??é??è¦?ç??å??å??ã??æ?¨è¿?å?¯ä»¥æ??å?ºå??ç??ç??æ?¬ã??ä¾?å¦?ï¼?â??libgnomeui-"
 "2.0â??æ??â??libgnomeui-2.0 >= 2.2.0â??"
 
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:20
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:26
 msgid "Require Package:"
 msgstr "é??è¦?å??ï¼?"
 
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:22
 msgid "Simple GTK+ project"
 msgstr "ç®?å?? GTK+ 项ç?®"
 
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:23
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:23
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:28
 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
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:24
+#: ../plugins/project-wizard/templates/vala-gtk.wiz.in.h:24
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:29
 msgid ""
 "Use GtkBuilder to create the user-interface in a graphical way and load it "
 "from xml files at runtime"
@@ -7226,6 +7358,7 @@ msgstr "使ç?¨ GtkBuilder 以è§?å?¾æ?¹å¼?å??建ç?¨æ?·ç??é?¢å??å?¨è¿?è¡?æ?¶å? è½½
 #: ../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
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:32
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
 msgstr "gtk-doc æ?¯ç?¨æ?¥ä¸ºå?ºäº? GObject ç??ç±»ç¼?è¯? API æ??æ¡£ç??"
 
@@ -7521,6 +7654,14 @@ msgstr "é??æ?©è¦?æ??建ç??åº?ç±»å??"
 msgid "Shared and Static library"
 msgstr "å?±äº«æ??é??æ??å?½æ?°åº?"
 
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:15
+msgid "Full features Gtk+ Application with file handling"
+msgstr "带æ??件å¤?ç??ç??å?¨å??è?½ GTK+ åº?ç?¨ç¨?åº?"
+
+#: ../plugins/project-wizard/templates/gtkapplication.wiz.in.h:16
+msgid "GTK+ (Application)"
+msgstr "GTK+ ����"
+
 #: ../plugins/run-program/anjuta-run-program.ui.h:2
 msgid "Choose a working directory"
 msgstr "é??æ?©å·¥ä½?ç?®å½?"
@@ -7551,11 +7692,11 @@ msgstr "工����"
 msgid "Program directory '%s' is not local"
 msgstr "ç¨?åº?ç?®å½?â??%sâ??æ??件ä¸?æ?¯æ?¬å?°è·¯å¾?"
 
-#: ../plugins/run-program/parameters.c:303
+#: ../plugins/run-program/parameters.c:304
 msgid "Load Target to run"
 msgstr "�载����"
 
-#: ../plugins/run-program/parameters.c:620
+#: ../plugins/run-program/parameters.c:621
 #, c-format
 msgid "Missing file %s"
 msgstr "缺å°?æ??件 %s"
@@ -7607,280 +7748,8 @@ msgstr "è¿?è¡?æ??ä½?"
 msgid "Command used for starting a terminal"
 msgstr "ç?¨äº?å?¯å?¨ç»?端ç??å?½ä»¤"
 
-#: ../plugins/search/anjuta-search.ui.h:1
-msgid "Actions"
-msgstr "��"
-
-#: ../plugins/search/anjuta-search.ui.h:2
-#: ../plugins/search/search-replace.c:91
-msgid "Backward"
-msgstr "å??å??"
-
-#: ../plugins/search/anjuta-search.ui.h:3
-msgid "Choose Directories:"
-msgstr "é??æ?©ç?®å½?ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:4
-msgid "Choose Files:"
-msgstr "é??æ?©æ??件ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:5
-msgid "Expand regex back references"
-msgstr "æ?©å±?æ­£å??表达å¼?ç??å??å??å¼?ç?¨"
-
-#: ../plugins/search/anjuta-search.ui.h:6
-msgid "File Filter"
-msgstr "æ??件è¿?滤å?¨"
-
-#: ../plugins/search/anjuta-search.ui.h:7
-msgid "Find & Replace"
-msgstr "��并��"
-
-#: ../plugins/search/anjuta-search.ui.h:8
-#: ../plugins/search/search-replace.c:90
-msgid "Forward"
-msgstr "å??å??"
-
-#. the order of these matters - it must match the order of the corresponding
-#. radio buttons on another page
-#: ../plugins/search/anjuta-search.ui.h:9
-#: ../plugins/search/search-replace.c:89
-msgid "Full Buffer"
-msgstr "�����"
-
-#: ../plugins/search/anjuta-search.ui.h:10
-msgid "Greedy matching"
-msgstr "贪婪å?¹é??"
-
-#: ../plugins/search/anjuta-search.ui.h:11
-msgid "Ignore Binary Files"
-msgstr "忽ç?¥äº?è¿?å?¶æ??件"
-
-#: ../plugins/search/anjuta-search.ui.h:12
-msgid "Ignore Directories:"
-msgstr "忽����"
-
-#: ../plugins/search/anjuta-search.ui.h:13
-msgid "Ignore Files:"
-msgstr "忽ç?¥æ??件ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:14
-msgid "Ignore Hidden Directories"
-msgstr "忽ç?¥é??è??ç?®å½?"
-
-#: ../plugins/search/anjuta-search.ui.h:15
-msgid "Ignore Hidden Files"
-msgstr "忽ç?¥é??è??æ??件"
-
-#: ../plugins/search/anjuta-search.ui.h:16
-msgid "Match at start of word"
-msgstr "å?¹é??è¯?é¦?"
-
-#: ../plugins/search/anjuta-search.ui.h:18
-msgid "Match complete lines"
-msgstr "å?¹é??æ?´è¡?"
-
-#: ../plugins/search/anjuta-search.ui.h:19
-msgid "Match complete words"
-msgstr "å?¹é??æ?´ä¸ªå??è¯?"
-
-#: ../plugins/search/anjuta-search.ui.h:20
-msgid "Maximum Actions"
-msgstr "æ??å¤?å?¨ä½?æ?°"
-
-#: ../plugins/search/anjuta-search.ui.h:21
-msgid "No Limit"
-msgstr "æ? é??å?¶"
-
-#: ../plugins/search/anjuta-search.ui.h:23
-msgid "Parameters"
-msgstr "å??æ?°"
-
-#: ../plugins/search/anjuta-search.ui.h:24
-msgid "Regular expression"
-msgstr "æ­£å??表达å¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:25
-msgid "Replace With:"
-msgstr "��为�"
-
-#: ../plugins/search/anjuta-search.ui.h:27
-msgid "Search Action:"
-msgstr "æ??ç´¢å?¨ä½?ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:28
-msgid "Search Direction:"
-msgstr "æ??ç´¢æ?¹å??ï¼?"
-
-#. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.ui.h:30
-msgid "Search Expression"
-msgstr "æ??索表达å¼?"
-
-#. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.ui.h:32
-msgid "Search Expression:"
-msgstr "æ??索表达å¼?ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:33
-msgid "Search In:"
-msgstr "æ??ç´¢è??å?´ï¼?"
-
-#: ../plugins/search/anjuta-search.ui.h:34
-msgid "Search Recursively"
-msgstr "é??å½?æ??ç´¢"
-
-#: ../plugins/search/anjuta-search.ui.h:35
-msgid "Search Target"
-msgstr "æ??ç´¢ç?®æ ?"
-
-#. User can select variables that contain lists of files, so this is a combined noun
-#: ../plugins/search/anjuta-search.ui.h:37
-msgid "Search variable"
-msgstr "æ??ç´¢å??é??"
-
-#: ../plugins/search/plugin.c:68
-msgid "_Findâ?¦"
-msgstr "��(_F)..."
-
-#: ../plugins/search/plugin.c:69
-msgid "Search for a string or regular expression in the editor"
-msgstr "å?¨ç¼?è¾?å?¨ä¸­æ??ç´¢ä¸?个å­?符串æ??æ­£å??表达å¼?"
-
-#: ../plugins/search/plugin.c:71
-msgid "Find _Next"
-msgstr "����个(_N)"
-
-#: ../plugins/search/plugin.c:72 ../plugins/search/plugin.c:76
-msgid "Repeat the last Find command"
-msgstr "é??å¤?ä¸?次æ?¥æ?¾å?½ä»¤"
-
-#: ../plugins/search/plugin.c:74
-msgid "Find _Previous"
-msgstr "����个(_P)"
-
-#: ../plugins/search/plugin.c:78
-msgid "Find and R_eplaceâ?¦"
-msgstr "��并��(_E)..."
-
-#: ../plugins/search/plugin.c:80
-msgid ""
-"Search for and replace a string or regular expression with another string"
-msgstr "æ?¥æ?¾ä¸?个å­?符串æ??å?¹é??ä¸?个正å??表达å¼?ï¼?并ä¸?ç?¨å?¦å¤?ç??å­?符串è¿?è¡?æ?¿æ?¢ã??"
-
-#: ../plugins/search/plugin.c:82 ../plugins/search/plugin.c:83
-msgid "Search and Replace"
-msgstr "æ?¥æ?¾å??æ?¿æ?¢"
-
-#: ../plugins/search/plugin.c:85
-msgid "Fin_d in Filesâ?¦"
-msgstr "å?¨å¤?个æ??件中æ?¥æ?¾(_D)..."
-
-#: ../plugins/search/plugin.c:86
-msgid "Search for a string in multiple files or directories"
-msgstr "å?¨å¤?个æ??件æ??ç?®å½?å??æ??ç´¢æ??å®?å­?符串"
-
-#: ../plugins/search/plugin.c:102
-msgid "Searchingâ?¦"
-msgstr "æ­£å?¨æ??ç´¢..."
-
-#: ../plugins/search/search-replace.c:96
-msgid "Current Buffer"
-msgstr "å½?å??ç¼?å?²å?º"
-
-#: ../plugins/search/search-replace.c:97
-msgid "Current Selection"
-msgstr "å½?å??é??æ?©"
-
-#: ../plugins/search/search-replace.c:98
-msgid "Current Block"
-msgstr "å½?å??å??"
-
-#: ../plugins/search/search-replace.c:99
-msgid "Current Function"
-msgstr "å½?å??å?½æ?°"
-
-#: ../plugins/search/search-replace.c:100
-msgid "All Open Buffers"
-msgstr "æ??æ??æ??å¼?ç??ç¼?å?²å?º"
-
-#: ../plugins/search/search-replace.c:101
-msgid "All Project Files"
-msgstr "æ??æ??项ç?®æ??件"
-
-#. {SR_VARIABLE, N_("Specify File List")},
-#: ../plugins/search/search-replace.c:103
-msgid "Specify File Patterns"
-msgstr "æ??å®?æ??件模å¼?"
-
-#: ../plugins/search/search-replace.c:108
-msgid "Select next match"
-msgstr "é??æ?©ä¸?ä¸?个å?¹é??"
-
-#: ../plugins/search/search-replace.c:109
-msgid "Bookmark all matched lines"
-msgstr "å°?æ??æ??å?¹é??å? å?¥ä¹¦ç­¾"
-
-#: ../plugins/search/search-replace.c:110
-msgid "Mark all matches"
-msgstr "æ ?è®°æ??æ??å?¹é??"
-
-#: ../plugins/search/search-replace.c:111
-msgid "List matches in find pane"
-msgstr "å?¨æ?¥æ?¾æ¡?中å??å?ºå?¹é??"
-
-#: ../plugins/search/search-replace.c:112
-msgid "Replace next match"
-msgstr "æ?¿æ?¢ä¸?ä¸?个å?¹é??"
-
-#: ../plugins/search/search-replace.c:113
-msgid "Replace all matches"
-msgstr "æ?¿æ?¢æ??æ??"
-
-#. Avoid space in translated string
-#: ../plugins/search/search-replace.c:312
-msgid "Find:"
-msgstr "���"
-
-#: ../plugins/search/search-replace.c:494
-msgid "Replace"
-msgstr "æ?¿æ?¢"
-
-#: ../plugins/search/search-replace.c:623
-msgid "Search complete"
-msgstr "æ??ç´¢å®?æ??"
-
-#: ../plugins/search/search-replace.c:1037
-#: ../plugins/search/search-replace.c:1714
-msgid "Replace All"
-msgstr "æ?¿æ?¢æ??æ??"
-
-#: ../plugins/search/search-replace.c:1076
-#, c-format
-msgid "The match \"%s\" was not found. Wrap search around the document?"
-msgstr "æ?¾ä¸?å?°æ»¡è¶³æ?¡ä»¶â??%sâ??ç??å?¹é??ã??æ?¯å?¦è¦?ä»?æ??档头å¼?å§?寻æ?¾ï¼?"
-
-#: ../plugins/search/search-replace.c:1096
-#, c-format
-msgid "The match \"%s\" was not found."
-msgstr "æ?¾ä¸?å?°æ»¡è¶³æ?¡ä»¶â??%sâ??ç??å?¹é??ã??"
-
-#: ../plugins/search/search-replace.c:1111
-msgid "The maximum number of results has been reached."
-msgstr "å·²ç»?è¾¾å?°æ??大ç??ç»?æ??æ?°ç?®"
-
-#: ../plugins/search/search-replace.c:1124
-#, c-format
-msgid "%d match has been replaced."
-msgid_plural "%d matches have been replaced."
-msgstr[0] "%d 个å?¹é??项被æ?¿æ?¢ã??"
-
-#: ../plugins/search/search-replace.c:1289
-msgid "Unable to build user interface for Search and Replace"
-msgstr "æ? æ³?为æ??ç´¢å??æ?¿æ?¢æ??建ç?¨æ?·ç??é?¢"
-
 #: ../plugins/snippets-manager/plugin.c:62
-#: ../plugins/snippets-manager/plugin.c:304
+#: ../plugins/snippets-manager/plugin.c:306
 #: ../plugins/snippets-manager/snippets-browser.c:208
 msgid "Snippets"
 msgstr "ç??段"
@@ -7927,26 +7796,26 @@ msgstr "导å?ºç??段(_E)..."
 msgid "Export snippets from the database"
 msgstr "ä»?æ?°æ?®åº?导å?ºç??段"
 
-#: ../plugins/snippets-manager/plugin.c:329
+#: ../plugins/snippets-manager/plugin.c:331
 msgid "Snippets Manager actions"
 msgstr "ç??段管ç??å?¨å?¨ä½?"
 
-#: ../plugins/snippets-manager/plugin.c:773
+#: ../plugins/snippets-manager/plugin.c:778
 msgid "Command?"
 msgstr "�令?"
 
-#: ../plugins/snippets-manager/plugin.c:789
+#: ../plugins/snippets-manager/plugin.c:794
 msgid "Variable text"
 msgstr "å??é??æ??æ?¬"
 
-#: ../plugins/snippets-manager/plugin.c:807
+#: ../plugins/snippets-manager/plugin.c:812
 #: ../plugins/snippets-manager/snippets-editor.c:40
 msgid "Instant value"
 msgstr "常é??å?¼"
 
-#: ../plugins/snippets-manager/plugin.c:936
-#: ../plugins/snippets-manager/plugin.c:973
-#: ../plugins/snippets-manager/snippets-provider.c:753
+#: ../plugins/snippets-manager/plugin.c:941
+#: ../plugins/snippets-manager/plugin.c:978
+#: ../plugins/snippets-manager/snippets-provider.c:754
 #: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:2
 msgid "Code Snippets"
 msgstr "代ç ?ç??段"
@@ -8124,12 +7993,12 @@ msgstr "æ??件â??%sâ??æ?¯å?ªè¯»ç??ï¼?ä»?ç?¶è¦?ç¼?è¾?å??ï¼?"
 msgid "Could not save %s: %s"
 msgstr "æ? æ³?ä¿?å­? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview-io.c:273
+#: ../plugins/sourceview/sourceview-io.c:271
 #, c-format
 msgid "Could not save file because filename not yet specified"
 msgstr "æ? æ³?ä¿?å­?æ??件ï¼?æ?ªæ??å®?æ??件å??"
 
-#: ../plugins/sourceview/sourceview-io.c:503
+#: ../plugins/sourceview/sourceview-io.c:501
 #, c-format
 msgid "New file %d"
 msgstr "æ?°å»ºæ??件 %d"
@@ -8227,34 +8096,37 @@ msgstr "使�主���"
 msgid "View"
 msgstr "æ?¥ç??"
 
-#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:353
-#: ../plugins/starter/anjuta-starter.plugin.in.h:1
-msgid "Starter"
-msgstr "èµ·ç?¹"
+#: ../plugins/starter/plugin.c:285
+msgid "Start"
+msgstr "已��"
 
-#: ../plugins/starter/starter.c:394
-msgid "Create File/Project"
-msgstr "å??建æ??件/项ç?®"
+#: ../plugins/starter/starter.ui.h:1
+msgid "Anjuta Manual"
+msgstr "Anjuta ç?¨æ?·æ??å??"
 
-#: ../plugins/starter/starter.c:428
-msgid "Recent Projects"
-msgstr "æ??è¿?ç??项ç?®"
+#: ../plugins/starter/starter.ui.h:2
+msgid "Create a new project"
+msgstr "�建项�"
 
-#: ../plugins/starter/starter.c:459
-msgid "Links"
-msgstr "��"
+#: ../plugins/starter/starter.ui.h:3
+msgid "FAQ"
+msgstr "FAQ"
 
-#: ../plugins/starter/starter.c:478
-msgid "Anjuta Home Page"
-msgstr "Anjuta 主页"
+#: ../plugins/starter/starter.ui.h:4
+msgid "Getting started:"
+msgstr "ä»?è¿?é??å¼?å§?ï¼?"
 
-#: ../plugins/starter/starter.c:484
-msgid "Anjuta Manual"
-msgstr "Anjuta ç?¨æ?·æ??å??"
+#: ../plugins/starter/starter.ui.h:5
+msgid "Import an existing project"
+msgstr "导å?¥å·²æ??项ç?®"
+
+#: ../plugins/starter/starter.ui.h:6
+msgid "Recent projects:"
+msgstr "æ??è¿?项ç?®ï¼?"
 
-#: ../plugins/starter/starter.c:490
-msgid "GNOME Online API Documentation"
-msgstr "Gnome å?¨çº¿ API æ??æ¡£"
+#: ../plugins/starter/starter.ui.h:7
+msgid "Tutorials"
+msgstr "æ??ç¨?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "Add file/directory"
@@ -8651,22 +8523,6 @@ 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 "ç??æ?¬"
-
-#: ../plugins/subversion/subversion-log-dialog.c:160
-msgid "Short Log"
-msgstr "���"
-
 #: ../plugins/subversion/subversion-log-dialog.c:257
 msgid "Subversion: Retrieving logâ?¦"
 msgstr "Subversionï¼?æ­£å?¨è?·å??æ?¥å¿?..."
@@ -8844,43 +8700,43 @@ msgstr "��符�(_F)..."
 msgid "Find Symbol"
 msgstr "��符�"
 
-#: ../plugins/symbol-db/plugin.c:1010
+#: ../plugins/symbol-db/plugin.c:1032
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ­£å?¨ç??æ??继æ?¿..."
 
-#: ../plugins/symbol-db/plugin.c:1015
+#: ../plugins/symbol-db/plugin.c:1037
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?è?ª %3$d 个æ??件中æ?«æ??äº? %2$d 个"
 
-#: ../plugins/symbol-db/plugin.c:1046
+#: ../plugins/symbol-db/plugin.c:1068
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "æ­£å?¨ç??æ??继æ?¿..."
 
-#: ../plugins/symbol-db/plugin.c:1048
+#: ../plugins/symbol-db/plugin.c:1070
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "è?ª %2$d 个æ??件中æ?«æ??äº? %1$d 个"
 
-#: ../plugins/symbol-db/plugin.c:1798
+#: ../plugins/symbol-db/plugin.c:1729
 msgid "Populating symbol databaseâ?¦"
 msgstr "æ­£å?¨å¡«å??符å?·åº?..."
 
-#: ../plugins/symbol-db/plugin.c:2119 ../plugins/symbol-db/plugin.c:2204
+#: ../plugins/symbol-db/plugin.c:2109 ../plugins/symbol-db/plugin.c:2194
 msgid "Symbols"
 msgstr "符�"
 
-#: ../plugins/symbol-db/plugin.c:2213
+#: ../plugins/symbol-db/plugin.c:2203
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb 弹���"
 
-#: ../plugins/symbol-db/plugin.c:2221
+#: ../plugins/symbol-db/plugin.c:2211
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb è??å??å?¨ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2529 ../plugins/symbol-db/plugin.c:2547
+#: ../plugins/symbol-db/plugin.c:2524 ../plugins/symbol-db/plugin.c:2542
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "符��"
@@ -9564,7 +9420,6 @@ msgid "Autocompletion"
 msgstr "��补�"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
-#, fuzzy
 msgid "Automatically load required libraries of the project"
 msgstr "��添���"
 
@@ -9610,62 +9465,70 @@ msgid "Line up parentheses"
 msgstr "对���"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+msgid "Load API tags for C standard library"
+msgstr "为 C æ ?å??åº?å?¨å¦? API æ ?ç­¾"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+msgid "Load API tags for C++ standard template library"
+msgstr "为 C++ æ ?å??模ç??åº?å?¨å¦? API æ ?ç­¾"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
 msgid "Parenthesis indentation"
 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
 msgid "Prefer vim/emacs modelines over indentation settings"
 msgstr "ä¼?å??使ç?¨ vim/emacs æ?¹å¼?è¡?缩è¿?代æ?¿ç¼©è¿?设置"
 
-#: ../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: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:19
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:21
 #: ../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:20
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:22
 #: ../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:967
-#: ../plugins/language-support-python/plugin.c:1185
+#: ../plugins/language-support-cpp-java/plugin.c:1203
+#: ../plugins/language-support-python/plugin.c:456
 msgid "Auto-Indent"
 msgstr "��缩�"
 
-#: ../plugins/language-support-cpp-java/plugin.c:968
-#: ../plugins/language-support-python/plugin.c:1186
+#: ../plugins/language-support-cpp-java/plugin.c:1204
+#: ../plugins/language-support-python/plugin.c:457
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "æ ¹æ?®ç¼©è¿?设置è?ªå?¨ç¼©è¿?å½?å??æ??é??中è¡?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:974
+#: ../plugins/language-support-cpp-java/plugin.c:1210
 msgid "Comment/Uncomment"
 msgstr "æ·»å? /å? é?¤æ³¨é??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:975
+#: ../plugins/language-support-cpp-java/plugin.c:1211
 msgid "Comment or uncomment current selection"
 msgstr "设置æ??å??æ¶?注é??å½?å??æ??é??中ç??代ç ?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:980
+#: ../plugins/language-support-cpp-java/plugin.c:1216
 msgid "Swap .h/.c"
 msgstr "å??æ?¢ .h /.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:981
+#: ../plugins/language-support-cpp-java/plugin.c:1217
 msgid "Swap C header and source files"
 msgstr "å??æ?¢ C 头æ??件å??æº?æ??件"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1021
+#: ../plugins/language-support-cpp-java/plugin.c:1257
 msgid "C++/Java Assistance"
 msgstr "C++/Java è¾?å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1196
-#: ../plugins/language-support-cpp-java/plugin.c:1226
+#: ../plugins/language-support-cpp-java/plugin.c:1491
+#: ../plugins/language-support-cpp-java/plugin.c:1525
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -9673,11 +9536,11 @@ msgstr "C/C++/Java/Vala"
 msgid "C/C++"
 msgstr "C/C++"
 
-#: ../plugins/language-support-python/plugin.c:909
+#: ../plugins/language-support-python/plugin.c:84
 msgid "Python support warning"
 msgstr "Python æ?¯æ??è­¦å??"
 
-#: ../plugins/language-support-python/plugin.c:917
+#: ../plugins/language-support-python/plugin.c:92
 msgid ""
 "Either python path is wrong or python-rope (http://rope.sf.net) libraries\n"
 "aren't installed. Both are required for autocompletion in python files.\n"
@@ -9687,16 +9550,16 @@ msgstr ""
 "两è??对 python æ??件ç??è?ªå?¨è¡¥å?¨å??å¿?é??ã??\n"
 "请å®?è£?ä»?们å??æ£?æ?¥é¦?é??项中ç?? python è·¯å¾?ã??"
 
-#: ../plugins/language-support-python/plugin.c:920
+#: ../plugins/language-support-python/plugin.c:95
 msgid "Do not show that warning again"
 msgstr "ä¸?å??æ?¾ç¤ºè¯¥è­¦å??"
 
-#: ../plugins/language-support-python/plugin.c:1267
+#: ../plugins/language-support-python/plugin.c:513
 msgid "Python Assistance"
 msgstr "Python è¾?å?©"
 
-#: ../plugins/language-support-python/plugin.c:1376
-#: ../plugins/language-support-python/plugin.c:1385
+#: ../plugins/language-support-python/plugin.c:618
+#: ../plugins/language-support-python/plugin.c:627
 #: ../plugins/language-support-python/python-assist.c:934
 msgid "Python"
 msgstr "Python"
@@ -9774,17 +9637,17 @@ msgid "A Subversion client plugin based on libsvn"
 msgstr "å?ºäº? libsvn ç??ä¸?个 Subversion 客æ?·ç«¯æ??件"
 
 #: ../plugins/glade/anjuta-glade.plugin.in.h:1
-msgid "Glade File"
-msgstr "Glade æ??件"
-
-#: ../plugins/glade/anjuta-glade.plugin.in.h:2
 msgid "Glade Plugin for Anjuta."
 msgstr "Anjuta ç?? Glade æ??件ã??"
 
-#: ../plugins/glade/anjuta-glade.plugin.in.h:3
+#: ../plugins/glade/anjuta-glade.plugin.in.h:2
 msgid "Glade interface designer"
 msgstr "Glade ç??é?¢è®¾è®¡å?¨"
 
+#: ../plugins/glade/anjuta-glade.plugin.in.h:3
+msgid "User interface file"
+msgstr "ç?¨æ?·ç??é?¢æ??件"
+
 #: ../plugins/patch/anjuta-patch.plugin.in.h:1
 msgid "Patch Plugin"
 msgstr "è¡¥ä¸?æ??件"
@@ -9837,6 +9700,10 @@ msgstr "GtkSourceView ç¼?è¾?å?¨"
 msgid "The default editor based on GtkSourceView"
 msgstr "å?ºäº? GtkSourceview ç??é»?认ç¼?è¾?å?¨"
 
+#: ../plugins/starter/anjuta-starter.plugin.in.h:1
+msgid "Starter"
+msgstr "èµ·ç?¹"
+
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
 msgid "Welcome page with most common actions."
 msgstr "å??å?«å¤?æ?°å¸¸ç?¨å?¨ä½?ç??欢è¿?页é?¢ã??"
@@ -9853,14 +9720,6 @@ msgstr "为 C++ å?? Java æ??ä¾?代ç ?è¡¥å?¨ã??è?ªå?¨ç¼©è¿?ç­?æ?¯æ??ç??æ??件ã??"
 msgid "Project Assistant"
 msgstr "项ç?®å??导"
 
-#: ../plugins/search/anjuta-search.plugin.in.h:1
-msgid "Component for searching"
-msgstr "ç?¨äº?æ??ç´¢ç??ç»?件"
-
-#: ../plugins/search/anjuta-search.plugin.in.h:2
-msgid "Searching"
-msgstr "æ­£å?¨æ??ç´¢"
-
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:1
 msgid "Anjuta Class Generator Plugin"
 msgstr "Anjuta ç±»ç??æ??å?¨æ??件"
@@ -9988,6 +9847,257 @@ msgstr "代ç ?è¡¥å?¨ç??æ??å°?å­?符"
 msgid "Symbol"
 msgstr "符�"
 
+#~ msgid "<b>Class Elements</b>"
+#~ msgstr "<b>ç±»å??ç´ </b>"
+
+#~ msgid "<b>Add Files:</b>"
+#~ msgstr "<b>æ·»å? æ??件ï¼?</b>"
+
+#~ msgid "<b>Branch name:</b>"
+#~ msgstr "<b>å??æ?¯å??称ï¼?</b>"
+
+#~ msgid "<b>Branches:</b>"
+#~ msgstr "<b>å??æ?¯ï¼?</b>"
+
+#~ msgid "<b>Branches</b>"
+#~ msgstr "<b>å??æ?¯ï¼?</b>"
+
+#~ msgid "<b>Log Message:</b>"
+#~ msgstr "<b>�����</b>"
+
+#~ msgid "<b>Mode:</b>"
+#~ msgstr "<b>模��</b>"
+
+#~ msgid "<b>Options:</b>"
+#~ msgstr "<b>é??项ï¼?</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>é??项</b>"
+
+#~ msgid "<b>Remove Files:</b>"
+#~ msgstr "<b>å? é?¤æ??件ï¼?</b>"
+
+#~ msgid "<b>Revision:</b>"
+#~ msgstr "<b>ç??æ?¬ï¼?</b>"
+
+#~ msgid "<b>Revision</b>"
+#~ msgstr "<b>ç??æ?¬</b>"
+
+#~ msgid "<b>Tag name:</b>"
+#~ msgstr "<b>æ ?ç­¾å??称ï¼?</b>"
+
+#~ msgid "<b>Tags:</b>"
+#~ msgstr "<b>�签�</b>"
+
+#~ msgid "<b>URL:</b>"
+#~ msgstr "<b>URLï¼?</b>"
+
+#~ msgid "Repository head; Drop or type a different revision here "
+#~ msgstr "ç??æ?¬æ?§å?¶é??å??ï¼?å?¨è¿?é??æ??å?¨æ??é?®å?¥ä¸?个ä¸?å??ç??ç??æ?¬"
+
+#~ msgid "_New library&#x2026;"
+#~ msgstr "��(_N)&#x2026�"
+
+#~ msgid "_Select file to add&#x2026;"
+#~ msgstr "é??æ?©è¦?æ·»å? ç??æ??件(_S)..."
+
+#~ msgid "Quick _ReSearch"
+#~ msgstr "å¿«é??é??æ?°æ??ç´¢(_R)"
+
+#~ msgid "Repeat quick search"
+#~ msgstr "é??å¤?å¿«é??æ??ç´¢"
+
+#~ msgid "Match case"
+#~ msgstr "å?ºå??大å°?å??"
+
+#~ msgid "Column 0"
+#~ msgstr "å?? 0"
+
+#~ msgid "Actions"
+#~ msgstr "��"
+
+#~ msgid "Backward"
+#~ msgstr "å??å??"
+
+#~ msgid "Choose Directories:"
+#~ msgstr "é??æ?©ç?®å½?ï¼?"
+
+#~ msgid "Choose Files:"
+#~ msgstr "é??æ?©æ??件ï¼?"
+
+#~ msgid "Expand regex back references"
+#~ msgstr "æ?©å±?æ­£å??表达å¼?ç??å??å??å¼?ç?¨"
+
+#~ msgid "File Filter"
+#~ msgstr "æ??件è¿?滤å?¨"
+
+#~ msgid "Find & Replace"
+#~ msgstr "��并��"
+
+#~ msgid "Forward"
+#~ msgstr "å??å??"
+
+#~ msgid "Full Buffer"
+#~ msgstr "�����"
+
+#~ msgid "Greedy matching"
+#~ msgstr "贪婪å?¹é??"
+
+#~ msgid "Ignore Binary Files"
+#~ msgstr "忽ç?¥äº?è¿?å?¶æ??件"
+
+#~ msgid "Ignore Directories:"
+#~ msgstr "忽����"
+
+#~ msgid "Ignore Files:"
+#~ msgstr "忽ç?¥æ??件ï¼?"
+
+#~ msgid "Ignore Hidden Directories"
+#~ msgstr "忽ç?¥é??è??ç?®å½?"
+
+#~ msgid "Ignore Hidden Files"
+#~ msgstr "忽ç?¥é??è??æ??件"
+
+#~ msgid "Match at start of word"
+#~ msgstr "å?¹é??è¯?é¦?"
+
+#~ msgid "Match complete lines"
+#~ msgstr "å?¹é??æ?´è¡?"
+
+#~ msgid "Match complete words"
+#~ msgstr "å?¹é??æ?´ä¸ªå??è¯?"
+
+#~ msgid "Maximum Actions"
+#~ msgstr "æ??å¤?å?¨ä½?æ?°"
+
+#~ msgid "No Limit"
+#~ msgstr "æ? é??å?¶"
+
+#~ msgid "Parameters"
+#~ msgstr "å??æ?°"
+
+#~ msgid "Replace With:"
+#~ msgstr "��为�"
+
+#~ msgid "Search Action:"
+#~ msgstr "æ??ç´¢å?¨ä½?ï¼?"
+
+#~ msgid "Search Direction:"
+#~ msgstr "æ??ç´¢æ?¹å??ï¼?"
+
+#~ msgid "Search Expression"
+#~ msgstr "æ??索表达å¼?"
+
+#~ msgid "Search Expression:"
+#~ msgstr "æ??索表达å¼?ï¼?"
+
+#~ msgid "Search In:"
+#~ msgstr "æ??ç´¢è??å?´ï¼?"
+
+#~ msgid "Search Recursively"
+#~ msgstr "é??å½?æ??ç´¢"
+
+#~ msgid "Search Target"
+#~ msgstr "æ??ç´¢ç?®æ ?"
+
+#~ msgid "Search variable"
+#~ msgstr "æ??ç´¢å??é??"
+
+#~ msgid "_Findâ?¦"
+#~ msgstr "��(_F)..."
+
+#~ msgid ""
+#~ "Search for and replace a string or regular expression with another string"
+#~ msgstr "æ?¥æ?¾ä¸?个å­?符串æ??å?¹é??ä¸?个正å??表达å¼?ï¼?并ä¸?ç?¨å?¦å¤?ç??å­?符串è¿?è¡?æ?¿æ?¢ã??"
+
+#~ msgid "Fin_d in Filesâ?¦"
+#~ msgstr "å?¨å¤?个æ??件中æ?¥æ?¾(_D)..."
+
+#~ msgid "Search for a string in multiple files or directories"
+#~ msgstr "å?¨å¤?个æ??件æ??ç?®å½?å??æ??ç´¢æ??å®?å­?符串"
+
+#~ msgid "Searchingâ?¦"
+#~ msgstr "æ­£å?¨æ??ç´¢..."
+
+#~ msgid "Current Buffer"
+#~ msgstr "å½?å??ç¼?å?²å?º"
+
+#~ msgid "Current Selection"
+#~ msgstr "å½?å??é??æ?©"
+
+#~ msgid "Current Block"
+#~ msgstr "å½?å??å??"
+
+#~ msgid "Current Function"
+#~ msgstr "å½?å??å?½æ?°"
+
+#~ msgid "All Open Buffers"
+#~ msgstr "æ??æ??æ??å¼?ç??ç¼?å?²å?º"
+
+#~ msgid "All Project Files"
+#~ msgstr "æ??æ??项ç?®æ??件"
+
+#~ msgid "Specify File Patterns"
+#~ msgstr "æ??å®?æ??件模å¼?"
+
+#~ msgid "Select next match"
+#~ msgstr "é??æ?©ä¸?ä¸?个å?¹é??"
+
+#~ msgid "Bookmark all matched lines"
+#~ msgstr "å°?æ??æ??å?¹é??å? å?¥ä¹¦ç­¾"
+
+#~ msgid "Mark all matches"
+#~ msgstr "æ ?è®°æ??æ??å?¹é??"
+
+#~ msgid "List matches in find pane"
+#~ msgstr "å?¨æ?¥æ?¾æ¡?中å??å?ºå?¹é??"
+
+#~ msgid "Replace next match"
+#~ msgstr "æ?¿æ?¢ä¸?ä¸?个å?¹é??"
+
+#~ msgid "Replace all matches"
+#~ msgstr "æ?¿æ?¢æ??æ??"
+
+#~ msgid "Find:"
+#~ msgstr "���"
+
+#~ msgid "Search complete"
+#~ msgstr "æ??ç´¢å®?æ??"
+
+#~ msgid "The match \"%s\" was not found. Wrap search around the document?"
+#~ msgstr "æ?¾ä¸?å?°æ»¡è¶³æ?¡ä»¶â??%sâ??ç??å?¹é??ã??æ?¯å?¦è¦?ä»?æ??档头å¼?å§?寻æ?¾ï¼?"
+
+#~ msgid "The match \"%s\" was not found."
+#~ msgstr "æ?¾ä¸?å?°æ»¡è¶³æ?¡ä»¶â??%sâ??ç??å?¹é??ã??"
+
+#~ msgid "The maximum number of results has been reached."
+#~ msgstr "å·²ç»?è¾¾å?°æ??大ç??ç»?æ??æ?°ç?®"
+
+#~ msgid "%d match has been replaced."
+#~ msgid_plural "%d matches have been replaced."
+#~ msgstr[0] "%d 个å?¹é??项被æ?¿æ?¢ã??"
+
+#~ msgid "Unable to build user interface for Search and Replace"
+#~ msgstr "æ? æ³?为æ??ç´¢å??æ?¿æ?¢æ??建ç?¨æ?·ç??é?¢"
+
+#~ msgid "Links"
+#~ msgstr "��"
+
+#~ msgid "Anjuta Home Page"
+#~ msgstr "Anjuta 主页"
+
+#~ msgid "GNOME Online API Documentation"
+#~ msgstr "Gnome å?¨çº¿ API æ??æ¡£"
+
+#~ msgid "Glade File"
+#~ msgstr "Glade æ??件"
+
+#~ msgid "Component for searching"
+#~ msgstr "ç?¨äº?æ??ç´¢ç??ç»?件"
+
+#~ msgid "Searching"
+#~ msgstr "æ­£å?¨æ??ç´¢"
+
 #~ msgid "Help display"
 #~ msgstr "帮��示"
 
@@ -10009,9 +10119,6 @@ msgstr "符�"
 #~ msgid "Bad revision:"
 #~ msgstr "å??ç??ç??æ?¬ï¼?"
 
-#~ msgid "Branch name:"
-#~ msgstr "å??æ?¯å??称ï¼?"
-
 #~ msgid "Branch to switch to:"
 #~ msgstr "å??æ?¢å?°å??æ?¯ï¼?"
 
@@ -10054,9 +10161,6 @@ msgstr "符�"
 #~ msgid "Mailbox file containing patches:"
 #~ msgstr "é?®ç®±æ??件å??å?«è¡¥ä¸?ï¼?"
 
-#~ msgid "Mode:"
-#~ msgstr "模��"
-
 #~ msgid "Previous commit"
 #~ msgstr "ä¸?ä¸?个æ??交"
 
@@ -10111,9 +10215,6 @@ msgstr "符�"
 #~ msgid "Switch to Another Branch"
 #~ msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
 
-#~ msgid "Tag name:"
-#~ msgstr "æ ?ç­¾å??称ï¼?"
-
 #~ msgid "Tag/Commit"
 #~ msgstr "æ ?ç­¾/æ??交"
 
@@ -10162,18 +10263,9 @@ msgstr "符�"
 #~ 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 "精���"
 
@@ -10488,9 +10580,6 @@ msgstr "符�"
 #~ msgid "Completed"
 #~ msgstr "å·²å®?æ??"
 
-#~ msgid "started:"
-#~ msgstr "����"
-
 #~ msgid "N/A"
 #~ msgstr "���"
 
@@ -10650,9 +10739,6 @@ msgstr "符�"
 #~ msgid "Show in main window"
 #~ msgstr "�主���示"
 
-#~ msgid "Highlight"
-#~ msgstr "�亮"
-
 #~ msgid "Items that are due today"
 #~ msgstr "ä»?æ?¥å?°æ??ç??ä»»å?¡"
 
@@ -10816,9 +10902,6 @@ msgstr "符�"
 #~ msgid "Configure file"
 #~ msgstr "é??ç½®æ??件"
 
-#~ msgid "Interface file"
-#~ msgstr "ç??é?¢æ??件"
-
 #~ msgid "GLib mkenums"
 #~ msgstr "GLib mkenums"
 
@@ -10993,9 +11076,6 @@ msgstr "符�"
 #~ msgid "Truncate long messages"
 #~ msgstr "缩ç?­è¿?é?¿ç??ä¿¡æ?¯"
 
-#~ msgid "_Select file to addâ?¦"
-#~ msgstr "é??æ?©è¦?æ·»å? ç??æ??件(_S)..."
-
 #~ msgid "No properties available for this group"
 #~ msgstr "没æ??è¿?个ç»?å?¯ç?¨ç??å±?æ?§"
 
@@ -11281,7 +11361,7 @@ msgstr "符�"
 #~ msgid ""
 #~ "To avoid this message turn off \"%s\" flag in Preferences->Glade GUI "
 #~ "Designer"
-#~ msgstr "è¦?é?¿å??è¿?个信æ?¯ï¼?请å?³é?­å?¨ é¦?é??项 -> Glade GUI 设计å?¨ å¤?ç??â??%sâ?? æ ?è®°"
+#~ msgstr "è¦?é?¿å??è¿?个信æ?¯ï¼?请å?³é?­å?¨ é¦?é??项 -> Glade GUI 设计å?¨ å¤?ç??â??%sâ??æ ?è®°"
 
 #~| msgid "Couldn't find a signal information"
 #~ msgid "Couldn't find an associated document"
@@ -12289,9 +12369,6 @@ msgstr "符�"
 #~ msgid "Editor bookmarks"
 #~ msgstr "���书签"
 
-#~ msgid "Case sensitive"
-#~ msgstr "å?ºå??大å°?å??"
-
 #~ msgid "Print Preview"
 #~ msgstr "æ??å?°é¢?è§?"
 



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