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

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [anjuta] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Wed, 22 Sep 2010 11:38:02 +0000 (UTC)
commit 27a2c386b7c723b56aed36b4db512ca326282bf6
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Sep 22 19:37:10 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1897 +++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po | 1961 +++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 2316 insertions(+), 1542 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9e35f49..a59ecde 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta 2.31.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 18:53+0800\n"
-"PO-Revision-Date: 2010-07-22 18:54+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
+"POT-Creation-Date: 2010-09-21 21:22+0000\n"
+"PO-Revision-Date: 2010-09-22 19:36+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,8 @@ msgstr "Anjuta æ?´å??å¼?é??ç?¼ç?°å¢?"
 msgid "Develop software in an integrated development environment"
 msgstr "å?¨æ?´å??å¼?é??ç?¼ç?°å¢?ä¸é??ç?¼è»?ä»¶"
 
-#: ../anjuta.desktop.in.in.h:3 ../src/about.c:204
+#: ../anjuta.desktop.in.in.h:3
+#: ../src/about.c:204
 msgid "Integrated Development Environment"
 msgstr "æ?´å??å¼?é??ç?¼ç?°å¢?"
 
@@ -60,30 +61,35 @@ msgstr "å¤±å?»å¤?æ??ç¨?å¼? %s å®?ç¾©ç??é¡?å??"
 msgid "plugin %s fails to register type %s"
 msgstr "å¤?æ??ç¨?å¼? %s è¨»å??é¡?å?? %s å¤±æ??"
 
-#: ../libanjuta/anjuta-convert.c:74 ../libanjuta/anjuta-convert.c:111
+#: ../libanjuta/anjuta-convert.c:74
+#: ../libanjuta/anjuta-convert.c:111
 #, c-format
 msgid "The file you are trying to open contains an invalid byte sequence."
 msgstr "ä½ å??è©¦é??å??ç??æª?æ¡?å??å?«ç?¡æ??ç??ä½?å??åº?å??"
 
-#: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
+#: ../libanjuta/anjuta-convert.c:168
+#: ../libanjuta/anjuta-convert.c:207
 #, c-format
-msgid ""
-"Anjuta was not able to automatically determine the encoding of the file you "
-"want to open."
+msgid "Anjuta was not able to automatically determine the encoding of the file you want to open."
 msgstr "Anjuta ç?¡æ³?è?ªå??å?¤æ?·ä½ æ?³è¦?é??å??æª?æ¡?ç??ç·¨ç¢¼ç?ºä½?ã??"
 
-#: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
-#: ../libanjuta/anjuta-encodings.c:184 ../libanjuta/anjuta-encodings.c:186
+#: ../libanjuta/anjuta-encodings.c:137
+#: ../libanjuta/anjuta-encodings.c:182
+#: ../libanjuta/anjuta-encodings.c:184
+#: ../libanjuta/anjuta-encodings.c:186
 #: ../libanjuta/anjuta-encodings.c:188
 msgid "Unicode"
 msgstr "çµ±ä¸?ç¢¼(Unicode)"
 
-#: ../libanjuta/anjuta-encodings.c:151 ../libanjuta/anjuta-encodings.c:177
-#: ../libanjuta/anjuta-encodings.c:223 ../libanjuta/anjuta-encodings.c:266
+#: ../libanjuta/anjuta-encodings.c:151
+#: ../libanjuta/anjuta-encodings.c:177
+#: ../libanjuta/anjuta-encodings.c:223
+#: ../libanjuta/anjuta-encodings.c:266
 msgid "Western"
 msgstr "è¥¿æ?"
 
-#: ../libanjuta/anjuta-encodings.c:153 ../libanjuta/anjuta-encodings.c:225
+#: ../libanjuta/anjuta-encodings.c:153
+#: ../libanjuta/anjuta-encodings.c:225
 #: ../libanjuta/anjuta-encodings.c:262
 msgid "Central European"
 msgstr "ä¸æ?"
@@ -92,23 +98,29 @@ msgstr "ä¸æ?"
 msgid "South European"
 msgstr "å??æ?"
 
-#: ../libanjuta/anjuta-encodings.c:157 ../libanjuta/anjuta-encodings.c:173
+#: ../libanjuta/anjuta-encodings.c:157
+#: ../libanjuta/anjuta-encodings.c:173
 #: ../libanjuta/anjuta-encodings.c:276
 msgid "Baltic"
 msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
 
-#: ../libanjuta/anjuta-encodings.c:159 ../libanjuta/anjuta-encodings.c:227
-#: ../libanjuta/anjuta-encodings.c:240 ../libanjuta/anjuta-encodings.c:244
-#: ../libanjuta/anjuta-encodings.c:246 ../libanjuta/anjuta-encodings.c:264
+#: ../libanjuta/anjuta-encodings.c:159
+#: ../libanjuta/anjuta-encodings.c:227
+#: ../libanjuta/anjuta-encodings.c:240
+#: ../libanjuta/anjuta-encodings.c:244
+#: ../libanjuta/anjuta-encodings.c:246
+#: ../libanjuta/anjuta-encodings.c:264
 msgid "Cyrillic"
 msgstr "æ?¯æ??å¤«æ??"
 
-#: ../libanjuta/anjuta-encodings.c:161 ../libanjuta/anjuta-encodings.c:233
+#: ../libanjuta/anjuta-encodings.c:161
+#: ../libanjuta/anjuta-encodings.c:233
 #: ../libanjuta/anjuta-encodings.c:274
 msgid "Arabic"
 msgstr "é?¿æ??ä¼¯æ??"
 
-#: ../libanjuta/anjuta-encodings.c:163 ../libanjuta/anjuta-encodings.c:268
+#: ../libanjuta/anjuta-encodings.c:163
+#: ../libanjuta/anjuta-encodings.c:268
 msgid "Greek"
 msgstr "å¸?è??æ??"
 
@@ -116,12 +128,14 @@ msgstr "å¸?è??æ??"
 msgid "Hebrew Visual"
 msgstr "å¸?ä¼¯ä¾?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:167 ../libanjuta/anjuta-encodings.c:231
+#: ../libanjuta/anjuta-encodings.c:167
+#: ../libanjuta/anjuta-encodings.c:231
 #: ../libanjuta/anjuta-encodings.c:272
 msgid "Hebrew"
 msgstr "å¸?ä¼¯ä¾?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:169 ../libanjuta/anjuta-encodings.c:229
+#: ../libanjuta/anjuta-encodings.c:169
+#: ../libanjuta/anjuta-encodings.c:229
 #: ../libanjuta/anjuta-encodings.c:270
 msgid "Turkish"
 msgstr "å??è?³å?¶æ??"
@@ -142,7 +156,8 @@ msgstr "ç¾?é¦¬å°¼äº?æ??"
 msgid "Armenian"
 msgstr "é?¿ç¾?å°¼äº?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:193 ../libanjuta/anjuta-encodings.c:195
+#: ../libanjuta/anjuta-encodings.c:193
+#: ../libanjuta/anjuta-encodings.c:195
 #: ../libanjuta/anjuta-encodings.c:209
 msgid "Chinese Traditional"
 msgstr "ç¹?é«?ä¸æ??"
@@ -151,19 +166,25 @@ msgstr "ç¹?é«?ä¸æ??"
 msgid "Cyrillic/Russian"
 msgstr "æ?¯æ??å¤«æ??/ä¿?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:200 ../libanjuta/anjuta-encodings.c:202
-#: ../libanjuta/anjuta-encodings.c:204 ../libanjuta/anjuta-encodings.c:236
+#: ../libanjuta/anjuta-encodings.c:200
+#: ../libanjuta/anjuta-encodings.c:202
+#: ../libanjuta/anjuta-encodings.c:204
+#: ../libanjuta/anjuta-encodings.c:236
 #: ../libanjuta/anjuta-encodings.c:251
 msgid "Japanese"
 msgstr "æ?¥æ??"
 
-#: ../libanjuta/anjuta-encodings.c:207 ../libanjuta/anjuta-encodings.c:238
-#: ../libanjuta/anjuta-encodings.c:242 ../libanjuta/anjuta-encodings.c:257
+#: ../libanjuta/anjuta-encodings.c:207
+#: ../libanjuta/anjuta-encodings.c:238
+#: ../libanjuta/anjuta-encodings.c:242
+#: ../libanjuta/anjuta-encodings.c:257
 msgid "Korean"
 msgstr "é??æ??"
 
-#: ../libanjuta/anjuta-encodings.c:212 ../libanjuta/anjuta-encodings.c:214
-#: ../libanjuta/anjuta-encodings.c:216 ../libanjuta/anjuta-encodings.c:220
+#: ../libanjuta/anjuta-encodings.c:212
+#: ../libanjuta/anjuta-encodings.c:214
+#: ../libanjuta/anjuta-encodings.c:216
+#: ../libanjuta/anjuta-encodings.c:220
 msgid "Chinese Simplified"
 msgstr "ç°¡é«?ä¸æ??"
 
@@ -175,7 +196,8 @@ msgstr "æ ¼é¯å??äº?æ??"
 msgid "Cyrillic/Ukrainian"
 msgstr "æ?¯æ??å¤«æ??/ç??é»?è?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:253 ../libanjuta/anjuta-encodings.c:259
+#: ../libanjuta/anjuta-encodings.c:253
+#: ../libanjuta/anjuta-encodings.c:259
 #: ../libanjuta/anjuta-encodings.c:278
 msgid "Vietnamese"
 msgstr "è¶?å??æ??"
@@ -184,7 +206,8 @@ msgstr "è¶?å??æ??"
 msgid "Thai"
 msgstr "æ³°æ??"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:193
+#: ../libanjuta/anjuta-encodings.c:441
+#: ../plugins/gbf-am/gbf-am-project.c:193
 #: ../plugins/gbf-am/gbf-am-project.c:3372
 #: ../plugins/gbf-am/gbf-am-properties.c:130
 #: ../plugins/gbf-am/gbf-am-properties.c:177
@@ -196,17 +219,20 @@ msgstr "æ³°æ??"
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libanjuta/anjuta-launcher.c:1168 ../libanjuta/resources.c:267
-#: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
+#: ../libanjuta/anjuta-launcher.c:1169
+#: ../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:1169
+#: ../libanjuta/anjuta-launcher.c:1170
 msgid "execvp failed"
 msgstr "execvp å·²å¤±æ??"
 
-#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2312
+#: ../libanjuta/anjuta-plugin.c:326
+#: ../libanjuta/anjuta-plugin-manager.c:2312
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -223,8 +249,7 @@ msgstr "å¤?æ??ç¨?å¼?ã??%sã??ä¸?æ?³è¦?è¢«å??æ¢ä½¿ç?¨"
 #, c-format
 msgid ""
 "Could not load %s\n"
-"This usually means that your installation is corrupted. The error message "
-"leading to this was:\n"
+"This usually means that your installation is corrupted. The error message leading to this was:\n"
 "%s"
 msgstr ""
 "ç?¡æ³?è¼?å?¥ %s\n"
@@ -241,7 +266,8 @@ msgstr "è¼?å?¥"
 msgid "Available Plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:934
+#: ../libanjuta/anjuta-plugin-manager.c:1036
+#: ../src/anjuta-app.c:934
 msgid "Preferred plugins"
 msgstr "å??å¥½ç??å¤?æ??ç¨?å¼?"
 
@@ -250,10 +276,7 @@ msgid "Only show user activatable plugins"
 msgstr "å?ªé¡¯ç¤ºä½¿ç?¨è??å?¯å??ç?¨ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1197
-msgid ""
-"These are the plugins selected by you when Anjuta prompted to choose one of "
-"many suitable plugins. Removing the preferred plugin will let Anjuta prompt "
-"you again to choose different plugin."
+msgid "These are the plugins selected by you when Anjuta prompted to choose one of many suitable plugins. Removing the preferred plugin will let Anjuta prompt you again to choose different plugin."
 msgstr "é??è£?æ?¯å?¨ Anjuta æ??ç¤ºä½ å¾?è¨±å¤?å??é?©ç??å¤?æ??ç¨?å¼?ä¸é?¸æ??ä¸?å??æ??æ??é?¸å??ç??å¤?æ??ç¨?å¼?ã??ç§»é?¤é??äº?é¦?é?¸ç??å¤?æ??ç¨?å¼?æ??è®? Anjuta å??åº¦æ??ç¤ºä½ é?¸æ??å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1223
@@ -261,7 +284,8 @@ msgid "Forget selected plugin"
 msgstr "å¿?æ??å·²é?¸å??ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
-#: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
+#: ../libanjuta/anjuta-plugin-manager.c:1508
+#: ../libanjuta/anjuta-profile.c:507
 #: ../plugins/debug-manager/queue.c:529
 msgid "Select a plugin"
 msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
@@ -361,9 +385,7 @@ msgstr "è«?å¾?æ¸?å?®ä¸é?¸æ??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-profile.c:672
 #, 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 profile."
 msgstr "è®?å??ã??%sã??å¤±æ??ï¼?XML è§£æ??é?¯èª¤ã??ç?¡æ??æ??æ??å£?ç?? Anjuta å¤?æ??ç¨?å¼?è¨å®?çµ?å??ã??"
 
 #. <Pluginname>: Install it from <some location on the web>
@@ -391,19 +413,22 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
+#: ../libanjuta/anjuta-preferences.c:1538
+#: ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "é??ç½®(_R)"
 
 #: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:229 ../plugins/gtodo/mcategory.c:36
+#: ../plugins/gtodo/interface.c:219
+#: ../plugins/gtodo/mcategory.c:36
 msgid "Category"
 msgstr "å??é¡?"
 
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:921
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../src/anjuta-app.c:921
 #: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "ä¸?è?¬"
@@ -422,6 +447,7 @@ msgstr "å¦?æ??ä½ æ²?æ??å?²å?ï¼?å°?é?ºå¤±æ??æ??ä¿®æ?¹ã??"
 
 #: ../libanjuta/anjuta-save-prompt.c:189
 #: ../plugins/document-manager/plugin.c:605
+#: ../plugins/snippets-manager/snippets-editor.ui.h:11
 msgid "Save"
 msgstr "å?²å?"
 
@@ -433,15 +459,14 @@ msgstr "é ?ç?®"
 msgid "_Discard changes"
 msgstr "æ??æ£?æ?´æ?¹(_D)"
 
-#: ../libanjuta/anjuta-save-prompt.c:297
+#: ../libanjuta/anjuta-save-prompt.c:296
 #, c-format
-msgid ""
-"<b>There is %d item with unsaved changes. Save changes before closing?</b>"
-msgid_plural ""
-"<b>There are %d items with unsaved changes. Save changes before closing?</b>"
-msgstr[0] "<b>é??è£?æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å?ç??æ?´æ?¹ã??æ?¯å?¦å?¨é??é??å??å?²å?æ?´æ?¹ï¼?</b>"
+#| msgid "There is an item with unsaved changes. Save changes before closing?"
+msgid "There is %d item with unsaved changes. Save changes before closing?"
+msgid_plural "There are %d items with unsaved changes. Save changes before closing?"
+msgstr[0] "é??è£?æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å?ç??æ?´æ?¹ã??æ?¯å?¦å?¨é??é??å??å?²å?æ?´æ?¹ï¼?"
 
-#: ../libanjuta/anjuta-save-prompt.c:304
+#: ../libanjuta/anjuta-save-prompt.c:305
 msgid "There is an item with unsaved changes. Save changes before closing?"
 msgstr "æ??ä¸?å??é ?ç?®å°?æ?ªå?²å?ä¿®æ?¹ã??çµ?æ??å??å?²å?ï¼?"
 
@@ -467,18 +492,15 @@ msgid "System:"
 msgstr "ç³»çµ±ï¼?"
 
 #: ../libanjuta/anjuta-utils.c:505
-msgid ""
-"You do not seem to have PackageKit installed. PackageKit is required for "
-"installing missing packages. Please install \"packagekit-gnome\" package "
-"from your distribution, or install the missing packages manually."
+msgid "You do not seem to have PackageKit installed. PackageKit is required for installing missing packages. Please install \"packagekit-gnome\" package from your distribution, or install the missing packages manually."
 msgstr "ä½ ä¼¼ä¹?æ²?æ??å®?è£? PackageKitã??å¿?é ?æ?? PackageKit æ??è?½å®?è£?ç¼ºå°?ç??å¥?ä»¶ã??è«?å¾?ä½ ç??ç?¼è¡?ç??æ?¬å®?è£?ã??packagekit-gnomeã??å¥?ä»¶ï¼?æ??æ??å??å®?è£?ç¼ºå°?ç??å¥?ä»¶ã??"
 
-#: ../libanjuta/anjuta-utils.c:515
+#: ../libanjuta/anjuta-utils.c:514
 #, c-format
 msgid "Installation failed: %s"
 msgstr "å®?è£?ä½?æ?¯å¤±æ??ï¼?%s"
 
-#: ../libanjuta/anjuta-utils.c:575
+#: ../libanjuta/anjuta-utils.c:582
 #, c-format
 msgid ""
 "The \"%s\" package is not installed.\n"
@@ -487,7 +509,7 @@ msgstr ""
 "ä½ å°?æ?ªå®?è£?ã??%sã??å¥?ä»¶ã??\n"
 "è«?å®?è£?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:593
+#: ../libanjuta/anjuta-utils.c:600
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -497,23 +519,23 @@ msgstr ""
 "è«?å®?è£?å®?ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:1172
+#: ../libanjuta/anjuta-utils.c:1179
 msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ?¾ä¸?å?°çµ?ç«¯æ©?ï¼?ä½¿ç?¨ xtermï¼?ä¸?ç®¡å®?è?½ä¸?è?½é??ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1208 ../libanjuta/anjuta-utils.c:1212
-#: ../libanjuta/anjuta-utils.c:1240 ../libanjuta/anjuta-utils.c:1244
+#: ../libanjuta/anjuta-utils.c:1215
+#: ../libanjuta/anjuta-utils.c:1219
+#: ../libanjuta/anjuta-utils.c:1247
+#: ../libanjuta/anjuta-utils.c:1251
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??ä»¤ï¼?%sï¼?ä½¿ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1894
-msgid ""
-"Unable to display help. Please make sure the Anjuta documentation package is "
-"installed. It can be downloaded from http://anjuta.org.";
+#: ../libanjuta/anjuta-utils.c:1901
+msgid "Unable to display help. Please make sure the Anjuta documentation package is installed. It can be downloaded from http://anjuta.org.";
 msgstr "ç?¡æ³?é¡¯ç¤ºæ±?å?©æ??ä»¶ã??è«?ç¢ºå®? Anjuta æ??ä»¶å¥?ä»¶å·²å®?è£?ã??ä½ å?¯ä»¥å¾? http://anjuta.org ä¸?è¼?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:2333
+#: ../libanjuta/anjuta-utils.c:2340
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
@@ -564,7 +586,8 @@ msgid "Ignored"
 msgstr "å·²å¿½ç?¥"
 
 #: ../libanjuta/cell-renderer-captioned-image.c:218
-#: ../libfoocanvas/foo-canvas-text.c:177 ../src/preferences.ui.h:18
+#: ../libfoocanvas/foo-canvas-text.c:177
+#: ../src/preferences.ui.h:18
 msgid "Text"
 msgstr "æ??å?"
 
@@ -586,16 +609,19 @@ msgstr "æº?å??æ??ç¹ªç?? pixbufã??"
 msgid "Widget not found: %s"
 msgstr "ç?¡æ³?æ?¾å?°å??ä»¶ï¼?%s"
 
-#: ../libanjuta/resources.c:79 ../libanjuta/resources.c:101
+#: ../libanjuta/resources.c:79
+#: ../libanjuta/resources.c:101
 #, c-format
 msgid "Could not find application pixmap file: %s"
 msgstr "ç?¡æ³?æ?¾å?°ç¨?å¼?å??ç¤ºæª?ï¼?%s"
 
-#: ../libfoocanvas/foo-canvas.c:1227 ../libfoocanvas/foo-canvas.c:1228
+#: ../libfoocanvas/foo-canvas.c:1227
+#: ../libfoocanvas/foo-canvas.c:1228
 msgid "X"
 msgstr "X"
 
-#: ../libfoocanvas/foo-canvas.c:1234 ../libfoocanvas/foo-canvas.c:1235
+#: ../libfoocanvas/foo-canvas.c:1234
+#: ../libfoocanvas/foo-canvas.c:1235
 msgid "Y"
 msgstr "Y"
 
@@ -632,23 +658,28 @@ msgstr "å?å??æ??ç³»"
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "å?å??æ??ç³»å??ç¨±ï¼?ä¾?å¦?ï¼?Sansã??Helveticaã??Timesã??Monospace"
 
-#: ../libfoocanvas/foo-canvas-text.c:247 ../libfoocanvas/foo-canvas-text.c:248
+#: ../libfoocanvas/foo-canvas-text.c:247
+#: ../libfoocanvas/foo-canvas-text.c:248
 msgid "Font style"
 msgstr "å?å??æ¨£å¼?"
 
-#: ../libfoocanvas/foo-canvas-text.c:257 ../libfoocanvas/foo-canvas-text.c:258
+#: ../libfoocanvas/foo-canvas-text.c:257
+#: ../libfoocanvas/foo-canvas-text.c:258
 msgid "Font variant"
 msgstr "å?å??è®?å??"
 
-#: ../libfoocanvas/foo-canvas-text.c:267 ../libfoocanvas/foo-canvas-text.c:268
+#: ../libfoocanvas/foo-canvas-text.c:267
+#: ../libfoocanvas/foo-canvas-text.c:268
 msgid "Font weight"
 msgstr "å?å??ç²?ç´°"
 
-#: ../libfoocanvas/foo-canvas-text.c:279 ../libfoocanvas/foo-canvas-text.c:280
+#: ../libfoocanvas/foo-canvas-text.c:279
+#: ../libfoocanvas/foo-canvas-text.c:280
 msgid "Font stretch"
 msgstr "å?å??å¯¬ç·?"
 
-#: ../libfoocanvas/foo-canvas-text.c:289 ../libfoocanvas/foo-canvas-text.c:290
+#: ../libfoocanvas/foo-canvas-text.c:289
+#: ../libfoocanvas/foo-canvas-text.c:290
 msgid "Font size"
 msgstr "å?å??å¤§å°?"
 
@@ -665,8 +696,7 @@ msgid "Rise"
 msgstr "å??é«?"
 
 #: ../libfoocanvas/foo-canvas-text.c:312
-msgid ""
-"Offset of text above the baseline (below the baseline if rise is negative)"
+msgid "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr "æ??å?å??åº?é?¨å?ºæº?ç·?ç??è·?é?¢ (å¦?æ??å??é«?ç??æ?¸å?¼ç?ºè² æ?¸ï¼?å??è¡¨ç¤ºä½?æ?¼å?ºæº?ç·?)"
 
 #: ../libfoocanvas/foo-canvas-text.c:322
@@ -693,7 +723,8 @@ msgstr "ç¸®æ?¾"
 msgid "Size of font, relative to default size"
 msgstr "ç?®å??ç??å?å??å¤§å°?ç?¸å°?æ?¼å??ä¾?å¤§å°?ç??æ¯?ä¾?"
 
-#: ../libfoocanvas/foo-canvas-text.c:402 ../libfoocanvas/foo-canvas-text.c:410
+#: ../libfoocanvas/foo-canvas-text.c:402
+#: ../libfoocanvas/foo-canvas-text.c:410
 #: ../libfoocanvas/foo-canvas-text.c:418
 msgid "Color"
 msgstr "é¡?è?²"
@@ -879,7 +910,8 @@ msgstr "ç¿»è¯è¨?æ?¯"
 #: ../plugins/build-basic-autotools/configuration-list.c:68
 #: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
+#: ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "é ?è¨"
 
@@ -992,7 +1024,7 @@ msgid "Command exited with status %d"
 msgstr "æ??ä»¤ä»¥ %d ç??æ??é?¢é??"
 
 #: ../plugins/build-basic-autotools/plugin.c:1048
-#: ../plugins/build-basic-autotools/plugin.c:1528
+#: ../plugins/build-basic-autotools/plugin.c:1527
 #, c-format
 msgid "Command canceled by user"
 msgstr "æ??ä»¤è¢«ä½¿ç?¨è??å??æ¶?"
@@ -1034,204 +1066,201 @@ msgstr "å»ºç½® %d: %s"
 
 #. Need to run make clean before
 #: ../plugins/build-basic-autotools/plugin.c:1522
-msgid ""
-"Before using this new configuration, the default one needs to be removed. Do "
-"you want to do that ?"
+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:1826
+#: ../plugins/build-basic-autotools/plugin.c:1823
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ç?¡æ³?ç·¨è¯ã??%sã??ï¼?æ²?æ??ç?ºæ¤æª?æ¡?é¡?å??å®?ç¾©ä»»ä½?ç·¨è¯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1961
+#: ../plugins/build-basic-autotools/plugin.c:1958
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½è¨å®?å°?æ¡?ï¼?%s ä¸é?ºå¤±è¨å®?å?½ä»¤ç¨¿ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2442
-#: ../plugins/build-basic-autotools/plugin.c:2516
-#: ../plugins/build-basic-autotools/plugin.c:2526
-#: ../plugins/build-basic-autotools/plugin.c:2544
-#: ../plugins/build-basic-autotools/plugin.c:2554
-#: ../plugins/build-basic-autotools/plugin.c:2611
+#: ../plugins/build-basic-autotools/plugin.c:2439
+#: ../plugins/build-basic-autotools/plugin.c:2513
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2541
+#: ../plugins/build-basic-autotools/plugin.c:2551
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Build"
 msgstr "å»ºç½®(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2446
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "_Build Project"
 msgstr "å»ºç½®å°?æ¡?(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2447
+#: ../plugins/build-basic-autotools/plugin.c:2444
 msgid "Build whole project"
 msgstr "å»ºç½®æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2452
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "_Install Project"
 msgstr "å®?è£?å°?æ¡?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2453
+#: ../plugins/build-basic-autotools/plugin.c:2450
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2458
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2456
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2464
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "C_onfigure Projectâ?¦"
 msgstr "è¨å®?å°?æ¡?(_O)..."
 
-#: ../plugins/build-basic-autotools/plugin.c:2465
+#: ../plugins/build-basic-autotools/plugin.c:2462
 msgid "Configure project"
 msgstr "è¨å®?å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build _Tarball"
 msgstr "å»ºç½® _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2471
+#: ../plugins/build-basic-autotools/plugin.c:2468
 msgid "Build project tarball distribution"
 msgstr "å»ºç½®å°?æ¡? tarball ç?¼è¡?å¥?ä»¶"
 
-#: ../plugins/build-basic-autotools/plugin.c:2476
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "_Build Module"
 msgstr "å»ºç½®æ¨¡çµ?(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2477
+#: ../plugins/build-basic-autotools/plugin.c:2474
 msgid "Build module associated with current file"
 msgstr "å»ºç½®è??ç?®å??æª?æ¡?é??è?¯ç??æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "_Install Module"
 msgstr "å®?è£?æ¨¡çµ?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2483
+#: ../plugins/build-basic-autotools/plugin.c:2480
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "_Clean Module"
 msgstr "æ¸?é?¤æ¨¡çµ?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2489
+#: ../plugins/build-basic-autotools/plugin.c:2486
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2494
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Co_mpile File"
 msgstr "ç·¨è¯æª?æ¡?(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2495
+#: ../plugins/build-basic-autotools/plugin.c:2492
 msgid "Compile current editor file"
 msgstr "ç·¨è¯ç?®å??ç·¨è¼¯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2501
+#: ../plugins/build-basic-autotools/plugin.c:2498
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2503
 msgid "Remove Configuration"
 msgstr "ç§»é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2507
-msgid ""
-"Clean project (distclean) and remove configuration directory if possible"
+#: ../plugins/build-basic-autotools/plugin.c:2504
+msgid "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??å°?æ¡? (distclean)ï¼?å?¯è?½ç??è©±ä¸?ä½µç§»é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2520
-#: ../plugins/build-basic-autotools/plugin.c:2548
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "_Compile"
 msgstr "ç·¨è¯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2521
-#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2518
+#: ../plugins/build-basic-autotools/plugin.c:2546
 msgid "Compile file"
 msgstr "ç·¨è¯æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2527
-#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2524
+#: ../plugins/build-basic-autotools/plugin.c:2552
 msgid "Build module"
 msgstr "å»ºç½®æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2532
-#: ../plugins/build-basic-autotools/plugin.c:2560
-#: ../plugins/build-basic-autotools/plugin.c:2618
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Install"
 msgstr "å®?è£?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2533
-#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2530
+#: ../plugins/build-basic-autotools/plugin.c:2558
 msgid "Install module"
 msgstr "å®?è£?æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2538
-#: ../plugins/build-basic-autotools/plugin.c:2566
-#: ../plugins/build-basic-autotools/plugin.c:2625
+#: ../plugins/build-basic-autotools/plugin.c:2535
+#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2622
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2539
-#: ../plugins/build-basic-autotools/plugin.c:2567
+#: ../plugins/build-basic-autotools/plugin.c:2536
+#: ../plugins/build-basic-autotools/plugin.c:2564
 msgid "Clean module"
 msgstr "æ¸?é?¤æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2569
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??ä»¤(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2573
+#: ../plugins/build-basic-autotools/plugin.c:2570
 msgid "Cancel build command"
 msgstr "å??æ¶?å»ºç½®æ??ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:2611
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Build (%s)"
 msgstr "å»ºç½®(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2618
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Install (%s)"
 msgstr "å®?è£?(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2625
+#: ../plugins/build-basic-autotools/plugin.c:2622
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2633
+#: ../plugins/build-basic-autotools/plugin.c:2630
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "ç·¨è¯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2633
+#: ../plugins/build-basic-autotools/plugin.c:2630
 #, c-format
 msgid "Co_mpile"
 msgstr "ç·¨è¯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3169
+#: ../plugins/build-basic-autotools/plugin.c:3166
 msgid "Build commands"
 msgstr "å»ºç½®å?½ä»¤"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3178
+#: ../plugins/build-basic-autotools/plugin.c:3175
 msgid "Build popup commands"
 msgstr "å»ºç½®å½?å?ºå¼?æ??ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:3560
-#: ../plugins/build-basic-autotools/plugin.c:3568
+#: ../plugins/build-basic-autotools/plugin.c:3557
+#: ../plugins/build-basic-autotools/plugin.c:3565
 msgid "Build Autotools"
 msgstr "å»ºç½® Autotools"
 
@@ -1310,22 +1339,22 @@ msgstr "ä¸?è?¬é¡?å?¥å±¬æ?§"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 #: ../plugins/file-wizard/file.c:103
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:14
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:16
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:15
-#: ../plugins/project-wizard/templates/java.wiz.in.h:15
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:17
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:16
+#: ../plugins/project-wizard/templates/java.wiz.in.h:16
 #: ../plugins/project-wizard/templates/js.wiz.in.h:8
-#: ../plugins/project-wizard/templates/python.wiz.in.h:15
+#: ../plugins/project-wizard/templates/python.wiz.in.h:16
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:12
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:19
-#: ../plugins/project-wizard/templates/library.wiz.in.h:15
+#: ../plugins/project-wizard/templates/library.wiz.in.h:16
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è¨±å?¯è? (GPL)"
 
@@ -1339,7 +1368,7 @@ msgstr "æ¨?é æª?ï¼?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "Inline the declaration and implementation"
-msgstr ""
+msgstr "è¡?å?§å®£å??è??å¯¦ä½?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 #: ../plugins/file-wizard/file.c:104
@@ -1356,8 +1385,8 @@ msgstr ""
 #: ../plugins/project-wizard/templates/java.wiz.in.h:18
 #: ../plugins/project-wizard/templates/js.wiz.in.h:10
 #: ../plugins/project-wizard/templates/python.wiz.in.h:18
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:13
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:23
 #: ../plugins/project-wizard/templates/library.wiz.in.h:17
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU å¯¬é??ç?¨å?¬å?±è¨±å?¯è? (LGPL)"
@@ -1391,35 +1420,36 @@ msgstr "ä¾?æº?æª?æ¡?ï¼?"
 msgid "Source/Header Headings:"
 msgstr "ä¾?æº?/æ¨?é ç??æ¨?é¡?ï¼?"
 
-#: ../plugins/class-gen/generator.c:132
+#: ../plugins/class-gen/generator.c:133
 #, c-format
 msgid "Header or source file has not been created"
 msgstr "æ¨?é æ??å??å§?æª?å°?æ?ªå»ºç«?"
 
-#: ../plugins/class-gen/generator.c:294
+#: ../plugins/class-gen/generator.c:295
 msgid "Autogen template used for the header file"
 msgstr "ç?¨æ?¼æ¨?é æª?æ¡?ç?? autogen ç¯?æ?¬"
 
-#: ../plugins/class-gen/generator.c:302
+#: ../plugins/class-gen/generator.c:303
 msgid "Autogen template used for the implementation file"
 msgstr "ç?¨æ?¼å¯¦ä½?æª?æ¡?ç?? autogen ç¯?æ?¬"
 
-#: ../plugins/class-gen/generator.c:310 ../plugins/class-gen/generator.c:318
+#: ../plugins/class-gen/generator.c:311
+#: ../plugins/class-gen/generator.c:319
 msgid "File to which the processed template will be written"
 msgstr "ç?¨ä¾?å¯«å?¥å·²è??ç??ç¯?æ?¬ç??æª?æ¡?"
 
-#: ../plugins/class-gen/generator.c:402
+#: ../plugins/class-gen/generator.c:403
 #, c-format
 msgid "Failed to write autogen definition file"
 msgstr "å¯«å?¥ autogen å®?ç¾©æª?æ¡?å¤±æ??"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1146
-msgid ""
-"Could not find autogen version 5; please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net.";
+#: ../plugins/class-gen/plugin.c:98
+#: ../plugins/project-wizard/druid.c:1160
+msgid "Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";
 msgstr "æ?¾ä¸?å?° autogen ç¬¬äº?ç??ï¼?è«?å®?è£? autogen å¥?ä»¶ã??ä½ å?¯ä»¥å¾? http://autogen.sourceforge.net å??å¾?ã??"
 
-#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
+#: ../plugins/class-gen/plugin.c:242
+#: ../plugins/class-gen/plugin.c:410
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "ç?¡æ³?å?·è¡? autogenï¼? %s"
@@ -1428,7 +1458,8 @@ msgstr "ç?¡æ³?å?·è¡? autogenï¼? %s"
 msgid "Guess from type"
 msgstr "å¾?é¡?å??æ?¨æ¸¬"
 
-#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/class-gen/window.c:499
+#: ../plugins/class-gen/window.c:510
 #: ../plugins/search/anjuta-search.ui.h:29
 msgid "Scope"
 msgstr "ç¯?å??"
@@ -1437,52 +1468,59 @@ msgstr "ç¯?å??"
 msgid "Implementation"
 msgstr "å¯¦ä½?"
 
-#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
+#: ../plugins/class-gen/window.c:501
+#: ../plugins/class-gen/window.c:511
 #: ../plugins/class-gen/window.c:533
 #: ../plugins/debug-manager/breakpoints.c:1952
 #: ../plugins/debug-manager/debug_tree.c:128
+#: ../plugins/snippets-manager/snippets-editor.c:38
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
-#: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
+#: ../plugins/class-gen/window.c:502
+#: ../plugins/class-gen/window.c:512
+#: ../plugins/class-gen/window.c:520
+#: ../plugins/class-gen/window.c:534
 #: ../plugins/run-program/parameters.c:754
 #: ../plugins/search/search_preferences.c:534
+#: ../plugins/snippets-manager/plugin.c:751
+#: ../plugins/snippets-manager/snippets-browser.c:530
+#: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
+#: ../plugins/class-gen/window.c:503
+#: ../plugins/class-gen/window.c:513
 #: ../plugins/class-gen/window.c:535
 #: ../plugins/debug-manager/stack_trace.c:712
 msgid "Arguments"
 msgstr "å??æ?¸"
 
 #: ../plugins/class-gen/window.c:521
-#, fuzzy
 msgid "Nick"
-msgstr "ç¶²å??è£?é½?å?ç¬¦"
+msgstr "ç¶²å??"
 
 #: ../plugins/class-gen/window.c:522
 msgid "Blurb"
-msgstr ""
+msgstr "å®£å?³"
 
 #: ../plugins/class-gen/window.c:523
 msgid "GType"
 msgstr "GType"
 
 #: ../plugins/class-gen/window.c:524
-#, fuzzy
 msgid "ParamSpec"
-msgstr "å??æ?¸ï¼?"
+msgstr "ParamSpec"
 
 #. Somehow redundant with marshaller, but required for default handler
-#: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
+#: ../plugins/class-gen/window.c:526
+#: ../plugins/class-gen/window.c:536
 msgid "Flags"
 msgstr "æ??æ¨?"
 
 #: ../plugins/class-gen/window.c:537
 msgid "Marshaller"
-msgstr ""
+msgstr "æ?´ç??å?¨"
 
 #: ../plugins/class-gen/window.c:818
 msgid "XML description of the user interface"
@@ -1507,9 +1545,7 @@ msgstr "ç¹¼æ?¿å??è¡¨"
 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>"
+"Pressing OK will delete the file from disk and from CVS. Of course, the file won't be removed from CVS before you use CVS Commit. <b>You have been warned!</b>"
 msgstr ""
 "<b>è«?æ³¨æ??ï¼?</b>\n"
 "æ??ä¸?ç¢ºå®?æ??å?ªé?¤ç£?ç¢?è?? CVS ä¸?ç??æª?æ¡?ã??ç?¶ç?¶å?¨ä½ ä½¿ç?¨ CVS Commit å??é??ä¸?æ??ç§»é?¤ CVS ä¸?ç??æª?æ¡?ã??<b>å·²ç¶?æ??é??ä½ æ³¨æ??äº?ï¼?</b>"
@@ -1622,7 +1658,7 @@ msgstr "ä¸?è¦?é??è¿´é??ä½?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Extern (rsh)"
-msgstr ""
+msgstr "å¤?é?¨ (rsh)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
@@ -1633,8 +1669,9 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "å¿½ç?¥ .cvsrc æª?ï¼?å»ºè°ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2052
-#: ../plugins/symbol-db/plugin.c:2094
+#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/symbol-db/plugin.c:2055
+#: ../plugins/symbol-db/plugin.c:2097
 msgid "Local"
 msgstr "å??å??"
 
@@ -1653,7 +1690,8 @@ msgstr "æ¨¡çµ?å??ç¨±ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/search/anjuta-search.ui.h:25
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
 msgid "Options"
@@ -1797,14 +1835,16 @@ msgid "CVS command is running â?? please wait until it finishes!"
 msgstr "CVS æ??ä»¤æ£å?¨å?·è¡? â?? è«?ç?å??ç?´å?°å®?çµ?æ??ï¼?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
-#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
+#: ../plugins/cvs-plugin/cvs-execute.c:233
+#: ../plugins/cvs-plugin/plugin.c:467
 #: ../plugins/cvs-plugin/plugin.c:474
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:44 ../plugins/cvs-plugin/plugin.c:119
+#: ../plugins/cvs-plugin/plugin.c:44
+#: ../plugins/cvs-plugin/plugin.c:119
 msgid "_CVS"
 msgstr "_CVS"
 
@@ -1834,62 +1874,72 @@ msgstr "å¾? CVS æ¨¹ç§»é?¤æª?æ¡?/ç?®é??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:68 ../plugins/cvs-plugin/plugin.c:127
+#: ../plugins/cvs-plugin/plugin.c:68
+#: ../plugins/cvs-plugin/plugin.c:127
 msgid "_Commit"
 msgstr "_Commit"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:70 ../plugins/cvs-plugin/plugin.c:129
+#: ../plugins/cvs-plugin/plugin.c:70
+#: ../plugins/cvs-plugin/plugin.c:129
 msgid "Commit your changes to the CVS tree"
 msgstr "æ??äº¤ä½ ç??ä¿®æ?¹è?³ CVS æ¨¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
+#: ../plugins/cvs-plugin/plugin.c:76
+#: ../plugins/cvs-plugin/plugin.c:135
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "_Update"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:78
+#: ../plugins/cvs-plugin/plugin.c:137
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?ä½ æ?¬æ©?ç??è¤?æ?¬è?? CVS æ¨¹å??æ¥"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:84 ../plugins/cvs-plugin/plugin.c:143
+#: ../plugins/cvs-plugin/plugin.c:84
+#: ../plugins/cvs-plugin/plugin.c:143
 msgid "_Diff"
 msgstr "_Diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:86 ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:86
+#: ../plugins/cvs-plugin/plugin.c:145
 msgid "Show differences between your local copy and the tree"
 msgstr "é¡¯ç¤ºä½ ç??æ?¬å?°ç«¯è¤?æ?¬è?? CVS æ¨¹ä¹?é??ç??å·®ç?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:92 ../plugins/cvs-plugin/plugin.c:151
+#: ../plugins/cvs-plugin/plugin.c:92
+#: ../plugins/cvs-plugin/plugin.c:151
 msgid "_Show Status"
 msgstr "é¡¯ç¤ºç??æ??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:94 ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:94
+#: ../plugins/cvs-plugin/plugin.c:153
 msgid "Show the status of a file/directory"
 msgstr "é¡¯ç¤ºæª?æ¡?/ç?®é??ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:100 ../plugins/cvs-plugin/plugin.c:159
+#: ../plugins/cvs-plugin/plugin.c:100
+#: ../plugins/cvs-plugin/plugin.c:159
 msgid "_Show Log"
 msgstr "é¡¯ç¤ºç´?é??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:102 ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:102
+#: ../plugins/cvs-plugin/plugin.c:161
 msgid "Show the log of a file/directory"
 msgstr "é¡¯ç¤ºæª?æ¡?/ç?®é??ç??ç´?é??æª?"
 
@@ -1915,13 +1965,13 @@ msgstr "CVS å½?å?ºå¼?æ??ä½?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
-"program not using the Debug configuration?</span>\n"
+"<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."
+"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 ""
+"<span weight=\"bold\" size=\"larger\">ä½ ç¢ºå®?ä¸?ä½¿ç?¨é?¤é?¯çµ?æ??ä¾?ç?ºç¨?å¼?é?¤é?¯ï¼?</span>\n"
+"\n"
+"ç?¶å??ç?¨æ??ä½³å??æ??ï¼?é?¤é?¯å·¥å?·ä¸?è?½ä¸?ç?´è¾¨è?å?ºæ??ä»¤ç??å??å§?ç¢¼ï¼?å? æ¤æ??äº?æ??ä»¤å?¯è?½æ??å?·è¡?å¾?å¾?å¥?æ?ªï¼?ç?¹å?¥æ?¯å?®æ¥æ??ä»¤ã??"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
@@ -1969,7 +2019,6 @@ msgid "Debugger:"
 msgstr "é?¤é?¯å·¥å?·ï¼?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:12
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
@@ -2283,14 +2332,16 @@ msgid "_Go to address"
 msgstr "ç§»è?³ä½?å??(_G)"
 
 #: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/gbf-am/gbf-am-properties.c:893 ../plugins/tools/editor.c:468
+#: ../plugins/gbf-am/gbf-am-properties.c:893
+#: ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "è®?æ?¸"
 
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/debug-manager/registers.c:469
 #: ../plugins/gbf-am/gbf-am-properties.c:903
-#: ../plugins/run-program/parameters.c:763 ../plugins/tools/editor.c:474
+#: ../plugins/run-program/parameters.c:763
+#: ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "è®?æ?¸å?¼"
 
@@ -2298,7 +2349,8 @@ msgstr "è®?æ?¸å?¼"
 msgid "Disassembly"
 msgstr "å??çµ?è¯"
 
-#: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
+#: ../plugins/debug-manager/info.c:52
+#: ../plugins/debug-manager/info.c:101
 #: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "è³?è¨?"
@@ -2316,9 +2368,12 @@ msgstr "å?°å??è®?æ?¸"
 msgid "Debugger Log"
 msgstr "é?¤é?¯å·¥å?·ç´?é??"
 
-#: ../plugins/debug-manager/plugin.c:411 ../plugins/debug-manager/plugin.c:433
-#: ../plugins/debug-manager/plugin.c:458 ../plugins/debug-manager/plugin.c:485
-#: ../plugins/debug-manager/plugin.c:519 ../plugins/debug-manager/plugin.c:552
+#: ../plugins/debug-manager/plugin.c:411
+#: ../plugins/debug-manager/plugin.c:433
+#: ../plugins/debug-manager/plugin.c:458
+#: ../plugins/debug-manager/plugin.c:485
+#: ../plugins/debug-manager/plugin.c:519
+#: ../plugins/debug-manager/plugin.c:552
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "é?¤é?¯å·¥å?·"
@@ -2518,9 +2573,8 @@ msgid "Step _Out"
 msgstr "æ¥å?º(_O)"
 
 #: ../plugins/debug-manager/plugin.c:1075
-#, fuzzy
 msgid "Single step out of function"
-msgstr "æ¥å?¥ç?®å??å?½æ?¸å?§ç?¶å¾?å?®æ¥å?·è¡?"
+msgstr "å?®æ¥é?¢é??å?½æ?¸"
 
 #: ../plugins/debug-manager/plugin.c:1081
 msgid "_Run to Cursor"
@@ -2586,11 +2640,13 @@ msgstr "æ?«å?å?¨"
 msgid "Shared Object"
 msgstr "å?±äº«ç?©ä»¶"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
+#: ../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:114
+#: ../plugins/debug-manager/sharedlib.c:180
+#: ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "çµ?æ??ä½?å??"
 
@@ -2679,8 +2735,10 @@ msgstr "ç·¨è??"
 
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:664
-#: ../plugins/debug-manager/threads.c:451 ../plugins/gdb/preferences.c:358
-#: ../plugins/tools/tool.c:100 ../src/anjuta-app.c:621
+#: ../plugins/debug-manager/threads.c:451
+#: ../plugins/gdb/preferences.c:363
+#: ../plugins/tools/tool.c:100
+#: ../src/anjuta-app.c:621
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "æª?æ¡?"
@@ -2744,7 +2802,8 @@ msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 msgid "Path"
 msgstr "è·¯å¾?"
 
-#: ../plugins/debug-manager/start.c:1386 ../plugins/gdb/debugger.c:1929
+#: ../plugins/debug-manager/start.c:1386
+#: ../plugins/gdb/debugger.c:1929
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2812,7 +2871,8 @@ msgstr "å?¨é?¨ç§»é?¤"
 msgid "Automatic update"
 msgstr "è?ªå??æ?´æ?°"
 
-#: ../plugins/debug-manager/watch.c:449 ../plugins/debug-manager/watch.c:455
+#: ../plugins/debug-manager/watch.c:449
+#: ../plugins/debug-manager/watch.c:455
 msgid "Watch operations"
 msgstr "ç?£ç??æ??ä½?"
 
@@ -2824,8 +2884,10 @@ msgstr "ç?£ç??"
 msgid "Search Help:"
 msgstr "æ??å°?èªªæ??ï¼?"
 
-#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:241
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:311
+#: ../plugins/devhelp/plugin.c:223
+#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/message-view/plugin.c:76
+#: ../plugins/symbol-db/plugin.c:311
 msgid "_Go to"
 msgstr "ç§»è?³(_G)"
 
@@ -2853,29 +2915,33 @@ msgstr "æ??å°?èªªæ??(_S)"
 msgid "Search for a term in help"
 msgstr "å?¨æ±?å?©ä¸æ??å°?ä¸?å??è©?"
 
-#: ../plugins/devhelp/plugin.c:327
+#: ../plugins/devhelp/plugin.c:326
 msgid "Help operations"
 msgstr "æ±?å?©æ??ä½?"
 
-#: ../plugins/devhelp/plugin.c:346 ../plugins/devhelp/plugin.c:464
+#: ../plugins/devhelp/plugin.c:345
+#: ../plugins/devhelp/plugin.c:462
 #: ../src/anjuta-app.c:638
 msgid "Help"
 msgstr "æ±?å?©"
 
-#: ../plugins/devhelp/plugin.c:357
+#: ../plugins/devhelp/plugin.c:356
 msgid "Contents"
 msgstr "å?§å®¹"
 
-#: ../plugins/devhelp/plugin.c:363 ../plugins/search/search-replace.c:1041
+#: ../plugins/devhelp/plugin.c:362
+#: ../plugins/search/search-replace.c:1041
 #: ../plugins/search/search-replace.c:1717
 #: ../plugins/search/search-replace.c:1724
 #: ../plugins/search/search-replace.c:1736
-#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2062
-#: ../plugins/symbol-db/plugin.c:2114
+#: ../plugins/search/search-replace.c:2065
+#: ../plugins/symbol-db/plugin.c:2065
+#: ../plugins/symbol-db/plugin.c:2117
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../plugins/devhelp/plugin.c:381 ../plugins/devhelp/plugin.c:469
+#: ../plugins/devhelp/plugin.c:380
+#: ../plugins/devhelp/plugin.c:467
 msgid "Help display"
 msgstr "é¡¯ç¤ºæ±?å?©"
 
@@ -2911,7 +2977,9 @@ msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+#: ../plugins/gtodo/callback.c:20
+#: ../plugins/gtodo/callback.c:101
+#: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "ç§»é?¤"
 
@@ -2924,8 +2992,10 @@ msgid "Path:"
 msgstr "è·¯å¾?ï¼?"
 
 #: ../plugins/document-manager/anjuta-docman.c:622
-#: ../plugins/file-loader/plugin.c:591 ../plugins/file-loader/plugin.c:894
-#: ../plugins/file-loader/plugin.c:904 ../plugins/file-loader/plugin.c:917
+#: ../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 "é??å??æª?æ¡?"
 
@@ -3245,7 +3315,8 @@ msgstr "ä¸?ä¸?å??æ·å?²ç´?é??(_Y)"
 msgid "Go to next history"
 msgstr "ç§»è?³ä¸?ä¸?å??æ·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:263 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
@@ -3265,9 +3336,11 @@ msgstr "å¿«é??é??æ?°æ??å°?(_R)"
 msgid "Repeat quick search"
 msgstr "é??è¤?å¿«é??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:273 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:273
+#: ../plugins/gtodo/interface.c:158
 #: ../src/anjuta-actions.h:30
 #: ../plugins/language-support-cpp-java/plugin.c:1876
+#: ../plugins/language-support-python/plugin.c:1176
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
@@ -3318,7 +3391,8 @@ msgstr "å?ªä¸?ç·¨è¼¯å?¨ä¸é?¸å®?ç??æ??å?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:296 ../plugins/terminal/terminal.c:616
+#: ../plugins/document-manager/plugin.c:296
+#: ../plugins/terminal/terminal.c:616
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
@@ -3326,7 +3400,8 @@ msgstr "è¤?è£½(_C)"
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å?è¤?è£½å?°å?ªè²¼ç°¿"
 
-#: ../plugins/document-manager/plugin.c:299 ../plugins/terminal/terminal.c:624
+#: ../plugins/document-manager/plugin.c:299
+#: ../plugins/terminal/terminal.c:624
 msgid "_Paste"
 msgstr "è²¼ä¸?(_P)"
 
@@ -3613,9 +3688,7 @@ msgstr "æ??å°?ã??%sã??å·²é??çµ?å°¾ä¸¦å°?å¾?é é??å§?ã??"
 
 #: ../plugins/document-manager/search-box.c:389
 #, c-format
-msgid ""
-"Search for \"%s\" reached the end and was continued at the top but no new "
-"match was found."
+msgid "Search for \"%s\" reached the end and was continued at the top but no new match was found."
 msgstr "æ??å°?ã??%sã??å·²é??çµ?å°¾ä¸¦å·²å¾?é é??å§?ï¼?ä½?å·²æ?¾ä¸?å?°ç¬¦å??é ?ç?®ã??"
 
 #: ../plugins/document-manager/search-box.c:446
@@ -3695,8 +3768,7 @@ msgstr ""
 msgid ""
 "<b>Cannot open \"%s\"</b>.\n"
 "\n"
-"There is no plugin, default action, or application configured to handle this "
-"file type.\n"
+"There is no plugin, default action, or application configured to handle this file type.\n"
 "\n"
 "MIME type: %s\n"
 "\n"
@@ -3720,7 +3792,8 @@ msgstr "ä»¥æ¤é??å??ï¼?"
 msgid "Document Manager"
 msgstr "æ??ä»¶ç®¡ç??å?¡"
 
-#: ../plugins/file-loader/plugin.c:497 ../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 "æ??æ??æª?æ¡?"
@@ -3794,19 +3867,23 @@ msgstr "æ?°å¢?ç©ºç?½æª?æ¡?"
 msgid "_Openâ?¦"
 msgstr "é??å??(_O)â?¦"
 
-#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
+#: ../plugins/file-loader/plugin.c:903
+#: ../plugins/file-loader/plugin.c:916
 msgid "_Open"
 msgstr "é??å??(_O)"
 
-#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
+#: ../plugins/file-loader/plugin.c:910
+#: ../plugins/file-loader/plugin.c:923
 msgid "Open _With"
 msgstr "é??å??ä»¥(_W)"
 
-#: ../plugins/file-loader/plugin.c:911 ../plugins/file-loader/plugin.c:924
+#: ../plugins/file-loader/plugin.c:911
+#: ../plugins/file-loader/plugin.c:924
 msgid "Open with"
 msgstr "é??å??ä»¥"
 
-#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
+#: ../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 "æª?æ¡?è¼?å?¥å?¨"
@@ -3819,7 +3896,8 @@ msgstr "æ?°å¢?"
 msgid "New file, project and project components."
 msgstr "æ?°å¢?æª?æ¡?ã??å°?æ¡?å??å°?æ¡?å??ä»¶ã??"
 
-#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
+#: ../plugins/file-loader/plugin.c:1261
+#: ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "é??å??"
 
@@ -3827,7 +3905,8 @@ msgstr "é??å??"
 msgid "Open _Recent"
 msgstr "æ??è¿?é??å??(_R)"
 
-#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1266
+#: ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "æ??è¿?é??å??ç??æª?æ¡?"
 
@@ -3839,7 +3918,8 @@ msgstr "æ??è¿?é??å??ç??æª?æ¡?"
 msgid "Open a file"
 msgstr "é??å??æª?æ¡?"
 
-#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
+#: ../plugins/file-loader/plugin.c:1416
+#: ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "æ?¾ä¸?å?°æª?æ¡?"
@@ -3850,7 +3930,8 @@ msgstr "æ?¾ä¸?å?°æª?æ¡?"
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? <b>%s</b> ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
+#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "ä»¥æ¤é??å??"
 
@@ -3879,7 +3960,8 @@ msgid "Filter"
 msgstr "é??æ¿¾æ¢?ä»¶"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2057 ../plugins/symbol-db/plugin.c:2106
+#: ../plugins/symbol-db/plugin.c:2060
+#: ../plugins/symbol-db/plugin.c:2109
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å??"
@@ -3920,7 +4002,8 @@ msgstr "æª?æ¡?ç®¡ç??ç¨?å¼?å½?å?ºå¼?å??ä½?"
 msgid "Files"
 msgstr "æª?æ¡?"
 
-#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
+#: ../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 "æª?æ¡?ç®¡ç??å?¡"
@@ -3954,7 +4037,7 @@ msgid "File Information"
 msgstr "æª?æ¡?è³?è¨?"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
-#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:64
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??ç¨±ï¼?"
@@ -4018,7 +4101,8 @@ msgstr "BSD å?¬å?±è¨±å?¯è?"
 msgid "Unable to build user interface for New File"
 msgstr "ç?¡æ³?å»ºç«?æ?°æª?æ¡?ç??ä½¿ç?¨è??ä»?é?¢"
 
-#: ../plugins/gbf-am/gbf-am-config.c:98 ../plugins/gbf-am/gbf-am-config.c:132
+#: ../plugins/gbf-am/gbf-am-config.c:98
+#: ../plugins/gbf-am/gbf-am-config.c:132
 msgid "Invalid GbfAmConfigValue type"
 msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
 
@@ -4039,7 +4123,6 @@ msgid "Select Package to add:"
 msgstr "é?¸æ??è¦?å? å?¥ç??å¥?ä»¶ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
-#: ../plugins/project-wizard/property.c:376
 msgid "Select package"
 msgstr "é?¸æ??å¥?ä»¶"
 
@@ -4135,12 +4218,12 @@ msgstr "ä»?é?¢æª?æ¡?"
 #: ../plugins/gbf-am/gbf-am-project.c:241
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:239
 msgid "GLib mkenums"
-msgstr ""
+msgstr "GLib mkenums"
 
 #: ../plugins/gbf-am/gbf-am-project.c:244
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
 msgid "GLib genmarshal"
-msgstr ""
+msgstr "GLib genmarshal"
 
 #: ../plugins/gbf-am/gbf-am-project.c:247
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:245
@@ -4282,8 +4365,7 @@ msgid "Source doesn't exist"
 msgstr "ä¾?æº?ä¸?å?å?¨"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3532
-msgid ""
-"Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "ä¾?æº?æª?æ¡?å??ç¨±å?ªè?½å??å?«è?±æ??å?æ¯?ã??'_'ã??'-' æ?? '.' å?ç¬¦"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3612
@@ -4317,9 +4399,7 @@ msgstr "è¼¸å?¥æ?°ç??æ¨¡çµ?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:449
 #, c-format
-msgid ""
-"Are you sure you want to remove module \"%s\" and all its associated "
-"packages?"
+msgid "Are you sure you want to remove module \"%s\" and all its associated packages?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?ç§»é?¤æ¨¡çµ?ã??%sã??è??æ??æ??è??å®?é??è?¯ç??å¥?ä»¶ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:451
@@ -4360,8 +4440,8 @@ msgstr "å°?æ¡?å??ç¨±:"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:29
 #: ../plugins/project-wizard/templates/js.wiz.in.h:17
 #: ../plugins/project-wizard/templates/python.wiz.in.h:27
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:24
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:33
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:32
 #: ../plugins/project-wizard/templates/library.wiz.in.h:31
 msgid "Version:"
 msgstr "ç??æ?¬:"
@@ -4673,37 +4753,45 @@ msgstr "å?³é??ä¸?å??è¨?è??çµ¦ç¨?åº?æ??ç?¼ç??é?¯èª¤ã??"
 
 #: ../plugins/gdb/plugin.c:117
 #, 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."
 msgstr "å»ºç«?å??ç?º %s ç?? FIFO æª?æ¡?å¤±æ??ã??è©²ç¨?å¼?æ??ä»¥ä¸?ä½¿ç?¨çµ?ç«¯æ©?ç??æ?¹å¼?å?·è¡?ã??"
 
 #: ../plugins/gdb/plugin.c:203
 msgid "Cannot start terminal for debugging."
 msgstr "ç?¡æ³?é??å??çµ?ç«¯æ©?é?²è¡?é?¤é?¯ã??"
 
-#: ../plugins/gdb/preferences.c:123
+#. Translators: pretty printer file is a script containing functions allowing gdb
+#. * to display variable content in a simpler way, typically removing
+#. * implementation details.
+#. * The register function is an additional function in the script. It defines
+#. * which function is used for each type of variables.
+#: ../plugins/gdb/preferences.c:128
 #, c-format
 msgid ""
-"The following pretty printers, without a register functions, have been "
-"disabled:\n"
-" %s"
+"The register function hasn't been found automatically in the following pretty printer files:\n"
+"%s\n"
+"You need to fill yourself the register function columns before enabling the rows. Most of the time the register function name contains the word \"register\"."
 msgstr ""
-"ä¸?å??æ??å?°æ©?å? ç?ºæ²?æ??è¨»å??è¡¨å?½æ?¸ï¼?å·²ç¶?è¢«å??ç?¨äº?ï¼?\n"
-" %s"
+"å?¨ä¸?å?? pretty printer files æ²?æ??è?ªå??æ?¾å?°è¨»å??å?½æ?¸ï¼?\n"
+"%s\n"
+"å?¨å??ç?¨é??äº?å??ä¹?å??ä½ é??è¦?è?ªè¡?å¡«å¯«è¨»å??å?½æ?¸ç??æ¬?ä½?ã??å?¨å¤§å¤?æ?¸æ??å??è¨»å??å?½æ?¸ç??å??ç¨±æ??å??å?« \"register\" é??å??å?ã??"
 
-#: ../plugins/gdb/preferences.c:216
+#: ../plugins/gdb/preferences.c:223
 msgid "Select a pretty printer file"
 msgstr "é?¸æ??æ??å?°æ©?æª?æ¡?"
 
-#: ../plugins/gdb/preferences.c:353
+#: ../plugins/gdb/preferences.c:358
 msgid "Activate"
 msgstr "ä½¿ç?¨"
 
-#: ../plugins/gdb/preferences.c:365
+#. Translators: The "Register Function" column contains the name of a
+#. * function used to register pretty printers in gdb.
+#: ../plugins/gdb/preferences.c:372
 msgid "Register Function"
 msgstr "è¨»å??å?½æ?¸"
 
-#: ../plugins/gdb/preferences.c:389 ../plugins/gdb/preferences.c:397
+#: ../plugins/gdb/preferences.c:396
+#: ../plugins/gdb/preferences.c:404
 msgid "Gdb Debugger"
 msgstr "Gdb é?¤é?¯å·¥å?·"
 
@@ -4721,9 +4809,8 @@ msgid "Add signed-off-by line"
 msgstr "å? å?¥ signed-off-by line"
 
 #: ../plugins/git/anjuta-git.ui.h:5
-#, fuzzy
 msgid "Amend the previous commit"
-msgstr "ä¸?ä¸?å??æ??äº¤è¨?æ?¯ï¼?"
+msgstr "ä¿®æ£ä¸?ä¸?æ¬¡æ??äº¤"
 
 #: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
@@ -4740,7 +4827,8 @@ msgstr "å¥?ç?¨ Stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "å¥?ç?¨ä¿¡ç®±æª?æ¡?"
 
@@ -4767,8 +4855,8 @@ msgstr "ä½?è??/Grep"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:7
 #: ../plugins/project-wizard/templates/js.wiz.in.h:2
 #: ../plugins/project-wizard/templates/python.wiz.in.h:7
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:7
 #: ../plugins/project-wizard/templates/library.wiz.in.h:6
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
@@ -4859,7 +4947,8 @@ msgstr "å»ºç«?æ¨?ç±¤"
 msgid "Create patch series"
 msgstr "å»ºç«?è£?é??ç³»å??"
 
-#: ../plugins/git/anjuta-git.ui.h:37 ../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 "æ?¥æ??"
@@ -5098,7 +5187,8 @@ msgstr "Soft"
 msgid "Squash"
 msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "Stash"
 
@@ -5136,7 +5226,8 @@ msgstr "æ¨?ç±¤/æ??äº¤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/plugin.c:391
 msgid "Tags"
 msgstr "æ¨?ç±¤"
 
@@ -5197,7 +5288,8 @@ msgstr "é ? 3"
 msgid "Git: File staged for add."
 msgstr ""
 
-#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
+#: ../plugins/git/git-add-dialog.c:62
+#: ../plugins/git/git-remove-dialog.c:63
 msgid "Please select a file."
 msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
 
@@ -5228,7 +5320,8 @@ msgstr "è«?é?¸æ??ä¸?å??ä¿¡ç®±æª?æ¡?ã??"
 #: ../plugins/git/git-cherry-pick-dialog.c:52
 #: ../plugins/git/git-create-branch-dialog.c:99
 #: ../plugins/git/git-create-tag-dialog.c:102
-#: ../plugins/git/git-reset-dialog.c:57 ../plugins/git/git-revert-dialog.c:46
+#: ../plugins/git/git-reset-dialog.c:57
+#: ../plugins/git/git-revert-dialog.c:46
 #: ../plugins/subversion/subversion-copy-dialog.c:207
 #: ../plugins/subversion/subversion-switch-dialog.c:122
 msgid "Please enter a revision."
@@ -5328,7 +5421,8 @@ 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/git-log-dialog.c:849
+#: ../plugins/git/plugin.c:674
 #: ../plugins/git/plugin.c:867
 msgid "Branch"
 msgstr "å??æ?¯"
@@ -5393,7 +5487,8 @@ msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
 msgid "Git: Branch checkout complete."
 msgstr "Gitï¼?å??å??å??æ?¯å®?æ??ã??"
 
-#: ../plugins/git/git-ui-utils.c:89 ../plugins/git/git-ui-utils.c:94
+#: ../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"
@@ -5429,7 +5524,8 @@ msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
+#: ../plugins/git/plugin.c:68
+#: ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
@@ -5441,7 +5537,8 @@ msgstr "æ?´æ?¹(_C)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+#: ../plugins/git/plugin.c:87
+#: ../plugins/subversion/plugin.c:76
 msgid "_Commitâ?¦"
 msgstr "_Commitâ?¦"
 
@@ -5495,7 +5592,8 @@ msgstr "å¥?ç?¨å·² stash ç??æ?´æ?¹å?° working tree"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+#: ../plugins/git/plugin.c:127
+#: ../plugins/git/plugin.c:583
 msgid "_View logâ?¦"
 msgstr "æª¢è¦?ç´?é??æª?(_V)â?¦"
 
@@ -5555,8 +5653,10 @@ msgstr "æª?æ¡?(_F)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
-#: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
+#: ../plugins/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)â?¦"
@@ -5569,8 +5669,10 @@ msgstr "å°?æª?æ¡?å? å?¥æª?æ¡?åº«"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+#: ../plugins/git/plugin.c:183
+#: ../plugins/git/plugin.c:599
+#: ../plugins/subversion/plugin.c:68
+#: ../plugins/subversion/plugin.c:183
 msgid "_Removeâ?¦"
 msgstr "ç§»é?¤(_R)â?¦"
 
@@ -5630,7 +5732,8 @@ msgstr "å°?è¡?çª?ç??æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
+#: ../plugins/git/plugin.c:223
+#: ../plugins/patch/patch-plugin.c:117
 msgid "Patches"
 msgstr "ä¿®è£?"
 
@@ -5684,15 +5787,15 @@ msgstr "ç?¥é??ç?®å?? series ä¸ç?? patch ä¸¦ç¹¼çº?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+#: ../plugins/git/plugin.c:271
+#: ../plugins/git/plugin.c:351
 msgid "_Abort"
 msgstr "_Abort"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:273
-msgid ""
-"Stop applying the series and return the repository to its original state"
+msgid "Stop applying the series and return the repository to its original state"
 msgstr "å??æ¢å¥?ç?¨é??å?? series ä¸¦å°?æª?æ¡?åº«å??å¾©å?°å??ä¾?ç??ç??æ??"
 
 #. Action name
@@ -5703,7 +5806,8 @@ msgstr "å??æ?¯(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+#: ../plugins/git/plugin.c:287
+#: ../plugins/git/plugin.c:507
 msgid "_Create branchâ?¦"
 msgstr "å»ºç«? bran_châ?¦"
 
@@ -5763,7 +5867,8 @@ msgstr "å°?ä½ ç??æ?´æ?¹è??ä¸?æ¸¸é? ç«¯å??æ?¯å??ä½µ"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+#: ../plugins/git/plugin.c:327
+#: ../plugins/git/plugin.c:447
 msgid "_Startâ?¦"
 msgstr "é??å§?(_S)..."
 
@@ -5805,15 +5910,15 @@ msgstr "ä¸æ¢ rebase ä¸¦å°?æª?æ¡?åº«è¨å??å??å§?ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+#: ../plugins/git/plugin.c:359
+#: ../plugins/git/plugin.c:539
 msgid "_Cherry pickâ?¦"
 msgstr "_Cherry pickâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:361
-msgid ""
-"Selectively merge individual changes from other branches into the current one"
+msgid "Selectively merge individual changes from other branches into the current one"
 msgstr "é?¸æ??æ?§ç??å°?å??å?¥æ?´æ?¹å¾?å?¶ä»?å??æ?¯å??ä½µå?°ç?®å??ç??å??æ?¯"
 
 #. Action name
@@ -5842,7 +5947,8 @@ msgstr "å?ªé?¤é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+#: ../plugins/git/plugin.c:399
+#: ../plugins/git/plugin.c:515
 msgid "_Create tagâ?¦"
 msgstr "å»ºç«?æ¨?ç±¤(_C)â?¦"
 
@@ -5872,7 +5978,8 @@ msgstr "_Reset/Revert"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+#: ../plugins/git/plugin.c:423
+#: ../plugins/git/plugin.c:523
 msgid "_Reset treeâ?¦"
 msgstr "_Reset treeâ?¦"
 
@@ -5884,7 +5991,8 @@ msgstr "å°?æª?æ¡?åº«ç?? head é??è¨ç?ºä»»ä½?é??å?»ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+#: ../plugins/git/plugin.c:431
+#: ../plugins/git/plugin.c:531
 msgid "_Revert commitâ?¦"
 msgstr "_Revert commitâ?¦"
 
@@ -5910,7 +6018,7 @@ msgstr "é??å§? bisect æ??ä½?"
 #. short-cut
 #: ../plugins/git/plugin.c:457
 msgid "Stop the bisect and bring the tree back to normal"
-msgstr ""
+msgstr "å??æ¢ bisect ä¸¦å°?å??å§?ç¢¼æ¨¹å¸¶å??æ£å¸¸ç??æ??"
 
 #. Action name
 #. Stock icon, if any
@@ -6115,22 +6223,26 @@ msgstr "å? å?¥é ?ç?®"
 msgid "Edit Item"
 msgstr "ç·¨è¼¯é ?ç?®"
 
-#: ../plugins/gtodo/add_edit_item.c:152 ../plugins/gtodo/add_edit_item.c:153
+#: ../plugins/gtodo/add_edit_item.c:152
+#: ../plugins/gtodo/add_edit_item.c:153
 #: ../plugins/gtodo/list_tooltip.c:42
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
+#: ../plugins/gtodo/add_edit_item.c:172
 msgid "Category:"
 msgstr "å??é¡?:"
 
-#: ../plugins/gtodo/add_edit_item.c:193 ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:76
+#: ../plugins/gtodo/add_edit_item.c:193
+#: ../plugins/gtodo/add_edit_item.c:472
+#: ../plugins/gtodo/mcategory.c:20
+#: ../plugins/gtodo/todo_db.c:76
 msgid "Edit Categories"
 msgstr "ç·¨è¼¯å??é¡?"
 
-#: ../plugins/gtodo/add_edit_item.c:205 ../plugins/gtodo/list_tooltip.c:48
+#: ../plugins/gtodo/add_edit_item.c:205
+#: ../plugins/gtodo/list_tooltip.c:48
 #: ../plugins/gtodo/list_tooltip.c:54
 msgid "Due date:"
 msgstr "å?°æ??æ?¥ï¼?"
@@ -6140,12 +6252,15 @@ msgid "Notify when due"
 msgstr "ç?¶å?°æ??æ??é??ç?¥"
 
 #. label
-#: ../plugins/gtodo/add_edit_item.c:237 ../plugins/gtodo/list_tooltip.c:64
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/list_tooltip.c:77
+#: ../plugins/gtodo/add_edit_item.c:237
+#: ../plugins/gtodo/list_tooltip.c:64
+#: ../plugins/gtodo/list_tooltip.c:71
+#: ../plugins/gtodo/list_tooltip.c:77
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?ï¼?"
 
-#: ../plugins/gtodo/add_edit_item.c:258 ../plugins/gtodo/add_edit_item.c:259
+#: ../plugins/gtodo/add_edit_item.c:258
+#: ../plugins/gtodo/add_edit_item.c:259
 #: ../plugins/gtodo/list_tooltip.c:81
 msgid "Comment:"
 msgstr "å??è¨»ï¼?"
@@ -6154,18 +6269,22 @@ msgstr "å??è¨»ï¼?"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:335
+#: ../plugins/gtodo/add_edit_item.c:289
+#: ../plugins/gtodo/add_edit_item.c:335
 #: ../plugins/gtodo/add_edit_item.c:448
 msgid "started:"
 msgstr "å·²å??å??ï¼?"
 
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
+#: ../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"
 
-#: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
+#: ../plugins/gtodo/add_edit_item.c:296
+#: ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
 msgid "stopped:"
 msgstr "å·²å??æ¢ï¼?"
@@ -6185,65 +6304,65 @@ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??ä»£è¾¦äº?é ?ï¼?"
 
 #: ../plugins/gtodo/callback.c:99
 #, c-format
-msgid ""
-"Are you sure you want to remove all the completed to-do items in the "
-"category \"%s\"?"
+msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??ä¸æ??æ??å·²å®?æ??ç??å¾?è¾¦äº?é ?ï¼?"
 
 #: ../plugins/gtodo/export.c:47
 msgid "Export task list"
 msgstr "å?¯å?ºå·¥ä½?æ¸?å?®"
 
-#: ../plugins/gtodo/export.c:158
+#: ../plugins/gtodo/export.c:159
 msgid "XML"
 msgstr "XML"
 
-#: ../plugins/gtodo/export.c:159
+#: ../plugins/gtodo/export.c:160
 msgid "Plain Text"
 msgstr "ç´?æ??å?"
 
-#: ../plugins/gtodo/export.c:160
+#: ../plugins/gtodo/export.c:161
 msgid "HTML"
 msgstr "HTML"
 
 #. add the embed css style sheet tb
-#: ../plugins/gtodo/export.c:167
+#: ../plugins/gtodo/export.c:168
 msgid "Export current category only"
 msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
 
-#: ../plugins/gtodo/export.c:171
-msgid "<b>HTML export options:</b>"
-msgstr "<b>HTML å?¯å?ºé?¸é ?:</b>"
+#: ../plugins/gtodo/export.c:172
+#| msgid "<b>HTML export options:</b>"
+msgid "HTML export options:"
+msgstr "HTML å?¯å?ºé?¸é ?ï¼?"
 
-#: ../plugins/gtodo/export.c:181
+#: ../plugins/gtodo/export.c:184
 msgid "Embed default (CSS) style sheet"
 msgstr "å?§åµ?å¼?é ?è¨ (CSS) æ¨£å¼?è¡¨"
 
-#: ../plugins/gtodo/export.c:185
+#: ../plugins/gtodo/export.c:188
 msgid "Custom (CSS) style sheet"
 msgstr "è?ªé?¸ (CSS) æ¨£å¼?è¡¨"
 
-#: ../plugins/gtodo/interface.c:34 ../src/anjuta-actions.h:38
+#: ../plugins/gtodo/interface.c:35
+#: ../src/anjuta-actions.h:38
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../plugins/gtodo/interface.c:146
+#: ../plugins/gtodo/interface.c:136
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../plugins/gtodo/interface.c:171
+#: ../plugins/gtodo/interface.c:161
 msgid "_Export"
 msgstr "å?¯å?º(_E)"
 
-#: ../plugins/gtodo/interface.c:215
+#: ../plugins/gtodo/interface.c:205
 msgid "Priority"
 msgstr "å?ªå??ç?ç´?"
 
-#: ../plugins/gtodo/interface.c:222
+#: ../plugins/gtodo/interface.c:212
 msgid "Due date"
 msgstr "å?°æ??æ?¥"
 
-#: ../plugins/gtodo/interface.c:236
+#: ../plugins/gtodo/interface.c:226
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -6257,7 +6376,8 @@ msgstr "æ²?æ??è¶³å¤ æ¬?é??è®?å??æª?æ¡?ã??"
 msgid "Failed to read file"
 msgstr "ç?¡æ³?è®?å??æª?æ¡?"
 
-#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
+#: ../plugins/gtodo/libgtodo.c:626
+#: ../plugins/gtodo/libgtodo.c:637
 #, c-format
 msgid "Failed to parse XML structure"
 msgstr "å??æ?? XML çµ?æ§?å¤±æ??"
@@ -6290,15 +6410,18 @@ msgid "No filename supplied."
 msgstr "æ²?æ??æ??ä¾?æª?æ¡?å??ç¨±ã??"
 
 #. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
+#: ../plugins/gtodo/list_tooltip.c:65
+#: ../plugins/gtodo/todo_db.c:130
 msgid "Low"
 msgstr "ä½?"
 
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
+#: ../plugins/gtodo/list_tooltip.c:71
+#: ../plugins/gtodo/todo_db.c:131
 msgid "Medium"
 msgstr "ä¸"
 
-#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
+#: ../plugins/gtodo/list_tooltip.c:77
+#: ../plugins/gtodo/todo_db.c:132
 msgid "High"
 msgstr "é«?"
 
@@ -6316,18 +6439,18 @@ msgstr "å?ªé?¤"
 msgid "<New category (%d)>"
 msgstr "<æ?°å??é¡? (%d)>"
 
-#: ../plugins/gtodo/notification.c:68
+#: ../plugins/gtodo/notification.c:66
 #, c-format
 msgid "The following item is due in %i minute:"
 msgid_plural "The following item is due in %i minutes:"
 msgstr[0] "ä¸?å??äº?é ?å?¨ %i å??é??å?§å?°æ??ï¼?"
 
-#: ../plugins/gtodo/notification.c:77
+#: ../plugins/gtodo/notification.c:75
 msgid "The following item is due:"
 msgstr "ä¸?å??é ?ç?®å·²å?°æ??ï¼?"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:118
+#: ../plugins/gtodo/notification.c:116
 msgid "_Do not show again"
 msgstr "ä¸?å??é¡¯ç¤º(_D)"
 
@@ -6371,7 +6494,8 @@ msgstr "å·¥ä½?ç®¡ç??å?¡æª¢è¦?"
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
+#: ../plugins/gtodo/plugin.c:342
+#: ../plugins/gtodo/plugin.c:351
 msgid "To-do Manager"
 msgstr "å¾?è¾¦äº?é ?ç®¡ç??å?¡"
 
@@ -6399,11 +6523,13 @@ msgstr "é¡¯ç¤ºå?ªå??é ?åº?æ¬?ä½?"
 msgid "Tooltips in list"
 msgstr "æ¸?å?®ä¸ç??å·¥å?·æ??ç¤º"
 
-#: ../plugins/gtodo/preferences.c:117 ../plugins/gtodo/preferences.c:119
+#: ../plugins/gtodo/preferences.c:117
+#: ../plugins/gtodo/preferences.c:119
 msgid "Show in main window"
 msgstr "é¡¯ç¤ºæ?¼ä¸»è¦?çª?ä¸"
 
-#: ../plugins/gtodo/preferences.c:130 ../plugins/gtodo/preferences.c:132
+#: ../plugins/gtodo/preferences.c:130
+#: ../plugins/gtodo/preferences.c:132
 msgid "Highlight"
 msgstr "æ¨?ç¤º"
 
@@ -6442,11 +6568,13 @@ msgstr "æ¸?é?¤"
 msgid "days."
 msgstr "å¤©å??ç??é ?ç?®ã??"
 
-#: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
+#: ../plugins/gtodo/preferences.c:195
+#: ../plugins/gtodo/preferences.c:197
 msgid "Auto-Purge"
 msgstr "è?ªå??æ¸?é?¤"
 
-#: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
+#: ../plugins/gtodo/preferences.c:209
+#: ../plugins/gtodo/preferences.c:211
 msgid "Notification"
 msgstr "é??ç?¥"
 
@@ -6468,107 +6596,6 @@ msgstr "å»ºç«?ä»»å??æ¸?å?®"
 msgid "No Date"
 msgstr "æ²?æ??æ?¥æ??"
 
-#: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "Editâ?¦"
-msgstr "ç·¨è¼¯â?¦"
-
-#: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "Macro details:"
-msgstr "å·¨é??è©³ç´°è³?æ??ï¼?"
-
-#: ../plugins/macro/anjuta-macro.ui.h:4
-msgid "Macro text:"
-msgstr "å·¨é??æ??å?ï¼?"
-
-#: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Macros:"
-msgstr "å·¨é??ï¼?"
-
-#: ../plugins/macro/anjuta-macro.ui.h:7
-msgid "Shortcut:"
-msgstr "å¿«æ?·é?µï¼?"
-
-#: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcutâ?¦"
-msgstr "è«?æ??å·¨é??å¿«æ?·é?µâ?¦"
-
-#: ../plugins/macro/macro-actions.c:134
-msgid "Press shortcut"
-msgstr "æ??ä¸?å¿«æ?·é?µ"
-
-#: ../plugins/macro/macro-db.c:256
-msgid "Anjuta macros"
-msgstr "Anjuta å·¨é??"
-
-#: ../plugins/macro/macro-db.c:260
-msgid "My macros"
-msgstr "æ??ç??å·¨é??"
-
-#: ../plugins/macro/macro-dialog.c:145
-#, c-format
-msgid ""
-"Name:\t %s\n"
-"Category:\t %s\n"
-"Shortcut:\t %c\n"
-msgstr ""
-"å??ç¨±ï¼?\t %s\n"
-"å??é¡?ï¼?\t %s\n"
-"æ?·å¾?ï¼?\t %c\n"
-
-#: ../plugins/macro/macro-dialog.c:277
-msgid "Insert"
-msgstr "æ??å?¥"
-
-#: ../plugins/macro/macro-dialog.c:280
-msgid "Insert macro"
-msgstr "æ??å?¥å·¨é??"
-
-#: ../plugins/macro/macro-edit.c:207
-msgid "Add/Edit macro"
-msgstr "å? å?¥/ç·¨è¼¯å·¨é??"
-
-#. Macros can expand the current date in the format specified below
-#: ../plugins/macro/macro-util.c:60
-msgid "%Y-%m-%d"
-msgstr "%Y-%m-%d"
-
-#. Macros can expand the year in the format specified below
-#: ../plugins/macro/macro-util.c:74
-msgid "%Y"
-msgstr "%Y"
-
-#: ../plugins/macro/plugin.c:35
-msgid "Macros"
-msgstr "å·¨é??"
-
-#: ../plugins/macro/plugin.c:42
-msgid "_Insert Macroâ?¦"
-msgstr "æ??å?¥å·¨é??(_I)â?¦"
-
-#: ../plugins/macro/plugin.c:44
-msgid "Insert a macro using a shortcut"
-msgstr "ä½¿ç?¨å¿«æ?·é?µæ??å?¥å·¨é??"
-
-#: ../plugins/macro/plugin.c:49
-msgid "_Add Macroâ?¦"
-msgstr "å? å?¥å·¨é??(_A)â?¦"
-
-#: ../plugins/macro/plugin.c:51
-msgid "Add a macro"
-msgstr "å? å?¥å·¨é??"
-
-#: ../plugins/macro/plugin.c:56
-msgid "Macrosâ?¦"
-msgstr "å·¨é??â?¦"
-
-#: ../plugins/macro/plugin.c:58
-msgid "Add/Edit/Remove macros"
-msgstr "å? å?¥/ç·¨è¼¯/ç§»é?¤å·¨é??"
-
-#: ../plugins/macro/plugin.c:116
-msgid "Macro operations"
-msgstr "å·¨é??æ??ä½?"
-
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 #, fuzzy
@@ -6651,8 +6678,10 @@ msgid "Icon"
 msgstr "å??ç¤º"
 
 #: ../plugins/message-view/message-view.c:512
-#: ../plugins/message-view/plugin.c:455 ../plugins/message-view/plugin.c:468
-#: ../plugins/message-view/plugin.c:588 ../plugins/message-view/plugin.c:600
+#: ../plugins/message-view/plugin.c:455
+#: ../plugins/message-view/plugin.c:468
+#: ../plugins/message-view/plugin.c:588
+#: ../plugins/message-view/plugin.c:600
 msgid "Messages"
 msgstr "è¨?æ?¯"
 
@@ -6729,7 +6758,8 @@ msgstr "è¦?ä¿®è£?ç??æª?æ¡?/ç?®é??"
 msgid "Patch file"
 msgstr "ä¿®è£?æª?"
 
-#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
+#: ../plugins/patch/patch-plugin.c:166
+#: ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "ä¿®è£?"
 
@@ -6787,7 +6817,8 @@ msgstr "ä¿®è£?å±¤ç´?ï¼?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/patch/plugin.c:53 ../plugins/tools/plugin.c:130
+#: ../plugins/patch/plugin.c:53
+#: ../plugins/tools/plugin.c:130
 msgid "_Tools"
 msgstr "å·¥å?·(_T)"
 
@@ -6802,9 +6833,7 @@ msgid "Patch files/directories"
 msgstr "ä¿®è£?æª?æ¡?/ç?®é??"
 
 #: ../plugins/project-import/plugin.c:68
-msgid ""
-"Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up-to-date."
+msgid "Generation of project file failed. Cannot find an appropriate project template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr "ç?¢ç??å°?æ¡?æª?æ¡?å¤±æ??ã??æ?¾ä¸?å?°é?©å??ç??å°?æ¡?ç¯?æ?¬å?¯ç?¨ã??è«?ç¢ºå®?ä½ ç?? Anjuta ç??æ?¬æ?¯æ??æ?°ç??ã??"
 
 #: ../plugins/project-import/plugin.c:88
@@ -6814,9 +6843,7 @@ msgstr "å??ç?ºã??%sã??ç??æª?æ¡?å·²å?å?¨ã??æ?¯å?¦è¦?å??ä»£å®?ï¼?"
 
 #: ../plugins/project-import/plugin.c:136
 #, c-format
-msgid ""
-"A file named \"%s\" cannot be written: %s. Check if you have write access to "
-"the project directory."
+msgid "A file named \"%s\" cannot be written: %s. Check if you have write access to the project directory."
 msgstr "æ??ä¸?å??å??ç?ºã??%sã??ç??æª?æ¡?ç?¡æ³?å¯«å?¥ï¼?%sã??è«?æª¢æ?¥ä½ æ?¯å?¦æ??è©²å°?æ¡?ç?®é??ç??å¯«å?¥æ¬?é??ã??"
 
 #: ../plugins/project-import/plugin.c:200
@@ -6826,36 +6853,33 @@ msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? %s ç??å°?æ¡?å¾?ç«¯ç¨?å¼?ã??"
 
 #: ../plugins/project-import/plugin.c:220
 #, c-format
-msgid ""
-"Could not find a valid project backend for the given directory (%s). Please "
-"select a different directory, or try upgrading to a newer version of Anjuta."
+msgid "Could not find a valid project backend for the given directory (%s). Please select a different directory, or try upgrading to a newer version of Anjuta."
 msgstr "å?¨æ??å®?ç?®é?? (%s) ä¸æ?¾ä¸?å?°æ??æ??ç??å°?æ¡?å¾?ç«¯ç¨?å¼?ã??è«?é?¸æ??ä¸?å??ç??ç?®é??ï¼?æ??å??è©¦å??ç´?ç?ºæ?´æ?°ç?? Anjutaã??"
 
 #: ../plugins/project-import/plugin.c:290
 #: ../plugins/project-import/plugin.c:346
 #, c-format
-msgid ""
-"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
+msgid "Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
 msgstr "ç?¡æ³? check out æ??å®?ç?? URIã??%sã??ã??å?³å??ç??é?¯èª¤ç?ºï¼?ã??%sã??"
 
 #: ../plugins/project-import/project-import.ui.h:1
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:12
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
 #: ../plugins/project-wizard/templates/django.wiz.in.h:1
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:13
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:11
-#: ../plugins/project-wizard/templates/java.wiz.in.h:12
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:14
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:12
+#: ../plugins/project-wizard/templates/java.wiz.in.h:13
 #: ../plugins/project-wizard/templates/js.wiz.in.h:5
-#: ../plugins/project-wizard/templates/python.wiz.in.h:12
+#: ../plugins/project-wizard/templates/python.wiz.in.h:13
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:9
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:9
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:13
-#: ../plugins/project-wizard/templates/library.wiz.in.h:12
+#: ../plugins/project-wizard/templates/library.wiz.in.h:13
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "ç?®ç??å?°:"
@@ -7183,9 +7207,7 @@ msgstr "å·²å»ºç«?å°?æ¡?æª¢è¦?â?¦"
 
 #: ../plugins/project-manager/plugin.c:1408
 #, c-format
-msgid ""
-"Failed to parse project (the project is opened, but there will be no project "
-"view) %s: %s\n"
+msgid "Failed to parse project (the project is opened, but there will be no project view) %s: %s\n"
 msgstr "å??æ??å°?æ¡?å¤±æ??ï¼?è©²å°?æ¡?å·²è¢«é??å??ï¼?ä½?ä¸?æ??æ??å°?æ¡?æª¢è¦?ï¼?%sï¼?%s\n"
 
 #: ../plugins/project-manager/plugin.c:1601
@@ -7218,7 +7240,8 @@ msgstr "è©³ç´°è³?æ??"
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
+#: ../plugins/project-wizard/druid.c:142
+#: ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "è¦å??"
 
@@ -7226,27 +7249,26 @@ msgstr "è¦å??"
 msgid "Message"
 msgstr "è¨?æ?¯"
 
-#: ../plugins/project-wizard/druid.c:232
-msgid ""
-"<b>Confirm the following information:</b>\n"
-"\n"
-msgstr ""
-"<b>ç¢ºèª?ä»¥ä¸?è³?è¨?ï¼?</b>\n"
-"\n"
+#: ../plugins/project-wizard/druid.c:233
+#| msgid ""
+#| "<b>Confirm the following information:</b>\n"
+#| "\n"
+msgid "Confirm the following information:"
+msgstr "ç¢ºèª?ä»¥ä¸?è³?è¨?ï¼?"
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:236
+#: ../plugins/project-wizard/druid.c:237
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "å°?æ¡?é¡?å??ï¼?%s\n"
 
-#: ../plugins/project-wizard/druid.c:401
+#: ../plugins/project-wizard/druid.c:402
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "ç?¡æ³?æ?¾å?°ä»»ä½?å°?æ¡?æ¨£æ?¬æ?¼ %s"
 
-#: ../plugins/project-wizard/druid.c:613
+#: ../plugins/project-wizard/druid.c:627
 #, c-format
 msgid ""
 "\n"
@@ -7255,47 +7277,40 @@ msgstr ""
 "\n"
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?è¼¸å?¥å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:628
+#: ../plugins/project-wizard/druid.c:642
 #, c-format
-msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contain "
-"only letters, digits, underscore, minus and dot. Please fix it."
+msgid "Field \"%s\" must start with a letter, a digit or an underscore and contain only letters, digits, underscore, minus and dot. Please fix it."
 msgstr "æ¬?ä½?ã??%sã??å¿?é ?ä»¥è?±æ??å?æ¯?ã??æ?¸å?æ??åº?ç·?é??é ä¸¦ä¸?å?ªè?½å??å?«è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?ã??æ¸?è??å??é»?ã??è«?ä¿®æ£å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:633
+#: ../plugins/project-wizard/druid.c:647
 #, c-format
-msgid ""
-"Field \"%s\" must start with a letter, a digit, an underscore or a directory "
-"separator and contain only letters, digits, underscore, directory separator, "
-"minus and dot. Please fix it."
+msgid "Field \"%s\" must start with a letter, a digit, an underscore or a directory separator and contain only letters, digits, underscore, directory separator, minus and dot. Please fix it."
 msgstr "æ¬?ä½?ã??%sã??å¿?é ?ä»¥è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?æ??ç?®é??å??é??å?ç¬¦é??é ä¸¦ä¸?å?ªè?½å??å?«è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?ã??ç?®é??å??é??å?ç¬¦ã??æ¸?è??å??é»?ã??è«?ä¿®æ£å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:638
+#: ../plugins/project-wizard/druid.c:652
 #, c-format
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/project-wizard/druid.c:665
+#: ../plugins/project-wizard/druid.c:679
 #, c-format
-msgid ""
-"Directory \"%s\" is not empty. Project creation could fail if some files "
-"cannot be written. Do you want to continue?"
+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:667
+#: ../plugins/project-wizard/druid.c:681
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "æª?æ¡? \"%s\" å·²å?å?¨ã??ä½ æ?¯å?¦æ?³è¦?è¦?è??ä»?ï¼?"
 
-#: ../plugins/project-wizard/druid.c:698
+#: ../plugins/project-wizard/druid.c:712
 msgid "Invalid entry"
 msgstr "ç?¡æ??ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:709
+#: ../plugins/project-wizard/druid.c:723
 msgid "Dubious entry"
 msgstr "ä¸?ç¢ºå®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:870
+#: ../plugins/project-wizard/druid.c:884
 #, c-format
 msgid ""
 "\n"
@@ -7304,7 +7319,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:881
+#: ../plugins/project-wizard/druid.c:895
 #, c-format
 msgid ""
 "\n"
@@ -7313,32 +7328,23 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?ä»¶ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:890
-msgid ""
-"Some important programs or development packages required to build this "
-"project are missing. Please make sure they are installed properly before "
-"generating the project.\n"
+#: ../plugins/project-wizard/druid.c:904
+msgid "Some important programs or development packages required to build this project are missing. Please make sure they are installed properly before generating the project.\n"
 msgstr "ç·¨è¯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?ä»¶é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??ç¢ºå®?å®?å??å·²ç¶?æ£ç¢ºç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:898
+#: ../plugins/project-wizard/druid.c:912
 msgid "Install missing packages"
 msgstr "å®?è£?ç¼ºå°?ç??å¥?ä»¶"
 
-#: ../plugins/project-wizard/druid.c:906
-msgid ""
-"The missing programs are usually part of some distrubution packages and can "
-"be searched for in your Application Manager. Similarly, the development "
-"packages are contained in special packages that your distribution provides "
-"to allow development of projects based on them. They usually end with a \"-"
-"dev\" or \"-devel\" suffix in package names and can be found by searching in "
-"your Application Manager."
+#: ../plugins/project-wizard/druid.c:920
+msgid "The missing programs are usually part of some distrubution packages and can be searched for in your Application Manager. Similarly, the development packages are contained in special packages that your distribution provides to allow development of projects based on them. They usually end with a \"-dev\" or \"-devel\" suffix in package names and can be found by searching in your Application Manager."
 msgstr "ç¼ºå°?ç??ç¨?å¼?é??å¸¸æ?¯æ??äº?ç?¼è¡?ç??æ?¬ç??ä¸?é?¨å??ï¼?å?¯ä»¥å?¨ä½ ç??å¥?ä»¶ç®¡ç??ç¨?å¼?ä¸æ??å°?å?°ã??å??æ¨£ç??ï¼?é??ç?¼ç?¨å¥?ä»¶ä¹?å¸¸å?å?¨ç?¹å?¥ç??å¥?ä»¶ä¸ï¼?æ?¯ä½ ç??ç?¼è¡?ç??æ?¬æ??ä¾?ä»¥ä¾¿é??ç?¼ä»¥å®?å??ç?ºå?ºç¤?ç??å°?æ¡?ã??å®?å??é??å¸¸å?¨å¥?ä»¶å??ç¨±ä¸ä»¥ã??-devã??æ??ã??-develã??å¾?ç¶´çµ?å°¾ï¼?è??ä¸?å??æ¨£å?¯ä»¥å?¨ä½ ç??å¥?ä»¶ç®¡ç??ç¨?å¼?ä¸æ??å°?å?°ã??"
 
-#: ../plugins/project-wizard/druid.c:914
+#: ../plugins/project-wizard/druid.c:928
 msgid "Missing components"
 msgstr "é?ºå¤±å??ä»¶"
 
-#: ../plugins/project-wizard/druid.c:1046
+#: ../plugins/project-wizard/druid.c:1060
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?å»ºç«?å°?æ¡?å?©ç??ä½¿ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7379,43 +7385,45 @@ msgid "Executing: %s"
 msgstr "æ£å?¨å?·è¡?ï¼?%s"
 
 #: ../plugins/project-wizard/plugin.c:50
-#, fuzzy, c-format
+#, c-format
 #| msgid "Unable to find any project template in %s"
-msgid "Unable to extrat project template %s: %s"
-msgstr "ç?¡æ³?æ?¾å?°ä»»ä½?å°?æ¡?æ¨£æ?¬æ?¼ %s"
+msgid "Unable to extract project template %s: %s"
+msgstr "ç?¡æ³?è§£é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 
 #: ../plugins/project-wizard/plugin.c:276
 msgid "New Project Assistant"
 msgstr "æ?°å°?æ¡?å?©ç??"
 
 #: ../plugins/project-wizard/property.c:343
-#: ../plugins/project-wizard/property.c:497
+#: ../plugins/project-wizard/property.c:454
 msgid "No"
 msgstr "å?¦"
 
-#: ../plugins/project-wizard/property.c:355
+#: ../plugins/project-wizard/property.c:354
 msgid "Select directory"
 msgstr "é?¸æ??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:363
+#: ../plugins/project-wizard/property.c:362
 msgid "Select file"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:455 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:412
+#: ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é?¸æ??å??ç??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:480
-#: ../plugins/project-wizard/property.c:570 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:437
+#: ../plugins/project-wizard/property.c:527
+#: ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é?¸æ??å??ç¤º"
 
-#: ../plugins/project-wizard/property.c:540
+#: ../plugins/project-wizard/property.c:497
 msgid "Choose directory"
 msgstr "é?¸å??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:544
+#: ../plugins/project-wizard/property.c:501
 msgid "Choose file"
 msgstr "é?¸å??æª?æ¡?"
 
@@ -7430,7 +7438,6 @@ msgstr "é??ç?¨ã??æ??å°?å??ç??æ?®é??å°?æ¡?"
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:2
 #: ../plugins/project-wizard/templates/library.wiz.in.h:2
 msgid "Add C++ support:"
 msgstr "å? å?¥ C++ æ?¯æ?´ï¼?"
@@ -7455,7 +7462,6 @@ msgstr "å? å?¥å?±äº«ç¨?å¼?åº«æ?¯æ?´ï¼?"
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:5
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:4
 #: ../plugins/project-wizard/templates/library.wiz.in.h:4
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr "å?¨å°?æ¡?å? å?¥ C++ æ?¯æ?´ä»¥ä¾¿ç·¨è¯ C++ å??å§?ç¢¼æª?æ¡?"
@@ -7487,8 +7493,8 @@ msgstr "å?¨ä½ ç??å°?æ¡?ä¸å? å?¥ç·¨è¯å?±äº«ç¨?å¼?åº«ç??æ?¯æ?´"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:8
 #: ../plugins/project-wizard/templates/js.wiz.in.h:3
 #: ../plugins/project-wizard/templates/python.wiz.in.h:8
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:4
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:8
 #: ../plugins/project-wizard/templates/library.wiz.in.h:7
 msgid "Basic information"
 msgstr "å?ºæ?¬è³?è¨?"
@@ -7506,8 +7512,8 @@ msgstr "å?ºæ?¬è³?è¨?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:9
 #: ../plugins/project-wizard/templates/js.wiz.in.h:4
 #: ../plugins/project-wizard/templates/python.wiz.in.h:9
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:5
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:9
 #: ../plugins/project-wizard/templates/library.wiz.in.h:8
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "æ??å??è??è»?ä»¶æ?£ä½?è¨±å?¯è? ï¼?BSDï¼?"
@@ -7515,8 +7521,7 @@ msgstr "æ??å??è??è»?ä»¶æ?£ä½?è¨±å?¯è? ï¼?BSDï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:9
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:9
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:9
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:9
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:8
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:10
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:9
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:11
@@ -7524,15 +7529,15 @@ msgstr "æ??å??è??è»?ä»¶æ?£ä½?è¨±å?¯è? ï¼?BSDï¼?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:9
 #: ../plugins/project-wizard/templates/java.wiz.in.h:10
 #: ../plugins/project-wizard/templates/python.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:10
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:6
 #: ../plugins/project-wizard/templates/library.wiz.in.h:10
-msgid "Configure external packages"
-msgstr "è¨å®?å¤?é?¨å¥?ä»¶"
+msgid "Check the packages that your project requires"
+msgstr "æª¢æ?¥ä½ ç??å°?æ¡?é??è¦?ç??å¥?ä»¶"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:10
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:11
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:10
@@ -7541,74 +7546,71 @@ msgstr "è¨å®?å¤?é?¨å¥?ä»¶"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:10
 #: ../plugins/project-wizard/templates/java.wiz.in.h:11
 #: ../plugins/project-wizard/templates/python.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:11
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:7
 #: ../plugins/project-wizard/templates/library.wiz.in.h:11
+msgid "Configure external packages"
+msgstr "è¨å®?å¤?é?¨å¥?ä»¶"
+
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:13
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:11
+#: ../plugins/project-wizard/templates/java.wiz.in.h:12
+#: ../plugins/project-wizard/templates/python.wiz.in.h:12
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/library.wiz.in.h:12
 msgid "Configure external packages:"
 msgstr "è¨å®?å¤?é?¨å¥?ä»¶ï¼?"
 
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:12
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:14
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:14
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:12
-#: ../plugins/project-wizard/templates/java.wiz.in.h:13
-#: ../plugins/project-wizard/templates/js.wiz.in.h:6
-#: ../plugins/project-wizard/templates/python.wiz.in.h:13
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:16
-#: ../plugins/project-wizard/templates/library.wiz.in.h:13
-msgid "Email address:"
-msgstr "é?»å?é?µä»¶ä½?å??ï¼?"
-
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:13
-#: ../plugins/project-wizard/templates/django.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:13
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:15
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:15
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:13
 #: ../plugins/project-wizard/templates/java.wiz.in.h:14
-#: ../plugins/project-wizard/templates/js.wiz.in.h:7
+#: ../plugins/project-wizard/templates/js.wiz.in.h:6
 #: ../plugins/project-wizard/templates/python.wiz.in.h:14
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:18
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:10
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:10
 #: ../plugins/project-wizard/templates/library.wiz.in.h:14
+msgid "Email address:"
+msgstr "é?»å?é?µä»¶ä½?å??ï¼?"
+
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:14
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
+#: ../plugins/project-wizard/templates/django.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:16
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:16
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:15
+#: ../plugins/project-wizard/templates/java.wiz.in.h:15
+#: ../plugins/project-wizard/templates/js.wiz.in.h:7
+#: ../plugins/project-wizard/templates/python.wiz.in.h:15
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:11
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:11
+#: ../plugins/project-wizard/templates/library.wiz.in.h:15
 msgid "General Project Information"
 msgstr "ä¸?è?¬å°?æ¡?è³?è¨?"
 
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:16
 msgid "Generic (Minimal)"
 msgstr "ä¸?è?¬ (æ??å°?)"
 
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:16
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:16
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:17
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:17
-#: ../plugins/project-wizard/templates/java.wiz.in.h:17
-#: ../plugins/project-wizard/templates/python.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:20
-#: ../plugins/project-wizard/templates/library.wiz.in.h:16
-msgid ""
-"Give a package name that your project require. You may also mention what is "
-"the required version of the package. For example, 'libgnomeui-2.0' or "
-"'libgnomeui-2.0 >= 2.2.0'"
-msgstr "æ??å®?ä½ ç??å°?æ¡?é??è¦?ç??å¥?ä»¶å??ç¨±ã??ä½ ä¹?å?¯ä»¥æ??å?ºè©²å¥?ä»¶æ??é??ç??ç??æ?¬ã??ä¾?å¦?ã??libgnomeui-2.0ã??æ??ã??libgnomeui-2.0 >= 2.2.0ã??"
-
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:18
@@ -7622,8 +7624,8 @@ msgstr "æ??å®?ä½ ç??å°?æ¡?é??è¦?ç??å¥?ä»¶å??ç¨±ã??ä½ ä¹?å?¯ä»¥æ??å?ºè©²å¥?ä»¶æ??
 #: ../plugins/project-wizard/templates/java.wiz.in.h:19
 #: ../plugins/project-wizard/templates/js.wiz.in.h:11
 #: ../plugins/project-wizard/templates/python.wiz.in.h:19
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:14
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:14
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:24
 #: ../plugins/project-wizard/templates/library.wiz.in.h:19
 msgid "License"
 msgstr "æ??æ¬?æ¢?æ¬¾"
@@ -7641,8 +7643,8 @@ msgstr "æ??æ¬?æ¢?æ¬¾"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:22
 #: ../plugins/project-wizard/templates/js.wiz.in.h:12
 #: ../plugins/project-wizard/templates/python.wiz.in.h:20
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:15
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:25
 #: ../plugins/project-wizard/templates/library.wiz.in.h:20
 msgid "No license"
 msgstr "æ²?æ??æ??æ¬?"
@@ -7660,8 +7662,8 @@ msgstr "æ²?æ??æ??æ¬?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:23
 #: ../plugins/project-wizard/templates/js.wiz.in.h:13
 #: ../plugins/project-wizard/templates/python.wiz.in.h:21
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:16
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:26
 #: ../plugins/project-wizard/templates/library.wiz.in.h:23
 msgid "Options for project build system"
 msgstr "å°?æ¡?ç·¨è¯ç³»çµ±ç??é?¸é ?"
@@ -7680,8 +7682,8 @@ msgstr "å°?æ¡?ç·¨è¯ç³»çµ±ç??é?¸é ?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:24
 #: ../plugins/project-wizard/templates/js.wiz.in.h:14
 #: ../plugins/project-wizard/templates/python.wiz.in.h:22
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:17
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:27
 #: ../plugins/project-wizard/templates/library.wiz.in.h:24
 msgid "Project Name:"
 msgstr "å°?æ¡?å??ç¨±ï¼?"
@@ -7699,9 +7701,9 @@ msgstr "å°?æ¡?å??ç¨±ï¼?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:25
 #: ../plugins/project-wizard/templates/js.wiz.in.h:15
 #: ../plugins/project-wizard/templates/python.wiz.in.h:23
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:18
 #: ../plugins/project-wizard/templates/mkfile.wiz.in.h:6
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:28
 #: ../plugins/project-wizard/templates/library.wiz.in.h:25
 msgid "Project options"
 msgstr "å°?æ¡?é?¸é ?"
@@ -7709,7 +7711,6 @@ msgstr "å°?æ¡?é?¸é ?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:23
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:23
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:23
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:40
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:24
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:22
@@ -7718,10 +7719,11 @@ msgstr "å°?æ¡?é?¸é ?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:25
 #: ../plugins/project-wizard/templates/java.wiz.in.h:26
 #: ../plugins/project-wizard/templates/python.wiz.in.h:24
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:29
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/library.wiz.in.h:26
-msgid "Require Package:"
-msgstr "é??è¦?å¥?ä»¶ï¼?"
+#| msgid "Require Package:"
+msgid "Required Packages:"
+msgstr "é??è¦?ç??å¥?ä»¶ï¼?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:24
@@ -7736,8 +7738,8 @@ msgstr "é??è¦?å¥?ä»¶ï¼?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:27
 #: ../plugins/project-wizard/templates/js.wiz.in.h:16
 #: ../plugins/project-wizard/templates/python.wiz.in.h:25
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:22
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:32
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:30
 #: ../plugins/project-wizard/templates/library.wiz.in.h:27
 msgid "Select code license"
 msgstr "é?¸æ??å??å§?ç¢¼æ??æ¬?"
@@ -7754,7 +7756,7 @@ msgstr "é?¸æ??å??å§?ç¢¼æ??æ¬?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:27
 #: ../plugins/project-wizard/templates/java.wiz.in.h:28
 #: ../plugins/project-wizard/templates/python.wiz.in.h:26
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:31
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:23
 #: ../plugins/project-wizard/templates/library.wiz.in.h:30
 msgid "Use pkg-config to add library support from other packages"
 msgstr "ä½¿ç?¨ pkg-config å¾?å?¶ä»?å¥?ä»¶å? å?¥ç¨?å¼?åº«ç??æ?¯æ?´"
@@ -7772,8 +7774,8 @@ msgstr "ä½¿ç?¨ pkg-config å¾?å?¶ä»?å¥?ä»¶å? å?¥ç¨?å¼?åº«ç??æ?¯æ?´"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:31
 #: ../plugins/project-wizard/templates/js.wiz.in.h:18
 #: ../plugins/project-wizard/templates/python.wiz.in.h:29
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:25
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:34
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:33
 #: ../plugins/project-wizard/templates/library.wiz.in.h:32
 msgid "project name"
 msgstr "å°?æ¡?å??ç¨±"
@@ -7792,8 +7794,8 @@ msgstr "ä¸?è?¬å°?æ¡?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:2
 #: ../plugins/project-wizard/templates/java.wiz.in.h:3
 #: ../plugins/project-wizard/templates/python.wiz.in.h:3
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:1
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:3
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:3
 #: ../plugins/project-wizard/templates/library.wiz.in.h:3
 msgid "Add internationalization:"
 msgstr "å? å?¥å??é??å??å??è?½ï¼?"
@@ -7808,15 +7810,13 @@ msgstr "å? å?¥å??é??å??å??è?½ï¼?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:5
 #: ../plugins/project-wizard/templates/java.wiz.in.h:6
 #: ../plugins/project-wizard/templates/python.wiz.in.h:6
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:5
 #: ../plugins/project-wizard/templates/library.wiz.in.h:5
-msgid ""
-"Adds support for internationalization so that your project can have "
-"translations in different languages"
+msgid "Adds support for internationalization so that your project can have translations in different languages"
 msgstr "å? å?¥å??é??å??æ?¯æ?´ï¼?è®?ä½ ç??å°?æ¡?å?¯ä»¥ç¿»è¯æ??ä¸?å??ç??èª?è¨?"
 
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:16
 msgid "Generic"
 msgstr "ä¸?è?¬"
 
@@ -7824,7 +7824,7 @@ msgstr "ä¸?è?¬"
 msgid "A generic C++ project"
 msgstr "ä¸?è?¬ C++ å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:16
 msgid "Generic C++"
 msgstr "ç?¢ç?? C++"
 
@@ -7855,6 +7855,14 @@ msgstr "å? å?¥ gtk-doc ç³»çµ±ï¼?"
 msgid "GTK+"
 msgstr "GTK+"
 
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
+msgid "Give a package name that your project require. You may also mention what is the required version of the package. For example, 'libgnomeui-2.0' or 'libgnomeui-2.0 >= 2.2.0'"
+msgstr "æ??å®?ä½ ç??å°?æ¡?é??è¦?ç??å¥?ä»¶å??ç¨±ã??ä½ ä¹?å?¯ä»¥æ??å?ºè©²å¥?ä»¶æ??é??ç??ç??æ?¬ã??ä¾?å¦?ã??libgnomeui-2.0ã??æ??ã??libgnomeui-2.0 >= 2.2.0ã??"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
+msgid "Require Package:"
+msgstr "é??è¦?å¥?ä»¶ï¼?"
+
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
 #: ../plugins/project-wizard/templates/java.wiz.in.h:30
@@ -7870,35 +7878,31 @@ msgstr "Anjuta å¤?æ??ç¨?å¼?"
 msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "ä½¿ç?¨ libanjuta æ?¶æ§?ç?? Anjuta å¤?æ??ç¨?å¼?å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:8
-msgid ""
-"Comma separated, other plugins that this plugin depends on. It could be "
-"either primary interface name or plugin location (library:class)"
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:9
+msgid "Comma separated, other plugins that this plugin depends on. It could be either primary interface name or plugin location (library:class)"
 msgstr "ä»¥é??è??å??é??ï¼?é??å??å¤?æ??ç¨?å¼?ç?¸æ ¹æ??ç??å?¶ä»?å¤?æ??ç¨?å¼?ã??å®?å?¯ä»¥æ?¯ä¸»è¦?ä»?é?¢å??ç¨±æ??å¤?æ??ç¨?å¼?ä½?ç½® (library:class)"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:12
 msgid "Create Gtk Builder interface file"
 msgstr "å»ºç«? Gtk çµ?å»ºä»?é?¢æª?æ¡?"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:12
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:13
 msgid "Create a template Gtk Builder interface file"
 msgstr "å»ºç«? Gtk çµ?å»ºä»?é?¢æª?æ¡?ç¯?æ?¬"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:15
 msgid "Display description of the plugin"
 msgstr "é¡¯ç¤ºå¤?æ??ç¨?å¼?ç??æ??è¿°"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:15
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:16
 msgid "Display title of the plugin"
 msgstr "é¡¯ç¤ºå¤?æ??ç¨?å¼?ç??æ¨?é¡?"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:20
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:21
 msgid "Icon File:"
 msgstr "å??ç¤ºæª?ï¼?"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:21
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:22
 msgid "Icon file for the plugin"
 msgstr "å¤?æ??ç¨?å¼?ç??å??ç¤ºæª?"
 
@@ -7947,9 +7951,7 @@ msgid "Plugin interfaces to implement"
 msgstr "æ¬²å¯¦ä½?ç??å¤?æ??ç¨?å¼?ä»?é?¢"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:38
-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.)"
 msgstr "å°?æ¡?å??ç¨±ä¸?è?½å?«æ??ç©ºç?½ï¼?å? ç?ºå®?æ??æ??ç?ºè©²å°?æ¡?ç·¨è¯ç?®æ¨?(å?¯å?·è¡?æª?ã??ç¨?å¼?åº«ç?)ç??å??ç¨±"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:42
@@ -7972,7 +7974,7 @@ msgstr "å¤?æ??ç¨?å¼?æ?¯å?¦å?·æ??é?¸å?®æ??å·¥å?·å??"
 msgid "A generic GTKmm (C++) project"
 msgstr "ä¸?è?¬ GTKmm (C++) å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
 msgid "GTKmm"
 msgstr "GTKmm"
 
@@ -8001,15 +8003,14 @@ msgid "Xlib dock"
 msgstr "Xlib dock"
 
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:1
-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)"
 msgstr "ä¸?è?¬å??ç??ç·¨è¯ java å°?æ¡?ï¼?ä½¿ç?¨ GNU Java ç·¨è¯å?¨ (gcj)"
 
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:14
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ é??è¦?ç?¥é??å?ªå??é¡?å?¥(class)å?«æ?? main() å?½æ?¸"
 
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:16
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:17
 msgid "Generic gcj compiled java"
 msgstr "ä¸?è?¬ gcj ç·¨è¯ç?? java"
 
@@ -8022,7 +8023,7 @@ msgstr "ä¸»é¡?å?¥ï¼?"
 msgid "A generic java project using automake project management"
 msgstr "ä¸?è?¬ java å°?æ¡?ï¼?ä½¿ç?¨ automake å°?æ¡?ç®¡ç??"
 
-#: ../plugins/project-wizard/templates/java.wiz.in.h:16
+#: ../plugins/project-wizard/templates/java.wiz.in.h:17
 msgid "Generic java (automake)"
 msgstr "ä¸?è?¬ java (automake)"
 
@@ -8038,10 +8039,20 @@ msgstr "ä¸?è?¬ JavaScript"
 msgid "A generic python project using automake project management"
 msgstr "ä¸?è?¬ python å°?æ¡?ï¼?ä½¿ç?¨ automake å°?æ¡?ç®¡ç??"
 
-#: ../plugins/project-wizard/templates/python.wiz.in.h:16
+#: ../plugins/project-wizard/templates/python.wiz.in.h:17
 msgid "Generic python (automake)"
 msgstr "ä¸?è?¬ python (automake)"
 
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:19
+#| msgid "Generic java (automake)"
+msgid "PyGTK (automake)"
+msgstr "PyGTK (automake)"
+
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:20
+#| msgid "Project name"
+msgid "PyGTK project using automake"
+msgstr "PyGTK å°?æ¡?ï¼?ä½¿ç?¨ automake å°?æ¡?ç®¡ç??"
+
 #: ../plugins/project-wizard/templates/mkfile.wiz.in.h:1
 msgid "Makefile project"
 msgstr "Makefile å°?æ¡?"
@@ -8118,26 +8129,6 @@ msgstr "é??è¦? SDL_ttfï¼?"
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:1
-msgid "A GNOME applet project"
-msgstr "GNOME é?¢æ?¿ç¨?å¼?å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:6
-msgid "Applet Title:"
-msgstr "é?¢æ?¿ç¨?å¼?æ¨?é¡?ï¼?"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:14
-msgid "Display description of the applet"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ??è¿°"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:15
-msgid "Display title of the applet"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ¨?é¡?"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:17
-msgid "GNOME Applet"
-msgstr "GNOME é?¢æ?¿ç¨?å¼?"
-
 #: ../plugins/project-wizard/templates/library.wiz.in.h:1
 msgid "A shared or a static library project"
 msgstr "å?±äº«å¼?æ??é??æ??ç¨?å¼?åº«å°?æ¡?"
@@ -8271,7 +8262,7 @@ msgstr "é?¸æ??æª?æ¡?ï¼?"
 
 #: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
-msgstr ""
+msgstr "æ?´å??æ£è¦?è¡¨ç¤ºå¼?å??å??å??ç?§"
 
 #: ../plugins/search/anjuta-search.ui.h:7
 msgid "File Filter"
@@ -8408,7 +8399,8 @@ msgstr "å?¨ç·¨è¼¯å?¨æ??å°?å?ä¸²æ??æ£è¦?è¡¨ç¤ºå¼?"
 msgid "Find _Next"
 msgstr "æ??å°?ä¸?ä¸?å?? (_N)"
 
-#: ../plugins/search/plugin.c:72 ../plugins/search/plugin.c:76
+#: ../plugins/search/plugin.c:72
+#: ../plugins/search/plugin.c:76
 msgid "Repeat the last Find command"
 msgstr "é??è¤?ä¸?ä¸?å??æ??å°?æ??ä»¤"
 
@@ -8421,11 +8413,11 @@ msgid "Find and R_eplaceâ?¦"
 msgstr "å°?æ?¾è??å??ä»£(_R)â?¦"
 
 #: ../plugins/search/plugin.c:80
-msgid ""
-"Search for and replace a string or regular expression with another string"
+msgid "Search for and replace a string or regular expression with another string"
 msgstr "ä½¿ç?¨å?ä¸²æ??æ£è¦?è¡¨ç¤ºå¼?æ??å°?ä¸¦å??ä»£ç?ºå?¶ä»?å?ä¸²"
 
-#: ../plugins/search/plugin.c:82 ../plugins/search/plugin.c:83
+#: ../plugins/search/plugin.c:82
+#: ../plugins/search/plugin.c:83
 msgid "Search and Replace"
 msgstr "æ??å°?å??å??ä»£"
 
@@ -8540,7 +8532,235 @@ msgstr[0] "å·²å??ä»£ %d å??ç¬¦å??é ?ã??"
 msgid "Unable to build user interface for Search and Replace"
 msgstr "ç?¡æ³?å»ºç«?æ??å°?è??å??ä»£ä½¿ç?¨è??ä»?é?¢"
 
-#: ../plugins/sourceview/sourceview.c:395
+#: ../plugins/snippets-manager/plugin.c:60
+#: ../plugins/snippets-manager/plugin.c:302
+#: ../plugins/snippets-manager/snippets-browser.c:208
+msgid "Snippets"
+msgstr "æ??å?ç??æ®µ"
+
+#. Translator: Appears in Edit->Snippets menu. It is used mainly for providing a
+#. shortcut for the trigger-key based insertion of snippets. It's called like this
+#. because you type the trigger-key in the editor, followed by Trigger Insert and
+#. the snippet gets inserted.
+#: ../plugins/snippets-manager/plugin.c:71
+msgid "_Trigger insert"
+msgstr "è§¸ç?¼æ??å?¥(_T)"
+
+#: ../plugins/snippets-manager/plugin.c:73
+msgid "Insert a snippet using the trigger-key"
+msgstr "ä½¿ç?¨è§¸ç?¼é?µæ??å?¥æ??å?ç??æ®µ"
+
+#. Translator: In a similar matter, it also appears in Edit->Snippets. It's another method
+#. for inserting snippets. In this case, you call Auto complete insert, start
+#. typing in the editor a string, the database is searched for that string and the
+#. most relevant snippets are returned in a pop-up like the auto-complete one
+#. (they are showed by their names). After selecting one of them, the snippet gets
+#. inserted.
+#: ../plugins/snippets-manager/plugin.c:84
+#| msgid "Auto-complete"
+msgid "_Auto complete insert"
+msgstr "è?ªå??è£?é½?æ??å?¥(_A)"
+
+#: ../plugins/snippets-manager/plugin.c:86
+#| msgid "Add a space after function call autocompletion"
+msgid "Insert a snippet using auto-completion"
+msgstr "ä½¿ç?¨è?ªå??è£?é½?æ??å?¥æ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/plugin.c:91
+msgid "_Import snippets â?¦"
+msgstr "å?¯å?¥æ??å?ç??æ®µ(_I)â?¦"
+
+#: ../plugins/snippets-manager/plugin.c:93
+msgid "Import snippets to the database"
+msgstr "å°?æ??å?ç??æ®µå?¯å?¥è³?æ??åº«"
+
+#: ../plugins/snippets-manager/plugin.c:98
+msgid "_Export snippets â?¦"
+msgstr "å?¯å?ºæ??å?ç??æ®µ(_E)â?¦"
+
+#: ../plugins/snippets-manager/plugin.c:100
+msgid "Export snippets from the database"
+msgstr "å¾?è³?æ??åº«å?¯å?ºæ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/plugin.c:327
+#| msgid "Project manager actions"
+msgid "Snippets Manager actions"
+msgstr "æ??å?ç®¡ç??å?¡å??ä½?"
+
+#: ../plugins/snippets-manager/plugin.c:767
+#| msgid "Command"
+msgid "Command?"
+msgstr "æ??ä»¤ï¼?"
+
+#: ../plugins/snippets-manager/plugin.c:783
+#| msgid "Variable list"
+msgid "Variable text"
+msgstr "è®?æ?¸æ??å?"
+
+#: ../plugins/snippets-manager/plugin.c:801
+#: ../plugins/snippets-manager/snippets-editor.c:40
+#| msgid "Inspect/Evaluate"
+msgid "Instant value"
+msgstr "å?³æ??æ?¸å?¼"
+
+#: ../plugins/snippets-manager/plugin.c:929
+#: ../plugins/snippets-manager/plugin.c:966
+#: ../plugins/snippets-manager/snippets-provider.c:753
+#: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:2
+msgid "Code Snippets"
+msgstr "ç¨?å¼?ç¢¼æ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/snippets-browser.c:549
+msgid "Trigger"
+msgstr "è§¸ç?¼"
+
+#: ../plugins/snippets-manager/snippets-browser.c:560
+#| msgid "Language Manager"
+msgid "Languages"
+msgstr "èª?è¨?"
+
+#. Insert the Add Snippet menu item
+#: ../plugins/snippets-manager/snippets-browser.c:808
+#| msgid "Add _Targetâ?¦"
+msgid "Add Snippet â?¦"
+msgstr "å? å?¥æ??å?ç??æ®µâ?¦"
+
+#. Insert the Add Snippets Group menu item
+#: ../plugins/snippets-manager/snippets-browser.c:818
+#| msgid "Add _Groupâ?¦"
+msgid "Add Snippets Group â?¦"
+msgstr "å? å?¥æ??å?ç??æ®µç¾£çµ?â?¦"
+
+#: ../plugins/snippets-manager/snippets-editor.c:39
+#| msgid "Default"
+msgid "Default value"
+msgstr "é ?è¨å?¼"
+
+#: ../plugins/snippets-manager/snippets-editor.c:48
+msgid "<b>Error:</b> You must choose at least one language for the snippet!"
+msgstr "<b>é?¯èª¤ï¼?</b>ä½ å¿?é ?ç?ºæ??å?ç??æ®µé?¸æ??è?³å°?ä¸?ç¨®èª?è¨?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.c:49
+msgid "<b>Error:</b> The trigger key is already in use for one of the languages!"
+msgstr "<b>é?¯èª¤ï¼?</b>é??å??è§¸ç?¼é?µå·²ç¶?ç?¨æ?¼å?¶ä¸ä¸?ç¨®èª?è¨?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.c:50
+#| msgid ""
+#| "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "<b>Error:</b> The trigger key can only contain alfanumeric characters and _ !"
+msgstr "<b>é?¯èª¤ï¼?</b>è§¸ç?¼é?µå?ªè?½å??å?«è?±æ??å?æ¯?å?? _ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.c:51
+msgid "<b>Error:</b> You haven't entered a trigger key for the snippet!"
+msgstr "<b>é?¯èª¤ï¼?</b>ä½ å°?æ?ªè¼¸å?¥é??å??æ??å?ç??æ®µç??è§¸ç?¼é?µï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:1
+msgid "<b>Error:</b> The snippet must belong to a group!"
+msgstr "<b>é?¯èª¤ï¼?</b>æ??å?ç??æ®µå¿?é ?å±¬æ?¼æ??å??ç¾£çµ?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:2
+msgid "<b>Warning:</b> You should choose a name for the snippet!"
+msgstr "<b>è¦å??ï¼?</b>ä½ æ??è©²ç?ºæ??å?ç??æ®µé?¸æ??ä¸?å??å??ç¨±ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:3
+#| msgid "_Add"
+msgid "Add"
+msgstr "å? å?¥"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:4
+#| msgid "Close All"
+msgid "Close"
+msgstr "é??é??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:5
+msgid "Insert"
+msgstr "æ??å?¥"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:6
+msgid "Keywords are used for better searching of the snippets. They should be relevant to the snippet content. Type them separated by a single space."
+msgstr "é??é?µå?å?¯ä»¥ç?¨ä¾?å??å?©æ??å°?æ??å?ç??æ®µã??å®?å??æ??è©²è??æ??å?ç??æ®µç??å?§å®¹æ??æ??é??è?¯ã??è¼¸å?¥æ??è«?ä»¥ä¸?å??ç©ºç?½å?ç¬¦å??ç?ºå??é??ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:7
+msgid "Keywords:"
+msgstr "é??é?µå?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:8
+#| msgid "Changes:"
+msgid "Languages:"
+msgstr "èª?è¨?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:9
+#| msgid "_Print Preview"
+msgid "Preview"
+msgstr "é ?è¦½"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:12
+msgid "Select the Snippets Group to which this snippet belongs."
+msgstr "é?¸æ??é??å??æ??å?ç??æ®µæ??å±¬ç??ç¾£çµ?ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:13
+msgid "Select the languages for which you want to use this snippet."
+msgstr "é?¸æ??ä½ è¦?é??å??æ??å?ç??æ®µç?¨æ?¼å?ªç¨®èª?è¨?ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:14
+msgid ""
+"Select the name of the Snippet. \n"
+"The role of the name is purely informative."
+msgstr ""
+"é?¸æ??æ??å?ç??æ®µç??å??ç¨±ã??\n"
+"å??ç¨±ç??ä½?ç?¨å®?å?¨æ?¯ç?¨ä¾?è¾¦è?è??å·²ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:16
+#| msgid "Contents"
+msgid "Snippet Content"
+msgstr "æ??å?ç??æ®µå?§å®¹"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:17
+#| msgid "New Name:"
+msgid "Snippet Name:"
+msgstr "æ??å?ç??æ®µå??ç¨±ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:18
+#| msgid "Properties"
+msgid "Snippet Properties"
+msgstr "æ??å?ç??æ®µå±¬æ?§"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:19
+#| msgid "Environment Variables:"
+msgid "Snippet Variables"
+msgstr "æ??å?ç??æ®µè®?æ?¸"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:20
+msgid "Snippets Group:"
+msgstr "æ??å?ç??æ®µç¾£çµ?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:21
+msgid ""
+"The trigger key is used for fast insertion of the snippet. Type the trigger key in the editor, followed by the \"Fast Insert\" shortcut to insert a snippet.\n"
+"<b>Warning: Must be unique per language. </b>"
+msgstr ""
+"è§¸ç?¼é?µæ?¯ç?¨æ?¼å¿«é??æ??å?¥æ??å?ç??æ®µã??å?¨ç·¨è¼¯å?¨ä¸è¼¸å?¥è§¸ç?¼é?µï¼?æ?¥ç??ä½¿ç?¨ã??å¿«é??æ??å?¥ã??ç??æ?·å¾?é?µä¾?æ??å?¥æ??å?ç??æ®µã??\n"
+"<b>è¦å??ï¼?è§¸ç?¼é?µå¿?é ?æ?¯æ¯?å??èª?è¨?å??è?ªç?¨ç«?ã??</b>"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:23
+msgid "Trigger Key:"
+msgstr "è§¸ç?¼é?µï¼?"
+
+#: ../plugins/snippets-manager/snippets-manager-preferences.ui.h:1
+#| msgid "Anjuta macros"
+msgid "Anjuta variables"
+msgstr "Anjuta è®?æ?¸"
+
+#: ../plugins/snippets-manager/snippets-import-export.c:145
+#| msgid "Import options"
+msgid "Import Snippets"
+msgstr "å?¯å?¥æ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/snippets-import-export.c:190
+msgid "Export Snippets"
+msgstr "å?¯å?ºæ??å?ç??æ®µ"
+
+#: ../plugins/sourceview/sourceview.c:478
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8549,7 +8769,7 @@ msgstr ""
 "å?¨ç¡¬ç¢?å?§æª?æ¡?ã?? %sã?? ç??å?§å®¹æ¯?ç?®å??ç??ç·©è¡?å??å?§å®¹é??è¦?æ?°ã??\n"
 "æ?¯å?¦è¦?é??æ?°è¼?å?¥å®?ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:432
+#: ../plugins/sourceview/sourceview.c:515
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8559,18 +8779,18 @@ msgstr ""
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:469
+#: ../plugins/sourceview/sourceview.c:552
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "ç?¡æ³?é??å?? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview.c:523
+#: ../plugins/sourceview/sourceview.c:606
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æª?æ¡?ã??%sã??æ?¯å?¯è®?ç??ï¼?ä»?ç?¶è¦?ç·¨è¼¯å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:582
+#: ../plugins/sourceview/sourceview.c:665
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "ç?¡æ³?å?²å?æª?æ¡? %sï¼?%s"
@@ -8674,7 +8894,8 @@ msgid "Use theme font"
 msgstr "ä½¿ç?¨ä¸»é¡?ç??å?å??"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
-#: ../src/anjuta-app.c:629 ../src/anjuta-app.c:634
+#: ../src/anjuta-app.c:629
+#: ../src/anjuta-app.c:634
 msgid "View"
 msgstr "é¡¯ç¤º"
 
@@ -8682,7 +8903,8 @@ msgstr "é¡¯ç¤º"
 msgid "Wrap long lines to fit on paper"
 msgstr "æ ¹æ??é ?é?¢å°?é??é?·ç??æ??å?æ??è¡?"
 
-#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
+#: ../plugins/starter/plugin.c:70
+#: ../plugins/starter/starter.c:362
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "èµ·æ¥"
@@ -8752,9 +8974,8 @@ msgid "First Path:"
 msgstr "ç¬¬ä¸?è·¯å¾?ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:20
-#, fuzzy
 msgid "Ignore ancestry"
-msgstr "å¿½ç?¥æª?æ¡?:"
+msgstr "å¿½ç?¥ä¹?å??ç??æ?¬"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:22
 msgid "Merge changes into working copy"
@@ -8882,19 +9103,22 @@ msgstr "é ?å??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:52 ../plugins/subversion/plugin.c:151
+#: ../plugins/subversion/plugin.c:52
+#: ../plugins/subversion/plugin.c:151
 msgid "_Subversion"
 msgstr "_Subversion"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:62 ../plugins/subversion/plugin.c:177
+#: ../plugins/subversion/plugin.c:62
+#: ../plugins/subversion/plugin.c:177
 msgid "Add a new file/directory to the Subversion tree"
 msgstr "å? å?¥æ?°æª?æ¡?/ç?®é??è?³ Subversion æ¨¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:70 ../plugins/subversion/plugin.c:185
+#: ../plugins/subversion/plugin.c:70
+#: ../plugins/subversion/plugin.c:185
 msgid "Remove a file/directory from Subversion tree"
 msgstr "å¾? Subversion æ¨¹ç§»é?¤æª?æ¡?/ç?®é?? "
 
@@ -8906,13 +9130,15 @@ msgstr "æ??äº¤ä½ ç??ä¿®æ?¹è?³ Subversion æ¨¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
+#: ../plugins/subversion/plugin.c:84
+#: ../plugins/subversion/plugin.c:167
 msgid "_Revertâ?¦"
 msgstr "_Revertâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:86 ../plugins/subversion/plugin.c:169
+#: ../plugins/subversion/plugin.c:86
+#: ../plugins/subversion/plugin.c:169
 msgid "Revert changes to your working copy."
 msgstr "å??å¾©æ?´æ?¹è?³ä½ ç??å·¥ä½?è¤?æ?¬ã??"
 
@@ -8930,13 +9156,15 @@ msgstr "èª¿è§£ä½ å·¥ä½?è¤?æ?¬ä¸ç??è¡?çª?ã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
+#: ../plugins/subversion/plugin.c:100
+#: ../plugins/subversion/plugin.c:159
 msgid "_Updateâ?¦"
 msgstr "_Updateâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
+#: ../plugins/subversion/plugin.c:102
+#: ../plugins/subversion/plugin.c:161
 msgid "Syncronize your local copy with the Subversion tree"
 msgstr "å°?ä½ æ?¬æ©?ç??è¤?æ?¬è?? Subversion æ¨¹å??æ¥"
 
@@ -8948,7 +9176,8 @@ msgstr "è¤?è£½æª?æ¡?/è³?æ??å¤¾â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:110 ../plugins/subversion/plugin.c:201
+#: ../plugins/subversion/plugin.c:110
+#: ../plugins/subversion/plugin.c:201
 msgid "Copy files/folders in the repository"
 msgstr "è¤?è£½æª?æ¡?åº«ä¸ç??æª?æ¡?/è³?æ??å¤¾"
 
@@ -8978,13 +9207,15 @@ msgstr "å??ä½µæ?´æ?¹è?³ä½ ç??å·¥ä½?è¤?æ?¬ä¸"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
+#: ../plugins/subversion/plugin.c:132
+#: ../plugins/subversion/plugin.c:191
 msgid "_View Logâ?¦"
 msgstr "æª¢è¦?ç´?é??æª?(_V)â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:134 ../plugins/subversion/plugin.c:193
+#: ../plugins/subversion/plugin.c:134
+#: ../plugins/subversion/plugin.c:193
 msgid "View file history"
 msgstr "æª¢è¦?æª?æ¡?æ·å?²"
 
@@ -8996,7 +9227,8 @@ msgstr "_Diffâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:142 ../plugins/subversion/plugin.c:209
+#: ../plugins/subversion/plugin.c:142
+#: ../plugins/subversion/plugin.c:209
 msgid "Diff local tree with repository"
 msgstr "æ¯?å°?æ?¬å?°ç«¯æª?æ¡?æ¨¹è??æª?æ¡?åº«ç??å·®ç?°"
 
@@ -9141,83 +9373,83 @@ msgstr "Subversion: å·®ç?°æ¯?å°?å®?æ??ã??"
 msgid "Subversion: Update complete."
 msgstr "Subversion: æ?´æ?°å®?æ??ã??"
 
-#: ../plugins/subversion/svn-command.c:158
-#: ../plugins/subversion/svn-command.c:225
+#: ../plugins/subversion/svn-command.c:168
+#: ../plugins/subversion/svn-command.c:231
 msgid "Authentication canceled"
 msgstr "èª?è?å??æ¶?"
 
-#: ../plugins/subversion/svn-command.c:198
+#: ../plugins/subversion/svn-command.c:204
 msgid "Hostname:"
 msgstr "ä¸»æ©?å??ç¨±:"
 
-#: ../plugins/subversion/svn-command.c:199
+#: ../plugins/subversion/svn-command.c:205
 msgid "Fingerprint:"
 msgstr "æ?¸ç¢¼æ??ç´?"
 
-#: ../plugins/subversion/svn-command.c:200
+#: ../plugins/subversion/svn-command.c:206
 msgid "Valid from:"
 msgstr "ç°½ç?¼æ?¥:"
 
-#: ../plugins/subversion/svn-command.c:201
+#: ../plugins/subversion/svn-command.c:207
 msgid "Valid until:"
 msgstr "å?°æ??æ?¥:"
 
-#: ../plugins/subversion/svn-command.c:202
+#: ../plugins/subversion/svn-command.c:208
 msgid "Issuer DN:"
 msgstr "ç°½ç?¼è?? DN:"
 
-#: ../plugins/subversion/svn-command.c:203
+#: ../plugins/subversion/svn-command.c:209
 msgid "DER certificate:"
 msgstr "DER è?æ?¸:"
 
-#: ../plugins/subversion/svn-command.c:350
-#: ../plugins/subversion/svn-command.c:366
+#: ../plugins/subversion/svn-command.c:375
+#: ../plugins/subversion/svn-command.c:391
 #, c-format
 msgid "Deleted: %s"
 msgstr "å·²å?ªé?¤ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:353
-#: ../plugins/subversion/svn-command.c:372
+#: ../plugins/subversion/svn-command.c:378
+#: ../plugins/subversion/svn-command.c:397
 #, c-format
 msgid "Added: %s"
 msgstr "å·²æ?°å¢?ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:363
+#: ../plugins/subversion/svn-command.c:388
 #, c-format
 msgid "Resolved: %s"
 msgstr "å·²è??ç??ï¼?%s"
 
-#: ../plugins/subversion/svn-command.c:369
+#: ../plugins/subversion/svn-command.c:394
 #, c-format
 msgid "Updated: %s"
 msgstr "å·²æ?´æ?°ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:375
+#: ../plugins/subversion/svn-command.c:400
 #, c-format
 msgid "Externally Updated: %s"
 msgstr "å¤?é?¨æ?´æ?°ï¼?%s"
 
-#: ../plugins/subversion/svn-command.c:409
+#: ../plugins/subversion/svn-command.c:434
 #, c-format
 msgid "Modified: %s"
 msgstr "å·²ä¿®æ?¹ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:412
+#: ../plugins/subversion/svn-command.c:437
 #, c-format
 msgid "Merged: %s"
 msgstr "å·²å??ä½µï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:415
+#: ../plugins/subversion/svn-command.c:440
 #, c-format
 msgid "Conflicted: %s"
 msgstr "å·²è¡?çª?ï¼?%s"
 
-#: ../plugins/subversion/svn-command.c:419
+#: ../plugins/subversion/svn-command.c:444
 #, c-format
 msgid "Missing: %s"
 msgstr "é?ºå¤±ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:422
+#: ../plugins/subversion/svn-command.c:447
 #, c-format
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
@@ -9267,20 +9499,20 @@ msgstr "æ£å?¨ç?¢ç??å¯?ç¢¼å??ç¹¼æ?¿é«?ç³»â?¦"
 msgid "%d files scanned out of %d"
 msgstr "%2$d å??æª?æ¡?ä¸å·²æ??æ?? %1$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1723
-#, fuzzy
+#: ../plugins/symbol-db/plugin.c:1726
 msgid "Populating symbol databaseâ?¦"
-msgstr "Symbol d-by-dt"
+msgstr "æ£å?¨é?·ç§»ç¬¦è??è³?æ??åº«â?¦"
 
-#: ../plugins/symbol-db/plugin.c:2042 ../plugins/symbol-db/plugin.c:2127
+#: ../plugins/symbol-db/plugin.c:2045
+#: ../plugins/symbol-db/plugin.c:2130
 msgid "Symbols"
 msgstr "ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:2136
+#: ../plugins/symbol-db/plugin.c:2139
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2144
+#: ../plugins/symbol-db/plugin.c:2147
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
@@ -9298,7 +9530,7 @@ msgstr "ç¬¦è??è³?æ??åº«"
 msgid "API Tags"
 msgstr "API æ¨?ç±¤"
 
-#: ../plugins/symbol-db/symbol-db-system.c:807
+#: ../plugins/symbol-db/symbol-db-system.c:817
 msgid "Resuming glb scan."
 msgstr "ç¹¼çº? glb æ??æ??ã??"
 
@@ -9311,9 +9543,7 @@ msgid "Automatically update symbols without saving file"
 msgstr "ä¸?å?²å?æª?æ¡?è??è?ªå??æ?´æ?°ç¬¦è??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid ""
-"Automatically update the file's symbols without saving. The update occurs "
-"after 10 seconds without keypresses by the user."
+msgid "Automatically update the file's symbols without saving. The update occurs after 10 seconds without keypresses by the user."
 msgstr "ä¸?é??å?²å?å°±è?ªå??æ?´æ?°æª?æ¡?ç??ç¬¦è??ã??æ¤æ?´æ?°æ??å?¨ä½¿ç?¨è??å??æ¢è¼¸å?¥ç?? 10 ç§?å¾?é?²è¡?ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
@@ -9329,15 +9559,11 @@ msgid "Parallel scan of project and global symbols"
 msgstr "å°?æ¡?å??å?¨å??ç¬¦è??ç??å¹³è¡?æ??æ??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-msgid ""
-"This option enables the default packages required by your opened project, e."
-"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
+msgid "This option enables the default packages required by your opened project, e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
 msgstr "é??å??é?¸é ?æ??å??ç?¨ä½ é??å??ç??å°?æ¡?æ??é??ç??é ?è¨å¥?ä»¶ï¼?ä¾?å¦?ä½ å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
-msgid ""
-"This option means that the global system packages will be scanned "
-"simultaneously with the project's ones"
+msgid "This option means that the global system packages will be scanned simultaneously with the project's ones"
 msgstr "é??å??é?¸é ?ç¤ºå?¨å??ç³»çµ±å¥?ä»¶æ??è??å°?å®?ä¸?æ¨£è¢«æ??æ??"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
@@ -9368,7 +9594,8 @@ msgstr "Ctrl-Z"
 msgid "terminal operations"
 msgstr "çµ?ç«¯æ©?æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:806 ../plugins/terminal/terminal.c:982
+#: ../plugins/terminal/terminal.c:806
+#: ../plugins/terminal/terminal.c:982
 #: ../plugins/terminal/terminal.c:1035
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
@@ -9422,8 +9649,10 @@ msgstr "æ¨?æº?è¼¸å?ºï¼?"
 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
+#: ../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 "å·¥å?·"
 
@@ -9477,9 +9706,7 @@ msgid "A tool with the same name already exists!"
 msgstr "ç?¸å??å??ç¨±ç??å·¥å?·å·²ç¶?å?å?¨ï¼?"
 
 #: ../plugins/tools/editor.c:824
-msgid ""
-"The shortcut is already used by another component in Anjuta. Do you want to "
-"keep it anyway?"
+msgid "The shortcut is already used by another component in Anjuta. Do you want to keep it anyway?"
 msgstr "è©²æ?·å¾?é?µå·²ç¶?è¢« Anjuta ä¸å?¶ä»?ç??å??ä»¶ä½¿ç?¨äº?ã??æ?¯å?¦è¦?å¼·å?¶ä¿?ç??å®?ï¼?"
 
 #: ../plugins/tools/editor.c:908
@@ -9984,10 +10211,12 @@ msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??ä¸?ä½¿ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?é¡¯ç¤ºè¦å??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?¨å?½æ?¸å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ '('"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:2
 msgid "Add a space after function call autocompletion"
 msgstr "å?¨å?½æ?¸å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ç©ºç?½"
 
@@ -9996,18 +10225,23 @@ msgid "Auto-complete"
 msgstr "è?ªå??è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
-msgid "Autocompletion (C/C++/Java only)"
-msgstr "è?ªå??è£?é½?(å?ªæ?? C/C++/Java)"
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:4
+#| msgid "Auto-complete"
+msgid "Autocompletion"
+msgstr "è?ªå??è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:5
 msgid "Brace indentation size in spaces:"
 msgstr "å¤§æ?¬å¼§ç¸®æ??(ç©ºç?½æ?¸)ï¼?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:6
 msgid "Calltips"
 msgstr "å?¼å?«æ??ç¤º"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:8
 msgid "Enable code completion"
 msgstr "å??ç?¨ç¨?å¼?ç¢¼è£?é½?"
 
@@ -10016,6 +10250,7 @@ msgid "Enable smart brace completion"
 msgstr "å??ç?¨æ?ºæ?§å??æ?¬å¼§è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:9
 msgid "Enable smart indentation"
 msgstr "å??ç?¨æ?ºæ?§å??ç¸®æ??"
 
@@ -10024,37 +10259,42 @@ msgid "Indent:"
 msgstr "ç¸®æ??ï¼?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:11
 msgid "Indentation parameters"
 msgstr "ç¸®æ??å??æ?¸"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
-#, fuzzy
 msgid "Line up parentheses"
-msgstr "æ??æ?°ç??"
+msgstr "å°?é½?æ?¬è??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
-#, fuzzy
 msgid "Parenthesis indentation"
-msgstr "ç¸®æ??æ??å¼?(_I)"
+msgstr "æ?¬è??ç¸®æ??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "é¡¯ç¤ºå?¼å?«æ??ç¤º"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:15
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??ç¸®æ??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??ç¸®æ??å¤§å°?(ç©ºç?½å?ç¬¦)ï¼?"
 
+#. ANJUTA_STOCK_AUTOINDENT,
 #: ../plugins/language-support-cpp-java/plugin.c:1882
+#: ../plugins/language-support-python/plugin.c:1182
 msgid "Auto-Indent"
 msgstr "è?ªå??ç¸®æ??"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1883
+#: ../plugins/language-support-python/plugin.c:1183
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "æ ¹æ??ç¸®æ??è¨å®?å?¼è?ªå??ç¸®æ??ç?®å??ç??è¡?æ??é?¸æ??å??å??"
 
@@ -10075,11 +10315,68 @@ msgstr "C++/Java æ?´å?©"
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
-#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1231
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1258
 msgid "C/C++"
 msgstr "C/C++"
 
-#: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
+#: ../plugins/language-support-python/plugin.c:907
+msgid "Python support warning"
+msgstr "Python æ?¯æ?´è¦å??"
+
+#: ../plugins/language-support-python/plugin.c:915
+msgid ""
+"Either python path is wrong or python-rope (http://rope.sf.net) libraries\n"
+"aren't installed. Both are required for autocompletion in python files.\n"
+"Please install them and check the python path in the preferences."
+msgstr ""
+"å?¯è?½ python è·¯å¾?é?¯èª¤æ?? python-rope (http://rope.sf.net) ç¨?å¼?åº«\n"
+"å°?æ?ªå®?è£?ã??é??å?©è??é?½æ?¯ python æª?æ¡?è?ªå??è£?é½?æ??é??ã??\n"
+"è«?å®?è£?å®?å??ä¸¦ä¸?å?¨å??å¥½è¨å®?ä¸æª¢æ?¥ python è·¯å¾?ã??"
+
+#: ../plugins/language-support-python/plugin.c:918
+#| msgid "Do not show again"
+msgid "Do not show that warning again"
+msgstr "ä¸?å??é¡¯ç¤ºé??å??è¦å??"
+
+#: ../plugins/language-support-python/plugin.c:1264
+#| msgid "Project Assistant"
+msgid "Python Assistance"
+msgstr "Python å?©ç??"
+
+#: ../plugins/language-support-python/plugin.c:1364
+#: ../plugins/language-support-python/plugin.c:1373
+#: ../plugins/language-support-python/python-assist.c:937
+#| msgid "Python Module"
+msgid "Python"
+msgstr "Python"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:3
+#| msgid "Auto-complete"
+msgid "Autocomplete"
+msgstr "è?ªå??å®?æ??"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:7
+#| msgid "Enable smart indentation"
+msgid "Enable adaptive indentation"
+msgstr "å??ç?¨é?©æ??å??ç¸®æ??"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:10
+#| msgid "Environment Variables:"
+msgid "Environment"
+msgstr "ç?°å¢?"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:12
+#| msgid "Interface"
+msgid "Interpreter"
+msgstr "è½?è¯å?¨"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:13
+#| msgid "Path:"
+msgid "Path: "
+msgstr "è·¯å¾?ï¼?"
+
+#: ../plugins/sourceview/plugin.c:232
+#: ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView ç·¨è¼¯å?¨"
 
@@ -10151,14 +10448,6 @@ msgstr "å·¥ä½?ç®¡ç??å?¡"
 msgid "Todo Plugin for Anjuta."
 msgstr "çµ¦ Anjuta ç??å¾?è¾¦äº?é ?å¤?æ??ç¨?å¼?ã??"
 
-#: ../plugins/macro/anjuta-macro.plugin.in.h:1
-msgid "Insert predefined macros into Editor"
-msgstr "æ??å?¥é ?å??å®?ç¾©å¥½ç??å·¨é??è?³ç·¨è¼¯å?¨"
-
-#: ../plugins/macro/anjuta-macro.plugin.in.h:2
-msgid "Macro Plugin"
-msgstr "å·¨é??å¤?æ??ç¨?å¼?"
-
 #: ../plugins/patch/anjuta-patch.plugin.in.h:1
 msgid "Patch Plugin"
 msgstr "ä¿®è£?å¤?æ??ç¨?å¼?"
@@ -10255,6 +10544,10 @@ msgstr "Anjuta ç??å°?æ¡?ç®¡ç??å?¡å¤?æ??ç¨?å¼?"
 msgid "Symbol Database Plugin for Anjuta."
 msgstr "Anjuta ç??ç¬¦è??è³?æ??åº«å¤?æ??ç¨?å¼?"
 
+#: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:1
+msgid "Allows insertion of snippets into the editor."
+msgstr "å??è¨±æ??å?ç??æ®µæ??å?¥ç·¨è¼¯å?¨ã??"
+
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
 msgstr "ç®¡ç??å¾?å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?ç??è¨?æ?¯"
@@ -10339,25 +10632,26 @@ msgid "JavaScript Support Plugin"
 msgstr "JavaScript æ?¯æ?´å¤?æ??ç¨?å¼?"
 
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
-msgid "<b>JS Find dirs</b>"
-msgstr "<b>JS Find ç?®é??</b>"
-
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
 msgid "Add brace after function call autocompletion"
 msgstr "å?¨å?½æ?¸å?¼å?«è?ªå??è£?é½?å¾?å? å?¥æ?¬è??"
 
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
 msgid "Gir repository's directory:   "
 msgstr "Gir æª?æ¡?åº«ç?®é??ï¼?"
 
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
 msgid "Gjs repository's directory:   "
 msgstr "Gjs æª?æ¡?åº«ç?®é??ï¼?"
 
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
 msgid "Highlight missed semicolon"
 msgstr "æ¨?ç¤ºæ¼?æ??ç??å??è??"
 
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+#| msgid "<b>JS Find dirs</b>"
+msgid "JS Find dirs"
+msgstr "JS Find ç?®é??"
+
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
 msgid "Min character for completion "
 msgstr "è?ªå??è£?é½?ç??æ??å°?å?ç¬¦"
@@ -10366,6 +10660,115 @@ msgstr "è?ªå??è£?é½?ç??æ??å°?å?ç¬¦"
 msgid "Symbol"
 msgstr "ç¬¦è??"
 
+#~ msgid ""
+#~ "<b>There is %d item with unsaved changes. Save changes before closing?</b>"
+
+#~ msgid_plural ""
+#~ "<b>There are %d items with unsaved changes. Save changes before closing?</"
+#~ "b>"
+#~ msgstr[0] "<b>é??è£¡æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å?ç??è®?æ?´ã??æ?¯å?¦å?¨é??é??å??å?²å?è®?æ?´ï¼?</b>"
+
+#~ msgid ""
+#~ "The following pretty printers, without a register functions, have been "
+#~ "disabled:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "ä¸?å??å?°è¡¨æ©?å? ç?ºæ²?æ??è¨»å??è¡¨å?½å¼?ï¼?å·²ç¶?è¢«å??ç?¨äº?ï¼?\n"
+#~ " %s"
+
+#~ msgid "Editâ?¦"
+#~ msgstr "ç·¨è¼¯â?¦"
+
+#~ msgid "Macro details:"
+#~ msgstr "å·¨é??è©³ç´°è³?æ??ï¼?"
+
+#~ msgid "Macro text:"
+#~ msgstr "å·¨é??æ??å?ï¼?"
+
+#~ msgid "Macros:"
+#~ msgstr "å·¨é??ï¼?"
+
+#~ msgid "Shortcut:"
+#~ msgstr "å¿«æ?·é?µï¼?"
+
+#~ msgid "Press macro shortcutâ?¦"
+#~ msgstr "è«?æ??å·¨é??å¿«æ?·é?µâ?¦"
+
+#~ msgid "Press shortcut"
+#~ msgstr "æ??ä¸?å¿«æ?·é?µ"
+
+#~ msgid "My macros"
+#~ msgstr "æ??ç??å·¨é??"
+
+#~ msgid ""
+#~ "Name:\t %s\n"
+#~ "Category:\t %s\n"
+#~ "Shortcut:\t %c\n"
+#~ msgstr ""
+#~ "å??ç¨±ï¼?\t %s\n"
+#~ "å??é¡?ï¼?\t %s\n"
+#~ "æ?·å¾?ï¼?\t %c\n"
+
+#~ msgid "Insert macro"
+#~ msgstr "æ??å?¥å·¨é??"
+
+#~ msgid "Add/Edit macro"
+#~ msgstr "å? å?¥/ç·¨è¼¯å·¨é??"
+
+#~ msgid "%Y-%m-%d"
+#~ msgstr "%Y-%m-%d"
+
+#~ msgid "%Y"
+#~ msgstr "%Y"
+
+#~ msgid "Macros"
+#~ msgstr "å·¨é??"
+
+#~ msgid "_Insert Macroâ?¦"
+#~ msgstr "æ??å?¥å·¨é??(_I)â?¦"
+
+#~ msgid "Insert a macro using a shortcut"
+#~ msgstr "ä½¿ç?¨å¿«æ?·é?µæ??å?¥å·¨é??"
+
+#~ msgid "_Add Macroâ?¦"
+#~ msgstr "å? å?¥å·¨é??(_A)â?¦"
+
+#~ msgid "Add a macro"
+#~ msgstr "å? å?¥å·¨é??"
+
+#~ msgid "Macrosâ?¦"
+#~ msgstr "å·¨é??â?¦"
+
+#~ msgid "Add/Edit/Remove macros"
+#~ msgstr "å? å?¥/ç·¨è¼¯/ç§»é?¤å·¨é??"
+
+#~ msgid "Macro operations"
+#~ msgstr "å·¨é??æ??ä½?"
+
+#~ msgid "A GNOME applet project"
+#~ msgstr "GNOME é?¢æ?¿ç¨?å¼?å°?æ¡?"
+
+#~ msgid "Applet Title:"
+#~ msgstr "é?¢æ?¿ç¨?å¼?æ¨?é¡?ï¼?"
+
+#~ msgid "Display description of the applet"
+#~ msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ??è¿°"
+
+#~ msgid "Display title of the applet"
+#~ msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ¨?é¡?"
+
+#~ msgid "GNOME Applet"
+#~ msgstr "GNOME é?¢æ?¿ç¨?å¼?"
+
+#~ msgid "Autocompletion (C/C++/Java only)"
+#~ msgstr "è?ªå??è£?é½?(å?ªæ?? C/C++/Java)"
+
+#~ msgid "Insert predefined macros into Editor"
+#~ msgstr "æ??å?¥é ?å??å®?ç¾©å¥½ç??å·¨é??è?³ç·¨è¼¯å?¨"
+
+#~ msgid "Macro Plugin"
+#~ msgstr "å·¨é??å¤?æ??ç¨?å¼?"
+
 #~ msgid "Online"
 #~ msgstr "ä¸?ç·?"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 11e9c36..3b43e84 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta 2.31.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 18:53+0800\n"
-"PO-Revision-Date: 2010-07-22 09:02+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
+"POT-Creation-Date: 2010-09-21 21:22+0000\n"
+"PO-Revision-Date: 2010-09-22 09:14+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,8 @@ msgstr "Anjuta æ?´å??å¼?é??ç?¼ç?°å¢?"
 msgid "Develop software in an integrated development environment"
 msgstr "å?¨æ?´å??å¼?é??ç?¼ç?°å¢?ä¸é??ç?¼è»?é«?"
 
-#: ../anjuta.desktop.in.in.h:3 ../src/about.c:204
+#: ../anjuta.desktop.in.in.h:3
+#: ../src/about.c:204
 msgid "Integrated Development Environment"
 msgstr "æ?´å??å¼?é??ç?¼ç?°å¢?"
 
@@ -60,30 +61,35 @@ msgstr "å¤±å?»å¤?æ??ç¨?å¼? %s å®?ç¾©ç??é¡?å??"
 msgid "plugin %s fails to register type %s"
 msgstr "å¤?æ??ç¨?å¼? %s è¨»å??é¡?å?? %s å¤±æ??"
 
-#: ../libanjuta/anjuta-convert.c:74 ../libanjuta/anjuta-convert.c:111
+#: ../libanjuta/anjuta-convert.c:74
+#: ../libanjuta/anjuta-convert.c:111
 #, c-format
 msgid "The file you are trying to open contains an invalid byte sequence."
 msgstr "æ?¨å??è©¦é??å??ç??æª?æ¡?å??å?«ç?¡æ??ç??ä½?å??åº?å??"
 
-#: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
+#: ../libanjuta/anjuta-convert.c:168
+#: ../libanjuta/anjuta-convert.c:207
 #, c-format
-msgid ""
-"Anjuta was not able to automatically determine the encoding of the file you "
-"want to open."
+msgid "Anjuta was not able to automatically determine the encoding of the file you want to open."
 msgstr "Anjuta ç?¡æ³?è?ªå??å?¤æ?·æ?¨æ?³è¦?é??å??æª?æ¡?ç??ç·¨ç¢¼ç?ºä½?ã??"
 
-#: ../libanjuta/anjuta-encodings.c:137 ../libanjuta/anjuta-encodings.c:182
-#: ../libanjuta/anjuta-encodings.c:184 ../libanjuta/anjuta-encodings.c:186
+#: ../libanjuta/anjuta-encodings.c:137
+#: ../libanjuta/anjuta-encodings.c:182
+#: ../libanjuta/anjuta-encodings.c:184
+#: ../libanjuta/anjuta-encodings.c:186
 #: ../libanjuta/anjuta-encodings.c:188
 msgid "Unicode"
 msgstr "çµ±ä¸?ç¢¼(Unicode)"
 
-#: ../libanjuta/anjuta-encodings.c:151 ../libanjuta/anjuta-encodings.c:177
-#: ../libanjuta/anjuta-encodings.c:223 ../libanjuta/anjuta-encodings.c:266
+#: ../libanjuta/anjuta-encodings.c:151
+#: ../libanjuta/anjuta-encodings.c:177
+#: ../libanjuta/anjuta-encodings.c:223
+#: ../libanjuta/anjuta-encodings.c:266
 msgid "Western"
 msgstr "è¥¿æ?"
 
-#: ../libanjuta/anjuta-encodings.c:153 ../libanjuta/anjuta-encodings.c:225
+#: ../libanjuta/anjuta-encodings.c:153
+#: ../libanjuta/anjuta-encodings.c:225
 #: ../libanjuta/anjuta-encodings.c:262
 msgid "Central European"
 msgstr "ä¸æ?"
@@ -92,23 +98,29 @@ msgstr "ä¸æ?"
 msgid "South European"
 msgstr "å??æ?"
 
-#: ../libanjuta/anjuta-encodings.c:157 ../libanjuta/anjuta-encodings.c:173
+#: ../libanjuta/anjuta-encodings.c:157
+#: ../libanjuta/anjuta-encodings.c:173
 #: ../libanjuta/anjuta-encodings.c:276
 msgid "Baltic"
 msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
 
-#: ../libanjuta/anjuta-encodings.c:159 ../libanjuta/anjuta-encodings.c:227
-#: ../libanjuta/anjuta-encodings.c:240 ../libanjuta/anjuta-encodings.c:244
-#: ../libanjuta/anjuta-encodings.c:246 ../libanjuta/anjuta-encodings.c:264
+#: ../libanjuta/anjuta-encodings.c:159
+#: ../libanjuta/anjuta-encodings.c:227
+#: ../libanjuta/anjuta-encodings.c:240
+#: ../libanjuta/anjuta-encodings.c:244
+#: ../libanjuta/anjuta-encodings.c:246
+#: ../libanjuta/anjuta-encodings.c:264
 msgid "Cyrillic"
 msgstr "æ?¯æ??å¤«æ??"
 
-#: ../libanjuta/anjuta-encodings.c:161 ../libanjuta/anjuta-encodings.c:233
+#: ../libanjuta/anjuta-encodings.c:161
+#: ../libanjuta/anjuta-encodings.c:233
 #: ../libanjuta/anjuta-encodings.c:274
 msgid "Arabic"
 msgstr "é?¿æ??ä¼¯æ??"
 
-#: ../libanjuta/anjuta-encodings.c:163 ../libanjuta/anjuta-encodings.c:268
+#: ../libanjuta/anjuta-encodings.c:163
+#: ../libanjuta/anjuta-encodings.c:268
 msgid "Greek"
 msgstr "å¸?è??æ??"
 
@@ -116,12 +128,14 @@ msgstr "å¸?è??æ??"
 msgid "Hebrew Visual"
 msgstr "å¸?ä¼¯ä¾?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:167 ../libanjuta/anjuta-encodings.c:231
+#: ../libanjuta/anjuta-encodings.c:167
+#: ../libanjuta/anjuta-encodings.c:231
 #: ../libanjuta/anjuta-encodings.c:272
 msgid "Hebrew"
 msgstr "å¸?ä¼¯ä¾?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:169 ../libanjuta/anjuta-encodings.c:229
+#: ../libanjuta/anjuta-encodings.c:169
+#: ../libanjuta/anjuta-encodings.c:229
 #: ../libanjuta/anjuta-encodings.c:270
 msgid "Turkish"
 msgstr "å??è?³å?¶æ??"
@@ -142,7 +156,8 @@ msgstr "ç¾?é¦¬å°¼äº?æ??"
 msgid "Armenian"
 msgstr "é?¿ç¾?å°¼äº?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:193 ../libanjuta/anjuta-encodings.c:195
+#: ../libanjuta/anjuta-encodings.c:193
+#: ../libanjuta/anjuta-encodings.c:195
 #: ../libanjuta/anjuta-encodings.c:209
 msgid "Chinese Traditional"
 msgstr "ç¹?é«?ä¸æ??"
@@ -151,19 +166,25 @@ msgstr "ç¹?é«?ä¸æ??"
 msgid "Cyrillic/Russian"
 msgstr "æ?¯æ??å¤«æ??/ä¿?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:200 ../libanjuta/anjuta-encodings.c:202
-#: ../libanjuta/anjuta-encodings.c:204 ../libanjuta/anjuta-encodings.c:236
+#: ../libanjuta/anjuta-encodings.c:200
+#: ../libanjuta/anjuta-encodings.c:202
+#: ../libanjuta/anjuta-encodings.c:204
+#: ../libanjuta/anjuta-encodings.c:236
 #: ../libanjuta/anjuta-encodings.c:251
 msgid "Japanese"
 msgstr "æ?¥æ??"
 
-#: ../libanjuta/anjuta-encodings.c:207 ../libanjuta/anjuta-encodings.c:238
-#: ../libanjuta/anjuta-encodings.c:242 ../libanjuta/anjuta-encodings.c:257
+#: ../libanjuta/anjuta-encodings.c:207
+#: ../libanjuta/anjuta-encodings.c:238
+#: ../libanjuta/anjuta-encodings.c:242
+#: ../libanjuta/anjuta-encodings.c:257
 msgid "Korean"
 msgstr "é??æ??"
 
-#: ../libanjuta/anjuta-encodings.c:212 ../libanjuta/anjuta-encodings.c:214
-#: ../libanjuta/anjuta-encodings.c:216 ../libanjuta/anjuta-encodings.c:220
+#: ../libanjuta/anjuta-encodings.c:212
+#: ../libanjuta/anjuta-encodings.c:214
+#: ../libanjuta/anjuta-encodings.c:216
+#: ../libanjuta/anjuta-encodings.c:220
 msgid "Chinese Simplified"
 msgstr "ç°¡é«?ä¸æ??"
 
@@ -175,7 +196,8 @@ msgstr "å?¬æ²»äº?æ??"
 msgid "Cyrillic/Ukrainian"
 msgstr "æ?¯æ??å¤«æ??/ç??é»?è?æ??"
 
-#: ../libanjuta/anjuta-encodings.c:253 ../libanjuta/anjuta-encodings.c:259
+#: ../libanjuta/anjuta-encodings.c:253
+#: ../libanjuta/anjuta-encodings.c:259
 #: ../libanjuta/anjuta-encodings.c:278
 msgid "Vietnamese"
 msgstr "è¶?å??æ??"
@@ -184,7 +206,8 @@ msgstr "è¶?å??æ??"
 msgid "Thai"
 msgstr "æ³°æ??"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:193
+#: ../libanjuta/anjuta-encodings.c:441
+#: ../plugins/gbf-am/gbf-am-project.c:193
 #: ../plugins/gbf-am/gbf-am-project.c:3372
 #: ../plugins/gbf-am/gbf-am-properties.c:130
 #: ../plugins/gbf-am/gbf-am-properties.c:177
@@ -196,17 +219,20 @@ msgstr "æ³°æ??"
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libanjuta/anjuta-launcher.c:1168 ../libanjuta/resources.c:267
-#: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
+#: ../libanjuta/anjuta-launcher.c:1169
+#: ../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:1169
+#: ../libanjuta/anjuta-launcher.c:1170
 msgid "execvp failed"
 msgstr "execvp å·²å¤±æ??"
 
-#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2312
+#: ../libanjuta/anjuta-plugin.c:326
+#: ../libanjuta/anjuta-plugin-manager.c:2312
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -223,8 +249,7 @@ msgstr "å¤?æ??ç¨?å¼?ã??%sã??ä¸?æ?³è¦?è¢«å??æ¢ä½¿ç?¨"
 #, c-format
 msgid ""
 "Could not load %s\n"
-"This usually means that your installation is corrupted. The error message "
-"leading to this was:\n"
+"This usually means that your installation is corrupted. The error message leading to this was:\n"
 "%s"
 msgstr ""
 "ç?¡æ³?è¼?å?¥ %s\n"
@@ -241,7 +266,8 @@ msgstr "è¼?å?¥"
 msgid "Available Plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:934
+#: ../libanjuta/anjuta-plugin-manager.c:1036
+#: ../src/anjuta-app.c:934
 msgid "Preferred plugins"
 msgstr "å??å¥½ç??å¤?æ??ç¨?å¼?"
 
@@ -250,20 +276,16 @@ msgid "Only show user activatable plugins"
 msgstr "å?ªé¡¯ç¤ºä½¿ç?¨è??å?¯å??ç?¨ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1197
-msgid ""
-"These are the plugins selected by you when Anjuta prompted to choose one of "
-"many suitable plugins. Removing the preferred plugin will let Anjuta prompt "
-"you again to choose different plugin."
-msgstr ""
-"é??è£¡æ?¯å?¨ Anjuta æ??ç¤ºæ?¨å¾?è¨±å¤?å??é?©ç??å¤?æ??ç¨?å¼?ä¸é?¸æ??ä¸?å??æ??æ??é?¸å??ç??å¤?æ??ç¨?å¼?ã??ç§»é?¤"
-"é??äº?é¦?é?¸ç??å¤?æ??ç¨?å¼?æ??è®? Anjuta å??åº¦æ??ç¤ºæ?¨é?¸æ??å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??"
+msgid "These are the plugins selected by you when Anjuta prompted to choose one of many suitable plugins. Removing the preferred plugin will let Anjuta prompt you again to choose different plugin."
+msgstr "é??è£¡æ?¯å?¨ Anjuta æ??ç¤ºæ?¨å¾?è¨±å¤?å??é?©ç??å¤?æ??ç¨?å¼?ä¸é?¸æ??ä¸?å??æ??æ??é?¸å??ç??å¤?æ??ç¨?å¼?ã??ç§»é?¤é??äº?é¦?é?¸ç??å¤?æ??ç¨?å¼?æ??è®? Anjuta å??åº¦æ??ç¤ºæ?¨é?¸æ??å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1223
 msgid "Forget selected plugin"
 msgstr "å¿?æ??å·²é?¸å??ç??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
-#: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
+#: ../libanjuta/anjuta-plugin-manager.c:1508
+#: ../libanjuta/anjuta-profile.c:507
 #: ../plugins/debug-manager/queue.c:529
 msgid "Select a plugin"
 msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
@@ -363,9 +385,7 @@ msgstr "è«?å¾?æ¸?å?®ä¸é?¸æ??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-profile.c:672
 #, 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 profile."
 msgstr "è®?å??ã??%sã??å¤±æ??ï¼?XML è§£æ??é?¯èª¤ã??ç?¡æ??æ??æ??å£?ç?? Anjuta å¤?æ??ç¨?å¼?è¨å®?çµ?å??ã??"
 
 #. <Pluginname>: Install it from <some location on the web>
@@ -393,19 +413,22 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1538 ../plugins/git/plugin.c:455
+#: ../libanjuta/anjuta-preferences.c:1538
+#: ../plugins/git/plugin.c:455
 msgid "_Reset"
 msgstr "é??ç½®(_R)"
 
 #: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:229 ../plugins/gtodo/mcategory.c:36
+#: ../plugins/gtodo/interface.c:219
+#: ../plugins/gtodo/mcategory.c:36
 msgid "Category"
 msgstr "å??é¡?"
 
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:921
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../src/anjuta-app.c:921
 #: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "ä¸?è?¬"
@@ -424,6 +447,7 @@ msgstr "å¦?æ??æ?¨æ²?æ??å?²å?ï¼?å°?é?ºå¤±æ??æ??ä¿®æ?¹ã??"
 
 #: ../libanjuta/anjuta-save-prompt.c:189
 #: ../plugins/document-manager/plugin.c:605
+#: ../plugins/snippets-manager/snippets-editor.ui.h:11
 msgid "Save"
 msgstr "å?²å?"
 
@@ -435,15 +459,14 @@ msgstr "é ?ç?®"
 msgid "_Discard changes"
 msgstr "æ??æ£?æ?´æ?¹(_D)"
 
-#: ../libanjuta/anjuta-save-prompt.c:297
+#: ../libanjuta/anjuta-save-prompt.c:296
 #, c-format
-msgid ""
-"<b>There is %d item with unsaved changes. Save changes before closing?</b>"
-msgid_plural ""
-"<b>There are %d items with unsaved changes. Save changes before closing?</b>"
-msgstr[0] "<b>é??è£¡æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å?ç??è®?æ?´ã??æ?¯å?¦å?¨é??é??å??å?²å?è®?æ?´ï¼?</b>"
+#| msgid "There is an item with unsaved changes. Save changes before closing?"
+msgid "There is %d item with unsaved changes. Save changes before closing?"
+msgid_plural "There are %d items with unsaved changes. Save changes before closing?"
+msgstr[0] "é??è£¡æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å?ç??è®?æ?´ã??æ?¯å?¦å?¨é??é??å??å?²å?è®?æ?´ï¼?"
 
-#: ../libanjuta/anjuta-save-prompt.c:304
+#: ../libanjuta/anjuta-save-prompt.c:305
 msgid "There is an item with unsaved changes. Save changes before closing?"
 msgstr "æ??ä¸?å??é ?ç?®å°?æ?ªå?²å?ä¿®æ?¹ã??çµ?æ??å??å?²å?ï¼?"
 
@@ -469,20 +492,15 @@ msgid "System:"
 msgstr "ç³»çµ±ï¼?"
 
 #: ../libanjuta/anjuta-utils.c:505
-msgid ""
-"You do not seem to have PackageKit installed. PackageKit is required for "
-"installing missing packages. Please install \"packagekit-gnome\" package "
-"from your distribution, or install the missing packages manually."
-msgstr ""
-"æ?¨ä¼¼ä¹?æ²?æ??å®?è£? PackageKitã??å¿?é ?æ?? PackageKit æ??è?½å®?è£?ç¼ºå°?ç??å¥?ä»¶ã??è«?å¾?æ?¨ç??ç?¼è¡?"
-"ç??æ?¬å®?è£?ã??packagekit-gnomeã??å¥?ä»¶ï¼?æ??æ??å??å®?è£?ç¼ºå°?ç??å¥?ä»¶ã??"
+msgid "You do not seem to have PackageKit installed. PackageKit is required for installing missing packages. Please install \"packagekit-gnome\" package from your distribution, or install the missing packages manually."
+msgstr "æ?¨ä¼¼ä¹?æ²?æ??å®?è£? PackageKitã??å¿?é ?æ?? PackageKit æ??è?½å®?è£?ç¼ºå°?ç??å¥?ä»¶ã??è«?å¾?æ?¨ç??ç?¼è¡?ç??æ?¬å®?è£?ã??packagekit-gnomeã??å¥?ä»¶ï¼?æ??æ??å??å®?è£?ç¼ºå°?ç??å¥?ä»¶ã??"
 
-#: ../libanjuta/anjuta-utils.c:515
+#: ../libanjuta/anjuta-utils.c:514
 #, c-format
 msgid "Installation failed: %s"
 msgstr "å®?è£?ä½?æ?¯å¤±æ??ï¼?%s"
 
-#: ../libanjuta/anjuta-utils.c:575
+#: ../libanjuta/anjuta-utils.c:582
 #, c-format
 msgid ""
 "The \"%s\" package is not installed.\n"
@@ -491,7 +509,7 @@ msgstr ""
 "æ?¨å°?æ?ªå®?è£?ã??%sã??å¥?ä»¶ã??\n"
 "è«?å®?è£?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:593
+#: ../libanjuta/anjuta-utils.c:600
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -501,25 +519,23 @@ msgstr ""
 "è«?å®?è£?å®?ã??"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:1172
+#: ../libanjuta/anjuta-utils.c:1179
 msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ?¾ä¸?å?°çµ?ç«¯æ©?ï¼?ä½¿ç?¨ xtermï¼?ä¸?ç®¡å®?è?½ä¸?è?½é??ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1208 ../libanjuta/anjuta-utils.c:1212
-#: ../libanjuta/anjuta-utils.c:1240 ../libanjuta/anjuta-utils.c:1244
+#: ../libanjuta/anjuta-utils.c:1215
+#: ../libanjuta/anjuta-utils.c:1219
+#: ../libanjuta/anjuta-utils.c:1247
+#: ../libanjuta/anjuta-utils.c:1251
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??ä»¤ï¼?%sï¼?ä½¿ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1894
-msgid ""
-"Unable to display help. Please make sure the Anjuta documentation package is "
-"installed. It can be downloaded from http://anjuta.org.";
-msgstr ""
-"ç?¡æ³?é¡¯ç¤ºæ±?å?©æ??ä»¶ã??è«?ç¢ºå®? Anjuta æ??ä»¶å¥?ä»¶å·²å®?è£?ã??æ?¨å?¯ä»¥å¾? http://anjuta.org ä¸?"
-"è¼?å®?ã??"
+#: ../libanjuta/anjuta-utils.c:1901
+msgid "Unable to display help. Please make sure the Anjuta documentation package is installed. It can be downloaded from http://anjuta.org.";
+msgstr "ç?¡æ³?é¡¯ç¤ºæ±?å?©æ??ä»¶ã??è«?ç¢ºå®? Anjuta æ??ä»¶å¥?ä»¶å·²å®?è£?ã??æ?¨å?¯ä»¥å¾? http://anjuta.org ä¸?è¼?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:2333
+#: ../libanjuta/anjuta-utils.c:2340
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
@@ -570,7 +586,8 @@ msgid "Ignored"
 msgstr "å·²å¿½ç?¥"
 
 #: ../libanjuta/cell-renderer-captioned-image.c:218
-#: ../libfoocanvas/foo-canvas-text.c:177 ../src/preferences.ui.h:18
+#: ../libfoocanvas/foo-canvas-text.c:177
+#: ../src/preferences.ui.h:18
 msgid "Text"
 msgstr "æ??å?"
 
@@ -592,16 +609,19 @@ msgstr "æº?å??æ??ç¹ªç?? pixbufã??"
 msgid "Widget not found: %s"
 msgstr "ç?¡æ³?æ?¾å?°å??ä»¶ï¼?%s"
 
-#: ../libanjuta/resources.c:79 ../libanjuta/resources.c:101
+#: ../libanjuta/resources.c:79
+#: ../libanjuta/resources.c:101
 #, c-format
 msgid "Could not find application pixmap file: %s"
 msgstr "ç?¡æ³?æ?¾å?°ç¨?å¼?å??ç¤ºæª?ï¼?%s"
 
-#: ../libfoocanvas/foo-canvas.c:1227 ../libfoocanvas/foo-canvas.c:1228
+#: ../libfoocanvas/foo-canvas.c:1227
+#: ../libfoocanvas/foo-canvas.c:1228
 msgid "X"
 msgstr "X"
 
-#: ../libfoocanvas/foo-canvas.c:1234 ../libfoocanvas/foo-canvas.c:1235
+#: ../libfoocanvas/foo-canvas.c:1234
+#: ../libfoocanvas/foo-canvas.c:1235
 msgid "Y"
 msgstr "Y"
 
@@ -638,23 +658,28 @@ msgstr "å?å??æ??ç³»"
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "å?å??æ??ç³»å??ç¨±ï¼?ä¾?å¦?ï¼?Sansã??Helveticaã??Timesã??Monospace"
 
-#: ../libfoocanvas/foo-canvas-text.c:247 ../libfoocanvas/foo-canvas-text.c:248
+#: ../libfoocanvas/foo-canvas-text.c:247
+#: ../libfoocanvas/foo-canvas-text.c:248
 msgid "Font style"
 msgstr "å?å??æ¨£å¼?"
 
-#: ../libfoocanvas/foo-canvas-text.c:257 ../libfoocanvas/foo-canvas-text.c:258
+#: ../libfoocanvas/foo-canvas-text.c:257
+#: ../libfoocanvas/foo-canvas-text.c:258
 msgid "Font variant"
 msgstr "å?å??è®?å??"
 
-#: ../libfoocanvas/foo-canvas-text.c:267 ../libfoocanvas/foo-canvas-text.c:268
+#: ../libfoocanvas/foo-canvas-text.c:267
+#: ../libfoocanvas/foo-canvas-text.c:268
 msgid "Font weight"
 msgstr "å?å??ç²?ç´°"
 
-#: ../libfoocanvas/foo-canvas-text.c:279 ../libfoocanvas/foo-canvas-text.c:280
+#: ../libfoocanvas/foo-canvas-text.c:279
+#: ../libfoocanvas/foo-canvas-text.c:280
 msgid "Font stretch"
 msgstr "å?å??å¯¬ç·?"
 
-#: ../libfoocanvas/foo-canvas-text.c:289 ../libfoocanvas/foo-canvas-text.c:290
+#: ../libfoocanvas/foo-canvas-text.c:289
+#: ../libfoocanvas/foo-canvas-text.c:290
 msgid "Font size"
 msgstr "å?å??å¤§å°?"
 
@@ -671,8 +696,7 @@ msgid "Rise"
 msgstr "å??é«?"
 
 #: ../libfoocanvas/foo-canvas-text.c:312
-msgid ""
-"Offset of text above the baseline (below the baseline if rise is negative)"
+msgid "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr "æ??å?å??åº?é?¨å?ºæº?ç·?ç??è·?é?¢ (å¦?æ??å??é«?ç??æ?¸å?¼ç?ºè² æ?¸ï¼?å??è¡¨ç¤ºä½?æ?¼å?ºæº?ç·?)"
 
 #: ../libfoocanvas/foo-canvas-text.c:322
@@ -699,7 +723,8 @@ msgstr "ç¸®æ?¾"
 msgid "Size of font, relative to default size"
 msgstr "ç?®å??ç??å?å??å¤§å°?ç?¸å°?æ?¼å??ä¾?å¤§å°?ç??æ¯?ä¾?"
 
-#: ../libfoocanvas/foo-canvas-text.c:402 ../libfoocanvas/foo-canvas-text.c:410
+#: ../libfoocanvas/foo-canvas-text.c:402
+#: ../libfoocanvas/foo-canvas-text.c:410
 #: ../libfoocanvas/foo-canvas-text.c:418
 msgid "Color"
 msgstr "é¡?è?²"
@@ -885,7 +910,8 @@ msgstr "ç¿»è¯è¨?æ?¯"
 #: ../plugins/build-basic-autotools/configuration-list.c:68
 #: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
+#: ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "é ?è¨"
 
@@ -998,7 +1024,7 @@ msgid "Command exited with status %d"
 msgstr "æ??ä»¤ä»¥ %d ç??æ??é?¢é??"
 
 #: ../plugins/build-basic-autotools/plugin.c:1048
-#: ../plugins/build-basic-autotools/plugin.c:1528
+#: ../plugins/build-basic-autotools/plugin.c:1527
 #, c-format
 msgid "Command canceled by user"
 msgstr "æ??ä»¤è¢«ä½¿ç?¨è??å??æ¶?"
@@ -1040,204 +1066,201 @@ msgstr "å»ºç½® %d: %s"
 
 #. Need to run make clean before
 #: ../plugins/build-basic-autotools/plugin.c:1522
-msgid ""
-"Before using this new configuration, the default one needs to be removed. Do "
-"you want to do that ?"
+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:1826
+#: ../plugins/build-basic-autotools/plugin.c:1823
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ç?¡æ³?ç·¨è¯ã??%sã??ï¼?æ²?æ??ç?ºæ¤æª?æ¡?é¡?å??å®?ç¾©ä»»ä½?ç·¨è¯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1961
+#: ../plugins/build-basic-autotools/plugin.c:1958
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½è¨å®?å°?æ¡?ï¼?%s ä¸é?ºå¤±è¨å®?å?½ä»¤ç¨¿ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2442
-#: ../plugins/build-basic-autotools/plugin.c:2516
-#: ../plugins/build-basic-autotools/plugin.c:2526
-#: ../plugins/build-basic-autotools/plugin.c:2544
-#: ../plugins/build-basic-autotools/plugin.c:2554
-#: ../plugins/build-basic-autotools/plugin.c:2611
+#: ../plugins/build-basic-autotools/plugin.c:2439
+#: ../plugins/build-basic-autotools/plugin.c:2513
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2541
+#: ../plugins/build-basic-autotools/plugin.c:2551
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Build"
 msgstr "å»ºç½®(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2446
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "_Build Project"
 msgstr "å»ºç½®å°?æ¡?(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2447
+#: ../plugins/build-basic-autotools/plugin.c:2444
 msgid "Build whole project"
 msgstr "å»ºç½®æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2452
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "_Install Project"
 msgstr "å®?è£?å°?æ¡?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2453
+#: ../plugins/build-basic-autotools/plugin.c:2450
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2458
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2456
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2464
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "C_onfigure Projectâ?¦"
 msgstr "è¨å®?å°?æ¡?(_O)..."
 
-#: ../plugins/build-basic-autotools/plugin.c:2465
+#: ../plugins/build-basic-autotools/plugin.c:2462
 msgid "Configure project"
 msgstr "è¨å®?å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build _Tarball"
 msgstr "å»ºç½® _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2471
+#: ../plugins/build-basic-autotools/plugin.c:2468
 msgid "Build project tarball distribution"
 msgstr "å»ºç½®å°?æ¡? tarball ç?¼è¡?å¥?ä»¶"
 
-#: ../plugins/build-basic-autotools/plugin.c:2476
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "_Build Module"
 msgstr "å»ºç½®æ¨¡çµ?(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2477
+#: ../plugins/build-basic-autotools/plugin.c:2474
 msgid "Build module associated with current file"
 msgstr "å»ºç½®è??ç?®å??æª?æ¡?é??è?¯ç??æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "_Install Module"
 msgstr "å®?è£?æ¨¡çµ?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2483
+#: ../plugins/build-basic-autotools/plugin.c:2480
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "_Clean Module"
 msgstr "æ¸?é?¤æ¨¡çµ?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2489
+#: ../plugins/build-basic-autotools/plugin.c:2486
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2494
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Co_mpile File"
 msgstr "ç·¨è¯æª?æ¡?(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2495
+#: ../plugins/build-basic-autotools/plugin.c:2492
 msgid "Compile current editor file"
 msgstr "ç·¨è¯ç?®å??ç·¨è¼¯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2501
+#: ../plugins/build-basic-autotools/plugin.c:2498
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2503
 msgid "Remove Configuration"
 msgstr "ç§»é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2507
-msgid ""
-"Clean project (distclean) and remove configuration directory if possible"
+#: ../plugins/build-basic-autotools/plugin.c:2504
+msgid "Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??å°?æ¡? (distclean)ï¼?å?¯è?½ç??è©±ä¸?ä½µç§»é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2520
-#: ../plugins/build-basic-autotools/plugin.c:2548
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "_Compile"
 msgstr "ç·¨è¯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2521
-#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2518
+#: ../plugins/build-basic-autotools/plugin.c:2546
 msgid "Compile file"
 msgstr "ç·¨è¯æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2527
-#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2524
+#: ../plugins/build-basic-autotools/plugin.c:2552
 msgid "Build module"
 msgstr "å»ºç½®æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2532
-#: ../plugins/build-basic-autotools/plugin.c:2560
-#: ../plugins/build-basic-autotools/plugin.c:2618
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Install"
 msgstr "å®?è£?(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2533
-#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2530
+#: ../plugins/build-basic-autotools/plugin.c:2558
 msgid "Install module"
 msgstr "å®?è£?æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2538
-#: ../plugins/build-basic-autotools/plugin.c:2566
-#: ../plugins/build-basic-autotools/plugin.c:2625
+#: ../plugins/build-basic-autotools/plugin.c:2535
+#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2622
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2539
-#: ../plugins/build-basic-autotools/plugin.c:2567
+#: ../plugins/build-basic-autotools/plugin.c:2536
+#: ../plugins/build-basic-autotools/plugin.c:2564
 msgid "Clean module"
 msgstr "æ¸?é?¤æ¨¡çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2569
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??ä»¤(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2573
+#: ../plugins/build-basic-autotools/plugin.c:2570
 msgid "Cancel build command"
 msgstr "å??æ¶?å»ºç½®æ??ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:2611
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Build (%s)"
 msgstr "å»ºç½®(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2618
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Install (%s)"
 msgstr "å®?è£?(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2625
+#: ../plugins/build-basic-autotools/plugin.c:2622
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2633
+#: ../plugins/build-basic-autotools/plugin.c:2630
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "ç·¨è¯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2633
+#: ../plugins/build-basic-autotools/plugin.c:2630
 #, c-format
 msgid "Co_mpile"
 msgstr "ç·¨è¯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3169
+#: ../plugins/build-basic-autotools/plugin.c:3166
 msgid "Build commands"
 msgstr "å»ºç½®å?½ä»¤"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3178
+#: ../plugins/build-basic-autotools/plugin.c:3175
 msgid "Build popup commands"
 msgstr "å»ºç½®å½?å?ºå¼?æ??ä»¤"
 
-#: ../plugins/build-basic-autotools/plugin.c:3560
-#: ../plugins/build-basic-autotools/plugin.c:3568
+#: ../plugins/build-basic-autotools/plugin.c:3557
+#: ../plugins/build-basic-autotools/plugin.c:3565
 msgid "Build Autotools"
 msgstr "å»ºç½® Autotools"
 
@@ -1316,22 +1339,22 @@ msgstr "ä¸?è?¬é¡?å?¥å±¬æ?§"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 #: ../plugins/file-wizard/file.c:103
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:14
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:16
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:15
-#: ../plugins/project-wizard/templates/java.wiz.in.h:15
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:17
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:16
+#: ../plugins/project-wizard/templates/java.wiz.in.h:16
 #: ../plugins/project-wizard/templates/js.wiz.in.h:8
-#: ../plugins/project-wizard/templates/python.wiz.in.h:15
+#: ../plugins/project-wizard/templates/python.wiz.in.h:16
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:12
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:19
-#: ../plugins/project-wizard/templates/library.wiz.in.h:15
+#: ../plugins/project-wizard/templates/library.wiz.in.h:16
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è¨±å?¯è? (GPL)"
 
@@ -1345,7 +1368,7 @@ msgstr "æ¨?é æª?ï¼?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "Inline the declaration and implementation"
-msgstr ""
+msgstr "è¡?å?§å®£å??è??å¯¦ä½?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 #: ../plugins/file-wizard/file.c:104
@@ -1362,8 +1385,8 @@ msgstr ""
 #: ../plugins/project-wizard/templates/java.wiz.in.h:18
 #: ../plugins/project-wizard/templates/js.wiz.in.h:10
 #: ../plugins/project-wizard/templates/python.wiz.in.h:18
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:13
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:23
 #: ../plugins/project-wizard/templates/library.wiz.in.h:17
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU å¯¬é??ç?¨å?¬å?±è¨±å?¯è? (LGPL)"
@@ -1397,37 +1420,36 @@ msgstr "ä¾?æº?æª?æ¡?ï¼?"
 msgid "Source/Header Headings:"
 msgstr "ä¾?æº?/æ¨?é ç??æ¨?é¡?ï¼?"
 
-#: ../plugins/class-gen/generator.c:132
+#: ../plugins/class-gen/generator.c:133
 #, c-format
 msgid "Header or source file has not been created"
 msgstr "æ¨?é æ??å??å§?æª?å°?æ?ªå»ºç«?"
 
-#: ../plugins/class-gen/generator.c:294
+#: ../plugins/class-gen/generator.c:295
 msgid "Autogen template used for the header file"
 msgstr "ç?¨æ?¼æ¨?é æª?æ¡?ç?? autogen ç¯?æ?¬"
 
-#: ../plugins/class-gen/generator.c:302
+#: ../plugins/class-gen/generator.c:303
 msgid "Autogen template used for the implementation file"
 msgstr "ç?¨æ?¼å¯¦ä½?æª?æ¡?ç?? autogen ç¯?æ?¬"
 
-#: ../plugins/class-gen/generator.c:310 ../plugins/class-gen/generator.c:318
+#: ../plugins/class-gen/generator.c:311
+#: ../plugins/class-gen/generator.c:319
 msgid "File to which the processed template will be written"
 msgstr "ç?¨ä¾?å¯«å?¥å·²è??ç??ç¯?æ?¬ç??æª?æ¡?"
 
-#: ../plugins/class-gen/generator.c:402
+#: ../plugins/class-gen/generator.c:403
 #, c-format
 msgid "Failed to write autogen definition file"
 msgstr "å¯«å?¥ autogen å®?ç¾©æª?æ¡?å¤±æ??"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1146
-msgid ""
-"Could not find autogen version 5; please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net.";
-msgstr ""
-"æ?¾ä¸?å?° autogen ç¬¬äº?ç??ï¼?è«?å®?è£? autogen å¥?ä»¶ã??æ?¨å?¯ä»¥å¾? http://autogen.";
-"sourceforge.net å??å¾?ã??"
+#: ../plugins/class-gen/plugin.c:98
+#: ../plugins/project-wizard/druid.c:1160
+msgid "Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";
+msgstr "æ?¾ä¸?å?° autogen ç¬¬äº?ç??ï¼?è«?å®?è£? autogen å¥?ä»¶ã??æ?¨å?¯ä»¥å¾? http://autogen.sourceforge.net å??å¾?ã??"
 
-#: ../plugins/class-gen/plugin.c:242 ../plugins/class-gen/plugin.c:410
+#: ../plugins/class-gen/plugin.c:242
+#: ../plugins/class-gen/plugin.c:410
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "ç?¡æ³?å?·è¡? autogenï¼? %s"
@@ -1436,7 +1458,8 @@ msgstr "ç?¡æ³?å?·è¡? autogenï¼? %s"
 msgid "Guess from type"
 msgstr "å¾?é¡?å??æ?¨æ¸¬"
 
-#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/class-gen/window.c:499
+#: ../plugins/class-gen/window.c:510
 #: ../plugins/search/anjuta-search.ui.h:29
 msgid "Scope"
 msgstr "ç¯?å??"
@@ -1445,52 +1468,59 @@ msgstr "ç¯?å??"
 msgid "Implementation"
 msgstr "å¯¦ä½?"
 
-#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
+#: ../plugins/class-gen/window.c:501
+#: ../plugins/class-gen/window.c:511
 #: ../plugins/class-gen/window.c:533
 #: ../plugins/debug-manager/breakpoints.c:1952
 #: ../plugins/debug-manager/debug_tree.c:128
+#: ../plugins/snippets-manager/snippets-editor.c:38
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
-#: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
+#: ../plugins/class-gen/window.c:502
+#: ../plugins/class-gen/window.c:512
+#: ../plugins/class-gen/window.c:520
+#: ../plugins/class-gen/window.c:534
 #: ../plugins/run-program/parameters.c:754
 #: ../plugins/search/search_preferences.c:534
+#: ../plugins/snippets-manager/plugin.c:751
+#: ../plugins/snippets-manager/snippets-browser.c:530
+#: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
+#: ../plugins/class-gen/window.c:503
+#: ../plugins/class-gen/window.c:513
 #: ../plugins/class-gen/window.c:535
 #: ../plugins/debug-manager/stack_trace.c:712
 msgid "Arguments"
 msgstr "å??æ?¸"
 
 #: ../plugins/class-gen/window.c:521
-#, fuzzy
 msgid "Nick"
-msgstr "æ?±ç¨±è£?é½?å?å??"
+msgstr "æ?±ç¨±"
 
 #: ../plugins/class-gen/window.c:522
 msgid "Blurb"
-msgstr ""
+msgstr "å®£å?³"
 
 #: ../plugins/class-gen/window.c:523
 msgid "GType"
 msgstr "GType"
 
 #: ../plugins/class-gen/window.c:524
-#, fuzzy
 msgid "ParamSpec"
-msgstr "å??æ?¸ï¼?"
+msgstr "ParamSpec"
 
 #. Somehow redundant with marshaller, but required for default handler
-#: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
+#: ../plugins/class-gen/window.c:526
+#: ../plugins/class-gen/window.c:536
 msgid "Flags"
 msgstr "æ??æ¨?"
 
 #: ../plugins/class-gen/window.c:537
 msgid "Marshaller"
-msgstr ""
+msgstr "æ?´ç??å?¨"
 
 #: ../plugins/class-gen/window.c:818
 msgid "XML description of the user interface"
@@ -1515,13 +1545,10 @@ msgstr "ç¹¼æ?¿å??è¡¨"
 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>"
+"Pressing OK will delete the file from disk and from CVS. Of course, the file won't be removed from CVS before you use CVS Commit. <b>You have been warned!</b>"
 msgstr ""
 "<b>è«?æ³¨æ??ï¼?</b>\n"
-"æ??ä¸?ç¢ºå®?æ??å?ªé?¤ç£?ç¢?è?? CVS ä¸?ç??æª?æ¡?ã??ç?¶ç?¶å?¨æ?¨ä½¿ç?¨ CVS Commit å??é??ä¸?æ??ç§»é?¤ CVS "
-"ä¸?ç??æª?æ¡?ã??<b>å·²ç¶?æ??é??æ?¨æ³¨æ??äº?ï¼?</b>"
+"æ??ä¸?ç¢ºå®?æ??å?ªé?¤ç£?ç¢?è?? CVS ä¸?ç??æª?æ¡?ã??ç?¶ç?¶å?¨æ?¨ä½¿ç?¨ CVS Commit å??é??ä¸?æ??ç§»é?¤ CVS ä¸?ç??æª?æ¡?ã??<b>å·²ç¶?æ??é??æ?¨æ³¨æ??äº?ï¼?</b>"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
@@ -1631,7 +1658,7 @@ msgstr "ä¸?è¦?é??è¿´é??ä½?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Extern (rsh)"
-msgstr ""
+msgstr "å¤?é?¨ (rsh)"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
@@ -1642,8 +1669,9 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "å¿½ç?¥ .cvsrc æª?ï¼?å»ºè°ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2052
-#: ../plugins/symbol-db/plugin.c:2094
+#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/symbol-db/plugin.c:2055
+#: ../plugins/symbol-db/plugin.c:2097
 msgid "Local"
 msgstr "å??å??"
 
@@ -1662,7 +1690,8 @@ msgstr "æ¨¡çµ?å??ç¨±ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/search/anjuta-search.ui.h:25
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
 msgid "Options"
@@ -1806,14 +1835,16 @@ msgid "CVS command is running â?? please wait until it finishes!"
 msgstr "CVS æ??ä»¤æ£å?¨å?·è¡? â?? è«?ç?å??ç?´å?°å®?çµ?æ??ï¼?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
-#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
+#: ../plugins/cvs-plugin/cvs-execute.c:233
+#: ../plugins/cvs-plugin/plugin.c:467
 #: ../plugins/cvs-plugin/plugin.c:474
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:44 ../plugins/cvs-plugin/plugin.c:119
+#: ../plugins/cvs-plugin/plugin.c:44
+#: ../plugins/cvs-plugin/plugin.c:119
 msgid "_CVS"
 msgstr "_CVS"
 
@@ -1843,62 +1874,72 @@ msgstr "å¾? CVS æ¨¹ç§»é?¤æª?æ¡?/ç?®é??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:68 ../plugins/cvs-plugin/plugin.c:127
+#: ../plugins/cvs-plugin/plugin.c:68
+#: ../plugins/cvs-plugin/plugin.c:127
 msgid "_Commit"
 msgstr "_Commit"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:70 ../plugins/cvs-plugin/plugin.c:129
+#: ../plugins/cvs-plugin/plugin.c:70
+#: ../plugins/cvs-plugin/plugin.c:129
 msgid "Commit your changes to the CVS tree"
 msgstr "æ??äº¤æ?¨ç??ä¿®æ?¹è?³ CVS æ¨¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
+#: ../plugins/cvs-plugin/plugin.c:76
+#: ../plugins/cvs-plugin/plugin.c:135
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "_Update"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:78
+#: ../plugins/cvs-plugin/plugin.c:137
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?æ?¨æ?¬æ©?ç??è¤?æ?¬è?? CVS æ¨¹å??æ¥"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:84 ../plugins/cvs-plugin/plugin.c:143
+#: ../plugins/cvs-plugin/plugin.c:84
+#: ../plugins/cvs-plugin/plugin.c:143
 msgid "_Diff"
 msgstr "_Diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:86 ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:86
+#: ../plugins/cvs-plugin/plugin.c:145
 msgid "Show differences between your local copy and the tree"
 msgstr "é¡¯ç¤ºæ?¨ç??æ?¬å?°ç«¯è¤?æ?¬è?? CVS æ¨¹ä¹?é??ç??å·®ç?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:92 ../plugins/cvs-plugin/plugin.c:151
+#: ../plugins/cvs-plugin/plugin.c:92
+#: ../plugins/cvs-plugin/plugin.c:151
 msgid "_Show Status"
 msgstr "é¡¯ç¤ºç??æ??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:94 ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:94
+#: ../plugins/cvs-plugin/plugin.c:153
 msgid "Show the status of a file/directory"
 msgstr "é¡¯ç¤ºæª?æ¡?/ç?®é??ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:100 ../plugins/cvs-plugin/plugin.c:159
+#: ../plugins/cvs-plugin/plugin.c:100
+#: ../plugins/cvs-plugin/plugin.c:159
 msgid "_Show Log"
 msgstr "é¡¯ç¤ºç´?é??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:102 ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:102
+#: ../plugins/cvs-plugin/plugin.c:161
 msgid "Show the log of a file/directory"
 msgstr "é¡¯ç¤ºæª?æ¡?/ç?®é??ç??ç´?é??æª?"
 
@@ -1924,13 +1965,13 @@ msgstr "CVS å½?å?ºå¼?æ??ä½?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
-"program not using the Debug configuration?</span>\n"
+"<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."
+"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 ""
+"<span weight=\"bold\" size=\"larger\">æ?¨ç¢ºå®?ä¸?ä½¿ç?¨é?¤é?¯çµ?æ??ä¾?ç?ºç¨?å¼?é?¤é?¯ï¼?</span>\n"
+"\n"
+"ç?¶å??ç?¨æ??ä½³å??æ??ï¼?é?¤é?¯å·¥å?·ä¸?è?½ä¸?ç?´è¾¨è?å?ºæ??ä»¤ç??å??å§?ç¢¼ï¼?å? æ¤æ??äº?æ??ä»¤å?¯è?½æ??å?·è¡?å¾?å¾?å¥?æ?ªï¼?ç?¹å?¥æ?¯å?®æ¥æ??ä»¤ã??"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
@@ -1978,7 +2019,6 @@ msgid "Debugger:"
 msgstr "é?¤é?¯å·¥å?·ï¼?"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:12
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
@@ -2292,14 +2332,16 @@ msgid "_Go to address"
 msgstr "ç§»è?³ä½?å??(_G)"
 
 #: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/gbf-am/gbf-am-properties.c:893 ../plugins/tools/editor.c:468
+#: ../plugins/gbf-am/gbf-am-properties.c:893
+#: ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "è®?æ?¸"
 
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/debug-manager/registers.c:469
 #: ../plugins/gbf-am/gbf-am-properties.c:903
-#: ../plugins/run-program/parameters.c:763 ../plugins/tools/editor.c:474
+#: ../plugins/run-program/parameters.c:763
+#: ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "è®?æ?¸å?¼"
 
@@ -2307,7 +2349,8 @@ msgstr "è®?æ?¸å?¼"
 msgid "Disassembly"
 msgstr "å??çµ?è¯"
 
-#: ../plugins/debug-manager/info.c:52 ../plugins/debug-manager/info.c:101
+#: ../plugins/debug-manager/info.c:52
+#: ../plugins/debug-manager/info.c:101
 #: ../plugins/project-wizard/druid.c:138
 msgid "Information"
 msgstr "è³?è¨?"
@@ -2325,9 +2368,12 @@ msgstr "å?°å??è®?æ?¸"
 msgid "Debugger Log"
 msgstr "é?¤é?¯å·¥å?·ç´?é??"
 
-#: ../plugins/debug-manager/plugin.c:411 ../plugins/debug-manager/plugin.c:433
-#: ../plugins/debug-manager/plugin.c:458 ../plugins/debug-manager/plugin.c:485
-#: ../plugins/debug-manager/plugin.c:519 ../plugins/debug-manager/plugin.c:552
+#: ../plugins/debug-manager/plugin.c:411
+#: ../plugins/debug-manager/plugin.c:433
+#: ../plugins/debug-manager/plugin.c:458
+#: ../plugins/debug-manager/plugin.c:485
+#: ../plugins/debug-manager/plugin.c:519
+#: ../plugins/debug-manager/plugin.c:552
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "é?¤é?¯å·¥å?·"
@@ -2527,9 +2573,8 @@ msgid "Step _Out"
 msgstr "æ¥å?º(_O)"
 
 #: ../plugins/debug-manager/plugin.c:1075
-#, fuzzy
 msgid "Single step out of function"
-msgstr "æ¥å?¥ç?®å??å?½å¼?å?§ç?¶å¾?å?®æ¥å?·è¡?"
+msgstr "å?®æ¥é?¢é??å?½æ?¸"
 
 #: ../plugins/debug-manager/plugin.c:1081
 msgid "_Run to Cursor"
@@ -2595,11 +2640,13 @@ msgstr "æ?«å?å?¨"
 msgid "Shared Object"
 msgstr "å?±äº«ç?©ä»¶"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
+#: ../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:114
+#: ../plugins/debug-manager/sharedlib.c:180
+#: ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "çµ?æ??ä½?å??"
 
@@ -2688,8 +2735,10 @@ msgstr "ç·¨è??"
 
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:664
-#: ../plugins/debug-manager/threads.c:451 ../plugins/gdb/preferences.c:358
-#: ../plugins/tools/tool.c:100 ../src/anjuta-app.c:621
+#: ../plugins/debug-manager/threads.c:451
+#: ../plugins/gdb/preferences.c:363
+#: ../plugins/tools/tool.c:100
+#: ../src/anjuta-app.c:621
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "æª?æ¡?"
@@ -2753,7 +2802,8 @@ msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 msgid "Path"
 msgstr "è·¯å¾?"
 
-#: ../plugins/debug-manager/start.c:1386 ../plugins/gdb/debugger.c:1929
+#: ../plugins/debug-manager/start.c:1386
+#: ../plugins/gdb/debugger.c:1929
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2821,7 +2871,8 @@ msgstr "å?¨é?¨ç§»é?¤"
 msgid "Automatic update"
 msgstr "è?ªå??æ?´æ?°"
 
-#: ../plugins/debug-manager/watch.c:449 ../plugins/debug-manager/watch.c:455
+#: ../plugins/debug-manager/watch.c:449
+#: ../plugins/debug-manager/watch.c:455
 msgid "Watch operations"
 msgstr "ç?£ç??æ??ä½?"
 
@@ -2833,8 +2884,10 @@ msgstr "ç?£ç??"
 msgid "Search Help:"
 msgstr "æ??å°?èªªæ??ï¼?"
 
-#: ../plugins/devhelp/plugin.c:223 ../plugins/document-manager/plugin.c:241
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:311
+#: ../plugins/devhelp/plugin.c:223
+#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/message-view/plugin.c:76
+#: ../plugins/symbol-db/plugin.c:311
 msgid "_Go to"
 msgstr "ç§»è?³(_G)"
 
@@ -2862,29 +2915,33 @@ msgstr "æ??å°?èªªæ??(_S)"
 msgid "Search for a term in help"
 msgstr "å?¨æ±?å?©ä¸æ??å°?ä¸?å??è©?"
 
-#: ../plugins/devhelp/plugin.c:327
+#: ../plugins/devhelp/plugin.c:326
 msgid "Help operations"
 msgstr "æ±?å?©æ??ä½?"
 
-#: ../plugins/devhelp/plugin.c:346 ../plugins/devhelp/plugin.c:464
+#: ../plugins/devhelp/plugin.c:345
+#: ../plugins/devhelp/plugin.c:462
 #: ../src/anjuta-app.c:638
 msgid "Help"
 msgstr "æ±?å?©"
 
-#: ../plugins/devhelp/plugin.c:357
+#: ../plugins/devhelp/plugin.c:356
 msgid "Contents"
 msgstr "å?§å®¹"
 
-#: ../plugins/devhelp/plugin.c:363 ../plugins/search/search-replace.c:1041
+#: ../plugins/devhelp/plugin.c:362
+#: ../plugins/search/search-replace.c:1041
 #: ../plugins/search/search-replace.c:1717
 #: ../plugins/search/search-replace.c:1724
 #: ../plugins/search/search-replace.c:1736
-#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2062
-#: ../plugins/symbol-db/plugin.c:2114
+#: ../plugins/search/search-replace.c:2065
+#: ../plugins/symbol-db/plugin.c:2065
+#: ../plugins/symbol-db/plugin.c:2117
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../plugins/devhelp/plugin.c:381 ../plugins/devhelp/plugin.c:469
+#: ../plugins/devhelp/plugin.c:380
+#: ../plugins/devhelp/plugin.c:467
 msgid "Help display"
 msgstr "é¡¯ç¤ºæ±?å?©"
 
@@ -2920,7 +2977,9 @@ msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
 #: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+#: ../plugins/gtodo/callback.c:20
+#: ../plugins/gtodo/callback.c:101
+#: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "ç§»é?¤"
 
@@ -2933,8 +2992,10 @@ msgid "Path:"
 msgstr "è·¯å¾?ï¼?"
 
 #: ../plugins/document-manager/anjuta-docman.c:622
-#: ../plugins/file-loader/plugin.c:591 ../plugins/file-loader/plugin.c:894
-#: ../plugins/file-loader/plugin.c:904 ../plugins/file-loader/plugin.c:917
+#: ../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 "é??å??æª?æ¡?"
 
@@ -3254,7 +3315,8 @@ msgstr "ä¸?ä¸?å??æ·å?²ç´?é??(_Y)"
 msgid "Go to next history"
 msgstr "ç§»è?³ä¸?ä¸?å??æ·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:263 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
@@ -3274,9 +3336,11 @@ msgstr "å¿«é??é??æ?°æ??å°?(_R)"
 msgid "Repeat quick search"
 msgstr "é??è¤?å¿«é??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:273 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:273
+#: ../plugins/gtodo/interface.c:158
 #: ../src/anjuta-actions.h:30
 #: ../plugins/language-support-cpp-java/plugin.c:1876
+#: ../plugins/language-support-python/plugin.c:1176
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
@@ -3327,7 +3391,8 @@ msgstr "å?ªä¸?ç·¨è¼¯å?¨ä¸é?¸å®?ç??æ??å?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:296 ../plugins/terminal/terminal.c:616
+#: ../plugins/document-manager/plugin.c:296
+#: ../plugins/terminal/terminal.c:616
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
@@ -3335,7 +3400,8 @@ msgstr "è¤?è£½(_C)"
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å?è¤?è£½å?°å?ªè²¼ç°¿"
 
-#: ../plugins/document-manager/plugin.c:299 ../plugins/terminal/terminal.c:624
+#: ../plugins/document-manager/plugin.c:299
+#: ../plugins/terminal/terminal.c:624
 msgid "_Paste"
 msgstr "è²¼ä¸?(_P)"
 
@@ -3622,9 +3688,7 @@ msgstr "æ??å°?ã??%sã??å·²é??çµ?å°¾ä¸¦å°?å¾?é é??å§?ã??"
 
 #: ../plugins/document-manager/search-box.c:389
 #, c-format
-msgid ""
-"Search for \"%s\" reached the end and was continued at the top but no new "
-"match was found."
+msgid "Search for \"%s\" reached the end and was continued at the top but no new match was found."
 msgstr "æ??å°?ã??%sã??å·²é??çµ?å°¾ä¸¦å·²å¾?é é??å§?ï¼?ä½?å·²æ?¾ä¸?å?°ç¬¦å??é ?ç?®ã??"
 
 #: ../plugins/document-manager/search-box.c:446
@@ -3704,8 +3768,7 @@ msgstr ""
 msgid ""
 "<b>Cannot open \"%s\"</b>.\n"
 "\n"
-"There is no plugin, default action, or application configured to handle this "
-"file type.\n"
+"There is no plugin, default action, or application configured to handle this file type.\n"
 "\n"
 "MIME type: %s\n"
 "\n"
@@ -3729,7 +3792,8 @@ msgstr "ä»¥æ¤é??å??ï¼?"
 msgid "Document Manager"
 msgstr "æ??ä»¶ç®¡ç??å?¡"
 
-#: ../plugins/file-loader/plugin.c:497 ../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 "æ??æ??æª?æ¡?"
@@ -3803,19 +3867,23 @@ msgstr "æ?°å¢?ç©ºç?½æª?æ¡?"
 msgid "_Openâ?¦"
 msgstr "é??å??(_O)â?¦"
 
-#: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
+#: ../plugins/file-loader/plugin.c:903
+#: ../plugins/file-loader/plugin.c:916
 msgid "_Open"
 msgstr "é??å??(_O)"
 
-#: ../plugins/file-loader/plugin.c:910 ../plugins/file-loader/plugin.c:923
+#: ../plugins/file-loader/plugin.c:910
+#: ../plugins/file-loader/plugin.c:923
 msgid "Open _With"
 msgstr "é??å??ä»¥(_W)"
 
-#: ../plugins/file-loader/plugin.c:911 ../plugins/file-loader/plugin.c:924
+#: ../plugins/file-loader/plugin.c:911
+#: ../plugins/file-loader/plugin.c:924
 msgid "Open with"
 msgstr "é??å??ä»¥"
 
-#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
+#: ../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 "æª?æ¡?è¼?å?¥å?¨"
@@ -3828,7 +3896,8 @@ msgstr "æ?°å¢?"
 msgid "New file, project and project components."
 msgstr "æ?°å¢?æª?æ¡?ã??å°?æ¡?å??å°?æ¡?å??ä»¶ã??"
 
-#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
+#: ../plugins/file-loader/plugin.c:1261
+#: ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "é??å??"
 
@@ -3836,7 +3905,8 @@ msgstr "é??å??"
 msgid "Open _Recent"
 msgstr "æ??è¿?é??å??(_R)"
 
-#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1266
+#: ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "æ??è¿?é??å??ç??æª?æ¡?"
 
@@ -3848,7 +3918,8 @@ msgstr "æ??è¿?é??å??ç??æª?æ¡?"
 msgid "Open a file"
 msgstr "é??å??æª?æ¡?"
 
-#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
+#: ../plugins/file-loader/plugin.c:1416
+#: ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "æ?¾ä¸?å?°æª?æ¡?"
@@ -3859,7 +3930,8 @@ msgstr "æ?¾ä¸?å?°æª?æ¡?"
 msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? <b>%s</b> ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
+#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "ä»¥æ¤é??å??"
 
@@ -3888,7 +3960,8 @@ msgid "Filter"
 msgstr "é??æ¿¾æ¢?ä»¶"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2057 ../plugins/symbol-db/plugin.c:2106
+#: ../plugins/symbol-db/plugin.c:2060
+#: ../plugins/symbol-db/plugin.c:2109
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "å?¨å??"
@@ -3929,7 +4002,8 @@ msgstr "æª?æ¡?ç®¡ç??ç¨?å¼?å½?å?ºå¼?å??ä½?"
 msgid "Files"
 msgstr "æª?æ¡?"
 
-#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
+#: ../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 "æª?æ¡?ç®¡ç??å?¡"
@@ -3963,7 +4037,7 @@ msgid "File Information"
 msgstr "æª?æ¡?è³?è¨?"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
-#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:64
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??ç¨±ï¼?"
@@ -4027,7 +4101,8 @@ msgstr "BSD å?¬å?±è¨±å?¯è?"
 msgid "Unable to build user interface for New File"
 msgstr "ç?¡æ³?å»ºç«?æ?°æª?æ¡?ç??ä½¿ç?¨è??ä»?é?¢"
 
-#: ../plugins/gbf-am/gbf-am-config.c:98 ../plugins/gbf-am/gbf-am-config.c:132
+#: ../plugins/gbf-am/gbf-am-config.c:98
+#: ../plugins/gbf-am/gbf-am-config.c:132
 msgid "Invalid GbfAmConfigValue type"
 msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
 
@@ -4048,7 +4123,6 @@ msgid "Select Package to add:"
 msgstr "é?¸æ??è¦?å? å?¥ç??å¥?ä»¶ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
-#: ../plugins/project-wizard/property.c:376
 msgid "Select package"
 msgstr "é?¸æ??å¥?ä»¶"
 
@@ -4144,12 +4218,12 @@ msgstr "ä»?é?¢æª?æ¡?"
 #: ../plugins/gbf-am/gbf-am-project.c:241
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:239
 msgid "GLib mkenums"
-msgstr ""
+msgstr "GLib mkenums"
 
 #: ../plugins/gbf-am/gbf-am-project.c:244
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:242
 msgid "GLib genmarshal"
-msgstr ""
+msgstr "GLib genmarshal"
 
 #: ../plugins/gbf-am/gbf-am-project.c:247
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:245
@@ -4291,8 +4365,7 @@ msgid "Source doesn't exist"
 msgstr "ä¾?æº?ä¸?å?å?¨"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3532
-msgid ""
-"Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "ä¾?æº?æª?æ¡?å??ç¨±å?ªè?½å??å?«è?±æ??å?æ¯?ã??'_'ã??'-' æ?? '.' å?å??"
 
 #: ../plugins/gbf-am/gbf-am-project.c:3612
@@ -4326,9 +4399,7 @@ msgstr "è¼¸å?¥æ?°ç??æ¨¡çµ?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:449
 #, c-format
-msgid ""
-"Are you sure you want to remove module \"%s\" and all its associated "
-"packages?"
+msgid "Are you sure you want to remove module \"%s\" and all its associated packages?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?ç§»é?¤æ¨¡çµ?ã??%sã??è??æ??æ??è??å®?é??è?¯ç??å¥?ä»¶ï¼?"
 
 #: ../plugins/gbf-am/gbf-am-properties.c:451
@@ -4369,8 +4440,8 @@ msgstr "å°?æ¡?å??ç¨±:"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:29
 #: ../plugins/project-wizard/templates/js.wiz.in.h:17
 #: ../plugins/project-wizard/templates/python.wiz.in.h:27
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:24
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:33
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:32
 #: ../plugins/project-wizard/templates/library.wiz.in.h:31
 msgid "Version:"
 msgstr "ç??æ?¬:"
@@ -4682,37 +4753,45 @@ msgstr "å?³é??ä¸?å??è¨?è??çµ¦ç¨?åº?æ??ç?¼ç??é?¯èª¤ã??"
 
 #: ../plugins/gdb/plugin.c:117
 #, 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."
 msgstr "å»ºç«?å??ç?º %s ç?? FIFO æª?æ¡?å¤±æ??ã??è©²ç¨?å¼?æ??ä»¥ä¸?ä½¿ç?¨çµ?ç«¯æ©?ç??æ?¹å¼?å?·è¡?ã??"
 
 #: ../plugins/gdb/plugin.c:203
 msgid "Cannot start terminal for debugging."
 msgstr "ç?¡æ³?é??å??çµ?ç«¯æ©?é?²è¡?é?¤é?¯ã??"
 
-#: ../plugins/gdb/preferences.c:123
+#. Translators: pretty printer file is a script containing functions allowing gdb
+#. * to display variable content in a simpler way, typically removing
+#. * implementation details.
+#. * The register function is an additional function in the script. It defines
+#. * which function is used for each type of variables.
+#: ../plugins/gdb/preferences.c:128
 #, c-format
 msgid ""
-"The following pretty printers, without a register functions, have been "
-"disabled:\n"
-" %s"
+"The register function hasn't been found automatically in the following pretty printer files:\n"
+"%s\n"
+"You need to fill yourself the register function columns before enabling the rows. Most of the time the register function name contains the word \"register\"."
 msgstr ""
-"ä¸?å??å?°è¡¨æ©?å? ç?ºæ²?æ??è¨»å??è¡¨å?½å¼?ï¼?å·²ç¶?è¢«å??ç?¨äº?ï¼?\n"
-" %s"
+"å?¨ä¸?å?? pretty printer files æ²?æ??è?ªå??æ?¾å?°è¨»å??å?½æ?¸ï¼?\n"
+"%s\n"
+"å?¨å??ç?¨é??äº?å??ä¹?å??æ?¨é??è¦?è?ªè¡?å¡«å¯«è¨»å??å?½æ?¸ç??æ¬?ä½?ã??å?¨å¤§å¤?æ?¸æ??å??è¨»å??å?½æ?¸ç??å??ç¨±æ??å??å?« \"register\" é??å??å?ã??"
 
-#: ../plugins/gdb/preferences.c:216
+#: ../plugins/gdb/preferences.c:223
 msgid "Select a pretty printer file"
 msgstr "é?¸æ??å?°è¡¨æ©?æª?æ¡?"
 
-#: ../plugins/gdb/preferences.c:353
+#: ../plugins/gdb/preferences.c:358
 msgid "Activate"
 msgstr "ä½¿ç?¨"
 
-#: ../plugins/gdb/preferences.c:365
+#. Translators: The "Register Function" column contains the name of a
+#. * function used to register pretty printers in gdb.
+#: ../plugins/gdb/preferences.c:372
 msgid "Register Function"
 msgstr "è¨»å??å?½å¼?"
 
-#: ../plugins/gdb/preferences.c:389 ../plugins/gdb/preferences.c:397
+#: ../plugins/gdb/preferences.c:396
+#: ../plugins/gdb/preferences.c:404
 msgid "Gdb Debugger"
 msgstr "Gdb é?¤é?¯å·¥å?·"
 
@@ -4730,9 +4809,8 @@ msgid "Add signed-off-by line"
 msgstr "å? å?¥ signed-off-by line"
 
 #: ../plugins/git/anjuta-git.ui.h:5
-#, fuzzy
 msgid "Amend the previous commit"
-msgstr "ä¸?ä¸?å??æ??äº¤è¨?æ?¯ï¼?"
+msgstr "ä¿®æ£ä¸?ä¸?æ¬¡æ??äº¤"
 
 #: ../plugins/git/anjuta-git.ui.h:6
 msgid "Annotate this tag"
@@ -4749,7 +4827,8 @@ msgstr "å¥?ç?¨ Stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "å¥?ç?¨ä¿¡ç®±æª?æ¡?"
 
@@ -4776,8 +4855,8 @@ msgstr "ä½?è??/Grep"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:7
 #: ../plugins/project-wizard/templates/js.wiz.in.h:2
 #: ../plugins/project-wizard/templates/python.wiz.in.h:7
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:7
 #: ../plugins/project-wizard/templates/library.wiz.in.h:6
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
@@ -4868,7 +4947,8 @@ msgstr "å»ºç«?æ¨?ç±¤"
 msgid "Create patch series"
 msgstr "å»ºç«?è£?é??ç³»å??"
 
-#: ../plugins/git/anjuta-git.ui.h:37 ../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 "æ?¥æ??"
@@ -5107,7 +5187,8 @@ msgstr "Soft"
 msgid "Squash"
 msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "Stash"
 
@@ -5145,7 +5226,8 @@ msgstr "æ¨?ç±¤/æ??äº¤"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/plugin.c:391
 msgid "Tags"
 msgstr "æ¨?ç±¤"
 
@@ -5206,7 +5288,8 @@ msgstr "é ? 3"
 msgid "Git: File staged for add."
 msgstr ""
 
-#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
+#: ../plugins/git/git-add-dialog.c:62
+#: ../plugins/git/git-remove-dialog.c:63
 msgid "Please select a file."
 msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
 
@@ -5237,7 +5320,8 @@ msgstr "è«?é?¸æ??ä¸?å??ä¿¡ç®±æª?æ¡?ã??"
 #: ../plugins/git/git-cherry-pick-dialog.c:52
 #: ../plugins/git/git-create-branch-dialog.c:99
 #: ../plugins/git/git-create-tag-dialog.c:102
-#: ../plugins/git/git-reset-dialog.c:57 ../plugins/git/git-revert-dialog.c:46
+#: ../plugins/git/git-reset-dialog.c:57
+#: ../plugins/git/git-revert-dialog.c:46
 #: ../plugins/subversion/subversion-copy-dialog.c:207
 #: ../plugins/subversion/subversion-switch-dialog.c:122
 msgid "Please enter a revision."
@@ -5337,7 +5421,8 @@ 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/git-log-dialog.c:849
+#: ../plugins/git/plugin.c:674
 #: ../plugins/git/plugin.c:867
 msgid "Branch"
 msgstr "å??æ?¯"
@@ -5402,7 +5487,8 @@ msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
 msgid "Git: Branch checkout complete."
 msgstr "Gitï¼?å??å??å??æ?¯å®?æ??ã??"
 
-#: ../plugins/git/git-ui-utils.c:89 ../plugins/git/git-ui-utils.c:94
+#: ../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"
@@ -5438,7 +5524,8 @@ msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:68 ../plugins/git/plugin.c:575
+#: ../plugins/git/plugin.c:68
+#: ../plugins/git/plugin.c:575
 msgid "_Git"
 msgstr "_Git"
 
@@ -5450,7 +5537,8 @@ msgstr "è®?æ?´(_C)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
+#: ../plugins/git/plugin.c:87
+#: ../plugins/subversion/plugin.c:76
 msgid "_Commitâ?¦"
 msgstr "_Commitâ?¦"
 
@@ -5504,7 +5592,8 @@ msgstr "å¥?ç?¨å·² stash ç??è®?æ?´å?° working tree"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
+#: ../plugins/git/plugin.c:127
+#: ../plugins/git/plugin.c:583
 msgid "_View logâ?¦"
 msgstr "æª¢è¦?ç´?é??æª?(_V)â?¦"
 
@@ -5564,8 +5653,10 @@ msgstr "æª?æ¡?(_F)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
-#: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
+#: ../plugins/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)â?¦"
@@ -5578,8 +5669,10 @@ msgstr "å°?æª?æ¡?å? å?¥æª?æ¡?åº«"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+#: ../plugins/git/plugin.c:183
+#: ../plugins/git/plugin.c:599
+#: ../plugins/subversion/plugin.c:68
+#: ../plugins/subversion/plugin.c:183
 msgid "_Removeâ?¦"
 msgstr "ç§»é?¤(_R)â?¦"
 
@@ -5639,7 +5732,8 @@ msgstr "å°?è¡?çª?ç??æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:223 ../plugins/patch/patch-plugin.c:117
+#: ../plugins/git/plugin.c:223
+#: ../plugins/patch/patch-plugin.c:117
 msgid "Patches"
 msgstr "ä¿®è£?"
 
@@ -5693,15 +5787,15 @@ msgstr "ç?¥é??ç?®å?? series ä¸ç?? patch ä¸¦ç¹¼çº?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:271 ../plugins/git/plugin.c:351
+#: ../plugins/git/plugin.c:271
+#: ../plugins/git/plugin.c:351
 msgid "_Abort"
 msgstr "_Abort"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:273
-msgid ""
-"Stop applying the series and return the repository to its original state"
+msgid "Stop applying the series and return the repository to its original state"
 msgstr "å??æ¢å¥?ç?¨é??å?? series ä¸¦å°?æª?æ¡?åº«å??å¾©å?°å??ä¾?ç??ç??æ??"
 
 #. Action name
@@ -5712,7 +5806,8 @@ msgstr "å??æ?¯(_B)"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
+#: ../plugins/git/plugin.c:287
+#: ../plugins/git/plugin.c:507
 msgid "_Create branchâ?¦"
 msgstr "å»ºç«? bran_châ?¦"
 
@@ -5772,7 +5867,8 @@ msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?æ¸¸é? ç«¯å??æ?¯å??ä½µ"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
+#: ../plugins/git/plugin.c:327
+#: ../plugins/git/plugin.c:447
 msgid "_Startâ?¦"
 msgstr "é??å§?(_S)..."
 
@@ -5814,15 +5910,15 @@ msgstr "ä¸æ¢ rebase ä¸¦å°?æª?æ¡?åº«è¨å??å??å§?ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
+#: ../plugins/git/plugin.c:359
+#: ../plugins/git/plugin.c:539
 msgid "_Cherry pickâ?¦"
 msgstr "_Cherry pickâ?¦"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:361
-msgid ""
-"Selectively merge individual changes from other branches into the current one"
+msgid "Selectively merge individual changes from other branches into the current one"
 msgstr "é?¸æ??æ?§ç??å°?å??å?¥è®?æ?´å¾?å?¶ä»?å??æ?¯å??ä½µå?°ç?®å??ç??å??æ?¯"
 
 #. Action name
@@ -5851,7 +5947,8 @@ msgstr "å?ªé?¤é? ç«¯å??æ?¯"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
+#: ../plugins/git/plugin.c:399
+#: ../plugins/git/plugin.c:515
 msgid "_Create tagâ?¦"
 msgstr "å»ºç«?æ¨?ç±¤(_C)â?¦"
 
@@ -5881,7 +5978,8 @@ msgstr "_Reset/Revert"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
+#: ../plugins/git/plugin.c:423
+#: ../plugins/git/plugin.c:523
 msgid "_Reset treeâ?¦"
 msgstr "_Reset treeâ?¦"
 
@@ -5893,7 +5991,8 @@ msgstr "å°?æª?æ¡?åº«ç?? head é??è¨ç?ºä»»ä½?é??å?»ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
+#: ../plugins/git/plugin.c:431
+#: ../plugins/git/plugin.c:531
 msgid "_Revert commitâ?¦"
 msgstr "_Revert commitâ?¦"
 
@@ -5919,7 +6018,7 @@ msgstr "é??å§? bisect æ??ä½?"
 #. short-cut
 #: ../plugins/git/plugin.c:457
 msgid "Stop the bisect and bring the tree back to normal"
-msgstr ""
+msgstr "å??æ¢ bisect ä¸¦å°?å??å§?ç¢¼æ¨¹å¸¶å??æ£å¸¸ç??æ??"
 
 #. Action name
 #. Stock icon, if any
@@ -6124,22 +6223,26 @@ msgstr "å? å?¥é ?ç?®"
 msgid "Edit Item"
 msgstr "ç·¨è¼¯é ?ç?®"
 
-#: ../plugins/gtodo/add_edit_item.c:152 ../plugins/gtodo/add_edit_item.c:153
+#: ../plugins/gtodo/add_edit_item.c:152
+#: ../plugins/gtodo/add_edit_item.c:153
 #: ../plugins/gtodo/list_tooltip.c:42
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
+#: ../plugins/gtodo/add_edit_item.c:172
 msgid "Category:"
 msgstr "å??é¡?:"
 
-#: ../plugins/gtodo/add_edit_item.c:193 ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:76
+#: ../plugins/gtodo/add_edit_item.c:193
+#: ../plugins/gtodo/add_edit_item.c:472
+#: ../plugins/gtodo/mcategory.c:20
+#: ../plugins/gtodo/todo_db.c:76
 msgid "Edit Categories"
 msgstr "ç·¨è¼¯å??é¡?"
 
-#: ../plugins/gtodo/add_edit_item.c:205 ../plugins/gtodo/list_tooltip.c:48
+#: ../plugins/gtodo/add_edit_item.c:205
+#: ../plugins/gtodo/list_tooltip.c:48
 #: ../plugins/gtodo/list_tooltip.c:54
 msgid "Due date:"
 msgstr "å?°æ??æ?¥ï¼?"
@@ -6149,12 +6252,15 @@ msgid "Notify when due"
 msgstr "ç?¶å?°æ??æ??é??ç?¥"
 
 #. label
-#: ../plugins/gtodo/add_edit_item.c:237 ../plugins/gtodo/list_tooltip.c:64
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/list_tooltip.c:77
+#: ../plugins/gtodo/add_edit_item.c:237
+#: ../plugins/gtodo/list_tooltip.c:64
+#: ../plugins/gtodo/list_tooltip.c:71
+#: ../plugins/gtodo/list_tooltip.c:77
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?ï¼?"
 
-#: ../plugins/gtodo/add_edit_item.c:258 ../plugins/gtodo/add_edit_item.c:259
+#: ../plugins/gtodo/add_edit_item.c:258
+#: ../plugins/gtodo/add_edit_item.c:259
 #: ../plugins/gtodo/list_tooltip.c:81
 msgid "Comment:"
 msgstr "å??è¨»ï¼?"
@@ -6163,18 +6269,22 @@ msgstr "å??è¨»ï¼?"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:335
+#: ../plugins/gtodo/add_edit_item.c:289
+#: ../plugins/gtodo/add_edit_item.c:335
 #: ../plugins/gtodo/add_edit_item.c:448
 msgid "started:"
 msgstr "å·²å??å??ï¼?"
 
-#: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
+#: ../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"
 
-#: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
+#: ../plugins/gtodo/add_edit_item.c:296
+#: ../plugins/gtodo/add_edit_item.c:339
 #: ../plugins/gtodo/add_edit_item.c:448
 msgid "stopped:"
 msgstr "å·²å??æ¢ï¼?"
@@ -6194,65 +6304,65 @@ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??ä»£è¾¦äº?é ?ï¼?"
 
 #: ../plugins/gtodo/callback.c:99
 #, c-format
-msgid ""
-"Are you sure you want to remove all the completed to-do items in the "
-"category \"%s\"?"
+msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??ä¸æ??æ??å·²å®?æ??ç??å¾?è¾¦äº?é ?ï¼?"
 
 #: ../plugins/gtodo/export.c:47
 msgid "Export task list"
 msgstr "å?¯å?ºå·¥ä½?æ¸?å?®"
 
-#: ../plugins/gtodo/export.c:158
+#: ../plugins/gtodo/export.c:159
 msgid "XML"
 msgstr "XML"
 
-#: ../plugins/gtodo/export.c:159
+#: ../plugins/gtodo/export.c:160
 msgid "Plain Text"
 msgstr "ç´?æ??å?"
 
-#: ../plugins/gtodo/export.c:160
+#: ../plugins/gtodo/export.c:161
 msgid "HTML"
 msgstr "HTML"
 
 #. add the embed css style sheet tb
-#: ../plugins/gtodo/export.c:167
+#: ../plugins/gtodo/export.c:168
 msgid "Export current category only"
 msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
 
-#: ../plugins/gtodo/export.c:171
-msgid "<b>HTML export options:</b>"
-msgstr "<b>HTML å?¯å?ºé?¸é ?:</b>"
+#: ../plugins/gtodo/export.c:172
+#| msgid "<b>HTML export options:</b>"
+msgid "HTML export options:"
+msgstr "HTML å?¯å?ºé?¸é ?ï¼?"
 
-#: ../plugins/gtodo/export.c:181
+#: ../plugins/gtodo/export.c:184
 msgid "Embed default (CSS) style sheet"
 msgstr "å?§åµ?å¼?é ?è¨ (CSS) æ¨£å¼?è¡¨"
 
-#: ../plugins/gtodo/export.c:185
+#: ../plugins/gtodo/export.c:188
 msgid "Custom (CSS) style sheet"
 msgstr "è?ªè¨? (CSS) æ¨£å¼?è¡¨"
 
-#: ../plugins/gtodo/interface.c:34 ../src/anjuta-actions.h:38
+#: ../plugins/gtodo/interface.c:35
+#: ../src/anjuta-actions.h:38
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../plugins/gtodo/interface.c:146
+#: ../plugins/gtodo/interface.c:136
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../plugins/gtodo/interface.c:171
+#: ../plugins/gtodo/interface.c:161
 msgid "_Export"
 msgstr "å?¯å?º(_E)"
 
-#: ../plugins/gtodo/interface.c:215
+#: ../plugins/gtodo/interface.c:205
 msgid "Priority"
 msgstr "å?ªå??ç?ç´?"
 
-#: ../plugins/gtodo/interface.c:222
+#: ../plugins/gtodo/interface.c:212
 msgid "Due date"
 msgstr "å?°æ??æ?¥"
 
-#: ../plugins/gtodo/interface.c:236
+#: ../plugins/gtodo/interface.c:226
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -6266,7 +6376,8 @@ msgstr "æ²?æ??è¶³å¤ æ¬?é??è®?å??æª?æ¡?ã??"
 msgid "Failed to read file"
 msgstr "ç?¡æ³?è®?å??æª?æ¡?"
 
-#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
+#: ../plugins/gtodo/libgtodo.c:626
+#: ../plugins/gtodo/libgtodo.c:637
 #, c-format
 msgid "Failed to parse XML structure"
 msgstr "å??æ?? XML çµ?æ§?å¤±æ??"
@@ -6299,15 +6410,18 @@ msgid "No filename supplied."
 msgstr "æ²?æ??æ??ä¾?æª?æ¡?å??ç¨±ã??"
 
 #. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
+#: ../plugins/gtodo/list_tooltip.c:65
+#: ../plugins/gtodo/todo_db.c:130
 msgid "Low"
 msgstr "ä½?"
 
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
+#: ../plugins/gtodo/list_tooltip.c:71
+#: ../plugins/gtodo/todo_db.c:131
 msgid "Medium"
 msgstr "ä¸"
 
-#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
+#: ../plugins/gtodo/list_tooltip.c:77
+#: ../plugins/gtodo/todo_db.c:132
 msgid "High"
 msgstr "é«?"
 
@@ -6325,18 +6439,18 @@ msgstr "å?ªé?¤"
 msgid "<New category (%d)>"
 msgstr "<æ?°å??é¡? (%d)>"
 
-#: ../plugins/gtodo/notification.c:68
+#: ../plugins/gtodo/notification.c:66
 #, c-format
 msgid "The following item is due in %i minute:"
 msgid_plural "The following item is due in %i minutes:"
 msgstr[0] "ä¸?å??äº?é ?å?¨ %i å??é??å?§å?°æ??ï¼?"
 
-#: ../plugins/gtodo/notification.c:77
+#: ../plugins/gtodo/notification.c:75
 msgid "The following item is due:"
 msgstr "ä¸?å??é ?ç?®å·²å?°æ??ï¼?"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:118
+#: ../plugins/gtodo/notification.c:116
 msgid "_Do not show again"
 msgstr "ä¸?å??é¡¯ç¤º(_D)"
 
@@ -6380,7 +6494,8 @@ msgstr "å·¥ä½?ç®¡ç??å?¡æª¢è¦?"
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
+#: ../plugins/gtodo/plugin.c:342
+#: ../plugins/gtodo/plugin.c:351
 msgid "To-do Manager"
 msgstr "å¾?è¾¦äº?é ?ç®¡ç??å?¡"
 
@@ -6408,11 +6523,13 @@ msgstr "é¡¯ç¤ºå?ªå??é ?åº?æ¬?ä½?"
 msgid "Tooltips in list"
 msgstr "æ¸?å?®ä¸ç??å·¥å?·æ??ç¤º"
 
-#: ../plugins/gtodo/preferences.c:117 ../plugins/gtodo/preferences.c:119
+#: ../plugins/gtodo/preferences.c:117
+#: ../plugins/gtodo/preferences.c:119
 msgid "Show in main window"
 msgstr "é¡¯ç¤ºæ?¼ä¸»è¦?çª?ä¸"
 
-#: ../plugins/gtodo/preferences.c:130 ../plugins/gtodo/preferences.c:132
+#: ../plugins/gtodo/preferences.c:130
+#: ../plugins/gtodo/preferences.c:132
 msgid "Highlight"
 msgstr "æ¨?ç¤º"
 
@@ -6451,11 +6568,13 @@ msgstr "æ¸?é?¤"
 msgid "days."
 msgstr "å¤©å??ç??é ?ç?®ã??"
 
-#: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
+#: ../plugins/gtodo/preferences.c:195
+#: ../plugins/gtodo/preferences.c:197
 msgid "Auto-Purge"
 msgstr "è?ªå??æ¸?é?¤"
 
-#: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
+#: ../plugins/gtodo/preferences.c:209
+#: ../plugins/gtodo/preferences.c:211
 msgid "Notification"
 msgstr "é??ç?¥"
 
@@ -6477,107 +6596,6 @@ msgstr "å»ºç«?ä»»å??æ¸?å?®"
 msgid "No Date"
 msgstr "æ²?æ??æ?¥æ??"
 
-#: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "Editâ?¦"
-msgstr "ç·¨è¼¯â?¦"
-
-#: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "Macro details:"
-msgstr "å·¨é??è©³ç´°è³?æ??ï¼?"
-
-#: ../plugins/macro/anjuta-macro.ui.h:4
-msgid "Macro text:"
-msgstr "å·¨é??æ??å?ï¼?"
-
-#: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Macros:"
-msgstr "å·¨é??ï¼?"
-
-#: ../plugins/macro/anjuta-macro.ui.h:7
-msgid "Shortcut:"
-msgstr "å¿«æ?·é?µï¼?"
-
-#: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcutâ?¦"
-msgstr "è«?æ??å·¨é??å¿«æ?·é?µâ?¦"
-
-#: ../plugins/macro/macro-actions.c:134
-msgid "Press shortcut"
-msgstr "æ??ä¸?å¿«æ?·é?µ"
-
-#: ../plugins/macro/macro-db.c:256
-msgid "Anjuta macros"
-msgstr "Anjuta å·¨é??"
-
-#: ../plugins/macro/macro-db.c:260
-msgid "My macros"
-msgstr "æ??ç??å·¨é??"
-
-#: ../plugins/macro/macro-dialog.c:145
-#, c-format
-msgid ""
-"Name:\t %s\n"
-"Category:\t %s\n"
-"Shortcut:\t %c\n"
-msgstr ""
-"å??ç¨±ï¼?\t %s\n"
-"å??é¡?ï¼?\t %s\n"
-"æ?·å¾?ï¼?\t %c\n"
-
-#: ../plugins/macro/macro-dialog.c:277
-msgid "Insert"
-msgstr "æ??å?¥"
-
-#: ../plugins/macro/macro-dialog.c:280
-msgid "Insert macro"
-msgstr "æ??å?¥å·¨é??"
-
-#: ../plugins/macro/macro-edit.c:207
-msgid "Add/Edit macro"
-msgstr "å? å?¥/ç·¨è¼¯å·¨é??"
-
-#. Macros can expand the current date in the format specified below
-#: ../plugins/macro/macro-util.c:60
-msgid "%Y-%m-%d"
-msgstr "%Y-%m-%d"
-
-#. Macros can expand the year in the format specified below
-#: ../plugins/macro/macro-util.c:74
-msgid "%Y"
-msgstr "%Y"
-
-#: ../plugins/macro/plugin.c:35
-msgid "Macros"
-msgstr "å·¨é??"
-
-#: ../plugins/macro/plugin.c:42
-msgid "_Insert Macroâ?¦"
-msgstr "æ??å?¥å·¨é??(_I)â?¦"
-
-#: ../plugins/macro/plugin.c:44
-msgid "Insert a macro using a shortcut"
-msgstr "ä½¿ç?¨å¿«æ?·é?µæ??å?¥å·¨é??"
-
-#: ../plugins/macro/plugin.c:49
-msgid "_Add Macroâ?¦"
-msgstr "å? å?¥å·¨é??(_A)â?¦"
-
-#: ../plugins/macro/plugin.c:51
-msgid "Add a macro"
-msgstr "å? å?¥å·¨é??"
-
-#: ../plugins/macro/plugin.c:56
-msgid "Macrosâ?¦"
-msgstr "å·¨é??â?¦"
-
-#: ../plugins/macro/plugin.c:58
-msgid "Add/Edit/Remove macros"
-msgstr "å? å?¥/ç·¨è¼¯/ç§»é?¤å·¨é??"
-
-#: ../plugins/macro/plugin.c:116
-msgid "Macro operations"
-msgstr "å·¨é??æ??ä½?"
-
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 #, fuzzy
@@ -6660,8 +6678,10 @@ msgid "Icon"
 msgstr "å??ç¤º"
 
 #: ../plugins/message-view/message-view.c:512
-#: ../plugins/message-view/plugin.c:455 ../plugins/message-view/plugin.c:468
-#: ../plugins/message-view/plugin.c:588 ../plugins/message-view/plugin.c:600
+#: ../plugins/message-view/plugin.c:455
+#: ../plugins/message-view/plugin.c:468
+#: ../plugins/message-view/plugin.c:588
+#: ../plugins/message-view/plugin.c:600
 msgid "Messages"
 msgstr "è¨?æ?¯"
 
@@ -6738,7 +6758,8 @@ msgstr "è¦?ä¿®è£?ç??æª?æ¡?/ç?®é??"
 msgid "Patch file"
 msgstr "ä¿®è£?æª?"
 
-#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
+#: ../plugins/patch/patch-plugin.c:166
+#: ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "ä¿®è£?"
 
@@ -6796,7 +6817,8 @@ msgstr "ä¿®è£?å±¤ç´?ï¼?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/patch/plugin.c:53 ../plugins/tools/plugin.c:130
+#: ../plugins/patch/plugin.c:53
+#: ../plugins/tools/plugin.c:130
 msgid "_Tools"
 msgstr "å·¥å?·(_T)"
 
@@ -6811,11 +6833,8 @@ msgid "Patch files/directories"
 msgstr "ä¿®è£?æª?æ¡?/ç?®é??"
 
 #: ../plugins/project-import/plugin.c:68
-msgid ""
-"Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up-to-date."
-msgstr ""
-"ç?¢ç??å°?æ¡?æª?æ¡?å¤±æ??ã??æ?¾ä¸?å?°é?©å??ç??å°?æ¡?ç¯?æ?¬å?¯ç?¨ã??è«?ç¢ºå®?æ?¨ç?? Anjuta ç??æ?¬æ?¯æ??æ?°ç??ã??"
+msgid "Generation of project file failed. Cannot find an appropriate project template to use. Please make sure your version of Anjuta is up-to-date."
+msgstr "ç?¢ç??å°?æ¡?æª?æ¡?å¤±æ??ã??æ?¾ä¸?å?°é?©å??ç??å°?æ¡?ç¯?æ?¬å?¯ç?¨ã??è«?ç¢ºå®?æ?¨ç?? Anjuta ç??æ?¬æ?¯æ??æ?°ç??ã??"
 
 #: ../plugins/project-import/plugin.c:88
 #, c-format
@@ -6824,11 +6843,8 @@ msgstr "å??ç?ºã??%sã??ç??æª?æ¡?å·²å?å?¨ã??æ?¯å?¦è¦?å??ä»£å®?ï¼?"
 
 #: ../plugins/project-import/plugin.c:136
 #, c-format
-msgid ""
-"A file named \"%s\" cannot be written: %s. Check if you have write access to "
-"the project directory."
-msgstr ""
-"æ??ä¸?å??å??ç?ºã??%sã??ç??æª?æ¡?ç?¡æ³?å¯«å?¥ï¼?%sã??è«?æª¢æ?¥æ?¨æ?¯å?¦æ??è©²å°?æ¡?ç?®é??ç??å¯«å?¥æ¬?é??ã??"
+msgid "A file named \"%s\" cannot be written: %s. Check if you have write access to the project directory."
+msgstr "æ??ä¸?å??å??ç?ºã??%sã??ç??æª?æ¡?ç?¡æ³?å¯«å?¥ï¼?%sã??è«?æª¢æ?¥æ?¨æ?¯å?¦æ??è©²å°?æ¡?ç?®é??ç??å¯«å?¥æ¬?é??ã??"
 
 #: ../plugins/project-import/plugin.c:200
 #, c-format
@@ -6837,38 +6853,33 @@ msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? %s ç??å°?æ¡?å¾?ç«¯ç¨?å¼?ã??"
 
 #: ../plugins/project-import/plugin.c:220
 #, c-format
-msgid ""
-"Could not find a valid project backend for the given directory (%s). Please "
-"select a different directory, or try upgrading to a newer version of Anjuta."
-msgstr ""
-"å?¨æ??å®?ç?®é?? (%s) ä¸æ?¾ä¸?å?°æ??æ??ç??å°?æ¡?å¾?ç«¯ç¨?å¼?ã??è«?é?¸æ??ä¸?å??ç??ç?®é??ï¼?æ??å??è©¦å??ç´?ç?ºæ?´"
-"æ?°ç?? Anjutaã??"
+msgid "Could not find a valid project backend for the given directory (%s). Please select a different directory, or try upgrading to a newer version of Anjuta."
+msgstr "å?¨æ??å®?ç?®é?? (%s) ä¸æ?¾ä¸?å?°æ??æ??ç??å°?æ¡?å¾?ç«¯ç¨?å¼?ã??è«?é?¸æ??ä¸?å??ç??ç?®é??ï¼?æ??å??è©¦å??ç´?ç?ºæ?´æ?°ç?? Anjutaã??"
 
 #: ../plugins/project-import/plugin.c:290
 #: ../plugins/project-import/plugin.c:346
 #, c-format
-msgid ""
-"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
+msgid "Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
 msgstr "ç?¡æ³? check out æ??å®?ç?? URIã??%sã??ã??å?³å??ç??é?¯èª¤ç?ºï¼?ã??%sã??"
 
 #: ../plugins/project-import/project-import.ui.h:1
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:12
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
 #: ../plugins/project-wizard/templates/django.wiz.in.h:1
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:13
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:11
-#: ../plugins/project-wizard/templates/java.wiz.in.h:12
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:14
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:12
+#: ../plugins/project-wizard/templates/java.wiz.in.h:13
 #: ../plugins/project-wizard/templates/js.wiz.in.h:5
-#: ../plugins/project-wizard/templates/python.wiz.in.h:12
+#: ../plugins/project-wizard/templates/python.wiz.in.h:13
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:9
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:9
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:13
-#: ../plugins/project-wizard/templates/library.wiz.in.h:12
+#: ../plugins/project-wizard/templates/library.wiz.in.h:13
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "ç?®ç??å?°:"
@@ -7196,9 +7207,7 @@ msgstr "å·²å»ºç«?å°?æ¡?æª¢è¦?â?¦"
 
 #: ../plugins/project-manager/plugin.c:1408
 #, c-format
-msgid ""
-"Failed to parse project (the project is opened, but there will be no project "
-"view) %s: %s\n"
+msgid "Failed to parse project (the project is opened, but there will be no project view) %s: %s\n"
 msgstr "å??æ??å°?æ¡?å¤±æ??ï¼?è©²å°?æ¡?å·²è¢«é??å??ï¼?ä½?ä¸?æ??æ??å°?æ¡?æª¢è¦?ï¼?%sï¼?%s\n"
 
 #: ../plugins/project-manager/plugin.c:1601
@@ -7231,7 +7240,8 @@ msgstr "è©³ç´°è³?æ??"
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../plugins/project-wizard/druid.c:142 ../plugins/project-wizard/druid.c:146
+#: ../plugins/project-wizard/druid.c:142
+#: ../plugins/project-wizard/druid.c:146
 msgid "Warning"
 msgstr "è¦å??"
 
@@ -7239,27 +7249,26 @@ msgstr "è¦å??"
 msgid "Message"
 msgstr "è¨?æ?¯"
 
-#: ../plugins/project-wizard/druid.c:232
-msgid ""
-"<b>Confirm the following information:</b>\n"
-"\n"
-msgstr ""
-"<b>ç¢ºèª?ä»¥ä¸?è³?è¨?ï¼?</b>\n"
-"\n"
+#: ../plugins/project-wizard/druid.c:233
+#| msgid ""
+#| "<b>Confirm the following information:</b>\n"
+#| "\n"
+msgid "Confirm the following information:"
+msgstr "ç¢ºèª?ä»¥ä¸?è³?è¨?ï¼?"
 
 #. The project type is translated too, it is something like
 #. * generic, GNOME applet, Makefile project...
-#: ../plugins/project-wizard/druid.c:236
+#: ../plugins/project-wizard/druid.c:237
 #, c-format
 msgid "Project Type: %s\n"
 msgstr "å°?æ¡?é¡?å??ï¼?%s\n"
 
-#: ../plugins/project-wizard/druid.c:401
+#: ../plugins/project-wizard/druid.c:402
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "ç?¡æ³?æ?¾å?°ä»»ä½?å°?æ¡?æ¨£æ?¬æ?¼ %s"
 
-#: ../plugins/project-wizard/druid.c:613
+#: ../plugins/project-wizard/druid.c:627
 #, c-format
 msgid ""
 "\n"
@@ -7268,53 +7277,40 @@ msgstr ""
 "\n"
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?è¼¸å?¥å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:628
+#: ../plugins/project-wizard/druid.c:642
 #, c-format
-msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contain "
-"only letters, digits, underscore, minus and dot. Please fix it."
-msgstr ""
-"æ¬?ä½?ã??%sã??å¿?é ?ä»¥è?±æ??å?æ¯?ã??æ?¸å?æ??åº?ç·?é??é ä¸¦ä¸?å?ªè?½å??å?«è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?ã??æ¸?"
-"è??å??é»?ã??è«?ä¿®æ£å®?ã??"
+msgid "Field \"%s\" must 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:633
+#: ../plugins/project-wizard/druid.c:647
 #, c-format
-msgid ""
-"Field \"%s\" must start with a letter, a digit, an underscore or a directory "
-"separator and contain only letters, digits, underscore, directory separator, "
-"minus and dot. Please fix it."
-msgstr ""
-"æ¬?ä½?ã??%sã??å¿?é ?ä»¥è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?æ??ç?®é??å??é??å?å??é??é ä¸¦ä¸?å?ªè?½å??å?«è?±æ??å?æ¯?ã??"
-"æ?¸å?ã??åº?ç·?ã??ç?®é??å??é??å?å??ã??æ¸?è??å??é»?ã??è«?ä¿®æ£å®?ã??"
+msgid "Field \"%s\" must start with a letter, a digit, an underscore or a directory separator and contain only letters, digits, underscore, directory separator, minus and dot. Please fix it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ä»¥è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?æ??ç?®é??å??é??å?å??é??é ä¸¦ä¸?å?ªè?½å??å?«è?±æ??å?æ¯?ã??æ?¸å?ã??åº?ç·?ã??ç?®é??å??é??å?å??ã??æ¸?è??å??é»?ã??è«?ä¿®æ£å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:638
+#: ../plugins/project-wizard/druid.c:652
 #, c-format
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/project-wizard/druid.c:665
+#: ../plugins/project-wizard/druid.c:679
 #, 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ã??ä¸?æ?¯ç©ºç??ã??å¦?æ??æ??äº?æª?æ¡?ç?¡æ³?å¯«å?¥ï¼?å°?æ¡?ç??å»ºç«?å?¯è?½æ??å¤±æ??ã??ç¢ºå®?è¦?ç¹¼çº?"
-"å??ï¼?"
+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:667
+#: ../plugins/project-wizard/druid.c:681
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "æª?æ¡? \"%s\" å·²å?å?¨ã??æ?¨æ?¯å?¦æ?³è¦?è¦?è??ä»?ï¼?"
 
-#: ../plugins/project-wizard/druid.c:698
+#: ../plugins/project-wizard/druid.c:712
 msgid "Invalid entry"
 msgstr "ç?¡æ??ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:709
+#: ../plugins/project-wizard/druid.c:723
 msgid "Dubious entry"
 msgstr "ä¸?ç¢ºå®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:870
+#: ../plugins/project-wizard/druid.c:884
 #, c-format
 msgid ""
 "\n"
@@ -7323,7 +7319,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:881
+#: ../plugins/project-wizard/druid.c:895
 #, c-format
 msgid ""
 "\n"
@@ -7332,38 +7328,23 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?ä»¶ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:890
-msgid ""
-"Some important programs or development packages required to build this "
-"project are missing. Please make sure they are installed properly before "
-"generating the project.\n"
-msgstr ""
-"ç·¨è¯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?ä»¶é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??ç¢ºå®?å®?å??å·²ç¶?æ£"
-"ç¢ºç??å®?è£?ã??\n"
+#: ../plugins/project-wizard/druid.c:904
+msgid "Some important programs or development packages required to build this project are missing. Please make sure they are installed properly before generating the project.\n"
+msgstr "ç·¨è¯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?ä»¶é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??ç¢ºå®?å®?å??å·²ç¶?æ£ç¢ºç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:898
+#: ../plugins/project-wizard/druid.c:912
 msgid "Install missing packages"
 msgstr "å®?è£?ç¼ºå°?ç??å¥?ä»¶"
 
-#: ../plugins/project-wizard/druid.c:906
-msgid ""
-"The missing programs are usually part of some distrubution packages and can "
-"be searched for in your Application Manager. Similarly, the development "
-"packages are contained in special packages that your distribution provides "
-"to allow development of projects based on them. They usually end with a \"-"
-"dev\" or \"-devel\" suffix in package names and can be found by searching in "
-"your Application Manager."
-msgstr ""
-"ç¼ºå°?ç??ç¨?å¼?é??å¸¸æ?¯æ??äº?ç?¼è¡?ç??æ?¬ç??ä¸?é?¨å??ï¼?å?¯ä»¥å?¨æ?¨ç??å¥?ä»¶ç®¡ç??ç¨?å¼?ä¸æ??å°?å?°ã??å??æ¨£"
-"ç??ï¼?é??ç?¼ç?¨å¥?ä»¶ä¹?å¸¸å?å?¨ç?¹å?¥ç??å¥?ä»¶ä¸ï¼?æ?¯æ?¨ç??ç?¼è¡?ç??æ?¬æ??ä¾?ä»¥ä¾¿é??ç?¼ä»¥å®?å??ç?ºå?ºç¤?ç??"
-"å°?æ¡?ã??å®?å??é??å¸¸å?¨å¥?ä»¶å??ç¨±ä¸ä»¥ã??-devã??æ??ã??-develã??å¾?ç¶´çµ?å°¾ï¼?è??ä¸?å??æ¨£å?¯ä»¥å?¨æ?¨ç??"
-"å¥?ä»¶ç®¡ç??ç¨?å¼?ä¸æ??å°?å?°ã??"
+#: ../plugins/project-wizard/druid.c:920
+msgid "The missing programs are usually part of some distrubution packages and can be searched for in your Application Manager. Similarly, the development packages are contained in special packages that your distribution provides to allow development of projects based on them. They usually end with a \"-dev\" or \"-devel\" suffix in package names and can be found by searching in your Application Manager."
+msgstr "ç¼ºå°?ç??ç¨?å¼?é??å¸¸æ?¯æ??äº?ç?¼è¡?ç??æ?¬ç??ä¸?é?¨å??ï¼?å?¯ä»¥å?¨æ?¨ç??å¥?ä»¶ç®¡ç??ç¨?å¼?ä¸æ??å°?å?°ã??å??æ¨£ç??ï¼?é??ç?¼ç?¨å¥?ä»¶ä¹?å¸¸å?å?¨ç?¹å?¥ç??å¥?ä»¶ä¸ï¼?æ?¯æ?¨ç??ç?¼è¡?ç??æ?¬æ??ä¾?ä»¥ä¾¿é??ç?¼ä»¥å®?å??ç?ºå?ºç¤?ç??å°?æ¡?ã??å®?å??é??å¸¸å?¨å¥?ä»¶å??ç¨±ä¸ä»¥ã??-devã??æ??ã??-develã??å¾?ç¶´çµ?å°¾ï¼?è??ä¸?å??æ¨£å?¯ä»¥å?¨æ?¨ç??å¥?ä»¶ç®¡ç??ç¨?å¼?ä¸æ??å°?å?°ã??"
 
-#: ../plugins/project-wizard/druid.c:914
+#: ../plugins/project-wizard/druid.c:928
 msgid "Missing components"
 msgstr "é?ºå¤±å??ä»¶"
 
-#: ../plugins/project-wizard/druid.c:1046
+#: ../plugins/project-wizard/druid.c:1060
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?å»ºç«?å°?æ¡?å?©ç??ä½¿ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7404,43 +7385,45 @@ msgid "Executing: %s"
 msgstr "æ£å?¨å?·è¡?ï¼?%s"
 
 #: ../plugins/project-wizard/plugin.c:50
-#, fuzzy, c-format
+#, c-format
 #| msgid "Unable to find any project template in %s"
-msgid "Unable to extrat project template %s: %s"
-msgstr "ç?¡æ³?æ?¾å?°ä»»ä½?å°?æ¡?æ¨£æ?¬æ?¼ %s"
+msgid "Unable to extract project template %s: %s"
+msgstr "ç?¡æ³?è§£é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 
 #: ../plugins/project-wizard/plugin.c:276
 msgid "New Project Assistant"
 msgstr "æ?°å°?æ¡?å?©ç??"
 
 #: ../plugins/project-wizard/property.c:343
-#: ../plugins/project-wizard/property.c:497
+#: ../plugins/project-wizard/property.c:454
 msgid "No"
 msgstr "å?¦"
 
-#: ../plugins/project-wizard/property.c:355
+#: ../plugins/project-wizard/property.c:354
 msgid "Select directory"
 msgstr "é?¸æ??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:363
+#: ../plugins/project-wizard/property.c:362
 msgid "Select file"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:455 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:412
+#: ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é?¸æ??å??ç??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:480
-#: ../plugins/project-wizard/property.c:570 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:437
+#: ../plugins/project-wizard/property.c:527
+#: ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é?¸æ??å??ç¤º"
 
-#: ../plugins/project-wizard/property.c:540
+#: ../plugins/project-wizard/property.c:497
 msgid "Choose directory"
 msgstr "é?¸å??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:544
+#: ../plugins/project-wizard/property.c:501
 msgid "Choose file"
 msgstr "é?¸å??æª?æ¡?"
 
@@ -7455,7 +7438,6 @@ msgstr "é??ç?¨ã??æ??å°?å??ç??æ?®é??å°?æ¡?"
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:2
 #: ../plugins/project-wizard/templates/library.wiz.in.h:2
 msgid "Add C++ support:"
 msgstr "å? å?¥ C++ æ?¯æ?´ï¼?"
@@ -7480,7 +7462,6 @@ msgstr "å? å?¥å?±äº«ç¨?å¼?åº«æ?¯æ?´ï¼?"
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:5
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:4
 #: ../plugins/project-wizard/templates/library.wiz.in.h:4
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr "å?¨å°?æ¡?å? å?¥ C++ æ?¯æ?´ä»¥ä¾¿ç·¨è¯ C++ å??å§?ç¢¼æª?æ¡?"
@@ -7512,8 +7493,8 @@ msgstr "å?¨æ?¨ç??å°?æ¡?ä¸å? å?¥ç·¨è¯å?±äº«ç¨?å¼?åº«ç??æ?¯æ?´"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:8
 #: ../plugins/project-wizard/templates/js.wiz.in.h:3
 #: ../plugins/project-wizard/templates/python.wiz.in.h:8
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:4
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:8
 #: ../plugins/project-wizard/templates/library.wiz.in.h:7
 msgid "Basic information"
 msgstr "å?ºæ?¬è³?è¨?"
@@ -7531,8 +7512,8 @@ msgstr "å?ºæ?¬è³?è¨?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:9
 #: ../plugins/project-wizard/templates/js.wiz.in.h:4
 #: ../plugins/project-wizard/templates/python.wiz.in.h:9
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:5
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:9
 #: ../plugins/project-wizard/templates/library.wiz.in.h:8
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "æ??å??è??è»?é«?æ?£ä½?è¨±å?¯è? ï¼?BSDï¼?"
@@ -7540,8 +7521,7 @@ msgstr "æ??å??è??è»?é«?æ?£ä½?è¨±å?¯è? ï¼?BSDï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:9
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:9
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:9
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:9
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:8
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:10
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:9
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:11
@@ -7549,15 +7529,15 @@ msgstr "æ??å??è??è»?é«?æ?£ä½?è¨±å?¯è? ï¼?BSDï¼?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:9
 #: ../plugins/project-wizard/templates/java.wiz.in.h:10
 #: ../plugins/project-wizard/templates/python.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:10
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:6
 #: ../plugins/project-wizard/templates/library.wiz.in.h:10
-msgid "Configure external packages"
-msgstr "è¨å®?å¤?é?¨å¥?ä»¶"
+msgid "Check the packages that your project requires"
+msgstr "æª¢æ?¥æ?¨ç??å°?æ¡?é??è¦?ç??å¥?ä»¶"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:10
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:11
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:10
@@ -7566,76 +7546,71 @@ msgstr "è¨å®?å¤?é?¨å¥?ä»¶"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:10
 #: ../plugins/project-wizard/templates/java.wiz.in.h:11
 #: ../plugins/project-wizard/templates/python.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:11
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:7
 #: ../plugins/project-wizard/templates/library.wiz.in.h:11
+msgid "Configure external packages"
+msgstr "è¨å®?å¤?é?¨å¥?ä»¶"
+
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:13
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:11
+#: ../plugins/project-wizard/templates/java.wiz.in.h:12
+#: ../plugins/project-wizard/templates/python.wiz.in.h:12
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/library.wiz.in.h:12
 msgid "Configure external packages:"
 msgstr "è¨å®?å¤?é?¨å¥?ä»¶ï¼?"
 
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:12
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:14
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:14
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:12
-#: ../plugins/project-wizard/templates/java.wiz.in.h:13
-#: ../plugins/project-wizard/templates/js.wiz.in.h:6
-#: ../plugins/project-wizard/templates/python.wiz.in.h:13
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:16
-#: ../plugins/project-wizard/templates/library.wiz.in.h:13
-msgid "Email address:"
-msgstr "é?»å?é?µä»¶ä½?å??ï¼?"
-
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:13
-#: ../plugins/project-wizard/templates/django.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:13
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:15
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:15
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:13
 #: ../plugins/project-wizard/templates/java.wiz.in.h:14
-#: ../plugins/project-wizard/templates/js.wiz.in.h:7
+#: ../plugins/project-wizard/templates/js.wiz.in.h:6
 #: ../plugins/project-wizard/templates/python.wiz.in.h:14
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:18
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:10
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:10
 #: ../plugins/project-wizard/templates/library.wiz.in.h:14
+msgid "Email address:"
+msgstr "é?»å?é?µä»¶ä½?å??ï¼?"
+
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:14
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
+#: ../plugins/project-wizard/templates/django.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:16
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:16
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:15
+#: ../plugins/project-wizard/templates/java.wiz.in.h:15
+#: ../plugins/project-wizard/templates/js.wiz.in.h:7
+#: ../plugins/project-wizard/templates/python.wiz.in.h:15
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:11
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:11
+#: ../plugins/project-wizard/templates/library.wiz.in.h:15
 msgid "General Project Information"
 msgstr "ä¸?è?¬å°?æ¡?è³?è¨?"
 
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:16
 msgid "Generic (Minimal)"
 msgstr "ä¸?è?¬ (æ??å°?)"
 
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:16
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:16
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:17
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:17
-#: ../plugins/project-wizard/templates/java.wiz.in.h:17
-#: ../plugins/project-wizard/templates/python.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:20
-#: ../plugins/project-wizard/templates/library.wiz.in.h:16
-msgid ""
-"Give a package name that your project require. You may also mention what is "
-"the required version of the package. For example, 'libgnomeui-2.0' or "
-"'libgnomeui-2.0 >= 2.2.0'"
-msgstr ""
-"æ??å®?æ?¨ç??å°?æ¡?é??è¦?ç??å¥?ä»¶å??ç¨±ã??æ?¨ä¹?å?¯ä»¥æ??å?ºè©²å¥?ä»¶æ??é??ç??ç??æ?¬ã??ä¾?å¦?ã??libgnomeui-"
-"2.0ã??æ??ã??libgnomeui-2.0 >= 2.2.0ã??"
-
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:18
@@ -7649,8 +7624,8 @@ msgstr ""
 #: ../plugins/project-wizard/templates/java.wiz.in.h:19
 #: ../plugins/project-wizard/templates/js.wiz.in.h:11
 #: ../plugins/project-wizard/templates/python.wiz.in.h:19
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:14
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:14
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:24
 #: ../plugins/project-wizard/templates/library.wiz.in.h:19
 msgid "License"
 msgstr "æ??æ¬?æ¢?æ¬¾"
@@ -7668,8 +7643,8 @@ msgstr "æ??æ¬?æ¢?æ¬¾"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:22
 #: ../plugins/project-wizard/templates/js.wiz.in.h:12
 #: ../plugins/project-wizard/templates/python.wiz.in.h:20
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:15
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:16
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:25
 #: ../plugins/project-wizard/templates/library.wiz.in.h:20
 msgid "No license"
 msgstr "æ²?æ??æ??æ¬?"
@@ -7687,8 +7662,8 @@ msgstr "æ²?æ??æ??æ¬?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:23
 #: ../plugins/project-wizard/templates/js.wiz.in.h:13
 #: ../plugins/project-wizard/templates/python.wiz.in.h:21
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:16
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:26
 #: ../plugins/project-wizard/templates/library.wiz.in.h:23
 msgid "Options for project build system"
 msgstr "å°?æ¡?ç·¨è¯ç³»çµ±ç??é?¸é ?"
@@ -7707,8 +7682,8 @@ msgstr "å°?æ¡?ç·¨è¯ç³»çµ±ç??é?¸é ?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:24
 #: ../plugins/project-wizard/templates/js.wiz.in.h:14
 #: ../plugins/project-wizard/templates/python.wiz.in.h:22
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:17
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:27
 #: ../plugins/project-wizard/templates/library.wiz.in.h:24
 msgid "Project Name:"
 msgstr "å°?æ¡?å??ç¨±ï¼?"
@@ -7726,9 +7701,9 @@ msgstr "å°?æ¡?å??ç¨±ï¼?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:25
 #: ../plugins/project-wizard/templates/js.wiz.in.h:15
 #: ../plugins/project-wizard/templates/python.wiz.in.h:23
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:18
 #: ../plugins/project-wizard/templates/mkfile.wiz.in.h:6
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:28
 #: ../plugins/project-wizard/templates/library.wiz.in.h:25
 msgid "Project options"
 msgstr "å°?æ¡?é?¸é ?"
@@ -7736,7 +7711,6 @@ msgstr "å°?æ¡?é?¸é ?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:23
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:23
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:23
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:40
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:24
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:22
@@ -7745,10 +7719,11 @@ msgstr "å°?æ¡?é?¸é ?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:25
 #: ../plugins/project-wizard/templates/java.wiz.in.h:26
 #: ../plugins/project-wizard/templates/python.wiz.in.h:24
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:29
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/library.wiz.in.h:26
-msgid "Require Package:"
-msgstr "é??è¦?å¥?ä»¶ï¼?"
+#| msgid "Require Package:"
+msgid "Required Packages:"
+msgstr "é??è¦?ç??å¥?ä»¶ï¼?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:24
@@ -7763,8 +7738,8 @@ msgstr "é??è¦?å¥?ä»¶ï¼?"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:27
 #: ../plugins/project-wizard/templates/js.wiz.in.h:16
 #: ../plugins/project-wizard/templates/python.wiz.in.h:25
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:22
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:32
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:30
 #: ../plugins/project-wizard/templates/library.wiz.in.h:27
 msgid "Select code license"
 msgstr "é?¸æ??å??å§?ç¢¼æ??æ¬?"
@@ -7781,7 +7756,7 @@ msgstr "é?¸æ??å??å§?ç¢¼æ??æ¬?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:27
 #: ../plugins/project-wizard/templates/java.wiz.in.h:28
 #: ../plugins/project-wizard/templates/python.wiz.in.h:26
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:31
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:23
 #: ../plugins/project-wizard/templates/library.wiz.in.h:30
 msgid "Use pkg-config to add library support from other packages"
 msgstr "ä½¿ç?¨ pkg-config å¾?å?¶ä»?å¥?ä»¶å? å?¥ç¨?å¼?åº«ç??æ?¯æ?´"
@@ -7799,8 +7774,8 @@ msgstr "ä½¿ç?¨ pkg-config å¾?å?¶ä»?å¥?ä»¶å? å?¥ç¨?å¼?åº«ç??æ?¯æ?´"
 #: ../plugins/project-wizard/templates/java.wiz.in.h:31
 #: ../plugins/project-wizard/templates/js.wiz.in.h:18
 #: ../plugins/project-wizard/templates/python.wiz.in.h:29
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:25
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:34
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:33
 #: ../plugins/project-wizard/templates/library.wiz.in.h:32
 msgid "project name"
 msgstr "å°?æ¡?å??ç¨±"
@@ -7819,8 +7794,8 @@ msgstr "ä¸?è?¬å°?æ¡?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:2
 #: ../plugins/project-wizard/templates/java.wiz.in.h:3
 #: ../plugins/project-wizard/templates/python.wiz.in.h:3
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:1
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:3
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:3
 #: ../plugins/project-wizard/templates/library.wiz.in.h:3
 msgid "Add internationalization:"
 msgstr "å? å?¥å??é??å??å??è?½ï¼?"
@@ -7835,15 +7810,13 @@ msgstr "å? å?¥å??é??å??å??è?½ï¼?"
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:5
 #: ../plugins/project-wizard/templates/java.wiz.in.h:6
 #: ../plugins/project-wizard/templates/python.wiz.in.h:6
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:5
 #: ../plugins/project-wizard/templates/library.wiz.in.h:5
-msgid ""
-"Adds support for internationalization so that your project can have "
-"translations in different languages"
+msgid "Adds support for internationalization so that your project can have translations in different languages"
 msgstr "å? å?¥å??é??å??æ?¯æ?´ï¼?è®?æ?¨ç??å°?æ¡?å?¯ä»¥ç¿»è¯æ??ä¸?å??ç??èª?è¨?"
 
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:16
 msgid "Generic"
 msgstr "ä¸?è?¬"
 
@@ -7851,7 +7824,7 @@ msgstr "ä¸?è?¬"
 msgid "A generic C++ project"
 msgstr "ä¸?è?¬ C++ å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:16
 msgid "Generic C++"
 msgstr "ç?¢ç?? C++"
 
@@ -7882,6 +7855,14 @@ msgstr "å? å?¥ gtk-doc ç³»çµ±ï¼?"
 msgid "GTK+"
 msgstr "GTK+"
 
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
+msgid "Give a package name that your project require. You may also mention what is the required version of the package. For example, 'libgnomeui-2.0' or 'libgnomeui-2.0 >= 2.2.0'"
+msgstr "æ??å®?æ?¨ç??å°?æ¡?é??è¦?ç??å¥?ä»¶å??ç¨±ã??æ?¨ä¹?å?¯ä»¥æ??å?ºè©²å¥?ä»¶æ??é??ç??ç??æ?¬ã??ä¾?å¦?ã??libgnomeui-2.0ã??æ??ã??libgnomeui-2.0 >= 2.2.0ã??"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
+msgid "Require Package:"
+msgstr "é??è¦?å¥?ä»¶ï¼?"
+
 #: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
 #: ../plugins/project-wizard/templates/java.wiz.in.h:30
@@ -7897,37 +7878,31 @@ msgstr "Anjuta å¤?æ??ç¨?å¼?"
 msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "ä½¿ç?¨ libanjuta æ?¶æ§?ç?? Anjuta å¤?æ??ç¨?å¼?å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:8
-msgid ""
-"Comma separated, other plugins that this plugin depends on. It could be "
-"either primary interface name or plugin location (library:class)"
-msgstr ""
-"ä»¥é??è??å??é??ï¼?é??å??å¤?æ??ç¨?å¼?ç?¸ä¾?ç??å?¶ä»?å¤?æ??ç¨?å¼?ã??å®?å?¯ä»¥æ?¯ä¸»è¦?ä»?é?¢å??ç¨±æ??å¤?æ??ç¨?å¼?ä½?"
-"ç½® (library:class)"
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:9
+msgid "Comma separated, other plugins that this plugin depends on. It could be either primary interface name or plugin location (library:class)"
+msgstr "ä»¥é??è??å??é??ï¼?é??å??å¤?æ??ç¨?å¼?ç?¸ä¾?ç??å?¶ä»?å¤?æ??ç¨?å¼?ã??å®?å?¯ä»¥æ?¯ä¸»è¦?ä»?é?¢å??ç¨±æ??å¤?æ??ç¨?å¼?ä½?ç½® (library:class)"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:12
 msgid "Create Gtk Builder interface file"
 msgstr "å»ºç«? Gtk çµ?å»ºä»?é?¢æª?æ¡?"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:12
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:13
 msgid "Create a template Gtk Builder interface file"
 msgstr "å»ºç«? Gtk çµ?å»ºä»?é?¢æª?æ¡?ç¯?æ?¬"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:15
 msgid "Display description of the plugin"
 msgstr "é¡¯ç¤ºå¤?æ??ç¨?å¼?ç??æ??è¿°"
 
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:15
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:16
 msgid "Display title of the plugin"
 msgstr "é¡¯ç¤ºå¤?æ??ç¨?å¼?ç??æ¨?é¡?"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:20
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:21
 msgid "Icon File:"
 msgstr "å??ç¤ºæª?ï¼?"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:21
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:22
 msgid "Icon file for the plugin"
 msgstr "å¤?æ??ç¨?å¼?ç??å??ç¤ºæª?"
 
@@ -7976,11 +7951,8 @@ msgid "Plugin interfaces to implement"
 msgstr "æ¬²å¯¦ä½?ç??å¤?æ??ç¨?å¼?ä»?é?¢"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:38
-msgid ""
-"Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
-msgstr ""
-"å°?æ¡?å??ç¨±ä¸?è?½å?«æ??ç©ºç?½ï¼?å? ç?ºå®?æ??æ??ç?ºè©²å°?æ¡?ç·¨è¯ç?®æ¨?(å?¯å?·è¡?æª?ã??ç¨?å¼?åº«ç?)ç??å??ç¨±"
+msgid "Project name must not contain spaces, because it will be the name of the project build target (executable, library etc.)"
+msgstr "å°?æ¡?å??ç¨±ä¸?è?½å?«æ??ç©ºç?½ï¼?å? ç?ºå®?æ??æ??ç?ºè©²å°?æ¡?ç·¨è¯ç?®æ¨?(å?¯å?·è¡?æª?ã??ç¨?å¼?åº«ç?)ç??å??ç¨±"
 
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:42
 msgid "Shell values to watch"
@@ -8002,7 +7974,7 @@ msgstr "å¤?æ??ç¨?å¼?æ?¯å?¦å?·æ??é?¸å?®æ??å·¥å?·å??"
 msgid "A generic GTKmm (C++) project"
 msgstr "ä¸?è?¬ GTKmm (C++) å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
 msgid "GTKmm"
 msgstr "GTKmm"
 
@@ -8031,15 +8003,14 @@ msgid "Xlib dock"
 msgstr "Xlib dock"
 
 #: ../plugins/project-wizard/templates/gcj.wiz.in.h:1
-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)"
 msgstr "ä¸?è?¬å??ç??ç·¨è¯ java å°?æ¡?ï¼?ä½¿ç?¨ GNU Java ç·¨è¯å?¨ (gcj)"
 
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:14
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ é??è¦?ç?¥é??å?ªå??é¡?å?¥(class)å?«æ?? main() å?½å¼?"
 
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:16
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:17
 msgid "Generic gcj compiled java"
 msgstr "ä¸?è?¬ gcj ç·¨è¯ç?? java"
 
@@ -8052,7 +8023,7 @@ msgstr "ä¸»é¡?å?¥ï¼?"
 msgid "A generic java project using automake project management"
 msgstr "ä¸?è?¬ java å°?æ¡?ï¼?ä½¿ç?¨ automake å°?æ¡?ç®¡ç??"
 
-#: ../plugins/project-wizard/templates/java.wiz.in.h:16
+#: ../plugins/project-wizard/templates/java.wiz.in.h:17
 msgid "Generic java (automake)"
 msgstr "ä¸?è?¬ java (automake)"
 
@@ -8068,10 +8039,20 @@ msgstr "ä¸?è?¬ JavaScript"
 msgid "A generic python project using automake project management"
 msgstr "ä¸?è?¬ python å°?æ¡?ï¼?ä½¿ç?¨ automake å°?æ¡?ç®¡ç??"
 
-#: ../plugins/project-wizard/templates/python.wiz.in.h:16
+#: ../plugins/project-wizard/templates/python.wiz.in.h:17
 msgid "Generic python (automake)"
 msgstr "ä¸?è?¬ python (automake)"
 
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:19
+#| msgid "Generic java (automake)"
+msgid "PyGTK (automake)"
+msgstr "PyGTK (automake)"
+
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:20
+#| msgid "Project name"
+msgid "PyGTK project using automake"
+msgstr "PyGTK å°?æ¡?ï¼?ä½¿ç?¨ automake å°?æ¡?ç®¡ç??"
+
 #: ../plugins/project-wizard/templates/mkfile.wiz.in.h:1
 msgid "Makefile project"
 msgstr "Makefile å°?æ¡?"
@@ -8148,26 +8129,6 @@ msgstr "é??è¦? SDL_ttfï¼?"
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:1
-msgid "A GNOME applet project"
-msgstr "GNOME é?¢æ?¿ç¨?å¼?å°?æ¡?"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:6
-msgid "Applet Title:"
-msgstr "é?¢æ?¿ç¨?å¼?æ¨?é¡?ï¼?"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:14
-msgid "Display description of the applet"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ??è¿°"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:15
-msgid "Display title of the applet"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ¨?é¡?"
-
-#: ../plugins/project-wizard/templates/gnome-applet.wiz.in.h:17
-msgid "GNOME Applet"
-msgstr "GNOME é?¢æ?¿ç¨?å¼?"
-
 #: ../plugins/project-wizard/templates/library.wiz.in.h:1
 msgid "A shared or a static library project"
 msgstr "å?±äº«å¼?æ??é??æ??ç¨?å¼?åº«å°?æ¡?"
@@ -8301,7 +8262,7 @@ msgstr "é?¸æ??æª?æ¡?ï¼?"
 
 #: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
-msgstr ""
+msgstr "æ?´å??æ£è¦?è¡¨ç¤ºå¼?å??å??å??ç?§"
 
 #: ../plugins/search/anjuta-search.ui.h:7
 msgid "File Filter"
@@ -8438,7 +8399,8 @@ msgstr "å?¨ç·¨è¼¯å?¨æ??å°?å?ä¸²æ??æ£è¦?è¡¨ç¤ºå¼?"
 msgid "Find _Next"
 msgstr "æ??å°?ä¸?ä¸?å?? (_N)"
 
-#: ../plugins/search/plugin.c:72 ../plugins/search/plugin.c:76
+#: ../plugins/search/plugin.c:72
+#: ../plugins/search/plugin.c:76
 msgid "Repeat the last Find command"
 msgstr "é??è¤?ä¸?ä¸?å??æ??å°?æ??ä»¤"
 
@@ -8451,11 +8413,11 @@ msgid "Find and R_eplaceâ?¦"
 msgstr "å°?æ?¾è??å??ä»£(_R)â?¦"
 
 #: ../plugins/search/plugin.c:80
-msgid ""
-"Search for and replace a string or regular expression with another string"
+msgid "Search for and replace a string or regular expression with another string"
 msgstr "ä½¿ç?¨å?ä¸²æ??æ£è¦?è¡¨ç¤ºå¼?æ??å°?ä¸¦å??ä»£ç?ºå?¶ä»?å?ä¸²"
 
-#: ../plugins/search/plugin.c:82 ../plugins/search/plugin.c:83
+#: ../plugins/search/plugin.c:82
+#: ../plugins/search/plugin.c:83
 msgid "Search and Replace"
 msgstr "æ??å°?å??å??ä»£"
 
@@ -8570,7 +8532,235 @@ msgstr[0] "å·²å??ä»£ %d å??ç¬¦å??é ?ã??"
 msgid "Unable to build user interface for Search and Replace"
 msgstr "ç?¡æ³?å»ºç«?æ??å°?è??å??ä»£ä½¿ç?¨è??ä»?é?¢"
 
-#: ../plugins/sourceview/sourceview.c:395
+#: ../plugins/snippets-manager/plugin.c:60
+#: ../plugins/snippets-manager/plugin.c:302
+#: ../plugins/snippets-manager/snippets-browser.c:208
+msgid "Snippets"
+msgstr "æ??å?ç??æ®µ"
+
+#. Translator: Appears in Edit->Snippets menu. It is used mainly for providing a
+#. shortcut for the trigger-key based insertion of snippets. It's called like this
+#. because you type the trigger-key in the editor, followed by Trigger Insert and
+#. the snippet gets inserted.
+#: ../plugins/snippets-manager/plugin.c:71
+msgid "_Trigger insert"
+msgstr "è§¸ç?¼æ??å?¥(_T)"
+
+#: ../plugins/snippets-manager/plugin.c:73
+msgid "Insert a snippet using the trigger-key"
+msgstr "ä½¿ç?¨è§¸ç?¼é?µæ??å?¥æ??å?ç??æ®µ"
+
+#. Translator: In a similar matter, it also appears in Edit->Snippets. It's another method
+#. for inserting snippets. In this case, you call Auto complete insert, start
+#. typing in the editor a string, the database is searched for that string and the
+#. most relevant snippets are returned in a pop-up like the auto-complete one
+#. (they are showed by their names). After selecting one of them, the snippet gets
+#. inserted.
+#: ../plugins/snippets-manager/plugin.c:84
+#| msgid "Auto-complete"
+msgid "_Auto complete insert"
+msgstr "è?ªå??è£?é½?æ??å?¥(_A)"
+
+#: ../plugins/snippets-manager/plugin.c:86
+#| msgid "Add a space after function call autocompletion"
+msgid "Insert a snippet using auto-completion"
+msgstr "ä½¿ç?¨è?ªå??è£?é½?æ??å?¥æ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/plugin.c:91
+msgid "_Import snippets â?¦"
+msgstr "å?¯å?¥æ??å?ç??æ®µ(_I)â?¦"
+
+#: ../plugins/snippets-manager/plugin.c:93
+msgid "Import snippets to the database"
+msgstr "å°?æ??å?ç??æ®µå?¯å?¥è³?æ??åº«"
+
+#: ../plugins/snippets-manager/plugin.c:98
+msgid "_Export snippets â?¦"
+msgstr "å?¯å?ºæ??å?ç??æ®µ(_E)â?¦"
+
+#: ../plugins/snippets-manager/plugin.c:100
+msgid "Export snippets from the database"
+msgstr "å¾?è³?æ??åº«å?¯å?ºæ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/plugin.c:327
+#| msgid "Project manager actions"
+msgid "Snippets Manager actions"
+msgstr "æ??å?ç®¡ç??å?¡å??ä½?"
+
+#: ../plugins/snippets-manager/plugin.c:767
+#| msgid "Command"
+msgid "Command?"
+msgstr "æ??ä»¤ï¼?"
+
+#: ../plugins/snippets-manager/plugin.c:783
+#| msgid "Variable list"
+msgid "Variable text"
+msgstr "è®?æ?¸æ??å?"
+
+#: ../plugins/snippets-manager/plugin.c:801
+#: ../plugins/snippets-manager/snippets-editor.c:40
+#| msgid "Inspect/Evaluate"
+msgid "Instant value"
+msgstr "å?³æ??æ?¸å?¼"
+
+#: ../plugins/snippets-manager/plugin.c:929
+#: ../plugins/snippets-manager/plugin.c:966
+#: ../plugins/snippets-manager/snippets-provider.c:753
+#: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:2
+msgid "Code Snippets"
+msgstr "ç¨?å¼?ç¢¼æ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/snippets-browser.c:549
+msgid "Trigger"
+msgstr "è§¸ç?¼"
+
+#: ../plugins/snippets-manager/snippets-browser.c:560
+#| msgid "Language Manager"
+msgid "Languages"
+msgstr "èª?è¨?"
+
+#. Insert the Add Snippet menu item
+#: ../plugins/snippets-manager/snippets-browser.c:808
+#| msgid "Add _Targetâ?¦"
+msgid "Add Snippet â?¦"
+msgstr "å? å?¥æ??å?ç??æ®µâ?¦"
+
+#. Insert the Add Snippets Group menu item
+#: ../plugins/snippets-manager/snippets-browser.c:818
+#| msgid "Add _Groupâ?¦"
+msgid "Add Snippets Group â?¦"
+msgstr "å? å?¥æ??å?ç??æ®µç¾¤çµ?â?¦"
+
+#: ../plugins/snippets-manager/snippets-editor.c:39
+#| msgid "Default"
+msgid "Default value"
+msgstr "é ?è¨å?¼"
+
+#: ../plugins/snippets-manager/snippets-editor.c:48
+msgid "<b>Error:</b> You must choose at least one language for the snippet!"
+msgstr "<b>é?¯èª¤ï¼?</b>æ?¨å¿?é ?ç?ºæ??å?ç??æ®µé?¸æ??è?³å°?ä¸?ç¨®èª?è¨?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.c:49
+msgid "<b>Error:</b> The trigger key is already in use for one of the languages!"
+msgstr "<b>é?¯èª¤ï¼?</b>é??å??è§¸ç?¼é?µå·²ç¶?ç?¨æ?¼å?¶ä¸ä¸?ç¨®èª?è¨?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.c:50
+#| msgid ""
+#| "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
+msgid "<b>Error:</b> The trigger key can only contain alfanumeric characters and _ !"
+msgstr "<b>é?¯èª¤ï¼?</b>è§¸ç?¼é?µå?ªè?½å??å?«è?±æ??å?æ¯?å?? _ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.c:51
+msgid "<b>Error:</b> You haven't entered a trigger key for the snippet!"
+msgstr "<b>é?¯èª¤ï¼?</b>æ?¨å°?æ?ªè¼¸å?¥é??å??æ??å?ç??æ®µç??è§¸ç?¼é?µï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:1
+msgid "<b>Error:</b> The snippet must belong to a group!"
+msgstr "<b>é?¯èª¤ï¼?</b>æ??å?ç??æ®µå¿?é ?å±¬æ?¼æ??å??ç¾¤çµ?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:2
+msgid "<b>Warning:</b> You should choose a name for the snippet!"
+msgstr "<b>è¦å??ï¼?</b>æ?¨æ??è©²ç?ºæ??å?ç??æ®µé?¸æ??ä¸?å??å??ç¨±ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:3
+#| msgid "_Add"
+msgid "Add"
+msgstr "å? å?¥"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:4
+#| msgid "Close All"
+msgid "Close"
+msgstr "é??é??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:5
+msgid "Insert"
+msgstr "æ??å?¥"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:6
+msgid "Keywords are used for better searching of the snippets. They should be relevant to the snippet content. Type them separated by a single space."
+msgstr "é??é?µå?å?¯ä»¥ç?¨ä¾?å??å?©æ??å°?æ??å?ç??æ®µã??å®?å??æ??è©²è??æ??å?ç??æ®µç??å?§å®¹æ??æ??é??è?¯ã??è¼¸å?¥æ??è«?ä»¥ä¸?å??ç©ºç?½å?å??å??ç?ºå??é??ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:7
+msgid "Keywords:"
+msgstr "é??é?µå?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:8
+#| msgid "Changes:"
+msgid "Languages:"
+msgstr "èª?è¨?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:9
+#| msgid "_Print Preview"
+msgid "Preview"
+msgstr "é ?è¦½"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:12
+msgid "Select the Snippets Group to which this snippet belongs."
+msgstr "é?¸æ??é??å??æ??å?ç??æ®µæ??å±¬ç??ç¾¤çµ?ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:13
+msgid "Select the languages for which you want to use this snippet."
+msgstr "é?¸æ??æ?¨è¦?é??å??æ??å?ç??æ®µç?¨æ?¼å?ªç¨®èª?è¨?ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:14
+msgid ""
+"Select the name of the Snippet. \n"
+"The role of the name is purely informative."
+msgstr ""
+"é?¸æ??æ??å?ç??æ®µç??å??ç¨±ã??\n"
+"å??ç¨±ç??ä½?ç?¨å®?å?¨æ?¯ç?¨ä¾?è¾¦è?è??å·²ã??"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:16
+#| msgid "Contents"
+msgid "Snippet Content"
+msgstr "æ??å?ç??æ®µå?§å®¹"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:17
+#| msgid "New Name:"
+msgid "Snippet Name:"
+msgstr "æ??å?ç??æ®µå??ç¨±ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:18
+#| msgid "Properties"
+msgid "Snippet Properties"
+msgstr "æ??å?ç??æ®µå±¬æ?§"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:19
+#| msgid "Environment Variables:"
+msgid "Snippet Variables"
+msgstr "æ??å?ç??æ®µè®?æ?¸"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:20
+msgid "Snippets Group:"
+msgstr "æ??å?ç??æ®µç¾¤çµ?ï¼?"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:21
+msgid ""
+"The trigger key is used for fast insertion of the snippet. Type the trigger key in the editor, followed by the \"Fast Insert\" shortcut to insert a snippet.\n"
+"<b>Warning: Must be unique per language. </b>"
+msgstr ""
+"è§¸ç?¼é?µæ?¯ç?¨æ?¼å¿«é??æ??å?¥æ??å?ç??æ®µã??å?¨ç·¨è¼¯å?¨ä¸è¼¸å?¥è§¸ç?¼é?µï¼?æ?¥è??ä½¿ç?¨ã??å¿«é??æ??å?¥ã??ç??æ?·å¾?é?µä¾?æ??å?¥æ??å?ç??æ®µã??\n"
+"<b>è¦å??ï¼?è§¸ç?¼é?µå¿?é ?æ?¯æ¯?å??èª?è¨?å??è?ªç?¨ç«?ã??</b>"
+
+#: ../plugins/snippets-manager/snippets-editor.ui.h:23
+msgid "Trigger Key:"
+msgstr "è§¸ç?¼é?µï¼?"
+
+#: ../plugins/snippets-manager/snippets-manager-preferences.ui.h:1
+#| msgid "Anjuta macros"
+msgid "Anjuta variables"
+msgstr "Anjuta è®?æ?¸"
+
+#: ../plugins/snippets-manager/snippets-import-export.c:145
+#| msgid "Import options"
+msgid "Import Snippets"
+msgstr "å?¯å?¥æ??å?ç??æ®µ"
+
+#: ../plugins/snippets-manager/snippets-import-export.c:190
+msgid "Export Snippets"
+msgstr "å?¯å?ºæ??å?ç??æ®µ"
+
+#: ../plugins/sourceview/sourceview.c:478
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8579,7 +8769,7 @@ msgstr ""
 "å?¨ç¡¬ç¢?å?§æª?æ¡?ã?? %sã?? ç??å?§å®¹æ¯?ç?®å??ç??ç·©è¡?å??å?§å®¹é??è¦?æ?°ã??\n"
 "æ?¯å?¦è¦?é??æ?°è¼?å?¥å®?ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:432
+#: ../plugins/sourceview/sourceview.c:515
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8589,18 +8779,18 @@ msgstr ""
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:469
+#: ../plugins/sourceview/sourceview.c:552
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "ç?¡æ³?é??å?? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview.c:523
+#: ../plugins/sourceview/sourceview.c:606
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æª?æ¡?ã??%sã??æ?¯å?¯è®?ç??ï¼?ä»?ç?¶è¦?ç·¨è¼¯å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:582
+#: ../plugins/sourceview/sourceview.c:665
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "ç?¡æ³?å?²å?æª?æ¡? %sï¼?%s"
@@ -8704,7 +8894,8 @@ msgid "Use theme font"
 msgstr "ä½¿ç?¨ä¸»é¡?ç??å?å??"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
-#: ../src/anjuta-app.c:629 ../src/anjuta-app.c:634
+#: ../src/anjuta-app.c:629
+#: ../src/anjuta-app.c:634
 msgid "View"
 msgstr "é¡¯ç¤º"
 
@@ -8712,7 +8903,8 @@ msgstr "é¡¯ç¤º"
 msgid "Wrap long lines to fit on paper"
 msgstr "ä¾?é ?é?¢å°?é??é?·ç??æ??å?æ??è¡?"
 
-#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:362
+#: ../plugins/starter/plugin.c:70
+#: ../plugins/starter/starter.c:362
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "èµ·æ¥"
@@ -8782,9 +8974,8 @@ msgid "First Path:"
 msgstr "ç¬¬ä¸?è·¯å¾?ï¼?"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:20
-#, fuzzy
 msgid "Ignore ancestry"
-msgstr "å¿½ç?¥æª?æ¡?:"
+msgstr "å¿½ç?¥ä¹?å??ç??æ?¬"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:22
 msgid "Merge changes into working copy"
@@ -8912,19 +9103,22 @@ msgstr "é ?å??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:52 ../plugins/subversion/plugin.c:151
+#: ../plugins/subversion/plugin.c:52
+#: ../plugins/subversion/plugin.c:151
 msgid "_Subversion"
 msgstr "_Subversion"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:62 ../plugins/subversion/plugin.c:177
+#: ../plugins/subversion/plugin.c:62
+#: ../plugins/subversion/plugin.c:177
 msgid "Add a new file/directory to the Subversion tree"
 msgstr "å? å?¥æ?°æª?æ¡?/ç?®é??è?³ Subversion æ¨¹"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:70 ../plugins/subversion/plugin.c:185
+#: ../plugins/subversion/plugin.c:70
+#: ../plugins/subversion/plugin.c:185
 msgid "Remove a file/directory from Subversion tree"
 msgstr "å¾? Subversion æ¨¹ç§»é?¤æª?æ¡?/ç?®é?? "
 
@@ -8936,13 +9130,15 @@ msgstr "æ??äº¤æ?¨ç??ä¿®æ?¹è?³ Subversion æ¨¹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
+#: ../plugins/subversion/plugin.c:84
+#: ../plugins/subversion/plugin.c:167
 msgid "_Revertâ?¦"
 msgstr "_Revertâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:86 ../plugins/subversion/plugin.c:169
+#: ../plugins/subversion/plugin.c:86
+#: ../plugins/subversion/plugin.c:169
 msgid "Revert changes to your working copy."
 msgstr "å??å¾©è®?æ?´è?³æ?¨ç??å·¥ä½?è¤?æ?¬ã??"
 
@@ -8960,13 +9156,15 @@ msgstr "èª¿è§£æ?¨å·¥ä½?è¤?æ?¬ä¸ç??è¡?çª?ã??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
+#: ../plugins/subversion/plugin.c:100
+#: ../plugins/subversion/plugin.c:159
 msgid "_Updateâ?¦"
 msgstr "_Updateâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
+#: ../plugins/subversion/plugin.c:102
+#: ../plugins/subversion/plugin.c:161
 msgid "Syncronize your local copy with the Subversion tree"
 msgstr "å°?æ?¨æ?¬æ©?ç??è¤?æ?¬è?? Subversion æ¨¹å??æ¥"
 
@@ -8978,7 +9176,8 @@ msgstr "è¤?è£½æª?æ¡?/è³?æ??å¤¾â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:110 ../plugins/subversion/plugin.c:201
+#: ../plugins/subversion/plugin.c:110
+#: ../plugins/subversion/plugin.c:201
 msgid "Copy files/folders in the repository"
 msgstr "è¤?è£½æª?æ¡?åº«ä¸ç??æª?æ¡?/è³?æ??å¤¾"
 
@@ -9008,13 +9207,15 @@ msgstr "å??ä½µè®?æ?´è?³ä½ ç??å·¥ä½?è¤?æ?¬ä¸"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
+#: ../plugins/subversion/plugin.c:132
+#: ../plugins/subversion/plugin.c:191
 msgid "_View Logâ?¦"
 msgstr "æª¢è¦?ç´?é??æª?(_V)â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:134 ../plugins/subversion/plugin.c:193
+#: ../plugins/subversion/plugin.c:134
+#: ../plugins/subversion/plugin.c:193
 msgid "View file history"
 msgstr "æª¢è¦?æª?æ¡?æ·å?²"
 
@@ -9026,7 +9227,8 @@ msgstr "_Diffâ?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:142 ../plugins/subversion/plugin.c:209
+#: ../plugins/subversion/plugin.c:142
+#: ../plugins/subversion/plugin.c:209
 msgid "Diff local tree with repository"
 msgstr "æ¯?å°?æ?¬å?°ç«¯æª?æ¡?æ¨¹è??æª?æ¡?åº«ç??å·®ç?°"
 
@@ -9171,83 +9373,83 @@ msgstr "Subversion: å·®ç?°æ¯?å°?å®?æ??ã??"
 msgid "Subversion: Update complete."
 msgstr "Subversion: æ?´æ?°å®?æ??ã??"
 
-#: ../plugins/subversion/svn-command.c:158
-#: ../plugins/subversion/svn-command.c:225
+#: ../plugins/subversion/svn-command.c:168
+#: ../plugins/subversion/svn-command.c:231
 msgid "Authentication canceled"
 msgstr "èª?è?å??æ¶?"
 
-#: ../plugins/subversion/svn-command.c:198
+#: ../plugins/subversion/svn-command.c:204
 msgid "Hostname:"
 msgstr "ä¸»æ©?å??ç¨±:"
 
-#: ../plugins/subversion/svn-command.c:199
+#: ../plugins/subversion/svn-command.c:205
 msgid "Fingerprint:"
 msgstr "æ?¸ä½?æ??ç´?"
 
-#: ../plugins/subversion/svn-command.c:200
+#: ../plugins/subversion/svn-command.c:206
 msgid "Valid from:"
 msgstr "ç°½ç?¼æ?¥:"
 
-#: ../plugins/subversion/svn-command.c:201
+#: ../plugins/subversion/svn-command.c:207
 msgid "Valid until:"
 msgstr "å?°æ??æ?¥:"
 
-#: ../plugins/subversion/svn-command.c:202
+#: ../plugins/subversion/svn-command.c:208
 msgid "Issuer DN:"
 msgstr "ç°½ç?¼è?? DN:"
 
-#: ../plugins/subversion/svn-command.c:203
+#: ../plugins/subversion/svn-command.c:209
 msgid "DER certificate:"
 msgstr "DER æ??è?:"
 
-#: ../plugins/subversion/svn-command.c:350
-#: ../plugins/subversion/svn-command.c:366
+#: ../plugins/subversion/svn-command.c:375
+#: ../plugins/subversion/svn-command.c:391
 #, c-format
 msgid "Deleted: %s"
 msgstr "å·²å?ªé?¤ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:353
-#: ../plugins/subversion/svn-command.c:372
+#: ../plugins/subversion/svn-command.c:378
+#: ../plugins/subversion/svn-command.c:397
 #, c-format
 msgid "Added: %s"
 msgstr "å·²æ?°å¢?ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:363
+#: ../plugins/subversion/svn-command.c:388
 #, c-format
 msgid "Resolved: %s"
 msgstr "å·²è??ç??ï¼?%s"
 
-#: ../plugins/subversion/svn-command.c:369
+#: ../plugins/subversion/svn-command.c:394
 #, c-format
 msgid "Updated: %s"
 msgstr "å·²æ?´æ?°ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:375
+#: ../plugins/subversion/svn-command.c:400
 #, c-format
 msgid "Externally Updated: %s"
 msgstr "å¤?é?¨æ?´æ?°ï¼?%s"
 
-#: ../plugins/subversion/svn-command.c:409
+#: ../plugins/subversion/svn-command.c:434
 #, c-format
 msgid "Modified: %s"
 msgstr "å·²ä¿®æ?¹ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:412
+#: ../plugins/subversion/svn-command.c:437
 #, c-format
 msgid "Merged: %s"
 msgstr "å·²å??ä½µï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:415
+#: ../plugins/subversion/svn-command.c:440
 #, c-format
 msgid "Conflicted: %s"
 msgstr "å·²è¡?çª?ï¼?%s"
 
-#: ../plugins/subversion/svn-command.c:419
+#: ../plugins/subversion/svn-command.c:444
 #, c-format
 msgid "Missing: %s"
 msgstr "é?ºå¤±ï¼? %s"
 
-#: ../plugins/subversion/svn-command.c:422
+#: ../plugins/subversion/svn-command.c:447
 #, c-format
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
@@ -9297,20 +9499,20 @@ msgstr "æ£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 msgid "%d files scanned out of %d"
 msgstr "%2$d å??æª?æ¡?ä¸å·²æ??æ?? %1$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1723
-#, fuzzy
+#: ../plugins/symbol-db/plugin.c:1726
 msgid "Populating symbol databaseâ?¦"
-msgstr "Symbol d-by-dt"
+msgstr "æ£å?¨é?·ç§»ç¬¦è??è³?æ??åº«â?¦"
 
-#: ../plugins/symbol-db/plugin.c:2042 ../plugins/symbol-db/plugin.c:2127
+#: ../plugins/symbol-db/plugin.c:2045
+#: ../plugins/symbol-db/plugin.c:2130
 msgid "Symbols"
 msgstr "ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:2136
+#: ../plugins/symbol-db/plugin.c:2139
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2144
+#: ../plugins/symbol-db/plugin.c:2147
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
@@ -9328,7 +9530,7 @@ msgstr "ç¬¦è??è³?æ??åº«"
 msgid "API Tags"
 msgstr "API æ¨?ç±¤"
 
-#: ../plugins/symbol-db/symbol-db-system.c:807
+#: ../plugins/symbol-db/symbol-db-system.c:817
 msgid "Resuming glb scan."
 msgstr "ç¹¼çº? glb æ??æ??ã??"
 
@@ -9341,9 +9543,7 @@ msgid "Automatically update symbols without saving file"
 msgstr "ä¸?å?²å?æª?æ¡?è??è?ªå??æ?´æ?°ç¬¦è??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid ""
-"Automatically update the file's symbols without saving. The update occurs "
-"after 10 seconds without keypresses by the user."
+msgid "Automatically update the file's symbols without saving. The update occurs after 10 seconds without keypresses by the user."
 msgstr "ä¸?é??å?²å?å°±è?ªå??æ?´æ?°æª?æ¡?ç??ç¬¦è??ã??æ¤æ?´æ?°æ??å?¨ä½¿ç?¨è??å??æ¢è¼¸å?¥ç?? 10 ç§?å¾?é?²è¡?ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
@@ -9359,17 +9559,11 @@ msgid "Parallel scan of project and global symbols"
 msgstr "å°?æ¡?å??å?¨å??ç¬¦è??ç??å¹³è¡?æ??æ??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-msgid ""
-"This option enables the default packages required by your opened project, e."
-"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
-msgstr ""
-"é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?è¨å¥?ä»¶ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? "
-"GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
+msgid "This option enables the default packages required by your opened project, e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
+msgstr "é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?è¨å¥?ä»¶ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
-msgid ""
-"This option means that the global system packages will be scanned "
-"simultaneously with the project's ones"
+msgid "This option means that the global system packages will be scanned simultaneously with the project's ones"
 msgstr "é??å??é?¸é ?ç¤ºå?¨å??ç³»çµ±å¥?ä»¶æ??è??å°?å®?ä¸?æ¨£è¢«æ??æ??"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
@@ -9400,7 +9594,8 @@ msgstr "Ctrl-Z"
 msgid "terminal operations"
 msgstr "çµ?ç«¯æ©?æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:806 ../plugins/terminal/terminal.c:982
+#: ../plugins/terminal/terminal.c:806
+#: ../plugins/terminal/terminal.c:982
 #: ../plugins/terminal/terminal.c:1035
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
@@ -9454,8 +9649,10 @@ msgstr "æ¨?æº?è¼¸å?ºï¼?"
 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
+#: ../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 "å·¥å?·"
 
@@ -9509,9 +9706,7 @@ msgid "A tool with the same name already exists!"
 msgstr "ç?¸å??å??ç¨±ç??å·¥å?·å·²ç¶?å?å?¨ï¼?"
 
 #: ../plugins/tools/editor.c:824
-msgid ""
-"The shortcut is already used by another component in Anjuta. Do you want to "
-"keep it anyway?"
+msgid "The shortcut is already used by another component in Anjuta. Do you want to keep it anyway?"
 msgstr "è©²æ?·å¾?é?µå·²ç¶?è¢« Anjuta ä¸å?¶ä»?ç??å??ä»¶ä½¿ç?¨äº?ã??æ?¯å?¦è¦?å¼·å?¶ä¿?ç??å®?ï¼?"
 
 #: ../plugins/tools/editor.c:908
@@ -10016,10 +10211,12 @@ msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??ä¸?ä½¿ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?é¡¯ç¤ºè¦å??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?¨å?½å¼?å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ '('"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:2
 msgid "Add a space after function call autocompletion"
 msgstr "å?¨å?½å¼?å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ç©ºç?½"
 
@@ -10028,18 +10225,23 @@ msgid "Auto-complete"
 msgstr "è?ªå??è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
-msgid "Autocompletion (C/C++/Java only)"
-msgstr "è?ªå??è£?é½?(å?ªæ?? C/C++/Java)"
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:4
+#| msgid "Auto-complete"
+msgid "Autocompletion"
+msgstr "è?ªå??è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:5
 msgid "Brace indentation size in spaces:"
 msgstr "å¤§æ?¬å¼§ç¸®æ??(ç©ºç?½æ?¸)ï¼?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:6
 msgid "Calltips"
 msgstr "å?¼å?«æ??ç¤º"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:8
 msgid "Enable code completion"
 msgstr "å??ç?¨ç¨?å¼?ç¢¼è£?é½?"
 
@@ -10048,6 +10250,7 @@ msgid "Enable smart brace completion"
 msgstr "å??ç?¨æ?ºæ?§å??æ?¬å¼§è£?é½?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:9
 msgid "Enable smart indentation"
 msgstr "å??ç?¨æ?ºæ?§å??ç¸®æ??"
 
@@ -10056,37 +10259,42 @@ msgid "Indent:"
 msgstr "ç¸®æ??ï¼?"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:11
 msgid "Indentation parameters"
 msgstr "ç¸®æ??å??æ?¸"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
-#, fuzzy
 msgid "Line up parentheses"
-msgstr "æ??æ?°ç??"
+msgstr "å°?é½?æ?¬è??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
-#, fuzzy
 msgid "Parenthesis indentation"
-msgstr "ç¸®æ??æ??å¼?(_I)"
+msgstr "æ?¬è??ç¸®æ??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "é¡¯ç¤ºå?¼å?«æ??ç¤º"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:15
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??ç¸®æ??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??ç¸®æ??å¤§å°?(ç©ºç?½å?å??)ï¼?"
 
+#. ANJUTA_STOCK_AUTOINDENT,
 #: ../plugins/language-support-cpp-java/plugin.c:1882
+#: ../plugins/language-support-python/plugin.c:1182
 msgid "Auto-Indent"
 msgstr "è?ªå??ç¸®æ??"
 
 #: ../plugins/language-support-cpp-java/plugin.c:1883
+#: ../plugins/language-support-python/plugin.c:1183
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "ä¾?ç¸®æ??è¨å®?å?¼è?ªå??ç¸®æ??ç?®å??ç??è¡?æ??é?¸æ??å??å??"
 
@@ -10107,11 +10315,68 @@ msgstr "C++/Java æ?´å?©"
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
-#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1231
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1258
 msgid "C/C++"
 msgstr "C/C++"
 
-#: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
+#: ../plugins/language-support-python/plugin.c:907
+msgid "Python support warning"
+msgstr "Python æ?¯æ?´è¦å??"
+
+#: ../plugins/language-support-python/plugin.c:915
+msgid ""
+"Either python path is wrong or python-rope (http://rope.sf.net) libraries\n"
+"aren't installed. Both are required for autocompletion in python files.\n"
+"Please install them and check the python path in the preferences."
+msgstr ""
+"å?¯è?½ python è·¯å¾?é?¯èª¤æ?? python-rope (http://rope.sf.net) ç¨?å¼?åº«\n"
+"å°?æ?ªå®?è£?ã??é??å?©è??é?½æ?¯ python æª?æ¡?è?ªå??è£?é½?æ??é??ã??\n"
+"è«?å®?è£?å®?å??ä¸¦ä¸?å?¨å??å¥½è¨å®?ä¸æª¢æ?¥ python è·¯å¾?ã??"
+
+#: ../plugins/language-support-python/plugin.c:918
+#| msgid "Do not show again"
+msgid "Do not show that warning again"
+msgstr "ä¸?å??é¡¯ç¤ºé??å??è¦å??"
+
+#: ../plugins/language-support-python/plugin.c:1264
+#| msgid "Project Assistant"
+msgid "Python Assistance"
+msgstr "Python å?©ç??"
+
+#: ../plugins/language-support-python/plugin.c:1364
+#: ../plugins/language-support-python/plugin.c:1373
+#: ../plugins/language-support-python/python-assist.c:937
+#| msgid "Python Module"
+msgid "Python"
+msgstr "Python"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:3
+#| msgid "Auto-complete"
+msgid "Autocomplete"
+msgstr "è?ªå??å®?æ??"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:7
+#| msgid "Enable smart indentation"
+msgid "Enable adaptive indentation"
+msgstr "å??ç?¨é?©æ??å??ç¸®æ??"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:10
+#| msgid "Environment Variables:"
+msgid "Environment"
+msgstr "ç?°å¢?"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:12
+#| msgid "Interface"
+msgid "Interpreter"
+msgstr "è½?è¯å?¨"
+
+#: ../plugins/language-support-python/python-plugin-properties.ui.h:13
+#| msgid "Path:"
+msgid "Path: "
+msgstr "è·¯å¾?ï¼?"
+
+#: ../plugins/sourceview/plugin.c:232
+#: ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView ç·¨è¼¯å?¨"
 
@@ -10183,14 +10448,6 @@ msgstr "å·¥ä½?ç®¡ç??å?¡"
 msgid "Todo Plugin for Anjuta."
 msgstr "çµ¦ Anjuta ç??å¾?è¾¦äº?é ?å¤?æ??ç¨?å¼?ã??"
 
-#: ../plugins/macro/anjuta-macro.plugin.in.h:1
-msgid "Insert predefined macros into Editor"
-msgstr "æ??å?¥é ?å??å®?ç¾©å¥½ç??å·¨é??è?³ç·¨è¼¯å?¨"
-
-#: ../plugins/macro/anjuta-macro.plugin.in.h:2
-msgid "Macro Plugin"
-msgstr "å·¨é??å¤?æ??ç¨?å¼?"
-
 #: ../plugins/patch/anjuta-patch.plugin.in.h:1
 msgid "Patch Plugin"
 msgstr "ä¿®è£?å¤?æ??ç¨?å¼?"
@@ -10287,6 +10544,10 @@ msgstr "Anjuta ç??å°?æ¡?ç®¡ç??å?¡å¤?æ??ç¨?å¼?"
 msgid "Symbol Database Plugin for Anjuta."
 msgstr "Anjuta ç??ç¬¦è??è³?æ??åº«å¤?æ??ç¨?å¼?"
 
+#: ../plugins/snippets-manager/anjuta-snippets-manager.plugin.in.h:1
+msgid "Allows insertion of snippets into the editor."
+msgstr "å??è¨±æ??å?ç??æ®µæ??å?¥ç·¨è¼¯å?¨ã??"
+
 #: ../plugins/message-view/anjuta-message-manager.plugin.in.h:1
 msgid "Manages messages from external apps"
 msgstr "ç®¡ç??å¾?å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?ç??è¨?æ?¯"
@@ -10371,25 +10632,26 @@ msgid "JavaScript Support Plugin"
 msgstr "JavaScript æ?¯æ?´å¤?æ??ç¨?å¼?"
 
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
-msgid "<b>JS Find dirs</b>"
-msgstr "<b>JS Find ç?®é??</b>"
-
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
 msgid "Add brace after function call autocompletion"
 msgstr "å?¨å?½å¼?å?¼å?«è?ªå??è£?é½?å¾?å? å?¥æ?¬è??"
 
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
 msgid "Gir repository's directory:   "
 msgstr "Gir æª?æ¡?åº«ç?®é??ï¼?"
 
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
 msgid "Gjs repository's directory:   "
 msgstr "Gjs æª?æ¡?åº«ç?®é??ï¼?"
 
-#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
 msgid "Highlight missed semicolon"
 msgstr "æ¨?ç¤ºæ¼?æ??ç??å??è??"
 
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+#| msgid "<b>JS Find dirs</b>"
+msgid "JS Find dirs"
+msgstr "JS Find ç?®é??"
+
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
 msgid "Min character for completion "
 msgstr "è?ªå??è£?é½?ç??æ??å°?å?å??"
@@ -10398,6 +10660,115 @@ msgstr "è?ªå??è£?é½?ç??æ??å°?å?å??"
 msgid "Symbol"
 msgstr "ç¬¦è??"
 
+#~ msgid ""
+#~ "<b>There is %d item with unsaved changes. Save changes before closing?</b>"
+
+#~ msgid_plural ""
+#~ "<b>There are %d items with unsaved changes. Save changes before closing?</"
+#~ "b>"
+#~ msgstr[0] "<b>é??è£¡æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å?ç??è®?æ?´ã??æ?¯å?¦å?¨é??é??å??å?²å?è®?æ?´ï¼?</b>"
+
+#~ msgid ""
+#~ "The following pretty printers, without a register functions, have been "
+#~ "disabled:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "ä¸?å??å?°è¡¨æ©?å? ç?ºæ²?æ??è¨»å??è¡¨å?½å¼?ï¼?å·²ç¶?è¢«å??ç?¨äº?ï¼?\n"
+#~ " %s"
+
+#~ msgid "Editâ?¦"
+#~ msgstr "ç·¨è¼¯â?¦"
+
+#~ msgid "Macro details:"
+#~ msgstr "å·¨é??è©³ç´°è³?æ??ï¼?"
+
+#~ msgid "Macro text:"
+#~ msgstr "å·¨é??æ??å?ï¼?"
+
+#~ msgid "Macros:"
+#~ msgstr "å·¨é??ï¼?"
+
+#~ msgid "Shortcut:"
+#~ msgstr "å¿«æ?·é?µï¼?"
+
+#~ msgid "Press macro shortcutâ?¦"
+#~ msgstr "è«?æ??å·¨é??å¿«æ?·é?µâ?¦"
+
+#~ msgid "Press shortcut"
+#~ msgstr "æ??ä¸?å¿«æ?·é?µ"
+
+#~ msgid "My macros"
+#~ msgstr "æ??ç??å·¨é??"
+
+#~ msgid ""
+#~ "Name:\t %s\n"
+#~ "Category:\t %s\n"
+#~ "Shortcut:\t %c\n"
+#~ msgstr ""
+#~ "å??ç¨±ï¼?\t %s\n"
+#~ "å??é¡?ï¼?\t %s\n"
+#~ "æ?·å¾?ï¼?\t %c\n"
+
+#~ msgid "Insert macro"
+#~ msgstr "æ??å?¥å·¨é??"
+
+#~ msgid "Add/Edit macro"
+#~ msgstr "å? å?¥/ç·¨è¼¯å·¨é??"
+
+#~ msgid "%Y-%m-%d"
+#~ msgstr "%Y-%m-%d"
+
+#~ msgid "%Y"
+#~ msgstr "%Y"
+
+#~ msgid "Macros"
+#~ msgstr "å·¨é??"
+
+#~ msgid "_Insert Macroâ?¦"
+#~ msgstr "æ??å?¥å·¨é??(_I)â?¦"
+
+#~ msgid "Insert a macro using a shortcut"
+#~ msgstr "ä½¿ç?¨å¿«æ?·é?µæ??å?¥å·¨é??"
+
+#~ msgid "_Add Macroâ?¦"
+#~ msgstr "å? å?¥å·¨é??(_A)â?¦"
+
+#~ msgid "Add a macro"
+#~ msgstr "å? å?¥å·¨é??"
+
+#~ msgid "Macrosâ?¦"
+#~ msgstr "å·¨é??â?¦"
+
+#~ msgid "Add/Edit/Remove macros"
+#~ msgstr "å? å?¥/ç·¨è¼¯/ç§»é?¤å·¨é??"
+
+#~ msgid "Macro operations"
+#~ msgstr "å·¨é??æ??ä½?"
+
+#~ msgid "A GNOME applet project"
+#~ msgstr "GNOME é?¢æ?¿ç¨?å¼?å°?æ¡?"
+
+#~ msgid "Applet Title:"
+#~ msgstr "é?¢æ?¿ç¨?å¼?æ¨?é¡?ï¼?"
+
+#~ msgid "Display description of the applet"
+#~ msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ??è¿°"
+
+#~ msgid "Display title of the applet"
+#~ msgstr "é¡¯ç¤ºé?¢æ?¿ç¨?å¼?ç??æ¨?é¡?"
+
+#~ msgid "GNOME Applet"
+#~ msgstr "GNOME é?¢æ?¿ç¨?å¼?"
+
+#~ msgid "Autocompletion (C/C++/Java only)"
+#~ msgstr "è?ªå??è£?é½?(å?ªæ?? C/C++/Java)"
+
+#~ msgid "Insert predefined macros into Editor"
+#~ msgstr "æ??å?¥é ?å??å®?ç¾©å¥½ç??å·¨é??è?³ç·¨è¼¯å?¨"
+
+#~ msgid "Macro Plugin"
+#~ msgstr "å·¨é??å¤?æ??ç¨?å¼?"
+
 #~ msgid "Online"
 #~ msgstr "ä¸?ç·?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]