[anjuta] Updated Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [anjuta] Updated Simplified Chinese translation.
Date: Fri, 6 Nov 2009 12:35:07 +0000 (UTC)
commit 0e43b2d0c518eec098f62ae5f977d57334852741
Author: Aron Xu <aronxu gnome org>
Date:   Fri Nov 6 20:34:55 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 4439 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 2708 insertions(+), 1731 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 564f221..38face7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,17 +9,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta 1.2.2\n"
+"Project-Id-Version: anjuta 2.2.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2009-07-09 04:05+0000\n"
-"PO-Revision-Date: 2009-07-11 13:17+0800\n"
-"Last-Translator: Aron Xu <aronmalache 163 com>\n"
+"POT-Creation-Date: 2009-10-26 18:54+0000\n"
+"PO-Revision-Date: 2009-11-06 20:34+0800\n"
+"Last-Translator: Hinker <hinkerliu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
 
 #: ../anjuta.desktop.in.in.h:1
 msgid "Anjuta IDE"
@@ -69,9 +71,12 @@ msgid "The file you are trying to open contains an invalid byte sequence."
 msgstr "æ?¨æ£è¯?å?¾æ??å¼?ç??æ??ä»¶ä¸å?«æ??é??æ³?å?è??åº?å??ã??"
 
 #: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "anjuta was not able to automatically determine the encoding of the file "
+#| "you want to open."
 msgid ""
-"anjuta was not able to automatically determine the encoding of the file you "
+"Anjuta was not able to automatically determine the encoding of the file you "
 "want to open."
 msgstr "Anjuta ä¸?è?½è?ªå?¨ç¡®å®?æ?¨è¦?æ??å¼?ç??æ??ä»¶ç??ç¼?ç ?ã??"
 
@@ -196,28 +201,28 @@ msgstr "æ³°å?½"
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libanjuta/anjuta-launcher.c:1147 ../libanjuta/resources.c:267
+#: ../libanjuta/anjuta-launcher.c:1154 ../libanjuta/resources.c:267
 #: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "æ? æ³?æ?§è¡?å?½ä»¤ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1148
+#: ../libanjuta/anjuta-launcher.c:1155
 msgid "execvp failed"
 msgstr "æ?§è¡?æ??ä»¶(execvp)å¤±è´¥"
 
-#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2310
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2310
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "Anjuta Shell å??æ?¬æ??ä»¶"
 
 #: ../libanjuta/anjuta-plugin-manager.c:733
 #, c-format
-msgid "Plugin '%s' do not want to be deactivated"
-msgstr "æ??ä»¶\"%s\"ä¸?è?½è¢«å??æ¶?æ¿?æ´»"
+msgid "Plugin '%s' does not want to be deactivated"
+msgstr "æ??ä»¶ â??%sâ?? ä¸?è?½è¢«å??æ¶?æ¿?æ´»"
 
 #: ../libanjuta/anjuta-plugin-manager.c:764
 #, c-format
@@ -264,19 +269,20 @@ msgstr "å¿?è®°å·²ç»?é??æ?©ç??æ??ä»¶"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
 #: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
-#: ../plugins/debug-manager/queue.c:556
+#: ../plugins/debug-manager/queue.c:537
 msgid "Select a plugin"
 msgstr "é??æ?©æ??ä»¶"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:557
+#: ../plugins/debug-manager/queue.c:538
 msgid "Please select a plugin to activate"
 msgstr "è¯·é??æ?©è¦?æ¿?æ´»ç??æ??ä»¶"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1372
-#, c-format
-msgid "No plugin able to load other plugins in %s"
+#, fuzzy, c-format
+#| msgid "No plugin able to load other plugins in %s"
+msgid "No plugin is able to load other plugins in %s"
 msgstr "æ²¡æ??æ??ä»¶å?¯ä»¥è½½å?¥ï¼?å?¶ä»?æ??ä»¶å?¨ %s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1960
@@ -308,7 +314,9 @@ msgid "Currently activated plugins"
 msgstr "å½?å??å·²æ¿?æ´»ç??æ??ä»¶"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2311
-msgid "Anjuta shell for which the plugins are"
+#, fuzzy
+#| msgid "Anjuta shell for which the plugins are"
+msgid "Anjuta shell for which the plugins are made"
 msgstr "Anjuta Shell æ??ä»¶"
 
 #: ../libanjuta/anjuta-plugin-manager.c:2319
@@ -354,7 +362,9 @@ msgid "Synchronization file"
 msgstr "å??æ¥æ??ä»¶"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
+#, fuzzy
+#| msgid "File to sync the profile xml"
+msgid "File to syncronize the profile XML"
 msgstr "ç?¨äº?å??æ¥ xml é??ç½®ç??æ??ä»¶"
 
 #: ../libanjuta/anjuta-profile.c:508
@@ -362,9 +372,12 @@ msgid "Please select a plugin from the list"
 msgstr "è¯·ä»?å??è¡¨ä¸é??æ?©è¦?æ¿?æ´»ç??æ??ä»¶"
 
 #: ../libanjuta/anjuta-profile.c:672
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+#| "profile."
 msgid ""
-"Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+"Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins "
 "profile."
 msgstr "è¯»å??â??%sâ??å¤±è´¥ï¼?XML è§£æ??é??è¯¯ã??é??æ³?æ??å·²æ??å??ç?? Anjuta æ??ä»¶é??ç½®ã??"
 
@@ -391,7 +404,7 @@ msgstr "æ?¨ç¡®å®?æ?³è¦?å°?é¦?é??é¡¹é??ç½®ä¸ºé»?è®¤è®¾ç½®å??ï¼?"
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:382
+#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "é??ç½®(_R)"
 
@@ -403,8 +416,8 @@ msgstr "ç±»å?«"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4 ../src/anjuta-app.c:723
-#: ../src/preferences.ui.h:10
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:723
+#: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "å¸¸è§?"
 
@@ -477,26 +490,31 @@ msgstr ""
 "è¯·å®?è£?è¯¥å·¥å?·ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:971
-msgid "Cannot find a terminal, using xterm, even if it may not work"
+#: ../libanjuta/anjuta-utils.c:986
+#, fuzzy
+#| msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ? æ³?æ?¾å?°å?¯ç?¨ç??ç»?ç«¯ï¼?ä½¿ç?¨ xtermï¼?å?³ä½¿å®?å?¯è?½æ? æ³?æ£å¸¸å·¥ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1007 ../libanjuta/anjuta-utils.c:1011
-#: ../libanjuta/anjuta-utils.c:1039 ../libanjuta/anjuta-utils.c:1043
+#: ../libanjuta/anjuta-utils.c:1022 ../libanjuta/anjuta-utils.c:1026
+#: ../libanjuta/anjuta-utils.c:1054 ../libanjuta/anjuta-utils.c:1058
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "æ? æ³?æ?§è¡?å?½ä»¤ï¼?%s(ä½¿ç?¨ Shell %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1677
+#: ../libanjuta/anjuta-utils.c:1690
+#, fuzzy
+#| msgid ""
+#| "Unable to display help. Please make sure Anjuta documentation package is "
+#| "install. It can be downloaded from http://anjuta.org";
 msgid ""
-"Unable to display help. Please make sure Anjuta documentation package is "
-"install. It can be downloaded from http://anjuta.org";
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr ""
 "æ? æ³?æ?¾ç¤ºå¸®å?©ã??è¯·ç¡®å®?å·²ç»?å®?è£?äº? Anjuta æ??æ¡£å??ã??æ?¨å?¯ä»? http://anjuta.org ä¸?è½½ã??"
 
-#: ../libanjuta/anjuta-utils.c:2116
+#: ../libanjuta/anjuta-utils.c:2129
 #, c-format
-#| msgid "Unable to build user interface for New File"
 msgid "Unable to load user interface file: %s"
 msgstr "æ? æ³?ä¸ºæ?°å»ºæ??ä»¶ç??æ??ç?¨æ?·ç??é?¢ï¼?%s"
 
@@ -521,7 +539,8 @@ msgid "Conflicted"
 msgstr "å?²çª?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
+#: ../plugins/file-manager/file-view.c:73
+msgid "Up-to-date"
 msgstr "æ??æ?°"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
@@ -560,8 +579,8 @@ msgstr "Pixbuf å¯¹è±¡"
 msgid "The pixbuf to render."
 msgstr "è¢«ç»?å?¶ç?? Pixbuf å¯¹è±¡ã??"
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3031
-#: ../plugins/glade/plugin.c:3066
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
+#: ../plugins/glade/plugin.c:3076
 #, c-format
 msgid "Widget not found: %s"
 msgstr "æ?¾ä¸?å?°é?¨ä»¶ï¼?%s"
@@ -572,67 +591,76 @@ msgid "Could not find application pixmap file: %s"
 msgstr "æ?¾ä¸?å?°åº?ç?¨ç¨?åº?ä½?å?¾æ??ä»¶ï¼?%s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-msgid "<b>Build</b>"
-msgstr "<b>å??å»º</b>"
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
+msgid "Arguments:"
+msgstr "å??æ?°ï¼?"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
-msgid "<b>Configuration:</b>"
-msgstr "<b>é??ç½®ï¼?</b>"
+#, fuzzy
+#| msgid "_Build"
+msgid "Build"
+msgstr "å??å»º(_B)"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
-msgid "<b>Install</b>"
-msgstr "<b>å®?è£?</b>"
+msgid "Build Directory:"
+msgstr "å??å»ºç?®å½?ï¼?"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
-msgid "<b>Regenerate project</b>"
-msgstr "<b>é??å»ºé¡¹ç?®</b>"
+#, fuzzy
+msgid "Configuration:"
+msgstr "é??ç½®"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
-msgid "<b>Select Program to run:</b>"
-msgstr "<b>é??æ?©è¦?è¿?è¡?ç??ç¨?åº?ï¼?</b>"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
-#: ../plugins/run-program/anjuta-run-program.ui.h:1
-msgid "Arguments:"
-msgstr "å??æ?°ï¼?"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
-msgid "Build Directory:"
-msgstr "å??å»ºç?®å½?ï¼?"
-
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Configure Options:"
 msgstr "é??ç½®é??é¡¹ï¼?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
 msgid "Configure Project"
 msgstr "é??ç½®é¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Continue on errors"
 msgstr "å??ç??é??è¯¯æ?¶ç»§ç»"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Highlight message locations in editor"
 msgstr "å?¨ç¼?è¾?å?¨ä¸é«?äº®æ?¾ç¤ºä¿¡æ?¯ä½?ç½®"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#, fuzzy
+#| msgid "_Install"
+msgid "Install"
+msgstr "å®?è£?(_I)"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Install as root:"
 msgstr "ä»¥ root èº«ä»½å®?è£?ï¼?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
-#: ../plugins/tools/anjuta-tools.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#, fuzzy
+#| msgid "<b>Regenerate project</b>"
+msgid "Regenerate project"
+msgstr "<b>é??å»ºé¡¹ç?®</b>"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Run in terminal"
 msgstr "å?¨ç»?ç«¯ä¸è¿?è¡?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
 msgid "Run several commands at a time:"
 msgstr "ä¸?æ¬¡æ?§è¡?è?¥å¹²æ?¡å?½ä»¤ï¼?"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Select Program"
 msgstr "é??æ?©ç¨?åº?"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#, fuzzy
+#| msgid "<b>Select Program to run:</b>"
+msgid "Select Program to run:"
+msgstr "<b>é??æ?©è¦?è¿?è¡?ç??ç¨?åº?ï¼?</b>"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "é??æ?©ä¸?ä¸ªå??å»ºç?®å½?"
@@ -641,22 +669,23 @@ msgstr "é??æ?©ä¸?ä¸ªå??å»ºç?®å½?"
 msgid "Translate messages"
 msgstr "ç¿»è¯?ä¿¡æ?¯"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:61
+#: ../plugins/build-basic-autotools/configuration-list.c:68
+#: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "é»?è®¤"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:62
+#: ../plugins/build-basic-autotools/configuration-list.c:69
 #: ../plugins/gdb/utilities.c:297
 msgid "Debug"
 msgstr "è°?è¯?"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:63
+#: ../plugins/build-basic-autotools/configuration-list.c:70
 msgid "Profiling"
 msgstr "ç??æ??æ¦?å?µ"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:64
+#: ../plugins/build-basic-autotools/configuration-list.c:71
 msgid "Optimized"
 msgstr "å·²ä¼?å??"
 
@@ -682,8 +711,9 @@ msgid "Program '%s' is not a local file"
 msgstr "ç¨?åº?â??%sâ??ä¸?æ?¯æ?¬å?°æ??ä»¶"
 
 #: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
+msgid "Program '%s' does not exist"
 msgstr "ç¨?åº?â??%sâ??ä¸?å?å?¨"
 
 #: ../plugins/build-basic-autotools/executer.c:318
@@ -727,264 +757,276 @@ msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨ç¦»å¼?ç?®å½?\\s+`(.+)'"
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+æ£å?¨ç¦»å¼?ç?®å½?\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:827
+#: ../plugins/build-basic-autotools/plugin.c:828
 #, c-format
 msgid "Entering: %s"
 msgstr "æ£å?¨è¿?å?¥ï¼? %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:863
+#: ../plugins/build-basic-autotools/plugin.c:864
 #, c-format
 msgid "Leaving: %s"
 msgstr "æ£å?¨ç¦»å¼?ï¼?%s"
 
-#: ../plugins/build-basic-autotools/plugin.c:896
+#: ../plugins/build-basic-autotools/plugin.c:897
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "è¦å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:902
+#: ../plugins/build-basic-autotools/plugin.c:903
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "é??è¯¯ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1019
+#: ../plugins/build-basic-autotools/plugin.c:1020
 #, c-format
 msgid "Command exited with status %d"
 msgstr "å?½ä»¤ä»¥ç?¶æ?? %d é??å?º"
 
-#: ../plugins/build-basic-autotools/plugin.c:1029
+#: ../plugins/build-basic-autotools/plugin.c:1030
+#: ../plugins/build-basic-autotools/plugin.c:1506
 #, c-format
 msgid "Command canceled by user"
 msgstr "å?½ä»¤è¢«ç?¨æ?·ç»?æ¢"
 
-#: ../plugins/build-basic-autotools/plugin.c:1034
+#: ../plugins/build-basic-autotools/plugin.c:1035
 #, c-format
 msgid "Command aborted by user"
 msgstr "å?½ä»¤è¢«ç?¨æ?·é??å?º"
 
-#: ../plugins/build-basic-autotools/plugin.c:1039
+#: ../plugins/build-basic-autotools/plugin.c:1040
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "å?½ä»¤ä»¥ä¿¡å?· %d ç»?æ¢"
 
-#: ../plugins/build-basic-autotools/plugin.c:1047
+#: ../plugins/build-basic-autotools/plugin.c:1048
 msgid "Command terminated for an unknown reason"
 msgstr "å?½ä»¤æ? æ??ç»?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1064
+#: ../plugins/build-basic-autotools/plugin.c:1066
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "æ?»å?±è??æ?¶ï¼?%lu ç§?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1071
+#: ../plugins/build-basic-autotools/plugin.c:1073
 msgid "Completed unsuccessfully\n"
 msgstr "å·²å®?æ??...å¤±è´¥\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1079
+#: ../plugins/build-basic-autotools/plugin.c:1081
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "å·²å®?æ??...æ??å??\n"
 
 #. Translators: the first number is the number of the build attemp,
 #. the string is the directory where the build takes place
-#: ../plugins/build-basic-autotools/plugin.c:1167
+#: ../plugins/build-basic-autotools/plugin.c:1169
 #, c-format
 msgid "Build %d: %s"
 msgstr "Build %d: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:1727
-#, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
+#. Need to run make clean before
+#: ../plugins/build-basic-autotools/plugin.c:1500
+msgid ""
+"Before using this new configuration, the default one needs to be removed. Do "
+"you want to do that ?"
+msgstr ""
+
+#: ../plugins/build-basic-autotools/plugin.c:1803
+#, fuzzy, c-format
+#| msgid "Can not compile \"%s\": No compile rule defined for this file type."
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ä¸?è?½ç¼?è¯?\"%s\"ï¼?æ²¡æ??å®?ä¹?å¯¹æ¤æ??ä»¶ç±»å??ç??ç¼?è¯?è§?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1853
-#, c-format
-msgid "Can not configure project: Missing configure script in %s."
+#: ../plugins/build-basic-autotools/plugin.c:1929
+#, fuzzy, c-format
+#| msgid "Can not configure project: Missing configure script in %s."
+msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½é??ç½®é¡¹ç?®ï¼?å?¨ %s ç¼ºå°?é??ç½®è??æ?¬ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2272
-#: ../plugins/build-basic-autotools/plugin.c:2346
-#: ../plugins/build-basic-autotools/plugin.c:2356
-#: ../plugins/build-basic-autotools/plugin.c:2374
-#: ../plugins/build-basic-autotools/plugin.c:2384
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2401
+#: ../plugins/build-basic-autotools/plugin.c:2475
+#: ../plugins/build-basic-autotools/plugin.c:2485
+#: ../plugins/build-basic-autotools/plugin.c:2503
+#: ../plugins/build-basic-autotools/plugin.c:2513
+#: ../plugins/build-basic-autotools/plugin.c:2570
 #, c-format
 msgid "_Build"
 msgstr "å??å»º(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2276
+#: ../plugins/build-basic-autotools/plugin.c:2405
 msgid "_Build Project"
 msgstr "å??å»ºé¡¹ç?®(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2277
+#: ../plugins/build-basic-autotools/plugin.c:2406
 msgid "Build whole project"
 msgstr "å??å»ºæ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2282
+#: ../plugins/build-basic-autotools/plugin.c:2411
 msgid "_Install Project"
 msgstr "å®?è£?é¡¹ç?®(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2283
+#: ../plugins/build-basic-autotools/plugin.c:2412
 msgid "Install whole project"
 msgstr "å®?è£?æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2288
+#: ../plugins/build-basic-autotools/plugin.c:2417
 msgid "_Clean Project"
 msgstr "æ¸?ç??é¡¹ç?®(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2289
+#: ../plugins/build-basic-autotools/plugin.c:2418
 msgid "Clean whole project"
 msgstr "æ¸?ç??æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2294
-msgid "C_onfigure Project..."
-msgstr "é??ç½®é¡¹ç?®(_O)..."
+#: ../plugins/build-basic-autotools/plugin.c:2423
+#, fuzzy
+#| msgid "Configure Project"
+msgid "C_onfigure Projectâ?¦"
+msgstr "é??ç½®é¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2295
+#: ../plugins/build-basic-autotools/plugin.c:2424
 msgid "Configure project"
 msgstr "é??ç½®é¡¹ç?®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2300
+#: ../plugins/build-basic-autotools/plugin.c:2429
 msgid "Build _Tarball"
 msgstr "å??å»º Tarball(_T)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2301
+#: ../plugins/build-basic-autotools/plugin.c:2430
 msgid "Build project tarball distribution"
 msgstr "å??å»ºé¡¹ç?® tarball å??è¡?å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2306
+#: ../plugins/build-basic-autotools/plugin.c:2435
 msgid "_Build Module"
 msgstr "å??å»ºæ¨¡å??(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2307
+#: ../plugins/build-basic-autotools/plugin.c:2436
 msgid "Build module associated with current file"
 msgstr "å??å»ºä¸?å½?å??æ??ä»¶å?³è??ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2312
+#: ../plugins/build-basic-autotools/plugin.c:2441
 msgid "_Install Module"
 msgstr "å®?è£?æ¨¡å??(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2313
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "Install module associated with current file"
 msgstr "å®?è£?ä¸?å½?å??æ??ä»¶å?³è??ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2318
+#: ../plugins/build-basic-autotools/plugin.c:2447
 msgid "_Clean Module"
 msgstr "æ¸?ç??æ¨¡å??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2319
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "Clean module associated with current file"
 msgstr "æ¸?ç??ä¸?å½?å??æ??ä»¶å?³è??ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2324
+#: ../plugins/build-basic-autotools/plugin.c:2453
 msgid "Co_mpile File"
 msgstr "ç¼?è¯?æ??ä»¶(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2325
+#: ../plugins/build-basic-autotools/plugin.c:2454
 msgid "Compile current editor file"
 msgstr "ç¼?è¯?å½?å??ç¼?è¾?å?¨ä¸ç??æ??ä»¶"
 
-#: ../plugins/build-basic-autotools/plugin.c:2330
+#: ../plugins/build-basic-autotools/plugin.c:2459
 msgid "Select Configuration"
 msgstr "é??æ?©é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2331
+#: ../plugins/build-basic-autotools/plugin.c:2460
 msgid "Select current configuration"
 msgstr "é??æ?©å½?å??é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2336
+#: ../plugins/build-basic-autotools/plugin.c:2465
 msgid "Remove Configuration"
 msgstr "å? é?¤é??ç½®"
 
-#: ../plugins/build-basic-autotools/plugin.c:2337
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??é¡¹ç?®(distclean)å¹¶å?¨å?¯è?½ç??æ??å?µä¸?å? é?¤é??ç½®ç?®å½?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2350
-#: ../plugins/build-basic-autotools/plugin.c:2378
+#: ../plugins/build-basic-autotools/plugin.c:2479
+#: ../plugins/build-basic-autotools/plugin.c:2507
 msgid "_Compile"
 msgstr "ç¼?è¯?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2351
-#: ../plugins/build-basic-autotools/plugin.c:2379
+#: ../plugins/build-basic-autotools/plugin.c:2480
+#: ../plugins/build-basic-autotools/plugin.c:2508
 msgid "Compile file"
 msgstr "ç¼?è¯?æ??ä»¶"
 
-#: ../plugins/build-basic-autotools/plugin.c:2357
-#: ../plugins/build-basic-autotools/plugin.c:2385
+#: ../plugins/build-basic-autotools/plugin.c:2486
+#: ../plugins/build-basic-autotools/plugin.c:2514
 msgid "Build module"
 msgstr "ç??æ??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2362
-#: ../plugins/build-basic-autotools/plugin.c:2390
-#: ../plugins/build-basic-autotools/plugin.c:2448
+#: ../plugins/build-basic-autotools/plugin.c:2491
+#: ../plugins/build-basic-autotools/plugin.c:2519
+#: ../plugins/build-basic-autotools/plugin.c:2577
 #, c-format
 msgid "_Install"
 msgstr "å®?è£?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2363
-#: ../plugins/build-basic-autotools/plugin.c:2391
+#: ../plugins/build-basic-autotools/plugin.c:2492
+#: ../plugins/build-basic-autotools/plugin.c:2520
 msgid "Install module"
 msgstr "å®?è£?æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2368
-#: ../plugins/build-basic-autotools/plugin.c:2396
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2497
+#: ../plugins/build-basic-autotools/plugin.c:2525
+#: ../plugins/build-basic-autotools/plugin.c:2584
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2369
-#: ../plugins/build-basic-autotools/plugin.c:2397
+#: ../plugins/build-basic-autotools/plugin.c:2498
+#: ../plugins/build-basic-autotools/plugin.c:2526
 msgid "Clean module"
 msgstr "æ¸?ç??æ¨¡å??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2402
+#: ../plugins/build-basic-autotools/plugin.c:2531
 msgid "_Cancel command"
 msgstr "å??æ¶?å?½ä»¤(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2403
+#: ../plugins/build-basic-autotools/plugin.c:2532
 msgid "Cancel build command"
 msgstr "å??æ¶?å??å»ºå?½ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2570
 #, c-format
 msgid "_Build (%s)"
 msgstr "å??å»º (%s)(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2448
+#: ../plugins/build-basic-autotools/plugin.c:2577
 #, c-format
 msgid "_Install (%s)"
 msgstr "å®?è£? (%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2455
+#: ../plugins/build-basic-autotools/plugin.c:2584
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç?? (%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2592
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "ç¼?è¯? (%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2592
 #, c-format
 msgid "Co_mpile"
 msgstr "ç¼?è¯?(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2999
+#: ../plugins/build-basic-autotools/plugin.c:3128
 msgid "Build commands"
 msgstr "å??å»ºå?½ä»¤"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3008
+#: ../plugins/build-basic-autotools/plugin.c:3137
 msgid "Build popup commands"
 msgstr "å??å»ºå¼¹å?ºå?½ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:3372
-#: ../plugins/build-basic-autotools/plugin.c:3380
+#: ../plugins/build-basic-autotools/plugin.c:3519
+#: ../plugins/build-basic-autotools/plugin.c:3527
 msgid "Build Autotools"
 msgstr "å??å»º Autotools"
 
@@ -993,49 +1035,54 @@ msgid "Command aborted"
 msgstr "å?½ä»¤å·²é??å?º"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
-msgid "<b>Class Elements</b>"
-msgstr "<b>ç±»å??ç´ </b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
-msgid "<b>General Class Properties</b>"
-msgstr "<b>ä¸?è?¬ç±»å±?æ?§</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "æ·»å? è?³é¡¹ç?®"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "æ·»å? å?°ä»?åº?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
-msgid "Author Email:"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+#, fuzzy
+#| msgid "Author Email:"
+msgid "Author Email Address:"
 msgstr "ä½?è??ç?µå?é?®ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "ä½?è??å§?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "ä½?è??/æ?¥æ??-æ?¶é?´"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "ä½?è??/æ?¥æ??/æ?¶é?´"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "å?ºç±»ç»§æ?¿ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "å?ºç±»ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#, fuzzy
+#| msgid "<b>Class Elements</b>"
+msgid "Class Elements"
+msgstr "<b>ç±»å??ç´ </b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "ç±»å?½æ?°å??ç¼?ï¼?"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
+msgid "Class Generator"
+msgstr "ç±»ç??æ??å?¨"
+
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "ç±»å??ï¼?"
@@ -1057,71 +1104,74 @@ msgid "GObject Prefix and Type:"
 msgstr "GObject å??ç¼?å??ç±»å??ï¼?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
-#: ../plugins/file-wizard/file.c:100
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
+#, fuzzy
+#| msgid "<b>General Class Properties</b>"
+msgid "General Class Properties"
+msgstr "<b>ä¸?è?¬ç±»å±?æ?§</b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/file-wizard/file.c:102
+#: ../plugins/project-wizard/templates/translatable-strings.h:47
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è®¸å?¯è¯? (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
 msgid "Generic C++ Class"
 msgstr "é??ç?¨ C++ ç±»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "Header File:"
 msgstr "å¤´æ??ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "Inline the declaration and implementation"
 msgstr "å??åµ?å£°æ??å??å®?ç?°"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
-#: ../plugins/file-wizard/file.c:101
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/file-wizard/file.c:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:60
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU å®½é??ç?¨å?¬å?±è®¸å?¯è¯? (LGPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "è®¸å?¯ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Member Functions/Variables"
 msgstr "æ??å??å?½æ?°/å??é??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
-#| msgid "No license"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 msgid "No License"
 msgstr "æ? è®¸å?¯"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
-#: ../plugins/glade/plugin.c:4436
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/glade/plugin.c:4446
 msgid "Properties"
 msgstr "å±?æ?§"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
 msgid "Signals"
 msgstr "ä¿¡å?·"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Source File:"
 msgstr "æº?æ??ä»¶ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
 msgid "Source/Header Headings:"
 msgstr "æº?æ??ä»¶/å¤´æ??ä»¶æ?¬å¤´è¡?ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
-#| msgid "Create"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
 msgid "private"
 msgstr "private"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
-#| msgid "project name"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
 msgid "protected"
 msgstr "protected"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
 msgid "public"
 msgstr "public"
 
@@ -1147,10 +1197,14 @@ msgstr "å¤?ç??å??ç??æ¨¡æ?¿å°?è¦?å??å?¥ç??æ??ä»¶"
 msgid "Failed to write autogen definition file"
 msgstr "å??å»º Autogen å®?ä¹?æ??ä»¶å¤±è´¥"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1040
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1043
+#, fuzzy
+#| msgid ""
+#| "Could not find autogen version 5, please install the autogen package. You "
+#| "can get it from http://autogen.sourceforge.net";
 msgid ""
-"Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr ""
 "æ?¾ä¸?å?°ç??æ?¬å?·ä¸º5ç?? Autogenï¼?è¯·å®?è£? Autogen è½¯ä»¶å??ã??æ?¨å?¯ä»¥å?¨ http://autogen.";
 "sourceforge.net æ?¾å?°å®?"
@@ -1160,33 +1214,86 @@ msgstr ""
 msgid "Failed to execute autogen: %s"
 msgstr "æ? æ³?æ?§è¡? Autogenï¼?%s"
 
-#: ../plugins/class-gen/window.c:818
-msgid "XML description of the user interface"
-msgstr "ç?¨æ?·ç??é?¢ç?? XML è¯è¨?æ??è¿°"
+#: ../plugins/class-gen/window.c:94
+#, fuzzy
+msgid "Guess from type"
+msgstr "ä»?ä¸?å?¼å®¹ç??æ??é??ç±»å??èµ?å?¼"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
-msgid "<b>CVS Options</b>"
-msgstr "<b>CVS é??é¡¹</b>"
+#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/search/anjuta-search.ui.h:29
+#, fuzzy
+#| msgid "Stopped"
+msgid "Scope"
+msgstr "è??å?´"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
-msgid "<b>Module Details:</b>"
-msgstr "<b>æ¨¡å??ç»?è??ï¼?</b>"
+#: ../plugins/class-gen/window.c:500
+#, fuzzy
+#| msgid "Tag _Implementation"
+msgid "Implementation"
+msgstr "æ?ªå®?ç?°"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
-msgid "<b>Options:</b>"
-msgstr "<b>é??é¡¹ï¼?</b>"
+#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
+#: ../plugins/class-gen/window.c:533
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/debug_tree.c:126
+msgid "Type"
+msgstr "ç±»å??"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
-#: ../plugins/search/anjuta-search.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>é??é¡¹</b>"
+#: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
+#: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
+#: ../plugins/run-program/parameters.c:749
+#: ../plugins/search/search_preferences.c:534
+msgid "Name"
+msgstr "å??ç§°"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
+#: ../plugins/class-gen/window.c:535
+#: ../plugins/debug-manager/stack_trace.c:679
+msgid "Arguments"
+msgstr "å??æ?°"
+
+#: ../plugins/class-gen/window.c:521
+msgid "Nick"
+msgstr "æ?µç§°"
+
+#: ../plugins/class-gen/window.c:522
+msgid "Blurb"
+msgstr ""
+
+#: ../plugins/class-gen/window.c:523
+msgid "GType"
+msgstr "GType"
+
+#: ../plugins/class-gen/window.c:524
+#, fuzzy
+#| msgid "Parameters:"
+msgid "ParamSpec"
+msgstr "å??æ?°ï¼?"
+
+#. Somehow redundant with marshaller, but required for default handler
+#: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
+msgid "Flags"
+msgstr "æ ?å¿?"
+
+#: ../plugins/class-gen/window.c:537
+msgid "Marshaller"
+msgstr ""
+
+#: ../plugins/class-gen/window.c:818
+msgid "XML description of the user interface"
+msgstr "ç?¨æ?·ç??é?¢ç?? XML è¯è¨?æ??è¿°"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
+#| msgid ""
+#| "<b>Please note: </b>\n"
+#| "\n"
+#| "Pressing OK will delete the file from disk and from CVS. Of course the "
+#| "file won't be removed from CVS before you use CVS Commit. <b>You have "
+#| "been warned!</b>"
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
-"Pressing OK will delete the file from disk and from CVS. Of course the file "
+"Pressing OK will delete the file from disk and from CVS. Of course, the file "
 "won't be removed from CVS before you use CVS Commit. <b>You have been warned!"
 "</b>"
 msgstr ""
@@ -1195,175 +1302,209 @@ msgstr ""
 "æ??ä¸?ç¡®å®?æ??é?®å°?ä¼?æ??æ??ä»¶ä»?ç£?ç??å?? CVS ä¸å? é?¤ã??å½?ç?¶ï¼?å?¨ä½¿ç?¨ CVS æ??äº¤å?½ä»¤ä¹?å??ï¼?æ??"
 "ä»¶æ?¯ä¸?ä¼?ç??ç??å?¨ CVS ä¸å? é?¤ç??ã??<b>å?«è¯´æ²¡è¦å??è¿?æ?¨å?¦ï¼?</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
-msgid "<b>Repository: </b>"
-msgstr "<b>ä»?åº?ï¼?</b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
 msgstr "è¯¦ç»?æ¨¡å¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
 #: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
-#: ../plugins/tools/anjuta-tools.ui.h:2
-msgid "Browse..."
+#: ../plugins/tools/anjuta-tools.ui.h:1
+#, fuzzy
+#| msgid "Browse..."
+msgid "Browseâ?¦"
 msgstr "æµ?è§?..."
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
+#, fuzzy
+#| msgid "CVS operations"
+msgid "CVS Options"
+msgstr "CVS æ??ä½?"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:7
 msgid "CVS Preferences"
 msgstr "CVS é¦?é??é¡¹"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "CVS: Add file/directory"
 msgstr "CVSï¼?æ·»å?  - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "CVS: Commit file/directory"
 msgstr "CVS: æ??äº¤ - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
 msgid "CVS: Diff file/directory"
 msgstr "CVSï¼?æ¯?è¾? - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS: Import"
 msgstr "CVSï¼?å¯¼å?¥"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Log file/directory"
 msgstr "CVSï¼?æ?¥å¿? - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Remove file/directory"
 msgstr "CVSï¼?å? é?¤ - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Status"
 msgstr "CVSï¼?ç?¶æ??"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Status from file/directory"
 msgstr "CVSï¼?ç?¶æ?? - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Update file/directory"
 msgstr "CVSï¼?æ?´æ?° - æ??ä»¶/ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVSROOT:"
 msgstr "CVSROOTï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 #: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "Choose file or directory to add:"
 msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "Choose file or directory to commit:"
 msgstr "é??æ?©è¦?æ??äº¤ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "Choose file or directory to diff:"
 msgstr "é??æ?©è¦? diff ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
-msgid "Choose file or directory to get log:"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#, fuzzy
+#| msgid "Choose file or directory to get log:"
+msgid "Choose file or directory to get log for:"
 msgstr "é??æ?©è¦?æ?¥ç??æ?¥å¿?ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
 msgid "Choose file or directory to get the status from:"
 msgstr "é??æ?©è¦?æ?¥ç??ç?¶æ??ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to remove:"
 msgstr "é??æ?©è¦?å? é?¤ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 #: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "é??æ?©è¦?æ?´æ?°ç??æ??ä»¶æ??ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Compression Level (0=off, 10=max):"
 msgstr "å??ç¼©çº§å?« (0=ä¸?å??ç¼©ï¼?10=æ??å¤§å??ç¼©)ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Create new directories"
 msgstr "å??å»ºæ?°ç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Delete empty directories"
 msgstr "å? é?¤ç©ºç?®å½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
 #: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "ä¸?è?½é??å½?æ??ä½?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+#, fuzzy
 msgid "Extern (rsh)"
-msgstr ""
+msgstr "%sï¼?â??%sâ??æ??ç?¸äº?å?²çª?ç??å¤?é?¨å®?ä¹?\n"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
 msgstr "æ??ä»¶æ?¯äº?è¿?å?¶æ??ä»¶"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "å¿½ç?¥ .cvsrc æ??ä»¶(æ?¨è??)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
-#: ../plugins/symbol-db/plugin.c:2247 ../plugins/symbol-db/plugin.c:2311
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2333
+#: ../plugins/symbol-db/plugin.c:2397
 msgid "Local"
 msgstr "æ?¬å?°"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "æ?¥å¿?ä¿¡æ?¯ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#, fuzzy
+#| msgid "<b>Module Details:</b>"
+msgid "Module Details:"
+msgstr "<b>æ¨¡å??ç»?è??ï¼?</b>"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Module name:"
 msgstr "æ¨¡å??å??ç§°ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3097
+#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
+msgid "Options"
+msgstr "é??é¡¹"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
+msgid "Options:"
+msgstr "é??é¡¹ï¼?"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Password server (pserver)"
 msgstr "å¯?ç ?æ??å?¡å?¨ (pserver)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
 #: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "å¯?ç ?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
 msgid "Patch-Style diff"
 msgstr "Patch é£?æ ¼ diff"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
 msgid "Path to \"cvs\" command"
 msgstr "\"cvs\"å?½ä»¤ç??è·¯å¾?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Project root directory:"
 msgstr "é¡¹ç?®æ ¹ç?®å½?ï¼?"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Release tag:"
 msgstr "å??å¸?æ ?ç¾ï¼?"
 
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#, fuzzy
+#| msgid "Repository Head"
+msgid "Repository:"
+msgstr "é??é¡¹"
+
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "é??ç½®ç²?æ»?æ ?ç¾"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:79
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ä¿®è®¢ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:47
-#| msgid "Standard input:"
 msgid "Standard diff"
 msgstr "æ ?å?? diff"
 
@@ -1372,7 +1513,7 @@ msgid "Unified format instead of context format"
 msgstr "ç»?ä¸?æ ¼å¼?è??ä¸?æ?¯ä¸?ä¸?æ??æ ¼å¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
-#: ../plugins/subversion/anjuta-subversion.ui.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use revision/tag:"
 msgstr "ä½¿ç?¨ä¿®è®¢/æ ?ç¾ï¼?"
 
@@ -1381,7 +1522,7 @@ msgid "Use revision:"
 msgstr "ä½¿ç?¨ä¿®è®¢ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
-#: ../plugins/subversion/anjuta-subversion.ui.h:55
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
@@ -1390,8 +1531,8 @@ msgid "Vendor tag:"
 msgstr "é??å?®å??æ ?ç¾ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:107
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "æ?´ä¸ªé¡¹ç?®"
 
@@ -1415,7 +1556,7 @@ msgstr "æ? æ³?å? é?¤æ??ä»¶"
 #: ../plugins/cvs-plugin/cvs-callbacks.c:244
 #: ../plugins/git/git-commit-dialog.c:79
 #: ../plugins/git/git-create-tag-dialog.c:130
-#: ../plugins/git/git-merge-dialog.c:87
+#: ../plugins/git/git-merge-dialog.c:91
 #: ../plugins/subversion/subversion-commit-dialog.c:88
 msgid "Are you sure that you want to pass an empty log message?"
 msgstr "æ?¨æ?¯å?¦ç¡®å®?è¦?æ??äº¤ä¸?ä¸ªç©ºç??æ?¥å¿?ä¿¡æ?¯ï¼?"
@@ -1442,17 +1583,23 @@ msgid "Are you sure that you do not want a log message?"
 msgstr "æ?¨ç¡®å®?ä¸?å??æ?¥å¿?ä¿¡æ?¯å??ï¼?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:125
-msgid "CVS command failed - See above for details"
+#, fuzzy
+#| msgid "CVS command failed - See above for details"
+msgid "CVS command failed. See above for details"
 msgstr "CVS å?½ä»¤å¤±è´¥ - ä»¥ä¸?ä¸ºè¯¦æ??"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:130
-#, c-format
-msgid "CVS command successful! - Time taken: %ld second"
-msgid_plural "CVS command successful! - Time taken: %ld seconds"
+#, fuzzy, c-format
+#| msgid "CVS command successful! - Time taken: %ld second"
+#| msgid_plural "CVS command successful! - Time taken: %ld seconds"
+msgid "CVS command successful! Time taken: %ld second"
+msgid_plural "CVS command successful! Time taken: %ld seconds"
 msgstr[0] "CVS å?½ä»¤æ??å?? - è??æ?¶ï¼?%ld ç§?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:221
-msgid "CVS command is running - please wait until it finishes!"
+#, fuzzy
+#| msgid "CVS command is running - please wait until it finishes!"
+msgid "CVS command is running â?? please wait until it finishes!"
 msgstr "CVS å?½ä»¤ä»?å?¨è¿?è¡?ä¸ - è¯·ç?å¾?å®?ä»¬å®?æ??ï¼?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
@@ -1506,15 +1653,16 @@ msgstr "å°?æ?´æ?¹æ??äº¤å?° CVS æ ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:49
-#: ../plugins/gdb/anjuta-gdb.glade.h:38
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Display label
 #. short-cut
 #: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
-msgid "Sync your local copy with the CVS tree"
+#, fuzzy
+#| msgid "Sync your local copy with the CVS tree"
+msgid "Syncronize your local copy with the CVS tree"
 msgstr "æ?¬å?°å?¯æ?¬ä¸? CVS æ ?å??æ¥"
 
 #. Action name
@@ -1574,391 +1722,380 @@ msgid "CVS popup operations"
 msgstr "CVS å¼¹å?ºæ??ä½?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
-msgid "<b>Debugger:</b>"
-msgstr "<b>è°?è¯?å?¨ï¼?</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
-msgid "<b>Remote debugging</b>"
-msgstr "<b>è¿?ç¨?è°?è¯?</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
+"program not using the Debug configuration?</span>\n"
+"\n"
+"When optimizations are enabled, the debugger cannot always identify the "
+"source code corresponding to the instructions, so some commands can perform "
+"in a strange way, especially steps."
+msgstr ""
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
 msgstr "æ·»å? ç??è§?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 msgid "Address:"
 msgstr "å?°å??ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
-#: ../plugins/gdb/anjuta-gdb.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "ä¾?é??å?°è¿?ç¨?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
-#: ../plugins/gdb/anjuta-gdb.glade.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Breakpoint properties"
 msgstr "æ?ç?¹å±?æ?§"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
-#: ../plugins/debug-manager/breakpoints.c:1981
-#: ../plugins/gdb/anjuta-gdb.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/breakpoints.c:1980
 msgid "Breakpoints"
 msgstr "æ?ç?¹"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
-#: ../plugins/gdb/anjuta-gdb.glade.h:5
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "CPU Registers"
 msgstr "CPU å¯?å?å?¨"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Change Watch"
 msgstr "æ?¹å??ç??è§?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "Connect to remote target"
 msgstr "è¿?æ?¥å?°è¿?ç¨?ç?®æ ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
-#: ../plugins/gdb/anjuta-gdb.glade.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
 msgstr "è°?è¯?å?¨å?½ä»¤"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
-#: ../plugins/gdb/anjuta-gdb.glade.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
 msgstr "è°?è¯?å?¨å?½ä»¤ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
-#: ../plugins/gdb/anjuta-gdb.glade.h:9
-#: ../plugins/project-wizard/templates/translatable-strings.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#, fuzzy
+#| msgid "Debugger"
+msgid "Debugger:"
+msgstr "è°?è¯?å?¨"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:33
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 msgid "Disable"
 msgstr "ç¦?ç?¨"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
-#: ../plugins/gdb/anjuta-gdb.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "æ?¾ç¤ºè¿?ç¨?æ ?(_T)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
-#: ../plugins/gdb/anjuta-gdb.glade.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
+msgid "Do not show again"
+msgstr "ä¸?å??æ?¾ç¤º"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "å?¨é?¨å?¯ç?¨(_A)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "è¾?å?¥å??å?è¿?å?¶å?°å??æ??è??å?¨æ?°æ?®ä¸é??æ?©ä¸?ä¸ª"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
-#: ../plugins/gdb/anjuta-gdb.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "é??è??è¿?ç¨?å??æ?°(_M)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
-#: ../plugins/gdb/anjuta-gdb.glade.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Inspect"
 msgstr "æ£?æ?¥"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect/Evaluate"
 msgstr "æ£?æ?¥/æ±?å?¼"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
-#: ../plugins/debug-manager/plugin.c:931
-#: ../plugins/debug-manager/plugin.c:1031 ../plugins/gdb/anjuta-gdb.glade.h:16
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
+#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "å??æ ¸ä¿¡å?·"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
-#: ../plugins/debug-manager/breakpoints.c:1908
-#: ../plugins/gdb/anjuta-gdb.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/breakpoints.c:1907
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
-#: ../plugins/debug-manager/memory.c:180 ../plugins/gdb/anjuta-gdb.glade.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
+#: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "å??å?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
-#: ../plugins/gdb/anjuta-gdb.glade.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 msgid "Pass:"
 msgstr "é??æ?°:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Port:"
 msgstr "ç«¯å?£ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
-#: ../plugins/gdb/anjuta-gdb.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "æ??å?°ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
-#: ../plugins/gdb/anjuta-gdb.glade.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Program Interrupt"
 msgstr "ç¨?åº?ä¸æ?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
-#: ../plugins/gdb/anjuta-gdb.glade.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#, fuzzy
+#| msgid "<b>Remote debugging</b>"
+msgid "Remote debugging"
+msgstr "<b>è¿?ç¨?è°?è¯?</b>"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 msgid "SIGINT"
 msgstr "SIGINT"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:33
 msgid "Select one directory"
 msgstr "é??æ?©ä¸?ä¸ªç?®å½?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:34
 msgid "Serial Line Connection"
 msgstr "ä¸²è¡?çº¿è·¯è¿?æ?¥"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
-#: ../plugins/gdb/anjuta-gdb.glade.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:35
 msgid "Set Signal Property"
 msgstr "è®¾ç½®ä¿¡å?·å±?æ?§"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
 #: ../plugins/debug-manager/sharedlib.c:214
-#: ../plugins/gdb/anjuta-gdb.glade.h:25
 msgid "Shared libraries"
 msgstr "å?±äº«å?½æ?°åº?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:33
-#: ../plugins/gdb/anjuta-gdb.glade.h:26
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:37
 msgid "Signal:"
 msgstr "ä¿¡å?·ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:34
-#: ../plugins/gdb/anjuta-gdb.glade.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:38
 msgid "Source Directories"
 msgstr "æº?ä»£ç ?ç?®å½?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:35
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
 msgid "Start Debugger"
 msgstr "å?¯å?¨è°?è¯?å?¨(_S)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
-#: ../plugins/gdb/anjuta-gdb.glade.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:40
 msgid "Stop:"
 msgstr "å??æ¢ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:37
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:41
 msgid "TCP/IP Connection"
 msgstr "TCP/IP è¿?æ?¥"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:38
-#: ../plugins/gdb/anjuta-gdb.glade.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
 #: ../plugins/project-wizard/property.c:286
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
-#: ../plugins/gdb/anjuta-gdb.glade.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:43
 msgid "_Attach"
 msgstr "ä¾?é??(_A)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:40
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:44
 msgid "_Automatic update"
 msgstr "è?ªå?¨æ?´æ?°(_A)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:41
-#: ../plugins/gdb/anjuta-gdb.glade.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:45
 msgid "_Condition:"
 msgstr "æ?¡ä»¶(_C)ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/gdb/anjuta-gdb.glade.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:46
 msgid "_Disable all"
 msgstr "å?¨é?¨ç¦?ç?¨(_D)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:43
-#: ../plugins/gdb/anjuta-gdb.glade.h:33
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:47
 msgid "_Hide paths"
 msgstr "é??è??è·¯å¾?(_H)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:44
-#: ../plugins/gdb/anjuta-gdb.glade.h:34
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:48
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:45
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:49
 msgid "_Name:"
 msgstr "å??ç§°(_N)ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:46
+#. This is the number of time that the program executes the line where a breakpoint is located. It is used as a list header, so I have tried to find a quite short name.
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:51
 msgid "_Pass count:"
 msgstr "é??æ?°(_P)ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:47
-#: ../plugins/gdb/anjuta-gdb.glade.h:36
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:52
 msgid "_Process to attach to:"
 msgstr "è¦?ä¾?é??ç??è¿?ç¨?(_P)ï¼?"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:48
-#: ../plugins/gdb/anjuta-gdb.glade.h:37
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:53
 msgid "_Remove all"
 msgstr "å?¨é?¨å? é?¤(_R)"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:50
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:55
 msgid "_Value:"
 msgstr "æ?°å?¼(_V)ï¼?"
 
-#: ../plugins/debug-manager/breakpoints.c:1674
+#: ../plugins/debug-manager/breakpoints.c:1673
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "æ?¨æ?¯å?¦ç¡®å®?è¦?å? é?¤å?¨é?¨æ?ç?¹ï¼?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1771
+#: ../plugins/debug-manager/breakpoints.c:1770
 msgid "_Breakpoints"
 msgstr "æ?ç?¹(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1779
+#: ../plugins/debug-manager/breakpoints.c:1778
 msgid "Toggle Breakpoint"
 msgstr "å??æ?¢æ?ç?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1781
+#: ../plugins/debug-manager/breakpoints.c:1780
 msgid "Toggle breakpoint at the current location"
 msgstr "å??æ?¢å½?å??ä½?ç½®ç??æ?ç?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1787
-msgid "Add Breakpoint..."
+#: ../plugins/debug-manager/breakpoints.c:1786
+#, fuzzy
+#| msgid "Add Breakpoint..."
+msgid "Add Breakpointâ?¦"
 msgstr "æ·»å? æ?ç?¹..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1789
+#: ../plugins/debug-manager/breakpoints.c:1788
 msgid "Add a breakpoint"
 msgstr "æ·»å? æ?ç?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1795
+#: ../plugins/debug-manager/breakpoints.c:1794
 msgid "Remove Breakpoint"
 msgstr "å? é?¤æ?ç?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1797
+#: ../plugins/debug-manager/breakpoints.c:1796
 msgid "Remove a breakpoint"
 msgstr "å? é?¤ä¸?ä¸ªæ?ç?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1803
+#: ../plugins/debug-manager/breakpoints.c:1802
 msgid "Edit Breakpoint"
 msgstr "ç¼?è¾?æ?ç?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1805
+#: ../plugins/debug-manager/breakpoints.c:1804
 msgid "Edit breakpoint properties"
 msgstr "ç¼?è¾?æ?ç?¹å±?æ?§"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1811
-#: ../plugins/debug-manager/breakpoints.c:1882
+#: ../plugins/debug-manager/breakpoints.c:1810
+#: ../plugins/debug-manager/breakpoints.c:1881
 msgid "Enable Breakpoint"
 msgstr "å?¯ç?¨æ?ç?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1813
-#: ../plugins/debug-manager/breakpoints.c:1883
+#: ../plugins/debug-manager/breakpoints.c:1812
+#: ../plugins/debug-manager/breakpoints.c:1882
 msgid "Enable a breakpoint"
 msgstr "å?¯ç?¨ä¸?ä¸ªæ?ç?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1819
+#: ../plugins/debug-manager/breakpoints.c:1818
 msgid "Disable All Breakpoints"
 msgstr "ç¦?ç?¨æ??æ??æ?ç?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1821
+#: ../plugins/debug-manager/breakpoints.c:1820
 msgid "Deactivate all breakpoints"
 msgstr "ä½¿æ??æ??æ?ç?¹å¤±æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1827
+#: ../plugins/debug-manager/breakpoints.c:1826
 msgid "R_emove All Breakpoints"
 msgstr "æ¸?é?¤å?¨é?¨æ?ç?¹(_E)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1829
+#: ../plugins/debug-manager/breakpoints.c:1828
 msgid "Remove all breakpoints"
 msgstr "æ¸?é?¤å?¨é?¨æ?ç?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1838
+#: ../plugins/debug-manager/breakpoints.c:1837
 msgid "Jump to Breakpoint"
 msgstr "è·³è½¬å?°æ?ç?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1840
+#: ../plugins/debug-manager/breakpoints.c:1839
 msgid "Jump to breakpoint location"
 msgstr "è·³è½¬å?°æ?ç?¹ä½?ç½®"
 
-#: ../plugins/debug-manager/breakpoints.c:1877
+#: ../plugins/debug-manager/breakpoints.c:1876
 msgid "Disable Breakpoint"
 msgstr "ç¦?ç?¨æ?ç?¹"
 
-#: ../plugins/debug-manager/breakpoints.c:1878
+#: ../plugins/debug-manager/breakpoints.c:1877
 msgid "Disable a breakpoint"
 msgstr "ç¦?ç?¨ä¸?ä¸ªæ?ç?¹"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "å·²å?¯ç?¨"
 
-#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/debug-manager/breakpoints.c:1907
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "å?°å??"
 
 #: ../plugins/debug-manager/breakpoints.c:1908
-#: ../plugins/debug-manager/debug_tree.c:126
-msgid "Type"
-msgstr "ç±»å??"
-
-#: ../plugins/debug-manager/breakpoints.c:1909
 msgid "Condition"
 msgstr "æ?¡ä»¶"
 
-#: ../plugins/debug-manager/breakpoints.c:1909
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "Pass count"
 msgstr "é??æ?°"
 
-#: ../plugins/debug-manager/breakpoints.c:1909
+#: ../plugins/debug-manager/breakpoints.c:1908
 msgid "State"
 msgstr "ç?¶æ??"
 
-#: ../plugins/debug-manager/breakpoints.c:1958
-#: ../plugins/debug-manager/breakpoints.c:1964
+#: ../plugins/debug-manager/breakpoints.c:1957
+#: ../plugins/debug-manager/breakpoints.c:1963
 msgid "Breakpoint operations"
 msgstr "æ?ç?¹æ??ä½?"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:390
-#: ../plugins/debug-manager/sparse_view.c:498
-msgid "_Goto address"
+#: ../plugins/debug-manager/data_view.c:389
+#: ../plugins/debug-manager/sparse_view.c:497
+#, fuzzy
+#| msgid "_Goto address"
+msgid "_Go to address"
 msgstr "è·³è½¬å?°å?°å??(_G)"
 
 #: ../plugins/debug-manager/debug_tree.c:126
@@ -1991,243 +2128,259 @@ msgstr "è¡?"
 msgid "Locals"
 msgstr "å±?é?¨å??é??"
 
-#: ../plugins/debug-manager/plugin.c:313
+#: ../plugins/debug-manager/plugin.c:315
 msgid "Debugger Log"
 msgstr "è°?è¯?å?¨æ?¥å¿?"
 
-#: ../plugins/debug-manager/plugin.c:387 ../plugins/debug-manager/plugin.c:407
-#: ../plugins/debug-manager/plugin.c:427 ../plugins/debug-manager/plugin.c:449
-#: ../plugins/debug-manager/plugin.c:483 ../plugins/debug-manager/plugin.c:518
+#: ../plugins/debug-manager/plugin.c:389 ../plugins/debug-manager/plugin.c:409
+#: ../plugins/debug-manager/plugin.c:429 ../plugins/debug-manager/plugin.c:451
+#: ../plugins/debug-manager/plugin.c:485 ../plugins/debug-manager/plugin.c:520
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "è°?è¯?å?¨"
 
-#: ../plugins/debug-manager/plugin.c:387
+#: ../plugins/debug-manager/plugin.c:389
 msgid "Started"
 msgstr "å·²å¼?å§?"
 
-#: ../plugins/debug-manager/plugin.c:407
+#: ../plugins/debug-manager/plugin.c:409
 msgid "Loaded"
 msgstr "å·²è½½å?¥"
 
-#: ../plugins/debug-manager/plugin.c:427
-msgid "Running..."
+#: ../plugins/debug-manager/plugin.c:429
+#, fuzzy
+#| msgid "Running..."
+msgid "Runningâ?¦"
 msgstr "æ£è¿?è¡?..."
 
-#: ../plugins/debug-manager/plugin.c:449
+#: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
-#: ../plugins/debug-manager/plugin.c:483
+#: ../plugins/debug-manager/plugin.c:485
 msgid "Unloaded"
 msgstr "å·²å?¸è½½"
 
-#: ../plugins/debug-manager/plugin.c:524
+#: ../plugins/debug-manager/plugin.c:529
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
 msgstr "è°?è¯?å?¨ç»?æ¢ï¼?é??è¯¯ %d: %s\n"
 
-#: ../plugins/debug-manager/plugin.c:537
+#: ../plugins/debug-manager/plugin.c:542
 #, c-format
 msgid "Program has received signal: %s\n"
 msgstr "ç¨?åº?æ?¥æ?¶å?°ä¿¡å?·ï¼?%s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:815
+#: ../plugins/debug-manager/plugin.c:829
 msgid "_Debug"
 msgstr "è°?è¯?(_D)"
 
-#: ../plugins/debug-manager/plugin.c:823
+#: ../plugins/debug-manager/plugin.c:837
 msgid "_Start Debugger"
 msgstr "å?¯å?¨è°?è¯?å?¨(_S)"
 
-#: ../plugins/debug-manager/plugin.c:831
+#: ../plugins/debug-manager/plugin.c:845
 msgid "_Debug Program"
 msgstr "è°?è¯?ç¨?åº?(_D)"
 
-#: ../plugins/debug-manager/plugin.c:833
+#: ../plugins/debug-manager/plugin.c:847
 msgid "Start debugger and load the program"
 msgstr "å?¯å?¨è°?è¯?å?¨å¹¶å? è½½ç¨?åº?"
 
-#: ../plugins/debug-manager/plugin.c:839
-msgid "_Debug Process..."
+#: ../plugins/debug-manager/plugin.c:853
+#, fuzzy
+#| msgid "_Debug Process..."
+msgid "_Debug Processâ?¦"
 msgstr "è°?è¯?è¿?ç¨?(_D)..."
 
-#: ../plugins/debug-manager/plugin.c:841
+#: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
 msgstr "å?¯å?¨è°?è¯?å?¨å¹¶ä¾?é??å?°è¿?è¡?ä¸ç??ç¨?åº?"
 
-#: ../plugins/debug-manager/plugin.c:847
-msgid "Debug _Remote Target..."
+#: ../plugins/debug-manager/plugin.c:861
+#, fuzzy
+#| msgid "Debug _Remote Target..."
+msgid "Debug _Remote Targetâ?¦"
 msgstr "è¿?ç¨?è°?è¯?ç?®æ ?(_R)ï¼?"
 
-#: ../plugins/debug-manager/plugin.c:849
+#: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
 msgstr "è¿?æ?¥å?°è¿?ç¨?è°?è¯?ç?®æ ?"
 
-#: ../plugins/debug-manager/plugin.c:855
+#: ../plugins/debug-manager/plugin.c:869
 msgid "Stop Debugger"
 msgstr "å??æ¢è°?è¯?å?¨(_O)"
 
-#: ../plugins/debug-manager/plugin.c:857
+#: ../plugins/debug-manager/plugin.c:871
 msgid "Say goodbye to the debugger"
 msgstr "å??è°?è¯?å?¨è¯´å??è§?"
 
-#: ../plugins/debug-manager/plugin.c:863
-msgid "Add source paths..."
+#: ../plugins/debug-manager/plugin.c:877
+#, fuzzy
+#| msgid "Add source paths..."
+msgid "Add source pathsâ?¦"
 msgstr "æ·»å? æº?ä»£ç ?è·¯å¾?..."
 
-#: ../plugins/debug-manager/plugin.c:865
+#: ../plugins/debug-manager/plugin.c:879
 msgid "Add additional source paths"
 msgstr "æ·»å? å?¶å®?æº?ç ?è·¯å¾?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:875 ../plugins/debug-manager/plugin.c:983
-msgid "Debugger Command..."
-msgstr "è°?è¯?å?¨å?½ä»¤..."
+#: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
+#, fuzzy
+#| msgid "Debugger command"
+msgid "Debugger Commandâ?¦"
+msgstr "è°?è¯?å?¨å?½ä»¤"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:877 ../plugins/debug-manager/plugin.c:985
+#: ../plugins/debug-manager/plugin.c:891 ../plugins/debug-manager/plugin.c:999
 msgid "Custom debugger command"
 msgstr "å®?å?¶è°?è¯?å?¨å?½ä»¤"
 
-#: ../plugins/debug-manager/plugin.c:883 ../plugins/debug-manager/plugin.c:991
+#: ../plugins/debug-manager/plugin.c:897
+#: ../plugins/debug-manager/plugin.c:1005
 msgid "_Info"
 msgstr "ä¿¡æ?¯(_I)"
 
-#: ../plugins/debug-manager/plugin.c:891
+#: ../plugins/debug-manager/plugin.c:905
 msgid "Info _Target Files"
 msgstr "ç?®æ ?æ??ä»¶ä¿¡æ?¯(_T)"
 
-#: ../plugins/debug-manager/plugin.c:893
+#: ../plugins/debug-manager/plugin.c:907
 msgid "Display information on the files the debugger is active with"
 msgstr "æ?¾ç¤ºæ??è°?è¯?å?¨æ´»å?¨ç??æ??ä»¶ä¸?ç??ä¿¡æ?¯"
 
-#: ../plugins/debug-manager/plugin.c:899
+#: ../plugins/debug-manager/plugin.c:913
 msgid "Info _Program"
 msgstr "ç¨?åº?ä¿¡æ?¯(_P)"
 
-#: ../plugins/debug-manager/plugin.c:901
+#: ../plugins/debug-manager/plugin.c:915
 msgid "Display information on the execution status of the program"
 msgstr "æ?¾ç¤ºæ?§è¡?ç?¶æ??ç??ç¨?åº?ç??ä¿¡æ?¯"
 
-#: ../plugins/debug-manager/plugin.c:907
+#: ../plugins/debug-manager/plugin.c:921
 msgid "Info _Kernel User Struct"
 msgstr ""
 
-#: ../plugins/debug-manager/plugin.c:909
+#: ../plugins/debug-manager/plugin.c:923
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr ""
 
-#: ../plugins/debug-manager/plugin.c:923
-#: ../plugins/debug-manager/plugin.c:1023
+#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:1037
 msgid "Shared Libraries"
 msgstr "å?±äº«å?½æ?°åº?"
 
-#: ../plugins/debug-manager/plugin.c:925
-#: ../plugins/debug-manager/plugin.c:1025
-msgid "Show shared libraries mappings"
+#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:1039
+#, fuzzy
+#| msgid "Show shared libraries mappings"
+msgid "Show shared library mappings"
 msgstr "æ?¾ç¤ºå?±äº«å?½æ?°åº?æ? å°?"
 
-#: ../plugins/debug-manager/plugin.c:933
-#: ../plugins/debug-manager/plugin.c:1033
+#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:1047
 msgid "Show kernel signals"
 msgstr "æ?¾ç¤ºå??æ ¸ä¿¡å?·"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:943
+#: ../plugins/debug-manager/plugin.c:957
 msgid "Run/_Continue"
 msgstr "è¿?è¡?/ç»§ç»(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:959
 msgid "Continue the execution of the program"
 msgstr "ç»§ç»ç¨?åº?æ?§è¡?"
 
-#: ../plugins/debug-manager/plugin.c:951
+#: ../plugins/debug-manager/plugin.c:965
 msgid "Step _In"
 msgstr "æ¥å?¥(_I)"
 
-#: ../plugins/debug-manager/plugin.c:953
+#: ../plugins/debug-manager/plugin.c:967
 msgid "Single step into function"
 msgstr "å??æ¥è·¨å?¥å?½æ?°"
 
-#: ../plugins/debug-manager/plugin.c:959
+#: ../plugins/debug-manager/plugin.c:973
 msgid "Step O_ver"
 msgstr "æ¥è¿?(_V)"
 
-#: ../plugins/debug-manager/plugin.c:961
+#: ../plugins/debug-manager/plugin.c:975
 msgid "Single step over function"
 msgstr "å??æ¥è·¨è¿?å?½æ?°"
 
-#: ../plugins/debug-manager/plugin.c:967
+#: ../plugins/debug-manager/plugin.c:981
 msgid "Step _Out"
 msgstr "æ¥å?º(_O)"
 
-#: ../plugins/debug-manager/plugin.c:969
-msgid "Single step out of the function"
+#: ../plugins/debug-manager/plugin.c:983
+#, fuzzy
+#| msgid "Single step out of the function"
+msgid "Single step out of function"
 msgstr "å??æ¥è·¨å?ºå?½æ?°"
 
-#: ../plugins/debug-manager/plugin.c:975
+#: ../plugins/debug-manager/plugin.c:989
 msgid "_Run to Cursor"
 msgstr "è¿?è¡?è?³å??æ ?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:977
+#: ../plugins/debug-manager/plugin.c:991
 msgid "Run to the cursor"
 msgstr "è¿?è¡?è?³å??æ ?"
 
-#: ../plugins/debug-manager/plugin.c:999
+#: ../plugins/debug-manager/plugin.c:1013
 msgid "Info _Global Variables"
 msgstr "å?¨å±?å??é??ä¿¡æ?¯(_G)"
 
-#: ../plugins/debug-manager/plugin.c:1001
+#: ../plugins/debug-manager/plugin.c:1015
 msgid "Display all global and static variables of the program"
 msgstr "æ?¾ç¤ºæ??æ??å?¨å±?å??é??å??é??æ??å??é??"
 
-#: ../plugins/debug-manager/plugin.c:1007
+#: ../plugins/debug-manager/plugin.c:1021
 msgid "Info _Current Frame"
 msgstr "å½?å??å¸§ä¿¡æ?¯(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1009
+#: ../plugins/debug-manager/plugin.c:1023
 msgid "Display information about the current frame of execution"
 msgstr "æ?¾ç¤ºå½?å??æ?§è¡?ç??å¸§ä¿¡æ?¯"
 
-#: ../plugins/debug-manager/plugin.c:1015
+#: ../plugins/debug-manager/plugin.c:1029
 msgid "Info Function _Arguments"
 msgstr "å?½æ?°å??æ?°ä¿¡æ?¯(_A)"
 
-#: ../plugins/debug-manager/plugin.c:1017
+#: ../plugins/debug-manager/plugin.c:1031
 msgid "Display function arguments of the current frame"
 msgstr "æ?¾ç¤ºå½?å??å¸§ç??å?½æ?°å??æ?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:1043
+#: ../plugins/debug-manager/plugin.c:1057
 msgid "Pa_use Program"
 msgstr "æ??å??ç¨?åº?(_U)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:1045
+#: ../plugins/debug-manager/plugin.c:1059
 msgid "Pauses the execution of the program"
 msgstr "æ??å??æ£å?¨æ?§è¡?ç??ç¨?åº?"
 
-#: ../plugins/debug-manager/plugin.c:1085
-#: ../plugins/debug-manager/plugin.c:1091
-#: ../plugins/debug-manager/plugin.c:1097
-#: ../plugins/debug-manager/plugin.c:1103
+#: ../plugins/debug-manager/plugin.c:1099
+#: ../plugins/debug-manager/plugin.c:1105
+#: ../plugins/debug-manager/plugin.c:1111
+#: ../plugins/debug-manager/plugin.c:1117
 msgid "Debugger operations"
 msgstr "è°?è¯?å?¨æ??ä½?"
 
-#: ../plugins/debug-manager/queue.c:543
-#, c-format
-msgid ""
-"Unable to find one debugger plugin supporting a target with %s mime type"
+#: ../plugins/debug-manager/queue.c:524
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to find one debugger plugin supporting a target with %s mime type"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
 msgstr "æ?¾ä¸?å?°æ?¯æ?? %s MIME ç±»å??ç?®æ ?ç??è°?è¯?å?¨æ??ä»¶"
 
 #: ../plugins/debug-manager/registers.c:462
@@ -2247,11 +2400,11 @@ msgstr "æ?´æ?°"
 msgid "Shared Object"
 msgstr "å?±äº«å¯¹è±¡"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "ä»?"
 
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "å?°"
 
@@ -2298,19 +2451,19 @@ msgstr "å??æ ¸ä¿¡å?·"
 msgid "Signal operations"
 msgstr "ä¿¡å?·æ??ä½?"
 
-#: ../plugins/debug-manager/sparse_view.c:1202
+#: ../plugins/debug-manager/sparse_view.c:1201
 msgid "Show Line Numbers"
 msgstr "æ?¾ç¤ºè¡?å?·"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1202
 msgid "Whether to display line numbers"
 msgstr "æ?¾ç¤º/é??è??è¡?å?·"
 
-#: ../plugins/debug-manager/sparse_view.c:1210
+#: ../plugins/debug-manager/sparse_view.c:1209
 msgid "Show Line Markers"
 msgstr "æ?¾ç¤ºè¡?æ ?è®°"
 
-#: ../plugins/debug-manager/sparse_view.c:1211
+#: ../plugins/debug-manager/sparse_view.c:1210
 msgid "Whether to display line marker pixbufs"
 msgstr "æ?¾ç¤º/é??è??å?¾æ ?å?¨æ ?å?·å?º"
 
@@ -2353,10 +2506,6 @@ msgstr "è¡?"
 msgid "Function"
 msgstr "å?½æ?°"
 
-#: ../plugins/debug-manager/stack_trace.c:679
-msgid "Arguments"
-msgstr "å??æ?°"
-
 #: ../plugins/debug-manager/stack_trace.c:703
 msgid "Stack"
 msgstr "æ ?"
@@ -2365,53 +2514,48 @@ msgstr "æ ?"
 msgid "Stack frame operations"
 msgstr "æ ?å¸§æ??ä½?"
 
-#: ../plugins/debug-manager/start.c:96
-msgid "Pid"
-msgstr "è¿?ç¨?å?·(PID)"
+#: ../plugins/debug-manager/start.c:98
+msgid "PID"
+msgstr ""
 
-#: ../plugins/debug-manager/start.c:96
+#: ../plugins/debug-manager/start.c:98
 msgid "User"
 msgstr "ç?¨æ?·"
 
-#: ../plugins/debug-manager/start.c:96
+#: ../plugins/debug-manager/start.c:98
 msgid "Time"
 msgstr "æ?¶é?´"
 
-#: ../plugins/debug-manager/start.c:96
+#: ../plugins/debug-manager/start.c:98
 msgid "Command"
 msgstr "å?½ä»¤"
 
-#: ../plugins/debug-manager/start.c:620
+#: ../plugins/debug-manager/start.c:627
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "æ? æ³?æ?§è¡?ï¼?%sã??"
 
-#: ../plugins/debug-manager/start.c:634
+#: ../plugins/debug-manager/start.c:641
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "æ? æ³?æ??å¼?æ??ä»¶ï¼?%s\n"
 
-#: ../plugins/debug-manager/start.c:918
+#: ../plugins/debug-manager/start.c:965
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "æ? æ³?æ??å¼? %s ã??è°?è¯?å?¨ä¸?è?½å?¯å?¨ã??"
 
-#: ../plugins/debug-manager/start.c:928
-#, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
+#: ../plugins/debug-manager/start.c:975
+#, fuzzy, c-format
+#| msgid "Unable to detect mime-type of %s. Debugger cannot start."
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
 msgstr "æ? æ³?æ£?æµ? %s ç?? MIME ç±»å??ï¼?è°?è¯?å?¨æ? æ³?å?¯å?¨ã??"
 
-#: ../plugins/debug-manager/start.c:1065 ../plugins/debug-manager/start.c:1260
-#: ../plugins/run-program/parameters.c:616
-#, c-format
-msgid "Missing file %s"
-msgstr "ç¼ºå°?æ??ä»¶ %s"
-
-#: ../plugins/debug-manager/start.c:1282
+#: ../plugins/debug-manager/start.c:1336
 msgid "Path"
 msgstr "è·¯å¾?"
 
-#: ../plugins/debug-manager/start.c:1330 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2426,8 +2570,8 @@ msgid "Set current thread"
 msgstr "è®¾ç½®å½?å??çº¿ç¨?"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "ID"
+msgid "ID"
+msgstr ""
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2439,51 +2583,55 @@ msgstr "çº¿ç¨?æ??ä½?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:390
-msgid "Ins_pect/Evaluate..."
-msgstr "æ£?æ?¥/æ±?å?¼(_P)..."
+#: ../plugins/debug-manager/watch.c:372
+#, fuzzy
+#| msgid "Inspect/Evaluate"
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "æ£?æ?¥/æ±?å?¼"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/watch.c:392
+#: ../plugins/debug-manager/watch.c:374
 msgid "Inspect or evaluate an expression or variable"
 msgstr "æ£?æ?¥æ??è¯?ä¼°ä¸?ä¸ªè¡¨è¾¾å¼?æ??å??é??"
 
-#: ../plugins/debug-manager/watch.c:398
-msgid "Add Watch..."
-msgstr "æ·»å? ç??è§?..."
+#: ../plugins/debug-manager/watch.c:380
+#, fuzzy
+#| msgid "Add Watch"
+msgid "Add Watchâ?¦"
+msgstr "æ·»å? ç??è§?"
 
-#: ../plugins/debug-manager/watch.c:406
+#: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
 msgstr "å? é?¤ç??è§?"
 
-#: ../plugins/debug-manager/watch.c:414
+#: ../plugins/debug-manager/watch.c:396
 msgid "Update Watch"
 msgstr "æ?´æ?°ç??è§?"
 
-#: ../plugins/debug-manager/watch.c:422
+#: ../plugins/debug-manager/watch.c:404
 msgid "Change Value"
 msgstr "æ?´æ?¹å?¼"
 
-#: ../plugins/debug-manager/watch.c:430
+#: ../plugins/debug-manager/watch.c:412
 msgid "Update all"
 msgstr "å?¨é?¨æ?´æ?°"
 
-#: ../plugins/debug-manager/watch.c:438
+#: ../plugins/debug-manager/watch.c:420
 msgid "Remove all"
 msgstr "å?¨é?¨å? é?¤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:449
+#: ../plugins/debug-manager/watch.c:431
 msgid "Automatic update"
 msgstr "è?ªå?¨æ?´æ?°"
 
-#: ../plugins/debug-manager/watch.c:475 ../plugins/debug-manager/watch.c:481
+#: ../plugins/debug-manager/watch.c:457 ../plugins/debug-manager/watch.c:463
 msgid "Watch operations"
 msgstr "ç??è§?æ??ä½?"
 
-#: ../plugins/debug-manager/watch.c:553
+#: ../plugins/debug-manager/watch.c:535
 msgid "Watches"
 msgstr "ç??è§?"
 
@@ -2493,7 +2641,9 @@ msgstr "æ??ç´¢å¸®å?©ï¼?"
 
 #: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:236
 #: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:309
-msgid "_Goto"
+#, fuzzy
+#| msgid "_Goto"
+msgid "_Go to"
 msgstr "è½¬å?°(_G)"
 
 #: ../plugins/devhelp/plugin.c:231
@@ -2528,12 +2678,12 @@ msgstr "å¸®å?©æ??ä½?"
 msgid "Contents"
 msgstr "ç?®å½?"
 
-#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1034
-#: ../plugins/search/search-replace.c:1710
+#: ../plugins/devhelp/plugin.c:369 ../plugins/search/search-replace.c:1041
 #: ../plugins/search/search-replace.c:1717
-#: ../plugins/search/search-replace.c:1729
-#: ../plugins/search/search-replace.c:2058 ../plugins/symbol-db/plugin.c:2249
-#: ../plugins/symbol-db/plugin.c:2361
+#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1736
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2335
+#: ../plugins/symbol-db/plugin.c:2447
 msgid "Search"
 msgstr "æ??ç´¢"
 
@@ -2563,22 +2713,31 @@ msgstr ""
 msgid "_Reload"
 msgstr "é??æ?°è½½å?¥(_R)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:235
-#| msgid "_Add Bookmark"
+#: ../plugins/document-manager/anjuta-bookmarks.c:311
 msgid "Add bookmark"
 msgstr "æ·»å? ä¹¦ç¾(_A)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:241
-#| msgid "Clear bookmarks"
+#: ../plugins/document-manager/anjuta-bookmarks.c:317
 msgid "Remove bookmark"
 msgstr "æ¸?é?¤ä¹¦ç¾"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:255
-#: ../plugins/document-manager/anjuta-bookmarks.c:300
+#: ../plugins/document-manager/anjuta-bookmarks.c:331
+#: ../plugins/document-manager/anjuta-bookmarks.c:393
 #: ../plugins/document-manager/plugin.c:411
 msgid "Bookmarks"
 msgstr "ä¹¦ç¾"
 
+#: ../plugins/document-manager/anjuta-bookmarks.c:339
+#, fuzzy
+#| msgid "_Rename"
+msgid "Rename"
+msgstr "é??å?½å??(_R)"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+msgid "Remove"
+msgstr "å? é?¤"
+
 #: ../plugins/document-manager/anjuta-docman.c:400
 msgid "Close file"
 msgstr "å?³é?æ??ä»¶(_C)"
@@ -2588,8 +2747,8 @@ msgid "Path:"
 msgstr "è·¯å¾?ï¼?"
 
 #: ../plugins/document-manager/anjuta-docman.c:565
-#: ../plugins/file-loader/plugin.c:590 ../plugins/file-loader/plugin.c:893
-#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
+#: ../plugins/file-loader/plugin.c:591 ../plugins/file-loader/plugin.c:894
+#: ../plugins/file-loader/plugin.c:904 ../plugins/file-loader/plugin.c:917
 msgid "Open file"
 msgstr "æ??å¼?æ??ä»¶"
 
@@ -2616,29 +2775,32 @@ msgid "[read-only]"
 msgstr "[å?ªè¯»]"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:1
-msgid "<b>Autosave</b>"
+#, fuzzy
+#| msgid "<b>Autosave</b>"
+msgid "Autosave"
 msgstr "<b>è?ªå?¨ä¿?å?</b>"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:2
-msgid "<b>Editor tabs</b>"
-msgstr "<b>ç¼?è¾?å?¨æ ?ç¾</b>"
-
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
-#| msgid "Goto"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "Bottom"
 msgstr "è½¬å?°"
 
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
 msgid "Do not show tabs"
 msgstr "ä¸?æ?¾ç¤ºæ ?ç¾"
 
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#, fuzzy
+#| msgid "<b>Editor tabs</b>"
+msgid "Editor tabs"
+msgstr "<b>ç¼?è¾?å?¨æ ?ç¾</b>"
+
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "å?¯ç?¨æ??ä»¶è?ªå?¨ä¿?å?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:6
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Left"
 msgstr "å·¦"
 
@@ -2647,8 +2809,7 @@ msgid "Position:"
 msgstr "ä½?ç½®ï¼?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
-#| msgid "High"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Right"
 msgstr "å?³"
 
@@ -2673,8 +2834,7 @@ msgid "Sorted in opening order"
 msgstr "ä»¥æ??å¼?é¡ºåº?æ??åº?"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
-#| msgid "To"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 msgid "Top"
 msgstr "é¡¶"
 
@@ -2687,7 +2847,9 @@ msgid "Save current file"
 msgstr "ä¿?å?å½?å??æ??ä»¶"
 
 #: ../plugins/document-manager/plugin.c:149
-msgid "Save _As..."
+#, fuzzy
+#| msgid "Save _As..."
+msgid "Save _Asâ?¦"
 msgstr "å?¦å?ä¸º(_A)..."
 
 #: ../plugins/document-manager/plugin.c:150
@@ -2731,8 +2893,10 @@ msgid "Recent _Files"
 msgstr "æ??è¿?æ??ä»¶(_F)"
 
 #: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "æ??å?°(_P)"
+#, fuzzy
+#| msgid "Print"
+msgid "_Printâ?¦"
+msgstr "æ??å?°"
 
 #: ../plugins/document-manager/plugin.c:169
 msgid "Print the current file"
@@ -2743,7 +2907,9 @@ msgid "_Print Preview"
 msgstr "æ??å?°é¢?è§?(_P)"
 
 #: ../plugins/document-manager/plugin.c:177
-msgid "Preview the current file in print-format"
+#, fuzzy
+#| msgid "Preview the current file in print-format"
+msgid "Preview the current file in print format"
 msgstr "å½?å??æ??ä»¶ç??æ??å?°é¢?è§?"
 
 #: ../plugins/document-manager/plugin.c:182
@@ -2796,7 +2962,10 @@ msgid "Convert EOL to Majority EOL"
 msgstr "è½¬æ?¢ EOL ä¸ºä¸»è¦? EOL"
 
 #: ../plugins/document-manager/plugin.c:199
-msgid "Convert End Of Line characters to majority of the EOL found in the file"
+#, fuzzy
+#| msgid ""
+#| "Convert End Of Line characters to majority of the EOL found in the file"
+msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr "å°?å?ç¬¦ä¸²ç??ç»?æ??å?ç¬¦ EOL è½¬æ?¢ä¸ºæ??ä»¶ä¸ä¸»è¦?ä½¿ç?¨ç?? EOL æ ¼å¼?"
 
 #: ../plugins/document-manager/plugin.c:204
@@ -2857,7 +3026,9 @@ msgstr "å°?é??ä¸æ??æ?¬è®¾ç½®ä¸ºæµ?æ³¨é??"
 
 #. menu title
 #: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
+#, fuzzy
+#| msgid "_Line Number..."
+msgid "_Line Numberâ?¦"
 msgstr "è¡?å?·(_L)..."
 
 #: ../plugins/document-manager/plugin.c:238
@@ -2893,7 +3064,9 @@ msgid "Previous _History"
 msgstr "ä¸?ä¸?æ?¡å??å?²(_P)"
 
 #: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
+#, fuzzy
+#| msgid "Goto previous history"
+msgid "Go to previous history"
 msgstr "è½¬å?°ä¸?ä¸?æ?¡å??å?²"
 
 #: ../plugins/document-manager/plugin.c:252
@@ -2901,7 +3074,9 @@ msgid "Next Histor_y"
 msgstr "ä¸?ä¸?æ?¡å??å?²(_Y)"
 
 #: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
+#, fuzzy
+#| msgid "Goto next history"
+msgid "Go to next history"
 msgstr "è½¬å?°ä¸?ä¸?æ?¡å??å?²"
 
 #: ../plugins/document-manager/plugin.c:258 ../plugins/search/plugin.c:67
@@ -2926,7 +3101,7 @@ msgstr "é??å¤?å¿«é??æ??ç´¢"
 
 #: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1910
+#: ../plugins/language-support-cpp-java/plugin.c:1915
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
@@ -2955,7 +3130,7 @@ msgstr "ä»?æ??æ¡£ä¸å? é?¤å½?å??è§?å?¾"
 msgid "U_ndo"
 msgstr "æ?¤æ¶?(_N)"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4079
+#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4089
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?ä¸?æ¬¡æ??ä½?"
 
@@ -2977,7 +3152,7 @@ msgstr "å°?é??ä¸æ??å?å?ªå??å?°å?ªè´´æ?¿"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:554
+#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:592
 msgid "_Copy"
 msgstr "å¤?å?¶(_C)"
 
@@ -2985,7 +3160,7 @@ msgstr "å¤?å?¶(_C)"
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:562
+#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:600
 msgid "_Paste"
 msgstr "ç²?è´´(_P)"
 
@@ -3218,7 +3393,9 @@ msgid "Reload"
 msgstr "é??æ?°è½½å?¥"
 
 #: ../plugins/document-manager/plugin.c:606
-msgid "Goto"
+#, fuzzy
+#| msgid "Goto"
+msgid "Go to"
 msgstr "è½¬å?°"
 
 #: ../plugins/document-manager/plugin.c:909
@@ -3258,19 +3435,23 @@ msgid "Autosave completed"
 msgstr "è?ªå?¨ä¿?å?å®?æ??"
 
 #: ../plugins/document-manager/search-box.c:383
-#, c-format
-msgid "Search for \"%s\" reached end and was continued on top."
+#, fuzzy, c-format
+#| msgid "Search for \"%s\" reached end and was continued on top."
+msgid "Search for \"%s\" reached the end and was continued at the top."
 msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?é¡¶é?¨ç»§ç»æ??ç´¢ã??"
 
 #: ../plugins/document-manager/search-box.c:389
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Search for \"%s\" reached end and was continued on top but no new match "
+#| "was found."
 msgid ""
-"Search for \"%s\" reached end and was continued on top but no new match was "
-"found."
+"Search for \"%s\" reached the end and was continued at the top but no new "
+"match was found."
 msgstr "æ??ç´¢â??%sâ??æ?¶è¾¾å?°æ?«å°¾ï¼?ä»?é¡¶é?¨ç»§ç»æ??ç´¢ã??ä½?æ?ªæ?¾å?°æ?°ç??å?¹é??ç»?æ??ã??"
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:22
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match case"
 msgstr "å?ºå??å¤§å°?å??"
 
@@ -3290,8 +3471,9 @@ msgstr "æ?ªæ?¾å?°å?¹é??é¡¹"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:670
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
-#, c-format
-msgid "No recently used resource found with URI `%s'"
+#, fuzzy, c-format
+#| msgid "No recently used resource found with URI `%s'"
+msgid "No recently used resource found with URI \"%s\""
 msgstr "å?¨ URI â??%sâ?? å¤?æ?¾ä¸?å?°æ??è¿?ä½¿ç?¨ç??èµ?æº?"
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
@@ -3313,28 +3495,30 @@ msgstr "æ?ªç?¥é¡¹"
 #. * in a recent files menu. The %d is the number of the item,
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:980
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:978
 #, c-format
-msgid "recent menu label|_%d. %s"
-msgstr "æ??è¿?è??å??æ ?ç¾|_%d. %s"
+msgctxt "recent menu label"
+msgid "_%d. %s"
+msgstr ""
 
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:987
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:983
 #, c-format
-msgid "recent menu label|%d. %s"
-msgstr "æ??è¿?è??å??æ ?ç¾|%d. %s"
+msgctxt "recent menu label"
+msgid "%d. %s"
+msgstr ""
 
 #: ../plugins/file-loader/plugin.c:116
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Can not open \"%s\".\n"
+#| "\n"
+#| "%s"
 msgid ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
@@ -3342,15 +3526,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../plugins/file-loader/plugin.c:256
-#, c-format
+#: ../plugins/file-loader/plugin.c:257
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>Cannot open \"%s\"</b>.\n"
+#| "\n"
+#| "There is no plugin, default action, or application configured to handle "
+#| "this file type.\n"
+#| "\n"
+#| "Mime type: %s\n"
+#| "\n"
+#| "You may choose to try opening it with the following plugins or "
+#| "applications."
 msgid ""
 "<b>Cannot open \"%s\"</b>.\n"
 "\n"
 "There is no plugin, default action, or application configured to handle this "
 "file type.\n"
 "\n"
-"Mime type: %s\n"
+"MIME type: %s\n"
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
@@ -3362,147 +3556,153 @@ msgstr ""
 "\n"
 "æ?¨å?¯è?½ä¼?å°?è¯?é??æ?©ç?¨ä¸?å??æ??ä»¶æ??åº?ç?¨ç¨?åº?æ?¥æ??å¼?å®?ã??"
 
-#: ../plugins/file-loader/plugin.c:279
+#: ../plugins/file-loader/plugin.c:280
 msgid "Open with:"
 msgstr "æ??å¼?æ?¹å¼?ï¼?"
 
 #. Document manager plugin
-#: ../plugins/file-loader/plugin.c:285
+#: ../plugins/file-loader/plugin.c:286
 #: ../plugins/document-manager/anjuta-document-manager.plugin.in.h:1
 msgid "Document Manager"
 msgstr "æ??æ¡£ç®¡ç??å?¨"
 
-#: ../plugins/file-loader/plugin.c:496 ../plugins/patch/patch-plugin.c:122
+#: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
 #: ../plugins/run-program/parameters.c:308
 msgid "All files"
 msgstr "å?¨é?¨æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:501
+#: ../plugins/file-loader/plugin.c:502
 msgid "Anjuta Projects"
 msgstr "Anjuta é¡¹ç?®"
 
-#: ../plugins/file-loader/plugin.c:507
+#: ../plugins/file-loader/plugin.c:508
 msgid "C/C++ source files"
 msgstr "C/C++ æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:519
+#: ../plugins/file-loader/plugin.c:520
 msgid "C# source files"
 msgstr "C# æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:525
+#: ../plugins/file-loader/plugin.c:526
 msgid "Java source files"
 msgstr "Java æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:531
+#: ../plugins/file-loader/plugin.c:532
 msgid "Pascal source files"
 msgstr "Pascal æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:536
+#: ../plugins/file-loader/plugin.c:537
 msgid "PHP source files"
 msgstr "PHP æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:543
+#: ../plugins/file-loader/plugin.c:544
 msgid "Perl source files"
 msgstr "Perl æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:549
+#: ../plugins/file-loader/plugin.c:550
 msgid "Python source files"
 msgstr "Python æº?æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:554
-msgid "Hyper text markup files"
+#: ../plugins/file-loader/plugin.c:555
+#, fuzzy
+#| msgid "Hyper text markup files"
+msgid "Hypertext markup files"
 msgstr "HTML æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:563
-msgid "Shell scripts files"
+#: ../plugins/file-loader/plugin.c:564
+#, fuzzy
+#| msgid "Shell scripts files"
+msgid "Shell script files"
 msgstr "Shell è??æ?¬æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:568
+#: ../plugins/file-loader/plugin.c:569
 msgid "Makefiles"
 msgstr "Makefiles"
 
-#: ../plugins/file-loader/plugin.c:574
+#: ../plugins/file-loader/plugin.c:575
 msgid "Lua files"
 msgstr "Lua æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:579
+#: ../plugins/file-loader/plugin.c:580
 msgid "Diff files"
 msgstr "Diff æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:822
+#: ../plugins/file-loader/plugin.c:823
 #, c-format
 msgid "Failed to activate plugin: %s"
 msgstr "æ¿?æ´»æ??ä»¶å¤±è´¥ï¼?%s"
 
-#: ../plugins/file-loader/plugin.c:883
+#: ../plugins/file-loader/plugin.c:884
 msgid "_New"
 msgstr "æ?°å»º(_N)"
 
-#: ../plugins/file-loader/plugin.c:885
+#: ../plugins/file-loader/plugin.c:886
 msgid "New empty file"
 msgstr "æ?°å»ºç©ºæ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:891
-msgid "_Open..."
-msgstr "æ??å¼?(_O)..."
+#: ../plugins/file-loader/plugin.c:892
+#, fuzzy
+#| msgid "_Open"
+msgid "_Openâ?¦"
+msgstr "æ??å¼?(_O)"
 
-#: ../plugins/file-loader/plugin.c:902 ../plugins/file-loader/plugin.c:915
+#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
 msgstr "æ??å¼?(_O)"
 
-#: ../plugins/file-loader/plugin.c:909 ../plugins/file-loader/plugin.c:922
+#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
 msgid "Open _With"
 msgstr "æ??å¼?æ?¹å¼?(_W)"
 
-#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
+#: ../plugins/file-loader/plugin.c:911 ../plugins/file-loader/plugin.c:924
 msgid "Open with"
 msgstr "æ??å¼?æ?¹å¼?"
 
-#: ../plugins/file-loader/plugin.c:1244 ../plugins/file-loader/plugin.c:1250
+#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:1
 msgid "File Loader"
 msgstr "æ??ä»¶è½½å?¥å?¨"
 
-#: ../plugins/file-loader/plugin.c:1254
+#: ../plugins/file-loader/plugin.c:1253
 msgid "New"
 msgstr "æ?°å»º"
 
-#: ../plugins/file-loader/plugin.c:1255
+#: ../plugins/file-loader/plugin.c:1254
 msgid "New file, project and project components."
 msgstr "æ?°å»ºæ??ä»¶æ??é¡¹ç?®ã??"
 
-#: ../plugins/file-loader/plugin.c:1262 ../plugins/file-loader/plugin.c:1302
+#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "æ??å¼?"
 
-#: ../plugins/file-loader/plugin.c:1266
+#: ../plugins/file-loader/plugin.c:1265
 msgid "Open _Recent"
 msgstr "æ??å¼?æ??è¿?(_R)"
 
-#: ../plugins/file-loader/plugin.c:1267 ../plugins/file-loader/plugin.c:1304
+#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "æ??å¼?æ??è¿?ç??æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:1273
+#: ../plugins/file-loader/plugin.c:1272
 msgid "Open recent files"
 msgstr "æ??å¼?æ??è¿?ç??æ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1302
 msgid "Open a file"
 msgstr "æ??å¼?ä¸?ä¸ªæ??ä»¶"
 
-#: ../plugins/file-loader/plugin.c:1419 ../plugins/file-loader/plugin.c:1421
+#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "æ?¾ä¸?å?°æ??ä»¶"
 
 #. %s is name of file that will be opened
-#: ../plugins/file-loader/plugin.c:1440
+#: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è¯·é??æ?©ç?¨äº?æ??å¼? <b>%s</b> ç??æ??ä»¶ã??"
 
-#: ../plugins/file-loader/plugin.c:1444
+#: ../plugins/file-loader/plugin.c:1441
 msgid "Open With"
 msgstr "æ??å¼?æ?¹å¼?(_W)"
 
@@ -3527,12 +3727,12 @@ msgid "Do not show unversioned files"
 msgstr "ä¸?æ?¾ç¤ºæ? ç??æ?¬ç??æ??ä»¶"
 
 #: ../plugins/file-manager/file-manager.ui.h:6
-#| msgid "File"
 msgid "Filter"
 msgstr "è¿?æ»¤å?¨"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2248 ../plugins/symbol-db/plugin.c:2337
+#: ../plugins/symbol-db/plugin.c:2334 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å±?"
 
@@ -3540,25 +3740,24 @@ msgstr "å?¨å±?"
 msgid "Root directory if no project is open:"
 msgstr "æ²¡æ??é¡¹ç?®è¢«æ??å¼?æ?¶ç??æ ¹ç?®å½?ï¼?"
 
-#: ../plugins/file-manager/file-model.c:119
-#: ../plugins/symbol-db/symbol-db-view.c:799
+#: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
 msgstr "æ£å?¨è½½å?¥..."
 
-#: ../plugins/file-manager/file-view.c:73
-msgid "Up-to-date"
-msgstr "æ??æ?°"
-
 #: ../plugins/file-manager/file-view.c:510
 msgid "Filename"
 msgstr "æ??ä»¶å??"
 
 #: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
+#, fuzzy
+#| msgid "Base uri"
+msgid "Base URI"
 msgstr "å?ºæ?¬ URI"
 
 #: ../plugins/file-manager/file-view.c:591
-msgid "Uri of the top-most path displayed"
+#, fuzzy
+#| msgid "Uri of the top-most path displayed"
+msgid "URI of the top-most path displayed"
 msgstr "å·²æ?¾ç¤ºå?° URI ç??æ??é¡¶å±?ç?®å½?"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3569,40 +3768,36 @@ msgstr "é??å?½å??(_R)"
 msgid "Rename file or directory"
 msgstr "é??å?½å??æ??ä»¶æ??ç?®å½?"
 
-#: ../plugins/file-manager/plugin.c:294
+#: ../plugins/file-manager/plugin.c:298
 msgid "File manager popup actions"
 msgstr "æ??ä»¶ç®¡ç??å?¨å¼¹å?ºå¼?å?¨ä½?"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:331
 msgid "Files"
 msgstr "æ??ä»¶"
 
-#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
+#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "æ??ä»¶ç®¡ç??å?¨"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
-msgid "<b>File Information</b>"
-msgstr "<b>æ??ä»¶ä¿¡æ?¯</b>"
-
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "æ·»å? è®¸å?¯ä¿¡æ?¯"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
 msgid "Add to project"
 msgstr "æ·»å? å?°é¡¹ç?®"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add to repository"
 msgstr "æ·»å? å?°ä»?åº?"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Create corresponding header file"
 msgstr "å??å»ºç?¸åº?ç??å¤´æ??ä»¶"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3610,13 +3805,19 @@ msgstr ""
 "è¾?å?¥æ??ä»¶å??ã??\n"
 "æ?©å±?å??å°?ä¼?æ ¹æ?®æ??ä»¶ç±»å??è?ªå?¨æ·»å? ã??"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:59 ../plugins/macro/anjuta-macro.ui.h:6
-#: ../plugins/tools/anjuta-tools.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#, fuzzy
+#| msgid "<b>File Information</b>"
+msgid "File Information"
+msgstr "<b>æ??ä»¶ä¿¡æ?¯</b>"
+
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??ç§°ï¼?"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
 #: ../plugins/starter/starter.c:404
 msgid "New File"
 msgstr "æ?°å»ºæ??ä»¶"
@@ -3631,47 +3832,47 @@ msgstr "ç±»å??ï¼?"
 msgid "Use Template for the Header file"
 msgstr "ä¸ºå¤´æ??ä»¶ä½¿ç?¨æ¨¡æ?¿"
 
-#: ../plugins/file-wizard/file.c:81
+#: ../plugins/file-wizard/file.c:83
 msgid "C Source File"
 msgstr "C æº?æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:82
+#: ../plugins/file-wizard/file.c:84
 msgid "C/C++ Header File"
 msgstr "C/C++ å¤´æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:83
+#: ../plugins/file-wizard/file.c:85
 msgid "C++ Source File"
 msgstr "C++ æº?æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:84
+#: ../plugins/file-wizard/file.c:86
 msgid "C# Source File"
 msgstr "C# æº?æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:85
+#: ../plugins/file-wizard/file.c:87
 msgid "Java Source File"
 msgstr "Java æº?æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:86
+#: ../plugins/file-wizard/file.c:88
 msgid "Perl Source File"
 msgstr "Perl æº?æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:87
+#: ../plugins/file-wizard/file.c:89
 msgid "Python Source File"
 msgstr "Python æº?æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:88
+#: ../plugins/file-wizard/file.c:90
 msgid "Shell Script File"
 msgstr "Shell è??æ?¬æ??ä»¶"
 
-#: ../plugins/file-wizard/file.c:89
+#: ../plugins/file-wizard/file.c:91
 msgid "Other"
 msgstr "å?¶å®?"
 
-#: ../plugins/file-wizard/file.c:102
+#: ../plugins/file-wizard/file.c:104
 msgid "BSD Public License"
 msgstr "BSD å?¬å?±è®¸å?¯è¯?"
 
-#: ../plugins/file-wizard/file.c:179
+#: ../plugins/file-wizard/file.c:182
 msgid "Unable to build user interface for New File"
 msgstr "æ? æ³?ä¸ºæ?°å»ºæ??ä»¶ç??æ??ç?¨æ?·ç??é?¢"
 
@@ -3680,21 +3881,23 @@ msgid "Invalid GbfAmConfigValue type"
 msgstr "æ? æ??ç?? GbfAmConfigValue ç±»å??"
 
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
-msgid "<b>Select Package to add:</b>"
-msgstr "<b>é??æ?©è¦?æ·»å? ç??å??ï¼?</b>"
-
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _Package"
 msgstr "æ·»å? å??(_P)"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "æ·»å? æ¨¡å??(_M)"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4
 msgid "Packages"
 msgstr "å??"
 
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#, fuzzy
+#| msgid "<b>Select Package to add:</b>"
+msgid "Select Package to add:"
+msgstr "<b>é??æ?©è¦?æ·»å? ç??å??ï¼?</b>"
+
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "é??æ?©å??"
@@ -3894,6 +4097,7 @@ msgid "Newly added source file could not be identified"
 msgstr "ä¸?è?½è¯?å?«æ?°æ·»å? ç??æº?æ??ä»¶"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3521
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
 msgid "Source couldn't be removed"
 msgstr "æº?æ??ä»¶ä¸?è?½è¢«å? é?¤"
 
@@ -3951,12 +4155,14 @@ msgid "Package name:"
 msgstr "å??å??ç§°ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:860
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
+#, fuzzy
+#| msgid "URL:"
+msgid "URI:"
 msgstr "URL:"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:1229
@@ -4058,8 +4264,10 @@ msgid "Install directory:"
 msgstr "å®?è£?ç?®å½?ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:1583
-msgid "Advanced..."
-msgstr "é«?çº§..."
+#, fuzzy
+#| msgid "Advanced"
+msgid "Advancedâ?¦"
+msgstr "é«?çº§"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
@@ -4096,38 +4304,10 @@ msgstr "æº?æ??ä»¶å·²ç»?å?¨ç?®æ ?ä¸"
 msgid "Source couldn't be added"
 msgstr "ä¸?è?½æ·»å? æº?æ??ä»¶"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
-msgid "Source coudn't be removed"
-msgstr "ä¸?è?½å? é?¤æº?æ??ä»¶"
-
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Includes:"
 msgstr "Includes:"
 
-#: ../plugins/gdb/anjuta-gdb.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:6
-msgid "Command Line Parameters"
-msgstr "å?½ä»¤è¡?å??æ?°"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:12
-msgid "Enter a Hexa adress or select one in the data"
-msgstr "è¾?å?¥ä¸?ä¸ªå??å?è¿?å?¶å?°å??æ??è??å?¨æ?°æ?®ä¸é??æ?©ä¸?ä¸ªå?°å??"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:13
-msgid "Execute Program"
-msgstr "æ?§è¡?ç¨?åº?"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:22
-msgid "Run in Terminal"
-msgstr "å?¨ç»?ç«¯ä¸è¿?è¡?"
-
-#: ../plugins/gdb/anjuta-gdb.glade.h:35
-msgid "_Pass:"
-msgstr "é??æ?°(_P)ï¼?"
-
 #. The %s argument is a program name, anjuta by example
 #: ../plugins/gdb/debugger.c:691
 #, c-format
@@ -4152,7 +4332,9 @@ msgstr ""
 "è¯·ç¡®å®? Anjuta æ?¯å?¦å®?è£?æ£ç¡®ã??"
 
 #: ../plugins/gdb/debugger.c:933
-msgid "Getting ready to start debugging session...\n"
+#, fuzzy
+#| msgid "Getting ready to start debugging session...\n"
+msgid "Getting ready to start debugging sessionâ?¦\n"
 msgstr "æ£å?¨å??å¤?å?¯å?¨è°?è¯?ä¼?è¯? ...\n"
 
 #: ../plugins/gdb/debugger.c:939
@@ -4230,8 +4412,9 @@ msgid "Program attached\n"
 msgstr "ç¨?åº?å·²ä¾?é??\n"
 
 #: ../plugins/gdb/debugger.c:1970
-#, c-format
-msgid "Attaching to process: %d...\n"
+#, fuzzy, c-format
+#| msgid "Attaching to process: %d...\n"
+msgid "Attaching to process: %dâ?¦\n"
 msgstr "æ£å?¨ä¾?é??å?°è¿?ç¨?ï¼?%d...\n"
 
 #: ../plugins/gdb/debugger.c:1996
@@ -4255,8 +4438,9 @@ msgid "Program detached\n"
 msgstr "ç¨?åº?å·²è?±ç¦»\n"
 
 #: ../plugins/gdb/debugger.c:2098
-#, c-format
-msgid "Detaching the process...\n"
+#, fuzzy, c-format
+#| msgid "Detaching the process...\n"
+msgid "Detaching the processâ?¦\n"
 msgstr "æ£å?¨è?±ç¦»è¿?ä¸ªè¿?ç¨?...\n"
 
 #: ../plugins/gdb/debugger.c:2119
@@ -4273,9 +4457,12 @@ msgid "Error whilst signaling the process."
 msgstr "ç»?è¿?ç¨?å??é??ä¿¡å?·æ?¶å?ºé??ã??"
 
 #: ../plugins/gdb/plugin.c:112
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to create fifo file named %s. The program will run without a "
+#| "terminal."
 msgid ""
-"Failed to create fifo file named %s. The program will run without a terminal."
+"Failed to create FIFO file named %s. The program will run without a terminal."
 msgstr "å??å»ºç®¡é??(fifo)æ??ä»¶ %s å¤±è´¥ã??ç¨?åº?å°?ä¼?è?±ç¦»ç»?ç«¯è¿?è¡?ã??"
 
 #: ../plugins/gdb/plugin.c:198
@@ -4283,52 +4470,54 @@ msgid "Cannot start terminal for debugging."
 msgstr "æ? æ³?å?¯å?¨ç»?ç«¯è¿?è¡?è°?è¯?ã??"
 
 #: ../plugins/git/anjuta-git.ui.h:1
-#| msgid "<b>Tag:</b> %s"
-msgid "<b>Tags</b>"
-msgstr "<b>æ ?ç¾ï¼?</b> %s"
-
-#: ../plugins/git/anjuta-git.ui.h:2
 msgid "Add File"
 msgstr "æ·»å? æ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:3
+#: ../plugins/git/anjuta-git.ui.h:2
 msgid "Add Remote Branch"
 msgstr "æ·»å? è¿?ç¨?å??æ?¯"
 
 #. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
-#: ../plugins/git/anjuta-git.ui.h:5
-msgid "Add signed off by line"
-msgstr ""
-
-#: ../plugins/git/anjuta-git.ui.h:6
-msgid "Add signed-off by line"
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "Add signed-off-by line"
 msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:7
-#| msgid "Previous commit"
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "Amend the previous commit"
 msgstr "ä¸?ä¸?æ¬¡æ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:8
+#: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
 msgstr "æ³¨è§£è¿?ä¸ªæ ?ç¾"
 
 #. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:8
+#, fuzzy
 msgid "Append fetch data"
-msgstr ""
+msgstr "æ?ªå¤?ç??ç??æ?°æ?®é?¿åº¦ï¼?%d\n"
+
+#: ../plugins/git/anjuta-git.ui.h:9
+#, fuzzy
+msgid "Apply Stash"
+msgstr "/è½¯ä»¶å??/åº?ç?¨(_A)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:11 ../plugins/git/plugin.c:214
-#| msgid "All files"
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "å?¨é?¨æ??ä»¶"
 
+#: ../plugins/git/anjuta-git.ui.h:11
+#, fuzzy
+#| msgid "Copy the selection"
+msgid "Apply the selected stash"
+msgstr "é??ä¸äº?ä¸?æ?¯æ??ç??å??è®®\n"
+
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
 #: ../plugins/git/anjuta-git.ui.h:13
+#, fuzzy
 msgid "Author/Grep"
-msgstr ""
+msgstr "Author meta å??"
 
 #: ../plugins/git/anjuta-git.ui.h:14
 #: ../plugins/project-wizard/templates/translatable-strings.h:24
@@ -4336,42 +4525,36 @@ msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:15
+#, fuzzy
 msgid "Bad revision:"
-msgstr ""
+msgstr "ä½¿ç?¨ä¿®è®¢ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:16
-#| msgid "<b>Branch name:</b>"
 msgid "Branch name:"
 msgstr "å??æ?¯å??ç§°ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:17
-#| msgid "<b>Branch to switch to:</b>"
 msgid "Branch to switch to:"
 msgstr "å??æ?¢å?°å??æ?¯ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:18
-#| msgid "_Branches"
 msgid "Branch:"
 msgstr "å??æ?¯"
 
 #: ../plugins/git/anjuta-git.ui.h:19
-#| msgid "_Branches"
 msgid "Branches"
 msgstr "å??æ?¯"
 
 #: ../plugins/git/anjuta-git.ui.h:20
-#| msgid "Branch must be fully merged"
 msgid "Branches must be fully merged"
 msgstr "å??æ?¯å¿?é¡»å®?å?¨è¢«å??å¹¶"
 
 #: ../plugins/git/anjuta-git.ui.h:21
-#| msgid "<b>Branch to delete:</b>"
 msgid "Branches to delete:"
 msgstr "è¦?å? é?¤ç??å??æ?¯ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:23
 #: ../plugins/subversion/anjuta-subversion.ui.h:4
-#| msgid "<b>Changes:</b>"
 msgid "Changes:"
 msgstr "æ?´æ?¹ï¼?"
 
@@ -4380,347 +4563,437 @@ msgid "Check Out Files"
 msgstr "æ£?å?ºæ??ä»¶"
 
 #: ../plugins/git/anjuta-git.ui.h:25
+msgid "Check out all local changes"
+msgstr ""
+
+#: ../plugins/git/anjuta-git.ui.h:26
 msgid "Check out the branch after it is created"
 msgstr "å??æ?¯ä¸?å??å»ºå°±æ£?å?ºå®?"
 
-#: ../plugins/git/anjuta-git.ui.h:26
+#: ../plugins/git/anjuta-git.ui.h:27
+#, fuzzy
 msgid "Cherry Pick"
-msgstr ""
+msgstr "æ?¿èµ·è¯?ç?"
 
-#: ../plugins/git/anjuta-git.ui.h:27
+#: ../plugins/git/anjuta-git.ui.h:28
+#, fuzzy
+#| msgid "Mark all matches"
+msgid "Clear all stashes"
+msgstr "æ¸?é?¤å?¨é?¨ä¹¦ç¾(_C)"
+
+#: ../plugins/git/anjuta-git.ui.h:29
+msgid "Column 1"
+msgstr "å?? 1"
+
+#: ../plugins/git/anjuta-git.ui.h:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "æ??äº¤æ?´æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
 msgstr "å¿«è¿?å??å¹¶æ?¶æ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:29
+#: ../plugins/git/anjuta-git.ui.h:32
+#, fuzzy
 msgid "Commit to Cherry Pick:"
-msgstr ""
+msgstr "å?? CVS æ??äº¤æ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:33
+#, fuzzy
 msgid "Commit to revert:"
-msgstr ""
+msgstr "å¤?å??å?°å??å§?å?¼(_R)"
 
-#: ../plugins/git/anjuta-git.ui.h:31
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "å??å»ºå??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "å??å»ºæ ?ç¾"
 
-#: ../plugins/git/anjuta-git.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "å??å»ºæ?°ç?®å½?"
 
-#: ../plugins/git/anjuta-git.ui.h:34 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "å? é?¤å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "å? é?¤è¿?ç¨?å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:37
-#| msgid "Deleted: %s"
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
 msgstr "å? é?¤äº?ï¼?%s"
 
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "ä¸?æ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "ä¸?è¦?è·?é??æ ?ç¾"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:43
+#, fuzzy
+#| msgid "Copy the selection"
+msgid "Drop the selected stash"
+msgstr "é??ä¸äº?ä¸?æ?¯æ??ç??å??è®®\n"
+
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: ../plugins/git/anjuta-git.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "å??å»ºå??è?·å??è¿?ç¨?å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:42
-#| msgid "Files"
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "æ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "é??æ?©ç?®å½?"
 
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "å¼ºå?¶"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "ä»?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:47
+#: ../plugins/git/anjuta-git.ui.h:51
+#, fuzzy
 msgid "Generate patches relative to:"
-msgstr ""
+msgstr "ç??æ??ç?¸å¯¹ pc ç??ä»£ç ?"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:52
+#, fuzzy
 msgid "Good revision:"
-msgstr ""
+msgstr "å¥½ç??ä¿®è®¢ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:54
+#, fuzzy
 msgid "Hard"
-msgstr ""
+msgstr "å?°é?¾"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:55
+#, fuzzy
 msgid "Head"
-msgstr ""
+msgstr "é??é¡¹"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "å¿½ç?¥æ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
-#| msgid "Log message:"
 msgid "Log Message:"
 msgstr "æ?¥å¿?ä¿¡æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:60
+#, fuzzy
 msgid "Mailbox file containing patches:"
-msgstr ""
+msgstr "æ??é?¤å??å?« FILE ç??ç?®å½?"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "å??å¹¶"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:62
+#, fuzzy
 msgid "Mixed"
-msgstr ""
+msgstr "å??å??"
 
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Mode:"
 msgstr "æ¨¡å¼?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:60
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
-#: ../plugins/subversion/anjuta-subversion.ui.h:23
-msgid "Options"
-msgstr "é??é¡¹"
-
-#: ../plugins/git/anjuta-git.ui.h:61
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-#| msgid "Options"
-msgid "Options:"
-msgstr "é??é¡¹ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:62
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "ä¸?ä¸?ä¸ªæ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "æ??å??"
 
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/git/anjuta-git.ui.h:69
+#, fuzzy
 msgid "Push"
-msgstr ""
+msgstr "å¹³å±?"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
 msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:66
-#| msgid "Push tags"
+#: ../plugins/git/anjuta-git.ui.h:71
+#, fuzzy
 msgid "Push all tags"
-msgstr ""
+msgstr "å??å?ºæ??æ?? EXIF ä¿¡æ?¯æ ?è¯?"
 
-#: ../plugins/git/anjuta-git.ui.h:67
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "é??å®?ä½?"
 
-#: ../plugins/git/anjuta-git.ui.h:68
-#| msgid "<b>Remote branch to rebase from:</b>"
+#: ../plugins/git/anjuta-git.ui.h:73
+msgid "Remote"
+msgstr "è¿?ç¨?"
+
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "é??å®?ä½?è?ªè¿?ç¨?å??æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:69
+#: ../plugins/git/anjuta-git.ui.h:75
+#, fuzzy
 msgid "Remote to delete:"
-msgstr ""
+msgstr "æ? æ³?å? é?¤ %s: %s\n"
 
-#: ../plugins/git/anjuta-git.ui.h:70
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "å? é?¤æ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:71
-#| msgid "Repository authorization"
+#: ../plugins/git/anjuta-git.ui.h:77
+#, fuzzy
 msgid "Repository origin"
-msgstr ""
+msgstr "ç½?ç»?å?ºå??æ?¥æº?"
 
-#: ../plugins/git/anjuta-git.ui.h:72
-#| msgid "<b>Repository to pull from:</b>"
+#: ../plugins/git/anjuta-git.ui.h:78
+#, fuzzy
 msgid "Repository to pull from:"
-msgstr ""
+msgstr "é?®ä»¶ä»? %s å??é??è?³ %s\n"
 
-#: ../plugins/git/anjuta-git.ui.h:73
-#| msgid "<b>Repository to push to:</b>"
+#: ../plugins/git/anjuta-git.ui.h:79
+#, fuzzy
 msgid "Repository to push to:"
-msgstr ""
+msgstr "æ·»å? å?°ä»?åº?"
 
-#: ../plugins/git/anjuta-git.ui.h:74
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "é??ç½®æ ?"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "é??ç½®ä¸ºï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:76
+#: ../plugins/git/anjuta-git.ui.h:82
+#, fuzzy
+#| msgid "Reset Tree"
+msgid "Restore index"
+msgstr ""
+"\n"
+"å½?æ¡£ç´¢å¼?ï¼?\n"
+
+#: ../plugins/git/anjuta-git.ui.h:83
 #: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving status..."
+#, fuzzy
+#| msgid "Retrieving status..."
+msgid "Retrieving statusâ?¦"
 msgstr "æ£å?¨å??å??ç?¶æ??..."
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "å??æ»?æ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "ä¿®è®¢/æ ?ç¾ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:80
-msgid "Select A Folder"
-msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹"
-
-#: ../plugins/git/anjuta-git.ui.h:81
-#| msgid "<b>Select Files to Check Out:</b>"
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "é??æ?©è¦?æ£?å?ºç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:82
-#: ../plugins/subversion/anjuta-subversion.ui.h:41
-#| msgid "<b>Select Files to Commit:</b>"
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
 msgid "Select Files to Commit:"
 msgstr "é??æ?©è¦?æ??äº¤ç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:83
-#| msgid "<b>Select Files to Ignore:</b>"
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "é??æ?©è¦?å¿½ç?¥ç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:84
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
-#| msgid "<b>Select Files to Mark as Resolved:</b>"
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Select Files to Mark as Resolved:"
 msgstr "é??æ?©è¦?æ ?è®°ä¸ºå·²è§£å?³ç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:85
+#: ../plugins/git/anjuta-git.ui.h:91
+#, fuzzy
 msgid "Select Files to Unstage:"
-msgstr ""
+msgstr "é??æ?©è¦?æ??äº¤ç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:86
-#| msgid "Select Scratchbox Folder"
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "é??æ?©é?®ç®±æ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:87
-#| msgid "_Select file to add..."
+#: ../plugins/git/anjuta-git.ui.h:93
+#, fuzzy
+#| msgid "Select A Folder"
+msgid "Select a Folder"
+msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹"
+
+#: ../plugins/git/anjuta-git.ui.h:94
 msgid "Select file to add:"
 msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:88
-#| msgid "<b>Select file to remove:</b>"
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "é??æ?©è¦?å? é?¤ç??æ??ä»¶ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:89
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Set Conflicts as Resolved"
 msgstr "å°?å?²çª?è®¾ç½®ä¸ºå·²è§£å?³"
 
-#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "å?¨æ?¥å¿?ä¿¡æ?¯ä¸æ?¾ç¤ºæº?ä»£ç ?ä¿®è®¢"
 
-#: ../plugins/git/anjuta-git.ui.h:91
-#| msgid "Annotate this tag"
+#: ../plugins/git/anjuta-git.ui.h:98
+#, fuzzy
+#| msgid "Stream comment the selected text"
+msgid "Show the contents of the selected stash in an editor"
+msgstr "å°?é??ä¸æ??æ?¬è®¾ç½®ä¸ºæµ?æ³¨é??"
+
+#: ../plugins/git/anjuta-git.ui.h:99
+#, fuzzy
 msgid "Sign this tag"
-msgstr ""
+msgstr "æ³¨è§£è¿?ä¸ªæ ?ç¾"
 
-#: ../plugins/git/anjuta-git.ui.h:92
+#: ../plugins/git/anjuta-git.ui.h:100
+#, fuzzy
 msgid "Soft"
-msgstr ""
+msgstr "è½¯"
 
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
 msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:94
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
+#, fuzzy
+#| msgid "State"
+msgid "Stash"
+msgstr "ç?¶æ??"
+
+#: ../plugins/git/anjuta-git.ui.h:103
+#, fuzzy
+#| msgid "<b>Messages options</b>"
+msgid "Stash Message (Optional)"
+msgstr "å?¯å?¨å?¯é??ç??è¯?æ?ä¿¡æ?¯"
+
+#: ../plugins/git/anjuta-git.ui.h:104
+#, fuzzy
+#| msgid "Show uncommitted changes"
+msgid "Stash Uncommitted Changes"
+msgstr "æ¯?è¾?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
+
+#: ../plugins/git/anjuta-git.ui.h:105
+#, fuzzy
+#| msgid "Show uncommitted changes"
+msgid "Stash indexed changes"
+msgstr "å°?æ?´æ?¹ä¿?å?å?°â??%sâ??å??ï¼?"
+
+#: ../plugins/git/anjuta-git.ui.h:106
+#, fuzzy
+#| msgid "Show uncommitted changes"
+msgid "Stash the working tree's uncommitted changes"
+msgstr "æ?¾ç¤ºæ?ªæ??äº¤ç??æ?´æ?¹"
+
+#: ../plugins/git/anjuta-git.ui.h:107
+#, fuzzy
+#| msgid "<b>Scope</b>"
+msgid "Stash to Apply"
+msgstr "å?¨é?¨åº?ç?¨"
+
+#: ../plugins/git/anjuta-git.ui.h:108
 msgid "Switch to Another Branch"
 msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:95
-#| msgid "Target name:"
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "æ ?ç¾å??ç§°ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "æ ?ç¾/æ??äº¤"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "æ ?ç¾"
+
+#: ../plugins/git/anjuta-git.ui.h:112
 msgid "Tags to delete:"
 msgstr "è¦?å? é?¤ç??æ ?ç¾ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:98
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "è¿?ä¸ªæ??äº¤ä»¥å¤±è´¥ç??å??å¹¶ç»?æ?? (ç?¨ -i)"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
 msgstr "å?°ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:101
+#: ../plugins/git/anjuta-git.ui.h:116
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:118
+#, fuzzy
 msgid "Unstage Files"
-msgstr ""
+msgstr "æ£å?¨ä¸?è½½ %i ä¸ªæ??ä»¶"
 
-#: ../plugins/git/anjuta-git.ui.h:103
+#: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
 msgstr "ä½¿ç?¨å®?å?¶ç??æ?¥å¿?ä¿¡æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:104
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Use custom author information:"
 msgstr "ä½¿ç?¨å®?å?¶ç??ä½?è??ä¿¡æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "View log"
 msgstr "æ?¥ç??æ?¥å¿?"
 
-#: ../plugins/git/anjuta-git.ui.h:106
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
-#| msgid "<b>View the Log for File/Folder:</b>"
+#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "æ?¥ç??æ??ä»¶/æ??ä»¶å¤¹ç??æ?¥å¿?ï¼?"
 
+#: ../plugins/git/anjuta-git.ui.h:124
+msgid "page 1"
+msgstr "ç¬¬ 1 é¡µ"
+
+#: ../plugins/git/anjuta-git.ui.h:125
+msgid "page 2"
+msgstr "ç¬¬ 2 é¡µ"
+
+#: ../plugins/git/anjuta-git.ui.h:126
+msgid "page 3"
+msgstr "ç¬¬ 3 é¡µ"
+
 #: ../plugins/git/git-add-dialog.c:36
+#, fuzzy
 msgid "Git: File staged for add."
-msgstr ""
+msgstr "æ? æ³?ä¸º %s æ·»å? æ??ä»¶ context"
 
 #: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
 msgid "Please select a file."
@@ -4742,11 +5015,12 @@ msgstr "è¯·è¾?å?¥ URL ã??"
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
+#, fuzzy
+#| msgid "Git: Fetching..."
+msgid "Git: Fetchingâ?¦"
 msgstr "Gitï¼?æ£å?¨è?·å??..."
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
-#| msgid "Please select a file."
 msgid "Please select a mailbox file."
 msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶ã??"
 
@@ -4795,10 +5069,19 @@ msgid "Please enter a tag name."
 msgstr "è¯·è¾?å?¥æ ?ç¾å??ç§°ã??"
 
 #: ../plugins/git/git-delete-branch-dialog.c:37
-#| msgid "Git: Deleted branch \"%s\"."
 msgid "Git: Deleted selected branches."
 msgstr "Git: å·²å? é?¤å??æ?¯ â??%sâ??ã??"
 
+#: ../plugins/git/git-delete-branch-dialog.c:106
+msgid "Please select branches to delete"
+msgstr "è¯·é??æ?©è¦?å? é?¤ç??å??æ?¯"
+
+#: ../plugins/git/git-delete-tag-dialog.c:37
+#, fuzzy
+#| msgid "Git: Deleted selected branches."
+msgid "Git: Deleted selected tags."
+msgstr "Git: å·²å? é?¤å??æ?¯ â??%sâ??ã??"
+
 #: ../plugins/git/git-fetch-dialog.c:40
 msgid "Git: Fetch complete."
 msgstr "Gitï¼?è?·å??å®?æ??ã??"
@@ -4817,7 +5100,9 @@ msgid "Author"
 msgstr "ä½?è??"
 
 #: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving log..."
+#, fuzzy
+#| msgid "Git: Retrieving log..."
+msgid "Git: Retrieving logâ?¦"
 msgstr "Gitï¼?æ£å?¨å??å??æ?¥å¿?..."
 
 #: ../plugins/git/git-log-dialog.c:360
@@ -4829,7 +5114,6 @@ msgid "Please enter a path."
 msgstr "è¯·è¾?å?¥è·¯å¾?ã??"
 
 #: ../plugins/git/git-log-dialog.c:399
-#| msgid "Select file"
 msgid "Select a file"
 msgstr "é??æ?©æ??ä»¶"
 
@@ -4848,32 +5132,52 @@ msgstr "<b>æ ?ç¾ï¼?</b> %s"
 msgid "<b>Remote:</b> %s"
 msgstr "<b>è¿?ç¨?ï¼?</b> %s"
 
+#: ../plugins/git/git-log-dialog.c:849 ../plugins/git/plugin.c:674
+#: ../plugins/git/plugin.c:867
+msgid "Branch"
+msgstr "å??æ?¯"
+
 #: ../plugins/git/git-merge-dialog.c:36
 msgid "Git: Merge complete."
 msgstr "Gitï¼?å??å¹¶å®?æ??ã??"
 
 #: ../plugins/git/git-pull-dialog.c:36
 msgid "Git: Pull complete."
-msgstr ""
+msgstr "Gitï¼?æ??å??å®?æ??ã??"
 
-#: ../plugins/git/git-pull-dialog.c:87
+#. The "input widget" is the widget that should receive focus if the
+#. * user does not properly enter anything
+#: ../plugins/git/git-pull-dialog.c:124
+#, fuzzy
+#| msgid "Please enter the URL of the repository to pull from."
+msgid "Please select a remote to pull from."
+msgstr "è¯·è¾?å?¥è¦?æ??å??ç??ç??æ?¬åº?ç?? URLã??"
+
+#: ../plugins/git/git-pull-dialog.c:142
 msgid "Please enter the URL of the repository to pull from."
 msgstr "è¯·è¾?å?¥è¦?æ??å??ç??ç??æ?¬åº?ç?? URLã??"
 
 #: ../plugins/git/git-push-dialog.c:36
-#| msgid "Git: Pull complete."
+#, fuzzy
 msgid "Git: Push complete."
-msgstr ""
+msgstr "Gitï¼?æ??äº¤å®?æ??ã??"
 
-#: ../plugins/git/git-push-dialog.c:131
-#| msgid "Please enter the URL of the repository to pull from."
+#. The "input widget" is the widget that should receive focus if the
+#. * user does not properly enter anything
+#: ../plugins/git/git-push-dialog.c:141
+#, fuzzy
+#| msgid "Please enter the URL of the repository to push to."
+msgid "Please select a remote to push to."
+msgstr "è¯·é??æ?©è¦?æ¿?æ´»ç??æ??ä»¶"
+
+#: ../plugins/git/git-push-dialog.c:159
 msgid "Please enter the URL of the repository to push to."
 msgstr "è¯·è¾?å?¥è¦?æ??å??ç??ç??æ?¬åº?ç?? URLã??"
 
-#: ../plugins/git/git-push-dialog.c:161
-#| msgid "Git: Fetching..."
-msgid "Git: Pushing..."
-msgstr ""
+#: ../plugins/git/git-push-dialog.c:193
+#, fuzzy
+msgid "Git: Pushingâ?¦"
+msgstr "Gitï¼?æ£å?¨è?·å??..."
 
 #: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
@@ -4887,625 +5191,765 @@ msgstr "Gitï¼?æ??ä»¶å·²å? é?¤ã??"
 msgid "Git: Resolve complete."
 msgstr "Gitï¼?è§£å?³å®?æ??ã??"
 
+#: ../plugins/git/git-stash-widget.c:219
+#, fuzzy
+#| msgid "Git: Fetch complete."
+msgid "Git: Stash dropped."
+msgstr "æ?¾å¼?å¾ªç?¯ä¾?èµ? %s <- %s ã??"
+
+#: ../plugins/git/git-stash-widget.c:275
+msgid "Git: All stashes cleared."
+msgstr ""
+
 #: ../plugins/git/git-switch-dialog.c:36
 msgid "Git: Branch checkout complete."
 msgstr "Gitï¼?å??æ?¯æ£?å?ºå®?æ??ã??"
 
-#: ../plugins/git/git-ui-utils.c:94 ../plugins/git/git-ui-utils.c:99
+#: ../plugins/git/git-ui-utils.c:89 ../plugins/git/git-ui-utils.c:94
 #: ../plugins/git/git.plugin.in.h:1
 msgid "Git"
 msgstr "Git"
 
-#: ../plugins/git/git-ui-utils.c:501
+#: ../plugins/git/git-ui-utils.c:158
+#, fuzzy
+msgid "There are no branches available."
+msgstr "æ²¡æ??æ?ªè¯»æ?¡ç?® "
+
+#: ../plugins/git/git-ui-utils.c:194
+#, fuzzy
+#| msgid "Please select a file."
+msgid "Please select a stash"
+msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶ã??"
+
+#: ../plugins/git/git-ui-utils.c:604
+msgid "Git: Changes stored in a stash."
+msgstr ""
+
+#: ../plugins/git/git-ui-utils.c:620
+#, fuzzy
+msgid "Git: Stashed changes applied."
+msgstr "æ? æ³?æ?´æ?¹ã??"
+
+#: ../plugins/git/git-ui-utils.c:744
 msgid "Git: Diff complete."
 msgstr "Gitï¼?Diff å®?æ??ã??"
 
+#: ../plugins/git/git-ui-utils.c:760
+#, c-format
+msgid "Column %i"
+msgstr "å?? %i"
+
 #: ../plugins/git/git-unstage-dialog.c:36
+#, fuzzy
 msgid "Git: Files unstaged."
-msgstr ""
+msgstr "Git: æ??ä»¶å·²æ£?å?ºã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:62 ../plugins/git/plugin.c:502
+#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:70 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "æ??äº¤(_C)..."
+#: ../plugins/git/plugin.c:79
+msgid "_Changes"
+msgstr "æ?´æ?¹(_C)"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+#, fuzzy
+#| msgid "_Commit"
+msgid "_Commitâ?¦"
+msgstr "æ??äº¤(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:72
-#| msgid "Subversion: Committing changes to the repository..."
+#: ../plugins/git/plugin.c:89
 msgid "Commit changes to the local repository"
 msgstr "Subversionï¼?æ£å?¨å??ç??æ?¬åº?æ??äº¤æ?´æ?¹..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:78
-msgid "_Fetch"
-msgstr "è?·å??(_F)"
+#: ../plugins/git/plugin.c:95
+msgid "_Diff uncommitted changes"
+msgstr "æ¯?è¾?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:80
-#| msgid "_Remote branches"
-msgid "Update remote branches"
-msgstr "è¿?ç¨?å??æ?¯(_R)"
+#: ../plugins/git/plugin.c:97
+msgid "Show uncommitted changes"
+msgstr "æ?¾ç¤ºæ?ªæ??äº¤ç??æ?´æ?¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:86
-msgid "_Rebase"
-msgstr "é??å®?ä½?(_R)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:88
-msgid "Merge your changes with an upstream remote branch"
-msgstr "å??å¹¶æ?´æ?¹å?°ä¸?æ¸¸å??æ?¯"
+#: ../plugins/git/plugin.c:103
+#, fuzzy
+#| msgid "_Attach"
+msgid "_Stash"
+msgstr "ä¾?é??(_A)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:94 ../plugins/git/plugin.c:374
-msgid "_Start..."
-msgstr "å¼?å§?(_S)..."
+#: ../plugins/git/plugin.c:111
+#, fuzzy
+#| msgid "Show uncommitted changes"
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "æ¯?è¾?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:96
-#| msgid "Start Debugger"
-msgid "Start a rebase"
-msgstr "å?¯å?¨é??å®?ä½?"
+#: ../plugins/git/plugin.c:113
+#, fuzzy
+#| msgid "Revert uncommitted changes to files"
+msgid "Save uncommitted changes and re-apply them later"
+msgstr "æ?¢å¤?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:102
-msgid "_Continue"
-msgstr "ç»§ç»(_C)"
+#: ../plugins/git/plugin.c:119
+#, fuzzy
+msgid "_Apply stashed changesâ?¦"
+msgstr "å°?æ?´æ?¹ä¿?å?å?°â??%sâ??å??ï¼?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:104
-msgid "Continue a rebase that stopped because of conflicts"
-msgstr ""
+#: ../plugins/git/plugin.c:121
+#, fuzzy
+#| msgid "Commit your changes to the Subversion tree"
+msgid "Apply stashed changes to the working tree"
+msgstr "å°?æ?´æ?¹æ??äº¤å?° Subversion æ ?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:110
-msgid "_Skip"
-msgstr "è·³è¿?(_S)"
+#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+#, fuzzy
+#| msgid "View log"
+msgid "_View logâ?¦"
+msgstr "æ?¥ç??æ?¥å¿?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:112
-msgid "Skip the current conflicted commmit and continue"
-msgstr ""
+#: ../plugins/git/plugin.c:129
+msgid "View change history"
+msgstr "æ?¥ç??æ??ä»¶å??å?²"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:118 ../plugins/git/plugin.c:246
-msgid "_Abort"
-msgstr "å?³äº?(_A)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:120
-msgid "Abort the rebase and put the repository in its original state"
-msgstr ""
+#: ../plugins/git/plugin.c:135
+#, fuzzy
+#| msgid "Remove Breakpoint"
+msgid "_Remote repository"
+msgstr "é??é¡¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:126
-msgid "_Push..."
-msgstr ""
+#: ../plugins/git/plugin.c:143
+#, fuzzy
+msgid "_Pushâ?¦"
+msgstr "å¹³å±?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:128
-#| msgid "Subversion: Committing changes to the repository..."
+#: ../plugins/git/plugin.c:145
+#, fuzzy
 msgid "Push changes to a remote repository"
-msgstr ""
+msgstr "Subversionï¼?æ£å?¨å??ç??æ?¬åº?æ??äº¤æ?´æ?¹..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:134
-msgid "_Pull..."
-msgstr "æ??å??(_P)"
+#: ../plugins/git/plugin.c:151
+#, fuzzy
+#| msgid "Pull"
+msgid "_Pullâ?¦"
+msgstr "æ??å??"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:136
-#| msgid "Update the graph"
+#: ../plugins/git/plugin.c:153
 msgid "Update the working copy"
 msgstr "æ?´æ?°å½?å??å·¥ä½?å?¯æ?¬"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:142
-msgid "_Diff uncommitted changes"
-msgstr "æ¯?è¾?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
+#: ../plugins/git/plugin.c:159
+msgid "_Fetch"
+msgstr "è?·å??(_F)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:144
-#| msgid "_Diff uncommitted changes"
-msgid "Show uncommitted changes"
-msgstr "æ?¾ç¤ºæ?ªæ??äº¤ç??æ?´æ?¹"
+#: ../plugins/git/plugin.c:161
+msgid "Update remote branches"
+msgstr "è¿?ç¨?å??æ?¯(_R)"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:167
+msgid "_Files"
+msgstr "æ??ä»¶(_F)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:150 ../plugins/git/plugin.c:310
-#: ../plugins/git/plugin.c:518 ../plugins/subversion/plugin.c:60
+#: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
+#: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
 #: ../plugins/subversion/plugin.c:175
-msgid "_Add..."
-msgstr "æ·»å? (_A)..."
+#, fuzzy
+#| msgid "_Add"
+msgid "_Addâ?¦"
+msgstr "æ·»å? (_A)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:152
-#| msgid "Add to repository"
+#: ../plugins/git/plugin.c:177
 msgid "Add files to the repository"
 msgstr "æ·»å? å?°ä»?åº?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:158 ../plugins/git/plugin.c:526
+#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "å? é?¤(_R)..."
+#, fuzzy
+#| msgid "_Remove"
+msgid "_Removeâ?¦"
+msgstr "å? é?¤(_R)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:160
+#: ../plugins/git/plugin.c:185
 msgid "Remove files from the repository"
 msgstr "ä»?ä»?åº?ä¸å? é?¤æ??ä»¶"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:166
-msgid "_Ignore..."
-msgstr "å¿½ç?¥(_I)..."
+#: ../plugins/git/plugin.c:191
+#, fuzzy
+#| msgid "Ignored"
+msgid "_Ignoreâ?¦"
+msgstr "å·²å¿½ç?¥"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:168
-#| msgid "Ignore Files"
+#: ../plugins/git/plugin.c:193
 msgid "Ignore files"
 msgstr "å¿½ç?¥æ??ä»¶"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:174
-msgid "_Check out files..."
+#: ../plugins/git/plugin.c:199
+#, fuzzy
+#| msgid "_Check out files..."
+msgid "_Check out filesâ?¦"
 msgstr "æ£?å?ºæ??ä»¶(_C)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:176
-#| msgid "_Diff uncommitted changes"
+#: ../plugins/git/plugin.c:201
 msgid "Revert uncommitted changes to files"
 msgstr "æ?¢å¤?æ?ªæ??äº¤ç??æ?´æ?¹(_D)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:182
-msgid "_Unstage files..."
-msgstr ""
+#: ../plugins/git/plugin.c:207
+#, fuzzy
+msgid "_Unstage filesâ?¦"
+msgstr "æ£å?¨ä¸?è½½ %i ä¸ªæ??ä»¶"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:184
+#: ../plugins/git/plugin.c:209
 msgid "Remove files from the commit index"
-msgstr ""
+msgstr "ä»?æ??äº¤ç´¢å¼?ä¸å? é?¤æ??ä»¶"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:190
-msgid "_Resolve conflicts..."
+#: ../plugins/git/plugin.c:215
+#, fuzzy
+#| msgid "_Resolve conflicts..."
+msgid "_Resolve conflictsâ?¦"
 msgstr "è§£å?³å?²çª?(_R)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:192
-#| msgid "Set Conflicts as Resolved"
+#: ../plugins/git/plugin.c:217
 msgid "Mark conflicted files as resolved"
 msgstr "å°?å?²çª?è®¾ç½®ä¸ºå·²è§£å?³"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:198 ../plugins/patch/patch-plugin.c:117
+#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
 msgid "Patches"
 msgstr "è¡¥ä¸?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:206
-msgid "Create patch series..."
-msgstr ""
+#: ../plugins/git/plugin.c:231
+#, fuzzy
+#| msgid "Create patch series"
+msgid "Create patch seriesâ?¦"
+msgstr "å??å»ºæ?°ç?®å½?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:208
+#: ../plugins/git/plugin.c:233
 msgid "Generate patch files for submission upstream"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:222
-#| msgid "_Add..."
-msgid "_Apply..."
+#: ../plugins/git/plugin.c:247
+#, fuzzy
+#| msgid "_Apply..."
+msgid "_Applyâ?¦"
 msgstr "åº?ç?¨(_A)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:224
+#: ../plugins/git/plugin.c:249
 msgid "Start applying a patch series"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:230
-#| msgid "_Resolve conflicts..."
+#: ../plugins/git/plugin.c:255
+#, fuzzy
 msgid "_Continue with resolved conflicts"
-msgstr ""
+msgstr "å°?å?²çª?è®¾ç½®ä¸ºå·²è§£å?³"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:232
+#: ../plugins/git/plugin.c:257
 msgid "Continue applying a series after resolving conflicts"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:238
-#| msgid "Set current thread"
+#: ../plugins/git/plugin.c:263
 msgid "_Skip current patch"
 msgstr "è·³è¿?å½?å??è¡¥ä¸?(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:240
+#: ../plugins/git/plugin.c:265
 msgid "Skip the current patch in the series and continue"
 msgstr ""
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+msgid "_Abort"
+msgstr "å?³äº?(_A)"
+
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:248
+#: ../plugins/git/plugin.c:273
 msgid ""
 "Stop applying the series and return the repository to its original state"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:254
+#: ../plugins/git/plugin.c:279
 msgid "_Branches"
 msgstr "å??æ?¯(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:262 ../plugins/git/plugin.c:434
-msgid "_Create branch..."
+#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+#, fuzzy
+#| msgid "_Create branch..."
+msgid "_Create branchâ?¦"
 msgstr "å??å»ºå??æ?¯(_C)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:264
-#| msgid "Create Branch"
+#: ../plugins/git/plugin.c:289
 msgid "Create a branch"
 msgstr "å??å»ºä¸?ä¸ªå??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:270
-msgid "_Delete branch..."
+#: ../plugins/git/plugin.c:295
+#, fuzzy
+#| msgid "_Delete branch..."
+msgid "_Delete branchâ?¦"
 msgstr "å? é?¤å??æ?¯(_D)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:272
-#| msgid "Delete Branch"
+#: ../plugins/git/plugin.c:297
 msgid "Delete branches"
 msgstr "å? é?¤å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:278
-msgid "_Switch to another branch..."
-msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯(_S)..."
+#: ../plugins/git/plugin.c:303
+#, fuzzy
+#| msgid "Switch to another branch"
+msgid "_Switch to another branchâ?¦"
+msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:280
-#| msgid "_Switch to another branch..."
+#: ../plugins/git/plugin.c:305
 msgid "Switch to another branch"
 msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:286
-msgid "_Merge..."
-msgstr "å??å¹¶(_M)..."
+#: ../plugins/git/plugin.c:311
+#, fuzzy
+#| msgid "Merge"
+msgid "_Mergeâ?¦"
+msgstr "å??å¹¶"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:288
+#: ../plugins/git/plugin.c:313
 msgid "Merge changes from another branch into the current one"
 msgstr "ä»?å?¶ä»?å??æ?¯å??å¹¶æ?´æ?¹å?°å½?å??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:294 ../plugins/git/plugin.c:466
-msgid "_Cherry pick..."
+#: ../plugins/git/plugin.c:319
+msgid "_Rebase"
+msgstr "é??å®?ä½?(_R)"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:321
+msgid "Merge your changes with an upstream remote branch"
+msgstr "å??å¹¶æ?´æ?¹å?°ä¸?æ¸¸å??æ?¯"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+#, fuzzy
+#| msgid "_Start..."
+msgid "_Startâ?¦"
+msgstr "å¼?å§?(_S)..."
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:329
+msgid "Start a rebase"
+msgstr "å?¯å?¨é??å®?ä½?"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:335
+msgid "_Continue"
+msgstr "ç»§ç»(_C)"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:337
+msgid "Continue a rebase that stopped because of conflicts"
+msgstr ""
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:343
+msgid "_Skip"
+msgstr "è·³è¿?(_S)"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:345
+#, fuzzy
+#| msgid "Save the current file with a different name"
+msgid "Skip the current conflicted commit and continue"
+msgstr "ç?¨å?¦ä¸?å??ç§°ä¿?å?å½?å??æ??ä»¶"
+
+#. Display label
+#. short-cut
+#: ../plugins/git/plugin.c:353
+msgid "Abort the rebase and put the repository in its original state"
 msgstr ""
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+#, fuzzy
+msgid "_Cherry pickâ?¦"
+msgstr "æ?¿èµ·è¯?ç?"
+
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:296
+#: ../plugins/git/plugin.c:361
 msgid ""
-"Selectively merge individual changes from other branches into the current "
-"one"
+"Selectively merge individual changes from other branches into the current one"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:302
+#: ../plugins/git/plugin.c:367
 msgid "_Remote branches"
 msgstr "è¿?ç¨?å??æ?¯(_R)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:312
-#| msgid "Add Remote Branch"
+#: ../plugins/git/plugin.c:377
 msgid "Add a remote branch"
 msgstr "æ·»å? è¿?ç¨?å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:318
-msgid "_Delete..."
-msgstr "å? é?¤(_D)"
+#: ../plugins/git/plugin.c:383
+#, fuzzy
+#| msgid "Delete"
+msgid "_Deleteâ?¦"
+msgstr "å? é?¤"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:320
-#| msgid "Delete Remote Branch"
+#: ../plugins/git/plugin.c:385
 msgid "Delete a remote branch"
 msgstr "å? é?¤ä¸?ä¸ªè¿?ç¨?å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:326
-#| msgid "Tasks"
-msgid "Tags"
-msgstr "æ ?ç¾"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:334 ../plugins/git/plugin.c:442
-msgid "_Create tag..."
+#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+#, fuzzy
+#| msgid "_Create tag..."
+msgid "_Create tagâ?¦"
 msgstr "å??å»ºæ ?ç¾(_C)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:336
-#| msgid "Create Tag"
+#: ../plugins/git/plugin.c:401
 msgid "Create a tag"
 msgstr "å??å»ºä¸?ä¸ªæ ?ç¾"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:342
-#| msgid "_Delete..."
-msgid "_Delete tag..."
-msgstr "å? é?¤æ ?ç¾(_D)"
+#: ../plugins/git/plugin.c:407
+#, fuzzy
+#| msgid "Delete tags"
+msgid "_Delete tagâ?¦"
+msgstr "å? é?¤æ ?ç¾"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:344
+#: ../plugins/git/plugin.c:409
 msgid "Delete tags"
 msgstr "å? é?¤æ ?ç¾"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:350 ../plugins/git/plugin.c:450
-msgid "_Reset tree..."
+#: ../plugins/git/plugin.c:415
+#, fuzzy
+#| msgid "_Reset"
+msgid "_Reset/Revert"
+msgstr "å¤?å??æ?´æ?¹å??ï¼?"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+#, fuzzy
+#| msgid "_Reset tree..."
+msgid "_Reset treeâ?¦"
 msgstr "é??ç½®æ ?(_R)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:352
+#: ../plugins/git/plugin.c:425
 msgid "Reset repository head to any past state"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:358 ../plugins/git/plugin.c:458
-msgid "_Revert commit..."
+#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+#, fuzzy
+#| msgid "_Revert commit..."
+msgid "_Revert commitâ?¦"
 msgstr "å??æ»?æ??äº¤(_R)..."
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:360
+#: ../plugins/git/plugin.c:433
 msgid "Revert a commit"
 msgstr "å??æ»?ä¸?ä¸ªæ??äº¤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:366
+#: ../plugins/git/plugin.c:439
 msgid "Bisect"
 msgstr "å¹³å??"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:376
-#| msgid "Stack frame operations"
+#: ../plugins/git/plugin.c:449
 msgid "Start a bisect operation"
 msgstr "å¼?å§?ä¸?ä¸ªå¹³å??æ??ä½?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:384
+#: ../plugins/git/plugin.c:457
 msgid "Stop the bisect and bring the tree back to normal"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:390
+#: ../plugins/git/plugin.c:463
+#, fuzzy
 msgid "_Good"
-msgstr ""
+msgstr "å¥½ (_G)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:392
+#: ../plugins/git/plugin.c:465
 msgid "Mark the current head revision as good"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:398
+#: ../plugins/git/plugin.c:471
+#, fuzzy
 msgid "_Bad"
-msgstr ""
+msgstr "å?? (_B)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:400
+#: ../plugins/git/plugin.c:473
 msgid "Mark the current head revision as bad"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:406 ../plugins/git/plugin.c:510
-msgid "_View log..."
-msgstr "æ?¥ç??æ?¥å¿?(_V)..."
+#: ../plugins/git/plugin.c:479
+#, fuzzy
+#| msgid "Add to repository"
+msgid "_Initialize repository"
+msgstr "é??é¡¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:408
-#| msgid "View file history"
-msgid "View change history"
-msgstr "æ?¥ç??æ??ä»¶å??å?²"
+#: ../plugins/git/plugin.c:481
+msgid "Create a new git repository or reinitialize an existing one"
+msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:418
+#: ../plugins/git/plugin.c:491
 msgid "_Show commit diff"
 msgstr "æ?¾ç¤ºæ??äº¤diff (_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:420
+#: ../plugins/git/plugin.c:493
 msgid "Show changes introduced by this commit"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:426
+#: ../plugins/git/plugin.c:499
 msgid "_View selected revision"
 msgstr "æ?¥ç??é??ä¸ç??ä¿®è®¢(_V)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:428
+#: ../plugins/git/plugin.c:501
 msgid "View a copy of this file at this revision"
 msgstr "æ?¾ç¤ºæ¤ä¿®è®¢ç??æ??ä»¶å?¯æ?¬"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:436
+#: ../plugins/git/plugin.c:509
 msgid "Create a branch with the selected revision as its head"
 msgstr ""
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:444
-#| msgid "Please enter a revision."
+#: ../plugins/git/plugin.c:517
 msgid "Create a tag at this revision"
 msgstr "å?¨æ¤ä¿®è®¢å??å»ºä¸?ä¸ªæ ?ç¾"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:452
-#| msgid "Please enter the start revision."
+#: ../plugins/git/plugin.c:525
 msgid "Reset repository head to this revision"
 msgstr ""
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:460
+#: ../plugins/git/plugin.c:533
 msgid "Revert this commit"
 msgstr "å??æ»?æ¤æ??äº¤"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:468
+#: ../plugins/git/plugin.c:541
 msgid "Merge this commit into the current branch"
 msgstr "å??å¹¶æ¤æ??äº¤å?°å½?å??å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:474
+#: ../plugins/git/plugin.c:547
 msgid "_Bisect"
 msgstr "å¹³å??(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:482
+#: ../plugins/git/plugin.c:555
+#, fuzzy
 msgid "_Set good revision"
-msgstr ""
+msgstr "è®¾å®?ä¸ºå¥½ç??ä¿®è®¢ (_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:484
+#: ../plugins/git/plugin.c:557
 msgid "Mark this revision as good"
 msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:490
+#: ../plugins/git/plugin.c:563
+#, fuzzy
 msgid "_Set bad revision"
-msgstr ""
+msgstr "è®¾å®?ä¸ºå¥½å??ç??ä¿®è®¢ (_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:492
+#: ../plugins/git/plugin.c:565
 msgid "Mark this revision as bad"
 msgstr ""
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:512
+#: ../plugins/git/plugin.c:585
 msgid "View changes to this file or folder"
 msgstr "æ?¾ç¤ºæ¤æ??ä»¶æ??æ??ä»¶å¤¹ç??æ?´æ?¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:520
+#: ../plugins/git/plugin.c:593
 msgid "Add this file or folder to the repository"
 msgstr "æ·»å? æ¤æ??ä»¶æ??æ??ä»¶å¤¹å?°ä»?åº?"
 
 #. Display label
 #. short-cut
-#: ../plugins/git/plugin.c:528
+#: ../plugins/git/plugin.c:601
 msgid "Remove this file or folder from the repository"
 msgstr "ä»?ä»?åº?ä¸å? é?¤æ¤æ??ä»¶æ??æ??ä»¶å¤¹"
 
-#: ../plugins/git/plugin.c:688
+#: ../plugins/git/plugin.c:766
+msgid "Top level git menu item"
+msgstr ""
+
+#: ../plugins/git/plugin.c:774
 msgid "Git operations"
 msgstr "Git æ??ä½?"
 
-#: ../plugins/git/plugin.c:693
+#: ../plugins/git/plugin.c:779
 msgid "Git log operations"
 msgstr "Git æ?¥å¿?æ??ä½?"
 
-#: ../plugins/git/plugin.c:698
+#: ../plugins/git/plugin.c:784
 msgid "Git FM operations"
 msgstr "Git FM æ??ä½?"
 
-#: ../plugins/git/plugin.c:713
+#: ../plugins/git/plugin.c:799
 msgid "Git Log"
 msgstr "Git æ?¥å¿?"
 
@@ -5521,51 +5965,45 @@ msgstr "<b>ç®¡ç??å?³è??</b>"
 msgid "<b>New association</b>"
 msgstr "<b>æ?°å»ºå?³è??</b>"
 
-#: ../plugins/glade/anjuta-glade.glade.h:4
+#. Link a file with a widget
+#: ../plugins/glade/anjuta-glade.glade.h:5
 msgid "Associate"
 msgstr "å?³è??"
 
-#: ../plugins/glade/anjuta-glade.glade.h:5
+#: ../plugins/glade/anjuta-glade.glade.h:6
 msgid "Automatically add resources"
 msgstr "è?ªå?¨æ·»å? èµ?æº?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:6 ../plugins/glade/plugin.c:755
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:763
+#: ../plugins/glade/plugin.c:3094
 msgid "Designer"
 msgstr "è®¾è®¡å?¨"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3096
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "ç¼?è¾?å?¨"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8
+#: ../plugins/glade/anjuta-glade.glade.h:9
 msgid "Insert handler on edit"
 msgstr "ç¼?è¾?æ?¶æ??å?¥å¤?ç??å?¥æ??"
 
-#: ../plugins/glade/anjuta-glade.glade.h:9
+#: ../plugins/glade/anjuta-glade.glade.h:10
 msgid "Position type"
 msgstr "ä½?ç½®ï¼?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:10
+#: ../plugins/glade/anjuta-glade.glade.h:11
 msgid "Separated designer layout"
 msgstr "å??ç¦»ç??è®¾è®¡å?¨å¸?å±?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:11
+#: ../plugins/glade/anjuta-glade.glade.h:12
 msgid "Special regexp"
-msgstr ""
+msgstr "ç?¹æ®?ç??æ£å??è¡¨è¾¾å¼?"
 
-#: ../plugins/glade/anjuta-glade.glade.h:12
+#: ../plugins/glade/anjuta-glade.glade.h:13
 msgid "Widget name"
 msgstr "é?¨ä»¶å??ç§°"
 
-#: ../plugins/glade/anjuta-glade.glade.h:13
-msgid "on_widget_signal"
-msgstr "on_widget_signal"
-
-#: ../plugins/glade/anjuta-glade.glade.h:14
-msgid "widget_signal_cb"
-msgstr "widget_signal_cb"
-
 #: ../plugins/glade/designer-associations-item.c:243
 #, c-format
 msgid "Association item has no designer"
@@ -5596,204 +6034,240 @@ msgstr "æ? æ??ç?? %s å±?æ?§å?¼"
 msgid "Association item filename has no path"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:847
-#, c-format
-msgid "No associations initialized, nothing to save"
+#: ../plugins/glade/plugin.c:855
+#, fuzzy, c-format
+#| msgid "No associations initialized, nothing to save"
+msgid "No associations initialized: nothing to save"
 msgstr "æ²¡æ??å??å§?å??å?³è??ï¼?æ²¡æ??ä¿?å?ä»»ä½?ä¸?è¥¿"
 
-#: ../plugins/glade/plugin.c:854
+#: ../plugins/glade/plugin.c:862
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:876
+#: ../plugins/glade/plugin.c:884
 #, c-format
 msgid "Failed to save associations"
 msgstr "ä¿?å?å?³è??å¤±è´¥"
 
-#: ../plugins/glade/plugin.c:1360
+#. iptCurrent:
+#: ../plugins/glade/plugin.c:1196
+msgid "Current"
+msgstr "å½?å??"
+
+#. iptBeforeEnd:
+#: ../plugins/glade/plugin.c:1197
+msgid "Before end"
+msgstr "ç»?æ??ä¹?å??"
+
+#. iptAfterBegin:
+#: ../plugins/glade/plugin.c:1198
+msgid "After begin"
+msgstr "å¼?å§?å??"
+
+#. ipEOF:
+#: ../plugins/glade/plugin.c:1199
+msgid "End of file"
+msgstr "æ??ä»¶ç»?æ??"
+
+#: ../plugins/glade/plugin.c:1368
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "ä¸?è?½è?ªç??è¿?ä¸ªä¿¡å?·"
 
-#: ../plugins/glade/plugin.c:1382
+#: ../plugins/glade/plugin.c:1390
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "å°?ä¸?æ?¯æ?? Python è¯è¨?"
 
-#: ../plugins/glade/plugin.c:1395
+#: ../plugins/glade/plugin.c:1403
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "å°?ä¸?æ?¯æ?? Vala è¯è¨?"
 
-#: ../plugins/glade/plugin.c:1954
+#: ../plugins/glade/plugin.c:1962
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "è®¾è®¡å?¨æ²¡æ??ä¸?ä¹?å?³è??ç??ç¼?è¾?å?¨"
 
-#: ../plugins/glade/plugin.c:1972
-#, c-format
-msgid "Unknown language of the editor \"%s\""
-msgstr "ç¼?è¾?å?¨â??%sâ??ç??æ?ªç?¥è¯è¨?"
+#: ../plugins/glade/plugin.c:1980
+#, fuzzy, c-format
+#| msgid "Unknown error in module %s"
+msgid "Unknown editor language \"%s\""
+msgstr "æ¨¡å?? %s å??ç??æ?ªç?¥é??è¯¯"
 
-#: ../plugins/glade/plugin.c:2039 ../plugins/glade/plugin.c:2116
-#: ../plugins/glade/plugin.c:2241
+#: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
+#: ../plugins/glade/plugin.c:2249
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "å??å?¥æ??ä»¶æ?¶å?ºé??ï¼?%sã??"
 
-#: ../plugins/glade/plugin.c:2046 ../plugins/glade/plugin.c:2130
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
+#, fuzzy
+#| msgid "Couldn't find a signal information"
+msgid "Couldn't find signal information"
 msgstr "æ?¾ä¸?å?°ä¿¡å?·ä¿¡æ?¯"
 
-#: ../plugins/glade/plugin.c:2073
+#: ../plugins/glade/plugin.c:2081
 msgid "Error while adding a new handler stub: No current editor"
 msgstr "æ·»å? æ?°å¤?ç??å?¥æ??æ?¶å?ºé??ï¼?æ? å½?å??ç¼?è¾?å?¨"
 
-#: ../plugins/glade/plugin.c:2244
+#: ../plugins/glade/plugin.c:2254
 #, c-format
 msgid ""
-"To avoid this messages turn off \"Insert handler on edit\" flag in "
-"Preferences->Glade GUI Designer"
-msgstr ""
-"è¦?é?¿å??è¿?ä¸ªä¿¡æ?¯ï¼?è¯·å?³é?å?¨ é¦?é??é¡¹->Glade GUI è®¾è®¡å?¨ å¤?ç??â??ç¼?è¾?æ?¶æ??å?¥å¤?ç??å?¥æ??â?? æ ?"
-"è®°"
+"To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
+msgstr "è¦?é?¿å??è¿?ä¸ªä¿¡æ?¯ï¼?è¯·å?³é?å?¨ é¦?é??é¡¹ -> Glade GUI è®¾è®¡å?¨ å¤?ç??â??%sâ?? æ ?è®°"
 
-#: ../plugins/glade/plugin.c:2380
+#: ../plugins/glade/plugin.c:2324
+#, fuzzy
+#| msgid "Couldn't find a signal information"
+msgid "Couldn't find an associated document"
+msgstr "å?¨æ??æ¡£ä¸æ?¥æ?¾å?¹é??"
+
+#: ../plugins/glade/plugin.c:2390
 msgid "Those documents are already associated"
 msgstr "é?£äº?æ??æ¡£å·²ç»?è¢«å?³è??"
 
-#: ../plugins/glade/plugin.c:2418
+#: ../plugins/glade/plugin.c:2428
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "æ? æ³?è¯»å??æ??ä»¶ï¼?%s"
 
-#: ../plugins/glade/plugin.c:3676
+#: ../plugins/glade/plugin.c:3095
+#, fuzzy
+msgid "Top level widget"
+msgstr "å?¨æ??ä»¶å±?ï¼?"
+
+#: ../plugins/glade/plugin.c:3686
 msgid "Couldn't find a default signal name"
 msgstr "æ?¾ä¸?å?°é»?è®¤ç??ä¿¡å?·å??"
 
-#: ../plugins/glade/plugin.c:3886
+#: ../plugins/glade/plugin.c:3896
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "é¡¹ç?® %s ä¸?å?å?¨ä¸?æ?¨è??ç??é?¨ä»¶æ??ç??æ?¬é??é??ã??"
 
-#: ../plugins/glade/plugin.c:3903
+#: ../plugins/glade/plugin.c:3913
 msgid "There is no Glade project"
 msgstr "æ²¡æ?? Glade é¡¹ç?®"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3989
+#: ../plugins/glade/plugin.c:3999
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:3997 ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:4007 ../plugins/glade/plugin.c:4009
 msgid "Switch between designer/code"
 msgstr "å?¨è®¾è®¡/ä»£ç ?é?´å??æ?¢"
 
-#: ../plugins/glade/plugin.c:4005 ../plugins/glade/plugin.c:4007
+#: ../plugins/glade/plugin.c:4015 ../plugins/glade/plugin.c:4017
 msgid "Insert handler stub"
 msgstr "æ??å?¥å¤?ç??å?¥æ??"
 
-#: ../plugins/glade/plugin.c:4013 ../plugins/glade/plugin.c:4015
+#: ../plugins/glade/plugin.c:4023 ../plugins/glade/plugin.c:4025
 msgid "Insert handler stub, autoposition"
 msgstr "æ??å?¥å¤?ç??å?¥æ??ï¼?è?ªå?¨å®?ä½?"
 
-#: ../plugins/glade/plugin.c:4021
+#: ../plugins/glade/plugin.c:4031
 msgid "Associate last designer and last editor"
 msgstr "å?³è??æ??å??ä½¿ç?¨ç??è®¾è®¡å?¨å??ç¼?è¾?å?¨"
 
-#: ../plugins/glade/plugin.c:4023
+#: ../plugins/glade/plugin.c:4033
 msgid "Associate last designer and editor"
 msgstr "å?³è??æ??å??ä½¿ç?¨ç??è®¾è®¡å?¨å??ç¼?è¾?å?¨"
 
-#: ../plugins/glade/plugin.c:4029 ../plugins/glade/plugin.c:4031
-msgid "Associations dialog..."
+#: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
+#, fuzzy
+#| msgid "Associations dialog..."
+msgid "Associations dialogâ?¦"
 msgstr "å?³è??å¯¹è¯?æ¡?..."
 
-#: ../plugins/glade/plugin.c:4037
-msgid "Versioning..."
-msgstr ""
+#: ../plugins/glade/plugin.c:4047
+#, fuzzy
+#| msgid "Version"
+msgid "Versioningâ?¦"
+msgstr "ç??æ?¬"
 
-#: ../plugins/glade/plugin.c:4039
+#: ../plugins/glade/plugin.c:4049
 msgid "Switch between library versions and check deprecations"
 msgstr ""
 
-#: ../plugins/glade/plugin.c:4045 ../plugins/glade/plugin.c:4047
+#: ../plugins/glade/plugin.c:4055 ../plugins/glade/plugin.c:4057
 msgid "Set as default resource target"
 msgstr "è®¾ç½®æ??é»?è®¤èµ?æº?ç?®æ ?"
 
-#: ../plugins/glade/plugin.c:4055
+#: ../plugins/glade/plugin.c:4065
 msgid "Current default target"
 msgstr "å½?å??é»?è®¤ç?®æ ?"
 
-#: ../plugins/glade/plugin.c:4063
+#: ../plugins/glade/plugin.c:4073
 msgid "Close the current file"
 msgstr "å?³é?å½?å??æ??ä»¶"
 
-#: ../plugins/glade/plugin.c:4071
+#: ../plugins/glade/plugin.c:4081
 msgid "Save the current file"
 msgstr "ä¿?å?å½?å??æ??ä»¶"
 
-#: ../plugins/glade/plugin.c:4087
+#: ../plugins/glade/plugin.c:4097
 msgid "Redo the last action"
 msgstr "æ?¤æ¶?ä¸?æ¬¡æ??ä½?"
 
-#: ../plugins/glade/plugin.c:4095
+#: ../plugins/glade/plugin.c:4105
 msgid "Cut the selection"
 msgstr "å?ªå??é??ä¸é?¨å??"
 
-#: ../plugins/glade/plugin.c:4103
+#: ../plugins/glade/plugin.c:4113
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??ä¸é?¨å??"
 
-#: ../plugins/glade/plugin.c:4111
+#: ../plugins/glade/plugin.c:4121
 msgid "Paste the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ç²?è´´"
 
-#: ../plugins/glade/plugin.c:4119
+#: ../plugins/glade/plugin.c:4129
 msgid "Delete the selection"
 msgstr "å? é?¤é??ä¸é?¨å??"
 
-#: ../plugins/glade/plugin.c:4297
+#: ../plugins/glade/plugin.c:4307
 msgid "Glade designer operations"
 msgstr "Glade è®¾è®¡å?¨æ??ä½?"
 
-#: ../plugins/glade/plugin.c:4397
+#: ../plugins/glade/plugin.c:4407
 msgid "Go back in undo history"
 msgstr "ä»?å??å?²ä¸å??é??"
 
-#: ../plugins/glade/plugin.c:4399
+#: ../plugins/glade/plugin.c:4409
 msgid "Go forward in undo history"
 msgstr "ä»?å??å?²ä¸å??è¿?"
 
-#: ../plugins/glade/plugin.c:4421
+#: ../plugins/glade/plugin.c:4431
 msgid "Glade Clipboard"
 msgstr "Glade å?ªè´´æ?¿"
 
-#: ../plugins/glade/plugin.c:4426
+#: ../plugins/glade/plugin.c:4436
 msgid "Widgets"
 msgstr "é?¨ä»¶"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4441
 msgid "Palette"
 msgstr "è°?è?²æ?¿"
 
-#: ../plugins/glade/plugin.c:4685
+#: ../plugins/glade/plugin.c:4695
 #, c-format
 msgid "Not local file: %s"
 msgstr "ä¸?æ?¯æ?¬å?°æ??ä»¶ï¼?%s"
 
-#: ../plugins/glade/plugin.c:4706
+#: ../plugins/glade/plugin.c:4716
 #, c-format
 msgid "Could not open %s"
 msgstr "æ? æ³?æ??å¼? %s"
 
-#: ../plugins/glade/plugin.c:4757
+#: ../plugins/glade/plugin.c:4767
 msgid "Could not create a new glade project."
 msgstr "æ? æ³?å??å»ºæ?°ç?? glade é¡¹ç?®ã??"
 
-#: ../plugins/glade/plugin.c:5027 ../plugins/glade/plugin.c:5052
+#: ../plugins/glade/plugin.c:5029 ../plugins/glade/plugin.c:5054
 msgid "Glade GUI Designer"
 msgstr "Glade GUI è®¾è®¡å?¨"
 
@@ -5805,7 +6279,9 @@ msgstr "Glade é¡¹ç?®â??%sâ??å·²ä¿?å?"
 
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
-msgid "Invalid glade file name"
+#, fuzzy
+#| msgid "Invalid glade file name"
+msgid "Invalid Glade file name"
 msgstr "é??æ³?ç?? glade æ??ä»¶å??ã??"
 
 #: ../plugins/gtodo/add_edit_item.c:99
@@ -5826,7 +6302,7 @@ msgid "Summary:"
 msgstr "æ¦?è¦?ï¼?"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "ç±»å?«ï¼?"
 
@@ -5867,8 +6343,8 @@ msgstr "å¼?å§?äº?ï¼?"
 #: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
 #: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
 #, c-format
-msgid "n/a"
-msgstr "n/a"
+msgid "N/A"
+msgstr ""
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
@@ -5876,27 +6352,31 @@ msgid "stopped:"
 msgstr "ç»?æ??äº?ï¼?"
 
 #: ../plugins/gtodo/callback.c:17
-msgid "You need to select a todo item before you can remove it"
+#, fuzzy
+#| msgid "You need to select a todo item before you can remove it"
+msgid "You need to select a to-do item before you can remove it"
 msgstr "å? é?¤å??é??è¦?é??æ?©ä¸?ä¸ªä»»å?¡é¡¹"
 
 #: ../plugins/gtodo/callback.c:20
-msgid "Are you sure you want to remove the selected todo item?"
+#, fuzzy
+#| msgid "Are you sure you want to remove the selected todo item?"
+msgid "Are you sure you want to remove the selected to-do item?"
 msgstr "æ?¨ç¡®å®?æ?³è¦?å? é?¤é??ä¸ç??ä»»å?¡é¡¹å??ï¼?"
 
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
-msgid "Remove"
-msgstr "å? é?¤"
-
 #: ../plugins/gtodo/callback.c:98
-#, c-format
-msgid "Are you sure you want to remove all the completed todo items?"
+#, fuzzy, c-format
+#| msgid "Are you sure you want to remove all the completed todo items?"
+msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤æ??æ??å·²å®?æ??ç??ä»»å?¡é¡¹å??ï¼?"
 
 #: ../plugins/gtodo/callback.c:99
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want to remove all the completed todo items in the "
+#| "category \"%s\"?"
 msgid ""
-"Are you sure you want to remove all the completed todo items in the category "
-"\"%s\"?"
+"Are you sure you want to remove all the completed to-do items in the "
+"category \"%s\"?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç±»å?«â??%sâ??ä¸æ??æ??å·²å®?æ??ç??ä»»å?¡é¡¹å??ï¼?"
 
 #: ../plugins/gtodo/export.c:47
@@ -5967,8 +6447,9 @@ msgid "Failed to read file"
 msgstr "è¯»å??æ??ä»¶å¤±è´¥"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
-#, c-format
-msgid "Failed to parse xml structure"
+#, fuzzy, c-format
+#| msgid "Failed to parse xml structure"
+msgid "Failed to parse XML structure"
 msgstr "è§£æ?? xml ç»?æ??å¤±è´¥"
 
 #: ../plugins/gtodo/libgtodo.c:646
@@ -6049,7 +6530,9 @@ msgid "Hide _Completed Items"
 msgstr "é??è??å·²å®?æ??ç??é¡¹ç?®(_C)"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
+#, fuzzy
+#| msgid "Hide completed todo items"
+msgid "Hide completed to-do items"
 msgstr "é??è??å·²å®?æ??ç??ä»»å?¡é¡¹"
 
 #: ../plugins/gtodo/plugin.c:83
@@ -6069,11 +6552,15 @@ msgid "Hide items without an end date"
 msgstr "é??è??æ? ç»?æ??æ?¥æ??ç??é¡¹ç?®"
 
 #: ../plugins/gtodo/plugin.c:122
-msgid "Tasks manager"
+#, fuzzy
+#| msgid "Tasks manager"
+msgid "Task manager"
 msgstr "ä»»å?¡ç®¡ç??å?¨"
 
 #: ../plugins/gtodo/plugin.c:128
-msgid "Tasks manager view"
+#, fuzzy
+#| msgid "Tasks manager view"
+msgid "Task manager view"
 msgstr "ä»»å?¡ç®¡ç??å?¨è§?å?¾"
 
 #: ../plugins/gtodo/plugin.c:134
@@ -6081,11 +6568,15 @@ msgid "Tasks"
 msgstr "ä»»å?¡"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+#, fuzzy
+#| msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "ä»»å?¡ç®¡ç??å?¨"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
+#, fuzzy
+#| msgid "Todo List Preferences"
+msgid "To-do List Preferences"
 msgstr "ä»»å?¡å??è¡¨é¦?é??é¡¹"
 
 #: ../plugins/gtodo/preferences.c:84
@@ -6134,11 +6625,15 @@ msgid_plural "Items that are due in the next %i days"
 msgstr[0] ""
 
 #: ../plugins/gtodo/preferences.c:168
-msgid "Misc"
-msgstr "æ??é¡¹"
+#, fuzzy
+#| msgid "Miscellaneous Data"
+msgid "Miscellaneous"
+msgstr "æ??é¡¹æ?°æ?®"
 
 #: ../plugins/gtodo/preferences.c:171
-msgid "Auto purge completed items"
+#, fuzzy
+#| msgid "Auto purge completed items"
+msgid "Auto-purge completed items"
 msgstr "è?ªå?¨æ¸?é?¤å·²å®?æ??ç??é¡¹ç?®"
 
 #. Translators: First part of the sentence "Purge items after %d days"
@@ -6152,7 +6647,9 @@ msgid "days."
 msgstr "å¤©å??æ¸?é?¤é¡¹ç?®ã??"
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
-msgid "Auto Purge"
+#, fuzzy
+#| msgid "Auto Purge"
+msgid "Auto-Purge"
 msgstr "è?ªå?¨æ¸?é?¤"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
@@ -6161,8 +6658,8 @@ msgstr "æ??é??"
 
 #: ../plugins/gtodo/preferences.c:218
 #, c-format
-msgid "Allow todo items to notifiy me when they are due in %i minute"
-msgid_plural "Allow todo items to notifiy me when they are due in %i minutes"
+msgid "Allow to-do items to notify me when they are due in %i minute"
+msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
 msgstr[0] ""
 
 #: ../plugins/gtodo/tasklists.c:10
@@ -6177,28 +6674,36 @@ msgstr "å??å»ºä»»å?¡å??è¡¨"
 msgid "No Date"
 msgstr "æ? æ?¥æ??"
 
-#: ../plugins/macro/anjuta-macro.ui.h:1
-msgid "<b>Macro details:</b>"
-msgstr "<b>å®?è¯¦ç»?ï¼?</b>"
-
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "<b>Macro text:</b>"
-msgstr "<b>å®?å??å®¹ï¼?</b>"
+msgid "Edit&#x2026;"
+msgstr ""
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "<b>Macros:</b>"
-msgstr "<b>å®?ï¼?</b>"
+#, fuzzy
+#| msgid "<b>Macro details:</b>"
+msgid "Macro details:"
+msgstr "<b>å®?è¯¦ç»?ï¼?</b>"
+
+#: ../plugins/macro/anjuta-macro.ui.h:4
+#, fuzzy
+#| msgid "<b>Macro text:</b>"
+msgid "Macro text:"
+msgstr "<b>å®?å??å®¹ï¼?</b>"
 
 #: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Edit..."
-msgstr "ç¼?è¾?..."
+#, fuzzy
+#| msgid "Macros"
+msgid "Macros:"
+msgstr "å®?"
 
 #: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "å¿«æ?·æ?¹å¼?ï¼?"
 
 #: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcut..."
+#, fuzzy
+#| msgid "Press macro shortcut..."
+msgid "Press macro shortcutâ?¦"
 msgstr "æ??ä¸?å®?å¿«æ?·é?®..."
 
 #: ../plugins/macro/macro-actions.c:134
@@ -6251,7 +6756,9 @@ msgid "Macros"
 msgstr "å®?"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
+#, fuzzy
+#| msgid "_Insert Macro..."
+msgid "_Insert Macroâ?¦"
 msgstr "æ??å?¥å®?(_I)..."
 
 #: ../plugins/macro/plugin.c:44
@@ -6259,7 +6766,9 @@ msgid "Insert a macro using a shortcut"
 msgstr "ä½¿ç?¨å¿«æ?·æ?¹å¼?æ??å?¥å®?"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
+#, fuzzy
+#| msgid "_Add Macro..."
+msgid "_Add Macroâ?¦"
 msgstr "æ·»å? å®?(_A)..."
 
 #: ../plugins/macro/plugin.c:51
@@ -6267,8 +6776,10 @@ msgid "Add a macro"
 msgstr "æ·»å? å®?"
 
 #: ../plugins/macro/plugin.c:56
-msgid "Macros..."
-msgstr "å®?..."
+#, fuzzy
+#| msgid "Macros"
+msgid "Macrosâ?¦"
+msgstr "å®?"
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -6278,76 +6789,84 @@ msgstr "æ·»å? /ç¼?è¾?/å? é?¤å®?"
 msgid "Macro operations"
 msgstr "å®?æ??ä½?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
-msgid "<b>Indicators</b>"
-msgstr "<b>æ??ç¤ºç¬¦</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
-msgid "<b>Message colors</b>"
-msgstr "<b>æ¶?æ?¯é¢?è?²</b>"
-
+#. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
-msgid "<b>Messages options</b>"
-msgstr "<b>æ¶?æ?¯é??é¡¹</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
-#| msgid "Signal"
 msgid "Diagonal"
 msgstr ""
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
 msgstr "é??è¯¯ä¿¡æ?¯æ??ç¤ºç¬¦æ ·å¼?ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Errors:"
 msgstr "é??è¯¯ï¼?"
 
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#, fuzzy
+#| msgid "<b>Indicators</b>"
+msgid "Indicators"
+msgstr "<b>æ??ç¤ºç¬¦</b>"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#, fuzzy
+#| msgid "<b>Message colors</b>"
+msgid "Message colors"
+msgstr "<b>æ¶?æ?¯é¢?è?²</b>"
+
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
+#, fuzzy
+#| msgid "<b>Messages options</b>"
+msgid "Messages options"
+msgstr "<b>æ¶?æ?¯é??é¡¹</b>"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Normal message indicator style:"
 msgstr "æ?®é??ä¿¡æ?¯æ??ç¤ºç¬¦æ ·å¼?ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of first characters to show:"
 msgstr "è¦?æ?¾ç¤ºç??é¦?å?ç¬¦æ?°ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Number of last characters to show:"
 msgstr "è¦?æ?¾ç¤ºç??æ?«å?ç¬¦æ?°ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
-#| msgid "Step _Out"
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
 msgstr "æ¥å?º(_O)"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#, fuzzy
+#| msgid "Tabs position:"
+msgid "Tab position:"
 msgstr "Tab ä½?ç½®ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
 msgid "Truncate long messages"
 msgstr "ç¼©ç?è¿?é?¿ç??ä¿¡æ?¯"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
-#| msgid "Underlined"
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Underline-Plain"
 msgstr "ä¸?å??çº¿"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
-#| msgid "Underlined"
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
 msgid "Underline-Squiggle"
 msgstr "ä¸?å??çº¿"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
-#| msgid "Underlined"
+#. text style in editor, TT is for typewriter text
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
 msgid "Underline-TT"
 msgstr "ä¸?å??çº¿"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
 msgid "Warning message indicator style:"
 msgstr "è¦å??ä¿¡æ?¯æ??ç¤ºç¬¦æ ·å¼?ï¼?"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:26
 msgid "Warnings:"
 msgstr "è¦å??ï¼?"
 
@@ -6468,15 +6987,21 @@ msgid "Patching %s using %s\n"
 msgstr "ä½¿ç?¨ %2$s ç»? %1$s æ??è¡¥ä¸?\n"
 
 #: ../plugins/patch/patch-plugin.c:209
-msgid "Patching...\n"
+#, fuzzy
+#| msgid "Patching...\n"
+msgid "Patchingâ?¦\n"
 msgstr "æ£å?¨æ??è¡¥ä¸?...\n"
 
 #: ../plugins/patch/patch-plugin.c:219
-msgid "Patching..."
+#, fuzzy
+#| msgid "Patching..."
+msgid "Patchingâ?¦"
 msgstr "æ£å?¨æ??è¡¥ä¸?..."
 
 #: ../plugins/patch/patch-plugin.c:224
-msgid "There are unfinished jobs, please wait until they are finished."
+#, fuzzy
+#| msgid "There are unfinished jobs, please wait until they are finished."
+msgid "There are unfinished jobs: please wait until they are finished."
 msgstr "ä»?æ??ä¸?äº?æ?ªå®?æ??ç??ä»»å?¡ï¼?è¯·ç?å??ç?´è?³å·¥ä½?å®?æ??"
 
 #: ../plugins/patch/patch-plugin.c:266
@@ -6519,17 +7044,23 @@ msgstr "å·¥å?·(_T)"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "è¡¥ä¸?(_P)..."
+#, fuzzy
+#| msgid "Patch"
+msgid "_Patchâ?¦"
+msgstr "è¡¥ä¸?"
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "è¡¥ä¸?æ??ä»¶/ç?®å½?"
 
 #: ../plugins/project-import/plugin.c:66
+#, fuzzy
+#| msgid ""
+#| "Generation of project file failed. Cannot find an appropriate project "
+#| "template to use. Please make sure your version of Anjuta is up to date."
 msgid ""
 "Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up to date."
+"template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr ""
 "é¡¹ç?®æ??ä»¶ç??æ??å¤±è´¥ã??æ?¾ä¸?å?°å??é??ç??é¡¹ç?®æ¨¡æ?¿ã??è¯·ç¡®è®¤æ?¨ä½¿ç?¨ç?? Anjuta æ?¯æ??æ?°ç??æ?¬ã??"
 
@@ -6539,16 +7070,23 @@ msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "æ??ä»¶â??%sâ??å·²å?å?¨ã??è¦?æ?¿æ?¢å®?å??ï¼?"
 
 #: ../plugins/project-import/plugin.c:134
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "A file named \"%s\" cannot be written: %s.  Check if you have write "
+#| "access to the project directory."
 msgid ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 msgstr "å??ä¸ºâ??%sâ??ç??æ??ä»¶ä¸?å?¯å??å?¥ï¼?%sã??æ£?æ?¥æ?¨æ?¯å?¦å?·æ??è¯¥é¡¹ç?®ç?®å½?ç??å??æ??é??ã??"
 
 #: ../plugins/project-import/plugin.c:204
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not find a valid project backend for the directory given (%s). "
+#| "Please select a different directory, or try upgrading to a newer version "
+#| "of Anjuta."
 msgid ""
-"Could not find a valid project backend for the directory given (%s). Please "
+"Could not find a valid project backend for the given directory (%s). Please "
 "select a different directory, or try upgrading to a newer version of Anjuta."
 msgstr ""
 "æ??å®?ç??ç?®å½?(%s)ä¸æ?¾ä¸?å?°æ??æ??ç??é¡¹ç?®å??ç«¯ã??è¯·é??æ?©ä¸?å??ç??ç?®å½?ï¼?æ??å°?è¯?å°? Anjuta å??çº§"
@@ -6556,37 +7094,43 @@ msgstr ""
 
 #: ../plugins/project-import/plugin.c:274
 #: ../plugins/project-import/plugin.c:330
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
 msgid ""
-"Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
+"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
 msgstr "æ??ä¾?ç?? uri â??%sâ??ä¸?è?½æ£?å?ºï¼?è¿?å??é??è¯¯ï¼?â??%sâ??"
 
 #: ../plugins/project-import/project-import.ui.h:1
-msgid "<b>Import options</b>"
-msgstr "<b>å¯¼å?¥é??é¡¹</b>"
-
-#: ../plugins/project-import/project-import.ui.h:2
-msgid "<b>Project name</b>"
-msgstr "<b>é¡¹ç?®å??ç§°</b>"
-
-#: ../plugins/project-import/project-import.ui.h:3
-#: ../plugins/project-wizard/templates/translatable-strings.h:33
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "ç?®ç??ï¼?"
 
-#: ../plugins/project-import/project-import.ui.h:4
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "Import from folder"
 msgstr "ä»?æ??ä»¶å¤¹å¯¼å?¥"
 
-#: ../plugins/project-import/project-import.ui.h:5
+#: ../plugins/project-import/project-import.ui.h:3
 msgid "Import from version control system"
 msgstr "ä»?ç??æ?¬æ?§å?¶ç³»ç»?ä¸å¯¼å?¥"
 
-#: ../plugins/project-import/project-import.ui.h:6
+#: ../plugins/project-import/project-import.ui.h:4
+#, fuzzy
+#| msgid "<b>Import options</b>"
+msgid "Import options"
+msgstr "<b>å¯¼å?¥é??é¡¹</b>"
+
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Location:"
 msgstr "ä½?ç½®ï¼?"
 
+#: ../plugins/project-import/project-import.ui.h:6
+#, fuzzy
+#| msgid "Project name:"
+msgid "Project name"
+msgstr "é¡¹ç?®å??ç§°ï¼?"
+
 #: ../plugins/project-import/project-import-dialog.c:292
 msgid "Import project"
 msgstr "å¯¼å?¥é¡¹ç?®"
@@ -6640,8 +7184,10 @@ msgid "_Group name:"
 msgstr "ç»?å??(_G)ï¼?"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶(_S)..."
+#, fuzzy
+#| msgid "Select file to add:"
+msgid "_Select file to addâ?¦"
+msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶ï¼?"
 
 #: ../plugins/project-manager/gbf-project-model.c:233
 #: ../plugins/project-manager/plugin.c:1301
@@ -6661,7 +7207,9 @@ msgstr "æ²¡æ??é¡¹ç?®è¢«å? è½½"
 
 #: ../plugins/project-manager/gbf-project-util.c:236
 #: ../plugins/project-manager/gbf-project-util.c:244
-msgid "Can not add group"
+#, fuzzy
+#| msgid "Can not add group"
+msgid "Cannot add group"
 msgstr "ä¸?è?½æ·»å? ç»?"
 
 #: ../plugins/project-manager/gbf-project-util.c:245
@@ -6670,7 +7218,9 @@ msgstr "æ²¡æ??é??ä¸ç?¶ç»?"
 
 #: ../plugins/project-manager/gbf-project-util.c:417
 #: ../plugins/project-manager/gbf-project-util.c:426
-msgid "Can not add target"
+#, fuzzy
+#| msgid "Can not add target"
+msgid "Cannot add target"
 msgstr "ä¸?è?½æ·»å? ç?®æ ?"
 
 #: ../plugins/project-manager/gbf-project-util.c:427
@@ -6678,12 +7228,16 @@ msgid "No group selected"
 msgstr "æ²¡æ??é??æ?©ç»?"
 
 #: ../plugins/project-manager/gbf-project-util.c:532
-msgid "Select sources..."
+#, fuzzy
+#| msgid "Select sources..."
+msgid "Select sourcesâ?¦"
 msgstr "é??æ?©æº?..."
 
 #: ../plugins/project-manager/gbf-project-util.c:772
 #: ../plugins/project-manager/gbf-project-util.c:779
-msgid "Can not add source files"
+#, fuzzy
+#| msgid "Can not add source files"
+msgid "Cannot add source files"
 msgstr "ä¸?è?½æ·»å? æº?æ??ä»¶"
 
 #: ../plugins/project-manager/gbf-project-util.c:780
@@ -6704,7 +7258,12 @@ msgid "Group properties"
 msgstr "ç»?å±?æ?§"
 
 #: ../plugins/project-manager/plugin.c:459
+#, fuzzy
 msgid "No properties available for this target"
+msgstr "æ²¡æ??è¿?ä¸ªä½?ç½®ç??å?°å?¾"
+
+#: ../plugins/project-manager/plugin.c:478
+msgid "Refreshing symbol treeâ?¦"
 msgstr ""
 
 #: ../plugins/project-manager/plugin.c:485
@@ -6713,27 +7272,39 @@ msgid "Failed to refresh project: %s"
 msgstr "é¡¹ç?®å?·æ?°å¤±è´¥ï¼?%s"
 
 #: ../plugins/project-manager/plugin.c:663
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to remove the following group from project?\n"
+#| "\n"
 msgid ""
-"Are you sure you want to remove the following group from project?\n"
+"Are you sure you want to remove the following group from the project?\n"
 "\n"
 msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?ç»?å??ï¼?\n"
 "\n"
 
 #: ../plugins/project-manager/plugin.c:664
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Group: %s\n"
+#| "\n"
+#| "The group will not be deleted from file system."
 msgid ""
 "Group: %s\n"
 "\n"
-"The group will not be deleted from file system."
+"The group will not be deleted from the file system."
 msgstr ""
 "ç»?ï¼?%s\n"
 "\n"
 "ç»?å°?ä¸?ä¼?ä»?æ??ä»¶ç³»ç»?ä¸å? é?¤ã??"
 
 #: ../plugins/project-manager/plugin.c:667
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to remove the following target from project?\n"
+#| "\n"
 msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
 msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?ç?®æ ?å??ï¼?\n"
@@ -6745,19 +7316,27 @@ msgid "Target: %s"
 msgstr "ç?®æ ?ï¼?%s"
 
 #: ../plugins/project-manager/plugin.c:671
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to remove the following source file from project?\n"
+#| "\n"
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
 "æ?¨ç??ç??è¦?ä»?é¡¹ç?®ä¸å? é?¤è¿?äº?æº?æ??ä»¶å??ï¼?\n"
 "\n"
 
 #: ../plugins/project-manager/plugin.c:672
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Source: %s\n"
+#| "\n"
+#| "The source file will not be deleted from file system."
 msgid ""
 "Source: %s\n"
 "\n"
-"The source file will not be deleted from file system."
+"The source file will not be deleted from the file system."
 msgstr ""
 "æº?æ??ä»¶ï¼?%s\n"
 "\n"
@@ -6795,8 +7374,10 @@ msgid "Refresh project manager tree"
 msgstr "å?·æ?°é¡¹ç?®ç®¡ç??å?¨æ ?"
 
 #: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "æ·»å? ç»?(_G)..."
+#, fuzzy
+#| msgid "Add _Group"
+msgid "Add _Groupâ?¦"
+msgstr "æ·»å? ç»?(_G)"
 
 #: ../plugins/project-manager/plugin.c:836
 #: ../plugins/project-manager/plugin.c:870
@@ -6804,8 +7385,10 @@ msgid "Add a group to project"
 msgstr "å??é¡¹ç?®æ·»å? ç»?"
 
 #: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "æ·»å? ç?®æ ?(_T)..."
+#, fuzzy
+#| msgid "Add _Target"
+msgid "Add _Targetâ?¦"
+msgstr "æ·»å? ç?®æ ?(_T)"
 
 #: ../plugins/project-manager/plugin.c:841
 #: ../plugins/project-manager/plugin.c:875
@@ -6813,8 +7396,10 @@ msgid "Add a target to project"
 msgstr "å??é¡¹ç?®æ·»å? ç?®æ ?"
 
 #: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "æ·»å? æº?æ??ä»¶(_S)..."
+#, fuzzy
+#| msgid "Add _Source File"
+msgid "Add _Source Fileâ?¦"
+msgstr "æ·»å? æº?æ??ä»¶(_S)"
 
 #: ../plugins/project-manager/plugin.c:846
 #: ../plugins/project-manager/plugin.c:865
@@ -6835,8 +7420,10 @@ msgid "Properties of group/target/source"
 msgstr "ç»?/ç?®æ ?/æº? å±?æ?§"
 
 #: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
-msgstr "æ·»å? å?°é¡¹ç?®(_A)"
+#, fuzzy
+#| msgid "Add to Project"
+msgid "_Add to Project"
+msgstr "æ·»å? è?³é¡¹ç?®"
 
 #: ../plugins/project-manager/plugin.c:870
 msgid "Add _Group"
@@ -6864,7 +7451,9 @@ msgid "Loading project: %s"
 msgstr "æ£å?¨è½½å?¥é¡¹ç?®ï¼?%s"
 
 #: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
+#, fuzzy
+#| msgid "Created project view..."
+msgid "Created project viewâ?¦"
 msgstr "å·²å??å»ºç??é¡¹ç?®è§?å?¾..."
 
 #: ../plugins/project-manager/plugin.c:1280
@@ -6888,7 +7477,9 @@ msgid "Project manager popup actions"
 msgstr "é¡¹ç?®ç®¡ç??å?¨å¼¹å?ºå¼?å?¨ä½?"
 
 #: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
+#, fuzzy
+#| msgid "Initializing Project..."
+msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??é¡¹ç?®..."
 
 #: ../plugins/project-manager/plugin.c:2644
@@ -6896,7 +7487,9 @@ msgid "Project Loaded"
 msgstr "é¡¹ç?®å·²è¢«è½½å?¥"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
-msgid "<b>Details</b>"
+#, fuzzy
+#| msgid "<b>Details</b>"
+msgid "Details"
 msgstr "<b>è¯¦ç»?ä¿¡æ?¯</b>"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
@@ -6904,10 +7497,6 @@ msgstr "<b>è¯¦ç»?ä¿¡æ?¯</b>"
 msgid "Error"
 msgstr "é??è¯¯"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
-msgid "Select project type"
-msgstr "é??æ?©é¡¹ç?®ç±»å??"
-
 #: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
 msgid "Warning"
 msgstr "è¦å??"
@@ -6931,12 +7520,12 @@ msgstr ""
 msgid "Project Type: %s\n"
 msgstr "é¡¹ç?®ç±»å??ï¼?%s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:377
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "å?¨ %s æ?¾ä¸?å?°é¡¹ç?®æ¨¡æ?¿"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:578
 #, c-format
 msgid ""
 "\n"
@@ -6945,41 +7534,44 @@ msgstr ""
 "\n"
 "â??%sâ??æ?¯å¿?å¡«ç??ã??è¯·å¡«ä¸?å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:590
-#, c-format
+#: ../plugins/project-wizard/druid.c:593
+#, fuzzy, c-format
+#| msgid ""
+#| "Field \"%s\" must start with a letter, a digit or an underscore and "
+#| "contains only letters, digits, underscore, minus and dot. Please fix it."
 msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contains "
+"Field \"%s\" must start with a letter, a digit or an underscore and contain "
 "only letters, digits, underscore, minus and dot. Please fix it."
 msgstr ""
 "â??%sâ??å?æ®µå¿?é¡»ä»¥å?æ¯?ã??æ?°å?å??ä¸?å??çº¿å¼?å¤´ï¼?å¹¶ä¸?å?ªè?½å??å?«å?æ¯?ã??æ?°å?ã??ä¸?å??çº¿ã??å??å?·å??"
 "è?±æ??å?¥å?·ã??è¯·æ?¹æ£ã??"
 
-#: ../plugins/project-wizard/druid.c:595
+#: ../plugins/project-wizard/druid.c:598
 #, c-format
 msgid "Unknown error."
 msgstr "æ?ªç?¥é??è¯¯ã??"
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:625
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
 "cannot be written. Do you want to continue?"
 msgstr "â??%sâ??ç?®å½?é??ç©ºã??å¦?æ??å?å?¨ä¸?è?½å??å?¥ç??æ??ä»¶ï¼?é¡¹ç?®å°?ä¼?å??å»ºå¤±è´¥ã??ä»?ç?¶è¦?ç»§ç»å??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:627
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "æ??ä»¶â??%sâ??å·²å?å?¨ã??æ?¯å?¦è¦?è¦?ç??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:655
+#: ../plugins/project-wizard/druid.c:658
 msgid "Invalid entry"
 msgstr "æ? æ??ç??æ?¡ç?®"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:669
 msgid "Dubious entry"
 msgstr "å?«ç³?ç??æ?¡ç?®"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:779
 #, c-format
 msgid ""
 "\n"
@@ -6988,7 +7580,7 @@ msgstr ""
 "\n"
 "ç¼ºå°?ç¨?åº?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:790
 #, c-format
 msgid ""
 "\n"
@@ -6997,7 +7589,7 @@ msgstr ""
 "\n"
 "ç¼ºå¤±è¿?äº?å??ï¼? %s."
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:798
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -7006,25 +7598,33 @@ msgstr ""
 "å??å»ºè¿?ä¸ªé¡¹ç?®æ??é??ç??ä¸?äº?é??è¦?ç¨?åº?æ??å¼?å??å??ç¼ºå¤±ã??è¯·å?¨ç??æ??é¡¹ç?®ä¹?å??ç¡®è®¤ä»?ä»¬æ?¯å?¦è¢«æ£"
 "ç¡®ç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:804
+#, fuzzy
+#| msgid ""
+#| "The missing programs are usually part of some distrubution packages and "
+#| "can be searched in your Application Manager. Similarly, the development "
+#| "packages are contained in special packages that your distribution provide "
+#| "to allow development of projects based on them. They usually end with -"
+#| "dev or -devel suffix in package names and can be found by searching in "
+#| "your Application Manager."
 msgid ""
 "The missing programs are usually part of some distrubution packages and can "
-"be searched in your Application Manager. Similarly, the development packages "
-"are contained in special packages that your distribution provide to allow "
-"development of projects based on them. They usually end with -dev or -devel "
-"suffix in package names and can be found by searching in your Application "
-"Manager."
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"dev\" or \"-devel\" suffix in package names and can be found by searching in "
+"your Application Manager."
 msgstr ""
 "ç¼ºå°?ç??ç¨?åº?é??å¸¸æ?¯æ??äº?å??è¡?ç??è½¯ä»¶å??ç??ä¸?é?¨å??ï¼?å?¯ä»¥å?¨åº?ç?¨ç¨?åº?ç®¡ç??å?¨ä¸æ??ç´¢å?°ã??å??"
 "æ ·ï¼?å¼?å??å??ä¹?ä¼?å??å?«å?¨å??è¡?ç??æ??æ??ä¾?ç??å?¯ä»¥å?ºäº?ä»?ä»¬å¼?å??é¡¹ç?®ç??ç?¹æ®?è½¯ä»¶å??ä¸ã??å®?ä»¬ç??"
 "å??å??ä¸?è?¬ä¼?ä»¥ -dev æ?? -devel å??ç¼?ç»?å°¾ï¼?å¹¶ä¸?å?¯ä»¥å?¨åº?ç?¨ç¨?åº?ç®¡ç??å?¨ä¸é??è¿?æ??ç´¢æ?¾"
 "å?°ã??"
 
-#: ../plugins/project-wizard/druid.c:809
+#: ../plugins/project-wizard/druid.c:812
 msgid "Missing components"
 msgstr "ç¼ºå°?ç»?ä»¶"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:944
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr ""
@@ -7043,18 +7643,21 @@ msgid "Skipping %s: file already exists"
 msgstr "è·³è¿? %sï¼?æ??ä»¶å·²å?å?¨"
 
 #: ../plugins/project-wizard/install.c:503
-#, c-format
-msgid "Creating %s ... Fail to create directory"
+#, fuzzy, c-format
+#| msgid "Creating %s ... Fail to create directory"
+msgid "Creating %s â?¦ Failed to create directory"
 msgstr "æ£å?¨å??å»º %s ... å??å»ºç?®å½?å¤±è´¥"
 
 #: ../plugins/project-wizard/install.c:519
-#, c-format
-msgid "Creating %s (using AutoGen)... %s"
+#, fuzzy, c-format
+#| msgid "Creating %s (using AutoGen)... %s"
+msgid "Creating %s (using AutoGen)â?¦ %s"
 msgstr "æ£å?¨(ä½¿ç?¨ AutoGen)å??å»º %s ... %s"
 
 #: ../plugins/project-wizard/install.c:524
-#, c-format
-msgid "Creating %s ... %s"
+#, fuzzy, c-format
+#| msgid "Creating %s ... %s"
+msgid "Creating %s â?¦ %s"
 msgstr "æ£å?¨å??å»º %s ... %s"
 
 #. The %s is a name of a unix command line, by example
@@ -7082,14 +7685,12 @@ msgid "Select file"
 msgstr "é??æ?©æ??ä»¶"
 
 #: ../plugins/project-wizard/property.c:359 ../plugins/tools/editor.c:522
-#| msgid "Select package"
 msgid "Select an Image File"
 msgstr "é??æ?©ä¸?ä¸ªå?¾å??æ??ä»¶"
 
 #: ../plugins/project-wizard/property.c:384
 #: ../plugins/project-wizard/property.c:474 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
-#| msgid "Choose directory"
 msgid "Choose Icon"
 msgstr "é??æ?©å?¾æ ?"
 
@@ -7126,7 +7727,9 @@ msgid "A generic Xlib project"
 msgstr "é??ç?¨ Xlib é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:7
-msgid "A generic java project using automake project management"
+#, fuzzy
+#| msgid "A generic java project using automake project management"
+msgid "A generic Java project using automake project management"
 msgstr "ä½¿ç?¨ automake ç®¡ç??ç??é??ç?¨ java é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:8
@@ -7134,8 +7737,11 @@ msgid "A generic minimal and flat project"
 msgstr "é??ç?¨æ??å°?å??ç??é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:9
+#, fuzzy
+#| msgid ""
+#| "A generic natively compiled java project using the GNU Java Compiler (gcj)"
 msgid ""
-"A generic natively compiled java project using the GNU Java Compiler (gcj)"
+"A generic natively compiled Java project using the GNU Java Compiler (gcj)"
 msgstr "ä½¿ç?¨ GNU Java ç¼?è¯?å?¨(gcj)è¿?è¡?æ?¬å?°ç¼?è¯?ç??é??ç?¨ java é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:10
@@ -7143,11 +7749,15 @@ msgid "A generic project"
 msgstr "é??ç?¨é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:11
-msgid "A generic python project using automake project management"
+#, fuzzy
+#| msgid "A generic python project using automake project management"
+msgid "A generic Python project using automake project management"
 msgstr "ä½¿ç?¨ automake ç®¡ç??ç??é??ç?¨ python é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wx Widgets project"
+#, fuzzy
+#| msgid "A generic wx Widgets project"
+msgid "A generic wxWidgets project"
 msgstr "é??ç?¨ wx Widgets é¡¹ç?®"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:13
@@ -7206,7 +7816,7 @@ msgstr "Berkeley Software Distribution License (BSD)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:27
 msgid ""
-"Comma separated, other plugins that this plugin depends on. It could be "
+"Comma-separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 msgstr ""
 
@@ -7219,86 +7829,97 @@ msgid "Configure external packages:"
 msgstr "é??ç½®å¤?é?¨å??ï¼?"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:30
-msgid "Create a template glade interface file"
-msgstr "å??å»ºä¸?ä¸ª glade ç??é?¢æ??ä»¶æ¨¡æ?¿"
+#, fuzzy
+#| msgid "Create Gtk Builder interface file"
+msgid "Create GtkBuilder interface file"
+msgstr "å??å»ºGTKç??æ??å?¨ç??é?¢æ??ä»¶"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:31
-msgid "Create glade interface file"
-msgstr "å??å»º glade ç??é?¢æ??ä»¶"
+#: ../plugins/project-wizard/templates/translatable-strings.h:32
+#, fuzzy
+#| msgid "Create a template glade interface file"
+msgid "Create a template GtkBuilder interface file"
+msgstr "å??å»ºä¸?ä¸ª glade ç??é?¢æ??ä»¶æ¨¡æ?¿"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/project-wizard/templates/translatable-strings.h:35
 msgid "Display description of the applet"
 msgstr "æ?¾ç¤ºå°?ç¨?åº?ç??æ??è¿°"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
+#: ../plugins/project-wizard/templates/translatable-strings.h:36
 msgid "Display description of the plugin"
 msgstr "æ?¾ç¤ºæ??ä»¶ç??æ??è¿°"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
+#: ../plugins/project-wizard/templates/translatable-strings.h:37
 msgid "Display title of the applet"
 msgstr "æ?¾ç¤ºå°?ç¨?åº?ç??æ ?é¢?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
+#: ../plugins/project-wizard/templates/translatable-strings.h:38
 msgid "Display title of the plugin"
 msgstr "æ?¾ç¤ºæ??ä»¶æ ?é¢?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
+#: ../plugins/project-wizard/templates/translatable-strings.h:39
 msgid "Django Project"
 msgstr "Django é¡¹ç?®"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
+#: ../plugins/project-wizard/templates/translatable-strings.h:40
 msgid "Django Project information"
 msgstr "Django é¡¹ç?®ä¿¡æ?¯ "
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
+#: ../plugins/project-wizard/templates/translatable-strings.h:41
 msgid "Email address:"
 msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
+#: ../plugins/project-wizard/templates/translatable-strings.h:42
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ é??è¦?ç?¥é??å?ªä¸?ä¸ªç±»ä¸å?«æ?? main() å?½æ?°"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
+#: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "GNOME Applet"
 msgstr "GNOME å°?ç¨?åº?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "General Project Information"
 msgstr "é¡¹ç?®å¸¸è§?ä¿¡æ?¯"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "Generic"
 msgstr "é??ç?¨"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "Generic (Minimal)"
 msgstr "é??ç?¨ (Minimal)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic C++"
 msgstr "é??ç?¨ C++"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
-msgid "Generic gcj compiled java"
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
+#, fuzzy
+#| msgid "Generic gcj compiled java"
+msgid "Generic gcj compiled Java"
 msgstr "é??ç?¨ gcj ç¼?è¯?ç?? java"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
-msgid "Generic java (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
+#, fuzzy
+#| msgid "Generic java (automake)"
+msgid "Generic Java (automake)"
 msgstr "é??ç?¨ java (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
-msgid "Generic python (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#, fuzzy
+#| msgid "Generic python (automake)"
+msgid "Generic Python (automake)"
 msgstr "é??ç?¨ python (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
+#: ../plugins/project-wizard/templates/translatable-strings.h:54
 msgid ""
 "Give a package name that your project require. You may also mention what is "
 "the required version of the package. For example, 'libgnomeui-2.0' or "
@@ -7307,214 +7928,236 @@ msgstr ""
 "ç»?å?ºæ?¨ç??é¡¹ç?®æ??é??è¦?ç??å??å??ã??æ?¨è¿?å?¯ä»¥æ??å?ºå??ç??ç??æ?¬ã??ä¾?å¦?ï¼? â??libgnomeui-"
 "2.0â??æ??â??libgnomeui-2.0 >= 2.2.0â??"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
 msgid "Icon File:"
 msgstr "å?¾æ ?æ??ä»¶ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
 msgid "Icon file for the plugin"
 msgstr "æ??ä»¶ç??å?¾æ ?æ??ä»¶"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#, fuzzy
 msgid "Implement plugin interfaces"
-msgstr ""
+msgstr "é??ç½®ç½?ç»?æ?¥å?£"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#, fuzzy
 msgid "Interface implemented by the plugin"
-msgstr ""
+msgstr "æ?ªæ??å®?æ??ä»¶ %s ç±»å??"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Interface:"
 msgstr "ç??é?¢ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "License"
 msgstr "è®¸å?¯"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Main Class:"
-msgstr ""
+msgstr "ä¸»ç±»ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
 msgid "Main class"
-msgstr ""
+msgstr "ä¸»ç±»"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
 msgid "Makefile project"
 msgstr "Makefile é¡¹ç?®"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "Makefile-based project"
 msgstr "å?ºäº? Makefile ç??é¡¹ç?®"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Mininum SDL version required"
 msgstr "SDL ç??æ??ä½?ç??æ?¬é??æ±?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#, fuzzy
 msgid "Name of the value to watch"
-msgstr ""
+msgstr "è®¡ç®?æ?¾ç¤ºå?¼ç?? e æ¬¡æ?¹ [N]"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "No license"
 msgstr "æ? è®¸å?¯"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Options for project build system"
 msgstr "é¡¹ç?®å??å»ºç³»ç»?é??é¡¹"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Plugin Class Name:"
 msgstr "* ç±»å??ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "Plugin Dependencies:"
 msgstr "æ??ä»¶ä¾?èµ?ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
 msgid "Plugin Description:"
 msgstr "æ??ä»¶æ??è¿°ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
 msgid "Plugin Title:"
 msgstr "æ??ä»¶æ ?é¢?ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
 msgid "Plugin class name"
 msgstr "æ??ä»¶ç®¡ç??å?¨"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
-msgid "Plugin has menus or/and toolbars"
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#, fuzzy
+#| msgid "Plugin has menus or/and toolbars"
+msgid "Plugin has menus and/or toolbars"
 msgstr "æ??ä»¶å¸¦æ??è??å?? æ??/å?? å·¥å?·æ?¡"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#, fuzzy
 msgid "Plugin interfaces to implement"
-msgstr ""
+msgstr "æ? æ³?å°?æ??ä»¶å¤?å?¶å?° â??%sâ??ã??"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Project Name:"
 msgstr "é¡¹ç?®å??ç§°ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
-msgid "Project directory, output file etc."
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#, fuzzy
+#| msgid "Project directory, output file etc."
+msgid "Project directory, output file, etc."
 msgstr "é¡¹ç?®ç?®å½?ï¼?è¾?å?ºæ??ä»¶ç?ã??"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Project directory:"
 msgstr "é¡¹ç?®ç?®å½?ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#, fuzzy
+#| msgid ""
+#| "Project name must not contain spaces, because it will be the name of the "
+#| "project build target (executable, library etc.)"
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
+"project build target (executable, library, etc.)"
 msgstr ""
 "é¡¹ç?®å??ç§°ä¸?è?½å??å?«ç©ºæ ¼ï¼?å? ä¸ºå®?å??æ ·æ?¯é¡¹ç?®å??å»ºç?®æ ?ç??å??ç§°(å?¯æ?§è¡?æ??ä»¶ï¼?åº?ç?ã??)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
 msgid "Project name:"
 msgstr "é¡¹ç?®å??ç§°ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Project options"
 msgstr "é¡¹ç?®é??é¡¹"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
-msgid "Python webproject using Django Web Framework"
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#, fuzzy
+#| msgid "Python webproject using Django Web Framework"
+msgid "Python web project using Django Web Framework"
 msgstr "ä½¿ç?¨ Django webæ¡?æ?¶ç?? Python webé¡¹ç?® "
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
 msgid "Require Package:"
 msgstr "é??è¦?å??ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid "Require SDL version:"
 msgstr "é??è¦? SDL ç??æ?¬ï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid "Require SDL_gfx library"
 msgstr "é??è¦? SDL_gfx åº?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Require SDL_gfx:"
 msgstr "é??è¦? SDL_gfxï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
 msgid "Require SDL_image library"
 msgstr "é??è¦? SDL_image åº?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
 msgid "Require SDL_image:"
 msgstr "é??è¦? SDL_imageï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require SDL_mixer library"
 msgstr "é??è¦? SDL_mixer åº?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL_mixer:"
 msgstr "é??è¦? SDL_mixerï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_net library"
 msgstr "é??è¦? SDL_net åº?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_net:"
 msgstr "é??è¦? SDL_netï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_ttf library"
 msgstr "é??è¦? SDL_ttf åº?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_ttf:"
 msgstr "é??è¦? SDL_ttfï¼?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Select code license"
 msgstr "é??æ?©ä»£ç ?è®¸å?¯"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#, fuzzy
 msgid "Shell values to watch"
-msgstr ""
+msgstr "æ?¢å¤?é»?è®¤å?¼"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Use pkg-config to add library support from other packages"
 msgstr ""
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#, fuzzy
 msgid "Value Name:"
-msgstr ""
+msgstr "å??ç§°ï¼?å?¼"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#, fuzzy
 msgid "Values to watch"
-msgstr ""
+msgstr "æ?¢å¤?é»?è®¤å?¼"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
 msgid "Whether the plugin has menus or toolbars"
 msgstr "æ??ä»¶æ?¯å?¦æ??è??å??æ??å·¥å?·æ ?"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
-msgid "Wx Widgets"
-msgstr "Wx Widgets"
-
 #: ../plugins/project-wizard/templates/translatable-strings.h:104
+#, fuzzy
+#| msgid "Widgets"
+msgid "wxWidgets"
+msgstr "é?¨ä»¶"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Xlib dock"
 msgstr "Xlib dock"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
-msgid "gtk-doc is used to compile API documentations for GObject based classes"
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#, fuzzy
+#| msgid ""
+#| "gtk-doc is used to compile API documentations for GObject based classes"
+msgid "gtk-doc is used to compile API documentation for GObject-based classes"
 msgstr "gtk-doc æ?¯ç?¨æ?¥ä¸ºå?ºäº? GObject ç??ç±»ç¼?è¯? API æ??æ¡£ç??"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "project name"
 msgstr "é¡¹ç?®å??ç§°"
 
@@ -7535,18 +8178,13 @@ msgid "Program:"
 msgstr "ç¨?åº?ï¼?"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:6
-msgid "Run In Terminal"
+msgid "Run in Terminal"
 msgstr "å?¨ç»?ç«¯ä¸è¿?è¡?"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "å·¥ä½?ç?®å½?ï¼?"
 
-#: ../plugins/run-program/execute.c:76
-#, c-format
-msgid "Program '%s' does not exist"
-msgstr "ç¨?åº?â??%sâ??ä¸?å?å?¨"
-
 #. Only local directory are supported
 #: ../plugins/run-program/execute.c:107
 #, c-format
@@ -7557,10 +8195,10 @@ msgstr "ç¨?åº?ç?®å½?â??%sâ??æ??ä»¶ä¸?æ?¯æ?¬å?°è·¯å¾?"
 msgid "Load Target to run"
 msgstr "å? è½½è°?è¯?ç?®æ ?"
 
-#: ../plugins/run-program/parameters.c:749
-#: ../plugins/search/search_preferences.c:534
-msgid "Name"
-msgstr "å??ç§°"
+#: ../plugins/run-program/parameters.c:616
+#, c-format
+msgid "Missing file %s"
+msgstr "ç¼ºå°?æ??ä»¶ %s"
 
 #: ../plugins/run-program/plugin.c:191
 msgid ""
@@ -7594,11 +8232,15 @@ msgid "Kill program"
 msgstr "æ??æ»ç¨?åº?"
 
 #: ../plugins/run-program/plugin.c:253
-msgid "Program Parameters..."
-msgstr "ç¨?åº?å??æ?°..."
+#, fuzzy
+#| msgid "Program Parameters"
+msgid "Program Parametersâ?¦"
+msgstr "ç¨?åº?å??æ?°"
 
 #: ../plugins/run-program/plugin.c:255
-msgid "Set current program, arguments and so on"
+#, fuzzy
+#| msgid "Set current program, arguments and so on"
+msgid "Set current program, arguments, etc."
 msgstr "è®¾ç½®å½?å??ç¨?åº?ã??å??æ?°ç?"
 
 #: ../plugins/run-program/plugin.c:280
@@ -7606,156 +8248,165 @@ msgid "Run operations"
 msgstr "è¿?è¡?æ??ä½?"
 
 #: ../plugins/search/anjuta-search.ui.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>å?¨ä½?</b>"
+#, fuzzy
+#| msgid "Action"
+msgid "Actions"
+msgstr "å?¨ä½?"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-msgid "<b>File Filter</b>"
-msgstr "<b>æ??ä»¶è¿?æ»¤å?¨</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:4
-msgid "<b>Parameters</b>"
-msgstr "<b>å??æ?°</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:5
-msgid "<b>Scope</b>"
-msgstr "é??é¡¹"
-
-#: ../plugins/search/anjuta-search.ui.h:6
-msgid "<b>Search variable</b>"
-msgstr "<b>æ??ç´¢å??é??</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:7
 #: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "å??å??"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:3
 msgid "Basic Search & Replace"
 msgstr "å?ºæ?¬æ?¥æ?¾å??æ?¿æ?¢"
 
-#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "é??æ?©ç?®å½?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:10
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Choose Files:"
 msgstr "é??æ?©æ??ä»¶ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
 msgstr "å?¨å¼?ç?¨å??æ?©å±?æ£å??è¡¨è¾¾å¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:7
+#, fuzzy
+#| msgid "<b>File Filter</b>"
+msgid "File Filter"
+msgstr "<b>æ??ä»¶è¿?æ»¤å?¨</b>"
+
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Find & Replace"
 msgstr "æ?¥æ?¾å¹¶æ?¿æ?¢"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:9
 #: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "å??å??"
 
 #. the order of these matters - it must match the order of the corresponding
 #. radio buttons on another page
-#: ../plugins/search/anjuta-search.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:10
 #: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
-msgstr ""
+msgstr "å®?æ?´ç¼?å?²å?º"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Greedy matching"
-msgstr "è´ªå©ªå¼?å?¹é??"
+msgstr "è´ªå©ªå?¹é??"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Binary Files"
 msgstr "å¿½ç?¥äº?è¿?å?¶æ??ä»¶"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Directories:"
 msgstr "å¿½ç?¥ç?®å½?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Files:"
 msgstr "å¿½ç?¥æ??ä»¶ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Directories"
 msgstr "å¿½ç?¥é??è??ç?®å½?"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Hidden Files"
 msgstr "å¿½ç?¥é??è??æ??ä»¶"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match at start of word"
 msgstr "å?¹é??è¯?é¦?"
 
-#: ../plugins/search/anjuta-search.ui.h:23
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete lines"
 msgstr "å?¹é??æ?´è¡?"
 
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Match complete words"
 msgstr "å?¹é??æ?´ä¸ªå??è¯?"
 
-#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Maximum Actions"
 msgstr "æ??å¤?å?¨ä½?æ?°"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "New Name:"
 msgstr "æ?°å??ç§°ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "No Limit"
 msgstr "æ? é??å?¶"
 
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
+#, fuzzy
+#| msgid "Parameters:"
+msgid "Parameters"
+msgstr "å??æ?°ï¼?"
+
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Regular expression"
 msgstr "æ£å??è¡¨è¾¾å¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Replace With:"
 msgstr "æ?¿æ?¢ä¸ºï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Action:"
 msgstr "æ??ç´¢å?¨ä½?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:32
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Direction:"
 msgstr "æ??ç´¢æ?¹å??ï¼?"
 
+#. This is "the search expression" (noun)
 #: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "æ??ç´¢è¡¨è¾¾å¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:34
+#. This is "the search expression" (noun)
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Expression:"
 msgstr "æ??ç´¢è¡¨è¾¾å¼?ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search In:"
 msgstr "æ??ç´¢è??å?´ï¼?"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Recursively"
 msgstr "é??å½?æ??ç´¢"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Target"
 msgstr "æ??ç´¢ç?®æ ?"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#. User can select variables that contain lists of files, so this is a combined noun
+#: ../plugins/search/anjuta-search.ui.h:40
+#, fuzzy
+#| msgid "<b>Search variable</b>"
+msgid "Search variable"
+msgstr "<b>æ??ç´¢å??é??</b>"
+
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Setting"
 msgstr "è®¾ç½®"
 
 #: ../plugins/search/plugin.c:68
-msgid "_Find..."
+#, fuzzy
+#| msgid "_Find..."
+msgid "_Findâ?¦"
 msgstr "æ?¥æ?¾(_F)..."
 
 #: ../plugins/search/plugin.c:69
@@ -7775,7 +8426,9 @@ msgid "Find _Previous"
 msgstr "æ?¥æ?¾ä¸?ä¸?ä¸ª(_P)"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
+#, fuzzy
+#| msgid "Find and R_eplace..."
+msgid "Find and R_eplaceâ?¦"
 msgstr "æ?¥æ?¾å¹¶æ?¿æ?¢(_E)..."
 
 #: ../plugins/search/plugin.c:80
@@ -7788,7 +8441,9 @@ msgid "Search and Replace"
 msgstr "æ?¥æ?¾å??æ?¿æ?¢"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
+#, fuzzy
+#| msgid "Fin_d in Files..."
+msgid "Fin_d in Filesâ?¦"
 msgstr "å?¨å¤?ä¸ªæ??ä»¶ä¸æ?¥æ?¾(_D)..."
 
 #: ../plugins/search/plugin.c:86
@@ -7796,8 +8451,10 @@ msgid "Search for a string in multiple files or directories"
 msgstr "å?¨å¤?ä¸ªæ??ä»¶æ??ç?®å½?å??æ??ç´¢æ??å®?å?ç¬¦ä¸²"
 
 #: ../plugins/search/plugin.c:102
-msgid "Searching..."
-msgstr "æ??ç´¢ä¸..."
+#, fuzzy
+#| msgid "Searching"
+msgid "Searchingâ?¦"
+msgstr "æ??ç´¢"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
@@ -7805,7 +8462,7 @@ msgstr "å?ºæ?¬æ??ç´¢"
 
 #: ../plugins/search/search-replace.c:97
 msgid "Current Buffer"
-msgstr ""
+msgstr "å½?å??ç¼?å?²å?º"
 
 #: ../plugins/search/search-replace.c:98
 msgid "Current Selection"
@@ -7869,39 +8526,44 @@ msgstr "æ?¿æ?¢"
 msgid "Search complete"
 msgstr "æ??ç´¢å®?æ??"
 
-#: ../plugins/search/search-replace.c:1037
-#: ../plugins/search/search-replace.c:1724
+#: ../plugins/search/search-replace.c:1044
+#: ../plugins/search/search-replace.c:1731
 msgid "Replace All"
 msgstr "æ?¿æ?¢æ??æ??"
 
-#: ../plugins/search/search-replace.c:1076
+#: ../plugins/search/search-replace.c:1083
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "æ?¾ä¸?å?°æ»¡è¶³æ?¡ä»¶â??%sâ??ç??å?¹é??ã??æ?¯å?¦è¦?ä»?æ??æ¡£å¤´å¼?å§?å¯»æ?¾ï¼?"
 
-#: ../plugins/search/search-replace.c:1096
+#: ../plugins/search/search-replace.c:1103
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "æ?¾ä¸?å?°æ»¡è¶³æ?¡ä»¶â??%sâ??ç??å?¹é??ã??"
 
-#: ../plugins/search/search-replace.c:1111
+#: ../plugins/search/search-replace.c:1118
 msgid "The maximum number of results has been reached."
 msgstr "å·²ç»?è¾¾å?°æ??å¤§ç??ç»?æ??æ?°ç?®"
 
-#: ../plugins/search/search-replace.c:1124
+#: ../plugins/search/search-replace.c:1131
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
 msgstr[0] "%d ä¸ªå?¹é??é¡¹è¢«æ?¿æ?¢ã??"
 
-#: ../plugins/search/search-replace.c:1291
-msgid "Unable to build user interface for Search And Replace"
+#: ../plugins/search/search-replace.c:1298
+#, fuzzy
+#| msgid "Unable to build user interface for Search And Replace"
+msgid "Unable to build user interface for Search and Replace"
 msgstr "æ? æ³?ä¸ºæ??ç´¢å??æ?¿æ?¢ç??æ??ç?¨æ?·ç??é?¢"
 
 #: ../plugins/sourceview/sourceview.c:364
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "The file '%s' on the disk is more recent than the current buffer.\n"
+#| "Do you want to reload it?"
 msgid ""
-"The file '%s' on the disk is more recent than the current buffer.\n"
+"The file \"%s\" on the disk is more recent than the current buffer.\n"
 "Do you want to reload it?"
 msgstr ""
 "è¦å??ï¼?å?¨ç£?ç??å??æ??ä»¶ \"%s\" ç??å??å®¹æ¯?å½?å??\n"
@@ -7909,9 +8571,12 @@ msgstr ""
 "æ?¯å?¦é??è¦?é??æ?°è½½å?¥è¿?ä¸ªæ??ä»¶ï¼? "
 
 #: ../plugins/sourceview/sourceview.c:401
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "The file '%s' has been deleted on the disk.\n"
+#| "Do you want to close it?"
 msgid ""
-"The file '%s' has been deleted on the disk.\n"
+"The file \"%s\" has been deleted on the disk.\n"
 "Do you want to close it?"
 msgstr ""
 "æ??ä»¶â??%sâ??å·²ç»?å?¨ç£?ç??ä¸?å? é?¤ã??\n"
@@ -7924,8 +8589,9 @@ msgid "Could not open %s: %s"
 msgstr "æ? æ³?æ??å¼? %sï¼? %s"
 
 #: ../plugins/sourceview/sourceview.c:492
-#, c-format
-msgid "The file '%s' is read-only! Edit anyway?"
+#, fuzzy, c-format
+#| msgid "The file '%s' is read-only! Edit anyway?"
+msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æ??ä»¶â??%sâ??æ?¯å?ªè¯»ç??ï¼?ä»?ç?¶è¦?ç¼?è¾?å??ï¼?"
 
 #. Could not open <filename>: <error message>
@@ -7934,12 +8600,12 @@ msgstr "æ??ä»¶â??%sâ??æ?¯å?ªè¯»ç??ï¼?ä»?ç?¶è¦?ç¼?è¾?å??ï¼?"
 msgid "Could not save %s: %s"
 msgstr "æ? æ³?ä¿?å? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview-io.c:274
+#: ../plugins/sourceview/sourceview-io.c:273
 #, c-format
 msgid "Could not save file because filename not yet specified"
 msgstr "æ? æ³?ä¿?å?æ??ä»¶ï¼?æ?ªæ??å®?æ??ä»¶å??"
 
-#: ../plugins/sourceview/sourceview-io.c:504
+#: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
 msgid "New file %d"
 msgstr "æ?°å»ºæ??ä»¶ %d"
@@ -7970,23 +8636,23 @@ msgstr "å?³é?å½?å??æ??ä»¶"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
 msgid "Highlight matching brackets"
-msgstr ""
+msgstr "é«?äº®å?¹é??æ?¬å?·"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
 msgid "Highlight syntax"
 msgstr "é«?äº®æ ·å¼?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
-#| msgid "<b>Indentation and auto-format options</b>"
 msgid "Indentation and auto-format options"
 msgstr "<b>ç¼©è¿?å??è?ªå?¨æ ¼å¼?å??é??é¡¹</b>"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
-msgid "Print Linenumbers"
+#, fuzzy
+#| msgid "Print Linenumbers"
+msgid "Print line numbers"
 msgstr "æ??å?°è¡?å?·(_G)"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
-#| msgid "Project options"
 msgid "Print options"
 msgstr "æ??å?°é??é¡¹"
 
@@ -8003,8 +8669,9 @@ msgid "Printing"
 msgstr "æ£å?¨æ??å?°"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
+#, fuzzy
 msgid "Right margin position in characters"
-msgstr ""
+msgstr "å?³è¾¹è·?ç??å®½åº¦(å??ç´ )"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Show line numbers"
@@ -8012,11 +8679,11 @@ msgstr "æ?¾ç¤ºè¡?å?·"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Show marks"
-msgstr ""
+msgstr "æ?¾ç¤ºæ ?è®°"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
 msgid "Show right margin"
-msgstr ""
+msgstr "æ?¾ç¤ºå?³è¾¹è·?"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
 msgid "Tab size in spaces:"
@@ -8065,7 +8732,9 @@ msgid "Anjuta Manual"
 msgstr "Anjuta ç?¨æ?·æ??å??"
 
 #: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
+#, fuzzy
+#| msgid "Gnome Online API Documentation"
+msgid "GNOME Online API Documentation"
 msgstr "Gnome å?¨çº¿ API æ??æ¡£"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
@@ -8073,7 +8742,6 @@ msgid "Add file/directory"
 msgstr "æ·»å? æ??ä»¶/ç?®å½?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:2
-#| msgid "<b>Branch/Tag URL:</b>"
 msgid "Branch/Tag URL:"
 msgstr "<b>å??æ?¯/æ ?ç¾ URLï¼?</b>"
 
@@ -8094,22 +8762,18 @@ msgid "Diff to Previous"
 msgstr "ä¸?å??ä¸?ä¸ªæ¯?è¾?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:15
-#| msgid "Revision:"
 msgid "End Revision:"
 msgstr "ä¿®è®¢ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:16
-#| msgid "<b>File or directory to diff:</b>"
 msgid "File or directory to diff:"
 msgstr "<b>è¦?æ¯?è¾?ç??æ??ä»¶æ??ç?®å½?ï¼?</b>"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:17
-#| msgid "<b>File/URL to Remove:</b>"
 msgid "File/URL to Remove:"
 msgstr "<b>è¦?å? é?¤ç?? æ??ä»¶/URLï¼?</b>"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:18
-#| msgid "<b>First Path:</b>"
 msgid "First Path:"
 msgstr "<b>ç¬¬ä¸?ä¸ªè·¯å¾?ï¼?</b>"
 
@@ -8126,7 +8790,6 @@ msgid "Other Revision:"
 msgstr "å?¶ä»?ä¿®è®¢ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:27
-#| msgid "Previous message"
 msgid "Previous Commit Messages:"
 msgstr "ä¸?ä¸?æ?¡æ¶?æ?¯"
 
@@ -8159,89 +8822,88 @@ msgid "Repository authorization"
 msgstr "ç??æ?¬åº?æ??æ??"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
+#, fuzzy
+#| msgid "Retrieving status..."
+msgid "Retrieving statusâ?¦â?¦"
+msgstr "æ£å?¨å??å??ç?¶æ??..."
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revert Changes"
 msgstr "è¿?å??æ?´æ?¹"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Save open files before diffing"
 msgstr "å?¨æ¯?è¾?å??ä¿?å?æ??å¼?ç??æ??ä»¶"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:39
-#| msgid "<b>Second Path:</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
 msgid "Second Path:"
 msgstr "ç¬¬äº?ä¸ªè·¯å¾?ï¼?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:40
-#| msgid "<b>Select Changes to Revert:</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
 msgid "Select Changes to Revert:"
 msgstr "é??æ?©è¦?è¿?å??ç??æ?´æ?¹"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
-#| msgid "<b>Source/Destination Paths:</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "æ?¥æº?/ç?®æ ? è·¯å¾?ï¼?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Source:"
 msgstr "æ?¥æº?ï¼?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:46
-#| msgid "<b>Start Revision:</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
 msgid "Start Revision:"
 msgstr "èµ·å§?ä¿®è®¢ï¼?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:47
-#| msgid "Subversion operations"
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Subversion Options"
 msgstr "Subversion æ??ä½?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:48
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Subversion Preferences"
 msgstr "Subversion é¦?é??é¡¹"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Switch to branch/tag"
 msgstr "å??æ?¢å?°å??æ?¯/æ ?ç¾"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Trust server"
 msgstr "ä¿¡ä»»æ??å?¡å?¨"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Update file/directory"
 msgstr "æ?´æ?°æ??ä»¶/ç?®å½?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Use first path"
-msgstr ""
+msgstr "ç?¨ç¬¬ä¸?ä¸ªè·¯å¾?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:53
-#| msgid "Previous message"
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Use previous message"
 msgstr "ä¸?ä¸?æ?¡æ¶?æ?¯"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:56
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Log"
 msgstr "æ?¥ç??æ?¥å¿?"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "View Selected Revision"
 msgstr "æ?¥ç??é??ä¸ç??ä¿®è®¢"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole Project"
 msgstr "æ?´ä¸ªé¡¹ç?®"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Working Copy"
 msgstr "å·¥ä½?å?¯æ?¬"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:62
-#| msgid "<b>Working Copy Path:</b>"
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "Working Copy Path:"
 msgstr "<b>å·¥ä½?å?¯æ?¬ç?®å½?ï¼?</b>"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:63
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "å??"
 
@@ -8272,7 +8934,9 @@ msgstr "å°?æ?´æ?¹æ??äº¤å?° Subversion æ ?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
+#, fuzzy
+#| msgid "_Revert..."
+msgid "_Revertâ?¦"
 msgstr "è¿?å??(_R)..."
 
 #. Display label
@@ -8284,7 +8948,9 @@ msgstr "è¿?å??æ?´æ?¹å?°å·¥ä½?å?¯æ?¬"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
+#, fuzzy
+#| msgid "_Resolve Conflicts..."
+msgid "_Resolve Conflictsâ?¦"
 msgstr "è§£å?³å?²çª?(_R)..."
 
 #. Display label
@@ -8296,19 +8962,25 @@ msgstr "å?¨å·¥ä½?å?¯æ?¬ä¸è§£å?³å?²çª?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "æ?´æ?°(_U)..."
+#, fuzzy
+#| msgid "_Update"
+msgid "_Updateâ?¦"
+msgstr "æ?´æ?°(_U)"
 
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
-msgid "Sync your local copy with the Subversion tree"
+#, fuzzy
+#| msgid "Sync your local copy with the Subversion tree"
+msgid "Syncronize your local copy with the Subversion tree"
 msgstr "ä¸? Subversion æ ?å??æ¥æ?¬å?°å?¯æ?¬"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
-msgid "Copy Files/Folders..."
+#, fuzzy
+#| msgid "Copy Files/Folders..."
+msgid "Copy Files/Foldersâ?¦"
 msgstr "å¤?å?¶æ??ä»¶/æ??ä»¶å¤¹..."
 
 #. Display label
@@ -8320,7 +8992,9 @@ msgstr "å°?å?¨é?¨æº?ä»£ç ?æ??å? "
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
-msgid "Switch to a Branch/Tag..."
+#, fuzzy
+#| msgid "Switch to a Branch/Tag..."
+msgid "Switch to a Branch/Tagâ?¦"
 msgstr "å??æ?¢å?°å??æ?¯/æ ?ç¾..."
 
 #. Display label
@@ -8332,8 +9006,10 @@ msgstr "å??æ?¢æ?¬å?°å?¯æ?¬è?³ç??æ?¬åº?ä¸ç??å??æ?¯æ??æ ?ç¾"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "å??å¹¶..."
+#, fuzzy
+#| msgid "Merge"
+msgid "Mergeâ?¦"
+msgstr "å??å¹¶"
 
 #. Display label
 #. short-cut
@@ -8344,8 +9020,10 @@ msgstr "å??å¹¶æ?´æ?¹å?°å·¥ä½?å?¯æ?¬"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "æ?¥ç??æ?¥å¿?(_V)..."
+#, fuzzy
+#| msgid "View Log"
+msgid "_View Logâ?¦"
+msgstr "æ?¥ç??æ?¥å¿?"
 
 #. Display label
 #. short-cut
@@ -8356,8 +9034,10 @@ msgstr "æ?¥ç??æ??ä»¶å??å?²"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "æ¯?è¾?(_D)..."
+#, fuzzy
+#| msgid "_Diff"
+msgid "_Diffâ?¦"
+msgstr "_Diff"
 
 #. Display label
 #. short-cut
@@ -8368,14 +9048,18 @@ msgstr "æ¯?è¾?æ?¬å?°æ ?ä¸?ç??æ?¬åº?"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
-msgid "Copy..."
-msgstr "å¤?å?¶..."
+#, fuzzy
+#| msgid "_Copy"
+msgid "Copyâ?¦"
+msgstr "å¤?å?¶(_C)"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
-msgid "Diff..."
-msgstr "æ¯?è¾?..."
+#, fuzzy
+#| msgid "Diff"
+msgid "Diffâ?¦"
+msgstr "æ¯?è¾?"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8398,7 +9082,9 @@ msgid "Subversion: Commit complete."
 msgstr "Subversionï¼?æ??äº¤å®?æ??ã??"
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
+#, fuzzy
+#| msgid "Subversion: Committing changes to the repository..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
 msgstr "Subversionï¼?æ£å?¨å??ç??æ?¬åº?æ??äº¤æ?´æ?¹..."
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
@@ -8414,13 +9100,16 @@ msgid "Please enter a destination path."
 msgstr "è¯·è¾?å?¥ç?®ç??è·¯å¾?ã??"
 
 #: ../plugins/subversion/subversion-diff-dialog.c:46
+#, fuzzy
 msgid "[Head/Working Copy]"
-msgstr ""
+msgstr "æ?´æ?°å½?å??å·¥ä½?å?¯æ?¬"
 
 #: ../plugins/subversion/subversion-diff-dialog.c:61
 #: ../plugins/subversion/subversion-log-dialog.c:426
 #: ../plugins/subversion/subversion-log-dialog.c:493
-msgid "Subversion: Retrieving diff..."
+#, fuzzy
+#| msgid "Subversion: Retrieving diff..."
+msgid "Subversion: Retrieving diffâ?¦"
 msgstr "Subversionï¼?æ£å?¨è?·å??æ¯?è¾?..."
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
@@ -8436,7 +9125,9 @@ msgid "Short Log"
 msgstr "ç?æ?¥å¿?"
 
 #: ../plugins/subversion/subversion-log-dialog.c:257
-msgid "Subversion: Retrieving log..."
+#, fuzzy
+#| msgid "Subversion: Retrieving log..."
+msgid "Subversion: Retrieving logâ?¦"
 msgstr "Subversionï¼?æ£å?¨è?·å??æ?¥å¿?..."
 
 #: ../plugins/subversion/subversion-log-dialog.c:309
@@ -8444,7 +9135,9 @@ msgid "Subversion: File retrieved."
 msgstr "Subversionï¼?æ??ä»¶å·²è?·å??ã??"
 
 #: ../plugins/subversion/subversion-log-dialog.c:351
-msgid "Subversion: Retrieving file..."
+#, fuzzy
+#| msgid "Subversion: Retrieving file..."
+msgid "Subversion: Retrieving fileâ?¦"
 msgstr "Subversionï¼?æ£å?¨è?·å??æ??ä»¶..."
 
 #: ../plugins/subversion/subversion-merge-dialog.c:38
@@ -8520,20 +9213,24 @@ msgid "Fingerprint:"
 msgstr "æ??çº¹ï¼?"
 
 #: ../plugins/subversion/svn-command.c:200
+#, fuzzy
 msgid "Valid from:"
-msgstr ""
+msgstr "<b>å?¼å?«å??èµ·äººï¼? %s</b>"
 
 #: ../plugins/subversion/svn-command.c:201
+#, fuzzy
 msgid "Valid until:"
-msgstr ""
+msgstr "ç¦»å??æ»¡è¿?å?© %d %s %d %s (%d%%)"
 
 #: ../plugins/subversion/svn-command.c:202
+#, fuzzy
 msgid "Issuer DN:"
-msgstr ""
+msgstr "ä¸?ç§»"
 
 #: ../plugins/subversion/svn-command.c:203
+#, fuzzy
 msgid "DER certificate:"
-msgstr ""
+msgstr "è¯?ä¹¦ä¸?è¢«ä¿¡ä»»"
 
 #: ../plugins/subversion/svn-command.c:350
 #: ../plugins/subversion/svn-command.c:366
@@ -8592,60 +9289,73 @@ msgid "Tag De_claration"
 msgstr "æ ?ç¾å£°æ??(_C)"
 
 #: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
+#, fuzzy
+#| msgid "Goto symbol declaration"
+msgid "Go to symbol declaration"
 msgstr "è½¬å?°ç¬¦å?·å£°æ??"
 
-#: ../plugins/symbol-db/plugin.c:321
+#. Translators: Go to the line where the tag is implemented
+#: ../plugins/symbol-db/plugin.c:322
 msgid "Tag _Implementation"
 msgstr "æ ?ç¾å®?ä¹?(_I)"
 
-#: ../plugins/symbol-db/plugin.c:323
-msgid "Goto symbol definition"
+#: ../plugins/symbol-db/plugin.c:324
+#, fuzzy
+#| msgid "Goto symbol definition"
+msgid "Go to symbol definition"
 msgstr "è½¬å?°ç¬¦å?·å®?ä¹?"
 
-#: ../plugins/symbol-db/plugin.c:330
-msgid "_Find Symbol..."
-msgstr "æ?¥æ?¾ç¬¦å?·(_F)..."
-
 #: ../plugins/symbol-db/plugin.c:331
+#, fuzzy
+#| msgid "Find Symbol"
+msgid "_Find Symbolâ?¦"
+msgstr "æ?¥æ?¾ç¬¦å?·"
+
+#: ../plugins/symbol-db/plugin.c:332
 msgid "Find Symbol"
 msgstr "æ?¥æ?¾ç¬¦å?·"
 
-#: ../plugins/symbol-db/plugin.c:1111
-#, c-format
-msgid "%s: Generating inheritances..."
+#: ../plugins/symbol-db/plugin.c:1170
+#, fuzzy, c-format
+#| msgid "%s: Generating inheritances..."
+msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ£å?¨ç??æ??ç»§æ?¿..."
 
-#: ../plugins/symbol-db/plugin.c:1116
+#: ../plugins/symbol-db/plugin.c:1175
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?è?ª %3$d ä¸ªæ??ä»¶ä¸æ?«æ??äº? %2$d ä¸ª"
 
-#: ../plugins/symbol-db/plugin.c:1147
-#, c-format
-msgid "Generating inheritances..."
+#: ../plugins/symbol-db/plugin.c:1206
+#, fuzzy, c-format
+#| msgid "Generating inheritances..."
+msgid "Generating inheritancesâ?¦"
 msgstr "æ£å?¨ç??æ??ç»§æ?¿..."
 
-#: ../plugins/symbol-db/plugin.c:1149
+#: ../plugins/symbol-db/plugin.c:1208
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "è?ª %2$d ä¸ªæ??ä»¶ä¸æ?«æ??äº? %1$d ä¸ª"
 
-#: ../plugins/symbol-db/plugin.c:1909
-msgid "Populating symbols' db..."
+#: ../plugins/symbol-db/plugin.c:1968
+#, fuzzy
+#| msgid "Populating symbols' db..."
+msgid "Populating symbol databaseâ?¦"
 msgstr "æ£å?¨å¡«å??ç¬¦å?·åº?..."
 
-#: ../plugins/symbol-db/plugin.c:2266 ../plugins/symbol-db/plugin.c:2394
+#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
 msgid "Symbols"
 msgstr "ç¬¦å?·"
 
-#: ../plugins/symbol-db/plugin.c:2403
+#: ../plugins/symbol-db/plugin.c:2489
+#, fuzzy
 msgid "SymbolDb popup actions"
-msgstr ""
+msgstr "æ??ä»¶ç®¡ç??å?¨å¼¹å?ºå¼?å?¨ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2411
+#: ../plugins/symbol-db/plugin.c:2497
+#, fuzzy
 msgid "SymbolDb menu actions"
-msgstr ""
+msgstr "é¡¹ç?®ç®¡ç??å?¨å?¨ä½?"
 
 #: ../plugins/symbol-db/symbol-db-prefs.c:275
 msgid "Package is not parseable"
@@ -8665,35 +9375,43 @@ msgstr "API æ ?ç¾"
 msgid "Resuming glb scan."
 msgstr "ç»§ç» glb æ?«æ??ã??"
 
-#: ../plugins/symbol-db/symbol-db-view-locals.c:294
-#: ../plugins/symbol-db/symbol-db-view.c:1426
+#: ../plugins/symbol-db/symbol-db-view-locals.c:326
+#: ../plugins/symbol-db/symbol-db-view.c:1413
 msgid "Symbol"
 msgstr "ç¬¦å?·"
 
+#: ../plugins/symbol-db/symbol-db-view.c:799
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loadingâ?¦"
+msgstr "æ£å?¨è½½å?¥..."
+
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "<b>Available API tags</b>"
-msgstr "<b>å?¯ç?¨ç?? API æ ?ç¾</b>"
+msgid "Automatically scan project's packages"
+msgstr "è?ªå?¨æ?«æ??é¡¹ç?®ç??å??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
-msgid "<b>Global</b>"
-msgstr "<b>å?¨å±?</b>"
+msgid "Automatically update symbols without saving file"
+msgstr "ä¸?å¿?ä¿?å?æ??ä»¶å°±è?ªå?¨æ?´æ?°ç¬¦å?·"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically scan project's packages"
-msgstr "è?ªå?¨æ?«æ??é¡¹ç?®ç??å??"
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
+msgstr ""
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Automatically update symbols without saving file"
-msgstr "ä¸?å¿?ä¿?å?æ??ä»¶å°±è?ªå?¨æ?´æ?°ç¬¦å?·"
+#, fuzzy
+#| msgid "<b>Available API tags</b>"
+msgid "Available API tags"
+msgstr "<b>å?¯ç?¨ç?? API æ ?ç¾</b>"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseable..."
+#, fuzzy
+#| msgid "Checking if package is parseable..."
+msgid "Checking if package is parseableâ?¦"
 msgstr "æ£å?¨æ£?æ?¥å??æ?¯å?¦å?¯ä»¥è§£æ??..."
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
-msgid "Ctags executable:"
-msgstr "Ctags å?¯æ?§è¡?æ??ä»¶ï¼?"
-
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "å¹¶è¡?æ?«æ??é¡¹ç?®å??å?¨å±?ç¬¦å?·"
@@ -8701,90 +9419,89 @@ msgstr "å¹¶è¡?æ?«æ??é¡¹ç?®å??å?¨å±?ç¬¦å?·"
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
 msgid ""
 "This option enables the default packages required by your opened project, e."
-"g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)"
+"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
 msgstr ""
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
 msgid ""
 "This option means that the global system packages will be scanned "
-"contemporary with the project's ones"
+"simultaneously with the project's ones"
 msgstr ""
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:10
-msgid ""
-"Update automatically the file's symbols without saving. The update occurs "
-"after 10 seconds of no keypress by user."
-msgstr ""
-
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>ç»?ç«¯é??é¡¹</b>"
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
+#, fuzzy
+#| msgid "terminal operations"
+msgid "Terminal options"
+msgstr "ç»?ç«¯æ??ä½?"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
-msgid "Use GNOME terminal profile:"
+#, fuzzy
+#| msgid "Use GNOME terminal profile:"
+msgid "Use GNOME Terminal profile:"
 msgstr "ä½¿ç?¨ GNOME ç»?ç«¯é??ç½®æ??ä»¶ï¼?"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "ä½¿ç?¨ GNOME ç»?ç«¯ç?®å??æ??é??ç??é??ç½®"
 
-#: ../plugins/terminal/terminal.c:701
+#: ../plugins/terminal/terminal.c:739
 msgid "terminal operations"
 msgstr "ç»?ç«¯æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:886
-#: ../plugins/terminal/terminal.c:939
+#: ../plugins/terminal/terminal.c:757 ../plugins/terminal/terminal.c:926
+#: ../plugins/terminal/terminal.c:979
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "ç»?ç«¯"
 
-#: ../plugins/tools/anjuta-tools.ui.h:1
-msgid "<b>Tools</b>"
-msgstr "<b>å·¥å?·</b>"
-
-#: ../plugins/tools/anjuta-tools.ui.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Command:"
 msgstr "å?½ä»¤ï¼?"
 
-#: ../plugins/tools/anjuta-tools.ui.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Edit as script"
 msgstr "ä½?ä¸ºè??æ?¬ç¼?è¾?"
 
-#: ../plugins/tools/anjuta-tools.ui.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit command as script in Anjuta on close"
 msgstr "å?³é?å??å?¨ Anjuta ä¸å°?æ¤å?½ä»¤ä½?ä¸ºè??æ?¬ç¼?è¾?"
 
-#: ../plugins/tools/anjuta-tools.ui.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Parameters:"
 msgstr "å??æ?°ï¼?"
 
-#: ../plugins/tools/anjuta-tools.ui.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Save all files"
 msgstr "ä¿?å?å?¨é?¨æ??ä»¶"
 
-#: ../plugins/tools/anjuta-tools.ui.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
 msgstr "å¿«æ?·æ?¹å¼?ï¼?"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:12
 msgid "Standard error:"
 msgstr "æ ?å??é??è¯¯ï¼?"
 
 #. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard input:"
 msgstr "æ ?å??è¾?å?¥ï¼?"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Standard output:"
 msgstr "æ ?å??è¾?å?ºï¼?"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Tool Editor"
 msgstr "å·¥å?·ç¼?è¾?å?¨"
 
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:256
+#: ../plugins/tools/plugin.c:263 ../plugins/tools/anjuta-tools.plugin.in.h:1
+msgid "Tools"
+msgstr "å·¥å?·"
+
 #: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "å??é??å??è¡¨"
@@ -8794,8 +9511,10 @@ msgid "Working directory:"
 msgstr "å·¥ä½?ç?®å½?ï¼?"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "å??é??(_V)..."
+#, fuzzy
+#| msgid "Variable"
+msgid "_Variableâ?¦"
+msgstr "å??é??"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -8845,7 +9564,9 @@ msgid "Unable to edit script"
 msgstr "ä¸?è?½ç¼?è¾?è??æ?¬"
 
 #: ../plugins/tools/editor.c:1044
-msgid "New accelerator..."
+#, fuzzy
+#| msgid "New accelerator..."
+msgid "New acceleratorâ?¦"
 msgstr "æ?°å»ºå? é??å?¨..."
 
 #: ../plugins/tools/execute.c:314
@@ -8871,8 +9592,9 @@ msgstr "(é??è¯¯)"
 
 #. Display the name of the command
 #: ../plugins/tools/execute.c:469
-#, c-format
-msgid "Running command: %s...\n"
+#, fuzzy, c-format
+#| msgid "Running command: %s...\n"
+msgid "Running command: %sâ?¦\n"
 msgstr "æ£å?¨è¿?è¡?å?½ä»¤ï¼? %s...\n"
 
 #: ../plugins/tools/execute.c:509
@@ -8881,11 +9603,15 @@ msgid "Completed unsuccessfully with status code %d\n"
 msgstr "å®?æ??ä¸?æ??å??ï¼?ç?¶æ??ç ? %d \n"
 
 #: ../plugins/tools/execute.c:629
-msgid "Unable to create a buffer, command aborted"
+#, fuzzy
+#| msgid "Unable to create a buffer, command aborted"
+msgid "Unable to create a buffer: command aborted"
 msgstr "æ? æ³?å??å»ºç¼?å?²å?ºï¼?å?½ä»¤ä¸æ¢"
 
 #: ../plugins/tools/execute.c:641
-msgid "No document currently open, command aborted"
+#, fuzzy
+#| msgid "No document currently open, command aborted"
+msgid "No document currently open: command aborted"
 msgstr "å½?å??æ²¡æ??æ??æ¡£æ??å¼?ï¼?å?½ä»¤ä¸æ¢"
 
 #: ../plugins/tools/execute.c:1019
@@ -8915,13 +9641,7 @@ msgstr "æ? æ³?æ??å¼? %s æ?§è¡?å??å?¥æ??ä½?"
 msgid "Tool operations"
 msgstr "å·¥å?·æ??ä½?"
 
-#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
-msgid "Tools"
-msgstr "å·¥å?·"
-
 #: ../plugins/tools/variable.c:84
-#| msgid "Project root directory:"
 msgid "Project root URI"
 msgstr "é¡¹ç?®æ ¹ URI"
 
@@ -8962,7 +9682,6 @@ msgid "Selected URI in the project manager plugin"
 msgstr "å?¨é¡¹ç?®ç®¡ç??å?¨æ??ä»¶ä¸é??æ?©ç?? URI"
 
 #: ../plugins/tools/variable.c:94
-#| msgid "Root directory if no project is open:"
 msgid "Selected directory in the project manager plugin"
 msgstr "å?¨é¡¹ç?®ç®¡ç??å?¨æ??ä»¶ä¸é??æ?©ç??ç?®å½?"
 
@@ -8975,7 +9694,6 @@ msgid "Selected full file name without extension in the project manager plugin"
 msgstr "å?¨é¡¹ç?®ç®¡ç??å?¨æ??ä»¶ä¸é??æ?©ç??æ? æ?©å±?å??ç??å®?æ?´æ??ä»¶å??"
 
 #: ../plugins/tools/variable.c:97
-#| msgid "Makefile backend for project manager"
 msgid "Selected file name in the project manager plugin"
 msgstr "å?¨é¡¹ç?®ç®¡ç??å?¨æ??ä»¶ä¸é??æ?©ç??æ??ä»¶å??"
 
@@ -8988,7 +9706,6 @@ msgid "Selected file extension in the project manager plugin"
 msgstr "å?¨é¡¹ç?®ç®¡ç??å?¨æ??ä»¶ä¸é??æ?©ç??æ??ä»¶æ?©å±?å??"
 
 #: ../plugins/tools/variable.c:100
-#| msgid "Currently activated plugins"
 msgid "Currently edited file name"
 msgstr "å½?å??ç¼?è¾?ç??æ??ä»¶å??"
 
@@ -8997,22 +9714,20 @@ msgid "Currently edited file name without extension"
 msgstr "å½?å??ç¼?è¾?ç??æ? æ?©å±?å??ç??æ??ä»¶å??"
 
 #: ../plugins/tools/variable.c:102
-#| msgid "CVS: Add file/directory"
 msgid "Currently edited file directory"
 msgstr "å½?å??æ¯?å?ªå? ç??æ??ä»¶ç?®å½?"
 
 #: ../plugins/tools/variable.c:103
-#| msgid "Current selection"
-msgid "Currently selection in editor"
-msgstr "å½?å??ç¼?è¾?å?¨ä¸ç??é??å?º"
+#, fuzzy
+#| msgid "Currently selection in editor"
+msgid "Currently selected text in editor"
+msgstr "é??å??ç¼?è¾?å?¨å??ç??å?¨é?¨æ??å?"
 
 #: ../plugins/tools/variable.c:104
-#| msgid "Toggle current code fold in the editor"
 msgid "Current word in editor"
 msgstr "å½?å??ç¼?è¾?å?¨ä¸ç??è¯?è¯"
 
 #: ../plugins/tools/variable.c:105
-#| msgid "Current Selection"
 msgid "Current line in editor"
 msgstr "å½?å??ç¼?è¾?å?¨ä¸ç??è¡?"
 
@@ -9045,7 +9760,9 @@ msgid "Replace buffer"
 msgstr "æ?¿æ?¢ç¼?å?²å?º"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
+#, fuzzy
+#| msgid "Insert in buffer"
+msgid "Insert into buffer"
 msgstr "å?¨ç¼?å?²å?ºä¸æ??å?¥"
 
 #: ../plugins/tools/tool.c:87
@@ -9085,8 +9802,10 @@ msgstr "å?ç¬¦ä¸²"
 msgid "Copyright (c) Naba Kumar"
 msgstr "ç??æ??æ??æ?? (c) Naba Kumar"
 
-#: ../src/anjuta.c:428
-msgid "Loaded Session..."
+#: ../src/anjuta.c:424
+#, fuzzy
+#| msgid "Loaded Session..."
+msgid "Loaded Sessionâ?¦"
 msgstr "å·²è½½å?¥ä¼?è¯?..."
 
 #: ../src/anjuta-actions.h:23
@@ -9214,7 +9933,9 @@ msgid "About External _Plugins"
 msgstr "å?³äº?å¤?é?¨æ??ä»¶(_P)"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+#, fuzzy
+#| msgid "About third party Anjuta plugins"
+msgid "About third-party Anjuta plugins"
 msgstr "å?³äº? Anjuta ç¬¬ä¸?æ?¹æ??ä»¶"
 
 #: ../src/anjuta-app.c:489
@@ -9245,11 +9966,15 @@ msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "å®½åº¦xé«?åº¦+X å??ç§»+Y å??ç§»"
 
 #: ../src/main.c:70
-msgid "Do not show the splashscreen"
+#, fuzzy
+#| msgid "Do not show the splashscreen"
+msgid "Do not show the splash screen"
 msgstr "ä¸?æ?¾ç¤ºå?¯å?¨å±?å¹?"
 
 #: ../src/main.c:76
-msgid "Start a new instance and do not open the file in a existing"
+#, fuzzy
+#| msgid "Start a new instance and do not open the file in a existing"
+msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "å?¯å?¨ä¸?ä¸ªæ?°ç??å®?ä¾?ï¼?ä¸?æ??å¼?å·²å?å?¨å®?ä¾?ä¸æ??æ??å¼?ç??æ??ä»¶"
 
 #: ../src/main.c:82
@@ -9261,19 +9986,20 @@ msgid "Do not open last project and files on startup"
 msgstr "å?¯å?¨æ?¶ä¸?å??æ??å¼?ä¸?æ¬¡ç??é¡¹ç?®å??æ??ä»¶"
 
 #: ../src/main.c:94
-msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+#, fuzzy
+#| msgid "Shutdown anjuta properly releasing all resources (for debugging)"
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "æ£å¸¸å?³é? Anjuta å¹¶é??æ?¾æ??æ??èµ?æº?(ä½?ä¸ºè°?è¯?)"
 
 #: ../src/main.c:156
 msgid "- Integrated Development Environment"
 msgstr "- é??æ??å¼?å??ç?¯å¢?"
 
-#: ../src/main.c:216
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "Anjuta"
 
 #: ../src/preferences.ui.h:1
-#| msgid "<b>Appearance</b>"
 msgid "Appearance"
 msgstr "<b>å¤?è§?</b>"
 
@@ -9302,36 +10028,35 @@ msgstr "å?¯å?¨æ?¶ä¸?è¦?å? è½½ä¸?ä¸?æ¬¡ä¼?è¯?"
 msgid "Dock switcher style:"
 msgstr "å??é? å??æ?¢æ ·å¼?ï¼?"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
+#: ../src/preferences.ui.h:10
+#, fuzzy
+#| msgid "Gnome toolbar setting"
+msgid "GNOME toolbar setting"
 msgstr "GNOME å·¥å?·æ ?è®¾ç½®"
 
 #: ../src/preferences.ui.h:12
-#| msgid "Icon"
 msgid "Icons"
 msgstr "å?¾æ ?"
 
 #: ../src/preferences.ui.h:13
-#| msgid "Icon File:"
 msgid "Icons only"
 msgstr "å?¾æ ?æ??ä»¶ï¼?"
 
 #: ../src/preferences.ui.h:14
-#| msgid "<b>Project Defaults</b>"
 msgid "Project Defaults"
 msgstr "<b>é¡¹ç?®é»?è®¤å?¼</b>"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+#, fuzzy
+#| msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "é??æ?©é¡¹ç?®ç?®å½?"
 
 #: ../src/preferences.ui.h:16
-#| msgid "Version"
 msgid "Session"
 msgstr "å??è¯?"
 
 #: ../src/preferences.ui.h:17
-#| msgid "Tasks"
 msgid "Tabs"
 msgstr "Tabs"
 
@@ -9348,7 +10073,6 @@ msgid "Text beside icons"
 msgstr "æ??å?å?¨å?¾æ ?æ??"
 
 #: ../src/preferences.ui.h:22
-#| msgid "Text"
 msgid "Text only"
 msgstr "ä»?æ??å?"
 
@@ -9357,6 +10081,10 @@ msgstr "ä»?æ??å?"
 msgid "Toolbar button labels:"
 msgstr "å·¥å?·æ ?æ??é?®æ ?ç¾ï¼?"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.schemas.in.h:1
+msgid "Do not display warning if not using a Debug configuration"
+msgstr ""
+
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr ""
@@ -9366,11 +10094,12 @@ msgid "Add a space after function call autocompletion"
 msgstr ""
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
-msgid "Autocomplete"
+#, fuzzy
+#| msgid "Autocomplete"
+msgid "Auto-complete"
 msgstr "è?ªå?¨è¡¥å?¨"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
-#| msgid "<b>Autocompletion (C/C++/Java only)</b>"
 msgid "Autocompletion (C/C++/Java only)"
 msgstr "è?ªå?¨è¡¥å?¨ (ä»? C/C++/Java)"
 
@@ -9387,86 +10116,87 @@ msgid "Calltips"
 msgstr "å?³é?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
-msgid "Enable adaptive indentation"
-msgstr "å?¯ç?¨è?ªé??åº?ç¼©è¿?"
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable code completion"
 msgstr "å?¯ç?¨ä»£ç ?è¡¥å?¨"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Enable smart brace completion"
 msgstr "å?¯ç?¨æ?ºè?½å¤§æ?¬å?·è¡¥å?¨"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart indentation"
 msgstr "å?¯ç?¨æ?ºè?½ç¼©è¿?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
-#| msgid "Auto Indent"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Indent:"
 msgstr "ç¼©è¿?ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
-#| msgid "<b>Indentation parameters</b>"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Indentation parameters"
 msgstr "<b>ç¼©è¿?å??æ?°</b>"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#, fuzzy
 msgid "Line up parentheses"
-msgstr ""
-
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
-#| msgid "Smart Indentation"
-msgid "Parenthese indentation"
-msgstr ""
+msgstr "å??ä¸?ç§»å?¨å?°ä¸?ä¸?è¡?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
-msgid "Pressing tab indents"
-msgstr "æ?? Tab é?®ç¼©è¿?"
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#, fuzzy
+msgid "Parenthesis indentation"
+msgstr "ç¼©è¿?å¯¼çº¿(_I)"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Show calltips"
 msgstr "æ?¾ç¤ºå?½æ?°æ??å??æ??ç¤º"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Smart Indentation"
 msgstr "æ?ºè?½ç¼©è¿?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Statement indentation size in spaces:"
 msgstr "æ?ºè?½ç¼©è¿?ç??ç©ºç?½é?¿åº¦ï¼?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1916
-msgid "_AutoComplete"
+#: ../plugins/language-support-cpp-java/plugin.c:1921
+#, fuzzy
+#| msgid "_AutoComplete"
+msgid "_Auto-Complete"
 msgstr "è?ªå?¨è¡¥å?¨(_A)"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1917
-msgid "AutoComplete the current word"
+#: ../plugins/language-support-cpp-java/plugin.c:1922
+#, fuzzy
+#| msgid "AutoComplete the current word"
+msgid "Auto-complete the current word"
 msgstr "è?ªå?¨è¡¥å?¨å½?å??ç??è¯?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1923
-msgid "Auto Indent"
+#: ../plugins/language-support-cpp-java/plugin.c:1928
+#, fuzzy
+#| msgid "Auto Indent"
+msgid "Auto-Indent"
 msgstr "è?ªå?¨ç¼©è¿?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1924
-msgid "Auto indent current line or selection based on indentation settings"
+#: ../plugins/language-support-cpp-java/plugin.c:1929
+#, fuzzy
+#| msgid "Auto indent current line or selection based on indentation settings"
+msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "æ ¹æ?®ç¼©è¿?è®¾ç½®è?ªå?¨ç¼©è¿?å½?å??æ??é??ä¸è¡?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1929
+#: ../plugins/language-support-cpp-java/plugin.c:1934
 msgid "Swap .h/.c"
 msgstr "äº¤æ?¢ .h /.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1930
-msgid "Swap c header and source files"
+#: ../plugins/language-support-cpp-java/plugin.c:1935
+#, fuzzy
+#| msgid "Swap c header and source files"
+msgid "Swap C header and source files"
 msgstr "äº¤æ?¢ c å¤´æ??ä»¶å??æº?æ??ä»¶"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1973
+#: ../plugins/language-support-cpp-java/plugin.c:1978
 msgid "C++/Java Assistance"
 msgstr "C++/Java è¾?å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2066
-#: ../plugins/language-support-cpp-java/plugin.c:2075
+#: ../plugins/language-support-cpp-java/plugin.c:2071
+#: ../plugins/language-support-cpp-java/plugin.c:2080
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -9575,23 +10305,31 @@ msgid "CVS Plugin"
 msgstr "CVS æ??ä»¶"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
+#, fuzzy
+#| msgid "Import an existing autotools project to anjuta"
+msgid "Import an existing autotools project to Anjuta"
 msgstr "æ??å·²å?å?¨ç?? autotools é¡¹ç?®å¯¼å?¥ Anjuta"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
-msgid "Project From Existing Sources"
-msgstr "ä»?ç?°æ??æº?ç¨?åº?å??å»ºé¡¹ç?®"
-
-#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
 msgid "Project Import Assistant"
 msgstr "é¡¹ç?®å¯¼å?¥å??å¯¼"
 
+#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
+#, fuzzy
+#| msgid "Project From Existing Sources"
+msgid "Project from Existing Sources"
+msgstr "ä»?ç?°æ??æº?ç¨?åº?å??å»ºé¡¹ç?®"
+
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
-msgid "GtkSourceview editor"
-msgstr "GtkSourceview ç¼?è¾?å?¨"
+#, fuzzy
+#| msgid "GtkSourceView Editor"
+msgid "GtkSourceView editor"
+msgstr "GtkSourceView ç¼?è¾?å?¨"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:2
-msgid "The default editor based on GtkSourceview"
+#, fuzzy
+#| msgid "The default editor based on GtkSourceview"
+msgid "The default editor based on GtkSourceView"
 msgstr "å?ºäº? GtkSourceview ç??é»?è®¤ç¼?è¾?å?¨"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
@@ -9603,7 +10341,10 @@ msgid "C++ and Java support Plugin"
 msgstr "C++ å?? Java æ?¯æ??æ??ä»¶"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in.h:2
-msgid "C++ and Java support plugin for code completion, auto indentation etc."
+#, fuzzy
+#| msgid ""
+#| "C++ and Java support plugin for code completion, auto indentation etc."
+msgid "C++ and Java support plugin for code completion, auto-indentation, etc."
 msgstr "ä¸º C++ å?? Java æ??ä¾?ä»£ç ?è¡¥å?¨ã??è?ªå?¨ç¼©è¿?ç?æ?¯æ??ç??æ??ä»¶ã??"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:2
@@ -9626,10 +10367,6 @@ msgstr "Anjuta ç±»ç??æ??å?¨æ??ä»¶"
 msgid "C++/GObject Class"
 msgstr "C++/GObject ç±»"
 
-#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
-msgid "Class Generator"
-msgstr "ç±»ç??æ??å?¨"
-
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
 msgstr "é¡¹ç?®ç®¡ç??å?¨"
@@ -9639,8 +10376,8 @@ msgid "Project Manager Plugin for Anjuta."
 msgstr "Anjuta ç??é¡¹ç?®ç®¡ç??å?¨æ??ä»¶"
 
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:2
-msgid "Symbol Database Plugin for Anjuta (unstable)."
-msgstr "Anjuta ç¬¦å?·åº?æ??ä»¶(ä¸?ç¨³å®?ç??)ã??"
+msgid "Symbol Database Plugin for Anjuta."
+msgstr "Anjuta ç¬¦å?·åº?æ??ä»¶"
 
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
@@ -9690,6 +10427,250 @@ msgstr "Autotools å??ç«¯"
 msgid "Autotools backend for project manager"
 msgstr "é¡¹ç?®ç®¡ç??å?¨ç?? Autotools å??ç«¯"
 
+#~ msgid "Up to date"
+#~ msgstr "æ??æ?°"
+
+#~ msgid "<b>Build</b>"
+#~ msgstr "<b>å??å»º</b>"
+
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>é??ç½®ï¼?</b>"
+
+#~ msgid "<b>Install</b>"
+#~ msgstr "<b>å®?è£?</b>"
+
+#~ msgid "Program '%s' does not exists"
+#~ msgstr "ç¨?åº?â??%sâ??ä¸?å?å?¨"
+
+#~ msgid "C_onfigure Project..."
+#~ msgstr "é??ç½®é¡¹ç?®(_O)..."
+
+#~ msgid "<b>CVS Options</b>"
+#~ msgstr "<b>CVS é??é¡¹</b>"
+
+#~ msgid "<b>Options:</b>"
+#~ msgstr "<b>é??é¡¹ï¼?</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>é??é¡¹</b>"
+
+#~ msgid "<b>Repository: </b>"
+#~ msgstr "<b>ä»?åº?ï¼?</b>"
+
+#~ msgid "<b>Debugger:</b>"
+#~ msgstr "<b>è°?è¯?å?¨ï¼?</b>"
+
+#~ msgid "Debugger Command..."
+#~ msgstr "è°?è¯?å?¨å?½ä»¤..."
+
+#~ msgid "Pid"
+#~ msgstr "è¿?ç¨?å?·(PID)"
+
+#~ msgid "Id"
+#~ msgstr "ID"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "æ£?æ?¥/æ±?å?¼(_P)..."
+
+#~ msgid "Add Watch..."
+#~ msgstr "æ·»å? ç??è§?..."
+
+#~ msgid "_Print..."
+#~ msgstr "æ??å?°(_P)"
+
+#~ msgid "recent menu label|_%d. %s"
+#~ msgstr "æ??è¿?è??å??æ ?ç¾|_%d. %s"
+
+#~ msgid "recent menu label|%d. %s"
+#~ msgstr "æ??è¿?è??å??æ ?ç¾|%d. %s"
+
+#~ msgid "_Open..."
+#~ msgstr "æ??å¼?(_O)..."
+
+#~ msgid "Url:"
+#~ msgstr "URL:"
+
+#~ msgid "Advanced..."
+#~ msgstr "é«?çº§..."
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "ä¸?è?½å? é?¤æº?æ??ä»¶"
+
+#~ msgid "<b>Tags</b>"
+#~ msgstr "<b>æ ?ç¾ï¼?</b> %s"
+
+#~ msgid "_Commit..."
+#~ msgstr "æ??äº¤(_C)..."
+
+#~ msgid "_View log..."
+#~ msgstr "æ?¥ç??æ?¥å¿?(_V)..."
+
+#, fuzzy
+#~ msgid "_Push..."
+#~ msgstr "å¹³å±?"
+
+#~ msgid "_Pull..."
+#~ msgstr "æ??å??(_P)"
+
+#~ msgid "_Add..."
+#~ msgstr "æ·»å? (_A)..."
+
+#~ msgid "_Remove..."
+#~ msgstr "å? é?¤(_R)..."
+
+#~ msgid "_Ignore..."
+#~ msgstr "å¿½ç?¥(_I)..."
+
+#, fuzzy
+#~ msgid "Create patch series..."
+#~ msgstr "å??å»ºæ?°ç?®å½?"
+
+#~ msgid "_Switch to another branch..."
+#~ msgstr "å??æ?¢å?°å?¦ä¸?å??æ?¯(_S)..."
+
+#~ msgid "_Merge..."
+#~ msgstr "å??å¹¶(_M)..."
+
+#~ msgid "_Delete..."
+#~ msgstr "å? é?¤(_D)"
+
+#~ msgid "_Delete tag..."
+#~ msgstr "å? é?¤æ ?ç¾(_D)"
+
+#~ msgid "Unknown language of the editor \"%s\""
+#~ msgstr "ç¼?è¾?å?¨â??%sâ??ç??æ?ªç?¥è¯è¨?"
+
+#~ msgid "n/a"
+#~ msgstr "n/a"
+
+#~ msgid "Misc"
+#~ msgstr "æ??é¡¹"
+
+#~ msgid "<b>Macros:</b>"
+#~ msgstr "<b>å®?ï¼?</b>"
+
+#~ msgid "Edit..."
+#~ msgstr "ç¼?è¾?..."
+
+#~ msgid "Macros..."
+#~ msgstr "å®?..."
+
+#~ msgid "_Patch..."
+#~ msgstr "è¡¥ä¸?(_P)..."
+
+#~ msgid "<b>Project name</b>"
+#~ msgstr "<b>é¡¹ç?®å??ç§°</b>"
+
+#~ msgid "_Select file to add..."
+#~ msgstr "é??æ?©è¦?æ·»å? ç??æ??ä»¶(_S)..."
+
+#~ msgid "Add _Group..."
+#~ msgstr "æ·»å? ç»?(_G)..."
+
+#~ msgid "Add _Target..."
+#~ msgstr "æ·»å? ç?®æ ?(_T)..."
+
+#~ msgid "Add _Source File..."
+#~ msgstr "æ·»å? æº?æ??ä»¶(_S)..."
+
+#~ msgid "_Add To Project"
+#~ msgstr "æ·»å? å?°é¡¹ç?®(_A)"
+
+#~ msgid "Select project type"
+#~ msgstr "é??æ?©é¡¹ç?®ç±»å??"
+
+#, fuzzy
+#~| msgid "Create a template glade interface file"
+#~ msgid "Create a template gtk builder interface file"
+#~ msgstr "å??å»ºä¸?ä¸ª glade ç??é?¢æ??ä»¶æ¨¡æ?¿"
+
+#~ msgid "Wx Widgets"
+#~ msgstr "Wx Widgets"
+
+#~ msgid "Run In Terminal"
+#~ msgstr "å?¨ç»?ç«¯ä¸è¿?è¡?"
+
+#~ msgid "Program Parameters..."
+#~ msgstr "ç¨?åº?å??æ?°..."
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>å?¨ä½?</b>"
+
+#~ msgid "<b>Parameters</b>"
+#~ msgstr "<b>å??æ?°</b>"
+
+#~ msgid "<b>Scope</b>"
+#~ msgstr "é??é¡¹"
+
+#~ msgid "Searching..."
+#~ msgstr "æ??ç´¢ä¸..."
+
+#~ msgid "_Update..."
+#~ msgstr "æ?´æ?°(_U)..."
+
+#~ msgid "Merge..."
+#~ msgstr "å??å¹¶..."
+
+#~ msgid "_View Log..."
+#~ msgstr "æ?¥ç??æ?¥å¿?(_V)..."
+
+#~ msgid "_Diff..."
+#~ msgstr "æ¯?è¾?(_D)..."
+
+#~ msgid "Copy..."
+#~ msgstr "å¤?å?¶..."
+
+#~ msgid "Diff..."
+#~ msgstr "æ¯?è¾?..."
+
+#~ msgid "_Find Symbol..."
+#~ msgstr "æ?¥æ?¾ç¬¦å?·(_F)..."
+
+#~ msgid "<b>Global</b>"
+#~ msgstr "<b>å?¨å±?</b>"
+
+#~ msgid "<b>Terminal options</b>"
+#~ msgstr "<b>ç»?ç«¯é??é¡¹</b>"
+
+#~ msgid "<b>Tools</b>"
+#~ msgstr "<b>å·¥å?·</b>"
+
+#~ msgid "_Variable..."
+#~ msgstr "å??é??(_V)..."
+
+#~ msgid "GtkSourceview editor"
+#~ msgstr "GtkSourceview ç¼?è¾?å?¨"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Command Line Parameters"
+#~ msgstr "å?½ä»¤è¡?å??æ?°"
+
+#~ msgid "Enter a Hexa adress or select one in the data"
+#~ msgstr "è¾?å?¥ä¸?ä¸ªå??å?è¿?å?¶å?°å??æ??è??å?¨æ?°æ?®ä¸é??æ?©ä¸?ä¸ªå?°å??"
+
+#~ msgid "Execute Program"
+#~ msgstr "æ?§è¡?ç¨?åº?"
+
+#~ msgid "_Pass:"
+#~ msgstr "é??æ?°(_P)ï¼?"
+
+#~ msgid "on_widget_signal"
+#~ msgstr "on_widget_signal"
+
+#~ msgid "widget_signal_cb"
+#~ msgstr "widget_signal_cb"
+
+#~ msgid "Ctags executable:"
+#~ msgstr "Ctags å?¯æ?§è¡?æ??ä»¶ï¼?"
+
+#~ msgid "Enable adaptive indentation"
+#~ msgstr "å?¯ç?¨è?ªé??åº?ç¼©è¿?"
+
+#~ msgid "Pressing tab indents"
+#~ msgstr "æ?? Tab é?®ç¼©è¿?"
+
 #~ msgid ""
 #~ "General Public License (GPL)\n"
 #~ "Lesser General Public License (LGPL)\n"
@@ -9942,10 +10923,6 @@ msgstr "é¡¹ç?®ç®¡ç??å?¨ç?? Autotools å??ç«¯"
 #~ msgid "<b>Enter the project name:</b>"
 #~ msgstr "è¾?å?¥è¡?å?·"
 
-#, fuzzy
-#~ msgid "Confirmation"
-#~ msgstr "é??ç½®"
-
 #~ msgid "_Sample action"
 #~ msgstr "ç¤ºä¾?å?¨ä½?(_S)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]