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



commit a924d3fe90feeea76c2cdc8129a8038ef03ae7a5
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Jan 29 18:44:21 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 5411 ++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 5491 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 5661 insertions(+), 5241 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4bfcfb9..7e5c800 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,12 +8,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta 2.31.5\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-11-21 11:57+0000\n"
-"PO-Revision-Date: 2010-12-04 19:32+0800\n"
+"Project-Id-Version: anjuta 2.91.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-29 18:42+0800\n"
+"PO-Revision-Date: 2011-01-29 18:43+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,8 +28,7 @@ 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 "æ?´å??å¼?é??ç?¼ç?°å¢?"
 
@@ -62,35 +62,30 @@ 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 "è?¬å??碼"
 
-#: ../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 "中��系"
@@ -99,29 +94,23 @@ 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 "å¸?è??èª?"
 
@@ -129,14 +118,12 @@ 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 "å??è?³å?¶èª?"
@@ -157,8 +144,7 @@ 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 "ç¹?é«?中æ??"
@@ -167,25 +153,19 @@ 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 "ç°¡é«?中æ??"
 
@@ -197,8 +177,7 @@ 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 "è¶?å??èª?"
@@ -211,25 +190,22 @@ msgstr "泰�"
 #. * ISO8859-1
 #. Translator: Unknown here is a target type, if not unknown it can
 #. * be a program or a shared library by example
-#: ../libanjuta/anjuta-encodings.c:443
-#: ../plugins/am-project/am-project.c:107
+#: ../libanjuta/anjuta-encodings.c:443 ../plugins/am-project/am-project.c:105
+#: ../plugins/mk-project/mk-project.c:152
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1170
-#: ../libanjuta/resources.c:267
-#: ../libanjuta/resources.c:276
-#: ../plugins/gdb/utilities.c:282
+#: ../libanjuta/anjuta-launcher.c:1172 ../libanjuta/resources.c:267
+#: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1171
+#: ../libanjuta/anjuta-launcher.c:1173
 msgid "execvp failed"
 msgstr "execvp 已失æ??"
 
-#: ../libanjuta/anjuta-plugin.c:326
-#: ../libanjuta/anjuta-plugin-manager.c:2364
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2365
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -246,7 +222,8 @@ 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"
@@ -254,17 +231,15 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:464
 msgid "Load"
 msgstr "è¼?å?¥"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1987
+#: ../libanjuta/anjuta-plugin-manager.c:1988
 msgid "Available Plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036
-#: ../src/anjuta-app.c:933
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:940
 msgid "Preferred plugins"
 msgstr "å??好ç??å¤?æ??ç¨?å¼?"
 
@@ -273,7 +248,10 @@ 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
@@ -281,15 +259,13 @@ 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 "é?¸æ??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#| msgid "Please select a plugin to activate"
 msgid "<b>Please select a plugin to activate</b>"
 msgstr "<b>è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?</b>"
 
@@ -298,49 +274,49 @@ msgstr "<b>è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?</b>"
 msgid "No plugin is able to load other plugins in %s"
 msgstr "å?¨ %s 中æ²?æ??å¤?æ??ç¨?å¼?å?¯ä»¥è¼?å?¥å?¶ä»?ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2014
+#: ../libanjuta/anjuta-plugin-manager.c:2015
 msgid "Remember this selection"
 msgstr "è¨?å¾?æ­¤é?¸æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2345
+#: ../libanjuta/anjuta-plugin-manager.c:2346
 msgid "Profiles"
 msgstr "設å®?çµ?å??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2346
+#: ../libanjuta/anjuta-plugin-manager.c:2347
 msgid "Current stack of profiles"
 msgstr "設å®?çµ?å??ç??ç?®å??å ?ç??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2351
+#: ../libanjuta/anjuta-plugin-manager.c:2352
 msgid "Available plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2352
+#: ../libanjuta/anjuta-plugin-manager.c:2353
 msgid "Currently available plugins found in plugin paths"
 msgstr "ç?®å??å?¨å¤?æ??ç¨?å¼?è·¯å¾?中æ?¾å?°å?¯ä½¿ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2358
+#: ../libanjuta/anjuta-plugin-manager.c:2359
 msgid "Activated plugins"
 msgstr "已使ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2359
+#: ../libanjuta/anjuta-plugin-manager.c:2360
 msgid "Currently activated plugins"
 msgstr "ç?®å??使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2365
+#: ../libanjuta/anjuta-plugin-manager.c:2366
 msgid "Anjuta shell for which the plugins are made"
 msgstr "製ä½?å¤?æ??ç¨?å¼?ç?? Anjuta shell"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2373
+#: ../libanjuta/anjuta-plugin-manager.c:2374
 msgid "Anjuta Status"
 msgstr "Anjuta ç??æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2374
+#: ../libanjuta/anjuta-plugin-manager.c:2375
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "Anjuta ç??æ??ï¼?ç?¨æ?¼å¤?æ??ç¨?å¼?ç??è¼?å?¥è??å?¸è¼?"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-plugin-manager.c:2534
+#: ../libanjuta/anjuta-plugin-manager.c:2535
 msgid "Loaded:"
 msgstr "已���"
 
@@ -382,7 +358,9 @@ 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>
@@ -400,21 +378,20 @@ msgstr ""
 "è®?å??ã??%sã??失æ??ï¼?ä¸?å??å¿?è¦?ç??å¤?æ??ç¨?å¼?é?ºå¤±ï¼?\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:202
-#: ../plugins/gtodo/mcategory.c:36
+#: ../libanjuta/anjuta-preferences-dialog.c:96
 msgid "Category"
 msgstr "å??é¡?"
 
 #. FIXME: Make the general page first
-#: ../libanjuta/anjuta-preferences-dialog.c:138
-#: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../src/anjuta-app.c:920
+#: ../libanjuta/anjuta-preferences-dialog.c:139
+#: ../libanjuta/anjuta-preferences-dialog.c:142
+#: ../plugins/code-analyzer/code-analyzer.ui.h:3
+#: ../plugins/mk-project/mk-project.ui.h:4 ../src/anjuta-app.c:927
 #: ../src/preferences.ui.h:8
 msgid "General"
 msgstr "��"
 
-#: ../libanjuta/anjuta-preferences-dialog.c:236
+#: ../libanjuta/anjuta-preferences-dialog.c:237
 msgid "Anjuta Preferences"
 msgstr "Anjuta å??好設å®?"
 
@@ -443,7 +420,8 @@ msgstr "æ??æ£?æ?´æ?¹(_D)"
 #: ../libanjuta/anjuta-save-prompt.c:296
 #, c-format
 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?"
+msgid_plural ""
+"There are %d items with unsaved changes. Save changes before closing?"
 msgstr[0] "é??è£?æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å­?ç??æ?´æ?¹ã??æ?¯å?¦å?¨é??é??å??å?²å­?æ?´æ?¹ï¼?"
 
 #: ../libanjuta/anjuta-save-prompt.c:305
@@ -472,7 +450,10 @@ msgid "System:"
 msgstr "系統�"
 
 #: ../libanjuta/anjuta-utils.c:503
-msgid "You do not seem to have PackageKit installed. PackageKit is required for installing missing packages. Please install \"packagekit-gnome\" package from your distribution, or install the missing packages manually."
+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:512
@@ -503,84 +484,125 @@ msgstr ""
 msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ?¾ä¸?å?°çµ?端æ©?ï¼?使ç?¨ xtermï¼?ä¸?管å®?è?½ä¸?è?½é??ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1207
-#: ../libanjuta/anjuta-utils.c:1211
-#: ../libanjuta/anjuta-utils.c:1239
-#: ../libanjuta/anjuta-utils.c:1243
+#: ../libanjuta/anjuta-utils.c:1207 ../libanjuta/anjuta-utils.c:1211
+#: ../libanjuta/anjuta-utils.c:1239 ../libanjuta/anjuta-utils.c:1243
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?%sï¼?使ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1893
-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:1892
+msgid ""
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr "ç?¡æ³?顯示æ±?å?©æ??件ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??ä½ å?¯ä»¥å¾? http://anjuta.org ä¸?è¼?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:2332
+#: ../libanjuta/anjuta-utils.c:2330
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:75 ../plugins/git/git-status-pane.c:164
 msgid "Modified"
 msgstr "已修�"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:79 ../plugins/git/git-status-pane.c:167
 msgid "Added"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:77 ../plugins/git/git-status-pane.c:170
 msgid "Deleted"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:81 ../plugins/git/git-status-pane.c:173
 msgid "Conflicted"
 msgstr "æ??è¡?çª?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-#: ../plugins/file-manager/file-view.c:83
+#: ../plugins/file-manager/file-view.c:83 ../plugins/git/git-status-pane.c:177
 msgid "Up-to-date"
 msgstr "æ??æ?°ç??"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:85
+#: ../plugins/file-manager/file-view.c:85 ../plugins/git/git-status-pane.c:181
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:87
+#: ../plugins/file-manager/file-view.c:87 ../plugins/git/git-status-pane.c:184
 msgid "Missing"
 msgstr "�失"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:89
+#: ../plugins/file-manager/file-view.c:89 ../plugins/git/git-status-pane.c:187
 msgid "Unversioned"
 msgstr "æ?ªè¨?ç??æ?¬"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:91
+#: ../plugins/file-manager/file-view.c:91 ../plugins/git/git-status-pane.c:191
 msgid "Ignored"
 msgstr "已忽�"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:215
-#: ../libfoocanvas/foo-canvas-text.c:177
-#: ../src/preferences.ui.h:13
+#: ../libanjuta/anjuta-column-text-view.c:40 ../plugins/git/git-pane.c:123
+#, c-format
+msgid "Column %i"
+msgstr "� %i"
+
+#. Column label
+#: ../libanjuta/anjuta-column-text-view.c:69 ../plugins/git/anjuta-git.ui.h:38
+msgid "Column 1"
+msgstr "� 1"
+
+#: ../libanjuta/anjuta-entry.c:241
+msgid "Help text"
+msgstr "æ±?å?©æ??å­?"
+
+#: ../libanjuta/anjuta-entry.c:242
+msgid "Text to show the user what to enter into the entry"
+msgstr "顯示給使ç?¨è??é??å??é ?ç?®è©²è¼¸å?¥ä»?麼ç??æ??å­?"
+
+#: ../libanjuta/anjuta-file-drop-entry.c:206
+msgid "Path that droppedfiles should be relative to"
+msgstr "æ??æ?¾ç??æª?æ¡?ç?¸å°?æ??ç??è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:101
+msgid "Drop a file or enter a path here"
+msgstr "å?¨é??è£?æ??æ?¾æª?æ¡?æ??輸å?¥è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:274
+msgid "Select Files"
+msgstr "é?¸æ??æª?æ¡?"
+
+#: ../libanjuta/anjuta-file-list.c:540
+msgid "Path that all files in the list should be relative to"
+msgstr "æ¸?å?®ä¸­æ??æ??ç??æª?æ¡?ç?¸å°?æ??ç??è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:547
+msgid "Show Add button"
+msgstr "顯示å? å?¥æ??é??"
+
+#: ../libanjuta/anjuta-file-list.c:548
+msgid "Display an Add button"
+msgstr "顯示å? å?¥æ??é??"
+
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:239
+#: ../libfoocanvas/foo-canvas-text.c:177 ../src/preferences.ui.h:13
 msgid "Text"
 msgstr "æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:216
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:240
 #: ../libfoocanvas/foo-canvas-text.c:178
 msgid "Text to render"
 msgstr "æº?å??æ??繪ç??æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:222
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:246
 msgid "Pixbuf Object"
 msgstr "Pixbuf �件"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:223
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:247
 msgid "The pixbuf to render."
 msgstr "æº?å??æ??繪ç?? pixbufã??"
 
@@ -589,19 +611,16 @@ 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,28 +657,23 @@ 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 "å­?å??大å°?"
 
@@ -676,7 +690,8 @@ 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
@@ -703,8 +718,7 @@ 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 "é¡?è?²"
@@ -817,6 +831,45 @@ msgstr "縮�設�"
 msgid "Whether this tag affects font scaling"
 msgstr "æ­¤æ¨?籤æ?¯å?¦å½±é?¿å­?å??ç??縮æ?¾"
 
+#: ../plugins/am-project/amp-group.c:528
+msgid "Please specify group name"
+msgstr "è«?æ??å®?ç¾£çµ?å??稱"
+
+#: ../plugins/am-project/amp-group.c:542
+msgid ""
+"Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
+msgstr "ç¾£çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?æ?? \"#$:%+,- = ^_`~\" å­?符"
+
+#: ../plugins/am-project/amp-group.c:571
+#: ../plugins/dir-project/dir-project.c:656
+#: ../plugins/dir-project/dir-project.c:769
+#: ../plugins/am-project/am-project.c:1569
+#: ../plugins/am-project/am-project.c:1599
+#: ../plugins/am-project/am-project.c:1651
+#: ../plugins/mk-project/mk-project.c:1109
+#: ../plugins/mk-project/mk-project.c:1182
+#: ../plugins/mk-project/mk-project.c:1259
+#, c-format
+msgid "Project doesn't exist or invalid path"
+msgstr "å°?æ¡?ä¸?å­?å?¨æ??ç?¡æ??ç??è·¯å¾?"
+
+#: ../plugins/am-project/amp-target.c:246
+msgid "Please specify target name"
+msgstr "è«?æ??å®?ç?®æ¨?å??稱"
+
+#: ../plugins/am-project/amp-target.c:260
+msgid ""
+"Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
+msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-'ã??'/' æ?? '.' å­?符"
+
+#: ../plugins/am-project/amp-target.c:275
+msgid "Shared library target name must be of the form 'libxxx.la'"
+msgstr "å?±äº«ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.laã??"
+
+#: ../plugins/am-project/amp-target.c:284
+msgid "Static library target name must be of the form 'libxxx.a'"
+msgstr "é??æ??ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.aã??"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
 #: ../plugins/run-program/anjuta-run-program.ui.h:1
 msgid "Arguments:"
@@ -847,8 +900,8 @@ msgid "Continue on errors"
 msgstr "å?³ä½¿æ??é?¯èª¤ä»?ç¹¼çº?"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
-msgid "Highlight message locations in editor"
-msgstr "�編輯�中�示���置"
+msgid "Highlight build warnings and errors in editor"
+msgstr "å?¨ç·¨è¼¯å?¨ä¸­æ¨?示çµ?建警å??è??é?¯èª¤"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
 msgid "Install"
@@ -896,9 +949,8 @@ msgid "sudo"
 msgstr "sudo"
 
 #: ../plugins/build-basic-autotools/configuration-list.c:68
-#: ../plugins/class-gen/window.c:525
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-#: ../src/preferences.ui.h:2
+#: ../plugins/class-gen/window.c:720
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "�設"
 
@@ -920,7 +972,7 @@ msgid "No executables in this project!"
 msgstr "å°?æ¡?中æ²?æ??å?¯å?·è¡?æª?ã??"
 
 #: ../plugins/build-basic-autotools/executer.c:157
-#: ../plugins/am-project/am-project.c:128
+#: ../plugins/am-project/am-project.c:126
 msgid "Program"
 msgstr "��"
 
@@ -961,11 +1013,11 @@ msgstr "å?¯å?·è¡?æª? '%s' 並ä¸?æ?¯æ??æ?°ç??ã??"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:169
+#: ../plugins/build-basic-autotools/plugin.c:171
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:170
+#: ../plugins/build-basic-autotools/plugin.c:172
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 
@@ -974,20 +1026,20 @@ msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:178
+#: ../plugins/build-basic-autotools/plugin.c:180
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:179
+#: ../plugins/build-basic-autotools/plugin.c:181
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:858
+#: ../plugins/build-basic-autotools/plugin.c:871
 #, c-format
 msgid "Entering: %s"
 msgstr "正���� %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:894
+#: ../plugins/build-basic-autotools/plugin.c:907
 #, c-format
 msgid "Leaving: %s"
 msgstr "æ­£å?¨é?¢é??ï¼? %s"
@@ -997,13 +1049,12 @@ msgstr "æ­£å?¨é?¢é??ï¼? %s"
 #. * version of 'gcc' if necessary. If you update one string,
 #. * move the first one to translate the -old string and then
 #. * replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:932
+#: ../plugins/build-basic-autotools/plugin.c:945
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "è­¦å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:933
-#| msgid "warning:"
+#: ../plugins/build-basic-autotools/plugin.c:946
 msgid "warning:-old"
 msgstr "è­¦å??:-old"
 
@@ -1012,341 +1063,374 @@ msgstr "è­¦å??:-old"
 #. * version of 'gcc' if necessary. If you update one string,
 #. * move the first one to translate the -old string and then
 #. * replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:944
+#: ../plugins/build-basic-autotools/plugin.c:957
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "�誤�"
 
-#: ../plugins/build-basic-autotools/plugin.c:945
-#| msgid "error:"
+#: ../plugins/build-basic-autotools/plugin.c:958
 msgid "error:-old"
 msgstr "�誤:-old"
 
-#: ../plugins/build-basic-autotools/plugin.c:1062
+#: ../plugins/build-basic-autotools/plugin.c:1075
 #, c-format
 msgid "Command exited with status %d"
 msgstr "æ??令以 %d ç??æ??é?¢é??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1072
-#: ../plugins/build-basic-autotools/plugin.c:1551
+#: ../plugins/build-basic-autotools/plugin.c:1085
+#: ../plugins/build-basic-autotools/plugin.c:1562
 #, c-format
 msgid "Command canceled by user"
 msgstr "æ??令被使ç?¨è??å??æ¶?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1077
+#: ../plugins/build-basic-autotools/plugin.c:1090
 #, c-format
 msgid "Command aborted by user"
 msgstr "æ??令被使ç?¨è??中止"
 
-#: ../plugins/build-basic-autotools/plugin.c:1082
+#: ../plugins/build-basic-autotools/plugin.c:1095
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "æ??令以信è?? %d çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1090
+#: ../plugins/build-basic-autotools/plugin.c:1103
 msgid "Command terminated for an unknown reason"
 msgstr "æ??令以ä¸?æ??ç??ç??ç?±çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1108
+#: ../plugins/build-basic-autotools/plugin.c:1121
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "總å?±è²»æ??ï¼?%lu ç§?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1115
+#: ../plugins/build-basic-autotools/plugin.c:1128
 msgid "Completed unsuccessfully\n"
 msgstr "æ?ªè?½æ??å??å®?æ??\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1123
+#: ../plugins/build-basic-autotools/plugin.c:1136
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "å·²æ??å??å®?æ??\n"
 
 #. Translators: the first number is the number of the build attemp,
 #. the string is the directory where the build takes place
-#: ../plugins/build-basic-autotools/plugin.c:1211
+#: ../plugins/build-basic-autotools/plugin.c:1218
 #, c-format
 msgid "Build %d: %s"
 msgstr "建置 %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1546
-msgid "Before using this new configuration, the default one needs to be removed. Do you want to do that ?"
+#: ../plugins/build-basic-autotools/plugin.c:1557
+msgid ""
+"Before using this new configuration, the default one needs to be removed. Do "
+"you want to do that ?"
 msgstr "å?¨ä½¿ç?¨é??å??æ?°çµ?æ??ä¹?å??ï¼?é??è¦?å??移é?¤é ?設ç??çµ?æ??ã??æ?¯å?¦è¦?é??麼å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1843
+#: ../plugins/build-basic-autotools/plugin.c:1854
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ç?¡æ³?編譯ã??%sã??ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1978
+#: ../plugins/build-basic-autotools/plugin.c:1989
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½è¨­å®?å°?æ¡?ï¼?%s 中é?ºå¤±è¨­å®?å?½ä»¤ç¨¿ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
-#: ../plugins/build-basic-autotools/plugin.c:2533
-#: ../plugins/build-basic-autotools/plugin.c:2543
-#: ../plugins/build-basic-autotools/plugin.c:2561
-#: ../plugins/build-basic-autotools/plugin.c:2571
-#: ../plugins/build-basic-autotools/plugin.c:2628
+#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2554
+#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2582
+#: ../plugins/build-basic-autotools/plugin.c:2639
 #, c-format
 msgid "_Build"
 msgstr "建置(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2474
 msgid "_Build Project"
 msgstr "建置��(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2464
+#: ../plugins/build-basic-autotools/plugin.c:2475
 msgid "Build whole project"
 msgstr "建置æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2469
+#: ../plugins/build-basic-autotools/plugin.c:2480
 msgid "_Install Project"
 msgstr "����(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2481
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2475
+#: ../plugins/build-basic-autotools/plugin.c:2486
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2476
+#: ../plugins/build-basic-autotools/plugin.c:2487
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2481
+#: ../plugins/build-basic-autotools/plugin.c:2492
 msgid "C_onfigure Projectâ?¦"
 msgstr "設���(_O)�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
+#: ../plugins/build-basic-autotools/plugin.c:2493
 msgid "Configure project"
 msgstr "設���"
 
-#: ../plugins/build-basic-autotools/plugin.c:2487
+#: ../plugins/build-basic-autotools/plugin.c:2498
 msgid "Build _Tarball"
 msgstr "建置 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
+#: ../plugins/build-basic-autotools/plugin.c:2499
 msgid "Build project tarball distribution"
 msgstr "建置�� tarball ���件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2493
+#: ../plugins/build-basic-autotools/plugin.c:2504
 msgid "_Build Module"
 msgstr "建置模�(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2494
+#: ../plugins/build-basic-autotools/plugin.c:2505
 msgid "Build module associated with current file"
 msgstr "建置è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2499
+#: ../plugins/build-basic-autotools/plugin.c:2510
 msgid "_Install Module"
 msgstr "��模�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2511
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2505
+#: ../plugins/build-basic-autotools/plugin.c:2516
 msgid "_Clean Module"
 msgstr "��模�(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2517
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2522
 msgid "Co_mpile File"
 msgstr "編譯��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2512
+#: ../plugins/build-basic-autotools/plugin.c:2523
 msgid "Compile current editor file"
 msgstr "編譯ç?®å??編輯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2528
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2518
+#: ../plugins/build-basic-autotools/plugin.c:2529
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2534
 msgid "Remove Configuration"
 msgstr "移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
-msgid "Clean project (distclean) and remove configuration directory if possible"
+#: ../plugins/build-basic-autotools/plugin.c:2535
+msgid ""
+"Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??å°?æ¡? (distclean)ï¼?å?¯è?½ç??話ä¸?併移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2537
-#: ../plugins/build-basic-autotools/plugin.c:2565
+#: ../plugins/build-basic-autotools/plugin.c:2548
+#: ../plugins/build-basic-autotools/plugin.c:2576
 msgid "_Compile"
 msgstr "編譯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2538
-#: ../plugins/build-basic-autotools/plugin.c:2566
+#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2577
 msgid "Compile file"
 msgstr "編譯��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2544
-#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2583
 msgid "Build module"
 msgstr "建置模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2549
-#: ../plugins/build-basic-autotools/plugin.c:2577
-#: ../plugins/build-basic-autotools/plugin.c:2635
+#: ../plugins/build-basic-autotools/plugin.c:2560
+#: ../plugins/build-basic-autotools/plugin.c:2588
+#: ../plugins/build-basic-autotools/plugin.c:2646
 #, c-format
 msgid "_Install"
 msgstr "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2550
-#: ../plugins/build-basic-autotools/plugin.c:2578
+#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2589
 msgid "Install module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2555
-#: ../plugins/build-basic-autotools/plugin.c:2583
-#: ../plugins/build-basic-autotools/plugin.c:2642
+#: ../plugins/build-basic-autotools/plugin.c:2566
+#: ../plugins/build-basic-autotools/plugin.c:2594
+#: ../plugins/build-basic-autotools/plugin.c:2653
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2556
-#: ../plugins/build-basic-autotools/plugin.c:2584
+#: ../plugins/build-basic-autotools/plugin.c:2567
+#: ../plugins/build-basic-autotools/plugin.c:2595
 msgid "Clean module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2589
+#: ../plugins/build-basic-autotools/plugin.c:2600
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??令(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2590
+#: ../plugins/build-basic-autotools/plugin.c:2601
 msgid "Cancel build command"
 msgstr "å??æ¶?建置æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:2628
+#: ../plugins/build-basic-autotools/plugin.c:2639
 #, c-format
 msgid "_Build (%s)"
 msgstr "建置(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2635
+#: ../plugins/build-basic-autotools/plugin.c:2646
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2642
+#: ../plugins/build-basic-autotools/plugin.c:2653
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2650
+#: ../plugins/build-basic-autotools/plugin.c:2661
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "編譯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2650
+#: ../plugins/build-basic-autotools/plugin.c:2661
 #, c-format
 msgid "Co_mpile"
 msgstr "編譯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3184
+#: ../plugins/build-basic-autotools/plugin.c:3195
 msgid "Build commands"
 msgstr "建置�令"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3193
+#: ../plugins/build-basic-autotools/plugin.c:3204
 msgid "Build popup commands"
 msgstr "建置å½?å?ºå¼?æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:3582
-#: ../plugins/build-basic-autotools/plugin.c:3590
+#: ../plugins/build-basic-autotools/plugin.c:3593
+#: ../plugins/build-basic-autotools/plugin.c:3601
 msgid "Build Autotools"
 msgstr "建置 Autotools"
 
-#: ../plugins/build-basic-autotools/program.c:326
+#: ../plugins/build-basic-autotools/program.c:269
+#, c-format
+msgid ""
+"Error while setting up build environment:\n"
+" %s"
+msgstr ""
+"設å®?çµ?建ç?°å¢?æ??ç?¼ç??é?¯èª¤ï¼?\n"
+"%s"
+
+#: ../plugins/build-basic-autotools/program.c:342
 msgid "Command aborted"
 msgstr "æ??令已æ?¾æ£?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
+msgid "<b>Class Elements</b>"
+msgstr "<b>é¡?å?¥å??ç´ </b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Project"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Repository"
 msgstr "�����庫"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Email Address:"
 msgstr "ä½?è??é?»é?µå?°å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author Name:"
 msgstr "ä½?è??å§?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date-Time"
 msgstr "ä½?è??/æ?¥æ??-æ??å?»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Author/Date/Time"
 msgstr "ä½?è??/æ?¥æ??/æ??å?»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class Inheritance:"
 msgstr "����繼��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
 msgid "Base Class:"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Elements"
 msgstr "é¡?å?¥å??ç´ "
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 msgid "Class Function Prefix:"
 msgstr "é¡?å?¥å?½æ?¸å??綴ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "é¡?å?¥ç?¢ç??å?¨"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+msgid "Class Methods"
+msgstr "����"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Class Name:"
 msgstr "é¡?å?¥å??稱ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "Class Options:"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#, fuzzy
+#| msgid "Class Name:"
+msgid "Class Scope:"
+msgstr "æ??å°?ç¯?å??(_S)"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+msgid "Constants/Variables"
+msgstr "常�/��"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 msgid "Create"
 msgstr "建�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+msgid "GLib.Object"
+msgstr "GLib.Object"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "GObject Class\t"
 msgstr "GObject é¡?å?¥\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "GObject Prefix and Type:"
 msgstr "GObject å??綴è??é¡?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 msgid "General Class Properties"
 msgstr "����屬�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
 #: ../plugins/file-wizard/file.c:104
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
@@ -1362,24 +1446,36 @@ msgstr "����屬�"
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è¨±å?¯è­? (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Generic C++ Class"
 msgstr "�� C++ ��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 msgid "Header File:"
 msgstr "�頭��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+msgid "Imports"
+msgstr "��"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+msgid "Initializer Arguments:"
+msgstr "å??å§?å??ç¨?å¼?å¼?æ?¸ï¼?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Inline the declaration and implementation"
 msgstr "è¡?å?§å®£å??è??實ä½?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+msgid "JavaScript Class"
+msgstr "JavaScript é¡?å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
 #: ../plugins/file-wizard/file.c:105
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:20
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:25
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:18
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:16
@@ -1395,35 +1491,56 @@ msgstr "è¡?å?§å®£å??è??實ä½?"
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU 寬é??ç?¨å?¬å?±è¨±å?¯è­? (LGPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "æ??æ¬?ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
 msgid "Member Functions/Variables"
 msgstr "æ??å?¡å?½æ?¸/è®?æ?¸"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:33
+msgid "Methods"
+msgstr "��"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:34
 msgid "No License"
 msgstr "æ²?æ??æ??æ¬?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:35
 msgid "Properties"
 msgstr "屬�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:36
+msgid "Python Class"
+msgstr "Python é¡?å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:37
 msgid "Signals"
 msgstr "è¨?è??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:38
 msgid "Source File:"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:39
 msgid "Source/Header Headings:"
 msgstr "ä¾?æº?/æ¨?é ­ç??æ¨?é¡?ï¼?"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:40
+msgid "Vala Class"
+msgstr "Vala é¡?å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:41
+#: ../plugins/mk-project/mk-project.ui.h:7
+msgid "Variables"
+msgstr "è®?æ?¸"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:42
+msgid "is Sub-Class"
+msgstr "����"
+
 #: ../plugins/class-gen/generator.c:133
 #, c-format
 msgid "Header or source file has not been created"
@@ -1437,8 +1554,7 @@ msgstr "ç?¨æ?¼æ¨?é ­æª?æ¡?ç?? autogen ç¯?æ?¬"
 msgid "Autogen template used for the implementation file"
 msgstr "ç?¨æ?¼å¯¦ä½?æª?æ¡?ç?? autogen ç¯?æ?¬"
 
-#: ../plugins/class-gen/generator.c:311
-#: ../plugins/class-gen/generator.c:319
+#: ../plugins/class-gen/generator.c:311 ../plugins/class-gen/generator.c:319
 msgid "File to which the processed template will be written"
 msgstr "ç?¨ä¾?寫å?¥å·²è??ç??ç¯?æ?¬ç??æª?æ¡?"
 
@@ -1447,86 +1563,118 @@ msgstr "ç?¨ä¾?寫å?¥å·²è??ç??ç¯?æ?¬ç??æª?æ¡?"
 msgid "Failed to write autogen definition file"
 msgstr "寫å?¥ autogen å®?義æª?æ¡?失æ??"
 
-#: ../plugins/class-gen/plugin.c:98
-#: ../plugins/project-wizard/druid.c:1141
-msgid "Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1155
+msgid ""
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr "æ?¾ä¸?å?° autogen 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??ä½ å?¯ä»¥å¾? http://autogen.sourceforge.net å??å¾?ã??"
 
-#: ../plugins/class-gen/plugin.c:242
-#: ../plugins/class-gen/plugin.c:410
+#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:453
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "ç?¡æ³?å?·è¡? autogenï¼? %s"
 
-#: ../plugins/class-gen/window.c:94
+#: ../plugins/class-gen/window.c:112
 msgid "Guess from type"
 msgstr "å¾?é¡?å??æ?¨æ¸¬"
 
-#: ../plugins/class-gen/window.c:499
-#: ../plugins/class-gen/window.c:510
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/class-gen/window.c:694 ../plugins/class-gen/window.c:705
+#: ../plugins/class-gen/window.c:779 ../plugins/class-gen/window.c:789
+#: ../plugins/class-gen/window.c:802 ../plugins/search/anjuta-search.ui.h:26
 msgid "Scope"
 msgstr "ç¯?å??"
 
-#: ../plugins/class-gen/window.c:500
+#: ../plugins/class-gen/window.c:695
 msgid "Implementation"
 msgstr "實�"
 
-#: ../plugins/class-gen/window.c:501
-#: ../plugins/class-gen/window.c:511
-#: ../plugins/class-gen/window.c:533
+#: ../plugins/class-gen/window.c:696 ../plugins/class-gen/window.c:706
+#: ../plugins/class-gen/window.c:728 ../plugins/class-gen/window.c:780
+#: ../plugins/class-gen/window.c:790
 #: ../plugins/debug-manager/breakpoints.c:1952
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/snippets-manager/snippets-editor.c:38
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../plugins/class-gen/window.c:502
-#: ../plugins/class-gen/window.c:512
-#: ../plugins/class-gen/window.c:520
-#: ../plugins/class-gen/window.c:534
-#: ../plugins/project-manager/dialogs.c:434
-#: ../plugins/run-program/parameters.c:754
+#: ../plugins/class-gen/window.c:697 ../plugins/class-gen/window.c:707
+#: ../plugins/class-gen/window.c:715 ../plugins/class-gen/window.c:729
+#: ../plugins/class-gen/window.c:739 ../plugins/class-gen/window.c:747
+#: ../plugins/class-gen/window.c:755 ../plugins/class-gen/window.c:763
+#: ../plugins/class-gen/window.c:771 ../plugins/class-gen/window.c:781
+#: ../plugins/class-gen/window.c:791 ../plugins/class-gen/window.c:803
+#: ../plugins/project-manager/dialogs.c:426
+#: ../plugins/run-program/parameters.c:757
 #: ../plugins/snippets-manager/plugin.c:757
 #: ../plugins/snippets-manager/snippets-browser.c:530
 #: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
 msgstr "å??稱"
 
-#: ../plugins/class-gen/window.c:503
-#: ../plugins/class-gen/window.c:513
-#: ../plugins/class-gen/window.c:535
+#: ../plugins/class-gen/window.c:698 ../plugins/class-gen/window.c:708
+#: ../plugins/class-gen/window.c:730 ../plugins/class-gen/window.c:740
+#: ../plugins/class-gen/window.c:756 ../plugins/class-gen/window.c:782
+#: ../plugins/class-gen/window.c:804
 #: ../plugins/debug-manager/stack_trace.c:712
 msgid "Arguments"
 msgstr "å??æ?¸"
 
-#: ../plugins/class-gen/window.c:521
+#: ../plugins/class-gen/window.c:716
 msgid "Nick"
 msgstr "網å??"
 
-#: ../plugins/class-gen/window.c:522
+#: ../plugins/class-gen/window.c:717
 msgid "Blurb"
 msgstr "宣�"
 
-#: ../plugins/class-gen/window.c:523
+#: ../plugins/class-gen/window.c:718
 msgid "GType"
 msgstr "GType"
 
-#: ../plugins/class-gen/window.c:524
+#: ../plugins/class-gen/window.c:719
 msgid "ParamSpec"
 msgstr "ParamSpec"
 
 #. Somehow redundant with marshaller, but required for default handler
-#: ../plugins/class-gen/window.c:526
-#: ../plugins/class-gen/window.c:536
+#: ../plugins/class-gen/window.c:721 ../plugins/class-gen/window.c:731
 msgid "Flags"
 msgstr "æ??æ¨?"
 
-#: ../plugins/class-gen/window.c:537
+#: ../plugins/class-gen/window.c:732
 msgid "Marshaller"
 msgstr "æ?´ç??å?¨"
 
-#: ../plugins/class-gen/window.c:818
+#: ../plugins/class-gen/window.c:748 ../plugins/class-gen/window.c:764
+#: ../plugins/class-gen/window.c:795 ../plugins/debug-manager/debug_tree.c:128
+#: ../plugins/debug-manager/registers.c:469
+#: ../plugins/project-manager/dialogs.c:433
+#: ../plugins/run-program/parameters.c:766 ../plugins/tools/editor.c:474
+msgid "Value"
+msgstr "���"
+
+#: ../plugins/class-gen/window.c:772 ../plugins/cvs-plugin/cvs-callbacks.c:438
+#: ../plugins/am-project/am-project.c:189
+msgid "Module"
+msgstr "模�"
+
+#. Automatic highlight menu
+#: ../plugins/class-gen/window.c:792 ../plugins/document-manager/plugin.c:1033
+msgid "Automatic"
+msgstr "è?ªå??"
+
+#: ../plugins/class-gen/window.c:793
+#, fuzzy
+#| msgid "Western"
+msgid "Getter"
+msgstr "西��系"
+
+#: ../plugins/class-gen/window.c:794
+#, fuzzy
+#| msgid "Starter"
+msgid "Setter"
+msgstr "èµ·æ­¥"
+
+#: ../plugins/class-gen/window.c:1208
 msgid "XML description of the user interface"
 msgstr "使ç?¨è??ä»?é?¢ç?? XML æ??è¿°"
 
@@ -1549,7 +1697,9 @@ 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>"
@@ -1559,7 +1709,6 @@ msgid "Be verbose"
 msgstr "使�詳細模�"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
-#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
 #: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "Browseâ?¦"
@@ -1673,14 +1822,11 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "忽� .cvsrc ��建議�"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57
-#: ../plugins/symbol-db/plugin.c:2116
-#: ../plugins/symbol-db/plugin.c:2158
+#: ../plugins/symbol-db/plugin.c:2171
 msgid "Local"
 msgstr "å??å??"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
-#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "ç´?é??è¨?æ?¯ï¼?"
 
@@ -1694,7 +1840,6 @@ msgstr "模çµ?å??稱ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/git/anjuta-git.ui.h:65
 #: ../plugins/search/anjuta-search.ui.h:22
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
@@ -1702,7 +1847,7 @@ msgid "Options"
 msgstr "��"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:50
 #: ../plugins/subversion/anjuta-subversion.ui.h:24
 msgid "Options:"
 msgstr "���"
@@ -1741,7 +1886,7 @@ msgid "Reset sticky tags"
 msgstr "é??設 sticky æ¨?籤"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/git/anjuta-git.ui.h:56
 #: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ä¿®è¨?ç??ï¼?"
@@ -1773,7 +1918,6 @@ msgid "Vendor tag:"
 msgstr "å» å??æ¨?籤ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:123
 #: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "æ?´å??å°?æ¡?"
@@ -1796,9 +1940,6 @@ msgid "Unable to delete file"
 msgstr "������"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:244
-#: ../plugins/git/git-commit-dialog.c:79
-#: ../plugins/git/git-create-tag-dialog.c:130
-#: ../plugins/git/git-merge-dialog.c:91
 #: ../plugins/subversion/subversion-commit-dialog.c:88
 msgid "Are you sure that you want to pass an empty log message?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?³é??空ç??ç´?é??è¨?æ?¯ï¼?"
@@ -1807,11 +1948,6 @@ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?³é??空ç??ç´?é??è¨?æ?¯ï¼?"
 msgid "CVSROOT"
 msgstr "CVSROOT"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/am-project/am-project.c:191
-msgid "Module"
-msgstr "模�"
-
 #: ../plugins/cvs-plugin/cvs-callbacks.c:441
 msgid "Vendor"
 msgstr "å» å??"
@@ -1839,16 +1975,14 @@ 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:474
+#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:474
 #: ../plugins/cvs-plugin/plugin.c:481
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:46
-#: ../plugins/cvs-plugin/plugin.c:121
+#: ../plugins/cvs-plugin/plugin.c:46 ../plugins/cvs-plugin/plugin.c:121
 msgid "_CVS"
 msgstr "_CVS"
 
@@ -1878,72 +2012,62 @@ msgstr "å¾? CVS 樹移é?¤æª?æ¡?/ç?®é??"
 
 #. Action name
 #. Stock icon, if any
-#: ../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"
 msgstr "_Commit"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:72
-#: ../plugins/cvs-plugin/plugin.c:131
+#: ../plugins/cvs-plugin/plugin.c:72 ../plugins/cvs-plugin/plugin.c:131
 msgid "Commit your changes to the CVS tree"
 msgstr "æ??交你ç??ä¿®æ?¹è?³ CVS 樹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:78
-#: ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "_Update"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:80
-#: ../plugins/cvs-plugin/plugin.c:139
+#: ../plugins/cvs-plugin/plugin.c:80 ../plugins/cvs-plugin/plugin.c:139
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?ä½ æ?¬æ©?ç??è¤?æ?¬è?? CVS 樹å??æ­¥"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:86
-#: ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:86 ../plugins/cvs-plugin/plugin.c:145
 msgid "_Diff"
 msgstr "_Diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:88
-#: ../plugins/cvs-plugin/plugin.c:147
+#: ../plugins/cvs-plugin/plugin.c:88 ../plugins/cvs-plugin/plugin.c:147
 msgid "Show differences between your local copy and the tree"
 msgstr "顯示你ç??æ?¬å?°ç«¯è¤?æ?¬è?? CVS 樹ä¹?é??ç??å·®ç?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:94
-#: ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:94 ../plugins/cvs-plugin/plugin.c:153
 msgid "_Show Status"
 msgstr "顯示ç??æ??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:96
-#: ../plugins/cvs-plugin/plugin.c:155
+#: ../plugins/cvs-plugin/plugin.c:96 ../plugins/cvs-plugin/plugin.c:155
 msgid "Show the status of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:102
-#: ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:102 ../plugins/cvs-plugin/plugin.c:161
 msgid "_Show Log"
 msgstr "顯示ç´?é??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:104
-#: ../plugins/cvs-plugin/plugin.c:163
+#: ../plugins/cvs-plugin/plugin.c:104 ../plugins/cvs-plugin/plugin.c:163
 msgid "Show the log of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç´?é??æª?"
 
@@ -1967,11 +2091,46 @@ msgstr "CVS æ??ä½?"
 msgid "CVS popup operations"
 msgstr "CVS å½?å?ºå¼?æ??ä½?"
 
+#: ../plugins/code-analyzer/code-analyzer.ui.h:1
+msgid "CLang Paths"
+msgstr "CLang 路�"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:2
+msgid "Enable CLang code analyzer"
+msgstr "å??ç?¨ CLang ç¨?å¼?碼å??æ??å?¨"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:4
+msgid ""
+"The project needs to be reconfigured after enabling this option. Please run "
+"Build->Configure!"
+msgstr "å?¨å??ç?¨æ­¤é?¸é ?å¾?å°?æ¡?é??è¦?é??æ?°è¨­å®?ã??è«?å?·è¡? çµ?建->設å®?ï¼?"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:5
+msgid "c++-analyzer:"
+msgstr "c++-å??æ??å?¨ï¼?"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:6
+msgid "ccc-analyzer:"
+msgstr "ccc-å??æ??å?¨ï¼?"
+
+#: ../plugins/code-analyzer/plugin.c:157
+msgid ""
+"Couldn't find clang analyzer, please check if it is installed and if the "
+"paths are configured correctly in the preferences"
+msgstr "æ?¾ä¸?å?° clang å??æ??å?¨ï¼?è«?檢æ?¥å®?æ?¯å?¦å·²å®?è£?以å??å??好設å®?中ç??è·¯å¾?æ?¯å?¦è¨­å®?正確"
+
+#: ../plugins/code-analyzer/plugin.c:226 ../plugins/code-analyzer/plugin.c:234
+msgid "CLang Analyzer"
+msgstr "CLang å??æ??å?¨"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a 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"
@@ -2059,8 +2218,8 @@ msgid "Inspect/Evaluate"
 msgstr "檢�/�估"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
-#: ../plugins/debug-manager/plugin.c:1029
-#: ../plugins/debug-manager/plugin.c:1145
+#: ../plugins/debug-manager/plugin.c:1031
+#: ../plugins/debug-manager/plugin.c:1147
 msgid "Kernel Signals"
 msgstr "å?§æ ¸è¨?è??"
 
@@ -2136,7 +2295,6 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:336
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2335,25 +2493,15 @@ msgstr "中æ?·é»?æ??ä½?"
 msgid "_Go to address"
 msgstr "移è?³ä½?å??(_G)"
 
-#: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/tools/editor.c:468
+#: ../plugins/debug-manager/debug_tree.c:128 ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "è®?æ?¸"
 
-#: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/debug-manager/registers.c:469
-#: ../plugins/project-manager/dialogs.c:441
-#: ../plugins/run-program/parameters.c:763
-#: ../plugins/tools/editor.c:474
-msgid "Value"
-msgstr "���"
-
 #: ../plugins/debug-manager/disassemble.c:851
 msgid "Disassembly"
 msgstr "å??çµ?è­¯"
 
-#: ../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 "��"
@@ -2367,262 +2515,259 @@ msgstr "å??"
 msgid "Locals"
 msgstr "å?°å??è®?æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:338
+#: ../plugins/debug-manager/plugin.c:340
 msgid "Debugger Log"
 msgstr "é?¤é?¯å·¥å?·ç´?é??"
 
-#: ../plugins/debug-manager/plugin.c:411
-#: ../plugins/debug-manager/plugin.c:433
-#: ../plugins/debug-manager/plugin.c:458
-#: ../plugins/debug-manager/plugin.c:485
-#: ../plugins/debug-manager/plugin.c:519
-#: ../plugins/debug-manager/plugin.c:552
+#: ../plugins/debug-manager/plugin.c:413 ../plugins/debug-manager/plugin.c:435
+#: ../plugins/debug-manager/plugin.c:460 ../plugins/debug-manager/plugin.c:487
+#: ../plugins/debug-manager/plugin.c:521 ../plugins/debug-manager/plugin.c:554
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "��工�"
 
-#: ../plugins/debug-manager/plugin.c:411
+#: ../plugins/debug-manager/plugin.c:413
 msgid "Started"
 msgstr "已起�"
 
-#: ../plugins/debug-manager/plugin.c:433
+#: ../plugins/debug-manager/plugin.c:435
 msgid "Loaded"
 msgstr "已��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:454
-#: ../plugins/debug-manager/plugin.c:1157
+#: ../plugins/debug-manager/plugin.c:456
+#: ../plugins/debug-manager/plugin.c:1159
 msgid "Pa_use Program"
 msgstr "æ?«å??ç¨?å¼?(_U)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:455
-#: ../plugins/debug-manager/plugin.c:1159
+#: ../plugins/debug-manager/plugin.c:457
+#: ../plugins/debug-manager/plugin.c:1161
 msgid "Pauses the execution of the program"
 msgstr "æ?«å??å?·è¡?ç¨?å¼?"
 
-#: ../plugins/debug-manager/plugin.c:458
+#: ../plugins/debug-manager/plugin.c:460
 msgid "Runningâ?¦"
 msgstr "正����"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:481
-#: ../plugins/debug-manager/plugin.c:1049
+#: ../plugins/debug-manager/plugin.c:483
+#: ../plugins/debug-manager/plugin.c:1051
 msgid "Run/_Continue"
 msgstr "�� / 繼���(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:482
-#: ../plugins/debug-manager/plugin.c:1051
+#: ../plugins/debug-manager/plugin.c:484
+#: ../plugins/debug-manager/plugin.c:1053
 msgid "Continue the execution of the program"
 msgstr "繼�����"
 
-#: ../plugins/debug-manager/plugin.c:485
+#: ../plugins/debug-manager/plugin.c:487
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
-#: ../plugins/debug-manager/plugin.c:519
+#: ../plugins/debug-manager/plugin.c:521
 msgid "Unloaded"
 msgstr "���"
 
-#: ../plugins/debug-manager/plugin.c:561
+#: ../plugins/debug-manager/plugin.c:563
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
 msgstr "é?¤é?¯ç¨?å¼?å?  %d é?¯èª¤è??中止ï¼?%s\n"
 
-#: ../plugins/debug-manager/plugin.c:574
+#: ../plugins/debug-manager/plugin.c:576
 #, c-format
 msgid "Program has received signal: %s\n"
 msgstr "ç¨?å¼?æ?¥æ?¶å?°ä¿¡è??ï¼?%s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:913
+#: ../plugins/debug-manager/plugin.c:915
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../plugins/debug-manager/plugin.c:921
+#: ../plugins/debug-manager/plugin.c:923
 msgid "_Start Debugger"
 msgstr "å??å??é?¤é?¯å?¨(_S)"
 
-#: ../plugins/debug-manager/plugin.c:929
+#: ../plugins/debug-manager/plugin.c:931
 msgid "_Debug Program"
 msgstr "�����(_D)"
 
-#: ../plugins/debug-manager/plugin.c:931
+#: ../plugins/debug-manager/plugin.c:933
 msgid "Start debugger and load the program"
 msgstr "å??å??é?¤é?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
 
-#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:939
 msgid "_Debug Processâ?¦"
 msgstr "����(_D)�"
 
-#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:941
 msgid "Start debugger and attach to a running program"
 msgstr "å??å??é?¤é?¯å?¨ä¸¦å°?æ­£å?¨å?·è¡?中ç??ç¨?å¼?é?²è¡?é?¤é?¯"
 
-#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:947
 msgid "Debug _Remote Targetâ?¦"
 msgstr "��端����(_R)�"
 
-#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:949
 msgid "Connect to a remote debugging target"
 msgstr "é?£æ?¥å?°é? ç«¯è¦?é?¤é?¯ç??ç?®æ¨?"
 
-#: ../plugins/debug-manager/plugin.c:953
+#: ../plugins/debug-manager/plugin.c:955
 msgid "Stop Debugger"
 msgstr "å??æ­¢é?¤é?¯å·¥å?·"
 
-#: ../plugins/debug-manager/plugin.c:955
+#: ../plugins/debug-manager/plugin.c:957
 msgid "Say goodbye to the debugger"
 msgstr "è·?é?¤é?¯å·¥å?·èªªè?²å??è¦?"
 
-#: ../plugins/debug-manager/plugin.c:961
+#: ../plugins/debug-manager/plugin.c:963
 msgid "Add source pathsâ?¦"
 msgstr "����路��"
 
-#: ../plugins/debug-manager/plugin.c:963
+#: ../plugins/debug-manager/plugin.c:965
 msgid "Add additional source paths"
 msgstr "å? å?¥é¡?å¤?ç??å??å§?æª?è·¯å¾?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:973
-#: ../plugins/debug-manager/plugin.c:1097
+#: ../plugins/debug-manager/plugin.c:975
+#: ../plugins/debug-manager/plugin.c:1099
 msgid "Debugger Commandâ?¦"
 msgstr "é?¤é?¯å·¥å?·æ??令â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:975
-#: ../plugins/debug-manager/plugin.c:1099
+#: ../plugins/debug-manager/plugin.c:977
+#: ../plugins/debug-manager/plugin.c:1101
 msgid "Custom debugger command"
 msgstr "è?ªé?¸é?¤é?¯å?¨æ??令"
 
-#: ../plugins/debug-manager/plugin.c:981
-#: ../plugins/debug-manager/plugin.c:1105
+#: ../plugins/debug-manager/plugin.c:983
+#: ../plugins/debug-manager/plugin.c:1107
 msgid "_Info"
 msgstr "��(_I)"
 
-#: ../plugins/debug-manager/plugin.c:989
+#: ../plugins/debug-manager/plugin.c:991
 msgid "Info _Target Files"
 msgstr "����(_T)"
 
-#: ../plugins/debug-manager/plugin.c:991
+#: ../plugins/debug-manager/plugin.c:993
 msgid "Display information on the files the debugger is active with"
 msgstr "顯示ç?®å??æ­£å?¨è¢«é?¤é?¯ç??ç¨?å¼?ç??å?·è¡?ç?°å¢?ç??è³?è¨?"
 
-#: ../plugins/debug-manager/plugin.c:997
+#: ../plugins/debug-manager/plugin.c:999
 msgid "Info _Program"
 msgstr "����(_P)"
 
-#: ../plugins/debug-manager/plugin.c:999
+#: ../plugins/debug-manager/plugin.c:1001
 msgid "Display information on the execution status of the program"
 msgstr "顯示ç¨?å¼?ç??å?·è¡?ç??æ³?è³?è¨?"
 
-#: ../plugins/debug-manager/plugin.c:1005
+#: ../plugins/debug-manager/plugin.c:1007
 msgid "Info _Kernel User Struct"
 msgstr "���核(_K)"
 
-#: ../plugins/debug-manager/plugin.c:1007
+#: ../plugins/debug-manager/plugin.c:1009
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr "顯示ç?®å??é?²ç¨?ç?? CPU æ?«å­?å?¨æ?¸å?¼ï¼?ç¨?å¼?å ?ç??ï¼?è³?æ??å??ç??ä½?å??å??大å°?ç­?ç­?â?¦"
 
-#: ../plugins/debug-manager/plugin.c:1021
-#: ../plugins/debug-manager/plugin.c:1137
+#: ../plugins/debug-manager/plugin.c:1023
+#: ../plugins/debug-manager/plugin.c:1139
 msgid "Shared Libraries"
 msgstr "�享��庫"
 
-#: ../plugins/debug-manager/plugin.c:1023
-#: ../plugins/debug-manager/plugin.c:1139
+#: ../plugins/debug-manager/plugin.c:1025
+#: ../plugins/debug-manager/plugin.c:1141
 msgid "Show shared library mappings"
 msgstr "顯示�享��庫��"
 
-#: ../plugins/debug-manager/plugin.c:1031
-#: ../plugins/debug-manager/plugin.c:1147
+#: ../plugins/debug-manager/plugin.c:1033
+#: ../plugins/debug-manager/plugin.c:1149
 msgid "Show kernel signals"
 msgstr "顯示核å¿?è¨?è??"
 
-#: ../plugins/debug-manager/plugin.c:1037
+#: ../plugins/debug-manager/plugin.c:1039
 msgid "_Continue/Suspend"
 msgstr "ç¹¼çº?/æ?«å??(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1039
+#: ../plugins/debug-manager/plugin.c:1041
 msgid "Continue or suspend the execution of the program"
 msgstr "ç¹¼çº?æ??æ?«å??å?·è¡?ç¨?å¼?"
 
-#: ../plugins/debug-manager/plugin.c:1057
+#: ../plugins/debug-manager/plugin.c:1059
 msgid "Step _In"
 msgstr "步�(_I)"
 
-#: ../plugins/debug-manager/plugin.c:1059
+#: ../plugins/debug-manager/plugin.c:1061
 msgid "Single step into function"
 msgstr "æ­¥å?¥ç?®å??å?½æ?¸å?§ç?¶å¾?å?®æ­¥å?·è¡?"
 
-#: ../plugins/debug-manager/plugin.c:1065
+#: ../plugins/debug-manager/plugin.c:1067
 msgid "Step O_ver"
 msgstr "æ­¥é??(_V)"
 
-#: ../plugins/debug-manager/plugin.c:1067
+#: ../plugins/debug-manager/plugin.c:1069
 msgid "Single step over function"
 msgstr "å?®æ­¥å?·è¡?ç?®å??å?½æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1073
+#: ../plugins/debug-manager/plugin.c:1075
 msgid "Step _Out"
 msgstr "步�(_O)"
 
-#: ../plugins/debug-manager/plugin.c:1075
+#: ../plugins/debug-manager/plugin.c:1077
 msgid "Single step out of function"
 msgstr "å?®æ­¥é?¢é??å?½æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1081
+#: ../plugins/debug-manager/plugin.c:1083
 msgid "_Run to Cursor"
 msgstr "å?·è¡?è?³é??æ¨?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:1083
+#: ../plugins/debug-manager/plugin.c:1085
 msgid "Run to the cursor"
 msgstr "ç¨?å¼?å?·è¡?è?³é??æ¨?ç?®å??ä½?ç½®æ??å??æ­¢"
 
-#: ../plugins/debug-manager/plugin.c:1089
+#: ../plugins/debug-manager/plugin.c:1091
 msgid "_Run from Cursor"
 msgstr "å¾?游æ¨?è??å?·è¡?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:1091
+#: ../plugins/debug-manager/plugin.c:1093
 msgid "Run from the cursor"
 msgstr "å¾?游æ¨?è??å?·è¡?"
 
-#: ../plugins/debug-manager/plugin.c:1113
+#: ../plugins/debug-manager/plugin.c:1115
 msgid "Info _Global Variables"
 msgstr "å?¨å??è®?æ?¸è³?è¨?(_G)"
 
-#: ../plugins/debug-manager/plugin.c:1115
+#: ../plugins/debug-manager/plugin.c:1117
 msgid "Display all global and static variables of the program"
 msgstr "顯示ç¨?å¼?ç??å?¨å??å??å??é??æ??è®?æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1121
+#: ../plugins/debug-manager/plugin.c:1123
 msgid "Info _Current Frame"
 msgstr "å ?ç??çµ?æ§?(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1123
+#: ../plugins/debug-manager/plugin.c:1125
 msgid "Display information about the current frame of execution"
 msgstr "顯示ç?®å??å ?ç??çµ?æ§?å?§ç??è³?è¨?"
 
-#: ../plugins/debug-manager/plugin.c:1129
+#: ../plugins/debug-manager/plugin.c:1131
 msgid "Info Function _Arguments"
 msgstr "å?½æ?¸å??æ?¸(_A)"
 
-#: ../plugins/debug-manager/plugin.c:1131
+#: ../plugins/debug-manager/plugin.c:1133
 msgid "Display function arguments of the current frame"
 msgstr "顯示ç?®å??å ?ç??çµ?æ§?æ??屬å?½æ?¸ç??å??æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1199
-#: ../plugins/debug-manager/plugin.c:1205
-#: ../plugins/debug-manager/plugin.c:1211
-#: ../plugins/debug-manager/plugin.c:1217
+#: ../plugins/debug-manager/plugin.c:1201
+#: ../plugins/debug-manager/plugin.c:1207
+#: ../plugins/debug-manager/plugin.c:1213
+#: ../plugins/debug-manager/plugin.c:1219
 msgid "Debugger operations"
 msgstr "é?¤é?¯å·¥å?·æ??ä½?"
 
@@ -2648,12 +2793,10 @@ msgid "Shared Object"
 msgstr "�享�件"
 
 #: ../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
 msgid "To"
 msgstr "çµ?æ??ä½?å??"
 
@@ -2742,10 +2885,9 @@ msgstr "ç·¨è??"
 
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:664
-#: ../plugins/debug-manager/threads.c:451
-#: ../plugins/gdb/preferences.c:363
-#: ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:623
+#: ../plugins/debug-manager/threads.c:451 ../plugins/gdb/preferences.c:363
+#: ../plugins/symbol-db/plugin.c:2129 ../plugins/tools/tool.c:100
+#: ../src/anjuta-app.c:625
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "��"
@@ -2809,8 +2951,7 @@ msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 msgid "Path"
 msgstr "路�"
 
-#: ../plugins/debug-manager/start.c:1389
-#: ../plugins/gdb/debugger.c:1929
+#: ../plugins/debug-manager/start.c:1389 ../plugins/gdb/debugger.c:1929
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2878,8 +3019,7 @@ 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 "ç?£ç??æ??ä½?"
 
@@ -2887,70 +3027,63 @@ msgstr "ç?£ç??æ??ä½?"
 msgid "Watches"
 msgstr "ç?£ç??"
 
-#: ../plugins/devhelp/plugin.c:202
+#: ../plugins/devhelp/plugin.c:206
 msgid "Search Help:"
 msgstr "æ??å°?說æ??ï¼?"
 
-#: ../plugins/devhelp/plugin.c:223
-#: ../plugins/document-manager/plugin.c:243
-#: ../plugins/message-view/plugin.c:77
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/devhelp/plugin.c:227 ../plugins/document-manager/plugin.c:243
+#: ../plugins/message-view/plugin.c:77 ../plugins/symbol-db/plugin.c:322
 msgid "_Go to"
 msgstr "移�(_G)"
 
-#: ../plugins/devhelp/plugin.c:232
+#: ../plugins/devhelp/plugin.c:236
 msgid "_API Reference"
 msgstr "API å??è??(_A)"
 
-#: ../plugins/devhelp/plugin.c:234
+#: ../plugins/devhelp/plugin.c:238
 msgid "Browse API Pages"
 msgstr "ç??覽 API é ?é?¢"
 
-#: ../plugins/devhelp/plugin.c:244
+#: ../plugins/devhelp/plugin.c:248
 msgid "_Context Help"
 msgstr "å?³æ??說æ??(_C)"
 
-#: ../plugins/devhelp/plugin.c:246
+#: ../plugins/devhelp/plugin.c:250
 msgid "Search help for the current word in the editor"
 msgstr "å?¨èªªæ??æª?å?§æ??å°?ç?®å??æ??件å?§é?¸å®?ç??å­?"
 
-#: ../plugins/devhelp/plugin.c:252
+#: ../plugins/devhelp/plugin.c:260
 msgid "_Search Help"
 msgstr "æ??å°?說æ??(_S)"
 
-#: ../plugins/devhelp/plugin.c:254
+#: ../plugins/devhelp/plugin.c:262
 msgid "Search for a term in help"
 msgstr "å?¨æ±?å?©ä¸­æ??å°?ä¸?å??è©?"
 
-#: ../plugins/devhelp/plugin.c:326
+#: ../plugins/devhelp/plugin.c:334
 msgid "Help operations"
 msgstr "æ±?å?©æ??ä½?"
 
-#: ../plugins/devhelp/plugin.c:345
-#: ../plugins/devhelp/plugin.c:462
-#: ../src/anjuta-app.c:640
-msgid "Help"
-msgstr "æ±?å?©"
+#: ../plugins/devhelp/plugin.c:353 ../plugins/devhelp/plugin.c:470
+msgid "API Browser"
+msgstr "API ç??覽å?¨"
 
-#: ../plugins/devhelp/plugin.c:356
+#: ../plugins/devhelp/plugin.c:364
 msgid "Contents"
 msgstr "�容"
 
-#: ../plugins/devhelp/plugin.c:362
-#: ../plugins/search/search-replace.c:1034
+#: ../plugins/devhelp/plugin.c:370 ../plugins/search/search-replace.c:1034
 #: ../plugins/search/search-replace.c:1700
 #: ../plugins/search/search-replace.c:1707
 #: ../plugins/search/search-replace.c:1719
-#: ../plugins/search/search-replace.c:2037
-#: ../plugins/symbol-db/plugin.c:2126
-#: ../plugins/symbol-db/plugin.c:2178
+#: ../plugins/search/search-replace.c:2037 ../plugins/symbol-db/plugin.c:2139
+#: ../plugins/symbol-db/plugin.c:2191
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../plugins/devhelp/plugin.c:380
-#: ../plugins/devhelp/plugin.c:467
-msgid "Help display"
-msgstr "顯示��"
+#: ../plugins/devhelp/plugin.c:388 ../plugins/devhelp/plugin.c:475
+msgid "API"
+msgstr "API"
 
 #: ../plugins/document-manager/action-callbacks.c:314
 #, c-format
@@ -2965,27 +3098,26 @@ msgstr ""
 msgid "_Reload"
 msgstr "é??æ?°è¼?å?¥(_R)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:311
+#: ../plugins/document-manager/anjuta-bookmarks.c:334
 msgid "Add bookmark"
 msgstr "���籤"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:317
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
 msgid "Remove bookmark"
 msgstr "移��籤"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:331
-#: ../plugins/document-manager/anjuta-bookmarks.c:404
+#: ../plugins/document-manager/anjuta-bookmarks.c:354
+#: ../plugins/document-manager/anjuta-bookmarks.c:414
 #: ../plugins/document-manager/plugin.c:422
 msgid "Bookmarks"
 msgstr "�籤"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:339
+#: ../plugins/document-manager/anjuta-bookmarks.c:362
 msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:23
-#: ../plugins/gtodo/callback.c:106
+#: ../plugins/document-manager/anjuta-bookmarks.c:363
+#: ../plugins/git/plugin.c:178
 #: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "移�"
@@ -2995,14 +3127,13 @@ msgid "Close file"
 msgstr "é??é??æª?æ¡?"
 
 #: ../plugins/document-manager/anjuta-docman.c:502
+#: ../plugins/project-manager/dialogs.c:563
 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 "é??å??æª?æ¡?"
 
@@ -3129,11 +3260,11 @@ msgid "Close all files"
 msgstr "é??é??å?¨é?¨æª?æ¡?"
 
 #: ../plugins/document-manager/plugin.c:165
-msgid "Close Other"
+msgid "Close Others"
 msgstr "é??é??å?¶ä»?ç??"
 
 #: ../plugins/document-manager/plugin.c:166
-msgid "Close other documents"
+msgid "Close others documents"
 msgstr "é??é??å?¶ä»?ç??æ??件"
 
 #: ../plugins/document-manager/plugin.c:168
@@ -3322,8 +3453,7 @@ msgstr "ä¸?ä¸?å??æ­·å?²ç´?é??(_Y)"
 msgid "Go to next history"
 msgstr "移è?³ä¸?ä¸?å??æ­·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:265
-#: ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:265 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
@@ -3343,10 +3473,8 @@ msgstr "å¿«é??é??æ?°æ??å°?(_R)"
 msgid "Repeat quick search"
 msgstr "é??è¤?å¿«é??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:275
-#: ../plugins/gtodo/interface.c:141
-#: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1914
+#: ../plugins/document-manager/plugin.c:275 ../src/anjuta-actions.h:30
+#: ../plugins/language-support-cpp-java/plugin.c:961
 #: ../plugins/language-support-python/plugin.c:1179
 msgid "_Edit"
 msgstr "編輯(_E)"
@@ -3398,8 +3526,7 @@ msgstr "å?ªä¸?編輯å?¨ä¸­é?¸å®?ç??æ??å­?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:298
-#: ../plugins/terminal/terminal.c:561
+#: ../plugins/document-manager/plugin.c:298 ../plugins/terminal/terminal.c:561
 msgid "_Copy"
 msgstr "�製(_C)"
 
@@ -3407,8 +3534,7 @@ msgstr "�製(_C)"
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å­?è¤?製å?°å?ªè²¼ç°¿"
 
-#: ../plugins/document-manager/plugin.c:301
-#: ../plugins/terminal/terminal.c:569
+#: ../plugins/document-manager/plugin.c:301 ../plugins/terminal/terminal.c:569
 msgid "_Paste"
 msgstr "貼�(_P)"
 
@@ -3557,12 +3683,12 @@ msgid "Bookmar_k"
 msgstr "�籤(_K)"
 
 #: ../plugins/document-manager/plugin.c:380
-msgid "_Add Bookmark"
-msgstr "���籤(_A)"
+msgid "_Toggle Bookmark"
+msgstr "å??æ??æ?¸ç±¤(_T)"
 
 #: ../plugins/document-manager/plugin.c:381
-msgid "Add a bookmark at the current line position"
-msgstr "å°?ç?®å??æ??å?¨è¡?ç??ä½?ç½®å? å?¥æ?¸ç±¤"
+msgid "Toggle bookmark at the current line position"
+msgstr "å??æ??ç?®å??æ??å?¨å??ç??ä½?ç½®æ?¸ç±¤"
 
 #: ../plugins/document-manager/plugin.c:383
 msgid "_Previous Bookmark"
@@ -3633,10 +3759,11 @@ msgstr "編輯å?¨æ??å­?æ ¼å¼?"
 msgid "Simple searching"
 msgstr "ç°¡æ??æ??å°?"
 
+#. DocmanPlugin* plugin = ANJUTA_PLUGIN_DOCMAN (ipref);
 #: ../plugins/document-manager/plugin.c:421
-#: ../plugins/document-manager/plugin.c:1750
-#: ../plugins/document-manager/plugin.c:2172
-#: ../plugins/document-manager/plugin.c:2181
+#: ../plugins/document-manager/plugin.c:1749
+#: ../plugins/document-manager/plugin.c:2171
+#: ../plugins/document-manager/plugin.c:2180
 msgid "Documents"
 msgstr "æ??件"
 
@@ -3673,18 +3800,13 @@ msgstr "�"
 msgid "Mode"
 msgstr "模�"
 
-#. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1033
-msgid "Automatic"
-msgstr "è?ªå??"
-
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1592
+#: ../plugins/document-manager/plugin.c:1591
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå??å?²å­? %s 失æ??"
 
-#: ../plugins/document-manager/plugin.c:1606
+#: ../plugins/document-manager/plugin.c:1605
 msgid "Autosave completed"
 msgstr "è?ªå??å?²å­?å®?ç?¢"
 
@@ -3695,7 +3817,9 @@ 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
@@ -3775,7 +3899,8 @@ 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"
@@ -3799,9 +3924,8 @@ msgstr "以此é??å??ï¼?"
 msgid "Document Manager"
 msgstr "æ??件管ç??å?¡"
 
-#: ../plugins/file-loader/plugin.c:497
-#: ../plugins/patch/patch-plugin.c:122
-#: ../plugins/run-program/parameters.c:308
+#: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
+#: ../plugins/run-program/parameters.c:311
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
@@ -3874,23 +3998,19 @@ 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 "�����"
@@ -3903,8 +4023,7 @@ 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 "é??å??"
 
@@ -3912,8 +4031,7 @@ 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 "æ??è¿?é??å??ç??æª?æ¡?"
 
@@ -3925,8 +4043,7 @@ 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 "�����"
@@ -3938,7 +4055,6 @@ msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? <b>%s</b> ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/file-loader/plugin.c:1441
-#| msgid "Open With"
 msgid "<b>Open With</b>"
 msgstr "<b>以此é??å??</b>"
 
@@ -3967,9 +4083,8 @@ msgid "Filter"
 msgstr "é??濾æ¢?件"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2121
-#: ../plugins/symbol-db/plugin.c:2170
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/plugin.c:2183
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
 msgid "Global"
 msgstr "å?¨å??"
 
@@ -3977,7 +4092,7 @@ msgstr "å?¨å??"
 msgid "Root directory if no project is open:"
 msgstr "å¦?æ??æ²?æ??é??å??å°?æ¡?æ??ç??æ ¹ç?®é??ï¼?"
 
-#: ../plugins/file-manager/file-model.c:120
+#: ../plugins/file-manager/file-model.c:120 ../plugins/git/anjuta-git.ui.h:46
 msgid "Loading..."
 msgstr "正����"
 
@@ -4005,12 +4120,11 @@ msgstr "é??æ?°å?½å??æª?æ¡?æ??ç?®é??"
 msgid "File manager popup actions"
 msgstr "æª?æ¡?管ç??ç¨?å¼?å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:327 ../plugins/git/plugin.c:162
 msgid "Files"
 msgstr "��"
 
-#: ../plugins/file-manager/plugin.c:457
-#: ../plugins/file-manager/plugin.c:466
+#: ../plugins/file-manager/plugin.c:457 ../plugins/file-manager/plugin.c:466
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "æª?æ¡?管ç??å?¡"
@@ -4044,8 +4158,8 @@ msgid "File Information"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
-#: ../plugins/am-project/am-properties.c:45
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/am-project/am-properties.c:48 ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/project-manager/dialogs.c:568
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??稱ï¼?"
@@ -4056,7 +4170,7 @@ msgid "New File"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
-#: ../plugins/project-manager/dialogs.c:542
+#: ../plugins/project-manager/dialogs.c:590
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
@@ -4097,7 +4211,6 @@ msgid "Shell Script File"
 msgstr "Shell �令稿��"
 
 #: ../plugins/file-wizard/file.c:92
-#| msgid "Java Source File"
 msgid "Vala Source File"
 msgstr "Vala å??å§?æª?"
 
@@ -4116,124 +4229,88 @@ msgstr "ç?¡æ³?建ç«?æ?°æª?æ¡?ç??使ç?¨è??ä»?é?¢"
 #: ../plugins/dir-project/dir-project.c:133
 #: ../plugins/dir-project/dir-project.c:156
 #, c-format
-#| msgid "Missing tool name"
 msgid "Missing name"
 msgstr "缺å°?å??稱"
 
-#: ../plugins/dir-project/dir-project.c:649
-#: ../plugins/dir-project/dir-project.c:762
-#: ../plugins/am-project/am-project.c:1627
-#: ../plugins/am-project/am-project.c:1658
-#: ../plugins/am-project/am-project.c:1767
-#: ../plugins/am-project/am-project.c:1843
-#, c-format
-msgid "Project doesn't exist or invalid path"
-msgstr "å°?æ¡?ä¸?å­?å?¨æ??ç?¡æ??ç??è·¯å¾?"
-
-#: ../plugins/dir-project/dir-project.c:773
-#: ../plugins/am-project/am-project.c:91
-#| msgid "Group:"
+#: ../plugins/dir-project/dir-project.c:780
+#: ../plugins/am-project/am-project.c:89
+#: ../plugins/mk-project/mk-project.c:138
 msgid "Group"
 msgstr "羣�"
 
-#: ../plugins/dir-project/dir-project.c:776
-#: ../plugins/am-project/am-project.c:98
-#| msgid "Source:"
+#: ../plugins/dir-project/dir-project.c:783
+#: ../plugins/am-project/am-project.c:96
+#: ../plugins/mk-project/mk-project.c:145
 msgid "Source"
 msgstr "��"
 
-#: ../plugins/dir-project/dir-project.c:877
-#: ../plugins/dir-project/dir-project.c:887
+#: ../plugins/dir-project/dir-project.c:899
+#: ../plugins/dir-project/dir-project.c:909
+#: ../plugins/mk-project/mk-project.c:1385
 #, c-format
-#| msgid "Project doesn't exist"
 msgid "Project doesn't allow to set properties"
 msgstr "å°?æ¡?ä¸?å??許設å®?屬æ?§"
 
-#: ../plugins/am-project/am-node.c:750
-msgid "Please specify group name"
-msgstr "è«?æ??å®?ç¾£çµ?å??稱"
-
-#: ../plugins/am-project/am-node.c:764
-#| msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
-msgid "Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
-msgstr "ç¾£çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?æ?? \"#$:%+,- = ^_`~\" å­?符"
-
-#: ../plugins/am-project/am-node.c:918
-msgid "Please specify target name"
-msgstr "è«?æ??å®?ç?®æ¨?å??稱"
-
-#: ../plugins/am-project/am-node.c:932
-#| msgid ""
-#| "Target name can only contain alphanumeric, '_', '-' or '.' characters"
-msgid "Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
-msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-'ã??'/' æ?? '.' å­?符"
-
-#: ../plugins/am-project/am-node.c:947
-msgid "Shared library target name must be of the form 'libxxx.la'"
-msgstr "å?±äº«ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.laã??"
-
-#: ../plugins/am-project/am-node.c:956
-msgid "Static library target name must be of the form 'libxxx.a'"
-msgstr "é??æ??ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.aã??"
-
-#: ../plugins/am-project/am-project.c:114
+#: ../plugins/am-project/am-project.c:112
 msgid "Shared Library"
 msgstr "�享��庫"
 
-#: ../plugins/am-project/am-project.c:121
+#: ../plugins/am-project/am-project.c:119
 msgid "Static Library"
 msgstr "é??æ??ç¨?å¼?庫"
 
-#: ../plugins/am-project/am-project.c:135
+#: ../plugins/am-project/am-project.c:133
 msgid "Python Module"
 msgstr "Python 模�"
 
-#: ../plugins/am-project/am-project.c:142
+#: ../plugins/am-project/am-project.c:140
 msgid "Java Module"
 msgstr "Java 模�"
 
-#: ../plugins/am-project/am-project.c:149
+#: ../plugins/am-project/am-project.c:147
 msgid "Lisp Module"
 msgstr "Lisp 模�"
 
-#: ../plugins/am-project/am-project.c:156
+#: ../plugins/am-project/am-project.c:154
 msgid "Header Files"
 msgstr "�頭�"
 
-#: ../plugins/am-project/am-project.c:163
+#: ../plugins/am-project/am-project.c:161
 msgid "Man Documentation"
 msgstr "Man æ??件"
 
-#: ../plugins/am-project/am-project.c:170
+#: ../plugins/am-project/am-project.c:168
 msgid "Info Documentation"
 msgstr "Info æ??件"
 
-#: ../plugins/am-project/am-project.c:177
+#: ../plugins/am-project/am-project.c:175
 msgid "Miscellaneous Data"
 msgstr "é??é ?è³?æ??"
 
-#: ../plugins/am-project/am-project.c:184
+#: ../plugins/am-project/am-project.c:182
 msgid "Script"
 msgstr "�令稿"
 
-#: ../plugins/am-project/am-project.c:198
-#| msgid "Packages"
+#: ../plugins/am-project/am-project.c:196
 msgid "Package"
 msgstr "�件"
 
-#: ../plugins/am-project/am-project.c:1644
+#: ../plugins/am-project/am-project.c:1585
 #, c-format
-#| msgid "Unable to update project"
 msgid "Unable to parse project file"
 msgstr "ç?¡æ³?解æ??å°?æ¡?æª?æ¡?"
 
-#: ../plugins/am-project/am-properties.c:46
+#: ../plugins/am-project/am-properties.c:51
+msgid "Project name, it can contain spaces by example 'GNU Autoconf'"
+msgstr "å°?æ¡?å??稱ï¼?å?¯ä»¥å??å?«ç©ºç?½ï¼?å??æ?¯ã??GNU Autoconfã??"
+
+#: ../plugins/am-project/am-properties.c:56
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:26
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:31
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:46
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:29
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:25
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:27
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:27
@@ -4247,129 +4324,365 @@ msgstr "ç?¡æ³?解æ??å°?æ¡?æª?æ¡?"
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../plugins/am-project/am-properties.c:47
+#: ../plugins/am-project/am-properties.c:59
+msgid ""
+"Project version, typically a few numbers separated by dot by example '1.0.0'"
+msgstr "å°?æ¡?ç??æ?¬ï¼?é??常æ?¯ä»¥é»?å??é??ç??æ?¸å­?ï¼?å??æ?¯ã??1.0.0ã??"
+
+#: ../plugins/am-project/am-properties.c:64
 msgid "Bug report URL:"
 msgstr "é?¯èª¤å ±å?? URLï¼?"
 
-#: ../plugins/am-project/am-properties.c:48
+#: ../plugins/am-project/am-properties.c:67
+msgid ""
+"An email address or a link to a web page where the user can report bug. It "
+"is optional."
+msgstr "è®?使ç?¨è??å?¯ä»¥å??å ±ç¨?å¼?é?¯èª¤ç??é?»å­?é?µä»¶ä½?å??æ??網é ?é?£çµ?ã??é??æ?¯é?¸æ??æ?§ç??ã??"
+
+#: ../plugins/am-project/am-properties.c:72
 msgid "Package name:"
 msgstr "å°?æ¡?å??稱:"
 
-#: ../plugins/am-project/am-properties.c:49
-#: ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/am-project/am-properties.c:75
+msgid ""
+"Package name, it can contains only alphanumerics and underscore characters."
+"It is generated from the project name if not provided."
+msgstr "å¥?件å??稱ï¼?å?ªè?½å??å?«å­?æ¯?å??åº?ç·?å­?符ã??å¦?æ??ä¸?æ??å®?å°±æ??å¾?å°?æ¡?å??稱ç?¢ç??ã??"
+
+#: ../plugins/am-project/am-properties.c:81
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/am-project/am-properties.c:56
-#: ../plugins/am-project/am-properties.c:75
+#: ../plugins/am-project/am-properties.c:84
+msgid "An link to the project web page if provided."
+msgstr "å°?æ¡?網é ?ç??é?£çµ?ï¼?å¦?æ??æ??æ??ä¾?ç??話ã??"
+
+#: ../plugins/am-project/am-properties.c:97
+#: ../plugins/am-project/am-properties.c:208
+#: ../plugins/am-project/am-properties.c:368
+#: ../plugins/am-project/am-properties.c:520
 msgid "Linker flags:"
 msgstr "é?£çµ?å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:57
-#: ../plugins/am-project/am-properties.c:78
+#: ../plugins/am-project/am-properties.c:100
+msgid "Common additional linker flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤?é?£çµ?å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:105
+#: ../plugins/am-project/am-properties.c:232
+#: ../plugins/am-project/am-properties.c:384
+#: ../plugins/am-project/am-properties.c:536
 msgid "C preprocessor flags:"
 msgstr "C é ?è??ç??å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:58
-#: ../plugins/am-project/am-properties.c:79
+#: ../plugins/am-project/am-properties.c:108
+msgid "Common additional C preprocessor flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? C å??è??ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:113
+#: ../plugins/am-project/am-properties.c:240
+#: ../plugins/am-project/am-properties.c:392
+#: ../plugins/am-project/am-properties.c:544
 msgid "C compiler flags:"
 msgstr "C 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:59
-#: ../plugins/am-project/am-properties.c:80
+#: ../plugins/am-project/am-properties.c:116
+msgid "Common additional C compiler flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:121
+#: ../plugins/am-project/am-properties.c:248
+#: ../plugins/am-project/am-properties.c:400
+#: ../plugins/am-project/am-properties.c:552
 msgid "C++ compiler flags:"
 msgstr "C++ 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:60
-#: ../plugins/am-project/am-properties.c:81
-#| msgid "C compiler flags:"
+#: ../plugins/am-project/am-properties.c:124
+msgid "Common additional C++ compiler flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? C++ 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:129
+#: ../plugins/am-project/am-properties.c:256
+#: ../plugins/am-project/am-properties.c:408
+#: ../plugins/am-project/am-properties.c:560
 msgid "Java compiler flags:"
 msgstr "Java 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:61
-#: ../plugins/am-project/am-properties.c:82
-#| msgid "C compiler flags:"
+#: ../plugins/am-project/am-properties.c:132
+msgid "Common additional Java compiler flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Java 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:137
+#: ../plugins/am-project/am-properties.c:264
+#: ../plugins/am-project/am-properties.c:416
+#: ../plugins/am-project/am-properties.c:568
 msgid "Vala compiler flags:"
 msgstr "Vala 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:62
-#: ../plugins/am-project/am-properties.c:83
-#| msgid "Fortran compiler flags:"
-msgid "Fortan compiler flags:"
+#: ../plugins/am-project/am-properties.c:140
+msgid "Common additional Vala compiler flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Vala 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:145
+#: ../plugins/am-project/am-properties.c:272
+#: ../plugins/am-project/am-properties.c:424
+#: ../plugins/am-project/am-properties.c:576
+msgid "Fortran compiler flags:"
 msgstr "Fortran 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:63
-#: ../plugins/am-project/am-properties.c:84
-#| msgid "C compiler flags:"
+#: ../plugins/am-project/am-properties.c:148
+msgid "Common additional Fortran compiler flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Fortran 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:153
+#: ../plugins/am-project/am-properties.c:280
+#: ../plugins/am-project/am-properties.c:432
+#: ../plugins/am-project/am-properties.c:584
 msgid "Objective C compiler flags:"
 msgstr "Objective C 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:64
-#: ../plugins/am-project/am-properties.c:85
-#| msgid "Linker flags:"
+#: ../plugins/am-project/am-properties.c:156
+msgid ""
+"Common additional Objective C compiler flags for all targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Objective C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:161
+#: ../plugins/am-project/am-properties.c:288
+#: ../plugins/am-project/am-properties.c:440
+#: ../plugins/am-project/am-properties.c:592
 msgid "Lex/Flex flags:"
 msgstr "Lex/Flex æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:65
-#: ../plugins/am-project/am-properties.c:86
-#| msgid "Linker flags:"
+#: ../plugins/am-project/am-properties.c:164
+msgid ""
+"Common additional Lex or Flex lexical analyser generator flags for all "
+"targets in this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Lex æ?? Flex lexical å??æ??å?¨ç?¢ç??æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:169
+#: ../plugins/am-project/am-properties.c:296
+#: ../plugins/am-project/am-properties.c:448
+#: ../plugins/am-project/am-properties.c:600
 msgid "Yacc/Bison flags:"
 msgstr "Yacc/Bison æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:66
-msgid "Install directories:"
+#: ../plugins/am-project/am-properties.c:172
+msgid ""
+"Common additional Yacc or Bison parser generator flags for all targets in "
+"this group."
+msgstr "é??å??ç¾£çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Yacc æ?? Bison 解æ??å?¨ç?¢ç??æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:177
+msgid "Installation directories:"
 msgstr "å®?è£?ç?®é??ï¼?"
 
-#: ../plugins/am-project/am-properties.c:73
-#| msgid "Do not show tabs"
+#: ../plugins/am-project/am-properties.c:180
+msgid "List of custom installation directories used by targets in this group."
+msgstr "é??å??ç¾£çµ?中ç?®æ¨?使ç?¨ç??è?ªé?¸å®?è£?ç?®é??æ¸?å?®ã??"
+
+#: ../plugins/am-project/am-properties.c:192
+#: ../plugins/am-project/am-properties.c:352
+#: ../plugins/am-project/am-properties.c:504
+#: ../plugins/am-project/am-properties.c:687
 msgid "Do not install:"
 msgstr "�����"
 
-#: ../plugins/am-project/am-properties.c:74
-#| msgid "Install directory:"
+#: ../plugins/am-project/am-properties.c:195
+#: ../plugins/am-project/am-properties.c:355
+#: ../plugins/am-project/am-properties.c:507
+#: ../plugins/am-project/am-properties.c:690
+msgid "Build but do not install the target."
+msgstr "çµ?建ä½?ä¸?å®?è£?ç?®æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:200
+#: ../plugins/am-project/am-properties.c:360
+#: ../plugins/am-project/am-properties.c:512
+#: ../plugins/am-project/am-properties.c:695
 msgid "Installation directory:"
 msgstr "å®?è£?ç?®é??ï¼?"
 
-#: ../plugins/am-project/am-properties.c:76
-#| msgid "Add internationalization:"
+#: ../plugins/am-project/am-properties.c:203
+#: ../plugins/am-project/am-properties.c:363
+#: ../plugins/am-project/am-properties.c:515
+#: ../plugins/am-project/am-properties.c:698
+msgid ""
+"It has to be a standard directory or a custom one defined in group "
+"properties."
+msgstr "å®?å¿?é ?æ?¯æ¨?æº?ç??ç?®é??æ??æ?¯å?¨ç¾£çµ?屬æ?§ä¸­å®?義ç??è?ªé?¸ç?®é??ã??"
+
+#: ../plugins/am-project/am-properties.c:211
+#: ../plugins/am-project/am-properties.c:371
+#: ../plugins/am-project/am-properties.c:523
+msgid "Additional linker flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?é?£çµ?å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:216
 msgid "Additional libraries:"
 msgstr "é¡?å¤?ç??ç¨?å¼?庫ï¼?"
 
-#: ../plugins/am-project/am-properties.c:77
-#| msgid "Add to Project"
+#: ../plugins/am-project/am-properties.c:219
+#: ../plugins/am-project/am-properties.c:379
+#: ../plugins/am-project/am-properties.c:531
+msgid "Additional libraries for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?ç¨?å¼?庫ã??"
+
+#: ../plugins/am-project/am-properties.c:224
 msgid "Additional objects:"
 msgstr "é¡?å¤?ç??ç?©ä»¶ï¼?"
 
-#: ../plugins/am-project/am-properties.c:87
-#: ../plugins/am-project/am-properties.c:97
-#| msgid "Plugin Dependencies:"
+#: ../plugins/am-project/am-properties.c:227
+msgid "Additional object files for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?ç?©ä»¶æª?æ¡?ã??"
+
+#: ../plugins/am-project/am-properties.c:235
+#: ../plugins/am-project/am-properties.c:387
+#: ../plugins/am-project/am-properties.c:539
+msgid "Additional C preprocessor flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? C å??è??ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:243
+#: ../plugins/am-project/am-properties.c:395
+#: ../plugins/am-project/am-properties.c:547
+msgid "Additional C compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:251
+#: ../plugins/am-project/am-properties.c:403
+#: ../plugins/am-project/am-properties.c:555
+msgid "Additional C++ compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? C++ 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:259
+#: ../plugins/am-project/am-properties.c:411
+#: ../plugins/am-project/am-properties.c:563
+msgid "Additional Java compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Java 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:267
+#: ../plugins/am-project/am-properties.c:419
+#: ../plugins/am-project/am-properties.c:571
+msgid "Additional Vala compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Vala 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:275
+#: ../plugins/am-project/am-properties.c:427
+#: ../plugins/am-project/am-properties.c:579
+msgid "Additional Fortran compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Fortran 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:283
+#: ../plugins/am-project/am-properties.c:435
+#: ../plugins/am-project/am-properties.c:587
+msgid "Additional Objective C compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Objective C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:291
+#: ../plugins/am-project/am-properties.c:443
+#: ../plugins/am-project/am-properties.c:595
+msgid ""
+"Additional Lex or Flex lexical analyser generator flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Lex æ?? Flex lexical å??æ??å?¨ç?¢ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:299
+#: ../plugins/am-project/am-properties.c:451
+#: ../plugins/am-project/am-properties.c:603
+msgid "Additional Yac or Bison parser generator flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Yac æ?? Bison 解æ??å?¨ç?¢ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:304
+#: ../plugins/am-project/am-properties.c:456
+#: ../plugins/am-project/am-properties.c:608
+#: ../plugins/am-project/am-properties.c:656
+#: ../plugins/am-project/am-properties.c:703
 msgid "Additional dependencies:"
 msgstr "é¡?å¤?ç??ç?¸æ ¹æ??æ?§ï¼?"
 
-#: ../plugins/am-project/am-properties.c:88
-#| msgid "Plugin Description:"
+#: ../plugins/am-project/am-properties.c:307
+#: ../plugins/am-project/am-properties.c:459
+#: ../plugins/am-project/am-properties.c:611
+#: ../plugins/am-project/am-properties.c:659
+#: ../plugins/am-project/am-properties.c:706
+msgid "Additional dependencies for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?ç?¸æ ¹æ??æ?§ã??"
+
+#: ../plugins/am-project/am-properties.c:312
+#: ../plugins/am-project/am-properties.c:464
+#: ../plugins/am-project/am-properties.c:616
+#: ../plugins/am-project/am-properties.c:711
 msgid "Include in distribution:"
 msgstr "å??å?«æ?¼æ??è¿°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:89
-#| msgid "Build Directory:"
+#: ../plugins/am-project/am-properties.c:315
+#: ../plugins/am-project/am-properties.c:467
+#: ../plugins/am-project/am-properties.c:619
+#: ../plugins/am-project/am-properties.c:714
+msgid "Include this target in the distributed package."
+msgstr "å?¨æ?£å¸?ç??å¥?件中å??å?«é??å??ç?®æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:320
+#: ../plugins/am-project/am-properties.c:472
+#: ../plugins/am-project/am-properties.c:624
+#: ../plugins/am-project/am-properties.c:719
 msgid "Build for check only:"
 msgstr "�編譯�檢����"
 
-#: ../plugins/am-project/am-properties.c:90
-#: ../plugins/am-project/am-properties.c:98
+#: ../plugins/am-project/am-properties.c:323
+#: ../plugins/am-project/am-properties.c:475
+#: ../plugins/am-project/am-properties.c:627
+#: ../plugins/am-project/am-properties.c:722
+msgid "Build this target only when running automatic tests."
+msgstr "å?ªå?¨å?·è¡?è?ªå??測試æ??çµ?建é??å??ç?®æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:328
+#: ../plugins/am-project/am-properties.c:480
+#: ../plugins/am-project/am-properties.c:632
+#: ../plugins/am-project/am-properties.c:664
+#: ../plugins/am-project/am-properties.c:727
 msgid "Do not use prefix:"
 msgstr "ä¸?使ç?¨å??綴ï¼?"
 
-#: ../plugins/am-project/am-properties.c:91
+#: ../plugins/am-project/am-properties.c:331
+#: ../plugins/am-project/am-properties.c:483
+#: ../plugins/am-project/am-properties.c:635
+#: ../plugins/am-project/am-properties.c:667
+#: ../plugins/am-project/am-properties.c:730
+msgid ""
+"Do not rename the target with an optional prefix, used to avoid overwritting "
+"system program. "
+msgstr "ä¸?è¦?以é?¸æ??æ?§ç??å??綴é??æ?°å?½å??ç?®æ¨?ï¼?ç?¨ä»¥é?¿å??è¦?è??系統ç¨?å¼?ã??"
+
+#: ../plugins/am-project/am-properties.c:336
+#: ../plugins/am-project/am-properties.c:488
+#: ../plugins/am-project/am-properties.c:640
+#: ../plugins/am-project/am-properties.c:735
 msgid "Keep target path:"
 msgstr "ä¿?ç??ç?®æ¨?è·¯å¾?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:99
-#| msgid "Maximum Actions"
+#: ../plugins/am-project/am-properties.c:339
+#: ../plugins/am-project/am-properties.c:491
+#: ../plugins/am-project/am-properties.c:643
+#: ../plugins/am-project/am-properties.c:738
+msgid ""
+"Keep relative target path for installing it. By example if you have a "
+"program subdir/app installed in bin directory it will be installed in bin/"
+"subdir/app not in bin/app."
+msgstr "ä¿?æ??å®?è£?ç?®æ¨?ç??ç?¸å°?è·¯å¾?ã??ä¾?å¦?ï¼?ä½ ç??ç¨?å¼? subdir/app è¦?å®?è£?æ?¼ bin ç?®é??ï¼?å®?æ??被å®?è£?å?¨ bin/subdir/app è??ä¸?æ?¯ bin/appã??"
+
+#: ../plugins/am-project/am-properties.c:376
+#: ../plugins/am-project/am-properties.c:528
+msgid "Libraries:"
+msgstr "��庫:"
+
+#: ../plugins/am-project/am-properties.c:672
 msgid "Manual section:"
 msgstr "æ??å??ç« ç¯?ï¼?"
 
+#: ../plugins/am-project/am-properties.c:675
+msgid ""
+"Section where are installed the man pages. Valid section names are the "
+"digits â??0â?? through â??9â??, and the letters â??lâ?? and â??nâ??. "
+msgstr "å®?è£? man pages ç??ç¯?å??ã??æ??æ??ç??ç¯?å??å??稱ç?ºæ?¸å­?ã??0ã??å?°ã??9ã??ï¼?以å??å­?æ¯?ã??lã??å??ã??nã??ã??"
+
 #: ../plugins/gdb/anjuta-gdb.ui.h:1
 msgid "Available pretty printers"
 msgstr "å?¯ç?¨ç??æ??å?°æ©?"
@@ -4524,7 +4837,8 @@ msgstr "å?³é??ä¸?å??è¨?è??給ç¨?åº?æ??ç?¼ç??é?¯èª¤ã??"
 
 #: ../plugins/gdb/plugin.c:118
 #, 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:202
@@ -4539,9 +4853,12 @@ msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?é?¤é?¯ã??"
 #: ../plugins/gdb/preferences.c:128
 #, c-format
 msgid ""
-"The register function hasn't been found automatically in the following pretty printer files:\n"
+"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\"."
+"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 ""
 "å?¨ä¸?å?? pretty printer files æ²?æ??è?ªå??æ?¾å?°è¨»å??å?½æ?¸ï¼?\n"
 "%s\n"
@@ -4561,1817 +4878,814 @@ msgstr "使�"
 msgid "Register Function"
 msgstr "註å??å?½æ?¸"
 
-#: ../plugins/gdb/preferences.c:396
-#: ../plugins/gdb/preferences.c:404
+#: ../plugins/gdb/preferences.c:396 ../plugins/gdb/preferences.c:404
 msgid "Gdb Debugger"
 msgstr "Gdb ��工�"
 
 #: ../plugins/git/anjuta-git.ui.h:1
-msgid "Add File"
-msgstr "����"
+msgid "<b>Add Files:</b>"
+msgstr "<b>�����</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:2
-msgid "Add Remote Branch"
-msgstr "å? å?¥é? ç«¯å??æ?¯"
+msgid "<b>Branch name:</b>"
+msgstr "<b>å??æ?¯å??稱ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:3
+msgid "<b>Branches:</b>"
+msgstr "<b>å??æ?¯ï¼?</b>"
 
-#. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
 #: ../plugins/git/anjuta-git.ui.h:4
-msgid "Add signed-off-by line"
-msgstr "å? å?¥ signed-off-by line"
+msgid "<b>Branches</b>"
+msgstr "<b>å??æ?¯</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:5
-msgid "Amend the previous commit"
-msgstr "修正ä¸?ä¸?次æ??交"
+msgid "<b>Commit to cherry pick:</b>"
+msgstr "<b>Commit è?³ cherry pickï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:6
-msgid "Annotate this tag"
-msgstr "å? è¨»é??å??æ¨?籤"
+msgid "<b>Commit to revert:</b>"
+msgstr "<b>Commit ç?º revertï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:7
+msgid "<b>Folder to create patches in:</b>"
+msgstr "<b>ç?¨ä¾?建ç«?ä¿®è£?æª?ç??ç?®é??ï¼?</b>"
 
-#. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
 #: ../plugins/git/anjuta-git.ui.h:8
-msgid "Append fetch data"
-msgstr "æ·»å? å??å??ç??è³?æ??"
+msgid "<b>Generate patches relative to:</b>"
+msgstr "<b>ç?¢ç??ç?¸å°?æ?¼æ­¤ç??ä¿®è£?æª?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:9
-msgid "Apply Stash"
-msgstr "�� Stash"
+msgid "<b>Log Message:</b>"
+msgstr "<b>ç´?é??è¨?æ?¯ï¼?</b>"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/anjuta-git.ui.h:10
-#: ../plugins/git/plugin.c:239
-msgid "Apply mailbox files"
-msgstr "��信箱��"
+msgid "<b>Mailbox files to apply:</b>"
+msgstr "<b>è¦?å¥?ç?¨ç?? Mailbox æª?æ¡?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:11
-msgid "Apply the selected stash"
-msgstr "å¥?ç?¨é?¸å??ç?? stash"
+msgid "<b>Mode:</b>"
+msgstr "<b>模��</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:12
+msgid "<b>Options:</b>"
+msgstr "<b>���</b>"
 
-#. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
 #: ../plugins/git/anjuta-git.ui.h:13
-msgid "Author/Grep"
-msgstr "ä½?è??/Grep"
+msgid "<b>Options</b>"
+msgstr "<b>��</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:14
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:6
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:6
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:6
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:9
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:7
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:6
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:8
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:6
-#: ../plugins/project-wizard/templates/java.wiz.in.h:7
-#: ../plugins/project-wizard/templates/js.wiz.in.h:2
-#: ../plugins/project-wizard/templates/python.wiz.in.h:7
-#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
-#: ../plugins/project-wizard/templates/library.wiz.in.h:6
-msgid "Author:"
-msgstr "ä½?è??ï¼?"
+msgid "<b>Remote Repositories:</b>"
+msgstr "<b>�端��庫�</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:15
-msgid "Bad revision:"
-msgstr "ä¸?好ç??ç??æ?¬ï¼?"
+msgid "<b>Remote name:</b>"
+msgstr "<b>é? ç«¯å??稱ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:16
-msgid "Branch name:"
-msgstr "å??æ?¯å??稱ï¼?"
+msgid "<b>Remove Files:</b>"
+msgstr "<b>移����</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:17
-msgid "Branch to switch to:"
-msgstr "è¦?å??æ??å?°å??æ?¯ï¼?"
+msgid "<b>Repository Status:</b>"
+msgstr "<b>æª?æ¡?庫ç??æ??ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:18
-msgid "Branch:"
-msgstr "å??æ?¯ï¼?"
+msgid "<b>Repository to pull from:</b>"
+msgstr "<b>è¦?é?²è¡? pull ç??æª?æ¡?庫ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:19
-msgid "Branches"
-msgstr "å??æ?¯"
+msgid "<b>Repository to push to:</b>"
+msgstr "<b>� push ���庫�</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:20
-msgid "Branches must be fully merged"
-msgstr "å??æ?¯å¿?é ?被å®?æ?´å??ä½µ"
+msgid "<b>Revision to merge with:</b>"
+msgstr "<b>è¦? merge ç?? revisionï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:21
-msgid "Branches to delete:"
-msgstr "è¦?å?ªé?¤ç??å??æ?¯ï¼?"
+msgid "<b>Revision:</b>"
+msgstr "<b>ä¿®è¨?ç??ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:22
+msgid "<b>Revision</b>"
+msgstr "<b>ä¿®è¨?ç??</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:23
-#: ../plugins/subversion/anjuta-subversion.ui.h:4
-msgid "Changes:"
-msgstr "���"
+msgid "<b>Stash Message (Optional):</b>"
+msgstr "<b>Stash è¨?æ?¯ï¼?é??å¿?è¦?ï¼?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:24
-msgid "Check Out Files"
-msgstr "å??å?ºæª?æ¡?"
+msgid "<b>Stashed Changes:</b>"
+msgstr "<b>å·² stash ç??æ?´æ?¹ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:25
-msgid "Check out all local changes"
-msgstr "Check out æ??æ??æ?¬å?°ç«¯ç??æ?´æ?¹"
+msgid "<b>Tag name:</b>"
+msgstr "<b>æ¨?籤å??稱ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:26
-msgid "Check out the branch after it is created"
-msgstr "å?¨å??æ?¯å»ºç«?å¾?å??å?ºå®?"
+msgid "<b>Tags:</b>"
+msgstr "<b>�籤�</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:27
-msgid "Cherry Pick"
-msgstr "Cherry Pick"
+msgid "<b>URL:</b>"
+msgstr "<b>URLï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:28
-msgid "Clear all stashes"
-msgstr "æ¸?é?¤æ??æ?? stash"
+msgid "Add signed off by line"
+msgstr "å? å?¥ signed-off-by line"
 
 #: ../plugins/git/anjuta-git.ui.h:29
-msgid "Column 1"
-msgstr "� 1"
+#, fuzzy
+#| msgid "Amend the previous commit"
+msgid "Amernd the previous commit"
+msgstr "修正ä¸?ä¸?次æ??交"
 
 #: ../plugins/git/anjuta-git.ui.h:30
-#: ../plugins/subversion/anjuta-subversion.ui.h:7
-msgid "Commit Changes"
-msgstr "æ??交修æ?¹"
+msgid "Annotate this tag:"
+msgstr "å? è¨»é??å??æ¨?籤ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:31
-msgid "Commit on fast-forward merges"
-msgstr "å?¨ fast-forward å??ä½µä¸? commit"
+msgid "Append fetch data"
+msgstr "æ·»å? å??å??ç??è³?æ??"
 
 #: ../plugins/git/anjuta-git.ui.h:32
-msgid "Commit to Cherry Pick:"
-msgstr "Commit è?³ Cherry Pickï¼?"
+msgid "Append signed-of- by line"
+msgstr "添� signed-off-by line"
 
 #: ../plugins/git/anjuta-git.ui.h:33
-msgid "Commit to revert:"
-msgstr "è¦?æ??交ç?ºå¾©å??ç??ï¼?"
+msgid "Branch:"
+msgstr "å??æ?¯ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:34
-msgid "Create Branch"
-msgstr "建ç«?å??æ?¯"
+msgid "Branches must be fully merged"
+msgstr "å??æ?¯å¿?é ?被å®?æ?´å??ä½µ"
 
 #: ../plugins/git/anjuta-git.ui.h:35
-msgid "Create Tag"
-msgstr "建��籤"
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
+msgid "Changes:"
+msgstr "���"
 
 #: ../plugins/git/anjuta-git.ui.h:36
-msgid "Create patch series"
-msgstr "建ç«?è£?é??ç³»å??"
+msgid "Check out the branch after it is created"
+msgstr "å?¨å??æ?¯å»ºç«?å¾?å??å?ºå®?"
 
 #: ../plugins/git/anjuta-git.ui.h:37
-#: ../plugins/git/git-log-dialog.c:189
-#: ../plugins/subversion/subversion-log-dialog.c:141
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../plugins/git/anjuta-git.ui.h:38
-msgid "Delete Branch"
-msgstr "å?ªé?¤å??æ?¯"
+msgid "Column 0"
+msgstr "� 0"
 
 #: ../plugins/git/anjuta-git.ui.h:39
-msgid "Delete Remote Branch"
-msgstr "å?ªé?¤é? ç«¯å??æ?¯"
+msgid "Commit on fast-forward merges"
+msgstr "å?¨ fast-forward å??ä½µä¸? commit"
 
 #: ../plugins/git/anjuta-git.ui.h:40
-msgid "Delete Tags"
-msgstr "���籤"
-
-#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "ä¸?è¦?æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not follow tags"
 msgstr "�����籤"
 
-#: ../plugins/git/anjuta-git.ui.h:43
-msgid "Drop the selected stash"
-msgstr "æ?¾æ£?é?¸å??ç?? stash"
-
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "E-mail:"
 msgstr "���件�"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Fetch remote branches after creation"
 msgstr "å?¨å»ºç«?å¾?å??å??é? ç«¯å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:46
-msgid "Filters"
-msgstr "é??濾æ¢?件"
-
-#: ../plugins/git/anjuta-git.ui.h:47
-msgid "Folder to create patches in:"
-msgstr "ç?¨ä¾?建ç«?ä¿®è£?æª?ç??ç?®é??ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:44
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "å¼·å?¶"
 
-#: ../plugins/git/anjuta-git.ui.h:50
-msgid "From:"
-msgstr "å¾?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:51
-msgid "Generate patches relative to:"
-msgstr "ç?¢ç??ç?¸å°?æ?¼æ­¤ç??ä¿®è£?æª?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:52
-msgid "Good revision:"
-msgstr "è?¯å¥½ç??ç??æ?¬ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:53
-msgid "Grep:"
-msgstr "Grep:"
-
-#: ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Hard"
 msgstr "Hard"
 
-#: ../plugins/git/anjuta-git.ui.h:55
-msgid "Head"
-msgstr "Head"
-
-#: ../plugins/git/anjuta-git.ui.h:56
-msgid "Ignore Files"
-msgstr "忽���:"
-
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:47
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "ç´?é??è¨?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:60
-msgid "Mailbox file containing patches:"
-msgstr "å??å?«ä¿®è£?ç??ä¿¡ç®±æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:61
-msgid "Merge"
-msgstr "å??ä½µ"
-
-#: ../plugins/git/anjuta-git.ui.h:62
+#: ../plugins/git/anjuta-git.ui.h:48
 msgid "Mixed"
 msgstr "æ··å??ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:63
-msgid "Mode:"
-msgstr "模��"
-
-#: ../plugins/git/anjuta-git.ui.h:67
-msgid "Previous commit"
-msgstr "å??ä¸?次æ??交"
-
-#: ../plugins/git/anjuta-git.ui.h:68
-msgid "Pull"
-msgstr "Pull"
-
-#: ../plugins/git/anjuta-git.ui.h:69
-msgid "Push"
-msgstr "Push"
-
-#: ../plugins/git/anjuta-git.ui.h:70
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Push all branches and tags"
 msgstr "Push æ??æ??ç??å??æ?¯è??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:71
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Push all tags"
 msgstr "Push æ??æ??ç??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:53 ../plugins/git/plugin.c:262
 msgid "Rebase"
 msgstr "é??建å?ºç¤?"
 
-#: ../plugins/git/anjuta-git.ui.h:73
-msgid "Remote"
-msgstr "�端"
-
-#: ../plugins/git/anjuta-git.ui.h:74
-msgid "Remote branch to rebase from:"
-msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:75
-msgid "Remote to delete:"
-msgstr "è¦?å?ªé?¤ç??é? ç«¯ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:76
-msgid "Remove File"
-msgstr "移���"
-
-#: ../plugins/git/anjuta-git.ui.h:77
-msgid "Repository origin"
-msgstr "��庫�頭"
-
-#: ../plugins/git/anjuta-git.ui.h:78
-msgid "Repository to pull from:"
-msgstr "è¦?é?²è¡? pull ç??æª?æ¡?庫ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:79
-msgid "Repository to push to:"
-msgstr "� push ���庫�"
-
-#: ../plugins/git/anjuta-git.ui.h:80
-msgid "Reset Tree"
-msgstr "é??設æª?æ¡?樹"
-
-#: ../plugins/git/anjuta-git.ui.h:81
-msgid "Reset to:"
-msgstr "é??設ç?ºï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:82
-msgid "Restore index"
-msgstr "é??å??ç´¢å¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:83
-#: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving statusâ?¦"
-msgstr "æ­£å?¨å??å¾?ç??æ??â?¦"
-
-#: ../plugins/git/anjuta-git.ui.h:84
-msgid "Revert Commit"
-msgstr "å??復æ??交"
-
-#: ../plugins/git/anjuta-git.ui.h:85
-msgid "Revision/Tag:"
-msgstr "ä¿®è¨?ç??/æ¨?籤:"
-
-#: ../plugins/git/anjuta-git.ui.h:87
-msgid "Select Files to Check Out:"
-msgstr "é?¸æ??è¦?å??å??ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:88
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
-msgid "Select Files to Commit:"
-msgstr "é?¸æ??è¦?æ??交ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:89
-msgid "Select Files to Ignore:"
-msgstr "é?¸æ??è¦?忽ç?¥ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:90
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
-msgid "Select Files to Mark as Resolved:"
-msgstr "é?¸æ??è¦?æ¨?è¨?ç?ºå·²è§£æ±ºç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:91
-msgid "Select Files to Unstage:"
-msgstr "é?¸æ??è¦? Unstage ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select Mailbox File"
-msgstr "é?¸æ??ä¿¡ç®±æª?æ¡?"
-
-#: ../plugins/git/anjuta-git.ui.h:93
-msgid "Select a Folder"
-msgstr "é?¸æ??è³?æ??夾"
-
-#: ../plugins/git/anjuta-git.ui.h:94
-msgid "Select file to add:"
-msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:95
-msgid "Select file to remove:"
-msgstr "é?¸æ??è¦?移é?¤ç??æª?æ¡?ï¼?"
+#: ../plugins/git/anjuta-git.ui.h:54
+msgid "Repository head"
+msgstr "��庫 head"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
-msgid "Set Conflicts as Resolved"
-msgstr "���設��已解決"
+#: ../plugins/git/anjuta-git.ui.h:55
+msgid "Repository origin; Drop or type a different revision here"
+msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:57
 msgid "Show source revision in log message"
 msgstr "å?¨ç´?é??è¨?æ?¯ä¸­é¡¯ç¤ºä¾?æº?ç??ä¿®è¨?ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:98
-msgid "Show the contents of the selected stash in an editor"
-msgstr "顯示å?¨ç·¨è¼¯å?¨ä¸­é?¸å?? stash ç??å?§å®¹"
-
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:58
 msgid "Sign this tag"
 msgstr "å? è¨»é??å??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Soft"
 msgstr "Soft"
 
-#: ../plugins/git/anjuta-git.ui.h:101
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Squash"
 msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.ui.h:102
-#: ../plugins/git/plugin.c:811
-msgid "Stash"
-msgstr "Stash"
-
-#: ../plugins/git/anjuta-git.ui.h:103
-msgid "Stash Message (Optional)"
-msgstr "Stash è¨?æ?¯ï¼?é??å¿?è¦?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:104
-msgid "Stash Uncommitted Changes"
-msgstr "Stash æ?ªæ??交ç??æ?´æ?¹"
-
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Stash indexed changes"
 msgstr "Stash 已索å¼?ç??æ?´æ?¹"
 
-#: ../plugins/git/anjuta-git.ui.h:106
-msgid "Stash the working tree's uncommitted changes"
-msgstr "Stash working tree 中æ?ªæ??交ç??æ?´æ?¹"
-
-#: ../plugins/git/anjuta-git.ui.h:107
-msgid "Stash to Apply"
-msgstr "è¦?å¥?ç?¨ç?? Stash"
-
-#: ../plugins/git/anjuta-git.ui.h:108
-msgid "Switch to Another Branch"
-msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
-
-#: ../plugins/git/anjuta-git.ui.h:109
-msgid "Tag name:"
-msgstr "æ¨?籤å??稱ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:110
-msgid "Tag/Commit"
-msgstr "æ¨?籤/æ??交"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:111
-#: ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "�籤"
-
-#: ../plugins/git/anjuta-git.ui.h:112
-msgid "Tags to delete:"
-msgstr "è¦?å?ªé?¤ç??æ¨?籤ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:113
-msgid "This commit concludes a failed merge (use -i)"
+#: ../plugins/git/anjuta-git.ui.h:62
+msgid "This commit concludes a failed merged (use -i)"
 msgstr "é??次æ??交ç?±æ?¼å??併失æ??è??çµ?æ­¢ï¼?使ç?¨ -iï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:115
-msgid "To:"
-msgstr "å?°ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:116
-msgid "URL"
-msgstr "網å??"
-
-#: ../plugins/git/anjuta-git.ui.h:118
-msgid "Unstage Files"
-msgstr "Unstage ��"
-
-#: ../plugins/git/anjuta-git.ui.h:119
-msgid "Use a custom log message"
-msgstr "使ç?¨è?ªé?¸ç??ç´?é??è¨?æ?¯"
+#: ../plugins/git/anjuta-git.ui.h:63
+msgid "Use a custom log message:"
+msgstr "使ç?¨è?ªé?¸ç??ç´?é??è¨?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:64
 msgid "Use custom author information:"
 msgstr "使ç?¨è?ªé?¸ç??ä½?è??è³?è¨?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:121
-msgid "View log"
-msgstr "檢è¦?ç´?é??"
-
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:65
 #: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "檢è¦?æª?æ¡?/è³?æ??夾ç??ç´?é??æª?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:124
+#: ../plugins/git/anjuta-git.ui.h:66
+msgid ""
+"Whole project; Drop a file here or type a path to view a file or folder log"
+msgstr ""
+
+#: ../plugins/git/anjuta-git.ui.h:67
+msgid "Whole project; Drop a file here to view a file or folder log"
+msgstr ""
+
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "page 1"
 msgstr "é ? 1"
 
-#: ../plugins/git/anjuta-git.ui.h:125
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "page 2"
 msgstr "é ? 2"
 
-#: ../plugins/git/anjuta-git.ui.h:126
-msgid "page 3"
-msgstr "é ? 3"
-
-#: ../plugins/git/git-add-dialog.c:36
-msgid "Git: File staged for add."
-msgstr ""
-
-#: ../plugins/git/git-add-dialog.c:62
-#: ../plugins/git/git-remove-dialog.c:63
-msgid "Please select a file."
-msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
+#: ../plugins/git/git-add-files-pane.c:157
+msgid "Add Files"
+msgstr "����"
 
-#: ../plugins/git/git-add-remote-dialog.c:41
-#, c-format
-msgid "Git: Added remote branch \"%s\"."
-msgstr "Gitï¼?å? å?¥é? ç«¯å??æ?¯ã??%sã??ã??"
+#: ../plugins/git/git-add-remote-pane.c:52
+msgid "Please enter a remote name."
+msgstr "è«?輸å?¥é? ç«¯å??稱ã??"
 
-#: ../plugins/git/git-add-remote-dialog.c:81
-#: ../plugins/git/git-create-branch-dialog.c:117
-msgid "Please enter a branch name."
-msgstr "è«?輸å?¥å??æ?¯å??稱ã??"
+#: ../plugins/git/git-add-remote-pane.c:55
+msgid "Please enter a URL"
+msgstr "�輸� URL"
 
-#: ../plugins/git/git-add-remote-dialog.c:91
-msgid "Please enter a URL."
-msgstr "è«?輸å?¥ URLã??"
+#: ../plugins/git/git-add-remote-pane.c:179
+msgid "Add Remote"
+msgstr "���端"
 
-#: ../plugins/git/git-add-remote-dialog.c:111
-#: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetchingâ?¦"
-msgstr "Gitï¼?æ­£å?¨å??å??â?¦"
-
-#: ../plugins/git/git-apply-mailbox-dialog.c:45
-msgid "Please select a mailbox file."
-msgstr "è«?é?¸æ??ä¸?å??ä¿¡ç®±æª?æ¡?ã??"
-
-#: ../plugins/git/git-bisect-dialog.c:54
-#: ../plugins/git/git-cherry-pick-dialog.c:52
-#: ../plugins/git/git-create-branch-dialog.c:99
-#: ../plugins/git/git-create-tag-dialog.c:102
-#: ../plugins/git/git-reset-dialog.c:57
-#: ../plugins/git/git-revert-dialog.c:46
-#: ../plugins/subversion/subversion-copy-dialog.c:207
-#: ../plugins/subversion/subversion-switch-dialog.c:122
-msgid "Please enter a revision."
-msgstr "è«?輸å?¥ä¿®è¨?ç??ã??"
+#: ../plugins/git/git-apply-mailbox-pane.c:157
+msgid "Apply Mailbox Files"
+msgstr "�� Mailbox ��"
 
-#: ../plugins/git/git-cat-file-menu.c:36
-msgid "Git: File retrieved."
-msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+#: ../plugins/git/git-apply-stash-pane.c:54
+#: ../plugins/git/git-diff-stash-pane.c:67
+#: ../plugins/git/git-drop-stash-pane.c:48
+msgid "No stash selected."
+msgstr "å°?æ?ªé?¸å?? stashã??"
 
-#: ../plugins/git/git-checkout-files-dialog.c:36
-msgid "Git: Files checked out."
-msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+#: ../plugins/git/git-checkout-pane.c:147
+msgid "Check Out Files"
+msgstr "å??å?ºæª?æ¡?"
 
-#: ../plugins/git/git-commit-dialog.c:36
-msgid "Git: Commit complete."
-msgstr "Gitï¼?æ??交å®?æ??ã??"
+#: ../plugins/git/git-commit-pane.c:123
+#: ../plugins/git/git-create-tag-pane.c:95 ../plugins/git/git-merge-pane.c:70
+msgid "Please enter a log message."
+msgstr "è«?輸å?¥ç´?é??è¨?æ?¯ã??"
 
-#: ../plugins/git/git-commit-dialog.c:105
-msgid "Please enter the commit author's name."
+#: ../plugins/git/git-commit-pane.c:144
+msgid "Please enter the commit author's name"
 msgstr "è«?輸å?¥æ??交ä½?è??ç??å??稱ã??"
 
-#: ../plugins/git/git-commit-dialog.c:115
+#: ../plugins/git/git-commit-pane.c:148
 msgid "Please enter the commit author's e-mail address."
 msgstr "è«?輸å?¥æ??交ä½?è??ç??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../plugins/git/git-create-branch-dialog.c:41
-#, c-format
-msgid "Git: Created branch \"%s\"."
-msgstr "Gitï¼?已建ç«?å??æ?¯ã??%sã??ã??"
-
-#: ../plugins/git/git-create-tag-dialog.c:41
-#, c-format
-msgid "Git: Created tag \"%s\"."
-msgstr "Gitï¼?已建ç«?æ¨?籤ã??%sã??ã??"
+#: ../plugins/git/git-commit-pane.c:304 ../plugins/git/plugin.c:146
+msgid "Commit"
+msgstr "Commit"
 
-#: ../plugins/git/git-create-tag-dialog.c:111
-msgid "Please enter a tag name."
-msgstr "è«?輸å?¥æ¨?籤å??稱ã??"
+#: ../plugins/git/git-cherry-pick-pane.c:53
+#: ../plugins/git/git-create-tag-pane.c:80 ../plugins/git/git-merge-pane.c:56
+#: ../plugins/subversion/subversion-copy-dialog.c:207
+#: ../plugins/subversion/subversion-switch-dialog.c:122
+msgid "Please enter a revision."
+msgstr "è«?輸å?¥ä¿®è¨?ç??ã??"
 
-#: ../plugins/git/git-delete-branch-dialog.c:37
-msgid "Git: Deleted selected branches."
-msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
+#: ../plugins/git/git-cherry-pick-pane.c:173
+msgid "Cherry Pick"
+msgstr "Cherry Pick"
 
-#: ../plugins/git/git-delete-branch-dialog.c:106
-msgid "Please select branches to delete"
-msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
+#: ../plugins/git/git-diff-pane.c:103
+msgid "No revision selected"
+msgstr "å°?æ?ªé?¸æ??ä¿®è¨?ç??"
 
-#: ../plugins/git/git-delete-tag-dialog.c:37
-msgid "Git: Deleted selected tags."
-msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
+#: ../plugins/git/git-reset-pane.c:167
+msgid "Reset"
+msgstr "Reset"
 
-#. Translators: default file name for git diff's output
-#: ../plugins/git/git-diff-dialog.c:42
-#| msgid "Stash Uncommitted Changes"
-msgid "Uncommitted Changes.diff"
-msgstr "Uncommitted Changes.diff"
+#: ../plugins/git/git-revert-pane.c:48
+msgid "Please enter a commit."
+msgstr "è«?輸å?¥ä¸?次æ??交ã??"
 
-#. Translators: file name for an existing commits diff, %s is an SHASUM of a commit
-#: ../plugins/git/git-diff-dialog.c:77
-#, c-format
-#| msgid "_Show commit diff"
-msgid "Commit %s.diff"
-msgstr "Commit %s.diff"
+#: ../plugins/git/git-revert-pane.c:162
+msgid "Revert"
+msgstr "Revert"
 
-#: ../plugins/git/git-fetch-dialog.c:40
-msgid "Git: Fetch complete."
-msgstr "Gitï¼?å??å??å·²å®?æ??ã??"
+#: ../plugins/git/git-create-branch-pane.c:51
+msgid "Please enter a branch name."
+msgstr "è«?輸å?¥å??æ?¯å??稱ã??"
 
-#: ../plugins/git/git-log-dialog.c:152
-msgid "Graph"
-msgstr "å??表"
+#: ../plugins/git/git-create-tag-pane.c:66
+msgid "Please enter a tag name."
+msgstr "è«?輸å?¥æ¨?籤å??稱ã??"
 
-#: ../plugins/git/git-log-dialog.c:167
-msgid "Short log"
-msgstr "ç?­ç´?é??"
+#: ../plugins/git/git-create-tag-pane.c:243
+msgid "Create Tag"
+msgstr "建��籤"
 
-#: ../plugins/git/git-log-dialog.c:178
-#: ../plugins/subversion/subversion-log-dialog.c:132
-msgid "Author"
-msgstr "ä½?è??"
+#: ../plugins/git/git-delete-remote-pane.c:49
+msgid "No remote selected."
+msgstr "å°?æ?ªé?¸å??é? ç«¯ã??"
 
-#: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving logâ?¦"
-msgstr "Gitï¼?æ­£å?¨å??å??ç´?é??æª?â?¦"
+#: ../plugins/git/git-delete-tags-pane.c:49
+msgid "No tags selected."
+msgstr "å°?æ?ªé?¸å??æ¨?籤ã??"
 
-#: ../plugins/git/git-log-dialog.c:360
-#: ../plugins/subversion/subversion-add-dialog.c:65
-#: ../plugins/subversion/subversion-diff-dialog.c:116
-#: ../plugins/subversion/subversion-remove-dialog.c:98
-#: ../plugins/subversion/subversion-update-dialog.c:68
-msgid "Please enter a path."
-msgstr "è«?輸å?¥è·¯å¾?ã??"
-
-#: ../plugins/git/git-log-dialog.c:399
-msgid "Select a file"
-msgstr "é?¸æ??æª?æ¡?"
+#: ../plugins/git/git-diff-stash-pane.c:40
+#, c-format
+msgid "Stash %i.diff"
+msgstr "Stash %i.diff"
 
-#: ../plugins/git/git-log-dialog.c:546
+#: ../plugins/git/git-log-pane.c:560
 #, c-format
 msgid "<b>Branch:</b> %s"
 msgstr "<b>å??æ?¯:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:551
+#: ../plugins/git/git-log-pane.c:565
 #, c-format
 msgid "<b>Tag:</b> %s"
 msgstr "<b>�籤:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:556
+#: ../plugins/git/git-log-pane.c:570
 #, c-format
 msgid "<b>Remote:</b> %s"
 msgstr "<b>�端:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:849
-#: ../plugins/git/plugin.c:674
-#: ../plugins/git/plugin.c:867
-msgid "Branch"
-msgstr "å??æ?¯"
+#: ../plugins/git/git-merge-pane.c:222 ../plugins/git/plugin.c:97
+msgid "Merge"
+msgstr "å??ä½µ"
 
-#: ../plugins/git/git-merge-dialog.c:36
-msgid "Git: Merge complete."
-msgstr "Gitï¼?å??ä½µå®?æ??ã??"
-
-#: ../plugins/git/git-pull-dialog.c:36
-msgid "Git: Pull complete."
-msgstr "Gitï¼? Pull å·²å®?æ??ã??"
-
-#. The "input widget" is the widget that should receive focus if the
-#. * user does not properly enter anything
-#: ../plugins/git/git-pull-dialog.c:124
-msgid "Please select a remote to pull from."
-msgstr "è«?輸å?¥è¦? pull ç??é? ç«¯ã??"
-
-#: ../plugins/git/git-pull-dialog.c:142
-msgid "Please enter the URL of the repository to pull from."
-msgstr "è«?輸å?¥è¦? pull ç??æª?æ¡?庫 URLã??"
-
-#: ../plugins/git/git-push-dialog.c:36
-msgid "Git: Push complete."
-msgstr "Git: Push complete."
-
-#. The "input widget" is the widget that should receive focus if the
-#. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:144
-msgid "Please select a remote to push to."
-msgstr "è«?é?¸æ??è¦? push ç??é? ç«¯ã??"
-
-#: ../plugins/git/git-push-dialog.c:162
-msgid "Please enter the URL of the repository to push to."
-msgstr "è«?輸å?¥è¦? push å?°ç??æª?æ¡?庫 URLã??"
-
-#: ../plugins/git/git-push-dialog.c:197
-msgid "Git: Pushingâ?¦"
-msgstr "Gitï¼?Pushingâ?¦"
-
-#: ../plugins/git/git-rebase-dialog.c:60
-msgid "Git: Rebasing"
-msgstr "Gitï¼?æ­£å?¨é??è¨?å?ºç¤?"
-
-#: ../plugins/git/git-remove-dialog.c:36
-msgid "Git: File removed."
-msgstr "Gitï¼?æª?æ¡?已移é?¤ã??"
-
-#: ../plugins/git/git-resolve-dialog.c:36
-msgid "Git: Resolve complete."
-msgstr "Gitï¼?調解已å®?æ??ã??"
-
-#: ../plugins/git/git-stash-widget.c:219
-msgid "Git: Stash dropped."
-msgstr "Gitï¼?Stash å·²æ?¾æ£?ã??"
-
-#: ../plugins/git/git-stash-widget.c:275
-msgid "Git: All stashes cleared."
-msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
-
-#: ../plugins/git/git-switch-dialog.c:36
-msgid "Git: Branch checkout complete."
-msgstr "Gitï¼?å??å??å??æ?¯å®?æ??ã??"
-
-#: ../plugins/git/git-ui-utils.c:89
-#: ../plugins/git/git-ui-utils.c:94
-#: ../plugins/git/git.plugin.in.h:1
+#: ../plugins/git/git-pane.c:77 ../plugins/git/git-pane.c:82
+#: ../plugins/git/plugin.c:700 ../plugins/git/git.plugin.in.h:1
 msgid "Git"
 msgstr "Git"
 
-#: ../plugins/git/git-ui-utils.c:158
-msgid "There are no branches available."
-msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
+#: ../plugins/git/git-pane.c:204
+msgid "Git Error"
+msgstr "Git �誤"
 
-#: ../plugins/git/git-ui-utils.c:194
-msgid "Please select a stash"
-msgstr "è«?é?¸æ??ä¸?å?? stash"
+#: ../plugins/git/git-pane.c:210
+msgid "Git Warning"
+msgstr "Git è­¦å??"
 
-#: ../plugins/git/git-ui-utils.c:603
-msgid "Git: Changes stored in a stash."
-msgstr "Gitï¼?å?²å­?å?¨ stash ç??æ?´æ?¹ã??"
+#: ../plugins/git/git-patch-series-pane.c:167
+msgid "Generate Patch Series"
+msgstr "建ç«?ä¿®è£?æª?ç³»å??"
 
-#: ../plugins/git/git-ui-utils.c:619
-msgid "Git: Stashed changes applied."
-msgstr "Gitï¼?å¥?ç?¨å·² stash ç??æ?´æ?¹ã??"
+#: ../plugins/git/git-pull-pane.c:66 ../plugins/git/git-push-pane.c:94
+msgid "Please enter a URL."
+msgstr "è«?輸å?¥ URLã??"
 
-#: ../plugins/git/git-ui-utils.c:743
-msgid "Git: Diff complete."
-msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
+#: ../plugins/git/git-pull-pane.c:235 ../plugins/git/plugin.c:246
+msgid "Pull"
+msgstr "Pull"
 
-#: ../plugins/git/git-ui-utils.c:759
-#, c-format
-msgid "Column %i"
-msgstr "� %i"
+#: ../plugins/git/git-push-pane.c:434 ../plugins/git/plugin.c:238
+msgid "Push"
+msgstr "Push"
 
-#: ../plugins/git/git-unstage-dialog.c:36
-msgid "Git: Files unstaged."
-msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
+#: ../plugins/git/git-rebase-pane.c:61
+msgid "No remote selected"
+msgstr "å°?æ?ªé?¸å??é? ç«¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:68
-#: ../plugins/git/plugin.c:575
-msgid "_Git"
-msgstr "_Git"
+#: ../plugins/git/git-remove-files-pane.c:157
+msgid "Remove Files"
+msgstr "移���"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:79
-msgid "_Changes"
-msgstr "æ?´æ?¹(_C)"
+#: ../plugins/git/git-repository-selector.c:66
+msgid "Remote"
+msgstr "�端"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:87
-#: ../plugins/subversion/plugin.c:76
-msgid "_Commitâ?¦"
-msgstr "_Commitâ?¦"
+#: ../plugins/git/git-repository-selector.c:81
+msgid "URL"
+msgstr "網å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:89
-msgid "Commit changes to the local repository"
-msgstr "æ??交æ?´æ?¹è?³æ?¬å?°ç«¯æª?æ¡?庫"
+#: ../plugins/git/git-repository-selector.c:100
+msgid "<b>Selected Remote:</b>"
+msgstr "<b>é?¸å??ç??é? ç«¯ï¼?</b>"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:95
-msgid "_Diff uncommitted changes"
-msgstr "_Diff uncommitted changes"
+#: ../plugins/git/git-repository-selector.c:199
+msgid ""
+"No remote selected; using origin by default.\n"
+"To push to a different remote, select one from the Remotes list above."
+msgstr ""
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:97
-msgid "Show uncommitted changes"
-msgstr "顯示æ?ªæ??交ç??æ?´æ?¹"
+#: ../plugins/git/git-resolve-conflicts-pane.c:50
+msgid "No conflicted files selected."
+msgstr "æ²?æ??é?¸å??è¡?çª?ç??æª?æ¡?ã??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:103
-msgid "_Stash"
-msgstr "_Stash"
+#: ../plugins/git/git-stash-changes-pane.c:158
+msgid "Stash Uncommitted Changes"
+msgstr "Stash æ?ªæ??交ç??æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changesâ?¦"
-msgstr "_Stash æ?ªæ??交ç??æ?´æ?¹â?¦"
+#: ../plugins/git/git-status-pane.c:368
+msgid "Changes to be committed"
+msgstr "è¦?æ??交ç??æ?¹è®?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:113
-msgid "Save uncommitted changes and re-apply them later"
-msgstr "å°?æ?ªæ??交ç??æ?´æ?¹å?²å­?並å?¨ç¨?å¾?é??æ?°å¥?ç?¨å®?å??"
+#: ../plugins/git/git-status-pane.c:377
+msgid "Changed but not updated"
+msgstr "已�������"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changesâ?¦"
-msgstr "��已 stash ��(_A)�"
+#: ../plugins/git/git-unstage-pane.c:51
+msgid "No staged files selected."
+msgstr "å°?æ?ªé?¸æ??å·² stage æª?æ¡?ã??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:121
-msgid "Apply stashed changes to the working tree"
-msgstr "å¥?ç?¨å·² stash ç??æ?´æ?¹å?° working tree"
+#: ../plugins/git/plugin.c:65
+msgid "Branch tools"
+msgstr "å??æ?¯å·¥å?·"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:127
-#: ../plugins/git/plugin.c:583
-msgid "_View logâ?¦"
-msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
+#: ../plugins/git/plugin.c:73 ../plugins/git/plugin.c:74
+msgid "Create a branch"
+msgstr "建ç«?å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:129
-msgid "View change history"
-msgstr "檢è¦?æ?´æ?¹æ­·å?²ç´?é??"
+#: ../plugins/git/plugin.c:81 ../plugins/git/plugin.c:82
+msgid "Delete selected branches"
+msgstr "è¦?å?ªé?¤ç??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:135
-msgid "_Remote repository"
-msgstr "�端��庫(_R)"
+#: ../plugins/git/plugin.c:89 ../plugins/git/plugin.c:90
+msgid "Switch to the selected branch"
+msgstr "å??æ??è?³é?¸å??ç??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:143
-msgid "_Pushâ?¦"
-msgstr "_Pushâ?¦"
+#: ../plugins/git/plugin.c:98
+msgid "Merge a revision into the current branch"
+msgstr "å°?ä¿®è¨?ç??å??ä½µå?°ç?®å??ç??å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:145
-msgid "Push changes to a remote repository"
-msgstr "��� push ��端��庫"
+#: ../plugins/git/plugin.c:109
+msgid "Tag tools"
+msgstr "�籤工�"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:151
-msgid "_Pullâ?¦"
-msgstr "_Pullâ?¦"
+#: ../plugins/git/plugin.c:117 ../plugins/git/plugin.c:118
+msgid "Create a tag"
+msgstr "建��籤"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:153
-msgid "Update the working copy"
-msgstr "��工���"
+#: ../plugins/git/plugin.c:125 ../plugins/git/plugin.c:126
+msgid "Delete selected tags"
+msgstr "è¦?å?ªé?¤ç??æ¨?籤"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:159
-msgid "_Fetch"
-msgstr "_Fetch"
+#: ../plugins/git/plugin.c:138
+msgid "Changes"
+msgstr "æ?´æ?¹"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:161
-msgid "Update remote branches"
-msgstr "æ?´æ?°é? ç«¯å??æ?¯"
+#: ../plugins/git/plugin.c:147
+msgid "Commit changes"
+msgstr "æ??交æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:167
-msgid "_Files"
-msgstr "��(_F)"
+#: ../plugins/git/plugin.c:154
+msgid "Diff uncommitted changes"
+msgstr "æ¯?å°?æ?ªæ??交ç??æ?´æ?¹"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:175
-#: ../plugins/git/plugin.c:375
-#: ../plugins/git/plugin.c:591
-#: ../plugins/subversion/plugin.c:60
-#: ../plugins/subversion/plugin.c:175
-msgid "_Addâ?¦"
-msgstr "å? å?¥(_A)â?¦"
+#: ../plugins/git/plugin.c:155
+msgid "Show a diff of uncommitted changes in an editor"
+msgstr "å?¨ç·¨è¼¯å?¨é¡¯ç¤ºæ?ªæ??交æ?´æ?¹ç??å·®ç?°"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:177
-msgid "Add files to the repository"
-msgstr "�������庫"
+#: ../plugins/git/plugin.c:170
+#: ../plugins/snippets-manager/snippets-editor.ui.h:3
+msgid "Add"
+msgstr "å? å?¥"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:183
-#: ../plugins/git/plugin.c:599
-#: ../plugins/subversion/plugin.c:68
-#: ../plugins/subversion/plugin.c:183
-msgid "_Removeâ?¦"
-msgstr "移�(_R)�"
+#: ../plugins/git/plugin.c:171
+msgid "Add files to the index"
+msgstr "�����索�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:185
+#: ../plugins/git/plugin.c:179
 msgid "Remove files from the repository"
 msgstr "���庫移���"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:191
-msgid "_Ignoreâ?¦"
-msgstr "忽�(_I)�"
+#: ../plugins/git/plugin.c:186
+msgid "Check out"
+msgstr "Check out"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:193
-msgid "Ignore files"
-msgstr "忽���"
+#: ../plugins/git/plugin.c:187
+msgid "Revert changes in unstaged files"
+msgstr "å°?æ?ª stage æª?æ¡?ç??æ?´æ?¹é??å??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:199
-msgid "_Check out filesâ?¦"
-msgstr "_Check out ���"
+#: ../plugins/git/plugin.c:194
+msgid "Unstage"
+msgstr "Unstage"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:201
-msgid "Revert uncommitted changes to files"
-msgstr "å°?æ?ªæ??交ç??æ?´æ?¹é??å??ç?ºæª?æ¡?"
+#: ../plugins/git/plugin.c:195
+msgid "Remove staged files from the index"
+msgstr "å¾?ç´¢å¼?中移é?¤å·² stage ç??æª?æ¡?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:207
-msgid "_Unstage filesâ?¦"
-msgstr "��� _Unstage�"
+#: ../plugins/git/plugin.c:202
+msgid "Resolve conflicts"
+msgstr "Resolve conflicts"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:209
-msgid "Remove files from the commit index"
-msgstr "å¾?æ??交索å¼?中移é?¤æª?æ¡?"
+#: ../plugins/git/plugin.c:203
+msgid "Mark selected conflicted files as resolved"
+msgstr "å°?é?¸å??ç??è¡?çª?æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:215
-msgid "_Resolve conflictsâ?¦"
-msgstr "_Resolve conflictsâ?¦"
+#: ../plugins/git/plugin.c:214
+msgid "Remote repository tools"
+msgstr "�端��庫工�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:217
-msgid "Mark conflicted files as resolved"
-msgstr "å°?è¡?çª?ç??æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
+#: ../plugins/git/plugin.c:222
+msgid "Add a remote"
+msgstr "���端"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:223
-#: ../plugins/patch/patch-plugin.c:117
-msgid "Patches"
-msgstr "修�"
+msgid "Add a remote repository"
+msgstr "���端��庫"
+
+#: ../plugins/git/plugin.c:230
+msgid "Delete selected remote"
+msgstr "å?ªé?¤é?¸å??ç??é? ç«¯"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch seriesâ?¦"
-msgstr "建� patch series�"
+msgid "Delete a remote"
+msgstr "���端"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:233
-msgid "Generate patch files for submission upstream"
-msgstr "å¾?æ??交ä¸?游ç?¢ç??ä¿®è£?æª?æ¡?"
+#: ../plugins/git/plugin.c:239
+msgid "Push changes to a remote repository"
+msgstr "��� push ��端��庫"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Applyâ?¦"
-msgstr "��(_A)�"
+msgid "Pull changes from a remote repository"
+msgstr "��端��庫 pull ��"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:249
-msgid "Start applying a patch series"
-msgstr "é??å§?å¥?ç?¨ patch series"
+#: ../plugins/git/plugin.c:254
+msgid "Fetch"
+msgstr "Fetch"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:255
-msgid "_Continue with resolved conflicts"
-msgstr "以解決å¾?ç??è¡?çª?ç¹¼çº?(_C)"
+msgid "Fetch changes from remote repositories"
+msgstr "��端��庫 fetch ��"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:257
-msgid "Continue applying a series after resolving conflicts"
-msgstr "�解決���繼��� series"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:263
-msgid "_Skip current patch"
-msgstr "忽ç?¥ç?®å??ç??ä¿®è£?æª?(_S)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:265
-msgid "Skip the current patch in the series and continue"
-msgstr "ç?¥é??ç?®å?? series 中ç?? patch 並繼çº?"
+#: ../plugins/git/plugin.c:270
+#, fuzzy
+msgid "Rebase against selected remote"
+msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:271
-#: ../plugins/git/plugin.c:351
-msgid "_Abort"
-msgstr "_Abort"
+msgid "Start a rebase operation relative to the selected remote repository"
+msgstr "å°?é?¸å??ç??é? ç«¯æª?æ¡?庫å??å??ç?¸å°?ç?? rebase æ??ä½?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:273
-msgid "Stop applying the series and return the repository to its original state"
-msgstr "å??æ­¢å¥?ç?¨é??å?? series 並å°?æª?æ¡?庫å??復å?°å??ä¾?ç??ç??æ??"
+#: ../plugins/git/plugin.c:278 ../plugins/git/plugin.c:446
+msgid "Continue"
+msgstr "Continue"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:279
-msgid "_Branches"
-msgstr "å??æ?¯(_B)"
+msgid "Continue a rebase with resolved conflicts"
+msgstr "以解決å¾?ç??è¡?çª?ç¹¼çº? rebase"
+
+#: ../plugins/git/plugin.c:286 ../plugins/git/plugin.c:454
+msgid "Skip"
+msgstr "Skip"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:287
-#: ../plugins/git/plugin.c:507
-msgid "_Create branchâ?¦"
-msgstr "建� bran_ch�"
+msgid "Skip the current revision"
+msgstr "忽ç?¥ç?®å??ç??ä¿®è¨?ç??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:289
-msgid "Create a branch"
-msgstr "建ç«?å??æ?¯"
+#: ../plugins/git/plugin.c:294 ../plugins/git/plugin.c:462
+msgid "Abort"
+msgstr "Abort"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:295
-msgid "_Delete branchâ?¦"
-msgstr "�� branch(_D)�"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:297
-msgid "Delete branches"
-msgstr "å?ªé?¤å??æ?¯"
+msgid "Abort the rebase and return the repository to its previous state"
+msgstr "中止 rebase 並å°?æª?æ¡?庫設å??å??ä¸?å??ç??æ??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:303
-msgid "_Switch to another branchâ?¦"
-msgstr "å??æ??è?³å?¦ä¸?å?? branch(_S)â?¦"
+#: ../plugins/git/plugin.c:306
+msgid "Stash tools"
+msgstr "Stash 工�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:305
-msgid "Switch to another branch"
-msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
+#: ../plugins/git/plugin.c:314
+msgid "Stash uncommitted changes"
+msgstr "Stash uncommitted changes"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:311
-msgid "_Mergeâ?¦"
-msgstr "_Mergeâ?¦"
+#: ../plugins/git/plugin.c:315
+msgid "Save uncommitted changes without committing them"
+msgstr "å°?æ?ªæ??交ç??æ?´æ?¹å?²å­?è??ä¸?æ??交å®?å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:313
-msgid "Merge changes from another branch into the current one"
-msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µæ?´æ?¹è?³ç?®å??ç??å??æ?¯"
+#: ../plugins/git/plugin.c:322
+msgid "Apply selected stash"
+msgstr "å¥?ç?¨é?¸å??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:319
-msgid "_Rebase"
-msgstr "_Rebase"
+#: ../plugins/git/plugin.c:323
+msgid "Apply stashed changes back into the working tree"
+msgstr "å¥?ç?¨å·² stash ç??æ?´æ?¹å?° working tree"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:321
-msgid "Merge your changes with an upstream remote branch"
-msgstr "å°?ä½ ç??æ?´æ?¹è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+#: ../plugins/git/plugin.c:330
+msgid "Apply stash and restore index"
+msgstr "å¥?ç?¨ stash 並é??å??ç´¢å¼?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:327
-#: ../plugins/git/plugin.c:447
-msgid "_Startâ?¦"
-msgstr "é??å§?(_S)â?¦"
+#: ../plugins/git/plugin.c:331
+msgid "Apply stashed changes back into the working tree and the index"
+msgstr "å¥?ç?¨å·² stash ç??æ?´æ?¹å?° working tree è??ç´¢å¼?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:329
-msgid "Start a rebase"
-msgstr "é??å§? rebase"
+#: ../plugins/git/plugin.c:338
+msgid "Diff selected stash"
+msgstr "æ¯?å°?é?¸å??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:335
-msgid "_Continue"
-msgstr "_Continue"
+#: ../plugins/git/plugin.c:339
+msgid "Show a diff of the selected stash"
+msgstr "顯示é?¸å??ç?? stash"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:337
-msgid "Continue a rebase that stopped because of conflicts"
-msgstr "ç¹¼çº?å? è¡?çª?è??å??æ­¢ç?? rebase"
+#: ../plugins/git/plugin.c:346
+msgid "Drop selected stash"
+msgstr "æ?¾æ£?é?¸å??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:343
-msgid "_Skip"
-msgstr "_Skip"
+#: ../plugins/git/plugin.c:347
+msgid "Delete the selected stash"
+msgstr "å?ªé?¤é?¸å??ç?? stash"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:345
-msgid "Skip the current conflicted commit and continue"
-msgstr "ç?¥é??ç?®å??è¡?çª?ç?? commit 並繼çº?"
+#: ../plugins/git/plugin.c:354
+msgid "Clear all stashes"
+msgstr "æ¸?é?¤æ??æ?? stash"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:353
-msgid "Abort the rebase and put the repository in its original state"
-msgstr "中止 rebase 並å°?æª?æ¡?庫設å??å??å§?ç??æ??"
+#: ../plugins/git/plugin.c:355
+msgid "Delete all stashes in this repository"
+msgstr "å?ªé?¤é??å??æª?æ¡?庫中æ??æ??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:359
-#: ../plugins/git/plugin.c:539
-msgid "_Cherry pickâ?¦"
-msgstr "_Cherry pickâ?¦"
+#: ../plugins/git/plugin.c:366
+msgid "Revision tools"
+msgstr "ä¿®è¨?ç??å·¥å?·"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:361
-msgid "Selectively merge individual changes from other branches into the current one"
-msgstr "é?¸æ??æ?§ç??å°?å??å?¥æ?´æ?¹å¾?å?¶ä»?å??æ?¯å??ä½µå?°ç?®å??ç??å??æ?¯"
+#: ../plugins/git/plugin.c:374
+msgid "Show commit diff"
+msgstr "Show commit diff"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:367
-msgid "_Remote branches"
-msgstr "_Remote branches"
+#: ../plugins/git/plugin.c:375
+msgid "Show a diff of the selected revision"
+msgstr "顯示é?¸å??ç??ä¿®è¨?ç??ç??å·®ç?°"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:377
-msgid "Add a remote branch"
-msgstr "å? å?¥é? ç«¯å??æ?¯"
+#: ../plugins/git/plugin.c:382
+msgid "Cherry pick"
+msgstr "Cherry pick"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Deleteâ?¦"
-msgstr "��(_D)�"
+msgid "Merge an individual commit from another branch"
+msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µå??å?¥ç??æ??交"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:385
-msgid "Delete a remote branch"
-msgstr "å?ªé?¤é? ç«¯å??æ?¯"
+#: ../plugins/git/plugin.c:390
+msgid "Reset/Revert"
+msgstr "Reset/Revert"
+
+#: ../plugins/git/plugin.c:398
+msgid "Reset tree"
+msgstr "é??設æª?æ¡?樹"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:399
-#: ../plugins/git/plugin.c:515
-msgid "_Create tagâ?¦"
-msgstr "建��籤(_C)�"
+msgid "Reset tree to a previous revision"
+msgstr "é??設æª?æ¡?樹å?°å??ä¸?å??ä¿®è¨?ç??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:401
-msgid "Create a tag"
-msgstr "建��籤"
+#: ../plugins/git/plugin.c:406
+msgid "Revert commit"
+msgstr "å??復æ??交"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:407
-msgid "_Delete tagâ?¦"
-msgstr "���籤(_D)�"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:409
-msgid "Delete tags"
-msgstr "���籤"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:415
-msgid "_Reset/Revert"
-msgstr "_Reset/Revert"
+msgid "Revert a commit"
+msgstr "復å??æ??交"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:423
-#: ../plugins/git/plugin.c:523
-msgid "_Reset treeâ?¦"
-msgstr "_Reset treeâ?¦"
+#: ../plugins/git/plugin.c:414
+msgid "Patch series"
+msgstr "ä¿®è£?æª?ç³»å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:425
-msgid "Reset repository head to any past state"
-msgstr "å°?æª?æ¡?庫ç?? head é??設ç?ºä»»ä½?é??å?»ç??ç??æ??"
+#: ../plugins/git/plugin.c:422 ../plugins/git/plugin.c:423
+msgid "Generate a patch series"
+msgstr "建ç«?ä¿®è£?æª?ç³»å??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:431
-#: ../plugins/git/plugin.c:531
-msgid "_Revert commitâ?¦"
-msgstr "_Revert commitâ?¦"
+#: ../plugins/git/plugin.c:430
+msgid "Mailbox files"
+msgstr "Mailbox ��"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:433
-msgid "Revert a commit"
-msgstr "復å??æ??交"
+#: ../plugins/git/plugin.c:438
+msgid "Apply mailbox files"
+msgstr "��信箱��"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:439
-msgid "Bisect"
-msgstr "Bisect"
+msgid "Apply patches from mailbox files"
+msgstr "å¥?ç?¨ mailbox æª?æ¡?ç??ä¿®è£?æª?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:449
-msgid "Start a bisect operation"
-msgstr "é??å§? bisect æ??ä½?"
+#: ../plugins/git/plugin.c:447
+msgid "Continue applying patches with resolved conflicts"
+msgstr "�解決���繼���修��"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:455
-msgid "_Reset"
-msgstr "é??ç½®(_R)"
+msgid "Skip the current patch in the series"
+msgstr "ç?¥é??ç?®å??ç³»å??中ç??ä¿®è£?æª?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:457
-msgid "Stop the bisect and bring the tree back to normal"
-msgstr "å??æ­¢ bisect 並å°?å??å§?碼樹帶å??正常ç??æ??"
-
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:463
-msgid "_Good"
-msgstr "_Good"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:465
-msgid "Mark the current head revision as good"
-msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º good"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:471
-msgid "_Bad"
-msgstr "_Bad"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:473
-msgid "Mark the current head revision as bad"
-msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º bad"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:479
-msgid "_Initialize repository"
-msgstr "å??å§?å??æª?æ¡?庫(_I)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:481
-msgid "Create a new git repository or reinitialize an existing one"
-msgstr "建ç«?æ?° git æª?æ¡?庫æ??é??æ?°å??å§?å??ç?¾æ??ç??æª?æ¡?庫"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:491
-msgid "_Show commit diff"
-msgstr "_Show commit diff"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:493
-msgid "Show changes introduced by this commit"
-msgstr "顯示ä»?ç´¹é??次æ??交ç??æ?´æ?¹"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:499
-msgid "_View selected revision"
-msgstr "_View selected revision"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:501
-msgid "View a copy of this file at this revision"
-msgstr "檢è¦?é??次修è¨?ç??ç??æª?æ¡?è¤?æ?¬"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:509
-msgid "Create a branch with the selected revision as its head"
-msgstr "建ç«?ä¸?å??å??æ?¯ä¸¦ä»¥é?¸å??ç??ä¿®è¨?ç??å??ç?ºå®?ç?? head"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:517
-msgid "Create a tag at this revision"
-msgstr "建ç«?此修è¨?ç??ç??æ¨?籤"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:525
-msgid "Reset repository head to this revision"
-msgstr "é??設é??å??ä¿®è¨?ç??ç??æª?æ¡?庫"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:533
-msgid "Revert this commit"
-msgstr "復å??此次æ??交"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:541
-msgid "Merge this commit into the current branch"
-msgstr "å°?é??次æ??交å??ä½µå?°ç?®å??ç??å??æ?¯"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:547
-msgid "_Bisect"
-msgstr "_Bisect"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:555
-msgid "_Set good revision"
-msgstr "_Set good revision"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:557
-msgid "Mark this revision as good"
-msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º good"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:563
-msgid "_Set bad revision"
-msgstr "_Set bad revision"
+msgid ""
+"Stop applying the patch series and return the tree to its previous state"
+msgstr "å??æ­¢å¥?ç?¨é??å??ç³»å??並å°?æª?æ¡?樹å??復å?°å??ä¾?ç??ç??æ??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:565
-msgid "Mark this revision as bad"
-msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º bad"
+#: ../plugins/git/plugin.c:554 ../plugins/git/plugin.c:627
+msgid "Branch"
+msgstr "å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:585
-msgid "View changes to this file or folder"
-msgstr "檢è¦?å?¨é??å??æª?æ¡?æ??è³?æ??夾ç??æ?´æ?¹"
+#: ../plugins/git/plugin.c:696
+msgid "Git Tasks"
+msgstr "Git 工�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:593
-msgid "Add this file or folder to the repository"
-msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å? å?¥æª?æ¡?庫"
+#: ../plugins/git/plugin.c:758
+msgid "Status"
+msgstr "ç??æ??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:601
-msgid "Remove this file or folder from the repository"
-msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å¾?æª?æ¡?庫移é?¤"
+#: ../plugins/git/plugin.c:764
+msgid "Log"
+msgstr "ç´?é??"
 
-#: ../plugins/git/plugin.c:766
-msgid "Top level git menu item"
-msgstr "�端層� git ����"
+#: ../plugins/git/plugin.c:770
+msgid "Branches"
+msgstr "å??æ?¯"
 
-#: ../plugins/git/plugin.c:774
-msgid "Git operations"
-msgstr "Git æ??ä½?"
+#: ../plugins/git/plugin.c:775
+msgid "Tags"
+msgstr "�籤"
 
-#: ../plugins/git/plugin.c:779
-msgid "Git log operations"
-msgstr "Git ç´?é??æª?æ??ä½?"
+#: ../plugins/git/plugin.c:781
+msgid "Remotes"
+msgstr "�端"
 
-#: ../plugins/git/plugin.c:784
-msgid "Git FM operations"
-msgstr "Git FM æ??ä½?"
+#: ../plugins/git/plugin.c:787
+msgid "Stash"
+msgstr "Stash"
 
-#: ../plugins/git/plugin.c:799
-msgid "Git Log"
-msgstr "Git ç´?é??æª?"
+#: ../plugins/glade/plugin.c:375
+msgid "Loading Gladeâ?¦"
+msgstr "正��� Glade�"
 
-#: ../plugins/glade/plugin.c:416
+#: ../plugins/glade/plugin.c:420
 msgid "Widgets"
 msgstr "è¦?çª?å??件"
 
-#: ../plugins/glade/plugin.c:421
+#: ../plugins/glade/plugin.c:425
 msgid "Palette"
 msgstr "å??件ä¸?覽表"
 
-#: ../plugins/glade/plugin.c:552
+#: ../plugins/glade/plugin.c:541
 #, c-format
 msgid "Not local file: %s"
 msgstr "�������%s"
 
-#: ../plugins/glade/plugin.c:593
+#: ../plugins/glade/plugin.c:587
 #, c-format
 msgid "Could not open %s"
 msgstr "ç?¡æ³?é??å?? %s"
 
-#: ../plugins/glade/plugin.c:646
+#: ../plugins/glade/plugin.c:642
 msgid "Could not create a new glade project."
 msgstr "ç?¡æ³?建ç«?æ?° Glade å°?æ¡?ã??"
 
-#: ../plugins/glade/anjuta-design-document.c:156
-#: ../plugins/glade/anjuta-design-document.c:183
+#: ../plugins/glade/anjuta-design-document.c:166
+#: ../plugins/glade/anjuta-design-document.c:193
 #, c-format
 msgid "Glade project '%s' saved"
 msgstr "已�� Glade �� '%s'"
 
-#: ../plugins/glade/anjuta-design-document.c:163
-#: ../plugins/glade/anjuta-design-document.c:190
+#: ../plugins/glade/anjuta-design-document.c:173
+#: ../plugins/glade/anjuta-design-document.c:200
 msgid "Invalid Glade file name"
 msgstr "ç?¡æ??ç?? Glade æª?æ¡?å??稱"
 
-#: ../plugins/gtodo/add_edit_item.c:99
-msgid "You need to select a to do item before you can edit it"
-msgstr "ä½ é??è¦?å??é?¸æ??ä¸?å??é ?ç?®æ??è?½ç·¨è¼¯å®?"
-
-#: ../plugins/gtodo/add_edit_item.c:118
-msgid "Add Item"
-msgstr "����"
-
-#: ../plugins/gtodo/add_edit_item.c:121
-msgid "Edit Item"
-msgstr "編輯��"
-
-#: ../plugins/gtodo/add_edit_item.c:152
-#: ../plugins/gtodo/add_edit_item.c:153
-#: ../plugins/gtodo/list_tooltip.c:42
-msgid "Summary:"
-msgstr "æ??è¦?ï¼?"
-
-#. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172
-msgid "Category:"
-msgstr "å??é¡?:"
-
-#: ../plugins/gtodo/add_edit_item.c:193
-#: ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20
-#: ../plugins/gtodo/todo_db.c:76
-msgid "Edit Categories"
-msgstr "編輯å??é¡?"
-
-#: ../plugins/gtodo/add_edit_item.c:205
-#: ../plugins/gtodo/list_tooltip.c:48
-#: ../plugins/gtodo/list_tooltip.c:54
-msgid "Due date:"
-msgstr "å?°æ??æ?¥ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:224
-msgid "Notify when due"
-msgstr "ç?¶å?°æ??æ??é??ç?¥"
-
-#. label
-#: ../plugins/gtodo/add_edit_item.c:237
-#: ../plugins/gtodo/list_tooltip.c:64
-#: ../plugins/gtodo/list_tooltip.c:71
-#: ../plugins/gtodo/list_tooltip.c:77
-msgid "Priority:"
-msgstr "å?ªå??ç­?ç´?ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:258
-#: ../plugins/gtodo/add_edit_item.c:259
-#: ../plugins/gtodo/list_tooltip.c:81
-msgid "Comment:"
-msgstr "å??註ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:283
-msgid "Completed"
-msgstr "å·²å®?æ??"
-
-#: ../plugins/gtodo/add_edit_item.c:289
-#: ../plugins/gtodo/add_edit_item.c:335
-#: ../plugins/gtodo/add_edit_item.c:448
-msgid "started:"
-msgstr "å·²å??å??ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:289
-#: ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:332
-#: ../plugins/gtodo/add_edit_item.c:333
-#, c-format
-msgid "N/A"
-msgstr "N/A"
-
-#: ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:339
-#: ../plugins/gtodo/add_edit_item.c:448
-msgid "stopped:"
-msgstr "å·²å??æ­¢ï¼?"
-
-#: ../plugins/gtodo/callback.c:20
-msgid "You need to select a to-do item before you can remove it"
-msgstr "ä½ é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
-
-#: ../plugins/gtodo/callback.c:23
-msgid "Are you sure you want to remove the selected to-do item?"
-msgstr "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
-
-#: ../plugins/gtodo/callback.c:103
-#, c-format
-msgid "Are you sure you want to remove all the completed to-do items?"
-msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
-
-#: ../plugins/gtodo/callback.c:104
-#, c-format
-msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
-msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
-
-#: ../plugins/gtodo/export.c:47
-msgid "Export task list"
-msgstr "��工���"
-
-#: ../plugins/gtodo/export.c:159
-msgid "XML"
-msgstr "XML"
-
-#: ../plugins/gtodo/export.c:160
-msgid "Plain Text"
-msgstr "ç´?æ??å­?"
-
-#: ../plugins/gtodo/export.c:161
-msgid "HTML"
-msgstr "HTML"
-
-#. add the embed css style sheet tb
-#: ../plugins/gtodo/export.c:168
-msgid "Export current category only"
-msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
-
-#: ../plugins/gtodo/export.c:172
-msgid "HTML export options:"
-msgstr "HTML �����"
-
-#: ../plugins/gtodo/export.c:184
-msgid "Embed default (CSS) style sheet"
-msgstr "����設 (CSS) 樣�表"
-
-#: ../plugins/gtodo/export.c:188
-msgid "Custom (CSS) style sheet"
-msgstr "�� (CSS) 樣�表"
-
-#: ../plugins/gtodo/interface.c:119
-msgid "All"
-msgstr "��"
-
-#: ../plugins/gtodo/interface.c:144
-msgid "_Export"
-msgstr "��(_E)"
-
-#: ../plugins/gtodo/interface.c:188
-msgid "Priority"
-msgstr "å?ªå??ç­?ç´?"
-
-#: ../plugins/gtodo/interface.c:195
-msgid "Due date"
-msgstr "å?°æ??æ?¥"
-
-#: ../plugins/gtodo/interface.c:209
-msgid "Summary"
-msgstr "æ??è¦?"
-
-#: ../plugins/gtodo/libgtodo.c:603
-#, c-format
-msgid "No permission to read the file."
-msgstr "æ²?æ??足夠æ¬?é??è®?å??æª?æ¡?ã??"
-
-#: ../plugins/gtodo/libgtodo.c:618
-#, c-format
-msgid "Failed to read file"
-msgstr "ç?¡æ³?è®?å??æª?æ¡?"
-
-#: ../plugins/gtodo/libgtodo.c:626
-#: ../plugins/gtodo/libgtodo.c:637
-#, c-format
-msgid "Failed to parse XML structure"
-msgstr "å??æ?? XML çµ?æ§?失æ??"
-
-#: ../plugins/gtodo/libgtodo.c:646
-#, c-format
-msgid "File is not a valid gtodo file"
-msgstr "æª?æ¡?並ä¸?æ?¯ä¸?å??æ??æ??ç?? gtodo æª?"
-
-#: ../plugins/gtodo/libgtodo.c:662
-msgid "Personal"
-msgstr "å??人"
-
-#: ../plugins/gtodo/libgtodo.c:664
-msgid "Business"
-msgstr "å??業"
-
-#: ../plugins/gtodo/libgtodo.c:666
-msgid "Unfiled"
-msgstr "�歸�"
-
-#: ../plugins/gtodo/libgtodo.c:755
-#, c-format
-msgid "No Gtodo Client to save."
-msgstr "æ²?æ??å?¯å?²å­?ç?? Gtodo 客æ?¶ç«¯ã??"
-
-#: ../plugins/gtodo/libgtodo.c:846
-#, c-format
-msgid "No filename supplied."
-msgstr "æ²?æ??æ??ä¾?æª?æ¡?å??稱ã??"
-
-#. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65
-#: ../plugins/gtodo/todo_db.c:130
-msgid "Low"
-msgstr "ä½?"
-
-#: ../plugins/gtodo/list_tooltip.c:71
-#: ../plugins/gtodo/todo_db.c:131
-msgid "Medium"
-msgstr "中"
-
-#: ../plugins/gtodo/list_tooltip.c:77
-#: ../plugins/gtodo/todo_db.c:132
-msgid "High"
-msgstr "é«?"
-
-#: ../plugins/gtodo/mcategory.c:145
-#, c-format
-msgid "When you delete the category \"%s\", all containing items are lost"
-msgstr "ç?¶ä½ å?ªé?¤å??é¡?ã??%sã??ï¼?æ??æ??å??å?«ç??é ?ç?®é?½æ??é?ºå¤±"
-
-#: ../plugins/gtodo/mcategory.c:146
-msgid "Delete"
-msgstr "��"
-
-#: ../plugins/gtodo/mcategory.c:173
-#, c-format
-msgid "<New category (%d)>"
-msgstr "<æ?°å??é¡? (%d)>"
-
-#: ../plugins/gtodo/notification.c:66
-#, c-format
-msgid "The following item is due in %i minute:"
-msgid_plural "The following item is due in %i minutes:"
-msgstr[0] "ä¸?å??äº?é ?å?¨ %i å??é??å?§å?°æ??ï¼?"
-
-#: ../plugins/gtodo/notification.c:75
-msgid "The following item is due:"
-msgstr "ä¸?å??é ?ç?®å·²å?°æ??ï¼?"
-
-#. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:116
-msgid "_Do not show again"
-msgstr "ä¸?å??顯示(_D)"
-
-#: ../plugins/gtodo/plugin.c:65
-msgid "_Tasks"
-msgstr "ä»»å??(_T)"
-
-#: ../plugins/gtodo/plugin.c:74
-msgid "Hide _Completed Items"
-msgstr "é?±è??å·²å®?æ??é ?ç?®(_C)"
-
-#: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed to-do items"
-msgstr "é?±è??å·²å®?æ??ç??å¾?辦äº?é ?"
-
-#: ../plugins/gtodo/plugin.c:83
-msgid "Hide Items Past _Due Date"
-msgstr "é?±è??å·²é??æ??ç??é ?ç?®(_D)"
-
-#: ../plugins/gtodo/plugin.c:85
-msgid "Hide items that are past due date"
-msgstr "é?±è??å·²é??æ??ç??é ?ç?®"
-
-#: ../plugins/gtodo/plugin.c:92
-msgid "Hide Items Without _End Date"
-msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®(_E)"
-
-#: ../plugins/gtodo/plugin.c:94
-msgid "Hide items without an end date"
-msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®"
-
-#: ../plugins/gtodo/plugin.c:122
-msgid "Task manager"
-msgstr "å·¥ä½?管ç??å?¡"
-
-#: ../plugins/gtodo/plugin.c:128
-msgid "Task manager view"
-msgstr "å·¥ä½?管ç??å?¡æª¢è¦?"
-
-#: ../plugins/gtodo/plugin.c:134
-msgid "Tasks"
-msgstr "工�"
-
-#: ../plugins/gtodo/plugin.c:342
-#: ../plugins/gtodo/plugin.c:351
-msgid "To-do Manager"
-msgstr "å¾?辦äº?é ?管ç??å?¡"
-
-#: ../plugins/gtodo/preferences.c:21
-msgid "To-do List Preferences"
-msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
-
-#: ../plugins/gtodo/preferences.c:89
-msgid "Interface"
-msgstr "ä»?é?¢"
-
-#: ../plugins/gtodo/preferences.c:93
-msgid "Show due date column"
-msgstr "顯示å?°æ??æ?¥æ¬?ä½?"
-
-#: ../plugins/gtodo/preferences.c:101
-msgid "Show category column"
-msgstr "顯示å??é¡?æ¬?ä½?"
-
-#: ../plugins/gtodo/preferences.c:107
-msgid "Show priority column"
-msgstr "顯示å?ªå??é ?åº?æ¬?ä½?"
-
-#: ../plugins/gtodo/preferences.c:115
-#: ../plugins/gtodo/preferences.c:117
-msgid "Show in main window"
-msgstr "顯示�主��中"
-
-#: ../plugins/gtodo/preferences.c:128
-#: ../plugins/gtodo/preferences.c:130
-msgid "Highlight"
-msgstr "�示"
-
-#. tb for highlighting due today
-#: ../plugins/gtodo/preferences.c:140
-msgid "Items that are due today"
-msgstr "å?¨ä»?æ?¥å?°æ??ç??é ?ç?®"
-
-#. tb for highlighting due
-#: ../plugins/gtodo/preferences.c:146
-msgid "Items that are past due"
-msgstr "é??å?»å?°æ??ç??é ?ç?®"
-
-#. tb for highlighting in x days
-#: ../plugins/gtodo/preferences.c:152
-#, c-format
-msgid "Items that are due in the next %i day"
-msgid_plural "Items that are due in the next %i days"
-msgstr[0] "é ?ç?®å?¨æ?ªä¾? %i 天å?§å?°æ??"
-
-#: ../plugins/gtodo/preferences.c:166
-msgid "Miscellaneous"
-msgstr "é??é ?"
-
-#: ../plugins/gtodo/preferences.c:169
-msgid "Auto-purge completed items"
-msgstr "è?ªå??æ¸?é?¤å·²å®?æ??ç??é ?ç?®"
-
-#. Translators: First part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:175
-msgid "Purge items after"
-msgstr "��"
-
-#. Translators: Second part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:180
-msgid "days."
-msgstr "天å??ç??é ?ç?®ã??"
-
-#: ../plugins/gtodo/preferences.c:193
-#: ../plugins/gtodo/preferences.c:195
-msgid "Auto-Purge"
-msgstr "è?ªå??æ¸?é?¤"
-
-#: ../plugins/gtodo/preferences.c:207
-#: ../plugins/gtodo/preferences.c:209
-msgid "Notification"
-msgstr "é??ç?¥"
-
-#: ../plugins/gtodo/preferences.c:216
-#, c-format
-msgid "Allow to-do items to notify me when they are due in %i minute"
-msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
-msgstr[0] "å??許å¾?辦äº?é ?å?¨å?°æ??ç?? %i å??é??å??é??ç?¥æ??"
-
-#: ../plugins/gtodo/tasklists.c:10
-msgid "Open a Task List"
-msgstr "é??å??ä»»å??æ¸?å?®"
-
-#: ../plugins/gtodo/tasklists.c:35
-msgid "Create a Task List"
-msgstr "建ç«?ä»»å??æ¸?å?®"
-
-#: ../plugins/gtodo/todo_db.c:165
-msgid "No Date"
-msgstr "æ²?æ??æ?¥æ??"
-
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 #, fuzzy
@@ -6407,19 +5721,19 @@ msgstr "���"
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 #, fuzzy
 msgid "Underline-Plain"
-msgstr "ç´?æ??å­? (ASCII)"
+msgstr "ç´?æ??å­?"
 
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 #, fuzzy
 msgid "Underline-Squiggle"
-msgstr "使���"
+msgstr "��設�"
 
 #. text style in editor, TT is for typewriter text
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
 #, fuzzy
 msgid "Underline-TT"
-msgstr "使���"
+msgstr "��設�"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Warning message indicator style:"
@@ -6438,10 +5752,8 @@ msgid "Icon"
 msgstr "å??示"
 
 #: ../plugins/message-view/message-view.c:511
-#: ../plugins/message-view/plugin.c:383
-#: ../plugins/message-view/plugin.c:396
-#: ../plugins/message-view/plugin.c:515
-#: ../plugins/message-view/plugin.c:526
+#: ../plugins/message-view/plugin.c:383 ../plugins/message-view/plugin.c:396
+#: ../plugins/message-view/plugin.c:515 ../plugins/message-view/plugin.c:526
 msgid "Messages"
 msgstr "��"
 
@@ -6510,6 +5822,31 @@ msgid "%d Error"
 msgid_plural "%d Errors"
 msgstr[0] "%d å??é?¯èª¤"
 
+#: ../plugins/mk-project/mk-project.c:715
+#, c-format
+msgid "Unable to parse make file"
+msgstr "ç?¡æ³?解æ?? make æª?æ¡?"
+
+#: ../plugins/mk-project/mk-project.ui.h:1
+msgid "<b>Select Package to add:</b>"
+msgstr "<b>��件������</b>"
+
+#: ../plugins/mk-project/mk-project.ui.h:2
+msgid "Add _Package"
+msgstr "���件(_P)"
+
+#: ../plugins/mk-project/mk-project.ui.h:3
+msgid "Add _module"
+msgstr "��模�(_M)"
+
+#: ../plugins/mk-project/mk-project.ui.h:5
+msgid "Packages"
+msgstr "�件"
+
+#: ../plugins/mk-project/mk-project.ui.h:6
+msgid "Select package"
+msgstr "é?¸æ??å¥?件"
+
 #: ../plugins/patch/patch-plugin.c:94
 msgid "File/Directory to patch"
 msgstr "è¦?ä¿®è£?ç??æª?æ¡?/ç?®é??"
@@ -6518,8 +5855,11 @@ msgstr "è¦?ä¿®è£?ç??æª?æ¡?/ç?®é??"
 msgid "Patch file"
 msgstr "修��"
 
-#: ../plugins/patch/patch-plugin.c:166
-#: ../plugins/patch/patch-plugin.ui.h:3
+#: ../plugins/patch/patch-plugin.c:117
+msgid "Patches"
+msgstr "修�"
+
+#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "修�"
 
@@ -6577,8 +5917,7 @@ msgstr "修�層��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/patch/plugin.c:53
-#: ../plugins/tools/plugin.c:131
+#: ../plugins/patch/plugin.c:53 ../plugins/tools/plugin.c:131
 msgid "_Tools"
 msgstr "工�(_T)"
 
@@ -6593,7 +5932,9 @@ 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
@@ -6603,7 +5944,9 @@ 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
@@ -6617,13 +5960,16 @@ msgstr "以此é??å??"
 
 #: ../plugins/project-import/plugin.c:220
 #, c-format
-msgid "Could not find a valid project backend for the given directory (%s). Please select a different directory, or try upgrading to a newer version of Anjuta."
+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
@@ -6631,7 +5977,7 @@ msgstr "ç?¡æ³? check out æ??å®?ç?? URIã??%sã??ã??å?³å??ç??é?¯èª¤ç?ºï¼?ã??%sã??"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
 #: ../plugins/project-wizard/templates/django.wiz.in.h:1
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
@@ -6677,120 +6023,115 @@ msgid "Import"
 msgstr "��"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:1
-#| msgid "Add _module"
-msgid "Add Module"
-msgstr "��模�"
+msgid "Add Library"
+msgstr "����庫"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:2
-#| msgid "Add _Package"
-msgid "Add Package"
-msgstr "���件"
-
-#: ../plugins/project-manager/pm_dialogs.ui.h:3
 msgid "Add Source"
 msgstr "����"
 
+#: ../plugins/project-manager/pm_dialogs.ui.h:3
+msgid "Browse other nodes"
+msgstr "ç??覽å?¶ä»?ç??ç¯?é»?"
+
 #: ../plugins/project-manager/pm_dialogs.ui.h:4
-#| msgid "Module"
 msgid "Modules:"
 msgstr "模��"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:5
-#| msgid "Import options"
 msgid "More options:"
 msgstr "�����"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:6
-msgid "New Group"
-msgstr "��羣�"
+msgid "New Directory"
+msgstr "æ?°å¢?ç?®é??"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:7
+msgid "New Library"
+msgstr "����庫"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:8
 msgid "New Target"
 msgstr "����"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:8
-#| msgid "Packages"
+#: ../plugins/project-manager/pm_dialogs.ui.h:9
 msgid "Package list:"
 msgstr "�件���"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:9
-#| msgid "Select the _target for the new source files:"
-msgid "Select the _target for the module:"
-msgstr "é?¸æ??模çµ?ç??ç?®æ¨?(_T):"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:10
+msgid "Select the _target for the library:"
+msgstr "é?¸æ??ç¨?å¼?庫ç??ç?®æ¨?(_T):"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:11
 msgid "Select the _target for the new source files:"
 msgstr "é?¸æ??æ?°ä¾?æº?æª?æ¡?ç??ç?®æ¨?(_T):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:11
+#: ../plugins/project-manager/pm_dialogs.ui.h:12
 msgid "Source files:"
 msgstr "�����"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:12
-msgid "Specify _where to create the group:"
-msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç¾£çµ?(_W):"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:13
+msgid "Specify _where to create the directory:"
+msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç?®é??(_W):"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:14
 msgid "Specify _where to create the target:"
 msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç?®æ¨?(_W):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:14
+#: ../plugins/project-manager/pm_dialogs.ui.h:15
 msgid "Target _name:"
 msgstr "ç?®æ¨?å??稱(_N):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:15
+#: ../plugins/project-manager/pm_dialogs.ui.h:16
 msgid "Target _type:"
 msgstr "ç?®æ¨?é¡?å??(_T):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:16
+#: ../plugins/project-manager/pm_dialogs.ui.h:17
 msgid "TargetTypes"
 msgstr "ç?®æ¨?é¡?å??"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:17
-#| msgid "Add _Package"
-msgid "_Add package&#x2026;"
-msgstr "���件(_A)&#x2026;"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:18
-msgid "_Group name:"
-msgstr "ç¾£çµ?å??稱(_G):"
+msgid "_Directory name:"
+msgstr "ç?®é??å??稱(_D):"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:19
-#| msgid "Module name:"
 msgid "_Module name:"
 msgstr "模çµ?å??稱(_M):"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:20
-#| msgid "Select file to add:"
+msgid "_New library&#x2026;"
+msgstr "����庫(_N)&#x2026;"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:21
 msgid "_Select file to add&#x2026;"
 msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)&#x2026;"
 
-#: ../plugins/project-manager/project-model.c:233
-#: ../plugins/project-manager/plugin.c:1389
-#: ../plugins/project-manager/plugin.c:1507
-#: ../plugins/project-manager/plugin.c:1684
+#: ../plugins/project-manager/project-model.c:184
+#: ../plugins/project-manager/plugin.c:1306
+#: ../plugins/project-manager/plugin.c:1426
+#: ../plugins/project-manager/plugin.c:1606 ../plugins/symbol-db/plugin.c:2134
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "å°?æ¡?"
 
-#: ../plugins/project-manager/project-model.c:234
+#: ../plugins/project-manager/project-model.c:185
 msgid "GbfProject Object"
 msgstr "GbfProject �件"
 
-#: ../plugins/project-manager/project-model.c:763
+#: ../plugins/project-manager/project-model.c:735
 msgid "No project loaded"
 msgstr "������"
 
-#: ../plugins/project-manager/plugin.c:385
+#: ../plugins/project-manager/plugin.c:402
 msgid "Refreshing symbol treeâ?¦"
 msgstr "æ­£å?¨é??æ?°æ?´ç??符è??樹â?¦"
 
-#: ../plugins/project-manager/plugin.c:392
+#: ../plugins/project-manager/plugin.c:409
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "é??æ?°æ?´ç??å°?æ¡?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:646
+#: ../plugins/project-manager/plugin.c:662
 msgid ""
 "Are you sure you want to remove the following group from the project?\n"
 "\n"
@@ -6798,7 +6139,7 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç¾£çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:649
+#: ../plugins/project-manager/plugin.c:665
 msgid ""
 "Are you sure you want to remove the following target from the project?\n"
 "\n"
@@ -6806,7 +6147,7 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:652
+#: ../plugins/project-manager/plugin.c:668
 msgid ""
 "Are you sure you want to remove the following source file from the project?\n"
 "\n"
@@ -6814,10 +6155,7 @@ msgstr ""
 "æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?碼æª?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:655
-#| msgid ""
-#| "Are you sure you want to remove the following target from the project?\n"
-#| "\n"
+#: ../plugins/project-manager/plugin.c:671
 msgid ""
 "Are you sure you want to remove the following package from the project?\n"
 "\n"
@@ -6825,10 +6163,7 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??å¥?件å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:658
-#| msgid ""
-#| "Are you sure you want to remove the following group from the project?\n"
-#| "\n"
+#: ../plugins/project-manager/plugin.c:674
 msgid ""
 "Are you sure you want to remove the following module from the project?\n"
 "\n"
@@ -6836,7 +6171,7 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??模çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:661
+#: ../plugins/project-manager/plugin.c:677
 msgid ""
 "Are you sure you want to remove the following elements from the project?\n"
 "\n"
@@ -6844,61 +6179,57 @@ msgstr ""
 "ä½ æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??ç´ å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:678
+#: ../plugins/project-manager/plugin.c:694
 #, c-format
 msgid "Group: %s\n"
 msgstr "羣��%s\n"
 
-#: ../plugins/project-manager/plugin.c:681
+#: ../plugins/project-manager/plugin.c:697
 #, c-format
 msgid "Target: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:684
+#: ../plugins/project-manager/plugin.c:700
 #, c-format
 msgid "Source: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:687
+#: ../plugins/project-manager/plugin.c:703
 #, c-format
 msgid "Shortcut: %s\n"
 msgstr "æ?·å¾?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:690
+#: ../plugins/project-manager/plugin.c:706
 #, c-format
-#| msgid "Source: %s\n"
 msgid "Module: %s\n"
 msgstr "模��%s\n"
 
-#: ../plugins/project-manager/plugin.c:693
+#: ../plugins/project-manager/plugin.c:709
 #, c-format
-#| msgid "Packages"
 msgid "Package: %s\n"
 msgstr "�件�%s\n"
 
-#: ../plugins/project-manager/plugin.c:705
-#| msgid "The group will not be deleted from the file system."
+#: ../plugins/project-manager/plugin.c:721
 msgid "The group will be deleted from the file system."
 msgstr "é??å??ç¾£çµ?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:707
+#: ../plugins/project-manager/plugin.c:723
 msgid "The group will not be deleted from the file system."
 msgstr "é??å??ç¾£çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:709
-#| msgid "The source file will not be deleted from the file system."
+#: ../plugins/project-manager/plugin.c:725
 msgid "The source file will be deleted from the file system."
 msgstr "該ä¾?æº?æª?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:711
+#: ../plugins/project-manager/plugin.c:727
 msgid "The source file will not be deleted from the file system."
 msgstr "該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:716
+#: ../plugins/project-manager/plugin.c:732
 msgid "Confirm remove"
 msgstr "確�移�"
 
-#: ../plugins/project-manager/plugin.c:762
+#: ../plugins/project-manager/plugin.c:778
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6907,165 +6238,155 @@ msgstr ""
 "移é?¤â??%sâ??失æ??ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:828
+#: ../plugins/project-manager/plugin.c:844
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "å??å?? %s ç?? URI è³?è¨?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:866
+#: ../plugins/project-manager/plugin.c:882
 msgid "_Project"
 msgstr "å°?æ¡?(_P)"
 
-#: ../plugins/project-manager/plugin.c:870
-msgid "Add _Groupâ?¦"
-msgstr "��羣�(_G)�"
+#: ../plugins/project-manager/plugin.c:886
+msgid "New _Directoryâ?¦"
+msgstr "æ?°å¢?ç?®é??(_D)â?¦"
 
-#: ../plugins/project-manager/plugin.c:870
-#: ../plugins/project-manager/plugin.c:914
-msgid "Add a group to project"
-msgstr "��羣����"
+#: ../plugins/project-manager/plugin.c:886
+#: ../plugins/project-manager/plugin.c:925
+msgid "Add a new directory to the project"
+msgstr "å? å?¥æ?°ç??ç?®é??è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:875
-msgid "Add _Targetâ?¦"
-msgstr "����(_T)�"
+#: ../plugins/project-manager/plugin.c:891
+msgid "New _Targetâ?¦"
+msgstr "����(_T)�"
 
-#: ../plugins/project-manager/plugin.c:875
-#: ../plugins/project-manager/plugin.c:919
-msgid "Add a target to project"
-msgstr "�������"
+#: ../plugins/project-manager/plugin.c:891
+#: ../plugins/project-manager/plugin.c:930
+msgid "Add a new target to the project"
+msgstr "å? å?¥æ?°ç??ç?®æ¨?è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:896
 msgid "Add _Source Fileâ?¦"
 msgstr "������(_S)�"
 
-#: ../plugins/project-manager/plugin.c:880
-#: ../plugins/project-manager/plugin.c:924
-#: ../plugins/project-manager/plugin.c:939
-msgid "Add a source file to project"
-msgstr "å? å?¥å??å§?æª?è?³å°?æ¡?"
+#: ../plugins/project-manager/plugin.c:896
+#: ../plugins/project-manager/plugin.c:935
+#: ../plugins/project-manager/plugin.c:950
+msgid "Add a source file to a target"
+msgstr "å? å?¥å??å§?æª?è?³ç?®æ¨?"
 
-#: ../plugins/project-manager/plugin.c:885
-#| msgid "Add _module"
-msgid "Add _Moduleâ?¦"
-msgstr "��模�(_M)�"
+#: ../plugins/project-manager/plugin.c:901
+msgid "Add _Libraryâ?¦"
+msgstr "����庫(_L)�"
 
-#: ../plugins/project-manager/plugin.c:885
-#| msgid "Add a source file to project"
+#: ../plugins/project-manager/plugin.c:901
 msgid "Add a module to a target"
 msgstr "�模������"
 
-#: ../plugins/project-manager/plugin.c:890
-#| msgid "Add _Package"
-msgid "Add _Packageâ?¦"
-msgstr "���件(_P)�"
+#: ../plugins/project-manager/plugin.c:906
+msgid "New _Libraryâ?¦"
+msgstr "����庫(_L)�"
 
-#: ../plugins/project-manager/plugin.c:890
-#: ../plugins/project-manager/plugin.c:934
-#| msgid "Add a target to project"
-msgid "Add a package to project"
-msgstr "��件�����"
+#: ../plugins/project-manager/plugin.c:906
+msgid "Add a new package to the project"
+msgstr "å? å?¥æ?°ç??å¥?件è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:895
-#: ../plugins/project-manager/plugin.c:944
+#: ../plugins/project-manager/plugin.c:911
+#: ../plugins/project-manager/plugin.c:955
 msgid "_Properties"
 msgstr "屬�(_P)"
 
-#: ../plugins/project-manager/plugin.c:895
-#: ../plugins/project-manager/dialogs.c:666
+#: ../plugins/project-manager/plugin.c:911
+#: ../plugins/project-manager/dialogs.c:517
 msgid "Project properties"
 msgstr "��屬�"
 
-#: ../plugins/project-manager/plugin.c:900
-msgid "_Refresh"
-msgstr "é??æ?°æ?´ç??(_R)"
-
-#: ../plugins/project-manager/plugin.c:900
-msgid "Refresh project manager tree"
-msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
-
-#: ../plugins/project-manager/plugin.c:905
+#: ../plugins/project-manager/plugin.c:916
 msgid "Close Pro_ject"
 msgstr "é??é??å°?æ¡?(_J)"
 
-#: ../plugins/project-manager/plugin.c:905
+#: ../plugins/project-manager/plugin.c:916
 msgid "Close project"
 msgstr "é??é??å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:914
-msgid "Add _Group"
-msgstr "��羣�(_G)"
+#: ../plugins/project-manager/plugin.c:925
+msgid "New _Directory"
+msgstr "æ?°å¢?ç?®é??(_D)"
 
-#: ../plugins/project-manager/plugin.c:919
-msgid "Add _Target"
+#: ../plugins/project-manager/plugin.c:930
+msgid "New _Target"
 msgstr "����(_T)"
 
-#: ../plugins/project-manager/plugin.c:924
+#: ../plugins/project-manager/plugin.c:935
 msgid "Add _Source File"
 msgstr "å? å?¥å??å§?æª?(_S)"
 
-#: ../plugins/project-manager/plugin.c:929
-#| msgid "Add _module"
-msgid "Add _Module"
-msgstr "��模�(_M)"
+#: ../plugins/project-manager/plugin.c:940
+msgid "Add _Library"
+msgstr "����庫(_L)"
 
-#: ../plugins/project-manager/plugin.c:929
-#| msgid "Add a group to project"
-msgid "Add a module to target"
-msgstr "�模������"
+#: ../plugins/project-manager/plugin.c:940
+msgid "Add a library to a target"
+msgstr "����庫���"
 
-#: ../plugins/project-manager/plugin.c:934
-msgid "Add _Package"
-msgstr "���件(_P)"
+#: ../plugins/project-manager/plugin.c:945
+msgid "New _Library"
+msgstr "����庫(_L)"
+
+#: ../plugins/project-manager/plugin.c:945
+msgid "Add a new library to the project"
+msgstr "å? å?¥æ?°ç??ç¨?å¼?庫è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:939
+#: ../plugins/project-manager/plugin.c:950
 msgid "_Add to Project"
 msgstr "�����(_A)"
 
-#: ../plugins/project-manager/plugin.c:944
+#: ../plugins/project-manager/plugin.c:955
 msgid "Properties of group/target/source"
 msgstr "ç¾£çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
 
-#: ../plugins/project-manager/plugin.c:949
+#: ../plugins/project-manager/plugin.c:960
 msgid "Re_move"
 msgstr "移�(_M)"
 
-#: ../plugins/project-manager/plugin.c:949
+#: ../plugins/project-manager/plugin.c:960
 msgid "Remove from project"
 msgstr "���中移�"
 
-#: ../plugins/project-manager/plugin.c:1343
+#: ../plugins/project-manager/plugin.c:1291
 #, 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:1384
-#| msgid "Created project viewâ?¦"
+#: ../plugins/project-manager/plugin.c:1301
 msgid "Update project viewâ?¦"
 msgstr "����檢��"
 
-#: ../plugins/project-manager/plugin.c:1425
+#: ../plugins/project-manager/plugin.c:1344
 #, c-format
 msgid "Loading project: %s"
 msgstr "正������%s"
 
-#: ../plugins/project-manager/plugin.c:1595
+#: ../plugins/project-manager/plugin.c:1514
 #, c-format
 msgid "Error closing project: %s"
 msgstr "é??é??å°?æ¡?æ??é?¯èª¤ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1663
+#: ../plugins/project-manager/plugin.c:1585
 msgid "Project manager actions"
 msgstr "å°?æ¡?管ç??å?¡å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:1671
+#: ../plugins/project-manager/plugin.c:1593
 msgid "Project manager popup actions"
 msgstr "å°?æ¡?管ç??å?¡å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:2384
+#: ../plugins/project-manager/plugin.c:2317
 msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??å°?æ¡?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2387
+#: ../plugins/project-manager/plugin.c:2320
 msgid "Project Loaded"
 msgstr "��已��"
 
@@ -7076,73 +6397,80 @@ msgstr "��已��"
 #. }
 #. else
 #. uri = g_strdup("");
-#: ../plugins/project-manager/dialogs.c:316
+#: ../plugins/project-manager/dialogs.c:290
 msgid "Select sourcesâ?¦"
 msgstr "é?¸æ??ä¾?æº?â?¦"
 
-#: ../plugins/project-manager/dialogs.c:521
-#| msgid "Class Name:"
-msgid "Full Name:"
-msgstr "å?¨å??ï¼?"
+#: ../plugins/project-manager/dialogs.c:369
+msgid " This property is not modifiable."
+msgstr "é??å??屬æ?§æ?¯ç?¡æ³?ä¿®æ?¹ç??ã??"
 
-#: ../plugins/project-manager/dialogs.c:669
-msgid "Group properties"
-msgstr "羣�屬�"
+#: ../plugins/project-manager/dialogs.c:520
+msgid "Directory properties"
+msgstr "ç?®é??屬æ?§"
 
-#: ../plugins/project-manager/dialogs.c:672
+#: ../plugins/project-manager/dialogs.c:523
 msgid "Target properties"
 msgstr "��屬�"
 
-#: ../plugins/project-manager/dialogs.c:675
-#| msgid "Group properties"
+#: ../plugins/project-manager/dialogs.c:526
 msgid "Source properties"
 msgstr "ä¾?æº?ç??屬æ?§"
 
-#: ../plugins/project-manager/dialogs.c:776
-#: ../plugins/project-manager/dialogs.c:787
+#: ../plugins/project-manager/dialogs.c:529
+msgid "Module properties"
+msgstr "模�屬�"
+
+#: ../plugins/project-manager/dialogs.c:532
+msgid "Package properties"
+msgstr "�件屬�"
+
+#: ../plugins/project-manager/dialogs.c:535
+msgid "Unknown properties"
+msgstr "ä¸?æ??ç??屬æ?§"
+
+#: ../plugins/project-manager/dialogs.c:930
+#: ../plugins/project-manager/dialogs.c:941
 msgid "Cannot add group"
 msgstr "����羣�"
 
-#: ../plugins/project-manager/dialogs.c:788
+#: ../plugins/project-manager/dialogs.c:942
 msgid "No parent group selected"
 msgstr "æ²?æ??é?¸æ??ä¸?層羣çµ?"
 
-#: ../plugins/project-manager/dialogs.c:998
-#: ../plugins/project-manager/dialogs.c:1008
+#: ../plugins/project-manager/dialogs.c:1156
+#: ../plugins/project-manager/dialogs.c:1166
 msgid "Cannot add source files"
 msgstr "������碼��"
 
-#: ../plugins/project-manager/dialogs.c:1009
-msgid "The selected node cannot contains source files."
+#: ../plugins/project-manager/dialogs.c:1167
+msgid "The selected node cannot contain source files."
 msgstr "é?¸å??ç??ç¯?é»?ä¸?è?½å??å?«ä¾?æº?æª?ã??"
 
-#: ../plugins/project-manager/dialogs.c:1191
-#: ../plugins/project-manager/dialogs.c:1202
+#: ../plugins/project-manager/dialogs.c:1353
+#: ../plugins/project-manager/dialogs.c:1364
 msgid "Cannot add target"
 msgstr "������"
 
-#: ../plugins/project-manager/dialogs.c:1203
+#: ../plugins/project-manager/dialogs.c:1365
 msgid "No group selected"
 msgstr "æ²?æ??é?¸å??ç¾£çµ?"
 
-#: ../plugins/project-manager/dialogs.c:1354
-#: ../plugins/project-manager/dialogs.c:1365
-#| msgid "Cannot add source files"
+#: ../plugins/project-manager/dialogs.c:1524
+#: ../plugins/project-manager/dialogs.c:1535
 msgid "Cannot add modules"
 msgstr "����模�"
 
-#: ../plugins/project-manager/dialogs.c:1366
+#: ../plugins/project-manager/dialogs.c:1536
 msgid "No target has been selected"
 msgstr "å°?æ?ªé?¸æ??ç?®æ¨?"
 
 #. Missing module name
-#: ../plugins/project-manager/dialogs.c:1569
-#| msgid "Missing tool name"
+#: ../plugins/project-manager/dialogs.c:1739
 msgid "Missing module name"
 msgstr "缺å°?模çµ?å??稱"
 
-#: ../plugins/project-manager/dialogs.c:1631
-#| msgid "Cannot add target"
+#: ../plugins/project-manager/dialogs.c:1801
 msgid "Cannot add packages"
 msgstr "�����件"
 
@@ -7155,8 +6483,7 @@ 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 "è­¦å??"
 
@@ -7180,7 +6507,7 @@ msgstr "å°?æ¡?é¡?å??ï¼?%s\n"
 msgid "Unable to find any project template in %s"
 msgstr "����任���樣�� %s"
 
-#: ../plugins/project-wizard/druid.c:627
+#: ../plugins/project-wizard/druid.c:631
 #, c-format
 msgid ""
 "\n"
@@ -7189,38 +6516,48 @@ msgstr ""
 "\n"
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?輸å?¥å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:642
-msgid "Field \"%s\" must contains only letters, digits or the following characters \"#$:%+, = ^_`~\". In addition you cannot have a leading dash. Please fix it."
-msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?æ??ä¸?å??å­?符 \"#$:%+, = ^_`~\"ã??æ­¤å¤?ä½ ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
+#: ../plugins/project-wizard/druid.c:646
+#, c-format
+msgid ""
+"Field \"%s\" must contains only letters, digits or the following characters "
+"\"#$:%%+, = ^_`~\". In addition you cannot have a leading dash. Please fix "
+"it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?æ??ä¸?å??å­?符 \"#$:%%+, = ^_`~\"ã??æ­¤å¤?ä½ ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:647
-msgid "Field \"%s\" must contains only letters, digits, the following characters \"#$:%+, = ^_`~\" or directory separators. In addition you cannot have a leading dash. Please fix it."
-msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?ã??ä¸?å??å­?符 \"#$:%+, = ^_`~\" æ??ç?®é??å??é??符ã??æ­¤å¤?ä½ ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
+#: ../plugins/project-wizard/druid.c:651
+#, c-format
+msgid ""
+"Field \"%s\" must contains only letters, digits, the following characters \"#"
+"$:%%+, = ^_`~\" or directory separators. In addition you cannot have a "
+"leading dash. Please fix it."
+msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?ã??ä¸?å??å­?符 \"#$:%%+, = ^_`~\" æ??ç?®é??å??é??符ã??æ­¤å¤?ä½ ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:652
+#: ../plugins/project-wizard/druid.c:656
 #, c-format
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/project-wizard/druid.c:679
+#: ../plugins/project-wizard/druid.c:683
 #, c-format
-msgid "Directory \"%s\" is not empty. Project creation could fail if some files cannot be written. Do you want to continue?"
+msgid ""
+"Directory \"%s\" is not empty. Project creation could fail if some files "
+"cannot be written. Do you want to continue?"
 msgstr "ç?®é??ã??%sã??ä¸?æ?¯ç©ºç??ã??å¦?æ??æ??äº?æª?æ¡?ç?¡æ³?寫å?¥ï¼?å°?æ¡?ç??建ç«?å?¯è?½æ??失æ??ã??確å®?è¦?ç¹¼çº?å??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:681
+#: ../plugins/project-wizard/druid.c:685
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "æª?æ¡? \"%s\" å·²å­?å?¨ã??ä½ æ?¯å?¦æ?³è¦?è¦?è??ä»?ï¼?"
 
-#: ../plugins/project-wizard/druid.c:712
+#: ../plugins/project-wizard/druid.c:716
 msgid "Invalid entry"
 msgstr "ç?¡æ??ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:723
+#: ../plugins/project-wizard/druid.c:727
 msgid "Dubious entry"
 msgstr "ä¸?確å®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:881
+#: ../plugins/project-wizard/druid.c:892
 #, c-format
 msgid ""
 "\n"
@@ -7229,7 +6566,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:892
+#: ../plugins/project-wizard/druid.c:903
 #, c-format
 msgid ""
 "\n"
@@ -7238,23 +6575,32 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?件ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:901
-msgid "Some important programs or development packages required to build this project are missing. Please make sure they are installed properly before generating the project.\n"
+#: ../plugins/project-wizard/druid.c:912
+msgid ""
+"Some important programs or development packages required to build this "
+"project are missing. Please make sure they are installed properly before "
+"generating the project.\n"
 msgstr "編譯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?件é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??確å®?å®?å??å·²ç¶?正確ç??å®?è£?ã??\n"
 
-#: ../plugins/project-wizard/druid.c:909
+#: ../plugins/project-wizard/druid.c:920
 msgid "Install missing packages"
 msgstr "å®?è£?缺å°?ç??å¥?件"
 
-#: ../plugins/project-wizard/druid.c:917
-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:928
+msgid ""
+"The missing programs are usually part of some distribution packages and can "
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"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:925
+#: ../plugins/project-wizard/druid.c:936
 msgid "Missing components"
 msgstr "é?ºå¤±å??件"
 
-#: ../plugins/project-wizard/druid.c:1057
+#: ../plugins/project-wizard/druid.c:1068
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?建ç«?å°?æ¡?å?©ç??使ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7303,36 +6649,29 @@ msgstr "ç?¡æ³?解é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 msgid "New Project Assistant"
 msgstr "æ?°å°?æ¡?å?©ç??"
 
-#: ../plugins/project-wizard/property.c:338
-#: ../plugins/project-wizard/property.c:449
-msgid "No"
-msgstr "å?¦"
-
-#: ../plugins/project-wizard/property.c:349
+#: ../plugins/project-wizard/property.c:340
 msgid "Select directory"
 msgstr "é?¸æ??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:357
+#: ../plugins/project-wizard/property.c:348
 msgid "Select file"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:407
-#: ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:398 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é?¸æ??å??ç??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:432
-#: ../plugins/project-wizard/property.c:522
-#: ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:423
+#: ../plugins/project-wizard/property.c:511 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é?¸æ??å??示"
 
-#: ../plugins/project-wizard/property.c:492
+#: ../plugins/project-wizard/property.c:481
 msgid "Choose directory"
 msgstr "é?¸å??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:496
+#: ../plugins/project-wizard/property.c:485
 msgid "Choose file"
 msgstr "é?¸å??æª?æ¡?"
 
@@ -7342,7 +6681,7 @@ msgid "A generic minimal and flat project"
 msgstr "é??ç?¨ã??æ??å°?å??ç??æ?®é??å°?æ¡?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:2
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:1
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:1
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:2
@@ -7354,7 +6693,7 @@ msgstr "�� C++ ���"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:3
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:3
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:3
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:4
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:4
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:3
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:4
@@ -7366,7 +6705,7 @@ msgid "Add shared library support:"
 msgstr "���享��庫���"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:5
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:5
@@ -7378,7 +6717,7 @@ msgstr "å?¨å°?æ¡?å? å?¥ C++ æ?¯æ?´ä»¥ä¾¿ç·¨è­¯ C++ å??å§?碼æª?æ¡?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:5
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:4
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:7
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:6
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:5
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:4
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:6
@@ -7389,10 +6728,29 @@ msgstr "å?¨å°?æ¡?å? å?¥ C++ æ?¯æ?´ä»¥ä¾¿ç·¨è­¯ C++ å??å§?碼æª?æ¡?"
 msgid "Adds support for building shared libraries in your project"
 msgstr "å?¨ä½ ç??å°?æ¡?中å? å?¥ç·¨è­¯å?±äº«ç¨?å¼?庫ç??æ?¯æ?´"
 
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:6
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:6
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:7
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:6
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:8
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:6
+#: ../plugins/project-wizard/templates/java.wiz.in.h:7
+#: ../plugins/project-wizard/templates/js.wiz.in.h:2
+#: ../plugins/project-wizard/templates/python.wiz.in.h:7
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
+#: ../plugins/project-wizard/templates/library.wiz.in.h:6
+msgid "Author:"
+msgstr "ä½?è??ï¼?"
+
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:7
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:7
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:10
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:9
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:6
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:8
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:7
@@ -7411,7 +6769,7 @@ msgstr "����"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:8
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:8
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:10
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:7
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:9
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:8
@@ -7446,7 +6804,7 @@ msgstr "檢æ?¥ä½ ç??å°?æ¡?é??è¦?ç??å¥?件"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:11
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:10
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:11
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:10
@@ -7463,7 +6821,7 @@ msgstr "設����件"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
@@ -7480,7 +6838,7 @@ msgstr "設����件�"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:17
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:13
@@ -7500,7 +6858,7 @@ msgstr "é?»å­?é?µä»¶ä½?å??ï¼?"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
 #: ../plugins/project-wizard/templates/django.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:16
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
@@ -7523,7 +6881,7 @@ msgstr "ä¸?è?¬ (æ??å°?)"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:21
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:20
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:26
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:19
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:17
@@ -7542,7 +6900,7 @@ msgstr "æ??æ¬?æ¢?款"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:19
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:19
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:22
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:28
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:20
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:18
@@ -7561,7 +6919,7 @@ msgstr "æ²?æ??æ??æ¬?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:20
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:20
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:20
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:23
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:22
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:29
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:21
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:19
@@ -7581,7 +6939,7 @@ msgstr "å°?æ¡?編譯系統ç??é?¸é ?"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:21
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:21
 #: ../plugins/project-wizard/templates/django.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:24
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:23
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:37
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:22
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:20
@@ -7600,7 +6958,7 @@ msgstr "å°?æ¡?å??稱ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:22
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:22
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:22
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:24
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:39
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:23
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:21
@@ -7636,7 +6994,7 @@ msgstr "é??è¦?ç??å¥?件ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:24
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:41
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:25
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:23
@@ -7655,9 +7013,9 @@ msgstr "é?¸æ??å??å§?碼æ??æ¬?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:25
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:25
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:25
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:43
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:24
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:26
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:26
@@ -7673,8 +7031,8 @@ msgstr "使ç?¨ pkg-config å¾?å?¶ä»?å¥?件å? å?¥ç¨?å¼?庫ç??æ?¯æ?´"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:27
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:27
 #: ../plugins/project-wizard/templates/django.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:31
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:33
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:31
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:27
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:29
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:29
@@ -7694,7 +7052,7 @@ msgstr "����"
 
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:2
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:3
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:3
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:3
@@ -7710,7 +7068,7 @@ msgstr "å? å?¥å??é??å??å??è?½ï¼?"
 
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:5
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:7
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:6
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:7
@@ -7721,7 +7079,9 @@ msgstr "å? å?¥å??é??å??å??è?½ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:5
 #: ../plugins/project-wizard/templates/library.wiz.in.h:5
-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:16
@@ -7748,31 +7108,46 @@ msgstr "Django ����"
 msgid "Python webproject using Django Web Framework"
 msgstr "使ç?¨ Django Web æ?¶æ§?ç?? Python 網絡å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:1
-msgid "A generic GTK+ project"
-msgstr "�� GTK+ ��"
-
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:2
 #: ../plugins/project-wizard/templates/java.wiz.in.h:2
 #: ../plugins/project-wizard/templates/python.wiz.in.h:2
 msgid "Add gtk-doc system:"
 msgstr "�� gtk-doc 系統�"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:16
-msgid "GTK+"
-msgstr "GTK+"
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+msgid "GTK+ (simple)"
+msgstr "GTK+ (ç°¡æ??)"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
-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'"
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
+msgid ""
+"Give a package name that your project require. You may also mention what is "
+"the required version of the package. For example, 'libgnomeui-2.0' or "
+"'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
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
 msgid "Require Package:"
 msgstr "é??è¦?å¥?件ï¼?"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+msgid "Simple GTK+ project"
+msgstr "ç°¡æ?? GTK+ å°?æ¡?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+msgid "Use GtkBuilder for user interface:"
+msgstr "使ç?¨ GtkBuilder å??使ç?¨è??ä»?é?¢ï¼?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:27
+msgid ""
+"Use GtkBuilder to create the user-interface in a graphical way and load it "
+"from xml files at runtime"
+msgstr "使ç?¨ GtkBuilder 以å??å½¢å??ç??æ?¹å¼?建ç«?使ç?¨è??ä»?é?¢ä¸¦å?¨å?·è¡?æ??é??å¾? xml æª?æ¡?è¼?å?¥å®?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:32
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:30
 #: ../plugins/project-wizard/templates/java.wiz.in.h:30
 #: ../plugins/project-wizard/templates/python.wiz.in.h:28
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
@@ -7787,7 +7162,9 @@ msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "使ç?¨ libanjuta æ?¶æ§?ç?? Anjuta å¤?æ??ç¨?å¼?å°?æ¡?"
 
 #: ../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)"
+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:12
@@ -7859,7 +7236,9 @@ 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
@@ -7879,12 +7258,12 @@ msgid "Whether the plugin has menus or toolbars"
 msgstr "å¤?æ??ç¨?å¼?æ?¯å?¦å?·æ??é?¸å?®æ??å·¥å?·å??"
 
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:1
-msgid "A generic GTKmm (C++) project"
-msgstr "�� GTKmm (C++) ��"
+msgid "A minimal GTKmm project"
+msgstr "æ??å°? GTKmm å°?æ¡?"
 
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
-msgid "GTKmm"
-msgstr "GTKmm"
+msgid "GTKmm (Simple)"
+msgstr "GTKmm (ç°¡æ??)"
 
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:1
 msgid "A generic wx Widgets project"
@@ -7911,7 +7290,8 @@ 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:14
@@ -8093,11 +7473,11 @@ msgstr "å·¥ä½?ç?®é??ï¼?"
 msgid "Program directory '%s' is not local"
 msgstr "ç¨?å¼?ç?®é??ã??%sã??ä¸?å?¨æ?¬å?°ç«¯"
 
-#: ../plugins/run-program/parameters.c:300
+#: ../plugins/run-program/parameters.c:303
 msgid "Load Target to run"
 msgstr "����以��"
 
-#: ../plugins/run-program/parameters.c:617
+#: ../plugins/run-program/parameters.c:620
 #, c-format
 msgid "Missing file %s"
 msgstr "�失�� %s"
@@ -8293,8 +7673,7 @@ 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 "é??è¤?ä¸?ä¸?å??æ??å°?æ??令"
 
@@ -8307,11 +7686,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 "æ??å°?å??å??代"
 
@@ -8521,11 +7900,14 @@ 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!"
+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 "<b>Error:</b> The trigger key can only contain alphanumeric characters and _ !"
+msgid ""
+"<b>Error:</b> The trigger key can only contain alphanumeric characters and "
+"_ !"
 msgstr "<b>é?¯èª¤ï¼?</b>觸ç?¼é?µå?ªè?½å??å?«è?±æ??å­?æ¯?å?? _ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.c:51
@@ -8540,10 +7922,6 @@ msgstr "<b>é?¯èª¤ï¼?</b>æ??å­?ç??段å¿?é ?屬æ?¼æ??å??ç¾£çµ?ï¼?"
 msgid "<b>Warning:</b> You should choose a name for the snippet!"
 msgstr "<b>è­¦å??ï¼?</b>ä½ æ??該ç?ºæ??å­?ç??段é?¸æ??ä¸?å??å??稱ï¼?"
 
-#: ../plugins/snippets-manager/snippets-editor.ui.h:3
-msgid "Add"
-msgstr "å? å?¥"
-
 #: ../plugins/snippets-manager/snippets-editor.ui.h:4
 msgid "Close"
 msgstr "é??é??"
@@ -8553,7 +7931,9 @@ 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."
+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
@@ -8606,7 +7986,9 @@ 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"
+"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"
@@ -8628,7 +8010,7 @@ msgstr "å?¯å?¥æ??å­?ç??段"
 msgid "Export Snippets"
 msgstr "å?¯å?ºæ??å­?ç??段"
 
-#: ../plugins/sourceview/sourceview.c:481
+#: ../plugins/sourceview/sourceview.c:480
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8637,7 +8019,7 @@ msgstr ""
 "å?¨ç¡¬ç¢?å?§æª?æ¡?ã?? %sã?? ç??å?§å®¹æ¯?ç?®å??ç??ç·©è¡?å??å?§å®¹é??è¦?æ?°ã??\n"
 "æ?¯å?¦è¦?é??æ?°è¼?å?¥å®?ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:518
+#: ../plugins/sourceview/sourceview.c:517
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8647,18 +8029,18 @@ msgstr ""
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:555
+#: ../plugins/sourceview/sourceview.c:554
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "ç?¡æ³?é??å?? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview.c:609
+#: ../plugins/sourceview/sourceview.c:608
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æª?æ¡?ã??%sã??æ?¯å?¯è®?ç??ï¼?ä»?ç?¶è¦?編輯å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:668
+#: ../plugins/sourceview/sourceview.c:667
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "������ %s�%s"
@@ -8682,22 +8064,18 @@ msgid "Wrap lines"
 msgstr "æ??å??"
 
 #: ../plugins/sourceview/sourceview-print.c:113
-#| msgid "Show Line Numbers"
 msgid "Line numbers"
 msgstr "å??è??"
 
 #: ../plugins/sourceview/sourceview-print.c:115
-#| msgid "Head"
 msgid "Header"
 msgstr "��"
 
 #: ../plugins/sourceview/sourceview-print.c:117
-#| msgid "Filter"
 msgid "Footer"
 msgstr "é ?å°¾"
 
 #: ../plugins/sourceview/sourceview-print.c:119
-#| msgid "_Highlight Mode"
 msgid "Highlight source code"
 msgstr "æ¨?示å??å§?碼"
 
@@ -8766,13 +8144,11 @@ msgid "Use theme font"
 msgstr "使ç?¨ä¸»é¡?ç??å­?å??"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
-#: ../src/anjuta-app.c:631
-#: ../src/anjuta-app.c:636
+#: ../src/anjuta-app.c:633 ../src/anjuta-app.c:638
 msgid "View"
 msgstr "顯示"
 
-#: ../plugins/starter/plugin.c:70
-#: ../plugins/starter/starter.c:353
+#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:353
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "èµ·æ­¥"
@@ -8809,6 +8185,10 @@ msgstr "å? å?¥æª?æ¡?/ç?®é??"
 msgid "Branch/Tag URL:"
 msgstr "å??æ?¯/æ¨?籤 URL:"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:7
+msgid "Commit Changes"
+msgstr "æ??交修æ?¹"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:8
 msgid "Copy files/folders"
 msgstr "è¤?製æª?æ¡?/è³?æ??夾"
@@ -8885,6 +8265,10 @@ msgstr "��庫 Head"
 msgid "Repository authorization"
 msgstr "��庫��"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:35
+msgid "Retrieving statusâ?¦"
+msgstr "æ­£å?¨å??å¾?ç??æ??â?¦"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
 msgid "Retrieving status��"
 msgstr "æ­£å?¨å??å¾?ç??æ??â?¦â?¦"
@@ -8905,6 +8289,18 @@ msgstr "第�路��"
 msgid "Select Changes to Revert:"
 msgstr "é?¸æ??è¦?復å??ç??æ?´æ?¹ï¼?"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
+msgid "Select Files to Commit:"
+msgstr "é?¸æ??è¦?æ??交ç??æª?æ¡?ï¼?"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
+msgid "Select Files to Mark as Resolved:"
+msgstr "é?¸æ??è¦?æ¨?è¨?ç?ºå·²è§£æ±ºç??æª?æ¡?ï¼?"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
+msgid "Set Conflicts as Resolved"
+msgstr "���設��已解決"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "ä¾?æº?/ç?®ç??è·¯å¾?ï¼?"
@@ -8971,25 +8367,40 @@ 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"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:60 ../plugins/subversion/plugin.c:175
+msgid "_Addâ?¦"
+msgstr "å? å?¥(_A)â?¦"
+
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:62
-#: ../plugins/subversion/plugin.c:177
+#: ../plugins/subversion/plugin.c:62 ../plugins/subversion/plugin.c:177
 msgid "Add a new file/directory to the Subversion tree"
 msgstr "å? å?¥æ?°æª?æ¡?/ç?®é??è?³ Subversion 樹"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+msgid "_Removeâ?¦"
+msgstr "移�(_R)�"
+
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:70
-#: ../plugins/subversion/plugin.c:185
+#: ../plugins/subversion/plugin.c:70 ../plugins/subversion/plugin.c:185
 msgid "Remove a file/directory from Subversion tree"
 msgstr "å¾? Subversion 樹移é?¤æª?æ¡?/ç?®é?? "
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:76
+msgid "_Commitâ?¦"
+msgstr "_Commitâ?¦"
+
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:78
@@ -8998,15 +8409,13 @@ 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 "å??復æ?´æ?¹è?³ä½ ç??å·¥ä½?è¤?æ?¬ã??"
 
@@ -9024,15 +8433,13 @@ 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 樹å??æ­¥"
 
@@ -9044,8 +8451,7 @@ 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 "è¤?製æª?æ¡?庫中ç??æª?æ¡?/è³?æ??夾"
 
@@ -9075,15 +8481,13 @@ 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 "檢���歷�"
 
@@ -9095,8 +8499,7 @@ 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 "æ¯?å°?æ?¬å?°ç«¯æª?æ¡?樹è??æª?æ¡?庫ç??å·®ç?°"
 
@@ -9128,6 +8531,13 @@ msgstr "Subversion ç´?é??"
 msgid "Subversion: File will be added on next commit."
 msgstr "Subversion: å?¨ä¸?次æ??交æ??å°?å? å?¥æ­¤æª?æ¡?ã??"
 
+#: ../plugins/subversion/subversion-add-dialog.c:65
+#: ../plugins/subversion/subversion-diff-dialog.c:116
+#: ../plugins/subversion/subversion-remove-dialog.c:98
+#: ../plugins/subversion/subversion-update-dialog.c:68
+msgid "Please enter a path."
+msgstr "è«?輸å?¥è·¯å¾?ã??"
+
 #: ../plugins/subversion/subversion-commit-dialog.c:39
 msgid "Subversion: Commit complete."
 msgstr "Subversion: æ??交å®?æ??ã??"
@@ -9162,6 +8572,14 @@ msgstr "Subversionï¼?æ­£å?¨å??å?? diffâ?¦"
 msgid "Diff"
 msgstr "差�"
 
+#: ../plugins/subversion/subversion-log-dialog.c:132
+msgid "Author"
+msgstr "ä½?è??"
+
+#: ../plugins/subversion/subversion-log-dialog.c:141
+msgid "Date"
+msgstr "æ?¥æ??"
+
 #: ../plugins/subversion/subversion-log-dialog.c:151
 msgid "Revision"
 msgstr "ä¿®è¨?ç??"
@@ -9322,116 +8740,94 @@ msgstr "�失� %s"
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag De_claration"
 msgstr "æ¨?籤宣å??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:319
+#: ../plugins/symbol-db/plugin.c:328
 msgid "Go to symbol declaration"
 msgstr "移è?³ä¸?ä¸?å??符è??宣å??"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:335
 msgid "Tag _Implementation"
 msgstr "�籤實�(_I)"
 
-#: ../plugins/symbol-db/plugin.c:328
+#: ../plugins/symbol-db/plugin.c:337
 msgid "Go to symbol definition"
 msgstr "移è?³ä¸?ä¸?å??符è??å®?義"
 
-#: ../plugins/symbol-db/plugin.c:335
+#: ../plugins/symbol-db/plugin.c:344
 msgid "_Find Symbolâ?¦"
 msgstr "å°?æ?¾ç¬¦è??(_F)â?¦"
 
-#: ../plugins/symbol-db/plugin.c:336
+#: ../plugins/symbol-db/plugin.c:345
 msgid "Find Symbol"
 msgstr "å°?æ?¾ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:1013
+#: ../plugins/symbol-db/plugin.c:1010
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ­£å?¨ç?¢ç??å¯?碼å??ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1018
+#: ../plugins/symbol-db/plugin.c:1015
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?%3$d å??æª?æ¡?中已æ??æ?? %2$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1049
+#: ../plugins/symbol-db/plugin.c:1046
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "æ­£å?¨ç?¢ç??å¯?碼å??ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1051
+#: ../plugins/symbol-db/plugin.c:1048
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%2$d å??æª?æ¡?中已æ??æ?? %1$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1786
+#: ../plugins/symbol-db/plugin.c:1798
 msgid "Populating symbol databaseâ?¦"
 msgstr "æ­£å?¨é?·ç§»ç¬¦è??è³?æ??庫â?¦"
 
-#: ../plugins/symbol-db/plugin.c:2106
-#: ../plugins/symbol-db/plugin.c:2191
+#: ../plugins/symbol-db/plugin.c:2119 ../plugins/symbol-db/plugin.c:2204
 msgid "Symbols"
 msgstr "符è??"
 
-#: ../plugins/symbol-db/plugin.c:2200
+#: ../plugins/symbol-db/plugin.c:2213
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2208
+#: ../plugins/symbol-db/plugin.c:2221
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:275
-msgid "Package is not parseable"
-msgstr "å¥?件æ?¯ç?¡æ³?解æ??ç??"
-
-#: ../plugins/symbol-db/symbol-db-prefs.c:375
-#: ../plugins/symbol-db/symbol-db-prefs.c:522
+#: ../plugins/symbol-db/plugin.c:2529 ../plugins/symbol-db/plugin.c:2547
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "符è??è³?æ??庫"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:472
-msgid "API Tags"
-msgstr "API �籤"
-
-#: ../plugins/symbol-db/symbol-db-system.c:817
+#: ../plugins/symbol-db/symbol-db-system.c:808
 msgid "Resuming glb scan."
 msgstr "ç¹¼çº? glb æ??æ??ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "Automatically scan project's packages"
-msgstr "è?ªå??æ??æ??å°?æ¡?ç??å¥?件"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
 msgid "Automatically update symbols without saving file"
 msgstr "ä¸?å?²å­?æª?æ¡?è??è?ªå??æ?´æ?°ç¬¦è??"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically update the file's symbols without saving. The update occurs after 10 seconds without keypresses by the user."
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
 msgstr "ä¸?é??å?²å­?å°±è?ªå??æ?´æ?°æª?æ¡?ç??符è??ã??æ­¤æ?´æ?°æ??å?¨ä½¿ç?¨è??å??止輸å?¥ç?? 10 ç§?å¾?é?²è¡?ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Available API tags"
-msgstr "å?¯ç?¨ç?? API æ¨?籤"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseableâ?¦"
-msgstr "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??â?¦"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "å°?æ¡?å??å?¨å??符è??ç??å¹³è¡?æ??æ??"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-msgid "This option enables the default packages required by your opened project, e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
-msgstr "é??å??é?¸é ?æ??å??ç?¨ä½ é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?你建ç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? 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"
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
+msgid ""
+"This option means that the global system packages will be scanned "
+"simultaneously with the project's ones"
 msgstr "é??å??é?¸é ?示å?¨å??系統å¥?件æ??è??å°?å®?ä¸?樣被æ??æ??"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
@@ -9462,8 +8858,7 @@ msgstr "Ctrl-Z"
 msgid "terminal operations"
 msgstr "çµ?端æ©?æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:750
-#: ../plugins/terminal/terminal.c:944
+#: ../plugins/terminal/terminal.c:750 ../plugins/terminal/terminal.c:944
 #: ../plugins/terminal/terminal.c:995
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
@@ -9517,10 +8912,8 @@ msgstr "��輸��"
 msgid "Tool Editor"
 msgstr "工�編輯�"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
-#: ../plugins/tools/plugin.c:263
-#: ../plugins/tools/plugin.c:270
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:263
+#: ../plugins/tools/plugin.c:270 ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "工�"
 
@@ -9574,7 +8967,9 @@ 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
@@ -9809,7 +9204,7 @@ msgstr "�串"
 msgid "Copyright (c) Naba Kumar"
 msgstr "ç??æ¬?æ??æ?? © Naba Kumar"
 
-#: ../src/anjuta.c:432
+#: ../src/anjuta.c:454
 msgid "Loaded Sessionâ?¦"
 msgstr "å·²è¼?å?¥ä½?業é??段â?¦"
 
@@ -9945,58 +9340,62 @@ msgstr "é??æ?¼å¤?é?¨å¤?æ??ç¨?å¼?(_P)"
 msgid "About third-party Anjuta plugins"
 msgstr "é??æ?¼ç¬¬ä¸?æ?¹ Anjuta å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:627
+#: ../src/anjuta-app.c:629
 msgid "Edit"
 msgstr "編輯"
 
-#: ../src/anjuta-app.c:931
+#: ../src/anjuta-app.c:642
+msgid "Help"
+msgstr "æ±?å?©"
+
+#: ../src/anjuta-app.c:938
 msgid "Installed plugins"
 msgstr "å·²å®?è£?ç??å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:935
+#: ../src/anjuta-app.c:942
 msgid "Shortcuts"
 msgstr "å¿«æ?·é?µ"
 
-#: ../src/anjuta-app.c:1007
+#: ../src/anjuta-app.c:1014
 #, c-format
 msgid "Value doesn't exist"
 msgstr "����"
 
-#: ../src/main.c:70
+#: ../src/main.c:67
 msgid "Specify the size and location of the main window"
 msgstr "æ??å®?主è¦?è¦?çª?ç??大å°?å??ä½?ç½®"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:73
+#: ../src/main.c:70
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
-#: ../src/main.c:78
+#: ../src/main.c:75
 msgid "Do not show the splash screen"
 msgstr "��顯示歡���"
 
-#: ../src/main.c:84
+#: ../src/main.c:81
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "å??å??æ?°ç??實é«?è??ä¸?å?¨æ?¢å­?ç??實é«?中é??å??æª?æ¡?"
 
-#: ../src/main.c:90
+#: ../src/main.c:87
 msgid "Do not open last session on startup"
 msgstr "å??å??æ??ä¸?è¦?é??å??æ??å¾?ä¸?次ä½?業é??段"
 
-#: ../src/main.c:96
+#: ../src/main.c:93
 msgid "Do not open last project and files on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??é??å??æ??å¾?ä¸?次編輯ç??å°?æ¡?å??æª?æ¡?"
 
-#: ../src/main.c:102
+#: ../src/main.c:99
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "é?©ç?¶ç??é??é?? Anjuta 並é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
 
-#: ../src/main.c:170
+#: ../src/main.c:138
 msgid "- Integrated Development Environment"
 msgstr "- æ?´å??å¼?é??ç?¼ç?°å¢?"
 
-#: ../src/main.c:245
+#: ../src/main.c:181
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -10063,114 +9462,130 @@ msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??ä¸?使ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?顯示警å??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
+msgid "API Tags (C/C++)"
+msgstr "API �籤 (C/C++)"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?¨å?½æ?¸å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ '('"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:2
 msgid "Add a space after function call autocompletion"
 msgstr "å?¨å?½æ?¸å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ç©ºç?½"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
 msgid "Auto-complete"
 msgstr "è?ªå??è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:4
 msgid "Autocompletion"
 msgstr "è?ªå??è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+msgid "Automatically load required libraries of the project"
+msgstr "è?ªå??è¼?å?¥å°?æ¡?é??è¦?ç??ç¨?å¼?庫"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:5
 msgid "Brace indentation size in spaces:"
 msgstr "大æ?¬å¼§ç¸®æ??(空ç?½æ?¸)ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:6
 msgid "Calltips"
 msgstr "å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:8
 msgid "Enable code completion"
 msgstr "å??ç?¨ç¨?å¼?碼è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart brace completion"
 msgstr "å??ç?¨æ?ºæ?§å??æ?¬å¼§è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:9
 msgid "Enable smart indentation"
 msgstr "å??ç?¨æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Indent:"
 msgstr "縮æ??ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:11
 msgid "Indentation parameters"
 msgstr "縮æ??å??æ?¸"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 msgid "Leading asterisk in multi-line comment"
 msgstr "å¤?è¡?註解ç??é??é ­æ??è??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Line up parentheses"
 msgstr "å°?é½?æ?¬è??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Parenthesis indentation"
 msgstr "æ?¬è??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Prefer vim/emacs modelines over indentation settings"
 msgstr "å??好 vim/emacs modelines å??æ?¼ç¸®æ??設å®?å?¼"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "顯示å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:15
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:20
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??縮æ??大å°?(空ç?½å­?符)ï¼?"
 
 #. ANJUTA_STOCK_AUTOINDENT,
-#: ../plugins/language-support-cpp-java/plugin.c:1920
+#: ../plugins/language-support-cpp-java/plugin.c:967
 #: ../plugins/language-support-python/plugin.c:1185
 msgid "Auto-Indent"
 msgstr "è?ªå??縮æ??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
+#: ../plugins/language-support-cpp-java/plugin.c:968
 #: ../plugins/language-support-python/plugin.c:1186
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "æ ¹æ??縮æ??設å®?å?¼è?ªå??縮æ??ç?®å??ç??è¡?æ??é?¸æ??å??å??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1926
+#: ../plugins/language-support-cpp-java/plugin.c:974
+msgid "Comment/Uncomment"
+msgstr "å? ä¸?/å??æ¶?å??註"
+
+#: ../plugins/language-support-cpp-java/plugin.c:975
+msgid "Comment or uncomment current selection"
+msgstr "å°?ç?®å??ç??é?¸æ??å??å??å? ä¸?æ??å??æ¶?å??註"
+
+#: ../plugins/language-support-cpp-java/plugin.c:980
 msgid "Swap .h/.c"
 msgstr "ç?¸äº?å??æ?? .h /.c æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1927
+#: ../plugins/language-support-cpp-java/plugin.c:981
 msgid "Swap C header and source files"
 msgstr "å??æ?? C æ¨?é ­æª?è??å??å§?æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1967
+#: ../plugins/language-support-cpp-java/plugin.c:1021
 msgid "C++/Java Assistance"
 msgstr "C++/Java æ?´å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2085
-#: ../plugins/language-support-cpp-java/plugin.c:2098
+#: ../plugins/language-support-cpp-java/plugin.c:1196
+#: ../plugins/language-support-cpp-java/plugin.c:1226
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -10226,18 +9641,17 @@ msgstr "�譯�"
 msgid "Path: "
 msgstr "路��"
 
-#: ../plugins/sourceview/plugin.c:238
-#: ../plugins/sourceview/plugin.c:279
+#: ../plugins/sourceview/plugin.c:238 ../plugins/sourceview/plugin.c:279
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView 編輯�"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "GNU Debugger Plugin"
-msgstr "GNU Debugger å¤?æ??ç¨?å¼?"
+msgid "GNU Debugger"
+msgstr "GNU Debugger"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "GNU Debugger å¤?æ??ç¨?å¼?"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -10291,14 +9705,6 @@ msgstr "給 Anjuta ç?? Glade å¤?æ??ç¨?å¼?ã??"
 msgid "Glade interface designer"
 msgstr "Glade ��設���"
 
-#: ../plugins/gtodo/anjuta-gtodo.plugin.in.h:1
-msgid "Task Manager"
-msgstr "å·¥ä½?管ç??å?¡"
-
-#: ../plugins/gtodo/anjuta-gtodo.plugin.in.h:2
-msgid "Todo Plugin for Anjuta."
-msgstr "給 Anjuta ç??å¾?辦äº?é ?å¤?æ??ç¨?å¼?ã??"
-
 #: ../plugins/patch/anjuta-patch.plugin.in.h:1
 msgid "Patch Plugin"
 msgstr "ä¿®è£?å¤?æ??ç¨?å¼?"
@@ -10380,8 +9786,8 @@ msgid "Anjuta Class Generator Plugin"
 msgstr "Anjuta é¡?å?¥ç?¢ç??å?¨å¤?æ??ç¨?å¼?"
 
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:2
-msgid "C++/GObject Class"
-msgstr "C++/GObject é¡?å?¥"
+msgid "Class"
+msgstr "é¡?å?¥"
 
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
@@ -10436,7 +9842,6 @@ msgid "Autotools backend"
 msgstr "Autotools �端��"
 
 #: ../plugins/am-project/am-project.plugin.in.h:2
-#| msgid "Autotools backend for project manager"
 msgid "New Autotools backend for project manager"
 msgstr "å°?æ¡?管ç??ç¨?å¼?ç??æ?° Autotools å¾?端ç¨?å¼?"
 
@@ -10451,8 +9856,8 @@ msgid "Error: cant bind port"
 msgstr "�誤��������"
 
 #: ../plugins/js-debugger/js_debugger.plugin.in.h:1
-msgid "Anjuta JS Debugger Plugin"
-msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
+msgid "Javascript Debugger"
+msgstr "Javascript Debugger"
 
 #: ../plugins/js-debugger/js_debugger.plugin.in.h:2
 msgid "Javascript Debugger Plugin"
@@ -10503,6 +9908,821 @@ msgstr "è?ªå??è£?é½?ç??æ??å°?å­?符"
 msgid "Symbol"
 msgstr "符è??"
 
+#~| msgid "Switch to another branch"
+#~ msgid "Switch to this branch"
+#~ msgstr "å??æ??è?³é??å??å??æ?¯"
+
+#~ msgid "Help display"
+#~ msgstr "顯示��"
+
+#~ msgid "_Add Bookmark"
+#~ msgstr "���籤(_A)"
+
+#~ msgid "Install directories:"
+#~ msgstr "å®?è£?ç?®é??ï¼?"
+
+#~ msgid "Add Remote Branch"
+#~ msgstr "å? å?¥é? ç«¯å??æ?¯"
+
+#~ msgid "Apply Stash"
+#~ msgstr "�� Stash"
+
+#~ msgid "Author/Grep"
+#~ msgstr "ä½?è??/Grep"
+
+#~ msgid "Bad revision:"
+#~ msgstr "ä¸?好ç??ç??æ?¬ï¼?"
+
+#~ msgid "Branch name:"
+#~ msgstr "å??æ?¯å??稱ï¼?"
+
+#~ msgid "Branch to switch to:"
+#~ msgstr "è¦?å??æ??å?°å??æ?¯ï¼?"
+
+#~ msgid "Branches to delete:"
+#~ msgstr "è¦?å?ªé?¤ç??å??æ?¯ï¼?"
+
+#~ msgid "Check out all local changes"
+#~ msgstr "Check out æ??æ??æ?¬å?°ç«¯ç??è®?æ?´"
+
+#~ msgid "Create Branch"
+#~ msgstr "建ç«?å??æ?¯"
+
+#~ msgid "Delete Branch"
+#~ msgstr "å?ªé?¤å??æ?¯"
+
+#~ msgid "Delete Remote Branch"
+#~ msgstr "å?ªé?¤é? ç«¯å??æ?¯"
+
+#~ msgid "Delete Tags"
+#~ msgstr "���籤"
+
+#~ msgid "Filters"
+#~ msgstr "é??濾æ¢?件"
+
+#~ msgid "From:"
+#~ msgstr "å¾?ï¼?"
+
+#~ msgid "Good revision:"
+#~ msgstr "è?¯å¥½ç??ç??æ?¬ï¼?"
+
+#~ msgid "Grep:"
+#~ msgstr "Grep:"
+
+#~ msgid "Head"
+#~ msgstr "Head"
+
+#~ msgid "Ignore Files"
+#~ msgstr "忽���:"
+
+#~ msgid "Mailbox file containing patches:"
+#~ msgstr "å??å?«ä¿®è£?ç??ä¿¡ç®±æª?æ¡?ï¼?"
+
+#~ msgid "Mode:"
+#~ msgstr "模��"
+
+#~ msgid "Previous commit"
+#~ msgstr "å??ä¸?次æ??交"
+
+#~ msgid "Remote branch to rebase from:"
+#~ msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
+
+#~ msgid "Remote to delete:"
+#~ msgstr "è¦?å?ªé?¤ç??é? ç«¯ï¼?"
+
+#~ msgid "Repository origin"
+#~ msgstr "��庫�頭"
+
+#~ msgid "Reset to:"
+#~ msgstr "é??設ç?ºï¼?"
+
+#~ msgid "Restore index"
+#~ msgstr "é??å??ç´¢å¼?"
+
+#~ msgid "Revert Commit"
+#~ msgstr "å??復æ??交"
+
+#~ msgid "Revision/Tag:"
+#~ msgstr "ä¿®è¨?ç??/æ¨?籤:"
+
+#~ msgid "Select Files to Check Out:"
+#~ msgstr "é?¸æ??è¦?å??å??ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select Files to Ignore:"
+#~ msgstr "é?¸æ??è¦?忽ç?¥ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select Files to Unstage:"
+#~ msgstr "é?¸æ??è¦? Unstage ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select Mailbox File"
+#~ msgstr "é?¸æ??ä¿¡ç®±æª?æ¡?"
+
+#~ msgid "Select a Folder"
+#~ msgstr "é?¸æ??è³?æ??夾"
+
+#~ msgid "Select file to add:"
+#~ msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select file to remove:"
+#~ msgstr "é?¸æ??è¦?移é?¤ç??æª?æ¡?ï¼?"
+
+#~ msgid "Show the contents of the selected stash in an editor"
+#~ msgstr "顯示å?¨ç·¨è¼¯å?¨ä¸­é?¸å?? stash ç??å?§å®¹"
+
+#~ msgid "Stash the working tree's uncommitted changes"
+#~ msgstr "Stash working tree 中æ?ªæ??交ç??è®?æ?´"
+
+#~ msgid "Switch to Another Branch"
+#~ msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
+
+#~ msgid "Tag name:"
+#~ msgstr "æ¨?籤å??稱ï¼?"
+
+#~ msgid "Tag/Commit"
+#~ msgstr "æ¨?籤/æ??交"
+
+#~ msgid "Tags to delete:"
+#~ msgstr "è¦?å?ªé?¤ç??æ¨?籤ï¼?"
+
+#~ msgid "To:"
+#~ msgstr "å?°ï¼?"
+
+#~ msgid "View log"
+#~ msgstr "檢è¦?ç´?é??"
+
+#~ msgid "page 3"
+#~ msgstr "é ? 3"
+
+#~ msgid "Please select a file."
+#~ msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
+
+#~ msgid "Git: Added remote branch \"%s\"."
+#~ msgstr "Gitï¼?å? å?¥é? ç«¯å??æ?¯ã??%sã??ã??"
+
+#~ msgid "Git: Fetchingâ?¦"
+#~ msgstr "Gitï¼?æ­£å?¨å??å??â?¦"
+
+#~ msgid "Please select a mailbox file."
+#~ msgstr "è«?é?¸æ??ä¸?å??ä¿¡ç®±æª?æ¡?ã??"
+
+#~ msgid "Git: File retrieved."
+#~ msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+
+#~ msgid "Git: Files checked out."
+#~ msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+
+#~ msgid "Git: Commit complete."
+#~ msgstr "Gitï¼?æ??交å®?æ??ã??"
+
+#~ msgid "Git: Created branch \"%s\"."
+#~ msgstr "Gitï¼?已建ç«?å??æ?¯ã??%sã??ã??"
+
+#~ msgid "Git: Created tag \"%s\"."
+#~ msgstr "Gitï¼?已建ç«?æ¨?籤ã??%sã??ã??"
+
+#~ msgid "Please select branches to delete"
+#~ msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
+
+#~| msgid "Stash Uncommitted Changes"
+#~ msgid "Uncommitted Changes.diff"
+#~ msgstr "Uncommitted Changes.diff"
+
+#~| msgid "_Show commit diff"
+#~ msgid "Commit %s.diff"
+#~ msgstr "Commit %s.diff"
+
+#~ msgid "Git: Fetch complete."
+#~ msgstr "Gitï¼?å??å??å·²å®?æ??ã??"
+
+#~ msgid "Graph"
+#~ msgstr "å??表"
+
+#~ msgid "Short log"
+#~ msgstr "ç?­ç´?é??"
+
+#~ msgid "Git: Retrieving logâ?¦"
+#~ msgstr "Gitï¼?æ­£å?¨å??å??ç´?é??æª?â?¦"
+
+#~ msgid "Select a file"
+#~ msgstr "é?¸æ??æª?æ¡?"
+
+#~ msgid "Git: Merge complete."
+#~ msgstr "Gitï¼?å??ä½µå®?æ??ã??"
+
+#~ msgid "Git: Pull complete."
+#~ msgstr "Gitï¼? Pull å·²å®?æ??ã??"
+
+#~ msgid "Please select a remote to pull from."
+#~ msgstr "è«?輸å?¥è¦? pull ç??é? ç«¯ã??"
+
+#~ msgid "Please enter the URL of the repository to pull from."
+#~ msgstr "è«?輸å?¥è¦? pull ç??æª?æ¡?庫 URLã??"
+
+#~ msgid "Git: Push complete."
+#~ msgstr "Git: Push complete."
+
+#~ msgid "Please select a remote to push to."
+#~ msgstr "è«?é?¸æ??è¦? push ç??é? ç«¯ã??"
+
+#~ msgid "Please enter the URL of the repository to push to."
+#~ msgstr "è«?輸å?¥è¦? push å?°ç??æª?æ¡?庫 URLã??"
+
+#~ msgid "Git: Pushingâ?¦"
+#~ msgstr "Gitï¼?Pushingâ?¦"
+
+#~ msgid "Git: Rebasing"
+#~ msgstr "Gitï¼?æ­£å?¨é??è¨?å?ºç¤?"
+
+#~ msgid "Git: File removed."
+#~ msgstr "Gitï¼?æª?æ¡?已移é?¤ã??"
+
+#~ msgid "Git: Resolve complete."
+#~ msgstr "Gitï¼?調解已å®?æ??ã??"
+
+#~ msgid "Git: Stash dropped."
+#~ msgstr "Gitï¼?Stash å·²æ?¾æ£?ã??"
+
+#~ msgid "Git: All stashes cleared."
+#~ msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
+
+#~ msgid "Git: Branch checkout complete."
+#~ msgstr "Gitï¼?å??å??å??æ?¯å®?æ??ã??"
+
+#~ msgid "There are no branches available."
+#~ msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
+
+#~ msgid "Please select a stash"
+#~ msgstr "è«?é?¸æ??ä¸?å?? stash"
+
+#~ msgid "Git: Changes stored in a stash."
+#~ msgstr "Gitï¼?å?²å­?å?¨ stash ç??è®?æ?´ã??"
+
+#~ msgid "Git: Stashed changes applied."
+#~ msgstr "Gitï¼?å¥?ç?¨å·² stash ç??è®?æ?´ã??"
+
+#~ msgid "Git: Diff complete."
+#~ msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
+
+#~ msgid "Git: Files unstaged."
+#~ msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
+
+#~ msgid "_Git"
+#~ msgstr "_Git"
+
+#~ msgid "_Changes"
+#~ msgstr "è®?æ?´(_C)"
+
+#~ msgid "Commit changes to the local repository"
+#~ msgstr "æ??交è®?æ?´è?³æ?¬å?°ç«¯æª?æ¡?庫"
+
+#~ msgid "_Stash"
+#~ msgstr "_Stash"
+
+#~ msgid "Save uncommitted changes and re-apply them later"
+#~ msgstr "å°?æ?ªæ??交ç??è®?æ?´å?²å­?並å?¨ç¨?å¾?é??æ?°å¥?ç?¨å®?å??"
+
+#~ msgid "_Apply stashed changesâ?¦"
+#~ msgstr "��已 stash ��(_A)�"
+
+#~ msgid "_View logâ?¦"
+#~ msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
+
+#~ msgid "View change history"
+#~ msgstr "檢è¦?è®?æ?´æ­·å?²ç´?é??"
+
+#~ msgid "_Pushâ?¦"
+#~ msgstr "_Pushâ?¦"
+
+#~ msgid "_Pullâ?¦"
+#~ msgstr "_Pullâ?¦"
+
+#~ msgid "Update the working copy"
+#~ msgstr "��工���"
+
+#~ msgid "Update remote branches"
+#~ msgstr "æ?´æ?°é? ç«¯å??æ?¯"
+
+#~ msgid "_Files"
+#~ msgstr "��(_F)"
+
+#~ msgid "_Ignoreâ?¦"
+#~ msgstr "忽�(_I)�"
+
+#~ msgid "Ignore files"
+#~ msgstr "忽���"
+
+#~ msgid "_Check out filesâ?¦"
+#~ msgstr "_Check out ���"
+
+#~ msgid "_Unstage filesâ?¦"
+#~ msgstr "��� _Unstage�"
+
+#~ msgid "Create patch seriesâ?¦"
+#~ msgstr "建� patch series�"
+
+#~ msgid "Generate patch files for submission upstream"
+#~ msgstr "å¾?æ??交ä¸?游ç?¢ç??ä¿®è£?æª?æ¡?"
+
+#~ msgid "_Applyâ?¦"
+#~ msgstr "��(_A)�"
+
+#~ msgid "Start applying a patch series"
+#~ msgstr "é??å§?å¥?ç?¨ patch series"
+
+#~ msgid "_Skip current patch"
+#~ msgstr "忽ç?¥ç?®å??ç??ä¿®è£?æª?(_S)"
+
+#~ msgid "_Branches"
+#~ msgstr "å??æ?¯(_B)"
+
+#~ msgid "_Create branchâ?¦"
+#~ msgstr "建� bran_ch�"
+
+#~ msgid "_Delete branchâ?¦"
+#~ msgstr "�� branch(_D)�"
+
+#~ msgid "Delete branches"
+#~ msgstr "å?ªé?¤å??æ?¯"
+
+#~ msgid "_Switch to another branchâ?¦"
+#~ msgstr "å??æ??è?³å?¦ä¸?å?? branch(_S)â?¦"
+
+#~ msgid "_Mergeâ?¦"
+#~ msgstr "_Mergeâ?¦"
+
+#~ msgid "Merge changes from another branch into the current one"
+#~ msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µè®?æ?´è?³ç?®å??ç??å??æ?¯"
+
+#~ msgid "_Rebase"
+#~ msgstr "_Rebase"
+
+#~ msgid "Merge your changes with an upstream remote branch"
+#~ msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+
+#~ msgid "_Startâ?¦"
+#~ msgstr "é??å§?(_S)â?¦"
+
+#~ msgid "Start a rebase"
+#~ msgstr "é??å§? rebase"
+
+#~ msgid "Continue a rebase that stopped because of conflicts"
+#~ msgstr "ç¹¼çº?å? è¡?çª?è??å??æ­¢ç?? rebase"
+
+#~ msgid "Skip the current conflicted commit and continue"
+#~ msgstr "ç?¥é??ç?®å??è¡?çª?ç?? commit 並繼çº?"
+
+#~ msgid "_Cherry pickâ?¦"
+#~ msgstr "_Cherry pickâ?¦"
+
+#~ msgid ""
+#~ "Selectively merge individual changes from other branches into the current "
+#~ "one"
+#~ msgstr "é?¸æ??æ?§ç??å°?å??å?¥è®?æ?´å¾?å?¶ä»?å??æ?¯å??ä½µå?°ç?®å??ç??å??æ?¯"
+
+#~ msgid "_Remote branches"
+#~ msgstr "_Remote branches"
+
+#~ msgid "_Deleteâ?¦"
+#~ msgstr "��(_D)�"
+
+#~ msgid "_Create tagâ?¦"
+#~ msgstr "建��籤(_C)�"
+
+#~ msgid "_Delete tagâ?¦"
+#~ msgstr "���籤(_D)�"
+
+#~ msgid "Delete tags"
+#~ msgstr "���籤"
+
+#~ msgid "_Reset treeâ?¦"
+#~ msgstr "_Reset treeâ?¦"
+
+#~ msgid "Reset repository head to any past state"
+#~ msgstr "å°?æª?æ¡?庫ç?? head é??設ç?ºä»»ä½?é??å?»ç??ç??æ??"
+
+#~ msgid "_Revert commitâ?¦"
+#~ msgstr "_Revert commitâ?¦"
+
+#~ msgid "Bisect"
+#~ msgstr "Bisect"
+
+#~ msgid "Start a bisect operation"
+#~ msgstr "é??å§? bisect æ??ä½?"
+
+#~ msgid "Stop the bisect and bring the tree back to normal"
+#~ msgstr "å??æ­¢ bisect 並å°?å??å§?碼樹帶å??正常ç??æ??"
+
+#~ msgid "_Good"
+#~ msgstr "_Good"
+
+#~ msgid "Mark the current head revision as good"
+#~ msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º good"
+
+#~ msgid "_Bad"
+#~ msgstr "_Bad"
+
+#~ msgid "Create a new git repository or reinitialize an existing one"
+#~ msgstr "建ç«?æ?° git æª?æ¡?庫æ??é??æ?°å??å§?å??ç?¾æ??ç??æª?æ¡?庫"
+
+#~ msgid "Show changes introduced by this commit"
+#~ msgstr "顯示ä»?ç´¹é??次æ??交ç??è®?æ?´"
+
+#~ msgid "View a copy of this file at this revision"
+#~ msgstr "檢è¦?é??次修è¨?ç??ç??æª?æ¡?è¤?æ?¬"
+
+#~ msgid "Create a branch with the selected revision as its head"
+#~ msgstr "建ç«?ä¸?å??å??æ?¯ä¸¦ä»¥é?¸å??ç??ä¿®è¨?ç??å??ç?ºå®?ç?? head"
+
+#~ msgid "Create a tag at this revision"
+#~ msgstr "建ç«?此修è¨?ç??ç??æ¨?籤"
+
+#~ msgid "Revert this commit"
+#~ msgstr "復å??此次æ??交"
+
+#~ msgid "_Bisect"
+#~ msgstr "_Bisect"
+
+#~ msgid "_Set good revision"
+#~ msgstr "_Set good revision"
+
+#~ msgid "Mark this revision as good"
+#~ msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º good"
+
+#~ msgid "_Set bad revision"
+#~ msgstr "_Set bad revision"
+
+#~ msgid "Mark this revision as bad"
+#~ msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º bad"
+
+#~ msgid "View changes to this file or folder"
+#~ msgstr "檢è¦?å?¨é??å??æª?æ¡?æ??è³?æ??夾ç??è®?æ?´"
+
+#~ msgid "Add this file or folder to the repository"
+#~ msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å? å?¥æª?æ¡?庫"
+
+#~ msgid "Remove this file or folder from the repository"
+#~ msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å¾?æª?æ¡?庫移é?¤"
+
+#~ msgid "Top level git menu item"
+#~ msgstr "�端層� git ����"
+
+#~ msgid "Git operations"
+#~ msgstr "Git æ??ä½?"
+
+#~ msgid "Git log operations"
+#~ msgstr "Git ç´?é??æª?æ??ä½?"
+
+#~ msgid "Git FM operations"
+#~ msgstr "Git FM æ??ä½?"
+
+#~ msgid "Git Log"
+#~ msgstr "Git ç´?é??æª?"
+
+#~ msgid "You need to select a to do item before you can edit it"
+#~ msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??é ?ç?®æ??è?½ç·¨è¼¯å®?"
+
+#~ msgid "Add Item"
+#~ msgstr "����"
+
+#~ msgid "Edit Item"
+#~ msgstr "編輯��"
+
+#~ msgid "Summary:"
+#~ msgstr "æ??è¦?ï¼?"
+
+#~ msgid "Category:"
+#~ msgstr "å??é¡?:"
+
+#~ msgid "Edit Categories"
+#~ msgstr "編輯å??é¡?"
+
+#~ msgid "Due date:"
+#~ msgstr "å?°æ??æ?¥ï¼?"
+
+#~ msgid "Notify when due"
+#~ msgstr "ç?¶å?°æ??æ??é??ç?¥"
+
+#~ msgid "Priority:"
+#~ msgstr "å?ªå??ç­?ç´?ï¼?"
+
+#~ msgid "Comment:"
+#~ msgstr "å??註ï¼?"
+
+#~ msgid "Completed"
+#~ msgstr "å·²å®?æ??"
+
+#~ msgid "started:"
+#~ msgstr "å·²å??å??ï¼?"
+
+#~ msgid "N/A"
+#~ msgstr "N/A"
+
+#~ msgid "stopped:"
+#~ msgstr "å·²å??æ­¢ï¼?"
+
+#~ msgid "You need to select a to-do item before you can remove it"
+#~ msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
+
+#~ msgid "Are you sure you want to remove the selected to-do item?"
+#~ msgstr "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
+
+#~ msgid "Are you sure you want to remove all the completed to-do items?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
+
+#~ msgid ""
+#~ "Are you sure you want to remove all the completed to-do items in the "
+#~ "category \"%s\"?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
+
+#~ msgid "Export task list"
+#~ msgstr "��工���"
+
+#~ msgid "XML"
+#~ msgstr "XML"
+
+#~ msgid "Plain Text"
+#~ msgstr "ç´?æ??å­?"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Export current category only"
+#~ msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
+
+#~ msgid "HTML export options:"
+#~ msgstr "HTML �����"
+
+#~ msgid "Embed default (CSS) style sheet"
+#~ msgstr "����設 (CSS) 樣�表"
+
+#~ msgid "Custom (CSS) style sheet"
+#~ msgstr "�� (CSS) 樣�表"
+
+#~ msgid "All"
+#~ msgstr "��"
+
+#~ msgid "_Export"
+#~ msgstr "��(_E)"
+
+#~ msgid "Priority"
+#~ msgstr "å?ªå??ç­?ç´?"
+
+#~ msgid "Due date"
+#~ msgstr "å?°æ??æ?¥"
+
+#~ msgid "Summary"
+#~ msgstr "æ??è¦?"
+
+#~ msgid "No permission to read the file."
+#~ msgstr "æ²?æ??足夠æ¬?é??è®?å??æª?æ¡?ã??"
+
+#~ msgid "Failed to read file"
+#~ msgstr "ç?¡æ³?è®?å??æª?æ¡?"
+
+#~ msgid "Failed to parse XML structure"
+#~ msgstr "å??æ?? XML çµ?æ§?失æ??"
+
+#~ msgid "File is not a valid gtodo file"
+#~ msgstr "æª?æ¡?並ä¸?æ?¯ä¸?å??æ??æ??ç?? gtodo æª?"
+
+#~ msgid "Personal"
+#~ msgstr "å??人"
+
+#~ msgid "Business"
+#~ msgstr "å??業"
+
+#~ msgid "Unfiled"
+#~ msgstr "�歸�"
+
+#~ msgid "No Gtodo Client to save."
+#~ msgstr "æ²?æ??å?¯å?²å­?ç?? Gtodo 客æ?¶ç«¯ã??"
+
+#~ msgid "No filename supplied."
+#~ msgstr "æ²?æ??æ??ä¾?æª?æ¡?å??稱ã??"
+
+#~ msgid "Medium"
+#~ msgstr "中"
+
+#~ msgid "High"
+#~ msgstr "é«?"
+
+#~ msgid "When you delete the category \"%s\", all containing items are lost"
+#~ msgstr "ç?¶æ?¨å?ªé?¤å??é¡?ã??%sã??ï¼?æ??æ??å??å?«ç??é ?ç?®é?½æ??é?ºå¤±"
+
+#~ msgid "Delete"
+#~ msgstr "��"
+
+#~ msgid "<New category (%d)>"
+#~ msgstr "<æ?°å??é¡? (%d)>"
+
+#~ msgid "The following item is due in %i minute:"
+#~ msgid_plural "The following item is due in %i minutes:"
+#~ msgstr[0] "ä¸?å??äº?é ?å?¨ %i å??é??å?§å?°æ??ï¼?"
+
+#~ msgid "The following item is due:"
+#~ msgstr "ä¸?å??é ?ç?®å·²å?°æ??ï¼?"
+
+#~ msgid "_Do not show again"
+#~ msgstr "ä¸?å??顯示(_D)"
+
+#~ msgid "_Tasks"
+#~ msgstr "ä»»å??(_T)"
+
+#~ msgid "Hide _Completed Items"
+#~ msgstr "é?±è??å·²å®?æ??é ?ç?®(_C)"
+
+#~ msgid "Hide completed to-do items"
+#~ msgstr "é?±è??å·²å®?æ??ç??å¾?辦äº?é ?"
+
+#~ msgid "Hide Items Past _Due Date"
+#~ msgstr "é?±è??å·²é??æ??ç??é ?ç?®(_D)"
+
+#~ msgid "Hide items that are past due date"
+#~ msgstr "é?±è??å·²é??æ??ç??é ?ç?®"
+
+#~ msgid "Hide Items Without _End Date"
+#~ msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®(_E)"
+
+#~ msgid "Hide items without an end date"
+#~ msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®"
+
+#~ msgid "Task manager"
+#~ msgstr "å·¥ä½?管ç??å?¡"
+
+#~ msgid "Task manager view"
+#~ msgstr "å·¥ä½?管ç??å?¡æª¢è¦?"
+
+#~ msgid "To-do Manager"
+#~ msgstr "å¾?辦äº?é ?管ç??å?¡"
+
+#~ msgid "To-do List Preferences"
+#~ msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
+
+#~ msgid "Interface"
+#~ msgstr "ä»?é?¢"
+
+#~ msgid "Show due date column"
+#~ msgstr "顯示å?°æ??æ?¥æ¬?ä½?"
+
+#~ msgid "Show category column"
+#~ msgstr "顯示å??é¡?æ¬?ä½?"
+
+#~ msgid "Show priority column"
+#~ msgstr "顯示å?ªå??é ?åº?æ¬?ä½?"
+
+#~ msgid "Show in main window"
+#~ msgstr "顯示�主��中"
+
+#~ msgid "Highlight"
+#~ msgstr "�示"
+
+#~ msgid "Items that are due today"
+#~ msgstr "å?¨ä»?æ?¥å?°æ??ç??é ?ç?®"
+
+#~ msgid "Items that are past due"
+#~ msgstr "é??å?»å?°æ??ç??é ?ç?®"
+
+#~ msgid "Items that are due in the next %i day"
+#~ msgid_plural "Items that are due in the next %i days"
+#~ msgstr[0] "é ?ç?®å?¨æ?ªä¾? %i 天å?§å?°æ??"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "é??é ?"
+
+#~ msgid "Auto-purge completed items"
+#~ msgstr "è?ªå??æ¸?é?¤å·²å®?æ??ç??é ?ç?®"
+
+#~ msgid "Purge items after"
+#~ msgstr "��"
+
+#~ msgid "days."
+#~ msgstr "天å??ç??é ?ç?®ã??"
+
+#~ msgid "Auto-Purge"
+#~ msgstr "è?ªå??æ¸?é?¤"
+
+#~ msgid "Notification"
+#~ msgstr "é??ç?¥"
+
+#~ msgid "Allow to-do items to notify me when they are due in %i minute"
+#~ msgid_plural ""
+#~ "Allow to-do items to notify me when they are due in %i minutes"
+#~ msgstr[0] "å??許å¾?辦äº?é ?å?¨å?°æ??ç?? %i å??é??å??é??ç?¥æ??"
+
+#~ msgid "Open a Task List"
+#~ msgstr "é??å??ä»»å??æ¸?å?®"
+
+#~ msgid "Create a Task List"
+#~ msgstr "建ç«?ä»»å??æ¸?å?®"
+
+#~ msgid "No Date"
+#~ msgstr "æ²?æ??æ?¥æ??"
+
+#~| msgid "Add _module"
+#~ msgid "Add Module"
+#~ msgstr "��模�"
+
+#~| msgid "Add _Package"
+#~ msgid "Add Package"
+#~ msgstr "���件"
+
+#~ msgid "New Group"
+#~ msgstr "��群�"
+
+#~ msgid "Specify _where to create the group:"
+#~ msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?群çµ?(_W):"
+
+#~| msgid "Add _Package"
+#~ msgid "_Add package&#x2026;"
+#~ msgstr "���件(_A)&#x2026;"
+
+#~ msgid "_Group name:"
+#~ msgstr "群çµ?å??稱(_G):"
+
+#~ msgid "Add _Groupâ?¦"
+#~ msgstr "��群�(_G)�"
+
+#~ msgid "Add a group to project"
+#~ msgstr "��群����"
+
+#~| msgid "Add _module"
+#~ msgid "Add _Moduleâ?¦"
+#~ msgstr "��模�(_M)�"
+
+#~| msgid "Add _Package"
+#~ msgid "Add _Packageâ?¦"
+#~ msgstr "���件(_P)�"
+
+#~ msgid "_Refresh"
+#~ msgstr "é??æ?°æ?´ç??(_R)"
+
+#~ msgid "Refresh project manager tree"
+#~ msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
+
+#~ msgid "Add _Group"
+#~ msgstr "��群�(_G)"
+
+#~ msgid "Add _Target"
+#~ msgstr "����(_T)"
+
+#~| msgid "Add a group to project"
+#~ msgid "Add a module to target"
+#~ msgstr "�模������"
+
+#~| msgid "Class Name:"
+#~ msgid "Full Name:"
+#~ msgstr "å?¨å??ï¼?"
+
+#~ msgid "Group properties"
+#~ msgstr "群�屬�"
+
+#~ msgid "No"
+#~ msgstr "å?¦"
+
+#~ msgid "GTK+"
+#~ msgstr "GTK+"
+
+#~ msgid "A generic GTKmm (C++) project"
+#~ msgstr "�� GTKmm (C++) ��"
+
+#~ msgid "GTKmm"
+#~ msgstr "GTKmm"
+
+#~ msgid "Package is not parseable"
+#~ msgstr "å¥?件æ?¯ç?¡æ³?解æ??ç??"
+
+#~ msgid "Automatically scan project's packages"
+#~ msgstr "è?ªå??æ??æ??å°?æ¡?ç??å¥?件"
+
+#~ msgid "Available API tags"
+#~ msgstr "å?¯ç?¨ç?? API æ¨?籤"
+
+#~ msgid "Checking if package is parseableâ?¦"
+#~ msgstr "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??â?¦"
+
+#~ msgid ""
+#~ "This option enables the default packages required by your opened project, "
+#~ "e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU "
+#~ "work)"
+#~ msgstr ""
+#~ "é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib "
+#~ "å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
+
+#~ msgid "Gdb"
+#~ msgstr "Gdb"
+
+#~ msgid "Task Manager"
+#~ msgstr "å·¥ä½?管ç??å?¡"
+
+#~ msgid "Todo Plugin for Anjuta."
+#~ msgstr "給 Anjuta ç??å¾?辦äº?é ?å¤?æ??ç¨?å¼?ã??"
+
+#~ msgid "C++/GObject Class"
+#~ msgstr "C++/GObject é¡?å?¥"
+
+#~ msgid "Anjuta JS Debugger Plugin"
+#~ msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
+
 #~ msgid ""
 #~ "Are you sure you want to reset the preferences to\n"
 #~ "their default settings?"
@@ -10513,15 +10733,6 @@ msgstr "符è??"
 #~ msgid "Invalid GbfAmConfigValue type"
 #~ msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
 
-#~ msgid "Select Package to add:"
-#~ msgstr "é?¸æ??è¦?å? å?¥ç??å¥?件ï¼?"
-
-#~ msgid "Select package"
-#~ msgstr "é?¸æ??å¥?件"
-
-#~ msgid "Variables"
-#~ msgstr "è®?æ?¸"
-
 #~ msgid "Generic rule"
 #~ msgstr "ä¸?è?¬è¦?å??"
 
@@ -10657,9 +10868,6 @@ msgstr "符è??"
 #~ msgid "gcj compiler flags (ahead-of-time)"
 #~ msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time)"
 
-#~ msgid "Libraries:"
-#~ msgstr "��庫:"
-
 #~ msgid "Dependencies:"
 #~ msgstr "ç?¸ä¾?é??ä¿?:"
 
@@ -10717,9 +10925,6 @@ msgstr "符è??"
 #~ msgid "No properties available for this group"
 #~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦é??å??群çµ?"
 
-#~ msgid "No properties available for this target"
-#~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦æ­¤ç?®æ¨?"
-
 #~ msgid ""
 #~ "Field \"%s\" must start with a letter, a digit or an underscore and "
 #~ "contain only letters, digits, underscore, minus and dot. Please fix it."
@@ -10791,7 +10996,6 @@ 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>"
@@ -10913,9 +11117,6 @@ msgstr "符è??"
 #~ msgid "Associate"
 #~ msgstr "é??è?¯"
 
-#~ msgid "Automatically add resources"
-#~ msgstr "è?ªå??å? å?¥ä¾?æº?"
-
 #~ msgid "Designer"
 #~ msgstr "設�師"
 
@@ -11104,9 +11305,6 @@ msgstr "符è??"
 #~ msgid "No Errors"
 #~ msgstr "æ²?æ??é?¯èª¤"
 
-#~ msgid "Loadingâ?¦"
-#~ msgstr "��中�"
-
 #~ msgid "Autocompletion pop up choices"
 #~ msgstr "è?ªå??è£?é½?å½?å?ºå¼?é?¸æ??"
 
@@ -11138,15 +11336,6 @@ msgstr "符è??"
 #~ msgid "<b>CVS Options</b>"
 #~ msgstr "<b>CVS ��</b>"
 
-#~ msgid "<b>Options:</b>"
-#~ msgstr "<b>���</b>"
-
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>��</b>"
-
-#~ msgid "<b>Repository: </b>"
-#~ msgstr "<b>��庫�</b>"
-
 #~ msgid "<b>Debugger:</b>"
 #~ msgstr "<b>��工��</b>"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7931447..5df9e1c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,12 +8,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: anjuta 2.31.5\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta&component=core application\n"
-"POT-Creation-Date: 2010-11-21 11:57+0000\n"
-"PO-Revision-Date: 2010-12-03 19:46+0800\n"
+"Project-Id-Version: anjuta 2.91.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-29 18:42+0800\n"
+"PO-Revision-Date: 2011-01-29 15:38+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"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,8 +28,7 @@ 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 "æ?´å??å¼?é??ç?¼ç?°å¢?"
 
@@ -62,35 +62,30 @@ 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 "è?¬å??碼"
 
-#: ../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 "中��系"
@@ -99,29 +94,23 @@ 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 "å¸?è??èª?"
 
@@ -129,14 +118,12 @@ 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 "å??è?³å?¶èª?"
@@ -157,8 +144,7 @@ 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 "æ­£é«?中æ??"
@@ -167,25 +153,19 @@ 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 "ç°¡é«?中æ??"
 
@@ -197,8 +177,7 @@ 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 "è¶?å??èª?"
@@ -211,25 +190,22 @@ msgstr "泰�"
 #. * ISO8859-1
 #. Translator: Unknown here is a target type, if not unknown it can
 #. * be a program or a shared library by example
-#: ../libanjuta/anjuta-encodings.c:443
-#: ../plugins/am-project/am-project.c:107
+#: ../libanjuta/anjuta-encodings.c:443 ../plugins/am-project/am-project.c:105
+#: ../plugins/mk-project/mk-project.c:152
 msgid "Unknown"
 msgstr "��"
 
-#: ../libanjuta/anjuta-launcher.c:1170
-#: ../libanjuta/resources.c:267
-#: ../libanjuta/resources.c:276
-#: ../plugins/gdb/utilities.c:282
+#: ../libanjuta/anjuta-launcher.c:1172 ../libanjuta/resources.c:267
+#: ../libanjuta/resources.c:276 ../plugins/gdb/utilities.c:282
 #, c-format
 msgid "Cannot execute command: \"%s\""
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?â??%sâ??"
 
-#: ../libanjuta/anjuta-launcher.c:1171
+#: ../libanjuta/anjuta-launcher.c:1173
 msgid "execvp failed"
 msgstr "execvp 已失æ??"
 
-#: ../libanjuta/anjuta-plugin.c:326
-#: ../libanjuta/anjuta-plugin-manager.c:2364
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2365
 msgid "Anjuta Shell"
 msgstr "Anjuta Shell"
 
@@ -246,7 +222,8 @@ 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"
@@ -254,17 +231,15 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:464
 msgid "Load"
 msgstr "è¼?å?¥"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1987
+#: ../libanjuta/anjuta-plugin-manager.c:1988
 msgid "Available Plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036
-#: ../src/anjuta-app.c:933
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:940
 msgid "Preferred plugins"
 msgstr "å??好ç??å¤?æ??ç¨?å¼?"
 
@@ -273,23 +248,26 @@ 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 "é?¸æ??å¤?æ??ç¨?å¼?"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#| msgid "Please select a plugin to activate"
 msgid "<b>Please select a plugin to activate</b>"
 msgstr "<b>è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?</b>"
 
@@ -298,49 +276,49 @@ msgstr "<b>è«?é?¸æ??欲å??ç?¨ç??å¤?æ??ç¨?å¼?</b>"
 msgid "No plugin is able to load other plugins in %s"
 msgstr "å?¨ %s 中æ²?æ??å¤?æ??ç¨?å¼?å?¯ä»¥è¼?å?¥å?¶ä»?ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2014
+#: ../libanjuta/anjuta-plugin-manager.c:2015
 msgid "Remember this selection"
 msgstr "è¨?å¾?æ­¤é?¸æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2345
+#: ../libanjuta/anjuta-plugin-manager.c:2346
 msgid "Profiles"
 msgstr "設å®?çµ?å??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2346
+#: ../libanjuta/anjuta-plugin-manager.c:2347
 msgid "Current stack of profiles"
 msgstr "設å®?çµ?å??ç??ç?®å??å ?ç??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2351
+#: ../libanjuta/anjuta-plugin-manager.c:2352
 msgid "Available plugins"
 msgstr "å?¯ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2352
+#: ../libanjuta/anjuta-plugin-manager.c:2353
 msgid "Currently available plugins found in plugin paths"
 msgstr "ç?®å??å?¨å¤?æ??ç¨?å¼?è·¯å¾?中æ?¾å?°å?¯ä½¿ç?¨ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2358
+#: ../libanjuta/anjuta-plugin-manager.c:2359
 msgid "Activated plugins"
 msgstr "已使ç?¨ç??å¤?æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2359
+#: ../libanjuta/anjuta-plugin-manager.c:2360
 msgid "Currently activated plugins"
 msgstr "ç?®å??使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2365
+#: ../libanjuta/anjuta-plugin-manager.c:2366
 msgid "Anjuta shell for which the plugins are made"
 msgstr "製ä½?å¤?æ??ç¨?å¼?ç?? Anjuta shell"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2373
+#: ../libanjuta/anjuta-plugin-manager.c:2374
 msgid "Anjuta Status"
 msgstr "Anjuta ç??æ??"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2374
+#: ../libanjuta/anjuta-plugin-manager.c:2375
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "Anjuta ç??æ??ï¼?ç?¨æ?¼å¤?æ??ç¨?å¼?ç??è¼?å?¥è??å?¸è¼?"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-plugin-manager.c:2534
+#: ../libanjuta/anjuta-plugin-manager.c:2535
 msgid "Loaded:"
 msgstr "已���"
 
@@ -382,7 +360,9 @@ 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>
@@ -400,21 +380,20 @@ msgstr ""
 "è®?å??ã??%sã??失æ??ï¼?ä¸?å??å¿?è¦?ç??å¤?æ??ç¨?å¼?é?ºå¤±ï¼?\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences-dialog.c:95
-#: ../plugins/gtodo/interface.c:202
-#: ../plugins/gtodo/mcategory.c:36
+#: ../libanjuta/anjuta-preferences-dialog.c:96
 msgid "Category"
 msgstr "å??é¡?"
 
 #. FIXME: Make the general page first
-#: ../libanjuta/anjuta-preferences-dialog.c:138
-#: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../src/anjuta-app.c:920
+#: ../libanjuta/anjuta-preferences-dialog.c:139
+#: ../libanjuta/anjuta-preferences-dialog.c:142
+#: ../plugins/code-analyzer/code-analyzer.ui.h:3
+#: ../plugins/mk-project/mk-project.ui.h:4 ../src/anjuta-app.c:927
 #: ../src/preferences.ui.h:8
 msgid "General"
 msgstr "��"
 
-#: ../libanjuta/anjuta-preferences-dialog.c:236
+#: ../libanjuta/anjuta-preferences-dialog.c:237
 msgid "Anjuta Preferences"
 msgstr "Anjuta å??好設å®?"
 
@@ -443,7 +422,8 @@ msgstr "æ??æ£?æ?´æ?¹(_D)"
 #: ../libanjuta/anjuta-save-prompt.c:296
 #, c-format
 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?"
+msgid_plural ""
+"There are %d items with unsaved changes. Save changes before closing?"
 msgstr[0] "é??裡æ?? %d å??é ?ç?®å?«æ??æ?ªå?²å­?ç??è®?æ?´ã??æ?¯å?¦å?¨é??é??å??å?²å­?è®?æ?´ï¼?"
 
 #: ../libanjuta/anjuta-save-prompt.c:305
@@ -472,8 +452,13 @@ msgid "System:"
 msgstr "系統�"
 
 #: ../libanjuta/anjuta-utils.c:503
-msgid "You do not seem to have PackageKit installed. PackageKit is required for installing missing packages. Please install \"packagekit-gnome\" package from your distribution, or install the missing packages manually."
-msgstr "æ?¨ä¼¼ä¹?æ²?æ??å®?è£? PackageKitã??å¿?é ?æ?? PackageKit æ??è?½å®?è£?缺å°?ç??å¥?件ã??è«?å¾?æ?¨ç??ç?¼è¡?ç??æ?¬å®?è£?ã??packagekit-gnomeã??å¥?件ï¼?æ??æ??å??å®?è£?缺å°?ç??å¥?件ã??"
+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:512
 #, c-format
@@ -503,84 +488,127 @@ msgstr ""
 msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "æ?¾ä¸?å?°çµ?端æ©?ï¼?使ç?¨ xtermï¼?ä¸?管å®?è?½ä¸?è?½é??ä½?"
 
-#: ../libanjuta/anjuta-utils.c:1207
-#: ../libanjuta/anjuta-utils.c:1211
-#: ../libanjuta/anjuta-utils.c:1239
-#: ../libanjuta/anjuta-utils.c:1243
+#: ../libanjuta/anjuta-utils.c:1207 ../libanjuta/anjuta-utils.c:1211
+#: ../libanjuta/anjuta-utils.c:1239 ../libanjuta/anjuta-utils.c:1243
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "ç?¡æ³?å?·è¡?æ??令ï¼?%sï¼?使ç?¨ shell %sï¼?\n"
 
-#: ../libanjuta/anjuta-utils.c:1893
-msgid "Unable to display help. Please make sure the Anjuta documentation package is installed. It can be downloaded from http://anjuta.org.";
-msgstr "ç?¡æ³?顯示æ±?å?©æ??件ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??æ?¨å?¯ä»¥å¾? http://anjuta.org ä¸?è¼?å®?ã??"
+#: ../libanjuta/anjuta-utils.c:1892
+msgid ""
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
+msgstr ""
+"ç?¡æ³?顯示æ±?å?©æ??件ã??è«?確å®? Anjuta æ??件å¥?件已å®?è£?ã??æ?¨å?¯ä»¥å¾? http://anjuta.org ä¸?"
+"è¼?å®?ã??"
 
-#: ../libanjuta/anjuta-utils.c:2332
+#: ../libanjuta/anjuta-utils.c:2330
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:92
-#: ../plugins/file-manager/file-view.c:75
+#: ../plugins/file-manager/file-view.c:75 ../plugins/git/git-status-pane.c:164
 msgid "Modified"
 msgstr "已修�"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:95
-#: ../plugins/file-manager/file-view.c:79
+#: ../plugins/file-manager/file-view.c:79 ../plugins/git/git-status-pane.c:167
 msgid "Added"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:98
-#: ../plugins/file-manager/file-view.c:77
+#: ../plugins/file-manager/file-view.c:77 ../plugins/git/git-status-pane.c:170
 msgid "Deleted"
 msgstr "已��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:101
-#: ../plugins/file-manager/file-view.c:81
+#: ../plugins/file-manager/file-view.c:81 ../plugins/git/git-status-pane.c:173
 msgid "Conflicted"
 msgstr "æ??è¡?çª?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-#: ../plugins/file-manager/file-view.c:83
+#: ../plugins/file-manager/file-view.c:83 ../plugins/git/git-status-pane.c:177
 msgid "Up-to-date"
 msgstr "æ??æ?°ç??"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
-#: ../plugins/file-manager/file-view.c:85
+#: ../plugins/file-manager/file-view.c:85 ../plugins/git/git-status-pane.c:181
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:112
-#: ../plugins/file-manager/file-view.c:87
+#: ../plugins/file-manager/file-view.c:87 ../plugins/git/git-status-pane.c:184
 msgid "Missing"
 msgstr "�失"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:115
-#: ../plugins/file-manager/file-view.c:89
+#: ../plugins/file-manager/file-view.c:89 ../plugins/git/git-status-pane.c:187
 msgid "Unversioned"
 msgstr "æ?ªè¨?ç??æ?¬"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:119
-#: ../plugins/file-manager/file-view.c:91
+#: ../plugins/file-manager/file-view.c:91 ../plugins/git/git-status-pane.c:191
 msgid "Ignored"
 msgstr "已忽�"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:215
-#: ../libfoocanvas/foo-canvas-text.c:177
-#: ../src/preferences.ui.h:13
+#: ../libanjuta/anjuta-column-text-view.c:40 ../plugins/git/git-pane.c:123
+#, c-format
+msgid "Column %i"
+msgstr "� %i"
+
+#. Column label
+#: ../libanjuta/anjuta-column-text-view.c:69 ../plugins/git/anjuta-git.ui.h:38
+msgid "Column 1"
+msgstr "� 1"
+
+#: ../libanjuta/anjuta-entry.c:241
+msgid "Help text"
+msgstr "æ±?å?©æ??å­?"
+
+#: ../libanjuta/anjuta-entry.c:242
+msgid "Text to show the user what to enter into the entry"
+msgstr "顯示給使ç?¨è??é??å??é ?ç?®è©²è¼¸å?¥ä»?麼ç??æ??å­?"
+
+#: ../libanjuta/anjuta-file-drop-entry.c:206
+msgid "Path that droppedfiles should be relative to"
+msgstr "æ??æ?¾ç??æª?æ¡?ç?¸å°?æ??ç??è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:101
+msgid "Drop a file or enter a path here"
+msgstr "å?¨é??裡æ??æ?¾æª?æ¡?æ??輸å?¥è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:274
+msgid "Select Files"
+msgstr "é?¸æ??æª?æ¡?"
+
+#: ../libanjuta/anjuta-file-list.c:540
+msgid "Path that all files in the list should be relative to"
+msgstr "æ¸?å?®ä¸­æ??æ??ç??æª?æ¡?ç?¸å°?æ??ç??è·¯å¾?"
+
+#: ../libanjuta/anjuta-file-list.c:547
+msgid "Show Add button"
+msgstr "顯示å? å?¥æ??é??"
+
+#: ../libanjuta/anjuta-file-list.c:548
+msgid "Display an Add button"
+msgstr "顯示å? å?¥æ??é??"
+
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:239
+#: ../libfoocanvas/foo-canvas-text.c:177 ../src/preferences.ui.h:13
 msgid "Text"
 msgstr "æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:216
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:240
 #: ../libfoocanvas/foo-canvas-text.c:178
 msgid "Text to render"
 msgstr "æº?å??æ??繪ç??æ??å­?"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:222
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:246
 msgid "Pixbuf Object"
 msgstr "Pixbuf �件"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:223
+#: ../libanjuta/anjuta-cell-renderer-captioned-image.c:247
 msgid "The pixbuf to render."
 msgstr "æº?å??æ??繪ç?? pixbufã??"
 
@@ -589,19 +617,16 @@ 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,28 +663,23 @@ 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 "å­?å??大å°?"
 
@@ -676,7 +696,8 @@ 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
@@ -703,8 +724,7 @@ 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 "é¡?è?²"
@@ -817,6 +837,45 @@ msgstr "縮�設�"
 msgid "Whether this tag affects font scaling"
 msgstr "æ­¤æ¨?籤æ?¯å?¦å½±é?¿å­?å??ç??縮æ?¾"
 
+#: ../plugins/am-project/amp-group.c:528
+msgid "Please specify group name"
+msgstr "è«?æ??å®?群çµ?å??稱"
+
+#: ../plugins/am-project/amp-group.c:542
+msgid ""
+"Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
+msgstr "群çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?æ?? \"#$:%+,- = ^_`~\" å­?å??"
+
+#: ../plugins/am-project/amp-group.c:571
+#: ../plugins/dir-project/dir-project.c:656
+#: ../plugins/dir-project/dir-project.c:769
+#: ../plugins/am-project/am-project.c:1569
+#: ../plugins/am-project/am-project.c:1599
+#: ../plugins/am-project/am-project.c:1651
+#: ../plugins/mk-project/mk-project.c:1109
+#: ../plugins/mk-project/mk-project.c:1182
+#: ../plugins/mk-project/mk-project.c:1259
+#, c-format
+msgid "Project doesn't exist or invalid path"
+msgstr "å°?æ¡?ä¸?å­?å?¨æ??ç?¡æ??ç??è·¯å¾?"
+
+#: ../plugins/am-project/amp-target.c:246
+msgid "Please specify target name"
+msgstr "è«?æ??å®?ç?®æ¨?å??稱"
+
+#: ../plugins/am-project/amp-target.c:260
+msgid ""
+"Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
+msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-'ã??'/' æ?? '.' å­?å??"
+
+#: ../plugins/am-project/amp-target.c:275
+msgid "Shared library target name must be of the form 'libxxx.la'"
+msgstr "å?±äº«ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.laã??"
+
+#: ../plugins/am-project/amp-target.c:284
+msgid "Static library target name must be of the form 'libxxx.a'"
+msgstr "é??æ??ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.aã??"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
 #: ../plugins/run-program/anjuta-run-program.ui.h:1
 msgid "Arguments:"
@@ -847,8 +906,8 @@ msgid "Continue on errors"
 msgstr "å?³ä½¿æ??é?¯èª¤ä»?ç¹¼çº?"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
-msgid "Highlight message locations in editor"
-msgstr "�編輯�中�示���置"
+msgid "Highlight build warnings and errors in editor"
+msgstr "å?¨ç·¨è¼¯å?¨ä¸­æ¨?示çµ?建警å??è??é?¯èª¤"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
 msgid "Install"
@@ -896,9 +955,8 @@ msgid "sudo"
 msgstr "sudo"
 
 #: ../plugins/build-basic-autotools/configuration-list.c:68
-#: ../plugins/class-gen/window.c:525
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-#: ../src/preferences.ui.h:2
+#: ../plugins/class-gen/window.c:720
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "�設"
 
@@ -920,7 +978,7 @@ msgid "No executables in this project!"
 msgstr "å°?æ¡?中æ²?æ??å?¯å?·è¡?æª?ã??"
 
 #: ../plugins/build-basic-autotools/executer.c:157
-#: ../plugins/am-project/am-project.c:128
+#: ../plugins/am-project/am-project.c:126
 msgid "Program"
 msgstr "��"
 
@@ -961,11 +1019,11 @@ msgstr "å?¯å?·è¡?æª? '%s' 並ä¸?æ?¯æ??æ?°ç??ã??"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:169
+#: ../plugins/build-basic-autotools/plugin.c:171
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:170
+#: ../plugins/build-basic-autotools/plugin.c:172
 msgid "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 
@@ -974,20 +1032,20 @@ msgstr "make(\\[\\d+\\])?:\\s+Entering\\s+directory\\s+'(.+)'"
 #. * 2 similar strings are used in order to parse the output of 2 different
 #. * version of make if necessary. If you update one string, move the first
 #. * string into the second slot and then replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:178
+#: ../plugins/build-basic-autotools/plugin.c:180
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:179
+#: ../plugins/build-basic-autotools/plugin.c:181
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:858
+#: ../plugins/build-basic-autotools/plugin.c:871
 #, c-format
 msgid "Entering: %s"
 msgstr "正���� %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:894
+#: ../plugins/build-basic-autotools/plugin.c:907
 #, c-format
 msgid "Leaving: %s"
 msgstr "æ­£å?¨é?¢é??ï¼? %s"
@@ -997,13 +1055,12 @@ msgstr "æ­£å?¨é?¢é??ï¼? %s"
 #. * version of 'gcc' if necessary. If you update one string,
 #. * move the first one to translate the -old string and then
 #. * replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:932
+#: ../plugins/build-basic-autotools/plugin.c:945
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "è­¦å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:933
-#| msgid "warning:"
+#: ../plugins/build-basic-autotools/plugin.c:946
 msgid "warning:-old"
 msgstr "è­¦å??:-old"
 
@@ -1012,341 +1069,374 @@ msgstr "è­¦å??:-old"
 #. * version of 'gcc' if necessary. If you update one string,
 #. * move the first one to translate the -old string and then
 #. * replace the first string only.
-#: ../plugins/build-basic-autotools/plugin.c:944
+#: ../plugins/build-basic-autotools/plugin.c:957
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "�誤�"
 
-#: ../plugins/build-basic-autotools/plugin.c:945
-#| msgid "error:"
+#: ../plugins/build-basic-autotools/plugin.c:958
 msgid "error:-old"
 msgstr "�誤:-old"
 
-#: ../plugins/build-basic-autotools/plugin.c:1062
+#: ../plugins/build-basic-autotools/plugin.c:1075
 #, c-format
 msgid "Command exited with status %d"
 msgstr "æ??令以 %d ç??æ??é?¢é??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1072
-#: ../plugins/build-basic-autotools/plugin.c:1551
+#: ../plugins/build-basic-autotools/plugin.c:1085
+#: ../plugins/build-basic-autotools/plugin.c:1562
 #, c-format
 msgid "Command canceled by user"
 msgstr "æ??令被使ç?¨è??å??æ¶?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1077
+#: ../plugins/build-basic-autotools/plugin.c:1090
 #, c-format
 msgid "Command aborted by user"
 msgstr "æ??令被使ç?¨è??中止"
 
-#: ../plugins/build-basic-autotools/plugin.c:1082
+#: ../plugins/build-basic-autotools/plugin.c:1095
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "æ??令以信è?? %d çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1090
+#: ../plugins/build-basic-autotools/plugin.c:1103
 msgid "Command terminated for an unknown reason"
 msgstr "æ??令以ä¸?æ??ç??ç??ç?±çµ?çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1108
+#: ../plugins/build-basic-autotools/plugin.c:1121
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "總å?±è²»æ??ï¼?%lu ç§?\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1115
+#: ../plugins/build-basic-autotools/plugin.c:1128
 msgid "Completed unsuccessfully\n"
 msgstr "æ?ªè?½æ??å??å®?æ??\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1123
+#: ../plugins/build-basic-autotools/plugin.c:1136
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "å·²æ??å??å®?æ??\n"
 
 #. Translators: the first number is the number of the build attemp,
 #. the string is the directory where the build takes place
-#: ../plugins/build-basic-autotools/plugin.c:1211
+#: ../plugins/build-basic-autotools/plugin.c:1218
 #, c-format
 msgid "Build %d: %s"
 msgstr "建置 %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1546
-msgid "Before using this new configuration, the default one needs to be removed. Do you want to do that ?"
+#: ../plugins/build-basic-autotools/plugin.c:1557
+msgid ""
+"Before using this new configuration, the default one needs to be removed. Do "
+"you want to do that ?"
 msgstr "å?¨ä½¿ç?¨é??å??æ?°çµ?æ??ä¹?å??ï¼?é??è¦?å??移é?¤é ?設ç??çµ?æ??ã??æ?¯å?¦è¦?é??麼å??ï¼?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1843
+#: ../plugins/build-basic-autotools/plugin.c:1854
 #, c-format
 msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "ç?¡æ³?編譯ã??%sã??ï¼?æ²?æ??ç?ºæ­¤æª?æ¡?é¡?å??å®?義任ä½?編譯è¦?å??ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:1978
+#: ../plugins/build-basic-autotools/plugin.c:1989
 #, c-format
 msgid "Cannot configure project: Missing configure script in %s."
 msgstr "ä¸?è?½è¨­å®?å°?æ¡?ï¼?%s 中é?ºå¤±è¨­å®?å?½ä»¤ç¨¿ã??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
-#: ../plugins/build-basic-autotools/plugin.c:2533
-#: ../plugins/build-basic-autotools/plugin.c:2543
-#: ../plugins/build-basic-autotools/plugin.c:2561
-#: ../plugins/build-basic-autotools/plugin.c:2571
-#: ../plugins/build-basic-autotools/plugin.c:2628
+#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2554
+#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2582
+#: ../plugins/build-basic-autotools/plugin.c:2639
 #, c-format
 msgid "_Build"
 msgstr "建置(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2463
+#: ../plugins/build-basic-autotools/plugin.c:2474
 msgid "_Build Project"
 msgstr "建置��(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2464
+#: ../plugins/build-basic-autotools/plugin.c:2475
 msgid "Build whole project"
 msgstr "建置æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2469
+#: ../plugins/build-basic-autotools/plugin.c:2480
 msgid "_Install Project"
 msgstr "����(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2470
+#: ../plugins/build-basic-autotools/plugin.c:2481
 msgid "Install whole project"
 msgstr "å®?è£?æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2475
+#: ../plugins/build-basic-autotools/plugin.c:2486
 msgid "_Clean Project"
 msgstr "æ¸?ç??å°?æ¡?(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2476
+#: ../plugins/build-basic-autotools/plugin.c:2487
 msgid "Clean whole project"
 msgstr "æ¸?é?¤æ?´å??å°?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2481
+#: ../plugins/build-basic-autotools/plugin.c:2492
 msgid "C_onfigure Projectâ?¦"
 msgstr "設���(_O)�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2482
+#: ../plugins/build-basic-autotools/plugin.c:2493
 msgid "Configure project"
 msgstr "設���"
 
-#: ../plugins/build-basic-autotools/plugin.c:2487
+#: ../plugins/build-basic-autotools/plugin.c:2498
 msgid "Build _Tarball"
 msgstr "建置 _Tarball"
 
-#: ../plugins/build-basic-autotools/plugin.c:2488
+#: ../plugins/build-basic-autotools/plugin.c:2499
 msgid "Build project tarball distribution"
 msgstr "建置�� tarball ���件"
 
-#: ../plugins/build-basic-autotools/plugin.c:2493
+#: ../plugins/build-basic-autotools/plugin.c:2504
 msgid "_Build Module"
 msgstr "建置模�(_B)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2494
+#: ../plugins/build-basic-autotools/plugin.c:2505
 msgid "Build module associated with current file"
 msgstr "建置è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2499
+#: ../plugins/build-basic-autotools/plugin.c:2510
 msgid "_Install Module"
 msgstr "��模�(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2511
 msgid "Install module associated with current file"
 msgstr "å®?è£?è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2505
+#: ../plugins/build-basic-autotools/plugin.c:2516
 msgid "_Clean Module"
 msgstr "��模�(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2506
+#: ../plugins/build-basic-autotools/plugin.c:2517
 msgid "Clean module associated with current file"
 msgstr "æ¸?é?¤è??ç?®å??æª?æ¡?é??è?¯ç??模çµ?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2522
 msgid "Co_mpile File"
 msgstr "編譯��(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2512
+#: ../plugins/build-basic-autotools/plugin.c:2523
 msgid "Compile current editor file"
 msgstr "編譯ç?®å??編輯å?¨ç??æª?æ¡?"
 
-#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2528
 msgid "Select Configuration"
 msgstr "é?¸æ??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2518
+#: ../plugins/build-basic-autotools/plugin.c:2529
 msgid "Select current configuration"
 msgstr "é?¸æ??ç?®å??çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2534
 msgid "Remove Configuration"
 msgstr "移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
-msgid "Clean project (distclean) and remove configuration directory if possible"
+#: ../plugins/build-basic-autotools/plugin.c:2535
+msgid ""
+"Clean project (distclean) and remove configuration directory if possible"
 msgstr "æ¸?ç??å°?æ¡? (distclean)ï¼?å?¯è?½ç??話ä¸?併移é?¤çµ?æ??"
 
-#: ../plugins/build-basic-autotools/plugin.c:2537
-#: ../plugins/build-basic-autotools/plugin.c:2565
+#: ../plugins/build-basic-autotools/plugin.c:2548
+#: ../plugins/build-basic-autotools/plugin.c:2576
 msgid "_Compile"
 msgstr "編譯(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2538
-#: ../plugins/build-basic-autotools/plugin.c:2566
+#: ../plugins/build-basic-autotools/plugin.c:2549
+#: ../plugins/build-basic-autotools/plugin.c:2577
 msgid "Compile file"
 msgstr "編譯��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2544
-#: ../plugins/build-basic-autotools/plugin.c:2572
+#: ../plugins/build-basic-autotools/plugin.c:2555
+#: ../plugins/build-basic-autotools/plugin.c:2583
 msgid "Build module"
 msgstr "建置模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2549
-#: ../plugins/build-basic-autotools/plugin.c:2577
-#: ../plugins/build-basic-autotools/plugin.c:2635
+#: ../plugins/build-basic-autotools/plugin.c:2560
+#: ../plugins/build-basic-autotools/plugin.c:2588
+#: ../plugins/build-basic-autotools/plugin.c:2646
 #, c-format
 msgid "_Install"
 msgstr "��(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2550
-#: ../plugins/build-basic-autotools/plugin.c:2578
+#: ../plugins/build-basic-autotools/plugin.c:2561
+#: ../plugins/build-basic-autotools/plugin.c:2589
 msgid "Install module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2555
-#: ../plugins/build-basic-autotools/plugin.c:2583
-#: ../plugins/build-basic-autotools/plugin.c:2642
+#: ../plugins/build-basic-autotools/plugin.c:2566
+#: ../plugins/build-basic-autotools/plugin.c:2594
+#: ../plugins/build-basic-autotools/plugin.c:2653
 #, c-format
 msgid "_Clean"
 msgstr "æ¸?ç??(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2556
-#: ../plugins/build-basic-autotools/plugin.c:2584
+#: ../plugins/build-basic-autotools/plugin.c:2567
+#: ../plugins/build-basic-autotools/plugin.c:2595
 msgid "Clean module"
 msgstr "��模�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2589
+#: ../plugins/build-basic-autotools/plugin.c:2600
 msgid "_Cancel command"
 msgstr "å??æ¶?æ??令(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2590
+#: ../plugins/build-basic-autotools/plugin.c:2601
 msgid "Cancel build command"
 msgstr "å??æ¶?建置æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:2628
+#: ../plugins/build-basic-autotools/plugin.c:2639
 #, c-format
 msgid "_Build (%s)"
 msgstr "建置(_B) (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2635
+#: ../plugins/build-basic-autotools/plugin.c:2646
 #, c-format
 msgid "_Install (%s)"
 msgstr "��(%s)(_I)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2642
+#: ../plugins/build-basic-autotools/plugin.c:2653
 #, c-format
 msgid "_Clean (%s)"
 msgstr "æ¸?ç??(%s)(_C)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2650
+#: ../plugins/build-basic-autotools/plugin.c:2661
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "編譯(%s)(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2650
+#: ../plugins/build-basic-autotools/plugin.c:2661
 #, c-format
 msgid "Co_mpile"
 msgstr "編譯(_M)"
 
-#: ../plugins/build-basic-autotools/plugin.c:3184
+#: ../plugins/build-basic-autotools/plugin.c:3195
 msgid "Build commands"
 msgstr "建置�令"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3193
+#: ../plugins/build-basic-autotools/plugin.c:3204
 msgid "Build popup commands"
 msgstr "建置å½?å?ºå¼?æ??令"
 
-#: ../plugins/build-basic-autotools/plugin.c:3582
-#: ../plugins/build-basic-autotools/plugin.c:3590
+#: ../plugins/build-basic-autotools/plugin.c:3593
+#: ../plugins/build-basic-autotools/plugin.c:3601
 msgid "Build Autotools"
 msgstr "建置 Autotools"
 
-#: ../plugins/build-basic-autotools/program.c:326
+#: ../plugins/build-basic-autotools/program.c:269
+#, c-format
+msgid ""
+"Error while setting up build environment:\n"
+" %s"
+msgstr ""
+"設å®?çµ?建ç?°å¢?æ??ç?¼ç??é?¯èª¤ï¼?\n"
+"%s"
+
+#: ../plugins/build-basic-autotools/program.c:342
 msgid "Command aborted"
 msgstr "æ??令已æ?¾æ£?"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
+msgid "<b>Class Elements</b>"
+msgstr "<b>é¡?å?¥å??ç´ </b>"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Project"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Repository"
 msgstr "�����庫"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Email Address:"
 msgstr "ä½?è??é?»é?µå?°å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author Name:"
 msgstr "ä½?è??å§?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date-Time"
 msgstr "ä½?è??/æ?¥æ??-æ??å?»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Author/Date/Time"
 msgstr "ä½?è??/æ?¥æ??/æ??å?»"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class Inheritance:"
 msgstr "����繼��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
 msgid "Base Class:"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Elements"
 msgstr "é¡?å?¥å??ç´ "
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 msgid "Class Function Prefix:"
 msgstr "é¡?å?¥å?½å¼?å??綴ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
 msgid "Class Generator"
 msgstr "é¡?å?¥ç?¢ç??å?¨"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+msgid "Class Methods"
+msgstr "����"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Class Name:"
 msgstr "é¡?å?¥å??稱ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "Class Options:"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#, fuzzy
+#| msgid "Class Name:"
+msgid "Class Scope:"
+msgstr "æ??å°?ç¯?å??(_S)"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+msgid "Constants/Variables"
+msgstr "常�/��"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 msgid "Create"
 msgstr "建�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+msgid "GLib.Object"
+msgstr "GLib.Object"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "GObject Class\t"
 msgstr "GObject é¡?å?¥\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "GObject Prefix and Type:"
 msgstr "GObject å??綴è??é¡?å??ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
 msgid "General Class Properties"
 msgstr "����屬�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
 #: ../plugins/file-wizard/file.c:104
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:15
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:15
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:18
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:19
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:17
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:15
@@ -1362,24 +1452,36 @@ msgstr "����屬�"
 msgid "General Public License (GPL)"
 msgstr "GNU é??ç?¨å?¬å?±è¨±å?¯è­? (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Generic C++ Class"
 msgstr "�� C++ ��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 msgid "Header File:"
 msgstr "�頭��"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+msgid "Imports"
+msgstr "��"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+msgid "Initializer Arguments:"
+msgstr "å??å§?å??ç¨?å¼?å¼?æ?¸ï¼?"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Inline the declaration and implementation"
 msgstr "è¡?å?§å®£å??è??實ä½?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+msgid "JavaScript Class"
+msgstr "JavaScript é¡?å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
 #: ../plugins/file-wizard/file.c:105
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:17
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:17
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:20
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:25
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:18
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:16
@@ -1395,35 +1497,56 @@ msgstr "è¡?å?§å®£å??è??實ä½?"
 msgid "Lesser General Public License (LGPL)"
 msgstr "GNU 寬é??ç?¨å?¬å?±è¨±å?¯è­? (LGPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "æ??æ¬?ï¼?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:32
 msgid "Member Functions/Variables"
 msgstr "æ??å?¡å?½å¼?/è®?æ?¸"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:33
+msgid "Methods"
+msgstr "��"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:34
 msgid "No License"
 msgstr "æ²?æ??æ??æ¬?"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:35
 msgid "Properties"
 msgstr "屬�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:36
+msgid "Python Class"
+msgstr "Python é¡?å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:37
 msgid "Signals"
 msgstr "è¨?è??"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:38
 msgid "Source File:"
 msgstr "�����"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:39
 msgid "Source/Header Headings:"
 msgstr "ä¾?æº?/æ¨?é ­ç??æ¨?é¡?ï¼?"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:40
+msgid "Vala Class"
+msgstr "Vala é¡?å?¥"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:41
+#: ../plugins/mk-project/mk-project.ui.h:7
+msgid "Variables"
+msgstr "è®?æ?¸"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:42
+msgid "is Sub-Class"
+msgstr "����"
+
 #: ../plugins/class-gen/generator.c:133
 #, c-format
 msgid "Header or source file has not been created"
@@ -1437,8 +1560,7 @@ msgstr "ç?¨æ?¼æ¨?é ­æª?æ¡?ç?? autogen ç¯?æ?¬"
 msgid "Autogen template used for the implementation file"
 msgstr "ç?¨æ?¼å¯¦ä½?æª?æ¡?ç?? autogen ç¯?æ?¬"
 
-#: ../plugins/class-gen/generator.c:311
-#: ../plugins/class-gen/generator.c:319
+#: ../plugins/class-gen/generator.c:311 ../plugins/class-gen/generator.c:319
 msgid "File to which the processed template will be written"
 msgstr "ç?¨ä¾?寫å?¥å·²è??ç??ç¯?æ?¬ç??æª?æ¡?"
 
@@ -1447,86 +1569,120 @@ msgstr "ç?¨ä¾?寫å?¥å·²è??ç??ç¯?æ?¬ç??æª?æ¡?"
 msgid "Failed to write autogen definition file"
 msgstr "寫å?¥ autogen å®?義æª?æ¡?失æ??"
 
-#: ../plugins/class-gen/plugin.c:98
-#: ../plugins/project-wizard/druid.c:1141
-msgid "Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";
-msgstr "æ?¾ä¸?å?° autogen 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??æ?¨å?¯ä»¥å¾? http://autogen.sourceforge.net å??å¾?ã??"
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1155
+msgid ""
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
+msgstr ""
+"æ?¾ä¸?å?° autogen 第äº?ç??ï¼?è«?å®?è£? autogen å¥?件ã??æ?¨å?¯ä»¥å¾? http://autogen.";
+"sourceforge.net å??å¾?ã??"
 
-#: ../plugins/class-gen/plugin.c:242
-#: ../plugins/class-gen/plugin.c:410
+#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:453
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "ç?¡æ³?å?·è¡? autogenï¼? %s"
 
-#: ../plugins/class-gen/window.c:94
+#: ../plugins/class-gen/window.c:112
 msgid "Guess from type"
 msgstr "å¾?é¡?å??æ?¨æ¸¬"
 
-#: ../plugins/class-gen/window.c:499
-#: ../plugins/class-gen/window.c:510
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/class-gen/window.c:694 ../plugins/class-gen/window.c:705
+#: ../plugins/class-gen/window.c:779 ../plugins/class-gen/window.c:789
+#: ../plugins/class-gen/window.c:802 ../plugins/search/anjuta-search.ui.h:26
 msgid "Scope"
 msgstr "ç¯?å??"
 
-#: ../plugins/class-gen/window.c:500
+#: ../plugins/class-gen/window.c:695
 msgid "Implementation"
 msgstr "實�"
 
-#: ../plugins/class-gen/window.c:501
-#: ../plugins/class-gen/window.c:511
-#: ../plugins/class-gen/window.c:533
+#: ../plugins/class-gen/window.c:696 ../plugins/class-gen/window.c:706
+#: ../plugins/class-gen/window.c:728 ../plugins/class-gen/window.c:780
+#: ../plugins/class-gen/window.c:790
 #: ../plugins/debug-manager/breakpoints.c:1952
 #: ../plugins/debug-manager/debug_tree.c:128
 #: ../plugins/snippets-manager/snippets-editor.c:38
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../plugins/class-gen/window.c:502
-#: ../plugins/class-gen/window.c:512
-#: ../plugins/class-gen/window.c:520
-#: ../plugins/class-gen/window.c:534
-#: ../plugins/project-manager/dialogs.c:434
-#: ../plugins/run-program/parameters.c:754
+#: ../plugins/class-gen/window.c:697 ../plugins/class-gen/window.c:707
+#: ../plugins/class-gen/window.c:715 ../plugins/class-gen/window.c:729
+#: ../plugins/class-gen/window.c:739 ../plugins/class-gen/window.c:747
+#: ../plugins/class-gen/window.c:755 ../plugins/class-gen/window.c:763
+#: ../plugins/class-gen/window.c:771 ../plugins/class-gen/window.c:781
+#: ../plugins/class-gen/window.c:791 ../plugins/class-gen/window.c:803
+#: ../plugins/project-manager/dialogs.c:426
+#: ../plugins/run-program/parameters.c:757
 #: ../plugins/snippets-manager/plugin.c:757
 #: ../plugins/snippets-manager/snippets-browser.c:530
 #: ../plugins/snippets-manager/snippets-editor.c:37
 msgid "Name"
 msgstr "å??稱"
 
-#: ../plugins/class-gen/window.c:503
-#: ../plugins/class-gen/window.c:513
-#: ../plugins/class-gen/window.c:535
+#: ../plugins/class-gen/window.c:698 ../plugins/class-gen/window.c:708
+#: ../plugins/class-gen/window.c:730 ../plugins/class-gen/window.c:740
+#: ../plugins/class-gen/window.c:756 ../plugins/class-gen/window.c:782
+#: ../plugins/class-gen/window.c:804
 #: ../plugins/debug-manager/stack_trace.c:712
 msgid "Arguments"
 msgstr "å??æ?¸"
 
-#: ../plugins/class-gen/window.c:521
+#: ../plugins/class-gen/window.c:716
 msgid "Nick"
 msgstr "�稱"
 
-#: ../plugins/class-gen/window.c:522
+#: ../plugins/class-gen/window.c:717
 msgid "Blurb"
 msgstr "宣�"
 
-#: ../plugins/class-gen/window.c:523
+#: ../plugins/class-gen/window.c:718
 msgid "GType"
 msgstr "GType"
 
-#: ../plugins/class-gen/window.c:524
+#: ../plugins/class-gen/window.c:719
 msgid "ParamSpec"
 msgstr "ParamSpec"
 
 #. Somehow redundant with marshaller, but required for default handler
-#: ../plugins/class-gen/window.c:526
-#: ../plugins/class-gen/window.c:536
+#: ../plugins/class-gen/window.c:721 ../plugins/class-gen/window.c:731
 msgid "Flags"
 msgstr "æ??æ¨?"
 
-#: ../plugins/class-gen/window.c:537
+#: ../plugins/class-gen/window.c:732
 msgid "Marshaller"
 msgstr "æ?´ç??å?¨"
 
-#: ../plugins/class-gen/window.c:818
+#: ../plugins/class-gen/window.c:748 ../plugins/class-gen/window.c:764
+#: ../plugins/class-gen/window.c:795 ../plugins/debug-manager/debug_tree.c:128
+#: ../plugins/debug-manager/registers.c:469
+#: ../plugins/project-manager/dialogs.c:433
+#: ../plugins/run-program/parameters.c:766 ../plugins/tools/editor.c:474
+msgid "Value"
+msgstr "���"
+
+#: ../plugins/class-gen/window.c:772 ../plugins/cvs-plugin/cvs-callbacks.c:438
+#: ../plugins/am-project/am-project.c:189
+msgid "Module"
+msgstr "模�"
+
+#. Automatic highlight menu
+#: ../plugins/class-gen/window.c:792 ../plugins/document-manager/plugin.c:1033
+msgid "Automatic"
+msgstr "è?ªå??"
+
+#: ../plugins/class-gen/window.c:793
+#, fuzzy
+#| msgid "Western"
+msgid "Getter"
+msgstr "西��系"
+
+#: ../plugins/class-gen/window.c:794
+#, fuzzy
+#| msgid "Starter"
+msgid "Setter"
+msgstr "èµ·æ­¥"
+
+#: ../plugins/class-gen/window.c:1208
 msgid "XML description of the user interface"
 msgstr "使ç?¨è??ä»?é?¢ç?? XML æ??è¿°"
 
@@ -1549,17 +1705,19 @@ 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"
 msgstr "使�詳細模�"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
-#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
 #: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "Browseâ?¦"
@@ -1673,14 +1831,11 @@ msgid "Ignore .cvsrc file (recommended)"
 msgstr "忽� .cvsrc ��建議�"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
-#: ../plugins/git/anjuta-git.ui.h:57
-#: ../plugins/symbol-db/plugin.c:2116
-#: ../plugins/symbol-db/plugin.c:2158
+#: ../plugins/symbol-db/plugin.c:2171
 msgid "Local"
 msgstr "å??å??"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
-#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "ç´?é??è¨?æ?¯ï¼?"
 
@@ -1694,7 +1849,6 @@ msgstr "模çµ?å??稱ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/git/anjuta-git.ui.h:65
 #: ../plugins/search/anjuta-search.ui.h:22
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
 #: ../plugins/subversion/anjuta-subversion.ui.h:23
@@ -1702,7 +1856,7 @@ msgid "Options"
 msgstr "��"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:50
 #: ../plugins/subversion/anjuta-subversion.ui.h:24
 msgid "Options:"
 msgstr "���"
@@ -1741,7 +1895,7 @@ msgid "Reset sticky tags"
 msgstr "é??設 sticky æ¨?籤"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/git/anjuta-git.ui.h:56
 #: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "ä¿®è¨?ç??ï¼?"
@@ -1773,7 +1927,6 @@ msgid "Vendor tag:"
 msgstr "å» å??æ¨?籤ï¼?"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:123
 #: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "æ?´å??å°?æ¡?"
@@ -1796,9 +1949,6 @@ msgid "Unable to delete file"
 msgstr "������"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:244
-#: ../plugins/git/git-commit-dialog.c:79
-#: ../plugins/git/git-create-tag-dialog.c:130
-#: ../plugins/git/git-merge-dialog.c:91
 #: ../plugins/subversion/subversion-commit-dialog.c:88
 msgid "Are you sure that you want to pass an empty log message?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å?³é??空ç??ç´?é??è¨?æ?¯ï¼?"
@@ -1807,11 +1957,6 @@ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?³é??空ç??ç´?é??è¨?æ?¯ï¼?"
 msgid "CVSROOT"
 msgstr "CVSROOT"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/am-project/am-project.c:191
-msgid "Module"
-msgstr "模�"
-
 #: ../plugins/cvs-plugin/cvs-callbacks.c:441
 msgid "Vendor"
 msgstr "å» å??"
@@ -1839,16 +1984,14 @@ 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:474
+#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:474
 #: ../plugins/cvs-plugin/plugin.c:481
 msgid "CVS"
 msgstr "CVS"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:46
-#: ../plugins/cvs-plugin/plugin.c:121
+#: ../plugins/cvs-plugin/plugin.c:46 ../plugins/cvs-plugin/plugin.c:121
 msgid "_CVS"
 msgstr "_CVS"
 
@@ -1878,72 +2021,62 @@ msgstr "å¾? CVS 樹移é?¤æª?æ¡?/ç?®é??"
 
 #. Action name
 #. Stock icon, if any
-#: ../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"
 msgstr "_Commit"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:72
-#: ../plugins/cvs-plugin/plugin.c:131
+#: ../plugins/cvs-plugin/plugin.c:72 ../plugins/cvs-plugin/plugin.c:131
 msgid "Commit your changes to the CVS tree"
 msgstr "æ??交æ?¨ç??ä¿®æ?¹è?³ CVS 樹"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:78
-#: ../plugins/cvs-plugin/plugin.c:137
+#: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:54
 msgid "_Update"
 msgstr "_Update"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:80
-#: ../plugins/cvs-plugin/plugin.c:139
+#: ../plugins/cvs-plugin/plugin.c:80 ../plugins/cvs-plugin/plugin.c:139
 msgid "Syncronize your local copy with the CVS tree"
 msgstr "å°?æ?¨æ?¬æ©?ç??è¤?æ?¬è?? CVS 樹å??æ­¥"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:86
-#: ../plugins/cvs-plugin/plugin.c:145
+#: ../plugins/cvs-plugin/plugin.c:86 ../plugins/cvs-plugin/plugin.c:145
 msgid "_Diff"
 msgstr "_Diff"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:88
-#: ../plugins/cvs-plugin/plugin.c:147
+#: ../plugins/cvs-plugin/plugin.c:88 ../plugins/cvs-plugin/plugin.c:147
 msgid "Show differences between your local copy and the tree"
 msgstr "顯示æ?¨ç??æ?¬å?°ç«¯è¤?æ?¬è?? CVS 樹ä¹?é??ç??å·®ç?°"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:94
-#: ../plugins/cvs-plugin/plugin.c:153
+#: ../plugins/cvs-plugin/plugin.c:94 ../plugins/cvs-plugin/plugin.c:153
 msgid "_Show Status"
 msgstr "顯示ç??æ??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:96
-#: ../plugins/cvs-plugin/plugin.c:155
+#: ../plugins/cvs-plugin/plugin.c:96 ../plugins/cvs-plugin/plugin.c:155
 msgid "Show the status of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç??æ??"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/cvs-plugin/plugin.c:102
-#: ../plugins/cvs-plugin/plugin.c:161
+#: ../plugins/cvs-plugin/plugin.c:102 ../plugins/cvs-plugin/plugin.c:161
 msgid "_Show Log"
 msgstr "顯示ç´?é??(_S)"
 
 #. Display label
 #. short-cut
-#: ../plugins/cvs-plugin/plugin.c:104
-#: ../plugins/cvs-plugin/plugin.c:163
+#: ../plugins/cvs-plugin/plugin.c:104 ../plugins/cvs-plugin/plugin.c:163
 msgid "Show the log of a file/directory"
 msgstr "顯示æª?æ¡?/ç?®é??ç??ç´?é??æª?"
 
@@ -1967,15 +2100,53 @@ msgstr "CVS æ??ä½?"
 msgid "CVS popup operations"
 msgstr "CVS å½?å?ºå¼?æ??ä½?"
 
+#: ../plugins/code-analyzer/code-analyzer.ui.h:1
+msgid "CLang Paths"
+msgstr "CLang 路�"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:2
+msgid "Enable CLang code analyzer"
+msgstr "å??ç?¨ CLang ç¨?å¼?碼å??æ??å?¨"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:4
+msgid ""
+"The project needs to be reconfigured after enabling this option. Please run "
+"Build->Configure!"
+msgstr "å?¨å??ç?¨æ­¤é?¸é ?å¾?å°?æ¡?é??è¦?é??æ?°è¨­å®?ã??è«?å?·è¡? çµ?建->設å®?ï¼?"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:5
+msgid "c++-analyzer:"
+msgstr "c++-å??æ??å?¨ï¼?"
+
+#: ../plugins/code-analyzer/code-analyzer.ui.h:6
+msgid "ccc-analyzer:"
+msgstr "ccc-å??æ??å?¨ï¼?"
+
+#: ../plugins/code-analyzer/plugin.c:157
+msgid ""
+"Couldn't find clang analyzer, please check if it is installed and if the "
+"paths are configured correctly in the preferences"
+msgstr ""
+"æ?¾ä¸?å?° clang å??æ??å?¨ï¼?è«?檢æ?¥å®?æ?¯å?¦å·²å®?è£?以å??å??好設å®?中ç??è·¯å¾?æ?¯å?¦è¨­å®?正確"
+
+#: ../plugins/code-analyzer/plugin.c:226 ../plugins/code-analyzer/plugin.c:234
+msgid "CLang Analyzer"
+msgstr "CLang å??æ??å?¨"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a 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"
+"<span weight=\"bold\" size=\"larger\">æ?¨ç¢ºå®?ä¸?使ç?¨é?¤é?¯çµ?æ??ä¾?ç?ºç¨?å¼?é?¤é?¯ï¼?</"
+"span>\n"
 "\n"
-"ç?¶å??ç?¨æ??ä½³å??æ??ï¼?é?¤é?¯å·¥å?·ä¸?è?½ä¸?ç?´è¾¨è­?å?ºæ??令ç??å??å§?碼ï¼?å? æ­¤æ??äº?æ??令å?¯è?½æ??å?·è¡?å¾?å¾?å¥?æ?ªï¼?ç?¹å?¥æ?¯å?®æ­¥æ??令ã??"
+"ç?¶å??ç?¨æ??ä½³å??æ??ï¼?é?¤é?¯å·¥å?·ä¸?è?½ä¸?ç?´è¾¨è­?å?ºæ??令ç??å??å§?碼ï¼?å? æ­¤æ??äº?æ??令å?¯è?½æ??å?·è¡?å¾?"
+"å¾?å¥?æ?ªï¼?ç?¹å?¥æ?¯å?®æ­¥æ??令ã??"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
@@ -2059,8 +2230,8 @@ msgid "Inspect/Evaluate"
 msgstr "檢�/�估"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
-#: ../plugins/debug-manager/plugin.c:1029
-#: ../plugins/debug-manager/plugin.c:1145
+#: ../plugins/debug-manager/plugin.c:1031
+#: ../plugins/debug-manager/plugin.c:1147
 msgid "Kernel Signals"
 msgstr "å?§æ ¸è¨?è??"
 
@@ -2136,7 +2307,6 @@ msgid "TCP/IP Connection"
 msgstr "TCP/IP ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:336
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2335,25 +2505,15 @@ msgstr "中æ?·é»?æ??ä½?"
 msgid "_Go to address"
 msgstr "移è?³ä½?å??(_G)"
 
-#: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/tools/editor.c:468
+#: ../plugins/debug-manager/debug_tree.c:128 ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "è®?æ?¸"
 
-#: ../plugins/debug-manager/debug_tree.c:128
-#: ../plugins/debug-manager/registers.c:469
-#: ../plugins/project-manager/dialogs.c:441
-#: ../plugins/run-program/parameters.c:763
-#: ../plugins/tools/editor.c:474
-msgid "Value"
-msgstr "���"
-
 #: ../plugins/debug-manager/disassemble.c:851
 msgid "Disassembly"
 msgstr "å??çµ?è­¯"
 
-#: ../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 "��"
@@ -2367,262 +2527,259 @@ msgstr "å??"
 msgid "Locals"
 msgstr "å?°å??è®?æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:338
+#: ../plugins/debug-manager/plugin.c:340
 msgid "Debugger Log"
 msgstr "é?¤é?¯å·¥å?·ç´?é??"
 
-#: ../plugins/debug-manager/plugin.c:411
-#: ../plugins/debug-manager/plugin.c:433
-#: ../plugins/debug-manager/plugin.c:458
-#: ../plugins/debug-manager/plugin.c:485
-#: ../plugins/debug-manager/plugin.c:519
-#: ../plugins/debug-manager/plugin.c:552
+#: ../plugins/debug-manager/plugin.c:413 ../plugins/debug-manager/plugin.c:435
+#: ../plugins/debug-manager/plugin.c:460 ../plugins/debug-manager/plugin.c:487
+#: ../plugins/debug-manager/plugin.c:521 ../plugins/debug-manager/plugin.c:554
 #: ../plugins/debug-manager/anjuta-debug-manager.plugin.in.h:2
 msgid "Debugger"
 msgstr "��工�"
 
-#: ../plugins/debug-manager/plugin.c:411
+#: ../plugins/debug-manager/plugin.c:413
 msgid "Started"
 msgstr "已起�"
 
-#: ../plugins/debug-manager/plugin.c:433
+#: ../plugins/debug-manager/plugin.c:435
 msgid "Loaded"
 msgstr "已��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:454
-#: ../plugins/debug-manager/plugin.c:1157
+#: ../plugins/debug-manager/plugin.c:456
+#: ../plugins/debug-manager/plugin.c:1159
 msgid "Pa_use Program"
 msgstr "æ?«å??ç¨?å¼?(_U)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:455
-#: ../plugins/debug-manager/plugin.c:1159
+#: ../plugins/debug-manager/plugin.c:457
+#: ../plugins/debug-manager/plugin.c:1161
 msgid "Pauses the execution of the program"
 msgstr "æ?«å??å?·è¡?ç¨?å¼?"
 
-#: ../plugins/debug-manager/plugin.c:458
+#: ../plugins/debug-manager/plugin.c:460
 msgid "Runningâ?¦"
 msgstr "正����"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:481
-#: ../plugins/debug-manager/plugin.c:1049
+#: ../plugins/debug-manager/plugin.c:483
+#: ../plugins/debug-manager/plugin.c:1051
 msgid "Run/_Continue"
 msgstr "�� / 繼���(_C)"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:482
-#: ../plugins/debug-manager/plugin.c:1051
+#: ../plugins/debug-manager/plugin.c:484
+#: ../plugins/debug-manager/plugin.c:1053
 msgid "Continue the execution of the program"
 msgstr "繼�����"
 
-#: ../plugins/debug-manager/plugin.c:485
+#: ../plugins/debug-manager/plugin.c:487
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
-#: ../plugins/debug-manager/plugin.c:519
+#: ../plugins/debug-manager/plugin.c:521
 msgid "Unloaded"
 msgstr "���"
 
-#: ../plugins/debug-manager/plugin.c:561
+#: ../plugins/debug-manager/plugin.c:563
 #, c-format
 msgid "Debugger terminated with error %d: %s\n"
 msgstr "é?¤é?¯ç¨?å¼?å?  %d é?¯èª¤è??中止ï¼?%s\n"
 
-#: ../plugins/debug-manager/plugin.c:574
+#: ../plugins/debug-manager/plugin.c:576
 #, c-format
 msgid "Program has received signal: %s\n"
 msgstr "ç¨?å¼?æ?¥æ?¶å?°ä¿¡è??ï¼?%s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:913
+#: ../plugins/debug-manager/plugin.c:915
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../plugins/debug-manager/plugin.c:921
+#: ../plugins/debug-manager/plugin.c:923
 msgid "_Start Debugger"
 msgstr "å??å??é?¤é?¯å?¨(_S)"
 
-#: ../plugins/debug-manager/plugin.c:929
+#: ../plugins/debug-manager/plugin.c:931
 msgid "_Debug Program"
 msgstr "�����(_D)"
 
-#: ../plugins/debug-manager/plugin.c:931
+#: ../plugins/debug-manager/plugin.c:933
 msgid "Start debugger and load the program"
 msgstr "å??å??é?¤é?¯å?¨ä¸¦è¼?å?¥ç¨?å¼?"
 
-#: ../plugins/debug-manager/plugin.c:937
+#: ../plugins/debug-manager/plugin.c:939
 msgid "_Debug Processâ?¦"
 msgstr "����(_D)�"
 
-#: ../plugins/debug-manager/plugin.c:939
+#: ../plugins/debug-manager/plugin.c:941
 msgid "Start debugger and attach to a running program"
 msgstr "å??å??é?¤é?¯å?¨ä¸¦å°?æ­£å?¨å?·è¡?中ç??ç¨?å¼?é?²è¡?é?¤é?¯"
 
-#: ../plugins/debug-manager/plugin.c:945
+#: ../plugins/debug-manager/plugin.c:947
 msgid "Debug _Remote Targetâ?¦"
 msgstr "��端����(_R)�"
 
-#: ../plugins/debug-manager/plugin.c:947
+#: ../plugins/debug-manager/plugin.c:949
 msgid "Connect to a remote debugging target"
 msgstr "é?£æ?¥å?°é? ç«¯è¦?é?¤é?¯ç??ç?®æ¨?"
 
-#: ../plugins/debug-manager/plugin.c:953
+#: ../plugins/debug-manager/plugin.c:955
 msgid "Stop Debugger"
 msgstr "å??æ­¢é?¤é?¯å·¥å?·"
 
-#: ../plugins/debug-manager/plugin.c:955
+#: ../plugins/debug-manager/plugin.c:957
 msgid "Say goodbye to the debugger"
 msgstr "è·?é?¤é?¯å·¥å?·èªªè?²å??è¦?"
 
-#: ../plugins/debug-manager/plugin.c:961
+#: ../plugins/debug-manager/plugin.c:963
 msgid "Add source pathsâ?¦"
 msgstr "����路��"
 
-#: ../plugins/debug-manager/plugin.c:963
+#: ../plugins/debug-manager/plugin.c:965
 msgid "Add additional source paths"
 msgstr "å? å?¥é¡?å¤?ç??å??å§?æª?è·¯å¾?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:973
-#: ../plugins/debug-manager/plugin.c:1097
+#: ../plugins/debug-manager/plugin.c:975
+#: ../plugins/debug-manager/plugin.c:1099
 msgid "Debugger Commandâ?¦"
 msgstr "é?¤é?¯å·¥å?·æ??令â?¦"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:975
-#: ../plugins/debug-manager/plugin.c:1099
+#: ../plugins/debug-manager/plugin.c:977
+#: ../plugins/debug-manager/plugin.c:1101
 msgid "Custom debugger command"
 msgstr "è?ªè¨?é?¤é?¯å?¨æ??令"
 
-#: ../plugins/debug-manager/plugin.c:981
-#: ../plugins/debug-manager/plugin.c:1105
+#: ../plugins/debug-manager/plugin.c:983
+#: ../plugins/debug-manager/plugin.c:1107
 msgid "_Info"
 msgstr "��(_I)"
 
-#: ../plugins/debug-manager/plugin.c:989
+#: ../plugins/debug-manager/plugin.c:991
 msgid "Info _Target Files"
 msgstr "����(_T)"
 
-#: ../plugins/debug-manager/plugin.c:991
+#: ../plugins/debug-manager/plugin.c:993
 msgid "Display information on the files the debugger is active with"
 msgstr "顯示ç?®å??æ­£å?¨è¢«é?¤é?¯ç??ç¨?å¼?ç??å?·è¡?ç?°å¢?ç??è³?è¨?"
 
-#: ../plugins/debug-manager/plugin.c:997
+#: ../plugins/debug-manager/plugin.c:999
 msgid "Info _Program"
 msgstr "����(_P)"
 
-#: ../plugins/debug-manager/plugin.c:999
+#: ../plugins/debug-manager/plugin.c:1001
 msgid "Display information on the execution status of the program"
 msgstr "顯示ç¨?å¼?ç??å?·è¡?ç??æ³?è³?è¨?"
 
-#: ../plugins/debug-manager/plugin.c:1005
+#: ../plugins/debug-manager/plugin.c:1007
 msgid "Info _Kernel User Struct"
 msgstr "���核(_K)"
 
-#: ../plugins/debug-manager/plugin.c:1007
+#: ../plugins/debug-manager/plugin.c:1009
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr "顯示ç?®å??é?²ç¨?ç?? CPU æ?«å­?å?¨æ?¸å?¼ï¼?ç¨?å¼?å ?ç??ï¼?è³?æ??å??ç??ä½?å??å??大å°?ç­?ç­?â?¦"
 
-#: ../plugins/debug-manager/plugin.c:1021
-#: ../plugins/debug-manager/plugin.c:1137
+#: ../plugins/debug-manager/plugin.c:1023
+#: ../plugins/debug-manager/plugin.c:1139
 msgid "Shared Libraries"
 msgstr "�享��庫"
 
-#: ../plugins/debug-manager/plugin.c:1023
-#: ../plugins/debug-manager/plugin.c:1139
+#: ../plugins/debug-manager/plugin.c:1025
+#: ../plugins/debug-manager/plugin.c:1141
 msgid "Show shared library mappings"
 msgstr "顯示�享��庫��"
 
-#: ../plugins/debug-manager/plugin.c:1031
-#: ../plugins/debug-manager/plugin.c:1147
+#: ../plugins/debug-manager/plugin.c:1033
+#: ../plugins/debug-manager/plugin.c:1149
 msgid "Show kernel signals"
 msgstr "顯示核å¿?è¨?è??"
 
-#: ../plugins/debug-manager/plugin.c:1037
+#: ../plugins/debug-manager/plugin.c:1039
 msgid "_Continue/Suspend"
 msgstr "ç¹¼çº?/æ?«å??(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1039
+#: ../plugins/debug-manager/plugin.c:1041
 msgid "Continue or suspend the execution of the program"
 msgstr "ç¹¼çº?æ??æ?«å??å?·è¡?ç¨?å¼?"
 
-#: ../plugins/debug-manager/plugin.c:1057
+#: ../plugins/debug-manager/plugin.c:1059
 msgid "Step _In"
 msgstr "步�(_I)"
 
-#: ../plugins/debug-manager/plugin.c:1059
+#: ../plugins/debug-manager/plugin.c:1061
 msgid "Single step into function"
 msgstr "æ­¥å?¥ç?®å??å?½å¼?å?§ç?¶å¾?å?®æ­¥å?·è¡?"
 
-#: ../plugins/debug-manager/plugin.c:1065
+#: ../plugins/debug-manager/plugin.c:1067
 msgid "Step O_ver"
 msgstr "æ­¥é??(_V)"
 
-#: ../plugins/debug-manager/plugin.c:1067
+#: ../plugins/debug-manager/plugin.c:1069
 msgid "Single step over function"
 msgstr "å?®æ­¥å?·è¡?ç?®å??å?½å¼?"
 
-#: ../plugins/debug-manager/plugin.c:1073
+#: ../plugins/debug-manager/plugin.c:1075
 msgid "Step _Out"
 msgstr "步�(_O)"
 
-#: ../plugins/debug-manager/plugin.c:1075
+#: ../plugins/debug-manager/plugin.c:1077
 msgid "Single step out of function"
 msgstr "å?®æ­¥é?¢é??å?½æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1081
+#: ../plugins/debug-manager/plugin.c:1083
 msgid "_Run to Cursor"
 msgstr "å?·è¡?è?³é??æ¨?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:1083
+#: ../plugins/debug-manager/plugin.c:1085
 msgid "Run to the cursor"
 msgstr "ç¨?å¼?å?·è¡?è?³é??æ¨?ç?®å??ä½?ç½®æ??å??æ­¢"
 
-#: ../plugins/debug-manager/plugin.c:1089
+#: ../plugins/debug-manager/plugin.c:1091
 msgid "_Run from Cursor"
 msgstr "å¾?游æ¨?è??å?·è¡?(_R)"
 
-#: ../plugins/debug-manager/plugin.c:1091
+#: ../plugins/debug-manager/plugin.c:1093
 msgid "Run from the cursor"
 msgstr "å¾?游æ¨?è??å?·è¡?"
 
-#: ../plugins/debug-manager/plugin.c:1113
+#: ../plugins/debug-manager/plugin.c:1115
 msgid "Info _Global Variables"
 msgstr "å?¨å??è®?æ?¸è³?è¨?(_G)"
 
-#: ../plugins/debug-manager/plugin.c:1115
+#: ../plugins/debug-manager/plugin.c:1117
 msgid "Display all global and static variables of the program"
 msgstr "顯示ç¨?å¼?ç??å?¨å??å??å??é??æ??è®?æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1121
+#: ../plugins/debug-manager/plugin.c:1123
 msgid "Info _Current Frame"
 msgstr "å ?ç??çµ?æ§?(_C)"
 
-#: ../plugins/debug-manager/plugin.c:1123
+#: ../plugins/debug-manager/plugin.c:1125
 msgid "Display information about the current frame of execution"
 msgstr "顯示ç?®å??å ?ç??çµ?æ§?å?§ç??è³?è¨?"
 
-#: ../plugins/debug-manager/plugin.c:1129
+#: ../plugins/debug-manager/plugin.c:1131
 msgid "Info Function _Arguments"
 msgstr "å?½å¼?å??æ?¸(_A)"
 
-#: ../plugins/debug-manager/plugin.c:1131
+#: ../plugins/debug-manager/plugin.c:1133
 msgid "Display function arguments of the current frame"
 msgstr "顯示ç?®å??å ?ç??çµ?æ§?æ??屬å?½å¼?ç??å??æ?¸"
 
-#: ../plugins/debug-manager/plugin.c:1199
-#: ../plugins/debug-manager/plugin.c:1205
-#: ../plugins/debug-manager/plugin.c:1211
-#: ../plugins/debug-manager/plugin.c:1217
+#: ../plugins/debug-manager/plugin.c:1201
+#: ../plugins/debug-manager/plugin.c:1207
+#: ../plugins/debug-manager/plugin.c:1213
+#: ../plugins/debug-manager/plugin.c:1219
 msgid "Debugger operations"
 msgstr "é?¤é?¯å·¥å?·æ??ä½?"
 
@@ -2648,12 +2805,10 @@ msgid "Shared Object"
 msgstr "�享�件"
 
 #: ../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
 msgid "To"
 msgstr "çµ?æ??ä½?å??"
 
@@ -2742,10 +2897,9 @@ msgstr "ç·¨è??"
 
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:664
-#: ../plugins/debug-manager/threads.c:451
-#: ../plugins/gdb/preferences.c:363
-#: ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:623
+#: ../plugins/debug-manager/threads.c:451 ../plugins/gdb/preferences.c:363
+#: ../plugins/symbol-db/plugin.c:2129 ../plugins/tools/tool.c:100
+#: ../src/anjuta-app.c:625
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "��"
@@ -2809,8 +2963,7 @@ msgstr "ç?¡æ³?å?µæ¸¬ %s ç?? MIME é¡?å??ã??é?¤é?¯å·¥å?·ä¸?è?½å??å??ã??"
 msgid "Path"
 msgstr "路�"
 
-#: ../plugins/debug-manager/start.c:1389
-#: ../plugins/gdb/debugger.c:1929
+#: ../plugins/debug-manager/start.c:1389 ../plugins/gdb/debugger.c:1929
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2878,8 +3031,7 @@ 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 "ç?£ç??æ??ä½?"
 
@@ -2887,70 +3039,63 @@ msgstr "ç?£ç??æ??ä½?"
 msgid "Watches"
 msgstr "ç?£ç??"
 
-#: ../plugins/devhelp/plugin.c:202
+#: ../plugins/devhelp/plugin.c:206
 msgid "Search Help:"
 msgstr "æ??å°?說æ??ï¼?"
 
-#: ../plugins/devhelp/plugin.c:223
-#: ../plugins/document-manager/plugin.c:243
-#: ../plugins/message-view/plugin.c:77
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/devhelp/plugin.c:227 ../plugins/document-manager/plugin.c:243
+#: ../plugins/message-view/plugin.c:77 ../plugins/symbol-db/plugin.c:322
 msgid "_Go to"
 msgstr "移�(_G)"
 
-#: ../plugins/devhelp/plugin.c:232
+#: ../plugins/devhelp/plugin.c:236
 msgid "_API Reference"
 msgstr "API å??è??(_A)"
 
-#: ../plugins/devhelp/plugin.c:234
+#: ../plugins/devhelp/plugin.c:238
 msgid "Browse API Pages"
 msgstr "ç??覽 API é ?é?¢"
 
-#: ../plugins/devhelp/plugin.c:244
+#: ../plugins/devhelp/plugin.c:248
 msgid "_Context Help"
 msgstr "å?³æ??說æ??(_C)"
 
-#: ../plugins/devhelp/plugin.c:246
+#: ../plugins/devhelp/plugin.c:250
 msgid "Search help for the current word in the editor"
 msgstr "å?¨èªªæ??æª?å?§æ??å°?ç?®å??æ??件å?§é?¸å®?ç??å­?"
 
-#: ../plugins/devhelp/plugin.c:252
+#: ../plugins/devhelp/plugin.c:260
 msgid "_Search Help"
 msgstr "æ??å°?說æ??(_S)"
 
-#: ../plugins/devhelp/plugin.c:254
+#: ../plugins/devhelp/plugin.c:262
 msgid "Search for a term in help"
 msgstr "å?¨æ±?å?©ä¸­æ??å°?ä¸?å??è©?"
 
-#: ../plugins/devhelp/plugin.c:326
+#: ../plugins/devhelp/plugin.c:334
 msgid "Help operations"
 msgstr "æ±?å?©æ??ä½?"
 
-#: ../plugins/devhelp/plugin.c:345
-#: ../plugins/devhelp/plugin.c:462
-#: ../src/anjuta-app.c:640
-msgid "Help"
-msgstr "æ±?å?©"
+#: ../plugins/devhelp/plugin.c:353 ../plugins/devhelp/plugin.c:470
+msgid "API Browser"
+msgstr "API ç??覽å?¨"
 
-#: ../plugins/devhelp/plugin.c:356
+#: ../plugins/devhelp/plugin.c:364
 msgid "Contents"
 msgstr "�容"
 
-#: ../plugins/devhelp/plugin.c:362
-#: ../plugins/search/search-replace.c:1034
+#: ../plugins/devhelp/plugin.c:370 ../plugins/search/search-replace.c:1034
 #: ../plugins/search/search-replace.c:1700
 #: ../plugins/search/search-replace.c:1707
 #: ../plugins/search/search-replace.c:1719
-#: ../plugins/search/search-replace.c:2037
-#: ../plugins/symbol-db/plugin.c:2126
-#: ../plugins/symbol-db/plugin.c:2178
+#: ../plugins/search/search-replace.c:2037 ../plugins/symbol-db/plugin.c:2139
+#: ../plugins/symbol-db/plugin.c:2191
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../plugins/devhelp/plugin.c:380
-#: ../plugins/devhelp/plugin.c:467
-msgid "Help display"
-msgstr "顯示��"
+#: ../plugins/devhelp/plugin.c:388 ../plugins/devhelp/plugin.c:475
+msgid "API"
+msgstr "API"
 
 #: ../plugins/document-manager/action-callbacks.c:314
 #, c-format
@@ -2965,27 +3110,26 @@ msgstr ""
 msgid "_Reload"
 msgstr "é??æ?°è¼?å?¥(_R)"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:311
+#: ../plugins/document-manager/anjuta-bookmarks.c:334
 msgid "Add bookmark"
 msgstr "���籤"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:317
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
 msgid "Remove bookmark"
 msgstr "移��籤"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:331
-#: ../plugins/document-manager/anjuta-bookmarks.c:404
+#: ../plugins/document-manager/anjuta-bookmarks.c:354
+#: ../plugins/document-manager/anjuta-bookmarks.c:414
 #: ../plugins/document-manager/plugin.c:422
 msgid "Bookmarks"
 msgstr "�籤"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:339
+#: ../plugins/document-manager/anjuta-bookmarks.c:362
 msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:340
-#: ../plugins/gtodo/callback.c:23
-#: ../plugins/gtodo/callback.c:106
+#: ../plugins/document-manager/anjuta-bookmarks.c:363
+#: ../plugins/git/plugin.c:178
 #: ../plugins/snippets-manager/snippets-editor.ui.h:10
 msgid "Remove"
 msgstr "移�"
@@ -2995,14 +3139,13 @@ msgid "Close file"
 msgstr "é??é??æª?æ¡?"
 
 #: ../plugins/document-manager/anjuta-docman.c:502
+#: ../plugins/project-manager/dialogs.c:563
 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 "é??å??æª?æ¡?"
 
@@ -3129,11 +3272,11 @@ msgid "Close all files"
 msgstr "é??é??å?¨é?¨æª?æ¡?"
 
 #: ../plugins/document-manager/plugin.c:165
-msgid "Close Other"
+msgid "Close Others"
 msgstr "é??é??å?¶ä»?ç??"
 
 #: ../plugins/document-manager/plugin.c:166
-msgid "Close other documents"
+msgid "Close others documents"
 msgstr "é??é??å?¶ä»?ç??æ??件"
 
 #: ../plugins/document-manager/plugin.c:168
@@ -3322,8 +3465,7 @@ msgstr "ä¸?ä¸?å??æ­·å?²ç´?é??(_Y)"
 msgid "Go to next history"
 msgstr "移è?³ä¸?ä¸?å??æ­·å?²ç´?é??"
 
-#: ../plugins/document-manager/plugin.c:265
-#: ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:265 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
@@ -3343,10 +3485,8 @@ msgstr "å¿«é??é??æ?°æ??å°?(_R)"
 msgid "Repeat quick search"
 msgstr "é??è¤?å¿«é??æ??å°?"
 
-#: ../plugins/document-manager/plugin.c:275
-#: ../plugins/gtodo/interface.c:141
-#: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1914
+#: ../plugins/document-manager/plugin.c:275 ../src/anjuta-actions.h:30
+#: ../plugins/language-support-cpp-java/plugin.c:961
 #: ../plugins/language-support-python/plugin.c:1179
 msgid "_Edit"
 msgstr "編輯(_E)"
@@ -3398,8 +3538,7 @@ msgstr "å?ªä¸?編輯å?¨ä¸­é?¸å®?ç??æ??å­?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:298
-#: ../plugins/terminal/terminal.c:561
+#: ../plugins/document-manager/plugin.c:298 ../plugins/terminal/terminal.c:561
 msgid "_Copy"
 msgstr "�製(_C)"
 
@@ -3407,8 +3546,7 @@ msgstr "�製(_C)"
 msgid "Copy the selected text to the clipboard"
 msgstr "å°?é?¸å®?ç¯?å??ç??æ??å­?è¤?製å?°å?ªè²¼ç°¿"
 
-#: ../plugins/document-manager/plugin.c:301
-#: ../plugins/terminal/terminal.c:569
+#: ../plugins/document-manager/plugin.c:301 ../plugins/terminal/terminal.c:569
 msgid "_Paste"
 msgstr "貼�(_P)"
 
@@ -3557,12 +3695,12 @@ msgid "Bookmar_k"
 msgstr "�籤(_K)"
 
 #: ../plugins/document-manager/plugin.c:380
-msgid "_Add Bookmark"
-msgstr "���籤(_A)"
+msgid "_Toggle Bookmark"
+msgstr "å??æ??æ?¸ç±¤(_T)"
 
 #: ../plugins/document-manager/plugin.c:381
-msgid "Add a bookmark at the current line position"
-msgstr "å°?ç?®å??æ??å?¨è¡?ç??ä½?ç½®å? å?¥æ?¸ç±¤"
+msgid "Toggle bookmark at the current line position"
+msgstr "å??æ??ç?®å??æ??å?¨å??ç??ä½?ç½®æ?¸ç±¤"
 
 #: ../plugins/document-manager/plugin.c:383
 msgid "_Previous Bookmark"
@@ -3633,10 +3771,11 @@ msgstr "編輯å?¨æ??å­?æ ¼å¼?"
 msgid "Simple searching"
 msgstr "ç°¡æ??æ??å°?"
 
+#. DocmanPlugin* plugin = ANJUTA_PLUGIN_DOCMAN (ipref);
 #: ../plugins/document-manager/plugin.c:421
-#: ../plugins/document-manager/plugin.c:1750
-#: ../plugins/document-manager/plugin.c:2172
-#: ../plugins/document-manager/plugin.c:2181
+#: ../plugins/document-manager/plugin.c:1749
+#: ../plugins/document-manager/plugin.c:2171
+#: ../plugins/document-manager/plugin.c:2180
 msgid "Documents"
 msgstr "æ??件"
 
@@ -3673,18 +3812,13 @@ msgstr "�"
 msgid "Mode"
 msgstr "模�"
 
-#. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1033
-msgid "Automatic"
-msgstr "è?ªå??"
-
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1592
+#: ../plugins/document-manager/plugin.c:1591
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "è?ªå??å?²å­? %s 失æ??"
 
-#: ../plugins/document-manager/plugin.c:1606
+#: ../plugins/document-manager/plugin.c:1605
 msgid "Autosave completed"
 msgstr "è?ªå??å?²å­?å®?ç?¢"
 
@@ -3695,7 +3829,9 @@ 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
@@ -3775,7 +3911,8 @@ 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"
@@ -3799,9 +3936,8 @@ msgstr "以此é??å??ï¼?"
 msgid "Document Manager"
 msgstr "æ??件管ç??å?¡"
 
-#: ../plugins/file-loader/plugin.c:497
-#: ../plugins/patch/patch-plugin.c:122
-#: ../plugins/run-program/parameters.c:308
+#: ../plugins/file-loader/plugin.c:497 ../plugins/patch/patch-plugin.c:122
+#: ../plugins/run-program/parameters.c:311
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
@@ -3874,23 +4010,19 @@ 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 "�����"
@@ -3903,8 +4035,7 @@ 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 "é??å??"
 
@@ -3912,8 +4043,7 @@ 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 "æ??è¿?é??å??ç??æª?æ¡?"
 
@@ -3925,8 +4055,7 @@ 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 "�����"
@@ -3938,7 +4067,6 @@ msgid "Please select a plugin to open <b>%s</b>."
 msgstr "è«?é?¸æ??è¦?ç?¨ä¾?é??å?? <b>%s</b> ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/file-loader/plugin.c:1441
-#| msgid "Open With"
 msgid "<b>Open With</b>"
 msgstr "<b>以此é??å??</b>"
 
@@ -3967,9 +4095,8 @@ msgid "Filter"
 msgstr "é??濾æ¢?件"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2121
-#: ../plugins/symbol-db/plugin.c:2170
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/plugin.c:2183
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
 msgid "Global"
 msgstr "å?¨å??"
 
@@ -3977,7 +4104,7 @@ msgstr "å?¨å??"
 msgid "Root directory if no project is open:"
 msgstr "å¦?æ??æ²?æ??é??å??å°?æ¡?æ??ç??æ ¹ç?®é??ï¼?"
 
-#: ../plugins/file-manager/file-model.c:120
+#: ../plugins/file-manager/file-model.c:120 ../plugins/git/anjuta-git.ui.h:46
 msgid "Loading..."
 msgstr "正����"
 
@@ -4005,12 +4132,11 @@ msgstr "é??æ?°å?½å??æª?æ¡?æ??ç?®é??"
 msgid "File manager popup actions"
 msgstr "æª?æ¡?管ç??ç¨?å¼?å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:327 ../plugins/git/plugin.c:162
 msgid "Files"
 msgstr "��"
 
-#: ../plugins/file-manager/plugin.c:457
-#: ../plugins/file-manager/plugin.c:466
+#: ../plugins/file-manager/plugin.c:457 ../plugins/file-manager/plugin.c:466
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "æª?æ¡?管ç??å?¡"
@@ -4044,8 +4170,8 @@ msgid "File Information"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
-#: ../plugins/am-project/am-properties.c:45
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/am-project/am-properties.c:48 ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/project-manager/dialogs.c:568
 #: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "å??稱ï¼?"
@@ -4056,7 +4182,7 @@ msgid "New File"
 msgstr "����"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
-#: ../plugins/project-manager/dialogs.c:542
+#: ../plugins/project-manager/dialogs.c:590
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
@@ -4097,7 +4223,6 @@ msgid "Shell Script File"
 msgstr "Shell �令稿��"
 
 #: ../plugins/file-wizard/file.c:92
-#| msgid "Java Source File"
 msgid "Vala Source File"
 msgstr "Vala å??å§?æª?"
 
@@ -4116,124 +4241,88 @@ msgstr "ç?¡æ³?建ç«?æ?°æª?æ¡?ç??使ç?¨è??ä»?é?¢"
 #: ../plugins/dir-project/dir-project.c:133
 #: ../plugins/dir-project/dir-project.c:156
 #, c-format
-#| msgid "Missing tool name"
 msgid "Missing name"
 msgstr "缺å°?å??稱"
 
-#: ../plugins/dir-project/dir-project.c:649
-#: ../plugins/dir-project/dir-project.c:762
-#: ../plugins/am-project/am-project.c:1627
-#: ../plugins/am-project/am-project.c:1658
-#: ../plugins/am-project/am-project.c:1767
-#: ../plugins/am-project/am-project.c:1843
-#, c-format
-msgid "Project doesn't exist or invalid path"
-msgstr "å°?æ¡?ä¸?å­?å?¨æ??ç?¡æ??ç??è·¯å¾?"
-
-#: ../plugins/dir-project/dir-project.c:773
-#: ../plugins/am-project/am-project.c:91
-#| msgid "Group:"
+#: ../plugins/dir-project/dir-project.c:780
+#: ../plugins/am-project/am-project.c:89
+#: ../plugins/mk-project/mk-project.c:138
 msgid "Group"
 msgstr "群�"
 
-#: ../plugins/dir-project/dir-project.c:776
-#: ../plugins/am-project/am-project.c:98
-#| msgid "Source:"
+#: ../plugins/dir-project/dir-project.c:783
+#: ../plugins/am-project/am-project.c:96
+#: ../plugins/mk-project/mk-project.c:145
 msgid "Source"
 msgstr "��"
 
-#: ../plugins/dir-project/dir-project.c:877
-#: ../plugins/dir-project/dir-project.c:887
+#: ../plugins/dir-project/dir-project.c:899
+#: ../plugins/dir-project/dir-project.c:909
+#: ../plugins/mk-project/mk-project.c:1385
 #, c-format
-#| msgid "Project doesn't exist"
 msgid "Project doesn't allow to set properties"
 msgstr "å°?æ¡?ä¸?å??許設å®?屬æ?§"
 
-#: ../plugins/am-project/am-node.c:750
-msgid "Please specify group name"
-msgstr "è«?æ??å®?群çµ?å??稱"
-
-#: ../plugins/am-project/am-node.c:764
-#| msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
-msgid "Group name can only contain alphanumeric or \"#$:%+,- = ^_`~\" characters"
-msgstr "群çµ?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?æ?? \"#$:%+,- = ^_`~\" å­?å??"
-
-#: ../plugins/am-project/am-node.c:918
-msgid "Please specify target name"
-msgstr "è«?æ??å®?ç?®æ¨?å??稱"
-
-#: ../plugins/am-project/am-node.c:932
-#| msgid ""
-#| "Target name can only contain alphanumeric, '_', '-' or '.' characters"
-msgid "Target name can only contain alphanumeric, '_', '-', '/' or '.' characters"
-msgstr "ç?®æ¨?å??稱å?ªè?½å??å?«è?±æ??å­?æ¯?ã??'_'ã??'-'ã??'/' æ?? '.' å­?å??"
-
-#: ../plugins/am-project/am-node.c:947
-msgid "Shared library target name must be of the form 'libxxx.la'"
-msgstr "å?±äº«ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.laã??"
-
-#: ../plugins/am-project/am-node.c:956
-msgid "Static library target name must be of the form 'libxxx.a'"
-msgstr "é??æ??ç¨?å¼?庫ç??ç?®æ¨?å??稱格å¼?å¿?é ?ç?ºã??libxxx.aã??"
-
-#: ../plugins/am-project/am-project.c:114
+#: ../plugins/am-project/am-project.c:112
 msgid "Shared Library"
 msgstr "�享��庫"
 
-#: ../plugins/am-project/am-project.c:121
+#: ../plugins/am-project/am-project.c:119
 msgid "Static Library"
 msgstr "é??æ??ç¨?å¼?庫"
 
-#: ../plugins/am-project/am-project.c:135
+#: ../plugins/am-project/am-project.c:133
 msgid "Python Module"
 msgstr "Python 模�"
 
-#: ../plugins/am-project/am-project.c:142
+#: ../plugins/am-project/am-project.c:140
 msgid "Java Module"
 msgstr "Java 模�"
 
-#: ../plugins/am-project/am-project.c:149
+#: ../plugins/am-project/am-project.c:147
 msgid "Lisp Module"
 msgstr "Lisp 模�"
 
-#: ../plugins/am-project/am-project.c:156
+#: ../plugins/am-project/am-project.c:154
 msgid "Header Files"
 msgstr "�頭�"
 
-#: ../plugins/am-project/am-project.c:163
+#: ../plugins/am-project/am-project.c:161
 msgid "Man Documentation"
 msgstr "Man æ??件"
 
-#: ../plugins/am-project/am-project.c:170
+#: ../plugins/am-project/am-project.c:168
 msgid "Info Documentation"
 msgstr "Info æ??件"
 
-#: ../plugins/am-project/am-project.c:177
+#: ../plugins/am-project/am-project.c:175
 msgid "Miscellaneous Data"
 msgstr "é??é ?è³?æ??"
 
-#: ../plugins/am-project/am-project.c:184
+#: ../plugins/am-project/am-project.c:182
 msgid "Script"
 msgstr "�令稿"
 
-#: ../plugins/am-project/am-project.c:198
-#| msgid "Packages"
+#: ../plugins/am-project/am-project.c:196
 msgid "Package"
 msgstr "�件"
 
-#: ../plugins/am-project/am-project.c:1644
+#: ../plugins/am-project/am-project.c:1585
 #, c-format
-#| msgid "Unable to update project"
 msgid "Unable to parse project file"
 msgstr "ç?¡æ³?解æ??å°?æ¡?æª?æ¡?"
 
-#: ../plugins/am-project/am-properties.c:46
+#: ../plugins/am-project/am-properties.c:51
+msgid "Project name, it can contain spaces by example 'GNU Autoconf'"
+msgstr "å°?æ¡?å??稱ï¼?å?¯ä»¥å??å?«ç©ºç?½ï¼?å??æ?¯ã??GNU Autoconfã??"
+
+#: ../plugins/am-project/am-properties.c:56
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:26
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:26
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:31
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:46
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:29
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:25
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:27
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:27
@@ -4247,129 +4336,369 @@ msgstr "ç?¡æ³?解æ??å°?æ¡?æª?æ¡?"
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../plugins/am-project/am-properties.c:47
+#: ../plugins/am-project/am-properties.c:59
+msgid ""
+"Project version, typically a few numbers separated by dot by example '1.0.0'"
+msgstr "å°?æ¡?ç??æ?¬ï¼?é??常æ?¯ä»¥é»?å??é??ç??æ?¸å­?ï¼?å??æ?¯ã??1.0.0ã??"
+
+#: ../plugins/am-project/am-properties.c:64
 msgid "Bug report URL:"
 msgstr "é?¯èª¤å ±å?? URLï¼?"
 
-#: ../plugins/am-project/am-properties.c:48
+#: ../plugins/am-project/am-properties.c:67
+msgid ""
+"An email address or a link to a web page where the user can report bug. It "
+"is optional."
+msgstr "è®?使ç?¨è??å?¯ä»¥å??å ±ç¨?å¼?é?¯èª¤ç??é?»å­?é?µä»¶ä½?å??æ??網é ?é?£çµ?ã??é??æ?¯é?¸æ??æ?§ç??ã??"
+
+#: ../plugins/am-project/am-properties.c:72
 msgid "Package name:"
 msgstr "å°?æ¡?å??稱:"
 
-#: ../plugins/am-project/am-properties.c:49
-#: ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/am-project/am-properties.c:75
+msgid ""
+"Package name, it can contains only alphanumerics and underscore characters."
+"It is generated from the project name if not provided."
+msgstr "å¥?件å??稱ï¼?å?ªè?½å??å?«å­?æ¯?å??åº?ç·?å­?å??ã??å¦?æ??ä¸?æ??å®?å°±æ??å¾?å°?æ¡?å??稱ç?¢ç??ã??"
+
+#: ../plugins/am-project/am-properties.c:81
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/am-project/am-properties.c:56
-#: ../plugins/am-project/am-properties.c:75
+#: ../plugins/am-project/am-properties.c:84
+msgid "An link to the project web page if provided."
+msgstr "å°?æ¡?網é ?ç??é?£çµ?ï¼?å¦?æ??æ??æ??ä¾?ç??話ã??"
+
+#: ../plugins/am-project/am-properties.c:97
+#: ../plugins/am-project/am-properties.c:208
+#: ../plugins/am-project/am-properties.c:368
+#: ../plugins/am-project/am-properties.c:520
 msgid "Linker flags:"
 msgstr "é?£çµ?å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:57
-#: ../plugins/am-project/am-properties.c:78
+#: ../plugins/am-project/am-properties.c:100
+msgid "Common additional linker flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤?é?£çµ?å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:105
+#: ../plugins/am-project/am-properties.c:232
+#: ../plugins/am-project/am-properties.c:384
+#: ../plugins/am-project/am-properties.c:536
 msgid "C preprocessor flags:"
 msgstr "C é ?è??ç??å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:58
-#: ../plugins/am-project/am-properties.c:79
+#: ../plugins/am-project/am-properties.c:108
+msgid "Common additional C preprocessor flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? C å??è??ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:113
+#: ../plugins/am-project/am-properties.c:240
+#: ../plugins/am-project/am-properties.c:392
+#: ../plugins/am-project/am-properties.c:544
 msgid "C compiler flags:"
 msgstr "C 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:59
-#: ../plugins/am-project/am-properties.c:80
+#: ../plugins/am-project/am-properties.c:116
+msgid "Common additional C compiler flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:121
+#: ../plugins/am-project/am-properties.c:248
+#: ../plugins/am-project/am-properties.c:400
+#: ../plugins/am-project/am-properties.c:552
 msgid "C++ compiler flags:"
 msgstr "C++ 編譯å?¨æ??æ¨?:"
 
-#: ../plugins/am-project/am-properties.c:60
-#: ../plugins/am-project/am-properties.c:81
-#| msgid "C compiler flags:"
+#: ../plugins/am-project/am-properties.c:124
+msgid "Common additional C++ compiler flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? C++ 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:129
+#: ../plugins/am-project/am-properties.c:256
+#: ../plugins/am-project/am-properties.c:408
+#: ../plugins/am-project/am-properties.c:560
 msgid "Java compiler flags:"
 msgstr "Java 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:61
-#: ../plugins/am-project/am-properties.c:82
-#| msgid "C compiler flags:"
+#: ../plugins/am-project/am-properties.c:132
+msgid "Common additional Java compiler flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Java 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:137
+#: ../plugins/am-project/am-properties.c:264
+#: ../plugins/am-project/am-properties.c:416
+#: ../plugins/am-project/am-properties.c:568
 msgid "Vala compiler flags:"
 msgstr "Vala 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:62
-#: ../plugins/am-project/am-properties.c:83
-#| msgid "Fortran compiler flags:"
-msgid "Fortan compiler flags:"
+#: ../plugins/am-project/am-properties.c:140
+msgid "Common additional Vala compiler flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Vala 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:145
+#: ../plugins/am-project/am-properties.c:272
+#: ../plugins/am-project/am-properties.c:424
+#: ../plugins/am-project/am-properties.c:576
+msgid "Fortran compiler flags:"
 msgstr "Fortran 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:63
-#: ../plugins/am-project/am-properties.c:84
-#| msgid "C compiler flags:"
+#: ../plugins/am-project/am-properties.c:148
+msgid "Common additional Fortran compiler flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Fortran 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:153
+#: ../plugins/am-project/am-properties.c:280
+#: ../plugins/am-project/am-properties.c:432
+#: ../plugins/am-project/am-properties.c:584
 msgid "Objective C compiler flags:"
 msgstr "Objective C 編譯å?¨æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:64
-#: ../plugins/am-project/am-properties.c:85
-#| msgid "Linker flags:"
+#: ../plugins/am-project/am-properties.c:156
+msgid ""
+"Common additional Objective C compiler flags for all targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Objective C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:161
+#: ../plugins/am-project/am-properties.c:288
+#: ../plugins/am-project/am-properties.c:440
+#: ../plugins/am-project/am-properties.c:592
 msgid "Lex/Flex flags:"
 msgstr "Lex/Flex æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:65
-#: ../plugins/am-project/am-properties.c:86
-#| msgid "Linker flags:"
+#: ../plugins/am-project/am-properties.c:164
+msgid ""
+"Common additional Lex or Flex lexical analyser generator flags for all "
+"targets in this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Lex æ?? Flex lexical å??æ??å?¨ç?¢ç??æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:169
+#: ../plugins/am-project/am-properties.c:296
+#: ../plugins/am-project/am-properties.c:448
+#: ../plugins/am-project/am-properties.c:600
 msgid "Yacc/Bison flags:"
 msgstr "Yacc/Bison æ??æ¨?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:66
-msgid "Install directories:"
+#: ../plugins/am-project/am-properties.c:172
+msgid ""
+"Common additional Yacc or Bison parser generator flags for all targets in "
+"this group."
+msgstr "é??å??群çµ?中æ??æ??ç?®æ¨?ç??é??ç?¨é¡?å¤? Yacc æ?? Bison 解æ??å?¨ç?¢ç??æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:177
+msgid "Installation directories:"
 msgstr "å®?è£?ç?®é??ï¼?"
 
-#: ../plugins/am-project/am-properties.c:73
-#| msgid "Do not show tabs"
+#: ../plugins/am-project/am-properties.c:180
+msgid "List of custom installation directories used by targets in this group."
+msgstr "é??å??群çµ?中ç?®æ¨?使ç?¨ç??è?ªè¨?å®?è£?ç?®é??æ¸?å?®ã??"
+
+#: ../plugins/am-project/am-properties.c:192
+#: ../plugins/am-project/am-properties.c:352
+#: ../plugins/am-project/am-properties.c:504
+#: ../plugins/am-project/am-properties.c:687
 msgid "Do not install:"
 msgstr "�����"
 
-#: ../plugins/am-project/am-properties.c:74
-#| msgid "Install directory:"
+#: ../plugins/am-project/am-properties.c:195
+#: ../plugins/am-project/am-properties.c:355
+#: ../plugins/am-project/am-properties.c:507
+#: ../plugins/am-project/am-properties.c:690
+msgid "Build but do not install the target."
+msgstr "çµ?建ä½?ä¸?å®?è£?ç?®æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:200
+#: ../plugins/am-project/am-properties.c:360
+#: ../plugins/am-project/am-properties.c:512
+#: ../plugins/am-project/am-properties.c:695
 msgid "Installation directory:"
 msgstr "å®?è£?ç?®é??ï¼?"
 
-#: ../plugins/am-project/am-properties.c:76
-#| msgid "Add internationalization:"
+#: ../plugins/am-project/am-properties.c:203
+#: ../plugins/am-project/am-properties.c:363
+#: ../plugins/am-project/am-properties.c:515
+#: ../plugins/am-project/am-properties.c:698
+msgid ""
+"It has to be a standard directory or a custom one defined in group "
+"properties."
+msgstr "å®?å¿?é ?æ?¯æ¨?æº?ç??ç?®é??æ??æ?¯å?¨ç¾¤çµ?屬æ?§ä¸­å®?義ç??è?ªè¨?ç?®é??ã??"
+
+#: ../plugins/am-project/am-properties.c:211
+#: ../plugins/am-project/am-properties.c:371
+#: ../plugins/am-project/am-properties.c:523
+msgid "Additional linker flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?é?£çµ?å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:216
 msgid "Additional libraries:"
 msgstr "é¡?å¤?ç??ç¨?å¼?庫ï¼?"
 
-#: ../plugins/am-project/am-properties.c:77
-#| msgid "Add to Project"
+#: ../plugins/am-project/am-properties.c:219
+#: ../plugins/am-project/am-properties.c:379
+#: ../plugins/am-project/am-properties.c:531
+msgid "Additional libraries for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?ç¨?å¼?庫ã??"
+
+#: ../plugins/am-project/am-properties.c:224
 msgid "Additional objects:"
 msgstr "é¡?å¤?ç??ç?©ä»¶ï¼?"
 
-#: ../plugins/am-project/am-properties.c:87
-#: ../plugins/am-project/am-properties.c:97
-#| msgid "Plugin Dependencies:"
+#: ../plugins/am-project/am-properties.c:227
+msgid "Additional object files for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?ç?©ä»¶æª?æ¡?ã??"
+
+#: ../plugins/am-project/am-properties.c:235
+#: ../plugins/am-project/am-properties.c:387
+#: ../plugins/am-project/am-properties.c:539
+msgid "Additional C preprocessor flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? C å??è??ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:243
+#: ../plugins/am-project/am-properties.c:395
+#: ../plugins/am-project/am-properties.c:547
+msgid "Additional C compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:251
+#: ../plugins/am-project/am-properties.c:403
+#: ../plugins/am-project/am-properties.c:555
+msgid "Additional C++ compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? C++ 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:259
+#: ../plugins/am-project/am-properties.c:411
+#: ../plugins/am-project/am-properties.c:563
+msgid "Additional Java compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Java 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:267
+#: ../plugins/am-project/am-properties.c:419
+#: ../plugins/am-project/am-properties.c:571
+msgid "Additional Vala compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Vala 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:275
+#: ../plugins/am-project/am-properties.c:427
+#: ../plugins/am-project/am-properties.c:579
+msgid "Additional Fortran compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Fortran 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:283
+#: ../plugins/am-project/am-properties.c:435
+#: ../plugins/am-project/am-properties.c:587
+msgid "Additional Objective C compiler flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Objective C 編譯å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:291
+#: ../plugins/am-project/am-properties.c:443
+#: ../plugins/am-project/am-properties.c:595
+msgid ""
+"Additional Lex or Flex lexical analyser generator flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Lex æ?? Flex lexical å??æ??å?¨ç?¢ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:299
+#: ../plugins/am-project/am-properties.c:451
+#: ../plugins/am-project/am-properties.c:603
+msgid "Additional Yac or Bison parser generator flags for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤? Yac æ?? Bison 解æ??å?¨ç?¢ç??å?¨æ??æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:304
+#: ../plugins/am-project/am-properties.c:456
+#: ../plugins/am-project/am-properties.c:608
+#: ../plugins/am-project/am-properties.c:656
+#: ../plugins/am-project/am-properties.c:703
 msgid "Additional dependencies:"
 msgstr "é¡?å¤?ç??ç?¸ä¾?æ?§ï¼?"
 
-#: ../plugins/am-project/am-properties.c:88
-#| msgid "Plugin Description:"
+#: ../plugins/am-project/am-properties.c:307
+#: ../plugins/am-project/am-properties.c:459
+#: ../plugins/am-project/am-properties.c:611
+#: ../plugins/am-project/am-properties.c:659
+#: ../plugins/am-project/am-properties.c:706
+msgid "Additional dependencies for this target."
+msgstr "é??å??ç?®æ¨?ç??é¡?å¤?ç?¸ä¾?æ?§ã??"
+
+#: ../plugins/am-project/am-properties.c:312
+#: ../plugins/am-project/am-properties.c:464
+#: ../plugins/am-project/am-properties.c:616
+#: ../plugins/am-project/am-properties.c:711
 msgid "Include in distribution:"
 msgstr "å??å?«æ?¼æ??è¿°ï¼?"
 
-#: ../plugins/am-project/am-properties.c:89
-#| msgid "Build Directory:"
+#: ../plugins/am-project/am-properties.c:315
+#: ../plugins/am-project/am-properties.c:467
+#: ../plugins/am-project/am-properties.c:619
+#: ../plugins/am-project/am-properties.c:714
+msgid "Include this target in the distributed package."
+msgstr "å?¨æ?£å¸?ç??å¥?件中å??å?«é??å??ç?®æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:320
+#: ../plugins/am-project/am-properties.c:472
+#: ../plugins/am-project/am-properties.c:624
+#: ../plugins/am-project/am-properties.c:719
 msgid "Build for check only:"
 msgstr "�編譯�檢����"
 
-#: ../plugins/am-project/am-properties.c:90
-#: ../plugins/am-project/am-properties.c:98
+#: ../plugins/am-project/am-properties.c:323
+#: ../plugins/am-project/am-properties.c:475
+#: ../plugins/am-project/am-properties.c:627
+#: ../plugins/am-project/am-properties.c:722
+msgid "Build this target only when running automatic tests."
+msgstr "å?ªå?¨å?·è¡?è?ªå??測試æ??çµ?建é??å??ç?®æ¨?ã??"
+
+#: ../plugins/am-project/am-properties.c:328
+#: ../plugins/am-project/am-properties.c:480
+#: ../plugins/am-project/am-properties.c:632
+#: ../plugins/am-project/am-properties.c:664
+#: ../plugins/am-project/am-properties.c:727
 msgid "Do not use prefix:"
 msgstr "ä¸?使ç?¨å??綴ï¼?"
 
-#: ../plugins/am-project/am-properties.c:91
+#: ../plugins/am-project/am-properties.c:331
+#: ../plugins/am-project/am-properties.c:483
+#: ../plugins/am-project/am-properties.c:635
+#: ../plugins/am-project/am-properties.c:667
+#: ../plugins/am-project/am-properties.c:730
+msgid ""
+"Do not rename the target with an optional prefix, used to avoid overwritting "
+"system program. "
+msgstr "ä¸?è¦?以é?¸æ??æ?§ç??å??綴é??æ?°å?½å??ç?®æ¨?ï¼?ç?¨ä»¥é?¿å??è¦?è??系統ç¨?å¼?ã??"
+
+#: ../plugins/am-project/am-properties.c:336
+#: ../plugins/am-project/am-properties.c:488
+#: ../plugins/am-project/am-properties.c:640
+#: ../plugins/am-project/am-properties.c:735
 msgid "Keep target path:"
 msgstr "ä¿?ç??ç?®æ¨?è·¯å¾?ï¼?"
 
-#: ../plugins/am-project/am-properties.c:99
-#| msgid "Maximum Actions"
+#: ../plugins/am-project/am-properties.c:339
+#: ../plugins/am-project/am-properties.c:491
+#: ../plugins/am-project/am-properties.c:643
+#: ../plugins/am-project/am-properties.c:738
+msgid ""
+"Keep relative target path for installing it. By example if you have a "
+"program subdir/app installed in bin directory it will be installed in bin/"
+"subdir/app not in bin/app."
+msgstr ""
+"ä¿?æ??å®?è£?ç?®æ¨?ç??ç?¸å°?è·¯å¾?ã??ä¾?å¦?ï¼?æ?¨ç??ç¨?å¼? subdir/app è¦?å®?è£?æ?¼ bin ç?®é??ï¼?å®?æ??被å®?"
+"è£?å?¨ bin/subdir/app è??ä¸?æ?¯ bin/appã??"
+
+#: ../plugins/am-project/am-properties.c:376
+#: ../plugins/am-project/am-properties.c:528
+msgid "Libraries:"
+msgstr "��庫:"
+
+#: ../plugins/am-project/am-properties.c:672
 msgid "Manual section:"
 msgstr "æ??å??ç« ç¯?ï¼?"
 
+#: ../plugins/am-project/am-properties.c:675
+msgid ""
+"Section where are installed the man pages. Valid section names are the "
+"digits â??0â?? through â??9â??, and the letters â??lâ?? and â??nâ??. "
+msgstr ""
+"å®?è£? man pages ç??ç¯?å??ã??æ??æ??ç??ç¯?å??å??稱ç?ºæ?¸å­?ã??0ã??å?°ã??9ã??ï¼?以å??å­?æ¯?ã??lã??å??"
+"ã??nã??ã??"
+
 #: ../plugins/gdb/anjuta-gdb.ui.h:1
 msgid "Available pretty printers"
 msgstr "å?¯ç?¨ç??å?°è¡¨æ©?"
@@ -4524,7 +4853,8 @@ msgstr "å?³é??ä¸?å??è¨?è??給ç¨?åº?æ??ç?¼ç??é?¯èª¤ã??"
 
 #: ../plugins/gdb/plugin.c:118
 #, 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:202
@@ -4539,13 +4869,17 @@ msgstr "ç?¡æ³?é??å??çµ?端æ©?é?²è¡?é?¤é?¯ã??"
 #: ../plugins/gdb/preferences.c:128
 #, c-format
 msgid ""
-"The register function hasn't been found automatically in the following pretty printer files:\n"
+"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\"."
+"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 ""
 "å?¨ä¸?å?? pretty printer files æ²?æ??è?ªå??æ?¾å?°è¨»å??å?½æ?¸ï¼?\n"
 "%s\n"
-"å?¨å??ç?¨é??äº?å??ä¹?å??æ?¨é??è¦?è?ªè¡?填寫註å??å?½æ?¸ç??æ¬?ä½?ã??å?¨å¤§å¤?æ?¸æ??å??註å??å?½æ?¸ç??å??稱æ??å??å?« \"register\" é??å??å­?ã??"
+"å?¨å??ç?¨é??äº?å??ä¹?å??æ?¨é??è¦?è?ªè¡?填寫註å??å?½æ?¸ç??æ¬?ä½?ã??å?¨å¤§å¤?æ?¸æ??å??註å??å?½æ?¸ç??å??稱æ??å??"
+"å?« \"register\" é??å??å­?ã??"
 
 #: ../plugins/gdb/preferences.c:223
 msgid "Select a pretty printer file"
@@ -4561,1817 +4895,814 @@ msgstr "使�"
 msgid "Register Function"
 msgstr "註å??å?½å¼?"
 
-#: ../plugins/gdb/preferences.c:396
-#: ../plugins/gdb/preferences.c:404
+#: ../plugins/gdb/preferences.c:396 ../plugins/gdb/preferences.c:404
 msgid "Gdb Debugger"
 msgstr "Gdb ��工�"
 
 #: ../plugins/git/anjuta-git.ui.h:1
-msgid "Add File"
-msgstr "����"
+msgid "<b>Add Files:</b>"
+msgstr "<b>�����</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:2
-msgid "Add Remote Branch"
-msgstr "å? å?¥é? ç«¯å??æ?¯"
+msgid "<b>Branch name:</b>"
+msgstr "<b>å??æ?¯å??稱ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:3
+msgid "<b>Branches:</b>"
+msgstr "<b>å??æ?¯ï¼?</b>"
 
-#. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
 #: ../plugins/git/anjuta-git.ui.h:4
-msgid "Add signed-off-by line"
-msgstr "å? å?¥ signed-off-by line"
+msgid "<b>Branches</b>"
+msgstr "<b>å??æ?¯</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:5
-msgid "Amend the previous commit"
-msgstr "修正ä¸?ä¸?次æ??交"
+msgid "<b>Commit to cherry pick:</b>"
+msgstr "<b>Commit è?³ cherry pickï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:6
-msgid "Annotate this tag"
-msgstr "å? è¨»é??å??æ¨?籤"
+msgid "<b>Commit to revert:</b>"
+msgstr "<b>Commit ç?º revertï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:7
+msgid "<b>Folder to create patches in:</b>"
+msgstr "<b>ç?¨ä¾?建ç«?ä¿®è£?æª?ç??ç?®é??ï¼?</b>"
 
-#. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
 #: ../plugins/git/anjuta-git.ui.h:8
-msgid "Append fetch data"
-msgstr "æ·»å? å??å??ç??è³?æ??"
+msgid "<b>Generate patches relative to:</b>"
+msgstr "<b>ç?¢ç??ç?¸å°?æ?¼æ­¤ç??ä¿®è£?æª?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:9
-msgid "Apply Stash"
-msgstr "�� Stash"
+msgid "<b>Log Message:</b>"
+msgstr "<b>ç´?é??è¨?æ?¯ï¼?</b>"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/anjuta-git.ui.h:10
-#: ../plugins/git/plugin.c:239
-msgid "Apply mailbox files"
-msgstr "��信箱��"
+msgid "<b>Mailbox files to apply:</b>"
+msgstr "<b>è¦?å¥?ç?¨ç?? Mailbox æª?æ¡?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:11
-msgid "Apply the selected stash"
-msgstr "å¥?ç?¨é?¸å??ç?? stash"
+msgid "<b>Mode:</b>"
+msgstr "<b>模��</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:12
+msgid "<b>Options:</b>"
+msgstr "<b>���</b>"
 
-#. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
 #: ../plugins/git/anjuta-git.ui.h:13
-msgid "Author/Grep"
-msgstr "ä½?è??/Grep"
+msgid "<b>Options</b>"
+msgstr "<b>��</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:14
-#: ../plugins/project-wizard/templates/minimal.wiz.in.h:6
-#: ../plugins/project-wizard/templates/terminal.wiz.in.h:6
-#: ../plugins/project-wizard/templates/cpp.wiz.in.h:6
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:9
-#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:7
-#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:6
-#: ../plugins/project-wizard/templates/xlib.wiz.in.h:8
-#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gcj.wiz.in.h:6
-#: ../plugins/project-wizard/templates/java.wiz.in.h:7
-#: ../plugins/project-wizard/templates/js.wiz.in.h:2
-#: ../plugins/project-wizard/templates/python.wiz.in.h:7
-#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
-#: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
-#: ../plugins/project-wizard/templates/library.wiz.in.h:6
-msgid "Author:"
-msgstr "ä½?è??ï¼?"
+msgid "<b>Remote Repositories:</b>"
+msgstr "<b>�端��庫�</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:15
-msgid "Bad revision:"
-msgstr "ä¸?好ç??ç??æ?¬ï¼?"
+msgid "<b>Remote name:</b>"
+msgstr "<b>é? ç«¯å??稱ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:16
-msgid "Branch name:"
-msgstr "å??æ?¯å??稱ï¼?"
+msgid "<b>Remove Files:</b>"
+msgstr "<b>移����</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:17
-msgid "Branch to switch to:"
-msgstr "è¦?å??æ??å?°å??æ?¯ï¼?"
+msgid "<b>Repository Status:</b>"
+msgstr "<b>æª?æ¡?庫ç??æ??ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:18
-msgid "Branch:"
-msgstr "å??æ?¯ï¼?"
+msgid "<b>Repository to pull from:</b>"
+msgstr "<b>è¦?é?²è¡? pull ç??æª?æ¡?庫ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:19
-msgid "Branches"
-msgstr "å??æ?¯"
+msgid "<b>Repository to push to:</b>"
+msgstr "<b>� push ���庫�</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:20
-msgid "Branches must be fully merged"
-msgstr "å??æ?¯å¿?é ?被å®?æ?´å??ä½µ"
+msgid "<b>Revision to merge with:</b>"
+msgstr "<b>è¦? merge ç?? revisionï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:21
-msgid "Branches to delete:"
-msgstr "è¦?å?ªé?¤ç??å??æ?¯ï¼?"
+msgid "<b>Revision:</b>"
+msgstr "<b>ä¿®è¨?ç??ï¼?</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:22
+msgid "<b>Revision</b>"
+msgstr "<b>ä¿®è¨?ç??</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:23
-#: ../plugins/subversion/anjuta-subversion.ui.h:4
-msgid "Changes:"
-msgstr "è®?æ?´ï¼?"
+msgid "<b>Stash Message (Optional):</b>"
+msgstr "<b>Stash è¨?æ?¯ï¼?é??å¿?è¦?ï¼?ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:24
-msgid "Check Out Files"
-msgstr "å??å?ºæª?æ¡?"
+msgid "<b>Stashed Changes:</b>"
+msgstr "<b>å·² stash ç??è®?æ?´ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:25
-msgid "Check out all local changes"
-msgstr "Check out æ??æ??æ?¬å?°ç«¯ç??è®?æ?´"
+msgid "<b>Tag name:</b>"
+msgstr "<b>æ¨?籤å??稱ï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:26
-msgid "Check out the branch after it is created"
-msgstr "å?¨å??æ?¯å»ºç«?å¾?å??å?ºå®?"
+msgid "<b>Tags:</b>"
+msgstr "<b>�籤�</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:27
-msgid "Cherry Pick"
-msgstr "Cherry Pick"
+msgid "<b>URL:</b>"
+msgstr "<b>URLï¼?</b>"
 
 #: ../plugins/git/anjuta-git.ui.h:28
-msgid "Clear all stashes"
-msgstr "æ¸?é?¤æ??æ?? stash"
+msgid "Add signed off by line"
+msgstr "å? å?¥ signed-off-by line"
 
 #: ../plugins/git/anjuta-git.ui.h:29
-msgid "Column 1"
-msgstr "� 1"
+#, fuzzy
+#| msgid "Amend the previous commit"
+msgid "Amernd the previous commit"
+msgstr "修正ä¸?ä¸?次æ??交"
 
 #: ../plugins/git/anjuta-git.ui.h:30
-#: ../plugins/subversion/anjuta-subversion.ui.h:7
-msgid "Commit Changes"
-msgstr "æ??交修æ?¹"
+msgid "Annotate this tag:"
+msgstr "å? è¨»é??å??æ¨?籤ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:31
-msgid "Commit on fast-forward merges"
-msgstr "å?¨ fast-forward å??ä½µä¸? commit"
+msgid "Append fetch data"
+msgstr "æ·»å? å??å??ç??è³?æ??"
 
 #: ../plugins/git/anjuta-git.ui.h:32
-msgid "Commit to Cherry Pick:"
-msgstr "Commit è?³ Cherry Pickï¼?"
+msgid "Append signed-of- by line"
+msgstr "添� signed-off-by line"
 
 #: ../plugins/git/anjuta-git.ui.h:33
-msgid "Commit to revert:"
-msgstr "è¦?æ??交ç?ºå¾©å??ç??ï¼?"
+msgid "Branch:"
+msgstr "å??æ?¯ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:34
-msgid "Create Branch"
-msgstr "建ç«?å??æ?¯"
+msgid "Branches must be fully merged"
+msgstr "å??æ?¯å¿?é ?被å®?æ?´å??ä½µ"
 
 #: ../plugins/git/anjuta-git.ui.h:35
-msgid "Create Tag"
-msgstr "建��籤"
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
+msgid "Changes:"
+msgstr "è®?æ?´ï¼?"
 
 #: ../plugins/git/anjuta-git.ui.h:36
-msgid "Create patch series"
-msgstr "建ç«?è£?é??ç³»å??"
+msgid "Check out the branch after it is created"
+msgstr "å?¨å??æ?¯å»ºç«?å¾?å??å?ºå®?"
 
 #: ../plugins/git/anjuta-git.ui.h:37
-#: ../plugins/git/git-log-dialog.c:189
-#: ../plugins/subversion/subversion-log-dialog.c:141
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../plugins/git/anjuta-git.ui.h:38
-msgid "Delete Branch"
-msgstr "å?ªé?¤å??æ?¯"
+msgid "Column 0"
+msgstr "� 0"
 
 #: ../plugins/git/anjuta-git.ui.h:39
-msgid "Delete Remote Branch"
-msgstr "å?ªé?¤é? ç«¯å??æ?¯"
+msgid "Commit on fast-forward merges"
+msgstr "å?¨ fast-forward å??ä½µä¸? commit"
 
 #: ../plugins/git/anjuta-git.ui.h:40
-msgid "Delete Tags"
-msgstr "���籤"
-
-#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "ä¸?è¦?æ??交"
 
-#: ../plugins/git/anjuta-git.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not follow tags"
 msgstr "�����籤"
 
-#: ../plugins/git/anjuta-git.ui.h:43
-msgid "Drop the selected stash"
-msgstr "æ?¾æ£?é?¸å??ç?? stash"
-
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "E-mail:"
 msgstr "���件�"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Fetch remote branches after creation"
 msgstr "å?¨å»ºç«?å¾?å??å??é? ç«¯å??æ?¯"
 
-#: ../plugins/git/anjuta-git.ui.h:46
-msgid "Filters"
-msgstr "é??濾æ¢?件"
-
-#: ../plugins/git/anjuta-git.ui.h:47
-msgid "Folder to create patches in:"
-msgstr "ç?¨ä¾?建ç«?ä¿®è£?æª?ç??ç?®é??ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:44
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "å¼·å?¶"
 
-#: ../plugins/git/anjuta-git.ui.h:50
-msgid "From:"
-msgstr "å¾?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:51
-msgid "Generate patches relative to:"
-msgstr "ç?¢ç??ç?¸å°?æ?¼æ­¤ç??ä¿®è£?æª?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:52
-msgid "Good revision:"
-msgstr "è?¯å¥½ç??ç??æ?¬ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:53
-msgid "Grep:"
-msgstr "Grep:"
-
-#: ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Hard"
 msgstr "Hard"
 
-#: ../plugins/git/anjuta-git.ui.h:55
-msgid "Head"
-msgstr "Head"
-
-#: ../plugins/git/anjuta-git.ui.h:56
-msgid "Ignore Files"
-msgstr "忽���:"
-
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:47
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "ç´?é??è¨?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:60
-msgid "Mailbox file containing patches:"
-msgstr "å??å?«ä¿®è£?ç??ä¿¡ç®±æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:61
-msgid "Merge"
-msgstr "å??ä½µ"
-
-#: ../plugins/git/anjuta-git.ui.h:62
+#: ../plugins/git/anjuta-git.ui.h:48
 msgid "Mixed"
 msgstr "æ··å??ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:63
-msgid "Mode:"
-msgstr "模��"
-
-#: ../plugins/git/anjuta-git.ui.h:67
-msgid "Previous commit"
-msgstr "å??ä¸?次æ??交"
-
-#: ../plugins/git/anjuta-git.ui.h:68
-msgid "Pull"
-msgstr "Pull"
-
-#: ../plugins/git/anjuta-git.ui.h:69
-msgid "Push"
-msgstr "Push"
-
-#: ../plugins/git/anjuta-git.ui.h:70
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Push all branches and tags"
 msgstr "Push æ??æ??ç??å??æ?¯è??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:71
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Push all tags"
 msgstr "Push æ??æ??ç??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:53 ../plugins/git/plugin.c:262
 msgid "Rebase"
 msgstr "é??建å?ºç¤?"
 
-#: ../plugins/git/anjuta-git.ui.h:73
-msgid "Remote"
-msgstr "�端"
-
-#: ../plugins/git/anjuta-git.ui.h:74
-msgid "Remote branch to rebase from:"
-msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:75
-msgid "Remote to delete:"
-msgstr "è¦?å?ªé?¤ç??é? ç«¯ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:76
-msgid "Remove File"
-msgstr "移���"
-
-#: ../plugins/git/anjuta-git.ui.h:77
-msgid "Repository origin"
-msgstr "��庫�頭"
-
-#: ../plugins/git/anjuta-git.ui.h:78
-msgid "Repository to pull from:"
-msgstr "è¦?é?²è¡? pull ç??æª?æ¡?庫ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:79
-msgid "Repository to push to:"
-msgstr "� push ���庫�"
-
-#: ../plugins/git/anjuta-git.ui.h:80
-msgid "Reset Tree"
-msgstr "é??設æª?æ¡?樹"
-
-#: ../plugins/git/anjuta-git.ui.h:81
-msgid "Reset to:"
-msgstr "é??設ç?ºï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:82
-msgid "Restore index"
-msgstr "é??å??ç´¢å¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:83
-#: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving statusâ?¦"
-msgstr "æ­£å?¨å??å¾?ç??æ??â?¦"
-
-#: ../plugins/git/anjuta-git.ui.h:84
-msgid "Revert Commit"
-msgstr "å??復æ??交"
-
-#: ../plugins/git/anjuta-git.ui.h:85
-msgid "Revision/Tag:"
-msgstr "ä¿®è¨?ç??/æ¨?籤:"
-
-#: ../plugins/git/anjuta-git.ui.h:87
-msgid "Select Files to Check Out:"
-msgstr "é?¸æ??è¦?å??å??ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:88
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
-msgid "Select Files to Commit:"
-msgstr "é?¸æ??è¦?æ??交ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:89
-msgid "Select Files to Ignore:"
-msgstr "é?¸æ??è¦?忽ç?¥ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:90
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
-msgid "Select Files to Mark as Resolved:"
-msgstr "é?¸æ??è¦?æ¨?è¨?ç?ºå·²è§£æ±ºç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:91
-msgid "Select Files to Unstage:"
-msgstr "é?¸æ??è¦? Unstage ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select Mailbox File"
-msgstr "é?¸æ??ä¿¡ç®±æª?æ¡?"
-
-#: ../plugins/git/anjuta-git.ui.h:93
-msgid "Select a Folder"
-msgstr "é?¸æ??è³?æ??夾"
-
-#: ../plugins/git/anjuta-git.ui.h:94
-msgid "Select file to add:"
-msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:95
-msgid "Select file to remove:"
-msgstr "é?¸æ??è¦?移é?¤ç??æª?æ¡?ï¼?"
+#: ../plugins/git/anjuta-git.ui.h:54
+msgid "Repository head"
+msgstr "��庫 head"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
-msgid "Set Conflicts as Resolved"
-msgstr "���設��已解決"
+#: ../plugins/git/anjuta-git.ui.h:55
+msgid "Repository origin; Drop or type a different revision here"
+msgstr ""
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:57
 msgid "Show source revision in log message"
 msgstr "å?¨ç´?é??è¨?æ?¯ä¸­é¡¯ç¤ºä¾?æº?ç??ä¿®è¨?ç??"
 
-#: ../plugins/git/anjuta-git.ui.h:98
-msgid "Show the contents of the selected stash in an editor"
-msgstr "顯示å?¨ç·¨è¼¯å?¨ä¸­é?¸å?? stash ç??å?§å®¹"
-
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:58
 msgid "Sign this tag"
 msgstr "å? è¨»é??å??æ¨?籤"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Soft"
 msgstr "Soft"
 
-#: ../plugins/git/anjuta-git.ui.h:101
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Squash"
 msgstr "Squash"
 
-#: ../plugins/git/anjuta-git.ui.h:102
-#: ../plugins/git/plugin.c:811
-msgid "Stash"
-msgstr "Stash"
-
-#: ../plugins/git/anjuta-git.ui.h:103
-msgid "Stash Message (Optional)"
-msgstr "Stash è¨?æ?¯ï¼?é??å¿?è¦?ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:104
-msgid "Stash Uncommitted Changes"
-msgstr "Stash æ?ªæ??交ç??è®?æ?´"
-
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Stash indexed changes"
 msgstr "Stash 已索å¼?ç??è®?æ?´"
 
-#: ../plugins/git/anjuta-git.ui.h:106
-msgid "Stash the working tree's uncommitted changes"
-msgstr "Stash working tree 中æ?ªæ??交ç??è®?æ?´"
-
-#: ../plugins/git/anjuta-git.ui.h:107
-msgid "Stash to Apply"
-msgstr "è¦?å¥?ç?¨ç?? Stash"
-
-#: ../plugins/git/anjuta-git.ui.h:108
-msgid "Switch to Another Branch"
-msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
-
-#: ../plugins/git/anjuta-git.ui.h:109
-msgid "Tag name:"
-msgstr "æ¨?籤å??稱ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:110
-msgid "Tag/Commit"
-msgstr "æ¨?籤/æ??交"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:111
-#: ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "�籤"
-
-#: ../plugins/git/anjuta-git.ui.h:112
-msgid "Tags to delete:"
-msgstr "è¦?å?ªé?¤ç??æ¨?籤ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:113
-msgid "This commit concludes a failed merge (use -i)"
+#: ../plugins/git/anjuta-git.ui.h:62
+msgid "This commit concludes a failed merged (use -i)"
 msgstr "é??次æ??交ç?±æ?¼å??併失æ??è??çµ?æ­¢ï¼?使ç?¨ -iï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:115
-msgid "To:"
-msgstr "å?°ï¼?"
-
-#: ../plugins/git/anjuta-git.ui.h:116
-msgid "URL"
-msgstr "網å??"
-
-#: ../plugins/git/anjuta-git.ui.h:118
-msgid "Unstage Files"
-msgstr "Unstage ��"
-
-#: ../plugins/git/anjuta-git.ui.h:119
-msgid "Use a custom log message"
-msgstr "使ç?¨è?ªè¨?ç??ç´?é??è¨?æ?¯"
+#: ../plugins/git/anjuta-git.ui.h:63
+msgid "Use a custom log message:"
+msgstr "使ç?¨è?ªè¨?ç??ç´?é??è¨?æ?¯ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:64
 msgid "Use custom author information:"
 msgstr "使ç?¨è?ªè¨?ç??ä½?è??è³?è¨?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:121
-msgid "View log"
-msgstr "檢è¦?ç´?é??"
-
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:65
 #: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "檢è¦?æª?æ¡?/è³?æ??夾ç??ç´?é??æª?ï¼?"
 
-#: ../plugins/git/anjuta-git.ui.h:124
+#: ../plugins/git/anjuta-git.ui.h:66
+msgid ""
+"Whole project; Drop a file here or type a path to view a file or folder log"
+msgstr ""
+
+#: ../plugins/git/anjuta-git.ui.h:67
+msgid "Whole project; Drop a file here to view a file or folder log"
+msgstr ""
+
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "page 1"
 msgstr "é ? 1"
 
-#: ../plugins/git/anjuta-git.ui.h:125
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "page 2"
 msgstr "é ? 2"
 
-#: ../plugins/git/anjuta-git.ui.h:126
-msgid "page 3"
-msgstr "é ? 3"
-
-#: ../plugins/git/git-add-dialog.c:36
-msgid "Git: File staged for add."
-msgstr ""
-
-#: ../plugins/git/git-add-dialog.c:62
-#: ../plugins/git/git-remove-dialog.c:63
-msgid "Please select a file."
-msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
+#: ../plugins/git/git-add-files-pane.c:157
+msgid "Add Files"
+msgstr "����"
 
-#: ../plugins/git/git-add-remote-dialog.c:41
-#, c-format
-msgid "Git: Added remote branch \"%s\"."
-msgstr "Gitï¼?å? å?¥é? ç«¯å??æ?¯ã??%sã??ã??"
+#: ../plugins/git/git-add-remote-pane.c:52
+msgid "Please enter a remote name."
+msgstr "è«?輸å?¥é? ç«¯å??稱ã??"
 
-#: ../plugins/git/git-add-remote-dialog.c:81
-#: ../plugins/git/git-create-branch-dialog.c:117
-msgid "Please enter a branch name."
-msgstr "è«?輸å?¥å??æ?¯å??稱ã??"
+#: ../plugins/git/git-add-remote-pane.c:55
+msgid "Please enter a URL"
+msgstr "�輸� URL"
 
-#: ../plugins/git/git-add-remote-dialog.c:91
-msgid "Please enter a URL."
-msgstr "è«?輸å?¥ URLã??"
+#: ../plugins/git/git-add-remote-pane.c:179
+msgid "Add Remote"
+msgstr "���端"
 
-#: ../plugins/git/git-add-remote-dialog.c:111
-#: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetchingâ?¦"
-msgstr "Gitï¼?æ­£å?¨å??å??â?¦"
-
-#: ../plugins/git/git-apply-mailbox-dialog.c:45
-msgid "Please select a mailbox file."
-msgstr "è«?é?¸æ??ä¸?å??ä¿¡ç®±æª?æ¡?ã??"
-
-#: ../plugins/git/git-bisect-dialog.c:54
-#: ../plugins/git/git-cherry-pick-dialog.c:52
-#: ../plugins/git/git-create-branch-dialog.c:99
-#: ../plugins/git/git-create-tag-dialog.c:102
-#: ../plugins/git/git-reset-dialog.c:57
-#: ../plugins/git/git-revert-dialog.c:46
-#: ../plugins/subversion/subversion-copy-dialog.c:207
-#: ../plugins/subversion/subversion-switch-dialog.c:122
-msgid "Please enter a revision."
-msgstr "è«?輸å?¥ä¿®è¨?ç??ã??"
+#: ../plugins/git/git-apply-mailbox-pane.c:157
+msgid "Apply Mailbox Files"
+msgstr "�� Mailbox ��"
 
-#: ../plugins/git/git-cat-file-menu.c:36
-msgid "Git: File retrieved."
-msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+#: ../plugins/git/git-apply-stash-pane.c:54
+#: ../plugins/git/git-diff-stash-pane.c:67
+#: ../plugins/git/git-drop-stash-pane.c:48
+msgid "No stash selected."
+msgstr "å°?æ?ªé?¸å?? stashã??"
 
-#: ../plugins/git/git-checkout-files-dialog.c:36
-msgid "Git: Files checked out."
-msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+#: ../plugins/git/git-checkout-pane.c:147
+msgid "Check Out Files"
+msgstr "å??å?ºæª?æ¡?"
 
-#: ../plugins/git/git-commit-dialog.c:36
-msgid "Git: Commit complete."
-msgstr "Gitï¼?æ??交å®?æ??ã??"
+#: ../plugins/git/git-commit-pane.c:123
+#: ../plugins/git/git-create-tag-pane.c:95 ../plugins/git/git-merge-pane.c:70
+msgid "Please enter a log message."
+msgstr "è«?輸å?¥ç´?é??è¨?æ?¯ã??"
 
-#: ../plugins/git/git-commit-dialog.c:105
-msgid "Please enter the commit author's name."
+#: ../plugins/git/git-commit-pane.c:144
+msgid "Please enter the commit author's name"
 msgstr "è«?輸å?¥æ??交ä½?è??ç??å??稱ã??"
 
-#: ../plugins/git/git-commit-dialog.c:115
+#: ../plugins/git/git-commit-pane.c:148
 msgid "Please enter the commit author's e-mail address."
 msgstr "è«?輸å?¥æ??交ä½?è??ç??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../plugins/git/git-create-branch-dialog.c:41
-#, c-format
-msgid "Git: Created branch \"%s\"."
-msgstr "Gitï¼?已建ç«?å??æ?¯ã??%sã??ã??"
-
-#: ../plugins/git/git-create-tag-dialog.c:41
-#, c-format
-msgid "Git: Created tag \"%s\"."
-msgstr "Gitï¼?已建ç«?æ¨?籤ã??%sã??ã??"
+#: ../plugins/git/git-commit-pane.c:304 ../plugins/git/plugin.c:146
+msgid "Commit"
+msgstr "Commit"
 
-#: ../plugins/git/git-create-tag-dialog.c:111
-msgid "Please enter a tag name."
-msgstr "è«?輸å?¥æ¨?籤å??稱ã??"
+#: ../plugins/git/git-cherry-pick-pane.c:53
+#: ../plugins/git/git-create-tag-pane.c:80 ../plugins/git/git-merge-pane.c:56
+#: ../plugins/subversion/subversion-copy-dialog.c:207
+#: ../plugins/subversion/subversion-switch-dialog.c:122
+msgid "Please enter a revision."
+msgstr "è«?輸å?¥ä¿®è¨?ç??ã??"
 
-#: ../plugins/git/git-delete-branch-dialog.c:37
-msgid "Git: Deleted selected branches."
-msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
+#: ../plugins/git/git-cherry-pick-pane.c:173
+msgid "Cherry Pick"
+msgstr "Cherry Pick"
 
-#: ../plugins/git/git-delete-branch-dialog.c:106
-msgid "Please select branches to delete"
-msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
+#: ../plugins/git/git-diff-pane.c:103
+msgid "No revision selected"
+msgstr "å°?æ?ªé?¸æ??ä¿®è¨?ç??"
 
-#: ../plugins/git/git-delete-tag-dialog.c:37
-msgid "Git: Deleted selected tags."
-msgstr "Gitï¼?å·²å?ªé?¤é?¸å??ç??å??æ?¯ã??"
+#: ../plugins/git/git-reset-pane.c:167
+msgid "Reset"
+msgstr "Reset"
 
-#. Translators: default file name for git diff's output
-#: ../plugins/git/git-diff-dialog.c:42
-#| msgid "Stash Uncommitted Changes"
-msgid "Uncommitted Changes.diff"
-msgstr "Uncommitted Changes.diff"
+#: ../plugins/git/git-revert-pane.c:48
+msgid "Please enter a commit."
+msgstr "è«?輸å?¥ä¸?次æ??交ã??"
 
-#. Translators: file name for an existing commits diff, %s is an SHASUM of a commit
-#: ../plugins/git/git-diff-dialog.c:77
-#, c-format
-#| msgid "_Show commit diff"
-msgid "Commit %s.diff"
-msgstr "Commit %s.diff"
+#: ../plugins/git/git-revert-pane.c:162
+msgid "Revert"
+msgstr "Revert"
 
-#: ../plugins/git/git-fetch-dialog.c:40
-msgid "Git: Fetch complete."
-msgstr "Gitï¼?å??å??å·²å®?æ??ã??"
-
-#: ../plugins/git/git-log-dialog.c:152
-msgid "Graph"
-msgstr "å??表"
+#: ../plugins/git/git-create-branch-pane.c:51
+msgid "Please enter a branch name."
+msgstr "è«?輸å?¥å??æ?¯å??稱ã??"
 
-#: ../plugins/git/git-log-dialog.c:167
-msgid "Short log"
-msgstr "ç?­ç´?é??"
+#: ../plugins/git/git-create-tag-pane.c:66
+msgid "Please enter a tag name."
+msgstr "è«?輸å?¥æ¨?籤å??稱ã??"
 
-#: ../plugins/git/git-log-dialog.c:178
-#: ../plugins/subversion/subversion-log-dialog.c:132
-msgid "Author"
-msgstr "ä½?è??"
+#: ../plugins/git/git-create-tag-pane.c:243
+msgid "Create Tag"
+msgstr "建��籤"
 
-#: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving logâ?¦"
-msgstr "Gitï¼?æ­£å?¨å??å??ç´?é??æª?â?¦"
+#: ../plugins/git/git-delete-remote-pane.c:49
+msgid "No remote selected."
+msgstr "å°?æ?ªé?¸å??é? ç«¯ã??"
 
-#: ../plugins/git/git-log-dialog.c:360
-#: ../plugins/subversion/subversion-add-dialog.c:65
-#: ../plugins/subversion/subversion-diff-dialog.c:116
-#: ../plugins/subversion/subversion-remove-dialog.c:98
-#: ../plugins/subversion/subversion-update-dialog.c:68
-msgid "Please enter a path."
-msgstr "è«?輸å?¥è·¯å¾?ã??"
+#: ../plugins/git/git-delete-tags-pane.c:49
+msgid "No tags selected."
+msgstr "å°?æ?ªé?¸å??æ¨?籤ã??"
 
-#: ../plugins/git/git-log-dialog.c:399
-msgid "Select a file"
-msgstr "é?¸æ??æª?æ¡?"
+#: ../plugins/git/git-diff-stash-pane.c:40
+#, c-format
+msgid "Stash %i.diff"
+msgstr "Stash %i.diff"
 
-#: ../plugins/git/git-log-dialog.c:546
+#: ../plugins/git/git-log-pane.c:560
 #, c-format
 msgid "<b>Branch:</b> %s"
 msgstr "<b>å??æ?¯:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:551
+#: ../plugins/git/git-log-pane.c:565
 #, c-format
 msgid "<b>Tag:</b> %s"
 msgstr "<b>�籤:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:556
+#: ../plugins/git/git-log-pane.c:570
 #, c-format
 msgid "<b>Remote:</b> %s"
 msgstr "<b>�端:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:849
-#: ../plugins/git/plugin.c:674
-#: ../plugins/git/plugin.c:867
-msgid "Branch"
-msgstr "å??æ?¯"
+#: ../plugins/git/git-merge-pane.c:222 ../plugins/git/plugin.c:97
+msgid "Merge"
+msgstr "å??ä½µ"
 
-#: ../plugins/git/git-merge-dialog.c:36
-msgid "Git: Merge complete."
-msgstr "Gitï¼?å??ä½µå®?æ??ã??"
-
-#: ../plugins/git/git-pull-dialog.c:36
-msgid "Git: Pull complete."
-msgstr "Gitï¼? Pull å·²å®?æ??ã??"
-
-#. The "input widget" is the widget that should receive focus if the
-#. * user does not properly enter anything
-#: ../plugins/git/git-pull-dialog.c:124
-msgid "Please select a remote to pull from."
-msgstr "è«?輸å?¥è¦? pull ç??é? ç«¯ã??"
-
-#: ../plugins/git/git-pull-dialog.c:142
-msgid "Please enter the URL of the repository to pull from."
-msgstr "è«?輸å?¥è¦? pull ç??æª?æ¡?庫 URLã??"
-
-#: ../plugins/git/git-push-dialog.c:36
-msgid "Git: Push complete."
-msgstr "Git: Push complete."
-
-#. The "input widget" is the widget that should receive focus if the
-#. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:144
-msgid "Please select a remote to push to."
-msgstr "è«?é?¸æ??è¦? push ç??é? ç«¯ã??"
-
-#: ../plugins/git/git-push-dialog.c:162
-msgid "Please enter the URL of the repository to push to."
-msgstr "è«?輸å?¥è¦? push å?°ç??æª?æ¡?庫 URLã??"
-
-#: ../plugins/git/git-push-dialog.c:197
-msgid "Git: Pushingâ?¦"
-msgstr "Gitï¼?Pushingâ?¦"
-
-#: ../plugins/git/git-rebase-dialog.c:60
-msgid "Git: Rebasing"
-msgstr "Gitï¼?æ­£å?¨é??è¨?å?ºç¤?"
-
-#: ../plugins/git/git-remove-dialog.c:36
-msgid "Git: File removed."
-msgstr "Gitï¼?æª?æ¡?已移é?¤ã??"
-
-#: ../plugins/git/git-resolve-dialog.c:36
-msgid "Git: Resolve complete."
-msgstr "Gitï¼?調解已å®?æ??ã??"
-
-#: ../plugins/git/git-stash-widget.c:219
-msgid "Git: Stash dropped."
-msgstr "Gitï¼?Stash å·²æ?¾æ£?ã??"
-
-#: ../plugins/git/git-stash-widget.c:275
-msgid "Git: All stashes cleared."
-msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
-
-#: ../plugins/git/git-switch-dialog.c:36
-msgid "Git: Branch checkout complete."
-msgstr "Gitï¼?å??å??å??æ?¯å®?æ??ã??"
-
-#: ../plugins/git/git-ui-utils.c:89
-#: ../plugins/git/git-ui-utils.c:94
-#: ../plugins/git/git.plugin.in.h:1
+#: ../plugins/git/git-pane.c:77 ../plugins/git/git-pane.c:82
+#: ../plugins/git/plugin.c:700 ../plugins/git/git.plugin.in.h:1
 msgid "Git"
 msgstr "Git"
 
-#: ../plugins/git/git-ui-utils.c:158
-msgid "There are no branches available."
-msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
+#: ../plugins/git/git-pane.c:204
+msgid "Git Error"
+msgstr "Git �誤"
 
-#: ../plugins/git/git-ui-utils.c:194
-msgid "Please select a stash"
-msgstr "è«?é?¸æ??ä¸?å?? stash"
+#: ../plugins/git/git-pane.c:210
+msgid "Git Warning"
+msgstr "Git è­¦å??"
 
-#: ../plugins/git/git-ui-utils.c:603
-msgid "Git: Changes stored in a stash."
-msgstr "Gitï¼?å?²å­?å?¨ stash ç??è®?æ?´ã??"
+#: ../plugins/git/git-patch-series-pane.c:167
+msgid "Generate Patch Series"
+msgstr "建ç«?ä¿®è£?æª?ç³»å??"
 
-#: ../plugins/git/git-ui-utils.c:619
-msgid "Git: Stashed changes applied."
-msgstr "Gitï¼?å¥?ç?¨å·² stash ç??è®?æ?´ã??"
+#: ../plugins/git/git-pull-pane.c:66 ../plugins/git/git-push-pane.c:94
+msgid "Please enter a URL."
+msgstr "è«?輸å?¥ URLã??"
 
-#: ../plugins/git/git-ui-utils.c:743
-msgid "Git: Diff complete."
-msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
+#: ../plugins/git/git-pull-pane.c:235 ../plugins/git/plugin.c:246
+msgid "Pull"
+msgstr "Pull"
 
-#: ../plugins/git/git-ui-utils.c:759
-#, c-format
-msgid "Column %i"
-msgstr "� %i"
+#: ../plugins/git/git-push-pane.c:434 ../plugins/git/plugin.c:238
+msgid "Push"
+msgstr "Push"
 
-#: ../plugins/git/git-unstage-dialog.c:36
-msgid "Git: Files unstaged."
-msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
+#: ../plugins/git/git-rebase-pane.c:61
+msgid "No remote selected"
+msgstr "å°?æ?ªé?¸å??é? ç«¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:68
-#: ../plugins/git/plugin.c:575
-msgid "_Git"
-msgstr "_Git"
+#: ../plugins/git/git-remove-files-pane.c:157
+msgid "Remove Files"
+msgstr "移���"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:79
-msgid "_Changes"
-msgstr "è®?æ?´(_C)"
+#: ../plugins/git/git-repository-selector.c:66
+msgid "Remote"
+msgstr "�端"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:87
-#: ../plugins/subversion/plugin.c:76
-msgid "_Commitâ?¦"
-msgstr "_Commitâ?¦"
+#: ../plugins/git/git-repository-selector.c:81
+msgid "URL"
+msgstr "網å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:89
-msgid "Commit changes to the local repository"
-msgstr "æ??交è®?æ?´è?³æ?¬å?°ç«¯æª?æ¡?庫"
+#: ../plugins/git/git-repository-selector.c:100
+msgid "<b>Selected Remote:</b>"
+msgstr "<b>é?¸å??ç??é? ç«¯ï¼?</b>"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:95
-msgid "_Diff uncommitted changes"
-msgstr "_Diff uncommitted changes"
+#: ../plugins/git/git-repository-selector.c:199
+msgid ""
+"No remote selected; using origin by default.\n"
+"To push to a different remote, select one from the Remotes list above."
+msgstr ""
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:97
-msgid "Show uncommitted changes"
-msgstr "顯示æ?ªæ??交ç??è®?æ?´"
+#: ../plugins/git/git-resolve-conflicts-pane.c:50
+msgid "No conflicted files selected."
+msgstr "æ²?æ??é?¸å??è¡?çª?ç??æª?æ¡?ã??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:103
-msgid "_Stash"
-msgstr "_Stash"
+#: ../plugins/git/git-stash-changes-pane.c:158
+msgid "Stash Uncommitted Changes"
+msgstr "Stash æ?ªæ??交ç??è®?æ?´"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changesâ?¦"
-msgstr "_Stash æ?ªæ??交ç??è®?æ?´â?¦"
+#: ../plugins/git/git-status-pane.c:368
+msgid "Changes to be committed"
+msgstr "è¦?æ??交ç??æ?¹è®?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:113
-msgid "Save uncommitted changes and re-apply them later"
-msgstr "å°?æ?ªæ??交ç??è®?æ?´å?²å­?並å?¨ç¨?å¾?é??æ?°å¥?ç?¨å®?å??"
+#: ../plugins/git/git-status-pane.c:377
+msgid "Changed but not updated"
+msgstr "已�������"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changesâ?¦"
-msgstr "��已 stash ��(_A)�"
+#: ../plugins/git/git-unstage-pane.c:51
+msgid "No staged files selected."
+msgstr "å°?æ?ªé?¸æ??å·² stage æª?æ¡?ã??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:121
-msgid "Apply stashed changes to the working tree"
-msgstr "å¥?ç?¨å·² stash ç??è®?æ?´å?° working tree"
+#: ../plugins/git/plugin.c:65
+msgid "Branch tools"
+msgstr "å??æ?¯å·¥å?·"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:127
-#: ../plugins/git/plugin.c:583
-msgid "_View logâ?¦"
-msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
+#: ../plugins/git/plugin.c:73 ../plugins/git/plugin.c:74
+msgid "Create a branch"
+msgstr "建ç«?å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:129
-msgid "View change history"
-msgstr "檢è¦?è®?æ?´æ­·å?²ç´?é??"
+#: ../plugins/git/plugin.c:81 ../plugins/git/plugin.c:82
+msgid "Delete selected branches"
+msgstr "è¦?å?ªé?¤ç??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:135
-msgid "_Remote repository"
-msgstr "�端��庫(_R)"
+#: ../plugins/git/plugin.c:89 ../plugins/git/plugin.c:90
+msgid "Switch to the selected branch"
+msgstr "å??æ??è?³é?¸å??ç??å??æ?¯"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:143
-msgid "_Pushâ?¦"
-msgstr "_Pushâ?¦"
+#: ../plugins/git/plugin.c:98
+msgid "Merge a revision into the current branch"
+msgstr "å°?ä¿®è¨?ç??å??ä½µå?°ç?®å??ç??å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:145
-msgid "Push changes to a remote repository"
-msgstr "��� push ��端��庫"
+#: ../plugins/git/plugin.c:109
+msgid "Tag tools"
+msgstr "�籤工�"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:151
-msgid "_Pullâ?¦"
-msgstr "_Pullâ?¦"
+#: ../plugins/git/plugin.c:117 ../plugins/git/plugin.c:118
+msgid "Create a tag"
+msgstr "建��籤"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:153
-msgid "Update the working copy"
-msgstr "��工���"
+#: ../plugins/git/plugin.c:125 ../plugins/git/plugin.c:126
+msgid "Delete selected tags"
+msgstr "è¦?å?ªé?¤ç??æ¨?籤"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:159
-msgid "_Fetch"
-msgstr "_Fetch"
+#: ../plugins/git/plugin.c:138
+msgid "Changes"
+msgstr "è®?æ?´"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:161
-msgid "Update remote branches"
-msgstr "æ?´æ?°é? ç«¯å??æ?¯"
+#: ../plugins/git/plugin.c:147
+msgid "Commit changes"
+msgstr "æ??交è®?æ?´"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:167
-msgid "_Files"
-msgstr "��(_F)"
+#: ../plugins/git/plugin.c:154
+msgid "Diff uncommitted changes"
+msgstr "æ¯?å°?æ?ªæ??交ç??è®?æ?´"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:175
-#: ../plugins/git/plugin.c:375
-#: ../plugins/git/plugin.c:591
-#: ../plugins/subversion/plugin.c:60
-#: ../plugins/subversion/plugin.c:175
-msgid "_Addâ?¦"
-msgstr "å? å?¥(_A)â?¦"
+#: ../plugins/git/plugin.c:155
+msgid "Show a diff of uncommitted changes in an editor"
+msgstr "å?¨ç·¨è¼¯å?¨é¡¯ç¤ºæ?ªæ??交è®?æ?´ç??å·®ç?°"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:177
-msgid "Add files to the repository"
-msgstr "�������庫"
+#: ../plugins/git/plugin.c:170
+#: ../plugins/snippets-manager/snippets-editor.ui.h:3
+msgid "Add"
+msgstr "å? å?¥"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:183
-#: ../plugins/git/plugin.c:599
-#: ../plugins/subversion/plugin.c:68
-#: ../plugins/subversion/plugin.c:183
-msgid "_Removeâ?¦"
-msgstr "移�(_R)�"
+#: ../plugins/git/plugin.c:171
+msgid "Add files to the index"
+msgstr "�����索�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:185
+#: ../plugins/git/plugin.c:179
 msgid "Remove files from the repository"
 msgstr "���庫移���"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:191
-msgid "_Ignoreâ?¦"
-msgstr "忽�(_I)�"
+#: ../plugins/git/plugin.c:186
+msgid "Check out"
+msgstr "Check out"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:193
-msgid "Ignore files"
-msgstr "忽���"
+#: ../plugins/git/plugin.c:187
+msgid "Revert changes in unstaged files"
+msgstr "å°?æ?ª stage æª?æ¡?ç??è®?æ?´é??å??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:199
-msgid "_Check out filesâ?¦"
-msgstr "_Check out ���"
+#: ../plugins/git/plugin.c:194
+msgid "Unstage"
+msgstr "Unstage"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:201
-msgid "Revert uncommitted changes to files"
-msgstr "å°?æ?ªæ??交ç??è®?æ?´é??å??ç?ºæª?æ¡?"
+#: ../plugins/git/plugin.c:195
+msgid "Remove staged files from the index"
+msgstr "å¾?ç´¢å¼?中移é?¤å·² stage ç??æª?æ¡?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:207
-msgid "_Unstage filesâ?¦"
-msgstr "��� _Unstage�"
+#: ../plugins/git/plugin.c:202
+msgid "Resolve conflicts"
+msgstr "Resolve conflicts"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:209
-msgid "Remove files from the commit index"
-msgstr "å¾?æ??交索å¼?中移é?¤æª?æ¡?"
+#: ../plugins/git/plugin.c:203
+msgid "Mark selected conflicted files as resolved"
+msgstr "å°?é?¸å??ç??è¡?çª?æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:215
-msgid "_Resolve conflictsâ?¦"
-msgstr "_Resolve conflictsâ?¦"
+#: ../plugins/git/plugin.c:214
+msgid "Remote repository tools"
+msgstr "�端��庫工�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:217
-msgid "Mark conflicted files as resolved"
-msgstr "å°?è¡?çª?ç??æª?æ¡?æ¨?è¨?ç?ºå·²è§£æ±º"
+#: ../plugins/git/plugin.c:222
+msgid "Add a remote"
+msgstr "���端"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:223
-#: ../plugins/patch/patch-plugin.c:117
-msgid "Patches"
-msgstr "修�"
+msgid "Add a remote repository"
+msgstr "���端��庫"
+
+#: ../plugins/git/plugin.c:230
+msgid "Delete selected remote"
+msgstr "å?ªé?¤é?¸å??ç??é? ç«¯"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch seriesâ?¦"
-msgstr "建� patch series�"
+msgid "Delete a remote"
+msgstr "���端"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:233
-msgid "Generate patch files for submission upstream"
-msgstr "å¾?æ??交ä¸?游ç?¢ç??ä¿®è£?æª?æ¡?"
+#: ../plugins/git/plugin.c:239
+msgid "Push changes to a remote repository"
+msgstr "��� push ��端��庫"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Applyâ?¦"
-msgstr "��(_A)�"
+msgid "Pull changes from a remote repository"
+msgstr "��端��庫 pull ��"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:249
-msgid "Start applying a patch series"
-msgstr "é??å§?å¥?ç?¨ patch series"
+#: ../plugins/git/plugin.c:254
+msgid "Fetch"
+msgstr "Fetch"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:255
-msgid "_Continue with resolved conflicts"
-msgstr "以解決å¾?ç??è¡?çª?ç¹¼çº?(_C)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:257
-msgid "Continue applying a series after resolving conflicts"
-msgstr "�解決���繼��� series"
+msgid "Fetch changes from remote repositories"
+msgstr "��端��庫 fetch ��"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:263
-msgid "_Skip current patch"
-msgstr "忽ç?¥ç?®å??ç??ä¿®è£?æª?(_S)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:265
-msgid "Skip the current patch in the series and continue"
-msgstr "ç?¥é??ç?®å?? series 中ç?? patch 並繼çº?"
+#: ../plugins/git/plugin.c:270
+#, fuzzy
+msgid "Rebase against selected remote"
+msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:271
-#: ../plugins/git/plugin.c:351
-msgid "_Abort"
-msgstr "_Abort"
+msgid "Start a rebase operation relative to the selected remote repository"
+msgstr "å°?é?¸å??ç??é? ç«¯æª?æ¡?庫å??å??ç?¸å°?ç?? rebase æ??ä½?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:273
-msgid "Stop applying the series and return the repository to its original state"
-msgstr "å??æ­¢å¥?ç?¨é??å?? series 並å°?æª?æ¡?庫å??復å?°å??ä¾?ç??ç??æ??"
+#: ../plugins/git/plugin.c:278 ../plugins/git/plugin.c:446
+msgid "Continue"
+msgstr "Continue"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:279
-msgid "_Branches"
-msgstr "å??æ?¯(_B)"
+msgid "Continue a rebase with resolved conflicts"
+msgstr "以解決å¾?ç??è¡?çª?ç¹¼çº? rebase"
+
+#: ../plugins/git/plugin.c:286 ../plugins/git/plugin.c:454
+msgid "Skip"
+msgstr "Skip"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:287
-#: ../plugins/git/plugin.c:507
-msgid "_Create branchâ?¦"
-msgstr "建� bran_ch�"
+msgid "Skip the current revision"
+msgstr "忽ç?¥ç?®å??ç??ä¿®è¨?ç??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:289
-msgid "Create a branch"
-msgstr "建ç«?å??æ?¯"
+#: ../plugins/git/plugin.c:294 ../plugins/git/plugin.c:462
+msgid "Abort"
+msgstr "Abort"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:295
-msgid "_Delete branchâ?¦"
-msgstr "�� branch(_D)�"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:297
-msgid "Delete branches"
-msgstr "å?ªé?¤å??æ?¯"
+msgid "Abort the rebase and return the repository to its previous state"
+msgstr "中止 rebase 並å°?æª?æ¡?庫設å??å??ä¸?å??ç??æ??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:303
-msgid "_Switch to another branchâ?¦"
-msgstr "å??æ??è?³å?¦ä¸?å?? branch(_S)â?¦"
+#: ../plugins/git/plugin.c:306
+msgid "Stash tools"
+msgstr "Stash 工�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:305
-msgid "Switch to another branch"
-msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
+#: ../plugins/git/plugin.c:314
+msgid "Stash uncommitted changes"
+msgstr "Stash uncommitted changes"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:311
-msgid "_Mergeâ?¦"
-msgstr "_Mergeâ?¦"
+#: ../plugins/git/plugin.c:315
+msgid "Save uncommitted changes without committing them"
+msgstr "å°?æ?ªæ??交ç??è®?æ?´å?²å­?è??ä¸?æ??交å®?å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:313
-msgid "Merge changes from another branch into the current one"
-msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µè®?æ?´è?³ç?®å??ç??å??æ?¯"
+#: ../plugins/git/plugin.c:322
+msgid "Apply selected stash"
+msgstr "å¥?ç?¨é?¸å??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:319
-msgid "_Rebase"
-msgstr "_Rebase"
+#: ../plugins/git/plugin.c:323
+msgid "Apply stashed changes back into the working tree"
+msgstr "å¥?ç?¨å·² stash ç??è®?æ?´å?° working tree"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:321
-msgid "Merge your changes with an upstream remote branch"
-msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+#: ../plugins/git/plugin.c:330
+msgid "Apply stash and restore index"
+msgstr "å¥?ç?¨ stash 並é??å??ç´¢å¼?"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:327
-#: ../plugins/git/plugin.c:447
-msgid "_Startâ?¦"
-msgstr "é??å§?(_S)â?¦"
+#: ../plugins/git/plugin.c:331
+msgid "Apply stashed changes back into the working tree and the index"
+msgstr "å¥?ç?¨å·² stash ç??è®?æ?´å?° working tree è??ç´¢å¼?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:329
-msgid "Start a rebase"
-msgstr "é??å§? rebase"
+#: ../plugins/git/plugin.c:338
+msgid "Diff selected stash"
+msgstr "æ¯?å°?é?¸å??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:335
-msgid "_Continue"
-msgstr "_Continue"
+#: ../plugins/git/plugin.c:339
+msgid "Show a diff of the selected stash"
+msgstr "顯示é?¸å??ç?? stash"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:337
-msgid "Continue a rebase that stopped because of conflicts"
-msgstr "ç¹¼çº?å? è¡?çª?è??å??æ­¢ç?? rebase"
+#: ../plugins/git/plugin.c:346
+msgid "Drop selected stash"
+msgstr "æ?¾æ£?é?¸å??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:343
-msgid "_Skip"
-msgstr "_Skip"
+#: ../plugins/git/plugin.c:347
+msgid "Delete the selected stash"
+msgstr "å?ªé?¤é?¸å??ç?? stash"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:345
-msgid "Skip the current conflicted commit and continue"
-msgstr "ç?¥é??ç?®å??è¡?çª?ç?? commit 並繼çº?"
+#: ../plugins/git/plugin.c:354
+msgid "Clear all stashes"
+msgstr "æ¸?é?¤æ??æ?? stash"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:353
-msgid "Abort the rebase and put the repository in its original state"
-msgstr "中止 rebase 並å°?æª?æ¡?庫設å??å??å§?ç??æ??"
+#: ../plugins/git/plugin.c:355
+msgid "Delete all stashes in this repository"
+msgstr "å?ªé?¤é??å??æª?æ¡?庫中æ??æ??ç?? stash"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:359
-#: ../plugins/git/plugin.c:539
-msgid "_Cherry pickâ?¦"
-msgstr "_Cherry pickâ?¦"
+#: ../plugins/git/plugin.c:366
+msgid "Revision tools"
+msgstr "ä¿®è¨?ç??å·¥å?·"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:361
-msgid "Selectively merge individual changes from other branches into the current one"
-msgstr "é?¸æ??æ?§ç??å°?å??å?¥è®?æ?´å¾?å?¶ä»?å??æ?¯å??ä½µå?°ç?®å??ç??å??æ?¯"
+#: ../plugins/git/plugin.c:374
+msgid "Show commit diff"
+msgstr "Show commit diff"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:367
-msgid "_Remote branches"
-msgstr "_Remote branches"
+#: ../plugins/git/plugin.c:375
+msgid "Show a diff of the selected revision"
+msgstr "顯示é?¸å??ç??ä¿®è¨?ç??ç??å·®ç?°"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:377
-msgid "Add a remote branch"
-msgstr "å? å?¥é? ç«¯å??æ?¯"
+#: ../plugins/git/plugin.c:382
+msgid "Cherry pick"
+msgstr "Cherry pick"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Deleteâ?¦"
-msgstr "��(_D)�"
+msgid "Merge an individual commit from another branch"
+msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µå??å?¥ç??æ??交"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:385
-msgid "Delete a remote branch"
-msgstr "å?ªé?¤é? ç«¯å??æ?¯"
+#: ../plugins/git/plugin.c:390
+msgid "Reset/Revert"
+msgstr "Reset/Revert"
+
+#: ../plugins/git/plugin.c:398
+msgid "Reset tree"
+msgstr "é??設æª?æ¡?樹"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:399
-#: ../plugins/git/plugin.c:515
-msgid "_Create tagâ?¦"
-msgstr "建��籤(_C)�"
+msgid "Reset tree to a previous revision"
+msgstr "é??設æª?æ¡?樹å?°å??ä¸?å??ä¿®è¨?ç??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:401
-msgid "Create a tag"
-msgstr "建��籤"
+#: ../plugins/git/plugin.c:406
+msgid "Revert commit"
+msgstr "å??復æ??交"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:407
-msgid "_Delete tagâ?¦"
-msgstr "���籤(_D)�"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:409
-msgid "Delete tags"
-msgstr "���籤"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:415
-msgid "_Reset/Revert"
-msgstr "_Reset/Revert"
+msgid "Revert a commit"
+msgstr "復å??æ??交"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:423
-#: ../plugins/git/plugin.c:523
-msgid "_Reset treeâ?¦"
-msgstr "_Reset treeâ?¦"
+#: ../plugins/git/plugin.c:414
+msgid "Patch series"
+msgstr "ä¿®è£?æª?ç³»å??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:425
-msgid "Reset repository head to any past state"
-msgstr "å°?æª?æ¡?庫ç?? head é??設ç?ºä»»ä½?é??å?»ç??ç??æ??"
+#: ../plugins/git/plugin.c:422 ../plugins/git/plugin.c:423
+msgid "Generate a patch series"
+msgstr "建ç«?ä¿®è£?æª?ç³»å??"
 
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:431
-#: ../plugins/git/plugin.c:531
-msgid "_Revert commitâ?¦"
-msgstr "_Revert commitâ?¦"
+#: ../plugins/git/plugin.c:430
+msgid "Mailbox files"
+msgstr "Mailbox ��"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:433
-msgid "Revert a commit"
-msgstr "復å??æ??交"
+#: ../plugins/git/plugin.c:438
+msgid "Apply mailbox files"
+msgstr "��信箱��"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:439
-msgid "Bisect"
-msgstr "Bisect"
+msgid "Apply patches from mailbox files"
+msgstr "å¥?ç?¨ mailbox æª?æ¡?ç??ä¿®è£?æª?"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:449
-msgid "Start a bisect operation"
-msgstr "é??å§? bisect æ??ä½?"
+#: ../plugins/git/plugin.c:447
+msgid "Continue applying patches with resolved conflicts"
+msgstr "�解決���繼���修��"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:455
-msgid "_Reset"
-msgstr "é??ç½®(_R)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:457
-msgid "Stop the bisect and bring the tree back to normal"
-msgstr "å??æ­¢ bisect 並å°?å??å§?碼樹帶å??正常ç??æ??"
+msgid "Skip the current patch in the series"
+msgstr "ç?¥é??ç?®å??ç³»å??中ç??ä¿®è£?æª?"
 
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:463
-msgid "_Good"
-msgstr "_Good"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:465
-msgid "Mark the current head revision as good"
-msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º good"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:471
-msgid "_Bad"
-msgstr "_Bad"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:473
-msgid "Mark the current head revision as bad"
-msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º bad"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:479
-msgid "_Initialize repository"
-msgstr "å??å§?å??æª?æ¡?庫(_I)"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:481
-msgid "Create a new git repository or reinitialize an existing one"
-msgstr "建ç«?æ?° git æª?æ¡?庫æ??é??æ?°å??å§?å??ç?¾æ??ç??æª?æ¡?庫"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:491
-msgid "_Show commit diff"
-msgstr "_Show commit diff"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:493
-msgid "Show changes introduced by this commit"
-msgstr "顯示ä»?ç´¹é??次æ??交ç??è®?æ?´"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:499
-msgid "_View selected revision"
-msgstr "_View selected revision"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:501
-msgid "View a copy of this file at this revision"
-msgstr "檢è¦?é??次修è¨?ç??ç??æª?æ¡?è¤?æ?¬"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:509
-msgid "Create a branch with the selected revision as its head"
-msgstr "建ç«?ä¸?å??å??æ?¯ä¸¦ä»¥é?¸å??ç??ä¿®è¨?ç??å??ç?ºå®?ç?? head"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:517
-msgid "Create a tag at this revision"
-msgstr "建ç«?此修è¨?ç??ç??æ¨?籤"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:525
-msgid "Reset repository head to this revision"
-msgstr "é??設é??å??ä¿®è¨?ç??ç??æª?æ¡?庫"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:533
-msgid "Revert this commit"
-msgstr "復å??此次æ??交"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:541
-msgid "Merge this commit into the current branch"
-msgstr "å°?é??次æ??交å??ä½µå?°ç?®å??ç??å??æ?¯"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:547
-msgid "_Bisect"
-msgstr "_Bisect"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:555
-msgid "_Set good revision"
-msgstr "_Set good revision"
-
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:557
-msgid "Mark this revision as good"
-msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º good"
-
-#. Action name
-#. Stock icon, if any
-#: ../plugins/git/plugin.c:563
-msgid "_Set bad revision"
-msgstr "_Set bad revision"
+msgid ""
+"Stop applying the patch series and return the tree to its previous state"
+msgstr "å??æ­¢å¥?ç?¨é??å??ç³»å??並å°?æª?æ¡?樹å??復å?°å??ä¾?ç??ç??æ??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:565
-msgid "Mark this revision as bad"
-msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º bad"
+#: ../plugins/git/plugin.c:554 ../plugins/git/plugin.c:627
+msgid "Branch"
+msgstr "å??æ?¯"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:585
-msgid "View changes to this file or folder"
-msgstr "檢è¦?å?¨é??å??æª?æ¡?æ??è³?æ??夾ç??è®?æ?´"
+#: ../plugins/git/plugin.c:696
+msgid "Git Tasks"
+msgstr "Git 工�"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:593
-msgid "Add this file or folder to the repository"
-msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å? å?¥æª?æ¡?庫"
+#: ../plugins/git/plugin.c:758
+msgid "Status"
+msgstr "ç??æ??"
 
-#. Display label
-#. short-cut
-#: ../plugins/git/plugin.c:601
-msgid "Remove this file or folder from the repository"
-msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å¾?æª?æ¡?庫移é?¤"
+#: ../plugins/git/plugin.c:764
+msgid "Log"
+msgstr "ç´?é??"
 
-#: ../plugins/git/plugin.c:766
-msgid "Top level git menu item"
-msgstr "�端層� git ����"
+#: ../plugins/git/plugin.c:770
+msgid "Branches"
+msgstr "å??æ?¯"
 
-#: ../plugins/git/plugin.c:774
-msgid "Git operations"
-msgstr "Git æ??ä½?"
+#: ../plugins/git/plugin.c:775
+msgid "Tags"
+msgstr "�籤"
 
-#: ../plugins/git/plugin.c:779
-msgid "Git log operations"
-msgstr "Git ç´?é??æª?æ??ä½?"
+#: ../plugins/git/plugin.c:781
+msgid "Remotes"
+msgstr "�端"
 
-#: ../plugins/git/plugin.c:784
-msgid "Git FM operations"
-msgstr "Git FM æ??ä½?"
+#: ../plugins/git/plugin.c:787
+msgid "Stash"
+msgstr "Stash"
 
-#: ../plugins/git/plugin.c:799
-msgid "Git Log"
-msgstr "Git ç´?é??æª?"
+#: ../plugins/glade/plugin.c:375
+msgid "Loading Gladeâ?¦"
+msgstr "正��� Glade�"
 
-#: ../plugins/glade/plugin.c:416
+#: ../plugins/glade/plugin.c:420
 msgid "Widgets"
 msgstr "è¦?çª?å??件"
 
-#: ../plugins/glade/plugin.c:421
+#: ../plugins/glade/plugin.c:425
 msgid "Palette"
 msgstr "å??件ä¸?覽表"
 
-#: ../plugins/glade/plugin.c:552
+#: ../plugins/glade/plugin.c:541
 #, c-format
 msgid "Not local file: %s"
 msgstr "�������%s"
 
-#: ../plugins/glade/plugin.c:593
+#: ../plugins/glade/plugin.c:587
 #, c-format
 msgid "Could not open %s"
 msgstr "ç?¡æ³?é??å?? %s"
 
-#: ../plugins/glade/plugin.c:646
+#: ../plugins/glade/plugin.c:642
 msgid "Could not create a new glade project."
 msgstr "ç?¡æ³?建ç«?æ?° Glade å°?æ¡?ã??"
 
-#: ../plugins/glade/anjuta-design-document.c:156
-#: ../plugins/glade/anjuta-design-document.c:183
+#: ../plugins/glade/anjuta-design-document.c:166
+#: ../plugins/glade/anjuta-design-document.c:193
 #, c-format
 msgid "Glade project '%s' saved"
 msgstr "已�� Glade �� '%s'"
 
-#: ../plugins/glade/anjuta-design-document.c:163
-#: ../plugins/glade/anjuta-design-document.c:190
+#: ../plugins/glade/anjuta-design-document.c:173
+#: ../plugins/glade/anjuta-design-document.c:200
 msgid "Invalid Glade file name"
 msgstr "ç?¡æ??ç?? Glade æª?æ¡?å??稱"
 
-#: ../plugins/gtodo/add_edit_item.c:99
-msgid "You need to select a to do item before you can edit it"
-msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??é ?ç?®æ??è?½ç·¨è¼¯å®?"
-
-#: ../plugins/gtodo/add_edit_item.c:118
-msgid "Add Item"
-msgstr "����"
-
-#: ../plugins/gtodo/add_edit_item.c:121
-msgid "Edit Item"
-msgstr "編輯��"
-
-#: ../plugins/gtodo/add_edit_item.c:152
-#: ../plugins/gtodo/add_edit_item.c:153
-#: ../plugins/gtodo/list_tooltip.c:42
-msgid "Summary:"
-msgstr "æ??è¦?ï¼?"
-
-#. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172
-msgid "Category:"
-msgstr "å??é¡?:"
-
-#: ../plugins/gtodo/add_edit_item.c:193
-#: ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20
-#: ../plugins/gtodo/todo_db.c:76
-msgid "Edit Categories"
-msgstr "編輯å??é¡?"
-
-#: ../plugins/gtodo/add_edit_item.c:205
-#: ../plugins/gtodo/list_tooltip.c:48
-#: ../plugins/gtodo/list_tooltip.c:54
-msgid "Due date:"
-msgstr "å?°æ??æ?¥ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:224
-msgid "Notify when due"
-msgstr "ç?¶å?°æ??æ??é??ç?¥"
-
-#. label
-#: ../plugins/gtodo/add_edit_item.c:237
-#: ../plugins/gtodo/list_tooltip.c:64
-#: ../plugins/gtodo/list_tooltip.c:71
-#: ../plugins/gtodo/list_tooltip.c:77
-msgid "Priority:"
-msgstr "å?ªå??ç­?ç´?ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:258
-#: ../plugins/gtodo/add_edit_item.c:259
-#: ../plugins/gtodo/list_tooltip.c:81
-msgid "Comment:"
-msgstr "å??註ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:283
-msgid "Completed"
-msgstr "å·²å®?æ??"
-
-#: ../plugins/gtodo/add_edit_item.c:289
-#: ../plugins/gtodo/add_edit_item.c:335
-#: ../plugins/gtodo/add_edit_item.c:448
-msgid "started:"
-msgstr "å·²å??å??ï¼?"
-
-#: ../plugins/gtodo/add_edit_item.c:289
-#: ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:332
-#: ../plugins/gtodo/add_edit_item.c:333
-#, c-format
-msgid "N/A"
-msgstr "N/A"
-
-#: ../plugins/gtodo/add_edit_item.c:296
-#: ../plugins/gtodo/add_edit_item.c:339
-#: ../plugins/gtodo/add_edit_item.c:448
-msgid "stopped:"
-msgstr "å·²å??æ­¢ï¼?"
-
-#: ../plugins/gtodo/callback.c:20
-msgid "You need to select a to-do item before you can remove it"
-msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
-
-#: ../plugins/gtodo/callback.c:23
-msgid "Are you sure you want to remove the selected to-do item?"
-msgstr "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
-
-#: ../plugins/gtodo/callback.c:103
-#, c-format
-msgid "Are you sure you want to remove all the completed to-do items?"
-msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
-
-#: ../plugins/gtodo/callback.c:104
-#, c-format
-msgid "Are you sure you want to remove all the completed to-do items in the category \"%s\"?"
-msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
-
-#: ../plugins/gtodo/export.c:47
-msgid "Export task list"
-msgstr "��工���"
-
-#: ../plugins/gtodo/export.c:159
-msgid "XML"
-msgstr "XML"
-
-#: ../plugins/gtodo/export.c:160
-msgid "Plain Text"
-msgstr "ç´?æ??å­?"
-
-#: ../plugins/gtodo/export.c:161
-msgid "HTML"
-msgstr "HTML"
-
-#. add the embed css style sheet tb
-#: ../plugins/gtodo/export.c:168
-msgid "Export current category only"
-msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
-
-#: ../plugins/gtodo/export.c:172
-msgid "HTML export options:"
-msgstr "HTML �����"
-
-#: ../plugins/gtodo/export.c:184
-msgid "Embed default (CSS) style sheet"
-msgstr "����設 (CSS) 樣�表"
-
-#: ../plugins/gtodo/export.c:188
-msgid "Custom (CSS) style sheet"
-msgstr "�� (CSS) 樣�表"
-
-#: ../plugins/gtodo/interface.c:119
-msgid "All"
-msgstr "��"
-
-#: ../plugins/gtodo/interface.c:144
-msgid "_Export"
-msgstr "��(_E)"
-
-#: ../plugins/gtodo/interface.c:188
-msgid "Priority"
-msgstr "å?ªå??ç­?ç´?"
-
-#: ../plugins/gtodo/interface.c:195
-msgid "Due date"
-msgstr "å?°æ??æ?¥"
-
-#: ../plugins/gtodo/interface.c:209
-msgid "Summary"
-msgstr "æ??è¦?"
-
-#: ../plugins/gtodo/libgtodo.c:603
-#, c-format
-msgid "No permission to read the file."
-msgstr "æ²?æ??足夠æ¬?é??è®?å??æª?æ¡?ã??"
-
-#: ../plugins/gtodo/libgtodo.c:618
-#, c-format
-msgid "Failed to read file"
-msgstr "ç?¡æ³?è®?å??æª?æ¡?"
-
-#: ../plugins/gtodo/libgtodo.c:626
-#: ../plugins/gtodo/libgtodo.c:637
-#, c-format
-msgid "Failed to parse XML structure"
-msgstr "å??æ?? XML çµ?æ§?失æ??"
-
-#: ../plugins/gtodo/libgtodo.c:646
-#, c-format
-msgid "File is not a valid gtodo file"
-msgstr "æª?æ¡?並ä¸?æ?¯ä¸?å??æ??æ??ç?? gtodo æª?"
-
-#: ../plugins/gtodo/libgtodo.c:662
-msgid "Personal"
-msgstr "å??人"
-
-#: ../plugins/gtodo/libgtodo.c:664
-msgid "Business"
-msgstr "å??業"
-
-#: ../plugins/gtodo/libgtodo.c:666
-msgid "Unfiled"
-msgstr "�歸�"
-
-#: ../plugins/gtodo/libgtodo.c:755
-#, c-format
-msgid "No Gtodo Client to save."
-msgstr "æ²?æ??å?¯å?²å­?ç?? Gtodo 客æ?¶ç«¯ã??"
-
-#: ../plugins/gtodo/libgtodo.c:846
-#, c-format
-msgid "No filename supplied."
-msgstr "æ²?æ??æ??ä¾?æª?æ¡?å??稱ã??"
-
-#. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65
-#: ../plugins/gtodo/todo_db.c:130
-msgid "Low"
-msgstr "ä½?"
-
-#: ../plugins/gtodo/list_tooltip.c:71
-#: ../plugins/gtodo/todo_db.c:131
-msgid "Medium"
-msgstr "中"
-
-#: ../plugins/gtodo/list_tooltip.c:77
-#: ../plugins/gtodo/todo_db.c:132
-msgid "High"
-msgstr "é«?"
-
-#: ../plugins/gtodo/mcategory.c:145
-#, c-format
-msgid "When you delete the category \"%s\", all containing items are lost"
-msgstr "ç?¶æ?¨å?ªé?¤å??é¡?ã??%sã??ï¼?æ??æ??å??å?«ç??é ?ç?®é?½æ??é?ºå¤±"
-
-#: ../plugins/gtodo/mcategory.c:146
-msgid "Delete"
-msgstr "��"
-
-#: ../plugins/gtodo/mcategory.c:173
-#, c-format
-msgid "<New category (%d)>"
-msgstr "<æ?°å??é¡? (%d)>"
-
-#: ../plugins/gtodo/notification.c:66
-#, c-format
-msgid "The following item is due in %i minute:"
-msgid_plural "The following item is due in %i minutes:"
-msgstr[0] "ä¸?å??äº?é ?å?¨ %i å??é??å?§å?°æ??ï¼?"
-
-#: ../plugins/gtodo/notification.c:75
-msgid "The following item is due:"
-msgstr "ä¸?å??é ?ç?®å·²å?°æ??ï¼?"
-
-#. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:116
-msgid "_Do not show again"
-msgstr "ä¸?å??顯示(_D)"
-
-#: ../plugins/gtodo/plugin.c:65
-msgid "_Tasks"
-msgstr "ä»»å??(_T)"
-
-#: ../plugins/gtodo/plugin.c:74
-msgid "Hide _Completed Items"
-msgstr "é?±è??å·²å®?æ??é ?ç?®(_C)"
-
-#: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed to-do items"
-msgstr "é?±è??å·²å®?æ??ç??å¾?辦äº?é ?"
-
-#: ../plugins/gtodo/plugin.c:83
-msgid "Hide Items Past _Due Date"
-msgstr "é?±è??å·²é??æ??ç??é ?ç?®(_D)"
-
-#: ../plugins/gtodo/plugin.c:85
-msgid "Hide items that are past due date"
-msgstr "é?±è??å·²é??æ??ç??é ?ç?®"
-
-#: ../plugins/gtodo/plugin.c:92
-msgid "Hide Items Without _End Date"
-msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®(_E)"
-
-#: ../plugins/gtodo/plugin.c:94
-msgid "Hide items without an end date"
-msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®"
-
-#: ../plugins/gtodo/plugin.c:122
-msgid "Task manager"
-msgstr "å·¥ä½?管ç??å?¡"
-
-#: ../plugins/gtodo/plugin.c:128
-msgid "Task manager view"
-msgstr "å·¥ä½?管ç??å?¡æª¢è¦?"
-
-#: ../plugins/gtodo/plugin.c:134
-msgid "Tasks"
-msgstr "工�"
-
-#: ../plugins/gtodo/plugin.c:342
-#: ../plugins/gtodo/plugin.c:351
-msgid "To-do Manager"
-msgstr "å¾?辦äº?é ?管ç??å?¡"
-
-#: ../plugins/gtodo/preferences.c:21
-msgid "To-do List Preferences"
-msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
-
-#: ../plugins/gtodo/preferences.c:89
-msgid "Interface"
-msgstr "ä»?é?¢"
-
-#: ../plugins/gtodo/preferences.c:93
-msgid "Show due date column"
-msgstr "顯示å?°æ??æ?¥æ¬?ä½?"
-
-#: ../plugins/gtodo/preferences.c:101
-msgid "Show category column"
-msgstr "顯示å??é¡?æ¬?ä½?"
-
-#: ../plugins/gtodo/preferences.c:107
-msgid "Show priority column"
-msgstr "顯示å?ªå??é ?åº?æ¬?ä½?"
-
-#: ../plugins/gtodo/preferences.c:115
-#: ../plugins/gtodo/preferences.c:117
-msgid "Show in main window"
-msgstr "顯示�主��中"
-
-#: ../plugins/gtodo/preferences.c:128
-#: ../plugins/gtodo/preferences.c:130
-msgid "Highlight"
-msgstr "�示"
-
-#. tb for highlighting due today
-#: ../plugins/gtodo/preferences.c:140
-msgid "Items that are due today"
-msgstr "å?¨ä»?æ?¥å?°æ??ç??é ?ç?®"
-
-#. tb for highlighting due
-#: ../plugins/gtodo/preferences.c:146
-msgid "Items that are past due"
-msgstr "é??å?»å?°æ??ç??é ?ç?®"
-
-#. tb for highlighting in x days
-#: ../plugins/gtodo/preferences.c:152
-#, c-format
-msgid "Items that are due in the next %i day"
-msgid_plural "Items that are due in the next %i days"
-msgstr[0] "é ?ç?®å?¨æ?ªä¾? %i 天å?§å?°æ??"
-
-#: ../plugins/gtodo/preferences.c:166
-msgid "Miscellaneous"
-msgstr "é??é ?"
-
-#: ../plugins/gtodo/preferences.c:169
-msgid "Auto-purge completed items"
-msgstr "è?ªå??æ¸?é?¤å·²å®?æ??ç??é ?ç?®"
-
-#. Translators: First part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:175
-msgid "Purge items after"
-msgstr "��"
-
-#. Translators: Second part of the sentence "Purge items after %d days"
-#: ../plugins/gtodo/preferences.c:180
-msgid "days."
-msgstr "天å??ç??é ?ç?®ã??"
-
-#: ../plugins/gtodo/preferences.c:193
-#: ../plugins/gtodo/preferences.c:195
-msgid "Auto-Purge"
-msgstr "è?ªå??æ¸?é?¤"
-
-#: ../plugins/gtodo/preferences.c:207
-#: ../plugins/gtodo/preferences.c:209
-msgid "Notification"
-msgstr "é??ç?¥"
-
-#: ../plugins/gtodo/preferences.c:216
-#, c-format
-msgid "Allow to-do items to notify me when they are due in %i minute"
-msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
-msgstr[0] "å??許å¾?辦äº?é ?å?¨å?°æ??ç?? %i å??é??å??é??ç?¥æ??"
-
-#: ../plugins/gtodo/tasklists.c:10
-msgid "Open a Task List"
-msgstr "é??å??ä»»å??æ¸?å?®"
-
-#: ../plugins/gtodo/tasklists.c:35
-msgid "Create a Task List"
-msgstr "建ç«?ä»»å??æ¸?å?®"
-
-#: ../plugins/gtodo/todo_db.c:165
-msgid "No Date"
-msgstr "æ²?æ??æ?¥æ??"
-
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 #, fuzzy
@@ -6407,19 +5738,19 @@ msgstr "���"
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 #, fuzzy
 msgid "Underline-Plain"
-msgstr "ç´?æ??å­? (ASCII)"
+msgstr "ç´?æ??å­?"
 
 #. text style in editor
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 #, fuzzy
 msgid "Underline-Squiggle"
-msgstr "使���"
+msgstr "��設�"
 
 #. text style in editor, TT is for typewriter text
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
 #, fuzzy
 msgid "Underline-TT"
-msgstr "使���"
+msgstr "��設�"
 
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Warning message indicator style:"
@@ -6438,10 +5769,8 @@ msgid "Icon"
 msgstr "å??示"
 
 #: ../plugins/message-view/message-view.c:511
-#: ../plugins/message-view/plugin.c:383
-#: ../plugins/message-view/plugin.c:396
-#: ../plugins/message-view/plugin.c:515
-#: ../plugins/message-view/plugin.c:526
+#: ../plugins/message-view/plugin.c:383 ../plugins/message-view/plugin.c:396
+#: ../plugins/message-view/plugin.c:515 ../plugins/message-view/plugin.c:526
 msgid "Messages"
 msgstr "��"
 
@@ -6510,6 +5839,31 @@ msgid "%d Error"
 msgid_plural "%d Errors"
 msgstr[0] "%d å??é?¯èª¤"
 
+#: ../plugins/mk-project/mk-project.c:715
+#, c-format
+msgid "Unable to parse make file"
+msgstr "ç?¡æ³?解æ?? make æª?æ¡?"
+
+#: ../plugins/mk-project/mk-project.ui.h:1
+msgid "<b>Select Package to add:</b>"
+msgstr "<b>��件������</b>"
+
+#: ../plugins/mk-project/mk-project.ui.h:2
+msgid "Add _Package"
+msgstr "���件(_P)"
+
+#: ../plugins/mk-project/mk-project.ui.h:3
+msgid "Add _module"
+msgstr "��模�(_M)"
+
+#: ../plugins/mk-project/mk-project.ui.h:5
+msgid "Packages"
+msgstr "�件"
+
+#: ../plugins/mk-project/mk-project.ui.h:6
+msgid "Select package"
+msgstr "é?¸æ??å¥?件"
+
 #: ../plugins/patch/patch-plugin.c:94
 msgid "File/Directory to patch"
 msgstr "è¦?ä¿®è£?ç??æª?æ¡?/ç?®é??"
@@ -6518,8 +5872,11 @@ msgstr "è¦?ä¿®è£?ç??æª?æ¡?/ç?®é??"
 msgid "Patch file"
 msgstr "修��"
 
-#: ../plugins/patch/patch-plugin.c:166
-#: ../plugins/patch/patch-plugin.ui.h:3
+#: ../plugins/patch/patch-plugin.c:117
+msgid "Patches"
+msgstr "修�"
+
+#: ../plugins/patch/patch-plugin.c:166 ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "修�"
 
@@ -6577,8 +5934,7 @@ msgstr "修�層��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/patch/plugin.c:53
-#: ../plugins/tools/plugin.c:131
+#: ../plugins/patch/plugin.c:53 ../plugins/tools/plugin.c:131
 msgid "_Tools"
 msgstr "工�(_T)"
 
@@ -6593,8 +5949,11 @@ 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
@@ -6603,8 +5962,11 @@ 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
@@ -6617,13 +5979,18 @@ msgstr "以此é??å??"
 
 #: ../plugins/project-import/plugin.c:220
 #, c-format
-msgid "Could not find a valid project backend for the given directory (%s). Please select a different directory, or try upgrading to a newer version of Anjuta."
-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
@@ -6631,7 +5998,7 @@ msgstr "ç?¡æ³? check out æ??å®?ç?? URIã??%sã??ã??å?³å??ç??é?¯èª¤ç?ºï¼?ã??%sã??"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:12
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:12
 #: ../plugins/project-wizard/templates/django.wiz.in.h:1
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:14
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:13
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:12
@@ -6677,120 +6044,115 @@ msgid "Import"
 msgstr "��"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:1
-#| msgid "Add _module"
-msgid "Add Module"
-msgstr "��模�"
+msgid "Add Library"
+msgstr "����庫"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:2
-#| msgid "Add _Package"
-msgid "Add Package"
-msgstr "���件"
-
-#: ../plugins/project-manager/pm_dialogs.ui.h:3
 msgid "Add Source"
 msgstr "����"
 
+#: ../plugins/project-manager/pm_dialogs.ui.h:3
+msgid "Browse other nodes"
+msgstr "ç??覽å?¶ä»?ç??ç¯?é»?"
+
 #: ../plugins/project-manager/pm_dialogs.ui.h:4
-#| msgid "Module"
 msgid "Modules:"
 msgstr "模��"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:5
-#| msgid "Import options"
 msgid "More options:"
 msgstr "�����"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:6
-msgid "New Group"
-msgstr "��群�"
+msgid "New Directory"
+msgstr "æ?°å¢?ç?®é??"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:7
+msgid "New Library"
+msgstr "����庫"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:8
 msgid "New Target"
 msgstr "����"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:8
-#| msgid "Packages"
+#: ../plugins/project-manager/pm_dialogs.ui.h:9
 msgid "Package list:"
 msgstr "�件���"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:9
-#| msgid "Select the _target for the new source files:"
-msgid "Select the _target for the module:"
-msgstr "é?¸æ??模çµ?ç??ç?®æ¨?(_T):"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:10
+msgid "Select the _target for the library:"
+msgstr "é?¸æ??ç¨?å¼?庫ç??ç?®æ¨?(_T):"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:11
 msgid "Select the _target for the new source files:"
 msgstr "é?¸æ??æ?°ä¾?æº?æª?æ¡?ç??ç?®æ¨?(_T):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:11
+#: ../plugins/project-manager/pm_dialogs.ui.h:12
 msgid "Source files:"
 msgstr "�����"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:12
-msgid "Specify _where to create the group:"
-msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?群çµ?(_W):"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:13
+msgid "Specify _where to create the directory:"
+msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç?®é??(_W):"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:14
 msgid "Specify _where to create the target:"
 msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?ç?®æ¨?(_W):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:14
+#: ../plugins/project-manager/pm_dialogs.ui.h:15
 msgid "Target _name:"
 msgstr "ç?®æ¨?å??稱(_N):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:15
+#: ../plugins/project-manager/pm_dialogs.ui.h:16
 msgid "Target _type:"
 msgstr "ç?®æ¨?é¡?å??(_T):"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:16
+#: ../plugins/project-manager/pm_dialogs.ui.h:17
 msgid "TargetTypes"
 msgstr "ç?®æ¨?é¡?å??"
 
-#: ../plugins/project-manager/pm_dialogs.ui.h:17
-#| msgid "Add _Package"
-msgid "_Add package&#x2026;"
-msgstr "���件(_A)&#x2026;"
-
 #: ../plugins/project-manager/pm_dialogs.ui.h:18
-msgid "_Group name:"
-msgstr "群çµ?å??稱(_G):"
+msgid "_Directory name:"
+msgstr "ç?®é??å??稱(_D):"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:19
-#| msgid "Module name:"
 msgid "_Module name:"
 msgstr "模çµ?å??稱(_M):"
 
 #: ../plugins/project-manager/pm_dialogs.ui.h:20
-#| msgid "Select file to add:"
+msgid "_New library&#x2026;"
+msgstr "����庫(_N)&#x2026;"
+
+#: ../plugins/project-manager/pm_dialogs.ui.h:21
 msgid "_Select file to add&#x2026;"
 msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?(_S)&#x2026;"
 
-#: ../plugins/project-manager/project-model.c:233
-#: ../plugins/project-manager/plugin.c:1389
-#: ../plugins/project-manager/plugin.c:1507
-#: ../plugins/project-manager/plugin.c:1684
+#: ../plugins/project-manager/project-model.c:184
+#: ../plugins/project-manager/plugin.c:1306
+#: ../plugins/project-manager/plugin.c:1426
+#: ../plugins/project-manager/plugin.c:1606 ../plugins/symbol-db/plugin.c:2134
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "å°?æ¡?"
 
-#: ../plugins/project-manager/project-model.c:234
+#: ../plugins/project-manager/project-model.c:185
 msgid "GbfProject Object"
 msgstr "GbfProject �件"
 
-#: ../plugins/project-manager/project-model.c:763
+#: ../plugins/project-manager/project-model.c:735
 msgid "No project loaded"
 msgstr "������"
 
-#: ../plugins/project-manager/plugin.c:385
+#: ../plugins/project-manager/plugin.c:402
 msgid "Refreshing symbol treeâ?¦"
 msgstr "æ­£å?¨é??æ?°æ?´ç??符è??樹â?¦"
 
-#: ../plugins/project-manager/plugin.c:392
+#: ../plugins/project-manager/plugin.c:409
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "é??æ?°æ?´ç??å°?æ¡?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:646
+#: ../plugins/project-manager/plugin.c:662
 msgid ""
 "Are you sure you want to remove the following group from the project?\n"
 "\n"
@@ -6798,7 +6160,7 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??群çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:649
+#: ../plugins/project-manager/plugin.c:665
 msgid ""
 "Are you sure you want to remove the following target from the project?\n"
 "\n"
@@ -6806,7 +6168,7 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??ç?®æ¨?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:652
+#: ../plugins/project-manager/plugin.c:668
 msgid ""
 "Are you sure you want to remove the following source file from the project?\n"
 "\n"
@@ -6814,10 +6176,7 @@ msgstr ""
 "æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??å§?碼æª?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:655
-#| msgid ""
-#| "Are you sure you want to remove the following target from the project?\n"
-#| "\n"
+#: ../plugins/project-manager/plugin.c:671
 msgid ""
 "Are you sure you want to remove the following package from the project?\n"
 "\n"
@@ -6825,10 +6184,7 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??å¥?件å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:658
-#| msgid ""
-#| "Are you sure you want to remove the following group from the project?\n"
-#| "\n"
+#: ../plugins/project-manager/plugin.c:674
 msgid ""
 "Are you sure you want to remove the following module from the project?\n"
 "\n"
@@ -6836,7 +6192,7 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??模çµ?å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:661
+#: ../plugins/project-manager/plugin.c:677
 msgid ""
 "Are you sure you want to remove the following elements from the project?\n"
 "\n"
@@ -6844,61 +6200,57 @@ msgstr ""
 "æ?¨æ?¯å?¦ç¢ºå®?å°?ä¸?å??å??ç´ å¾?å°?æ¡?中移é?¤ï¼?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:678
+#: ../plugins/project-manager/plugin.c:694
 #, c-format
 msgid "Group: %s\n"
 msgstr "群��%s\n"
 
-#: ../plugins/project-manager/plugin.c:681
+#: ../plugins/project-manager/plugin.c:697
 #, c-format
 msgid "Target: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:684
+#: ../plugins/project-manager/plugin.c:700
 #, c-format
 msgid "Source: %s\n"
 msgstr "���%s\n"
 
-#: ../plugins/project-manager/plugin.c:687
+#: ../plugins/project-manager/plugin.c:703
 #, c-format
 msgid "Shortcut: %s\n"
 msgstr "æ?·å¾?ï¼?%s\n"
 
-#: ../plugins/project-manager/plugin.c:690
+#: ../plugins/project-manager/plugin.c:706
 #, c-format
-#| msgid "Source: %s\n"
 msgid "Module: %s\n"
 msgstr "模��%s\n"
 
-#: ../plugins/project-manager/plugin.c:693
+#: ../plugins/project-manager/plugin.c:709
 #, c-format
-#| msgid "Packages"
 msgid "Package: %s\n"
 msgstr "�件�%s\n"
 
-#: ../plugins/project-manager/plugin.c:705
-#| msgid "The group will not be deleted from the file system."
+#: ../plugins/project-manager/plugin.c:721
 msgid "The group will be deleted from the file system."
 msgstr "é??å??群çµ?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:707
+#: ../plugins/project-manager/plugin.c:723
 msgid "The group will not be deleted from the file system."
 msgstr "é??å??群çµ?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:709
-#| msgid "The source file will not be deleted from the file system."
+#: ../plugins/project-manager/plugin.c:725
 msgid "The source file will be deleted from the file system."
 msgstr "該ä¾?æº?æª?å°?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:711
+#: ../plugins/project-manager/plugin.c:727
 msgid "The source file will not be deleted from the file system."
 msgstr "該ä¾?æº?æª?å°?ä¸?æ??å¾?æª?æ¡?系統中å?ªé?¤ã??"
 
-#: ../plugins/project-manager/plugin.c:716
+#: ../plugins/project-manager/plugin.c:732
 msgid "Confirm remove"
 msgstr "確�移�"
 
-#: ../plugins/project-manager/plugin.c:762
+#: ../plugins/project-manager/plugin.c:778
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6907,165 +6259,155 @@ msgstr ""
 "移é?¤â??%sâ??失æ??ï¼?\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:828
+#: ../plugins/project-manager/plugin.c:844
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "å??å?? %s ç?? URI è³?è¨?失æ??ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:866
+#: ../plugins/project-manager/plugin.c:882
 msgid "_Project"
 msgstr "å°?æ¡?(_P)"
 
-#: ../plugins/project-manager/plugin.c:870
-msgid "Add _Groupâ?¦"
-msgstr "��群�(_G)�"
+#: ../plugins/project-manager/plugin.c:886
+msgid "New _Directoryâ?¦"
+msgstr "æ?°å¢?ç?®é??(_D)â?¦"
 
-#: ../plugins/project-manager/plugin.c:870
-#: ../plugins/project-manager/plugin.c:914
-msgid "Add a group to project"
-msgstr "��群����"
+#: ../plugins/project-manager/plugin.c:886
+#: ../plugins/project-manager/plugin.c:925
+msgid "Add a new directory to the project"
+msgstr "å? å?¥æ?°ç??ç?®é??è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:875
-msgid "Add _Targetâ?¦"
-msgstr "����(_T)�"
+#: ../plugins/project-manager/plugin.c:891
+msgid "New _Targetâ?¦"
+msgstr "����(_T)�"
 
-#: ../plugins/project-manager/plugin.c:875
-#: ../plugins/project-manager/plugin.c:919
-msgid "Add a target to project"
-msgstr "�������"
+#: ../plugins/project-manager/plugin.c:891
+#: ../plugins/project-manager/plugin.c:930
+msgid "Add a new target to the project"
+msgstr "å? å?¥æ?°ç??ç?®æ¨?è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:896
 msgid "Add _Source Fileâ?¦"
 msgstr "������(_S)�"
 
-#: ../plugins/project-manager/plugin.c:880
-#: ../plugins/project-manager/plugin.c:924
-#: ../plugins/project-manager/plugin.c:939
-msgid "Add a source file to project"
-msgstr "å? å?¥å??å§?æª?è?³å°?æ¡?"
+#: ../plugins/project-manager/plugin.c:896
+#: ../plugins/project-manager/plugin.c:935
+#: ../plugins/project-manager/plugin.c:950
+msgid "Add a source file to a target"
+msgstr "å? å?¥å??å§?æª?è?³ç?®æ¨?"
 
-#: ../plugins/project-manager/plugin.c:885
-#| msgid "Add _module"
-msgid "Add _Moduleâ?¦"
-msgstr "��模�(_M)�"
+#: ../plugins/project-manager/plugin.c:901
+msgid "Add _Libraryâ?¦"
+msgstr "����庫(_L)�"
 
-#: ../plugins/project-manager/plugin.c:885
-#| msgid "Add a source file to project"
+#: ../plugins/project-manager/plugin.c:901
 msgid "Add a module to a target"
 msgstr "�模������"
 
-#: ../plugins/project-manager/plugin.c:890
-#| msgid "Add _Package"
-msgid "Add _Packageâ?¦"
-msgstr "���件(_P)�"
+#: ../plugins/project-manager/plugin.c:906
+msgid "New _Libraryâ?¦"
+msgstr "����庫(_L)�"
 
-#: ../plugins/project-manager/plugin.c:890
-#: ../plugins/project-manager/plugin.c:934
-#| msgid "Add a target to project"
-msgid "Add a package to project"
-msgstr "��件�����"
+#: ../plugins/project-manager/plugin.c:906
+msgid "Add a new package to the project"
+msgstr "å? å?¥æ?°ç??å¥?件è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:895
-#: ../plugins/project-manager/plugin.c:944
+#: ../plugins/project-manager/plugin.c:911
+#: ../plugins/project-manager/plugin.c:955
 msgid "_Properties"
 msgstr "屬�(_P)"
 
-#: ../plugins/project-manager/plugin.c:895
-#: ../plugins/project-manager/dialogs.c:666
+#: ../plugins/project-manager/plugin.c:911
+#: ../plugins/project-manager/dialogs.c:517
 msgid "Project properties"
 msgstr "��屬�"
 
-#: ../plugins/project-manager/plugin.c:900
-msgid "_Refresh"
-msgstr "é??æ?°æ?´ç??(_R)"
-
-#: ../plugins/project-manager/plugin.c:900
-msgid "Refresh project manager tree"
-msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
-
-#: ../plugins/project-manager/plugin.c:905
+#: ../plugins/project-manager/plugin.c:916
 msgid "Close Pro_ject"
 msgstr "é??é??å°?æ¡?(_J)"
 
-#: ../plugins/project-manager/plugin.c:905
+#: ../plugins/project-manager/plugin.c:916
 msgid "Close project"
 msgstr "é??é??å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:914
-msgid "Add _Group"
-msgstr "��群�(_G)"
+#: ../plugins/project-manager/plugin.c:925
+msgid "New _Directory"
+msgstr "æ?°å¢?ç?®é??(_D)"
 
-#: ../plugins/project-manager/plugin.c:919
-msgid "Add _Target"
+#: ../plugins/project-manager/plugin.c:930
+msgid "New _Target"
 msgstr "����(_T)"
 
-#: ../plugins/project-manager/plugin.c:924
+#: ../plugins/project-manager/plugin.c:935
 msgid "Add _Source File"
 msgstr "å? å?¥å??å§?æª?(_S)"
 
-#: ../plugins/project-manager/plugin.c:929
-#| msgid "Add _module"
-msgid "Add _Module"
-msgstr "��模�(_M)"
+#: ../plugins/project-manager/plugin.c:940
+msgid "Add _Library"
+msgstr "����庫(_L)"
 
-#: ../plugins/project-manager/plugin.c:929
-#| msgid "Add a group to project"
-msgid "Add a module to target"
-msgstr "�模������"
+#: ../plugins/project-manager/plugin.c:940
+msgid "Add a library to a target"
+msgstr "����庫���"
 
-#: ../plugins/project-manager/plugin.c:934
-msgid "Add _Package"
-msgstr "���件(_P)"
+#: ../plugins/project-manager/plugin.c:945
+msgid "New _Library"
+msgstr "����庫(_L)"
+
+#: ../plugins/project-manager/plugin.c:945
+msgid "Add a new library to the project"
+msgstr "å? å?¥æ?°ç??ç¨?å¼?庫è?³å°?æ¡?"
 
-#: ../plugins/project-manager/plugin.c:939
+#: ../plugins/project-manager/plugin.c:950
 msgid "_Add to Project"
 msgstr "�����(_A)"
 
-#: ../plugins/project-manager/plugin.c:944
+#: ../plugins/project-manager/plugin.c:955
 msgid "Properties of group/target/source"
 msgstr "群çµ?/ç?®æ¨?/ä¾?æº?ç??屬æ?§"
 
-#: ../plugins/project-manager/plugin.c:949
+#: ../plugins/project-manager/plugin.c:960
 msgid "Re_move"
 msgstr "移�(_M)"
 
-#: ../plugins/project-manager/plugin.c:949
+#: ../plugins/project-manager/plugin.c:960
 msgid "Remove from project"
 msgstr "���中移�"
 
-#: ../plugins/project-manager/plugin.c:1343
+#: ../plugins/project-manager/plugin.c:1291
 #, 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:1384
-#| msgid "Created project viewâ?¦"
+#: ../plugins/project-manager/plugin.c:1301
 msgid "Update project viewâ?¦"
 msgstr "����檢��"
 
-#: ../plugins/project-manager/plugin.c:1425
+#: ../plugins/project-manager/plugin.c:1344
 #, c-format
 msgid "Loading project: %s"
 msgstr "正������%s"
 
-#: ../plugins/project-manager/plugin.c:1595
+#: ../plugins/project-manager/plugin.c:1514
 #, c-format
 msgid "Error closing project: %s"
 msgstr "é??é??å°?æ¡?æ??é?¯èª¤ï¼?%s"
 
-#: ../plugins/project-manager/plugin.c:1663
+#: ../plugins/project-manager/plugin.c:1585
 msgid "Project manager actions"
 msgstr "å°?æ¡?管ç??å?¡å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:1671
+#: ../plugins/project-manager/plugin.c:1593
 msgid "Project manager popup actions"
 msgstr "å°?æ¡?管ç??å?¡å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/project-manager/plugin.c:2384
+#: ../plugins/project-manager/plugin.c:2317
 msgid "Initializing Projectâ?¦"
 msgstr "å??å§?å??å°?æ¡?â?¦"
 
-#: ../plugins/project-manager/plugin.c:2387
+#: ../plugins/project-manager/plugin.c:2320
 msgid "Project Loaded"
 msgstr "��已��"
 
@@ -7076,73 +6418,80 @@ msgstr "��已��"
 #. }
 #. else
 #. uri = g_strdup("");
-#: ../plugins/project-manager/dialogs.c:316
+#: ../plugins/project-manager/dialogs.c:290
 msgid "Select sourcesâ?¦"
 msgstr "é?¸æ??ä¾?æº?â?¦"
 
-#: ../plugins/project-manager/dialogs.c:521
-#| msgid "Class Name:"
-msgid "Full Name:"
-msgstr "å?¨å??ï¼?"
+#: ../plugins/project-manager/dialogs.c:369
+msgid " This property is not modifiable."
+msgstr "é??å??屬æ?§æ?¯ç?¡æ³?ä¿®æ?¹ç??ã??"
 
-#: ../plugins/project-manager/dialogs.c:669
-msgid "Group properties"
-msgstr "群�屬�"
+#: ../plugins/project-manager/dialogs.c:520
+msgid "Directory properties"
+msgstr "ç?®é??屬æ?§"
 
-#: ../plugins/project-manager/dialogs.c:672
+#: ../plugins/project-manager/dialogs.c:523
 msgid "Target properties"
 msgstr "��屬�"
 
-#: ../plugins/project-manager/dialogs.c:675
-#| msgid "Group properties"
+#: ../plugins/project-manager/dialogs.c:526
 msgid "Source properties"
 msgstr "ä¾?æº?ç??屬æ?§"
 
-#: ../plugins/project-manager/dialogs.c:776
-#: ../plugins/project-manager/dialogs.c:787
+#: ../plugins/project-manager/dialogs.c:529
+msgid "Module properties"
+msgstr "模�屬�"
+
+#: ../plugins/project-manager/dialogs.c:532
+msgid "Package properties"
+msgstr "�件屬�"
+
+#: ../plugins/project-manager/dialogs.c:535
+msgid "Unknown properties"
+msgstr "ä¸?æ??ç??屬æ?§"
+
+#: ../plugins/project-manager/dialogs.c:930
+#: ../plugins/project-manager/dialogs.c:941
 msgid "Cannot add group"
 msgstr "����群�"
 
-#: ../plugins/project-manager/dialogs.c:788
+#: ../plugins/project-manager/dialogs.c:942
 msgid "No parent group selected"
 msgstr "æ²?æ??é?¸æ??ä¸?層群çµ?"
 
-#: ../plugins/project-manager/dialogs.c:998
-#: ../plugins/project-manager/dialogs.c:1008
+#: ../plugins/project-manager/dialogs.c:1156
+#: ../plugins/project-manager/dialogs.c:1166
 msgid "Cannot add source files"
 msgstr "������碼��"
 
-#: ../plugins/project-manager/dialogs.c:1009
-msgid "The selected node cannot contains source files."
+#: ../plugins/project-manager/dialogs.c:1167
+msgid "The selected node cannot contain source files."
 msgstr "é?¸å??ç??ç¯?é»?ä¸?è?½å??å?«ä¾?æº?æª?ã??"
 
-#: ../plugins/project-manager/dialogs.c:1191
-#: ../plugins/project-manager/dialogs.c:1202
+#: ../plugins/project-manager/dialogs.c:1353
+#: ../plugins/project-manager/dialogs.c:1364
 msgid "Cannot add target"
 msgstr "������"
 
-#: ../plugins/project-manager/dialogs.c:1203
+#: ../plugins/project-manager/dialogs.c:1365
 msgid "No group selected"
 msgstr "æ²?æ??é?¸å??群çµ?"
 
-#: ../plugins/project-manager/dialogs.c:1354
-#: ../plugins/project-manager/dialogs.c:1365
-#| msgid "Cannot add source files"
+#: ../plugins/project-manager/dialogs.c:1524
+#: ../plugins/project-manager/dialogs.c:1535
 msgid "Cannot add modules"
 msgstr "����模�"
 
-#: ../plugins/project-manager/dialogs.c:1366
+#: ../plugins/project-manager/dialogs.c:1536
 msgid "No target has been selected"
 msgstr "å°?æ?ªé?¸æ??ç?®æ¨?"
 
 #. Missing module name
-#: ../plugins/project-manager/dialogs.c:1569
-#| msgid "Missing tool name"
+#: ../plugins/project-manager/dialogs.c:1739
 msgid "Missing module name"
 msgstr "缺å°?模çµ?å??稱"
 
-#: ../plugins/project-manager/dialogs.c:1631
-#| msgid "Cannot add target"
+#: ../plugins/project-manager/dialogs.c:1801
 msgid "Cannot add packages"
 msgstr "�����件"
 
@@ -7155,8 +6504,7 @@ 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 "è­¦å??"
 
@@ -7180,7 +6528,7 @@ msgstr "å°?æ¡?é¡?å??ï¼?%s\n"
 msgid "Unable to find any project template in %s"
 msgstr "����任���樣�� %s"
 
-#: ../plugins/project-wizard/druid.c:627
+#: ../plugins/project-wizard/druid.c:631
 #, c-format
 msgid ""
 "\n"
@@ -7189,38 +6537,54 @@ msgstr ""
 "\n"
 "æ¬?ä½?ã??%sã??æ?¯å¿?è¦?ç??ã??è«?輸å?¥å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:642
-msgid "Field \"%s\" must contains only letters, digits or the following characters \"#$:%+, = ^_`~\". In addition you cannot have a leading dash. Please fix it."
-msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?æ??ä¸?å??å­?å?? \"#$:%+, = ^_`~\"ã??æ­¤å¤?æ?¨ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
+#: ../plugins/project-wizard/druid.c:646
+#, c-format
+msgid ""
+"Field \"%s\" must contains only letters, digits or the following characters "
+"\"#$:%%+, = ^_`~\". In addition you cannot have a leading dash. Please fix "
+"it."
+msgstr ""
+"æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?æ??ä¸?å??å­?å?? \"#$:%%+, = ^_`~\"ã??æ­¤å¤?æ?¨ä¸?è?½ä»¥ ~ 符è??"
+"é??é ­ã??è«?修正å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:647
-msgid "Field \"%s\" must contains only letters, digits, the following characters \"#$:%+, = ^_`~\" or directory separators. In addition you cannot have a leading dash. Please fix it."
-msgstr "æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?ã??ä¸?å??å­?å?? \"#$:%+, = ^_`~\" æ??ç?®é??å??é??符ã??æ­¤å¤?æ?¨ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
+#: ../plugins/project-wizard/druid.c:651
+#, c-format
+msgid ""
+"Field \"%s\" must contains only letters, digits, the following characters \"#"
+"$:%%+, = ^_`~\" or directory separators. In addition you cannot have a "
+"leading dash. Please fix it."
+msgstr ""
+"æ¬?ä½?ã??%sã??å¿?é ?ç?ºå­?æ¯?ã??æ?¸å­?ã??ä¸?å??å­?å?? \"#$:%%+, = ^_`~\" æ??ç?®é??å??é??符ã??æ­¤å¤?æ?¨"
+"ä¸?è?½ä»¥ ~ 符è??é??é ­ã??è«?修正å®?ã??"
 
-#: ../plugins/project-wizard/druid.c:652
+#: ../plugins/project-wizard/druid.c:656
 #, c-format
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/project-wizard/druid.c:679
+#: ../plugins/project-wizard/druid.c:683
 #, c-format
-msgid "Directory \"%s\" is not empty. Project creation could fail if some files cannot be written. Do you want to continue?"
-msgstr "ç?®é??ã??%sã??ä¸?æ?¯ç©ºç??ã??å¦?æ??æ??äº?æª?æ¡?ç?¡æ³?寫å?¥ï¼?å°?æ¡?ç??建ç«?å?¯è?½æ??失æ??ã??確å®?è¦?ç¹¼çº?å??ï¼?"
+msgid ""
+"Directory \"%s\" is not empty. Project creation could fail if some files "
+"cannot be written. Do you want to continue?"
+msgstr ""
+"ç?®é??ã??%sã??ä¸?æ?¯ç©ºç??ã??å¦?æ??æ??äº?æª?æ¡?ç?¡æ³?寫å?¥ï¼?å°?æ¡?ç??建ç«?å?¯è?½æ??失æ??ã??確å®?è¦?ç¹¼çº?"
+"å??ï¼?"
 
-#: ../plugins/project-wizard/druid.c:681
+#: ../plugins/project-wizard/druid.c:685
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "æª?æ¡? \"%s\" å·²å­?å?¨ã??æ?¨æ?¯å?¦æ?³è¦?è¦?è??ä»?ï¼?"
 
-#: ../plugins/project-wizard/druid.c:712
+#: ../plugins/project-wizard/druid.c:716
 msgid "Invalid entry"
 msgstr "ç?¡æ??ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:723
+#: ../plugins/project-wizard/druid.c:727
 msgid "Dubious entry"
 msgstr "ä¸?確å®?ç??é ?ç?®"
 
-#: ../plugins/project-wizard/druid.c:881
+#: ../plugins/project-wizard/druid.c:892
 #, c-format
 msgid ""
 "\n"
@@ -7229,7 +6593,7 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??ç¨?å¼?ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:892
+#: ../plugins/project-wizard/druid.c:903
 #, c-format
 msgid ""
 "\n"
@@ -7238,23 +6602,38 @@ msgstr ""
 "\n"
 "é?ºå¤±ç??å¥?件ï¼?%sã??"
 
-#: ../plugins/project-wizard/druid.c:901
-msgid "Some important programs or development packages required to build this project are missing. Please make sure they are installed properly before generating the project.\n"
-msgstr "編譯é??å??å°?æ¡?æ??é??ç??é?¨å??é??è¦?ç¨?å¼?æ??é??ç?¼å¥?件é?ºå¤±ã??å?¨ç?¢ç??å°?æ¡?å??è«?å??確å®?å®?å??å·²ç¶?正確ç??å®?è£?ã??\n"
+#: ../plugins/project-wizard/druid.c:912
+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:909
+#: ../plugins/project-wizard/druid.c:920
 msgid "Install missing packages"
 msgstr "å®?è£?缺å°?ç??å¥?件"
 
-#: ../plugins/project-wizard/druid.c:917
-msgid "The missing programs are usually part of some distrubution packages and can be searched for in your Application Manager. Similarly, the development packages are contained in special packages that your distribution provides to allow development of projects based on them. They usually end with a \"-dev\" or \"-devel\" suffix in package names and can be found by searching in your Application Manager."
-msgstr "缺å°?ç??ç¨?å¼?é??常æ?¯æ??äº?ç?¼è¡?ç??æ?¬ç??ä¸?é?¨å??ï¼?å?¯ä»¥å?¨æ?¨ç??å¥?件管ç??ç¨?å¼?中æ??å°?å?°ã??å??樣ç??ï¼?é??ç?¼ç?¨å¥?件ä¹?常å­?å?¨ç?¹å?¥ç??å¥?件中ï¼?æ?¯æ?¨ç??ç?¼è¡?ç??æ?¬æ??ä¾?以便é??ç?¼ä»¥å®?å??ç?ºå?ºç¤?ç??å°?æ¡?ã??å®?å??é??常å?¨å¥?件å??稱中以ã??-devã??æ??ã??-develã??å¾?綴çµ?å°¾ï¼?è??ä¸?å??樣å?¯ä»¥å?¨æ?¨ç??å¥?件管ç??ç¨?å¼?中æ??å°?å?°ã??"
+#: ../plugins/project-wizard/druid.c:928
+msgid ""
+"The missing programs are usually part of some distribution packages and can "
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"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:925
+#: ../plugins/project-wizard/druid.c:936
 msgid "Missing components"
 msgstr "é?ºå¤±å??件"
 
-#: ../plugins/project-wizard/druid.c:1057
+#: ../plugins/project-wizard/druid.c:1068
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "ç?¡æ³?建ç«?å°?æ¡?å?©ç??使ç?¨è??ä»?é?¢è®?å?? %sã??"
@@ -7303,36 +6682,29 @@ msgstr "ç?¡æ³?解é??å°?æ¡?ç¯?æ?¬ %sï¼?%s"
 msgid "New Project Assistant"
 msgstr "æ?°å°?æ¡?å?©ç??"
 
-#: ../plugins/project-wizard/property.c:338
-#: ../plugins/project-wizard/property.c:449
-msgid "No"
-msgstr "å?¦"
-
-#: ../plugins/project-wizard/property.c:349
+#: ../plugins/project-wizard/property.c:340
 msgid "Select directory"
 msgstr "é?¸æ??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:357
+#: ../plugins/project-wizard/property.c:348
 msgid "Select file"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:407
-#: ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:398 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "é?¸æ??å??ç??æª?æ¡?"
 
-#: ../plugins/project-wizard/property.c:432
-#: ../plugins/project-wizard/property.c:522
-#: ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:423
+#: ../plugins/project-wizard/property.c:511 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "é?¸æ??å??示"
 
-#: ../plugins/project-wizard/property.c:492
+#: ../plugins/project-wizard/property.c:481
 msgid "Choose directory"
 msgstr "é?¸å??ç?®é??"
 
-#: ../plugins/project-wizard/property.c:496
+#: ../plugins/project-wizard/property.c:485
 msgid "Choose file"
 msgstr "é?¸å??æª?æ¡?"
 
@@ -7342,7 +6714,7 @@ msgid "A generic minimal and flat project"
 msgstr "é??ç?¨ã??æ??å°?å??ç??æ?®é??å°?æ¡?"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:2
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:1
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:1
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:2
@@ -7354,7 +6726,7 @@ msgstr "�� C++ ���"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:3
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:3
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:3
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:4
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:4
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:3
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:4
@@ -7366,7 +6738,7 @@ msgid "Add shared library support:"
 msgstr "���享��庫���"
 
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:5
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:5
@@ -7378,7 +6750,7 @@ msgstr "å?¨å°?æ¡?å? å?¥ C++ æ?¯æ?´ä»¥ä¾¿ç·¨è­¯ C++ å??å§?碼æª?æ¡?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:5
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:4
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:7
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:6
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:5
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:4
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:6
@@ -7389,10 +6761,29 @@ msgstr "å?¨å°?æ¡?å? å?¥ C++ æ?¯æ?´ä»¥ä¾¿ç·¨è­¯ C++ å??å§?碼æª?æ¡?"
 msgid "Adds support for building shared libraries in your project"
 msgstr "å?¨æ?¨ç??å°?æ¡?中å? å?¥ç·¨è­¯å?±äº«ç¨?å¼?庫ç??æ?¯æ?´"
 
+#: ../plugins/project-wizard/templates/minimal.wiz.in.h:6
+#: ../plugins/project-wizard/templates/terminal.wiz.in.h:6
+#: ../plugins/project-wizard/templates/cpp.wiz.in.h:6
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:5
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:7
+#: ../plugins/project-wizard/templates/wxwin.wiz.in.h:6
+#: ../plugins/project-wizard/templates/xlib.wiz.in.h:8
+#: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gcj.wiz.in.h:6
+#: ../plugins/project-wizard/templates/java.wiz.in.h:7
+#: ../plugins/project-wizard/templates/js.wiz.in.h:2
+#: ../plugins/project-wizard/templates/python.wiz.in.h:7
+#: ../plugins/project-wizard/templates/pygtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/sdl.wiz.in.h:6
+#: ../plugins/project-wizard/templates/library.wiz.in.h:6
+msgid "Author:"
+msgstr "ä½?è??ï¼?"
+
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:7
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:7
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:10
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:9
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:6
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:8
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:7
@@ -7411,7 +6802,7 @@ msgstr "����"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:8
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:8
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:8
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:11
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:10
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:7
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:9
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:8
@@ -7446,7 +6837,7 @@ msgstr "檢æ?¥æ?¨ç??å°?æ¡?é??è¦?ç??å¥?件"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:10
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:10
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:11
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:10
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:11
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:10
@@ -7463,7 +6854,7 @@ msgstr "設����件"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:11
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:11
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:11
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:13
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:12
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:11
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:12
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:11
@@ -7480,7 +6871,7 @@ msgstr "設����件�"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:13
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:13
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:14
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:17
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:14
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:13
@@ -7500,7 +6891,7 @@ msgstr "é?»å­?é?µä»¶ä½?å??ï¼?"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:14
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:14
 #: ../plugins/project-wizard/templates/django.wiz.in.h:4
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:17
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:16
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:18
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:16
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:14
@@ -7523,7 +6914,7 @@ msgstr "ä¸?è?¬ (æ??å°?)"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:18
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:18
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:21
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:20
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:26
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:19
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:17
@@ -7542,7 +6933,7 @@ msgstr "æ??æ¬?æ¢?款"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:19
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:19
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:19
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:22
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:21
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:28
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:20
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:18
@@ -7561,7 +6952,7 @@ msgstr "æ²?æ??æ??æ¬?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:20
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:20
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:20
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:23
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:22
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:29
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:21
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:19
@@ -7581,7 +6972,7 @@ msgstr "å°?æ¡?編譯系統ç??é?¸é ?"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:21
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:21
 #: ../plugins/project-wizard/templates/django.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:24
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:23
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:37
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:22
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:20
@@ -7600,7 +6991,7 @@ msgstr "å°?æ¡?å??稱ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:22
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:22
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:22
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:24
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:39
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:23
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:21
@@ -7636,7 +7027,7 @@ msgstr "é??è¦?ç??å¥?件ï¼?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:24
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:24
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:26
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:41
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:25
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:23
@@ -7655,9 +7046,9 @@ msgstr "é?¸æ??å??å§?碼æ??æ¬?"
 #: ../plugins/project-wizard/templates/minimal.wiz.in.h:25
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:25
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:25
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
 #: ../plugins/project-wizard/templates/anjuta-plugin.wiz.in.h:43
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:24
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:26
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:26
@@ -7673,8 +7064,8 @@ msgstr "使ç?¨ pkg-config å¾?å?¶ä»?å¥?件å? å?¥ç¨?å¼?庫ç??æ?¯æ?´"
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:27
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:27
 #: ../plugins/project-wizard/templates/django.wiz.in.h:7
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:31
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:33
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:31
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:27
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:29
 #: ../plugins/project-wizard/templates/xlib-dock.wiz.in.h:29
@@ -7694,7 +7085,7 @@ msgstr "����"
 
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:2
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:2
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:4
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:3
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:3
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:2
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:3
@@ -7710,7 +7101,7 @@ msgstr "å? å?¥å??é??å??å??è?½ï¼?"
 
 #: ../plugins/project-wizard/templates/terminal.wiz.in.h:5
 #: ../plugins/project-wizard/templates/cpp.wiz.in.h:5
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:8
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:7
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:6
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:5
 #: ../plugins/project-wizard/templates/xlib.wiz.in.h:7
@@ -7721,7 +7112,9 @@ msgstr "å? å?¥å??é??å??å??è?½ï¼?"
 #: ../plugins/project-wizard/templates/pygtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/sdl.wiz.in.h:5
 #: ../plugins/project-wizard/templates/library.wiz.in.h:5
-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:16
@@ -7748,31 +7141,49 @@ msgstr "Django ����"
 msgid "Python webproject using Django Web Framework"
 msgstr "使ç?¨ Django Web æ?¶æ§?ç?? Python 網路å°?æ¡?"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:1
-msgid "A generic GTK+ project"
-msgstr "�� GTK+ ��"
-
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:3
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:2
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:2
 #: ../plugins/project-wizard/templates/java.wiz.in.h:2
 #: ../plugins/project-wizard/templates/python.wiz.in.h:2
 msgid "Add gtk-doc system:"
 msgstr "�� gtk-doc 系統�"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:16
-msgid "GTK+"
-msgstr "GTK+"
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:15
+msgid "GTK+ (simple)"
+msgstr "GTK+ (ç°¡æ??)"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:19
-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:18
+msgid ""
+"Give a package name that your project require. You may also mention what is "
+"the required version of the package. For example, 'libgnomeui-2.0' or "
+"'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
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:25
 msgid "Require Package:"
 msgstr "é??è¦?å¥?件ï¼?"
 
-#: ../plugins/project-wizard/templates/gtk.wiz.in.h:30
-#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:27
+msgid "Simple GTK+ project"
+msgstr "ç°¡æ?? GTK+ å°?æ¡?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:28
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:26
+msgid "Use GtkBuilder for user interface:"
+msgstr "使ç?¨ GtkBuilder å??使ç?¨è??ä»?é?¢ï¼?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:29
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:27
+msgid ""
+"Use GtkBuilder to create the user-interface in a graphical way and load it "
+"from xml files at runtime"
+msgstr ""
+"使ç?¨ GtkBuilder 以å??å½¢å??ç??æ?¹å¼?建ç«?使ç?¨è??ä»?é?¢ä¸¦å?¨å?·è¡?æ??é??å¾? xml æª?æ¡?è¼?å?¥å®?"
+
+#: ../plugins/project-wizard/templates/gtk.wiz.in.h:32
+#: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:30
 #: ../plugins/project-wizard/templates/java.wiz.in.h:30
 #: ../plugins/project-wizard/templates/python.wiz.in.h:28
 msgid "gtk-doc is used to compile API documentations for GObject based classes"
@@ -7787,8 +7198,12 @@ msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "使ç?¨ libanjuta æ?¶æ§?ç?? Anjuta å¤?æ??ç¨?å¼?å°?æ¡?"
 
 #: ../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)"
+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:12
 msgid "Create Gtk Builder interface file"
@@ -7859,8 +7274,11 @@ 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"
@@ -7879,12 +7297,12 @@ msgid "Whether the plugin has menus or toolbars"
 msgstr "å¤?æ??ç¨?å¼?æ?¯å?¦å?·æ??é?¸å?®æ??å·¥å?·å??"
 
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:1
-msgid "A generic GTKmm (C++) project"
-msgstr "�� GTKmm (C++) ��"
+msgid "A minimal GTKmm project"
+msgstr "æ??å°? GTKmm å°?æ¡?"
 
 #: ../plugins/project-wizard/templates/gtkmm.wiz.in.h:15
-msgid "GTKmm"
-msgstr "GTKmm"
+msgid "GTKmm (Simple)"
+msgstr "GTKmm (ç°¡æ??)"
 
 #: ../plugins/project-wizard/templates/wxwin.wiz.in.h:1
 msgid "A generic wx Widgets project"
@@ -7911,7 +7329,8 @@ 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:14
@@ -8093,11 +7512,11 @@ msgstr "å·¥ä½?ç?®é??ï¼?"
 msgid "Program directory '%s' is not local"
 msgstr "ç¨?å¼?ç?®é??ã??%sã??ä¸?å?¨æ?¬å?°ç«¯"
 
-#: ../plugins/run-program/parameters.c:300
+#: ../plugins/run-program/parameters.c:303
 msgid "Load Target to run"
 msgstr "����以��"
 
-#: ../plugins/run-program/parameters.c:617
+#: ../plugins/run-program/parameters.c:620
 #, c-format
 msgid "Missing file %s"
 msgstr "�失�� %s"
@@ -8293,8 +7712,7 @@ 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 "é??è¤?ä¸?ä¸?å??æ??å°?æ??令"
 
@@ -8307,11 +7725,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 "æ??å°?å??å??代"
 
@@ -8521,11 +7939,14 @@ 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!"
+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 "<b>Error:</b> The trigger key can only contain alphanumeric characters and _ !"
+msgid ""
+"<b>Error:</b> The trigger key can only contain alphanumeric characters and "
+"_ !"
 msgstr "<b>é?¯èª¤ï¼?</b>觸ç?¼é?µå?ªè?½å??å?«è?±æ??å­?æ¯?å?? _ï¼?"
 
 #: ../plugins/snippets-manager/snippets-editor.c:51
@@ -8540,10 +7961,6 @@ msgstr "<b>é?¯èª¤ï¼?</b>æ??å­?ç??段å¿?é ?屬æ?¼æ??å??群çµ?ï¼?"
 msgid "<b>Warning:</b> You should choose a name for the snippet!"
 msgstr "<b>è­¦å??ï¼?</b>æ?¨æ??該ç?ºæ??å­?ç??段é?¸æ??ä¸?å??å??稱ï¼?"
 
-#: ../plugins/snippets-manager/snippets-editor.ui.h:3
-msgid "Add"
-msgstr "å? å?¥"
-
 #: ../plugins/snippets-manager/snippets-editor.ui.h:4
 msgid "Close"
 msgstr "é??é??"
@@ -8553,8 +7970,12 @@ 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 "é??é?µå­?å?¯ä»¥ç?¨ä¾?å??å?©æ??å°?æ??å­?ç??段ã??å®?å??æ??該è??æ??å­?ç??段ç??å?§å®¹æ??æ??é??è?¯ã??輸å?¥æ??è«?以ä¸?å??空ç?½å­?å??å??ç?ºå??é??ã??"
+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:"
@@ -8606,10 +8027,13 @@ 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"
+"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"
+"觸ç?¼é?µæ?¯ç?¨æ?¼å¿«é??æ??å?¥æ??å­?ç??段ã??å?¨ç·¨è¼¯å?¨ä¸­è¼¸å?¥è§¸ç?¼é?µï¼?æ?¥è??使ç?¨ã??å¿«é??æ??å?¥ã??ç??æ?·"
+"å¾?é?µä¾?æ??å?¥æ??å­?ç??段ã??\n"
 "<b>è­¦å??ï¼?觸ç?¼é?µå¿?é ?æ?¯æ¯?å??èª?è¨?å??è?ªç?¨ç«?ã??</b>"
 
 #: ../plugins/snippets-manager/snippets-editor.ui.h:23
@@ -8628,7 +8052,7 @@ msgstr "å?¯å?¥æ??å­?ç??段"
 msgid "Export Snippets"
 msgstr "å?¯å?ºæ??å­?ç??段"
 
-#: ../plugins/sourceview/sourceview.c:481
+#: ../plugins/sourceview/sourceview.c:480
 #, c-format
 msgid ""
 "The file \"%s\" on the disk is more recent than the current buffer.\n"
@@ -8637,7 +8061,7 @@ msgstr ""
 "å?¨ç¡¬ç¢?å?§æª?æ¡?ã?? %sã?? ç??å?§å®¹æ¯?ç?®å??ç??ç·©è¡?å??å?§å®¹é??è¦?æ?°ã??\n"
 "æ?¯å?¦è¦?é??æ?°è¼?å?¥å®?ï¼? "
 
-#: ../plugins/sourceview/sourceview.c:518
+#: ../plugins/sourceview/sourceview.c:517
 #, c-format
 msgid ""
 "The file \"%s\" has been deleted on the disk.\n"
@@ -8647,18 +8071,18 @@ msgstr ""
 "æ?¯å?¦è¦?é??é??å®?ï¼? "
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:555
+#: ../plugins/sourceview/sourceview.c:554
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "ç?¡æ³?é??å?? %sï¼?%s"
 
-#: ../plugins/sourceview/sourceview.c:609
+#: ../plugins/sourceview/sourceview.c:608
 #, c-format
 msgid "The file \"%s\" is read-only! Edit anyway?"
 msgstr "æª?æ¡?ã??%sã??æ?¯å?¯è®?ç??ï¼?ä»?ç?¶è¦?編輯å??ï¼?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:668
+#: ../plugins/sourceview/sourceview.c:667
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "������ %s�%s"
@@ -8682,22 +8106,18 @@ msgid "Wrap lines"
 msgstr "æ??å??"
 
 #: ../plugins/sourceview/sourceview-print.c:113
-#| msgid "Show Line Numbers"
 msgid "Line numbers"
 msgstr "å??è??"
 
 #: ../plugins/sourceview/sourceview-print.c:115
-#| msgid "Head"
 msgid "Header"
 msgstr "��"
 
 #: ../plugins/sourceview/sourceview-print.c:117
-#| msgid "Filter"
 msgid "Footer"
 msgstr "é ?å°¾"
 
 #: ../plugins/sourceview/sourceview-print.c:119
-#| msgid "_Highlight Mode"
 msgid "Highlight source code"
 msgstr "æ¨?示å??å§?碼"
 
@@ -8766,13 +8186,11 @@ msgid "Use theme font"
 msgstr "使ç?¨ä¸»é¡?ç??å­?å??"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
-#: ../src/anjuta-app.c:631
-#: ../src/anjuta-app.c:636
+#: ../src/anjuta-app.c:633 ../src/anjuta-app.c:638
 msgid "View"
 msgstr "顯示"
 
-#: ../plugins/starter/plugin.c:70
-#: ../plugins/starter/starter.c:353
+#: ../plugins/starter/plugin.c:70 ../plugins/starter/starter.c:353
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "èµ·æ­¥"
@@ -8809,6 +8227,10 @@ msgstr "å? å?¥æª?æ¡?/ç?®é??"
 msgid "Branch/Tag URL:"
 msgstr "å??æ?¯/æ¨?籤 URL:"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:7
+msgid "Commit Changes"
+msgstr "æ??交修æ?¹"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:8
 msgid "Copy files/folders"
 msgstr "è¤?製æª?æ¡?/è³?æ??夾"
@@ -8885,6 +8307,10 @@ msgstr "��庫 Head"
 msgid "Repository authorization"
 msgstr "��庫��"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:35
+msgid "Retrieving statusâ?¦"
+msgstr "æ­£å?¨å??å¾?ç??æ??â?¦"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
 msgid "Retrieving status��"
 msgstr "æ­£å?¨å??å¾?ç??æ??â?¦â?¦"
@@ -8905,6 +8331,18 @@ msgstr "第�路��"
 msgid "Select Changes to Revert:"
 msgstr "é?¸æ??è¦?復å??ç??è®?æ?´ï¼?"
 
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
+msgid "Select Files to Commit:"
+msgstr "é?¸æ??è¦?æ??交ç??æª?æ¡?ï¼?"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
+msgid "Select Files to Mark as Resolved:"
+msgstr "é?¸æ??è¦?æ¨?è¨?ç?ºå·²è§£æ±ºç??æª?æ¡?ï¼?"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
+msgid "Set Conflicts as Resolved"
+msgstr "���設��已解決"
+
 #: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "ä¾?æº?/ç?®ç??è·¯å¾?ï¼?"
@@ -8971,25 +8409,40 @@ 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"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:60 ../plugins/subversion/plugin.c:175
+msgid "_Addâ?¦"
+msgstr "å? å?¥(_A)â?¦"
+
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:62
-#: ../plugins/subversion/plugin.c:177
+#: ../plugins/subversion/plugin.c:62 ../plugins/subversion/plugin.c:177
 msgid "Add a new file/directory to the Subversion tree"
 msgstr "å? å?¥æ?°æª?æ¡?/ç?®é??è?³ Subversion 樹"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+msgid "_Removeâ?¦"
+msgstr "移�(_R)�"
+
 #. Display label
 #. short-cut
-#: ../plugins/subversion/plugin.c:70
-#: ../plugins/subversion/plugin.c:185
+#: ../plugins/subversion/plugin.c:70 ../plugins/subversion/plugin.c:185
 msgid "Remove a file/directory from Subversion tree"
 msgstr "å¾? Subversion 樹移é?¤æª?æ¡?/ç?®é?? "
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/subversion/plugin.c:76
+msgid "_Commitâ?¦"
+msgstr "_Commitâ?¦"
+
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:78
@@ -8998,15 +8451,13 @@ 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 "å??復è®?æ?´è?³æ?¨ç??å·¥ä½?è¤?æ?¬ã??"
 
@@ -9024,15 +8475,13 @@ 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 樹å??æ­¥"
 
@@ -9044,8 +8493,7 @@ 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 "è¤?製æª?æ¡?庫中ç??æª?æ¡?/è³?æ??夾"
 
@@ -9075,15 +8523,13 @@ 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 "檢���歷�"
 
@@ -9095,8 +8541,7 @@ 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 "æ¯?å°?æ?¬å?°ç«¯æª?æ¡?樹è??æª?æ¡?庫ç??å·®ç?°"
 
@@ -9128,6 +8573,13 @@ msgstr "Subversion ç´?é??"
 msgid "Subversion: File will be added on next commit."
 msgstr "Subversion: å?¨ä¸?次æ??交æ??å°?å? å?¥æ­¤æª?æ¡?ã??"
 
+#: ../plugins/subversion/subversion-add-dialog.c:65
+#: ../plugins/subversion/subversion-diff-dialog.c:116
+#: ../plugins/subversion/subversion-remove-dialog.c:98
+#: ../plugins/subversion/subversion-update-dialog.c:68
+msgid "Please enter a path."
+msgstr "è«?輸å?¥è·¯å¾?ã??"
+
 #: ../plugins/subversion/subversion-commit-dialog.c:39
 msgid "Subversion: Commit complete."
 msgstr "Subversion: æ??交å®?æ??ã??"
@@ -9162,6 +8614,14 @@ msgstr "Subversionï¼?æ­£å?¨å??å?? diffâ?¦"
 msgid "Diff"
 msgstr "差�"
 
+#: ../plugins/subversion/subversion-log-dialog.c:132
+msgid "Author"
+msgstr "ä½?è??"
+
+#: ../plugins/subversion/subversion-log-dialog.c:141
+msgid "Date"
+msgstr "æ?¥æ??"
+
 #: ../plugins/subversion/subversion-log-dialog.c:151
 msgid "Revision"
 msgstr "ä¿®è¨?ç??"
@@ -9322,116 +8782,94 @@ msgstr "�失� %s"
 msgid "Obstructed: %s"
 msgstr "æ??é?»ç¤?ï¼?%s"
 
-#: ../plugins/symbol-db/plugin.c:317
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag De_claration"
 msgstr "æ¨?籤宣å??(_C)"
 
-#: ../plugins/symbol-db/plugin.c:319
+#: ../plugins/symbol-db/plugin.c:328
 msgid "Go to symbol declaration"
 msgstr "移è?³ä¸?ä¸?å??符è??宣å??"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:326
+#: ../plugins/symbol-db/plugin.c:335
 msgid "Tag _Implementation"
 msgstr "�籤實�(_I)"
 
-#: ../plugins/symbol-db/plugin.c:328
+#: ../plugins/symbol-db/plugin.c:337
 msgid "Go to symbol definition"
 msgstr "移è?³ä¸?ä¸?å??符è??å®?義"
 
-#: ../plugins/symbol-db/plugin.c:335
+#: ../plugins/symbol-db/plugin.c:344
 msgid "_Find Symbolâ?¦"
 msgstr "å°?æ?¾ç¬¦è??(_F)â?¦"
 
-#: ../plugins/symbol-db/plugin.c:336
+#: ../plugins/symbol-db/plugin.c:345
 msgid "Find Symbol"
 msgstr "å°?æ?¾ç¬¦è??"
 
-#: ../plugins/symbol-db/plugin.c:1013
+#: ../plugins/symbol-db/plugin.c:1010
 #, c-format
 msgid "%s: Generating inheritancesâ?¦"
 msgstr "%sï¼?æ­£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1018
+#: ../plugins/symbol-db/plugin.c:1015
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%1$sï¼?%3$d å??æª?æ¡?中已æ??æ?? %2$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1049
+#: ../plugins/symbol-db/plugin.c:1046
 #, c-format
 msgid "Generating inheritancesâ?¦"
 msgstr "æ­£å?¨ç?¢ç??é??é?°ç¹¼æ?¿é«?ç³»â?¦"
 
-#: ../plugins/symbol-db/plugin.c:1051
+#: ../plugins/symbol-db/plugin.c:1048
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "%2$d å??æª?æ¡?中已æ??æ?? %1$d å??"
 
-#: ../plugins/symbol-db/plugin.c:1786
+#: ../plugins/symbol-db/plugin.c:1798
 msgid "Populating symbol databaseâ?¦"
 msgstr "æ­£å?¨é?·ç§»ç¬¦è??è³?æ??庫â?¦"
 
-#: ../plugins/symbol-db/plugin.c:2106
-#: ../plugins/symbol-db/plugin.c:2191
+#: ../plugins/symbol-db/plugin.c:2119 ../plugins/symbol-db/plugin.c:2204
 msgid "Symbols"
 msgstr "符è??"
 
-#: ../plugins/symbol-db/plugin.c:2200
+#: ../plugins/symbol-db/plugin.c:2213
 msgid "SymbolDb popup actions"
 msgstr "SymbolDb å½?å?ºå¼?å??ä½?"
 
-#: ../plugins/symbol-db/plugin.c:2208
+#: ../plugins/symbol-db/plugin.c:2221
 msgid "SymbolDb menu actions"
 msgstr "SymbolDb é?¸å?®å??ä½?"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:275
-msgid "Package is not parseable"
-msgstr "å¥?件æ?¯ç?¡æ³?解æ??ç??"
-
-#: ../plugins/symbol-db/symbol-db-prefs.c:375
-#: ../plugins/symbol-db/symbol-db-prefs.c:522
+#: ../plugins/symbol-db/plugin.c:2529 ../plugins/symbol-db/plugin.c:2547
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "符è??è³?æ??庫"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:472
-msgid "API Tags"
-msgstr "API �籤"
-
-#: ../plugins/symbol-db/symbol-db-system.c:817
+#: ../plugins/symbol-db/symbol-db-system.c:808
 msgid "Resuming glb scan."
 msgstr "ç¹¼çº? glb æ??æ??ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "Automatically scan project's packages"
-msgstr "è?ªå??æ??æ??å°?æ¡?ç??å¥?件"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
 msgid "Automatically update symbols without saving file"
 msgstr "ä¸?å?²å­?æª?æ¡?è??è?ªå??æ?´æ?°ç¬¦è??"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically update the file's symbols without saving. The update occurs after 10 seconds without keypresses by the user."
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
 msgstr "ä¸?é??å?²å­?å°±è?ªå??æ?´æ?°æª?æ¡?ç??符è??ã??æ­¤æ?´æ?°æ??å?¨ä½¿ç?¨è??å??止輸å?¥ç?? 10 ç§?å¾?é?²è¡?ã??"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Available API tags"
-msgstr "å?¯ç?¨ç?? API æ¨?籤"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseableâ?¦"
-msgstr "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??â?¦"
-
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "å°?æ¡?å??å?¨å??符è??ç??å¹³è¡?æ??æ??"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
-msgid "This option enables the default packages required by your opened project, e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
-msgstr "é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? 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"
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
+msgid ""
+"This option means that the global system packages will be scanned "
+"simultaneously with the project's ones"
 msgstr "é??å??é?¸é ?示å?¨å??系統å¥?件æ??è??å°?å®?ä¸?樣被æ??æ??"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
@@ -9462,8 +8900,7 @@ msgstr "Ctrl-Z"
 msgid "terminal operations"
 msgstr "çµ?端æ©?æ??ä½?"
 
-#: ../plugins/terminal/terminal.c:750
-#: ../plugins/terminal/terminal.c:944
+#: ../plugins/terminal/terminal.c:750 ../plugins/terminal/terminal.c:944
 #: ../plugins/terminal/terminal.c:995
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
@@ -9517,10 +8954,8 @@ msgstr "��輸��"
 msgid "Tool Editor"
 msgstr "工�編輯�"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
-#: ../plugins/tools/plugin.c:263
-#: ../plugins/tools/plugin.c:270
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:263
+#: ../plugins/tools/plugin.c:270 ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "工�"
 
@@ -9574,7 +9009,9 @@ 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
@@ -9809,7 +9246,7 @@ msgstr "�串"
 msgid "Copyright (c) Naba Kumar"
 msgstr "ç??æ¬?æ??æ?? © Naba Kumar"
 
-#: ../src/anjuta.c:432
+#: ../src/anjuta.c:454
 msgid "Loaded Sessionâ?¦"
 msgstr "å·²è¼?å?¥ä½?業é??段â?¦"
 
@@ -9945,58 +9382,62 @@ msgstr "é??æ?¼å¤?é?¨å¤?æ??ç¨?å¼?(_P)"
 msgid "About third-party Anjuta plugins"
 msgstr "é??æ?¼ç¬¬ä¸?æ?¹ Anjuta å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:627
+#: ../src/anjuta-app.c:629
 msgid "Edit"
 msgstr "編輯"
 
-#: ../src/anjuta-app.c:931
+#: ../src/anjuta-app.c:642
+msgid "Help"
+msgstr "æ±?å?©"
+
+#: ../src/anjuta-app.c:938
 msgid "Installed plugins"
 msgstr "å·²å®?è£?ç??å¤?æ??ç¨?å¼?"
 
-#: ../src/anjuta-app.c:935
+#: ../src/anjuta-app.c:942
 msgid "Shortcuts"
 msgstr "å¿«æ?·é?µ"
 
-#: ../src/anjuta-app.c:1007
+#: ../src/anjuta-app.c:1014
 #, c-format
 msgid "Value doesn't exist"
 msgstr "����"
 
-#: ../src/main.c:70
+#: ../src/main.c:67
 msgid "Specify the size and location of the main window"
 msgstr "æ??å®?主è¦?è¦?çª?ç??大å°?å??ä½?ç½®"
 
 #. This is the format you can specify the size andposition
 #. * of the window on command line
-#: ../src/main.c:73
+#: ../src/main.c:70
 msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
-#: ../src/main.c:78
+#: ../src/main.c:75
 msgid "Do not show the splash screen"
 msgstr "��顯示歡���"
 
-#: ../src/main.c:84
+#: ../src/main.c:81
 msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "å??å??æ?°ç??實é«?è??ä¸?å?¨æ?¢å­?ç??實é«?中é??å??æª?æ¡?"
 
-#: ../src/main.c:90
+#: ../src/main.c:87
 msgid "Do not open last session on startup"
 msgstr "å??å??æ??ä¸?è¦?é??å??æ??å¾?ä¸?次ä½?業é??段"
 
-#: ../src/main.c:96
+#: ../src/main.c:93
 msgid "Do not open last project and files on startup"
 msgstr "ä¸?è¦?å?¨å??å??æ??é??å??æ??å¾?ä¸?次編輯ç??å°?æ¡?å??æª?æ¡?"
 
-#: ../src/main.c:102
+#: ../src/main.c:99
 msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
 msgstr "é?©ç?¶ç??é??é?? Anjuta 並é??æ?¾æ??æ??è³?æº?ï¼?é?¤é?¯ç?¨ï¼?"
 
-#: ../src/main.c:170
+#: ../src/main.c:138
 msgid "- Integrated Development Environment"
 msgstr "- æ?´å??å¼?é??ç?¼ç?°å¢?"
 
-#: ../src/main.c:245
+#: ../src/main.c:181
 msgid "Anjuta"
 msgstr "Anjuta"
 
@@ -10063,114 +9504,130 @@ msgid "Do not display warning if not using a Debug configuration"
 msgstr "å¦?æ??ä¸?使ç?¨é?¤é?¯çµ?æ??æ??ä¸?è¦?顯示警å??"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
+msgid "API Tags (C/C++)"
+msgstr "API �籤 (C/C++)"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:1
 msgid "Add '(' after function call autocompletion"
 msgstr "å?¨å?½å¼?å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ '('"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:2
 msgid "Add a space after function call autocompletion"
 msgstr "å?¨å?½å¼?å?¼å?«è?ªå??è£?é½?å¾?å? å?¥ç©ºç?½"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
 msgid "Auto-complete"
 msgstr "è?ªå??è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:4
 msgid "Autocompletion"
 msgstr "è?ªå??è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+msgid "Automatically load required libraries of the project"
+msgstr "è?ªå??è¼?å?¥å°?æ¡?é??è¦?ç??ç¨?å¼?庫"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:5
 msgid "Brace indentation size in spaces:"
 msgstr "大æ?¬å¼§ç¸®æ??(空ç?½æ?¸)ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:6
 msgid "Calltips"
 msgstr "å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:8
 msgid "Enable code completion"
 msgstr "å??ç?¨ç¨?å¼?碼è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Enable smart brace completion"
 msgstr "å??ç?¨æ?ºæ?§å??æ?¬å¼§è£?é½?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:9
 msgid "Enable smart indentation"
 msgstr "å??ç?¨æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Indent:"
 msgstr "縮æ??ï¼?"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:11
 msgid "Indentation parameters"
 msgstr "縮æ??å??æ?¸"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 msgid "Leading asterisk in multi-line comment"
 msgstr "å¤?è¡?註解ç??é??é ­æ??è??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
 msgid "Line up parentheses"
 msgstr "å°?é½?æ?¬è??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
 msgid "Parenthesis indentation"
 msgstr "æ?¬è??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Prefer vim/emacs modelines over indentation settings"
 msgstr "å??好 vim/emacs modelines å??æ?¼ç¸®æ??設å®?å?¼"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:14
 #: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "顯示å?¼å?«æ??示"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:15
 msgid "Smart Indentation"
 msgstr "æ?ºæ?§å??縮æ??"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:20
 #: ../plugins/language-support-python/python-plugin-properties.ui.h:16
 msgid "Statement indentation size in spaces:"
 msgstr "é?³è¿°ç??縮æ??大å°?(空ç?½å­?å??)ï¼?"
 
 #. ANJUTA_STOCK_AUTOINDENT,
-#: ../plugins/language-support-cpp-java/plugin.c:1920
+#: ../plugins/language-support-cpp-java/plugin.c:967
 #: ../plugins/language-support-python/plugin.c:1185
 msgid "Auto-Indent"
 msgstr "è?ªå??縮æ??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
+#: ../plugins/language-support-cpp-java/plugin.c:968
 #: ../plugins/language-support-python/plugin.c:1186
 msgid "Auto-indent current line or selection based on indentation settings"
 msgstr "ä¾?縮æ??設å®?å?¼è?ªå??縮æ??ç?®å??ç??è¡?æ??é?¸æ??å??å??"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1926
+#: ../plugins/language-support-cpp-java/plugin.c:974
+msgid "Comment/Uncomment"
+msgstr "å? ä¸?/å??æ¶?å??註"
+
+#: ../plugins/language-support-cpp-java/plugin.c:975
+msgid "Comment or uncomment current selection"
+msgstr "å°?ç?®å??ç??é?¸æ??å??å??å? ä¸?æ??å??æ¶?å??註"
+
+#: ../plugins/language-support-cpp-java/plugin.c:980
 msgid "Swap .h/.c"
 msgstr "ç?¸äº?å??æ?? .h /.c æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1927
+#: ../plugins/language-support-cpp-java/plugin.c:981
 msgid "Swap C header and source files"
 msgstr "å??æ?? C æ¨?é ­æª?è??å??å§?æª?"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1967
+#: ../plugins/language-support-cpp-java/plugin.c:1021
 msgid "C++/Java Assistance"
 msgstr "C++/Java æ?´å?©"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2085
-#: ../plugins/language-support-cpp-java/plugin.c:2098
+#: ../plugins/language-support-cpp-java/plugin.c:1196
+#: ../plugins/language-support-cpp-java/plugin.c:1226
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -10226,18 +9683,17 @@ msgstr "�譯�"
 msgid "Path: "
 msgstr "路��"
 
-#: ../plugins/sourceview/plugin.c:238
-#: ../plugins/sourceview/plugin.c:279
+#: ../plugins/sourceview/plugin.c:238 ../plugins/sourceview/plugin.c:279
 msgid "GtkSourceView Editor"
 msgstr "GtkSourceView 編輯�"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:1
-msgid "GNU Debugger Plugin"
-msgstr "GNU Debugger å¤?æ??ç¨?å¼?"
+msgid "GNU Debugger"
+msgstr "GNU Debugger"
 
 #: ../plugins/gdb/anjuta-gdb.plugin.in.h:2
-msgid "Gdb"
-msgstr "Gdb"
+msgid "GNU Debugger Plugin"
+msgstr "GNU Debugger å¤?æ??ç¨?å¼?"
 
 #: ../plugins/git/git.plugin.in.h:2
 msgid "Git version control"
@@ -10291,14 +9747,6 @@ msgstr "給 Anjuta ç?? Glade å¤?æ??ç¨?å¼?ã??"
 msgid "Glade interface designer"
 msgstr "Glade ��設���"
 
-#: ../plugins/gtodo/anjuta-gtodo.plugin.in.h:1
-msgid "Task Manager"
-msgstr "å·¥ä½?管ç??å?¡"
-
-#: ../plugins/gtodo/anjuta-gtodo.plugin.in.h:2
-msgid "Todo Plugin for Anjuta."
-msgstr "給 Anjuta ç??å¾?辦äº?é ?å¤?æ??ç¨?å¼?ã??"
-
 #: ../plugins/patch/anjuta-patch.plugin.in.h:1
 msgid "Patch Plugin"
 msgstr "ä¿®è£?å¤?æ??ç¨?å¼?"
@@ -10380,8 +9828,8 @@ msgid "Anjuta Class Generator Plugin"
 msgstr "Anjuta é¡?å?¥ç?¢ç??å?¨å¤?æ??ç¨?å¼?"
 
 #: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:2
-msgid "C++/GObject Class"
-msgstr "C++/GObject é¡?å?¥"
+msgid "Class"
+msgstr "é¡?å?¥"
 
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
@@ -10436,7 +9884,6 @@ msgid "Autotools backend"
 msgstr "Autotools �端��"
 
 #: ../plugins/am-project/am-project.plugin.in.h:2
-#| msgid "Autotools backend for project manager"
 msgid "New Autotools backend for project manager"
 msgstr "å°?æ¡?管ç??ç¨?å¼?ç??æ?° Autotools å¾?端ç¨?å¼?"
 
@@ -10451,8 +9898,8 @@ msgid "Error: cant bind port"
 msgstr "�誤��������"
 
 #: ../plugins/js-debugger/js_debugger.plugin.in.h:1
-msgid "Anjuta JS Debugger Plugin"
-msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
+msgid "Javascript Debugger"
+msgstr "Javascript Debugger"
 
 #: ../plugins/js-debugger/js_debugger.plugin.in.h:2
 msgid "Javascript Debugger Plugin"
@@ -10503,6 +9950,821 @@ msgstr "è?ªå??è£?é½?ç??æ??å°?å­?å??"
 msgid "Symbol"
 msgstr "符è??"
 
+#~| msgid "Switch to another branch"
+#~ msgid "Switch to this branch"
+#~ msgstr "å??æ??è?³é??å??å??æ?¯"
+
+#~ msgid "Help display"
+#~ msgstr "顯示��"
+
+#~ msgid "_Add Bookmark"
+#~ msgstr "���籤(_A)"
+
+#~ msgid "Install directories:"
+#~ msgstr "å®?è£?ç?®é??ï¼?"
+
+#~ msgid "Add Remote Branch"
+#~ msgstr "å? å?¥é? ç«¯å??æ?¯"
+
+#~ msgid "Apply Stash"
+#~ msgstr "�� Stash"
+
+#~ msgid "Author/Grep"
+#~ msgstr "ä½?è??/Grep"
+
+#~ msgid "Bad revision:"
+#~ msgstr "ä¸?好ç??ç??æ?¬ï¼?"
+
+#~ msgid "Branch name:"
+#~ msgstr "å??æ?¯å??稱ï¼?"
+
+#~ msgid "Branch to switch to:"
+#~ msgstr "è¦?å??æ??å?°å??æ?¯ï¼?"
+
+#~ msgid "Branches to delete:"
+#~ msgstr "è¦?å?ªé?¤ç??å??æ?¯ï¼?"
+
+#~ msgid "Check out all local changes"
+#~ msgstr "Check out æ??æ??æ?¬å?°ç«¯ç??è®?æ?´"
+
+#~ msgid "Create Branch"
+#~ msgstr "建ç«?å??æ?¯"
+
+#~ msgid "Delete Branch"
+#~ msgstr "å?ªé?¤å??æ?¯"
+
+#~ msgid "Delete Remote Branch"
+#~ msgstr "å?ªé?¤é? ç«¯å??æ?¯"
+
+#~ msgid "Delete Tags"
+#~ msgstr "���籤"
+
+#~ msgid "Filters"
+#~ msgstr "é??濾æ¢?件"
+
+#~ msgid "From:"
+#~ msgstr "å¾?ï¼?"
+
+#~ msgid "Good revision:"
+#~ msgstr "è?¯å¥½ç??ç??æ?¬ï¼?"
+
+#~ msgid "Grep:"
+#~ msgstr "Grep:"
+
+#~ msgid "Head"
+#~ msgstr "Head"
+
+#~ msgid "Ignore Files"
+#~ msgstr "忽���:"
+
+#~ msgid "Mailbox file containing patches:"
+#~ msgstr "å??å?«ä¿®è£?ç??ä¿¡ç®±æª?æ¡?ï¼?"
+
+#~ msgid "Mode:"
+#~ msgstr "模��"
+
+#~ msgid "Previous commit"
+#~ msgstr "å??ä¸?次æ??交"
+
+#~ msgid "Remote branch to rebase from:"
+#~ msgstr "è¦?ç?¨ä¾?é?²è¡? rebase ç??é? ç«¯å??æ?¯ï¼?"
+
+#~ msgid "Remote to delete:"
+#~ msgstr "è¦?å?ªé?¤ç??é? ç«¯ï¼?"
+
+#~ msgid "Repository origin"
+#~ msgstr "��庫�頭"
+
+#~ msgid "Reset to:"
+#~ msgstr "é??設ç?ºï¼?"
+
+#~ msgid "Restore index"
+#~ msgstr "é??å??ç´¢å¼?"
+
+#~ msgid "Revert Commit"
+#~ msgstr "å??復æ??交"
+
+#~ msgid "Revision/Tag:"
+#~ msgstr "ä¿®è¨?ç??/æ¨?籤:"
+
+#~ msgid "Select Files to Check Out:"
+#~ msgstr "é?¸æ??è¦?å??å??ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select Files to Ignore:"
+#~ msgstr "é?¸æ??è¦?忽ç?¥ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select Files to Unstage:"
+#~ msgstr "é?¸æ??è¦? Unstage ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select Mailbox File"
+#~ msgstr "é?¸æ??ä¿¡ç®±æª?æ¡?"
+
+#~ msgid "Select a Folder"
+#~ msgstr "é?¸æ??è³?æ??夾"
+
+#~ msgid "Select file to add:"
+#~ msgstr "é?¸æ??è¦?å? å?¥ç??æª?æ¡?ï¼?"
+
+#~ msgid "Select file to remove:"
+#~ msgstr "é?¸æ??è¦?移é?¤ç??æª?æ¡?ï¼?"
+
+#~ msgid "Show the contents of the selected stash in an editor"
+#~ msgstr "顯示å?¨ç·¨è¼¯å?¨ä¸­é?¸å?? stash ç??å?§å®¹"
+
+#~ msgid "Stash the working tree's uncommitted changes"
+#~ msgstr "Stash working tree 中æ?ªæ??交ç??è®?æ?´"
+
+#~ msgid "Switch to Another Branch"
+#~ msgstr "å??æ??è?³å?¦ä¸?å??å??æ?¯"
+
+#~ msgid "Tag name:"
+#~ msgstr "æ¨?籤å??稱ï¼?"
+
+#~ msgid "Tag/Commit"
+#~ msgstr "æ¨?籤/æ??交"
+
+#~ msgid "Tags to delete:"
+#~ msgstr "è¦?å?ªé?¤ç??æ¨?籤ï¼?"
+
+#~ msgid "To:"
+#~ msgstr "å?°ï¼?"
+
+#~ msgid "View log"
+#~ msgstr "檢è¦?ç´?é??"
+
+#~ msgid "page 3"
+#~ msgstr "é ? 3"
+
+#~ msgid "Please select a file."
+#~ msgstr "è«?é?¸æ??ä¸?å??æª?æ¡?ã??"
+
+#~ msgid "Git: Added remote branch \"%s\"."
+#~ msgstr "Gitï¼?å? å?¥é? ç«¯å??æ?¯ã??%sã??ã??"
+
+#~ msgid "Git: Fetchingâ?¦"
+#~ msgstr "Gitï¼?æ­£å?¨å??å??â?¦"
+
+#~ msgid "Please select a mailbox file."
+#~ msgstr "è«?é?¸æ??ä¸?å??ä¿¡ç®±æª?æ¡?ã??"
+
+#~ msgid "Git: File retrieved."
+#~ msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+
+#~ msgid "Git: Files checked out."
+#~ msgstr "Gitï¼?å·²å??å??æª?æ¡?ã??"
+
+#~ msgid "Git: Commit complete."
+#~ msgstr "Gitï¼?æ??交å®?æ??ã??"
+
+#~ msgid "Git: Created branch \"%s\"."
+#~ msgstr "Gitï¼?已建ç«?å??æ?¯ã??%sã??ã??"
+
+#~ msgid "Git: Created tag \"%s\"."
+#~ msgstr "Gitï¼?已建ç«?æ¨?籤ã??%sã??ã??"
+
+#~ msgid "Please select branches to delete"
+#~ msgstr "è«?é?¸æ??è¦?å?ªé?¤ç??å??æ?¯"
+
+#~| msgid "Stash Uncommitted Changes"
+#~ msgid "Uncommitted Changes.diff"
+#~ msgstr "Uncommitted Changes.diff"
+
+#~| msgid "_Show commit diff"
+#~ msgid "Commit %s.diff"
+#~ msgstr "Commit %s.diff"
+
+#~ msgid "Git: Fetch complete."
+#~ msgstr "Gitï¼?å??å??å·²å®?æ??ã??"
+
+#~ msgid "Graph"
+#~ msgstr "å??表"
+
+#~ msgid "Short log"
+#~ msgstr "ç?­ç´?é??"
+
+#~ msgid "Git: Retrieving logâ?¦"
+#~ msgstr "Gitï¼?æ­£å?¨å??å??ç´?é??æª?â?¦"
+
+#~ msgid "Select a file"
+#~ msgstr "é?¸æ??æª?æ¡?"
+
+#~ msgid "Git: Merge complete."
+#~ msgstr "Gitï¼?å??ä½µå®?æ??ã??"
+
+#~ msgid "Git: Pull complete."
+#~ msgstr "Gitï¼? Pull å·²å®?æ??ã??"
+
+#~ msgid "Please select a remote to pull from."
+#~ msgstr "è«?輸å?¥è¦? pull ç??é? ç«¯ã??"
+
+#~ msgid "Please enter the URL of the repository to pull from."
+#~ msgstr "è«?輸å?¥è¦? pull ç??æª?æ¡?庫 URLã??"
+
+#~ msgid "Git: Push complete."
+#~ msgstr "Git: Push complete."
+
+#~ msgid "Please select a remote to push to."
+#~ msgstr "è«?é?¸æ??è¦? push ç??é? ç«¯ã??"
+
+#~ msgid "Please enter the URL of the repository to push to."
+#~ msgstr "è«?輸å?¥è¦? push å?°ç??æª?æ¡?庫 URLã??"
+
+#~ msgid "Git: Pushingâ?¦"
+#~ msgstr "Gitï¼?Pushingâ?¦"
+
+#~ msgid "Git: Rebasing"
+#~ msgstr "Gitï¼?æ­£å?¨é??è¨?å?ºç¤?"
+
+#~ msgid "Git: File removed."
+#~ msgstr "Gitï¼?æª?æ¡?已移é?¤ã??"
+
+#~ msgid "Git: Resolve complete."
+#~ msgstr "Gitï¼?調解已å®?æ??ã??"
+
+#~ msgid "Git: Stash dropped."
+#~ msgstr "Gitï¼?Stash å·²æ?¾æ£?ã??"
+
+#~ msgid "Git: All stashes cleared."
+#~ msgstr "Gitï¼?æ??æ?? stashe å·²æ¸?é?¤ã??"
+
+#~ msgid "Git: Branch checkout complete."
+#~ msgstr "Gitï¼?å??å??å??æ?¯å®?æ??ã??"
+
+#~ msgid "There are no branches available."
+#~ msgstr "æ²?æ??å?¯ç?¨ç??å??æ?¯ã??"
+
+#~ msgid "Please select a stash"
+#~ msgstr "è«?é?¸æ??ä¸?å?? stash"
+
+#~ msgid "Git: Changes stored in a stash."
+#~ msgstr "Gitï¼?å?²å­?å?¨ stash ç??è®?æ?´ã??"
+
+#~ msgid "Git: Stashed changes applied."
+#~ msgstr "Gitï¼?å¥?ç?¨å·² stash ç??è®?æ?´ã??"
+
+#~ msgid "Git: Diff complete."
+#~ msgstr "Gitï¼?å·®ç?°æ¯?å°?å®?æ??ã??"
+
+#~ msgid "Git: Files unstaged."
+#~ msgstr "Gitï¼?æª?æ¡?å·² unstageã??"
+
+#~ msgid "_Git"
+#~ msgstr "_Git"
+
+#~ msgid "_Changes"
+#~ msgstr "è®?æ?´(_C)"
+
+#~ msgid "Commit changes to the local repository"
+#~ msgstr "æ??交è®?æ?´è?³æ?¬å?°ç«¯æª?æ¡?庫"
+
+#~ msgid "_Stash"
+#~ msgstr "_Stash"
+
+#~ msgid "Save uncommitted changes and re-apply them later"
+#~ msgstr "å°?æ?ªæ??交ç??è®?æ?´å?²å­?並å?¨ç¨?å¾?é??æ?°å¥?ç?¨å®?å??"
+
+#~ msgid "_Apply stashed changesâ?¦"
+#~ msgstr "��已 stash ��(_A)�"
+
+#~ msgid "_View logâ?¦"
+#~ msgstr "檢è¦?ç´?é??æª?(_V)â?¦"
+
+#~ msgid "View change history"
+#~ msgstr "檢è¦?è®?æ?´æ­·å?²ç´?é??"
+
+#~ msgid "_Pushâ?¦"
+#~ msgstr "_Pushâ?¦"
+
+#~ msgid "_Pullâ?¦"
+#~ msgstr "_Pullâ?¦"
+
+#~ msgid "Update the working copy"
+#~ msgstr "��工���"
+
+#~ msgid "Update remote branches"
+#~ msgstr "æ?´æ?°é? ç«¯å??æ?¯"
+
+#~ msgid "_Files"
+#~ msgstr "��(_F)"
+
+#~ msgid "_Ignoreâ?¦"
+#~ msgstr "忽�(_I)�"
+
+#~ msgid "Ignore files"
+#~ msgstr "忽���"
+
+#~ msgid "_Check out filesâ?¦"
+#~ msgstr "_Check out ���"
+
+#~ msgid "_Unstage filesâ?¦"
+#~ msgstr "��� _Unstage�"
+
+#~ msgid "Create patch seriesâ?¦"
+#~ msgstr "建� patch series�"
+
+#~ msgid "Generate patch files for submission upstream"
+#~ msgstr "å¾?æ??交ä¸?游ç?¢ç??ä¿®è£?æª?æ¡?"
+
+#~ msgid "_Applyâ?¦"
+#~ msgstr "��(_A)�"
+
+#~ msgid "Start applying a patch series"
+#~ msgstr "é??å§?å¥?ç?¨ patch series"
+
+#~ msgid "_Skip current patch"
+#~ msgstr "忽ç?¥ç?®å??ç??ä¿®è£?æª?(_S)"
+
+#~ msgid "_Branches"
+#~ msgstr "å??æ?¯(_B)"
+
+#~ msgid "_Create branchâ?¦"
+#~ msgstr "建� bran_ch�"
+
+#~ msgid "_Delete branchâ?¦"
+#~ msgstr "�� branch(_D)�"
+
+#~ msgid "Delete branches"
+#~ msgstr "å?ªé?¤å??æ?¯"
+
+#~ msgid "_Switch to another branchâ?¦"
+#~ msgstr "å??æ??è?³å?¦ä¸?å?? branch(_S)â?¦"
+
+#~ msgid "_Mergeâ?¦"
+#~ msgstr "_Mergeâ?¦"
+
+#~ msgid "Merge changes from another branch into the current one"
+#~ msgstr "å¾?å?¦ä¸?å??å??æ?¯å??ä½µè®?æ?´è?³ç?®å??ç??å??æ?¯"
+
+#~ msgid "_Rebase"
+#~ msgstr "_Rebase"
+
+#~ msgid "Merge your changes with an upstream remote branch"
+#~ msgstr "å°?æ?¨ç??è®?æ?´è??ä¸?游é? ç«¯å??æ?¯å??ä½µ"
+
+#~ msgid "_Startâ?¦"
+#~ msgstr "é??å§?(_S)â?¦"
+
+#~ msgid "Start a rebase"
+#~ msgstr "é??å§? rebase"
+
+#~ msgid "Continue a rebase that stopped because of conflicts"
+#~ msgstr "ç¹¼çº?å? è¡?çª?è??å??æ­¢ç?? rebase"
+
+#~ msgid "Skip the current conflicted commit and continue"
+#~ msgstr "ç?¥é??ç?®å??è¡?çª?ç?? commit 並繼çº?"
+
+#~ msgid "_Cherry pickâ?¦"
+#~ msgstr "_Cherry pickâ?¦"
+
+#~ msgid ""
+#~ "Selectively merge individual changes from other branches into the current "
+#~ "one"
+#~ msgstr "é?¸æ??æ?§ç??å°?å??å?¥è®?æ?´å¾?å?¶ä»?å??æ?¯å??ä½µå?°ç?®å??ç??å??æ?¯"
+
+#~ msgid "_Remote branches"
+#~ msgstr "_Remote branches"
+
+#~ msgid "_Deleteâ?¦"
+#~ msgstr "��(_D)�"
+
+#~ msgid "_Create tagâ?¦"
+#~ msgstr "建��籤(_C)�"
+
+#~ msgid "_Delete tagâ?¦"
+#~ msgstr "���籤(_D)�"
+
+#~ msgid "Delete tags"
+#~ msgstr "���籤"
+
+#~ msgid "_Reset treeâ?¦"
+#~ msgstr "_Reset treeâ?¦"
+
+#~ msgid "Reset repository head to any past state"
+#~ msgstr "å°?æª?æ¡?庫ç?? head é??設ç?ºä»»ä½?é??å?»ç??ç??æ??"
+
+#~ msgid "_Revert commitâ?¦"
+#~ msgstr "_Revert commitâ?¦"
+
+#~ msgid "Bisect"
+#~ msgstr "Bisect"
+
+#~ msgid "Start a bisect operation"
+#~ msgstr "é??å§? bisect æ??ä½?"
+
+#~ msgid "Stop the bisect and bring the tree back to normal"
+#~ msgstr "å??æ­¢ bisect 並å°?å??å§?碼樹帶å??正常ç??æ??"
+
+#~ msgid "_Good"
+#~ msgstr "_Good"
+
+#~ msgid "Mark the current head revision as good"
+#~ msgstr "å°?ç?®å??ç?? head ä¿®è¨?ç??æ¨?è¨?ç?º good"
+
+#~ msgid "_Bad"
+#~ msgstr "_Bad"
+
+#~ msgid "Create a new git repository or reinitialize an existing one"
+#~ msgstr "建ç«?æ?° git æª?æ¡?庫æ??é??æ?°å??å§?å??ç?¾æ??ç??æª?æ¡?庫"
+
+#~ msgid "Show changes introduced by this commit"
+#~ msgstr "顯示ä»?ç´¹é??次æ??交ç??è®?æ?´"
+
+#~ msgid "View a copy of this file at this revision"
+#~ msgstr "檢è¦?é??次修è¨?ç??ç??æª?æ¡?è¤?æ?¬"
+
+#~ msgid "Create a branch with the selected revision as its head"
+#~ msgstr "建ç«?ä¸?å??å??æ?¯ä¸¦ä»¥é?¸å??ç??ä¿®è¨?ç??å??ç?ºå®?ç?? head"
+
+#~ msgid "Create a tag at this revision"
+#~ msgstr "建ç«?此修è¨?ç??ç??æ¨?籤"
+
+#~ msgid "Revert this commit"
+#~ msgstr "復å??此次æ??交"
+
+#~ msgid "_Bisect"
+#~ msgstr "_Bisect"
+
+#~ msgid "_Set good revision"
+#~ msgstr "_Set good revision"
+
+#~ msgid "Mark this revision as good"
+#~ msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º good"
+
+#~ msgid "_Set bad revision"
+#~ msgstr "_Set bad revision"
+
+#~ msgid "Mark this revision as bad"
+#~ msgstr "æ¨?è¨?ä¿®è¨?ç??ç?º bad"
+
+#~ msgid "View changes to this file or folder"
+#~ msgstr "檢è¦?å?¨é??å??æª?æ¡?æ??è³?æ??夾ç??è®?æ?´"
+
+#~ msgid "Add this file or folder to the repository"
+#~ msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å? å?¥æª?æ¡?庫"
+
+#~ msgid "Remove this file or folder from the repository"
+#~ msgstr "å°?é??å??æª?æ¡?æ??è³?æ??夾å¾?æª?æ¡?庫移é?¤"
+
+#~ msgid "Top level git menu item"
+#~ msgstr "�端層� git ����"
+
+#~ msgid "Git operations"
+#~ msgstr "Git æ??ä½?"
+
+#~ msgid "Git log operations"
+#~ msgstr "Git ç´?é??æª?æ??ä½?"
+
+#~ msgid "Git FM operations"
+#~ msgstr "Git FM æ??ä½?"
+
+#~ msgid "Git Log"
+#~ msgstr "Git ç´?é??æª?"
+
+#~ msgid "You need to select a to do item before you can edit it"
+#~ msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??é ?ç?®æ??è?½ç·¨è¼¯å®?"
+
+#~ msgid "Add Item"
+#~ msgstr "����"
+
+#~ msgid "Edit Item"
+#~ msgstr "編輯��"
+
+#~ msgid "Summary:"
+#~ msgstr "æ??è¦?ï¼?"
+
+#~ msgid "Category:"
+#~ msgstr "å??é¡?:"
+
+#~ msgid "Edit Categories"
+#~ msgstr "編輯å??é¡?"
+
+#~ msgid "Due date:"
+#~ msgstr "å?°æ??æ?¥ï¼?"
+
+#~ msgid "Notify when due"
+#~ msgstr "ç?¶å?°æ??æ??é??ç?¥"
+
+#~ msgid "Priority:"
+#~ msgstr "å?ªå??ç­?ç´?ï¼?"
+
+#~ msgid "Comment:"
+#~ msgstr "å??註ï¼?"
+
+#~ msgid "Completed"
+#~ msgstr "å·²å®?æ??"
+
+#~ msgid "started:"
+#~ msgstr "å·²å??å??ï¼?"
+
+#~ msgid "N/A"
+#~ msgstr "N/A"
+
+#~ msgid "stopped:"
+#~ msgstr "å·²å??æ­¢ï¼?"
+
+#~ msgid "You need to select a to-do item before you can remove it"
+#~ msgstr "æ?¨é??è¦?å??é?¸æ??ä¸?å??å¾?辦äº?é ?æ??è?½ç§»é?¤å®?"
+
+#~ msgid "Are you sure you want to remove the selected to-do item?"
+#~ msgstr "確å®?移é?¤å·²é?¸ç??å¾?辦äº?é ?ï¼?"
+
+#~ msgid "Are you sure you want to remove all the completed to-do items?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤æ??æ??å·²å®?æ??ç??代辦äº?é ?ï¼?"
+
+#~ msgid ""
+#~ "Are you sure you want to remove all the completed to-do items in the "
+#~ "category \"%s\"?"
+#~ msgstr "æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å??é¡?ã??%sã??中æ??æ??å·²å®?æ??ç??å¾?辦äº?é ?ï¼?"
+
+#~ msgid "Export task list"
+#~ msgstr "��工���"
+
+#~ msgid "XML"
+#~ msgstr "XML"
+
+#~ msgid "Plain Text"
+#~ msgstr "ç´?æ??å­?"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Export current category only"
+#~ msgstr "å?ªå?¯å?ºç?®å??ç??å??é¡?"
+
+#~ msgid "HTML export options:"
+#~ msgstr "HTML �����"
+
+#~ msgid "Embed default (CSS) style sheet"
+#~ msgstr "����設 (CSS) 樣�表"
+
+#~ msgid "Custom (CSS) style sheet"
+#~ msgstr "�� (CSS) 樣�表"
+
+#~ msgid "All"
+#~ msgstr "��"
+
+#~ msgid "_Export"
+#~ msgstr "��(_E)"
+
+#~ msgid "Priority"
+#~ msgstr "å?ªå??ç­?ç´?"
+
+#~ msgid "Due date"
+#~ msgstr "å?°æ??æ?¥"
+
+#~ msgid "Summary"
+#~ msgstr "æ??è¦?"
+
+#~ msgid "No permission to read the file."
+#~ msgstr "æ²?æ??足夠æ¬?é??è®?å??æª?æ¡?ã??"
+
+#~ msgid "Failed to read file"
+#~ msgstr "ç?¡æ³?è®?å??æª?æ¡?"
+
+#~ msgid "Failed to parse XML structure"
+#~ msgstr "å??æ?? XML çµ?æ§?失æ??"
+
+#~ msgid "File is not a valid gtodo file"
+#~ msgstr "æª?æ¡?並ä¸?æ?¯ä¸?å??æ??æ??ç?? gtodo æª?"
+
+#~ msgid "Personal"
+#~ msgstr "å??人"
+
+#~ msgid "Business"
+#~ msgstr "å??業"
+
+#~ msgid "Unfiled"
+#~ msgstr "�歸�"
+
+#~ msgid "No Gtodo Client to save."
+#~ msgstr "æ²?æ??å?¯å?²å­?ç?? Gtodo 客æ?¶ç«¯ã??"
+
+#~ msgid "No filename supplied."
+#~ msgstr "æ²?æ??æ??ä¾?æª?æ¡?å??稱ã??"
+
+#~ msgid "Medium"
+#~ msgstr "中"
+
+#~ msgid "High"
+#~ msgstr "é«?"
+
+#~ msgid "When you delete the category \"%s\", all containing items are lost"
+#~ msgstr "ç?¶æ?¨å?ªé?¤å??é¡?ã??%sã??ï¼?æ??æ??å??å?«ç??é ?ç?®é?½æ??é?ºå¤±"
+
+#~ msgid "Delete"
+#~ msgstr "��"
+
+#~ msgid "<New category (%d)>"
+#~ msgstr "<æ?°å??é¡? (%d)>"
+
+#~ msgid "The following item is due in %i minute:"
+#~ msgid_plural "The following item is due in %i minutes:"
+#~ msgstr[0] "ä¸?å??äº?é ?å?¨ %i å??é??å?§å?°æ??ï¼?"
+
+#~ msgid "The following item is due:"
+#~ msgstr "ä¸?å??é ?ç?®å·²å?°æ??ï¼?"
+
+#~ msgid "_Do not show again"
+#~ msgstr "ä¸?å??顯示(_D)"
+
+#~ msgid "_Tasks"
+#~ msgstr "ä»»å??(_T)"
+
+#~ msgid "Hide _Completed Items"
+#~ msgstr "é?±è??å·²å®?æ??é ?ç?®(_C)"
+
+#~ msgid "Hide completed to-do items"
+#~ msgstr "é?±è??å·²å®?æ??ç??å¾?辦äº?é ?"
+
+#~ msgid "Hide Items Past _Due Date"
+#~ msgstr "é?±è??å·²é??æ??ç??é ?ç?®(_D)"
+
+#~ msgid "Hide items that are past due date"
+#~ msgstr "é?±è??å·²é??æ??ç??é ?ç?®"
+
+#~ msgid "Hide Items Without _End Date"
+#~ msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®(_E)"
+
+#~ msgid "Hide items without an end date"
+#~ msgstr "é?±è??æ²?æ??çµ?æ??æ?¥æ??ç??é ?ç?®"
+
+#~ msgid "Task manager"
+#~ msgstr "å·¥ä½?管ç??å?¡"
+
+#~ msgid "Task manager view"
+#~ msgstr "å·¥ä½?管ç??å?¡æª¢è¦?"
+
+#~ msgid "To-do Manager"
+#~ msgstr "å¾?辦äº?é ?管ç??å?¡"
+
+#~ msgid "To-do List Preferences"
+#~ msgstr "å¾?辦äº?é ?æ¸?å?®å??好設å®?"
+
+#~ msgid "Interface"
+#~ msgstr "ä»?é?¢"
+
+#~ msgid "Show due date column"
+#~ msgstr "顯示å?°æ??æ?¥æ¬?ä½?"
+
+#~ msgid "Show category column"
+#~ msgstr "顯示å??é¡?æ¬?ä½?"
+
+#~ msgid "Show priority column"
+#~ msgstr "顯示å?ªå??é ?åº?æ¬?ä½?"
+
+#~ msgid "Show in main window"
+#~ msgstr "顯示�主��中"
+
+#~ msgid "Highlight"
+#~ msgstr "�示"
+
+#~ msgid "Items that are due today"
+#~ msgstr "å?¨ä»?æ?¥å?°æ??ç??é ?ç?®"
+
+#~ msgid "Items that are past due"
+#~ msgstr "é??å?»å?°æ??ç??é ?ç?®"
+
+#~ msgid "Items that are due in the next %i day"
+#~ msgid_plural "Items that are due in the next %i days"
+#~ msgstr[0] "é ?ç?®å?¨æ?ªä¾? %i 天å?§å?°æ??"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "é??é ?"
+
+#~ msgid "Auto-purge completed items"
+#~ msgstr "è?ªå??æ¸?é?¤å·²å®?æ??ç??é ?ç?®"
+
+#~ msgid "Purge items after"
+#~ msgstr "��"
+
+#~ msgid "days."
+#~ msgstr "天å??ç??é ?ç?®ã??"
+
+#~ msgid "Auto-Purge"
+#~ msgstr "è?ªå??æ¸?é?¤"
+
+#~ msgid "Notification"
+#~ msgstr "é??ç?¥"
+
+#~ msgid "Allow to-do items to notify me when they are due in %i minute"
+#~ msgid_plural ""
+#~ "Allow to-do items to notify me when they are due in %i minutes"
+#~ msgstr[0] "å??許å¾?辦äº?é ?å?¨å?°æ??ç?? %i å??é??å??é??ç?¥æ??"
+
+#~ msgid "Open a Task List"
+#~ msgstr "é??å??ä»»å??æ¸?å?®"
+
+#~ msgid "Create a Task List"
+#~ msgstr "建ç«?ä»»å??æ¸?å?®"
+
+#~ msgid "No Date"
+#~ msgstr "æ²?æ??æ?¥æ??"
+
+#~| msgid "Add _module"
+#~ msgid "Add Module"
+#~ msgstr "��模�"
+
+#~| msgid "Add _Package"
+#~ msgid "Add Package"
+#~ msgstr "���件"
+
+#~ msgid "New Group"
+#~ msgstr "��群�"
+
+#~ msgid "Specify _where to create the group:"
+#~ msgstr "æ??å®?è¦?å?¨ä½?è??建ç«?群çµ?(_W):"
+
+#~| msgid "Add _Package"
+#~ msgid "_Add package&#x2026;"
+#~ msgstr "���件(_A)&#x2026;"
+
+#~ msgid "_Group name:"
+#~ msgstr "群çµ?å??稱(_G):"
+
+#~ msgid "Add _Groupâ?¦"
+#~ msgstr "��群�(_G)�"
+
+#~ msgid "Add a group to project"
+#~ msgstr "��群����"
+
+#~| msgid "Add _module"
+#~ msgid "Add _Moduleâ?¦"
+#~ msgstr "��模�(_M)�"
+
+#~| msgid "Add _Package"
+#~ msgid "Add _Packageâ?¦"
+#~ msgstr "���件(_P)�"
+
+#~ msgid "_Refresh"
+#~ msgstr "é??æ?°æ?´ç??(_R)"
+
+#~ msgid "Refresh project manager tree"
+#~ msgstr "æ?´æ?°å°?æ¡?管ç??å?¡å°?æ¡?樹"
+
+#~ msgid "Add _Group"
+#~ msgstr "��群�(_G)"
+
+#~ msgid "Add _Target"
+#~ msgstr "����(_T)"
+
+#~| msgid "Add a group to project"
+#~ msgid "Add a module to target"
+#~ msgstr "�模������"
+
+#~| msgid "Class Name:"
+#~ msgid "Full Name:"
+#~ msgstr "å?¨å??ï¼?"
+
+#~ msgid "Group properties"
+#~ msgstr "群�屬�"
+
+#~ msgid "No"
+#~ msgstr "å?¦"
+
+#~ msgid "GTK+"
+#~ msgstr "GTK+"
+
+#~ msgid "A generic GTKmm (C++) project"
+#~ msgstr "�� GTKmm (C++) ��"
+
+#~ msgid "GTKmm"
+#~ msgstr "GTKmm"
+
+#~ msgid "Package is not parseable"
+#~ msgstr "å¥?件æ?¯ç?¡æ³?解æ??ç??"
+
+#~ msgid "Automatically scan project's packages"
+#~ msgstr "è?ªå??æ??æ??å°?æ¡?ç??å¥?件"
+
+#~ msgid "Available API tags"
+#~ msgstr "å?¯ç?¨ç?? API æ¨?籤"
+
+#~ msgid "Checking if package is parseableâ?¦"
+#~ msgstr "檢æ?¥å¥?件æ?¯å?¦å?¯è§£æ??â?¦"
+
+#~ msgid ""
+#~ "This option enables the default packages required by your opened project, "
+#~ "e.g. Glib and GTK+ if you create a GTK+ project (may require more CPU "
+#~ "work)"
+#~ msgstr ""
+#~ "é??å??é?¸é ?æ??å??ç?¨æ?¨é??å??ç??å°?æ¡?æ??é??ç??é ?設å¥?件ï¼?ä¾?å¦?æ?¨å»ºç«? Gtk+ å°?æ¡?å°±é??è¦? Glib "
+#~ "å?? GTK+ (å?¯è?½é??è¦?æ?´å¤? CPU é??ç®?æ??é??)"
+
+#~ msgid "Gdb"
+#~ msgstr "Gdb"
+
+#~ msgid "Task Manager"
+#~ msgstr "å·¥ä½?管ç??å?¡"
+
+#~ msgid "Todo Plugin for Anjuta."
+#~ msgstr "給 Anjuta ç??å¾?辦äº?é ?å¤?æ??ç¨?å¼?ã??"
+
+#~ msgid "C++/GObject Class"
+#~ msgstr "C++/GObject é¡?å?¥"
+
+#~ msgid "Anjuta JS Debugger Plugin"
+#~ msgstr "Anjuta JS Debugger å¤?æ??ç¨?å¼?"
+
 #~ msgid ""
 #~ "Are you sure you want to reset the preferences to\n"
 #~ "their default settings?"
@@ -10513,15 +10775,6 @@ msgstr "符è??"
 #~ msgid "Invalid GbfAmConfigValue type"
 #~ msgstr "ç?¡æ??ç?? GbfAmConfigValue é¡?å??"
 
-#~ msgid "Select Package to add:"
-#~ msgstr "é?¸æ??è¦?å? å?¥ç??å¥?件ï¼?"
-
-#~ msgid "Select package"
-#~ msgstr "é?¸æ??å¥?件"
-
-#~ msgid "Variables"
-#~ msgstr "è®?æ?¸"
-
 #~ msgid "Generic rule"
 #~ msgstr "ä¸?è?¬è¦?å??"
 
@@ -10657,9 +10910,6 @@ msgstr "符è??"
 #~ msgid "gcj compiler flags (ahead-of-time)"
 #~ msgstr "gcj 編譯å?¨æ??æ¨? (ahead-of-time)"
 
-#~ msgid "Libraries:"
-#~ msgstr "��庫:"
-
 #~ msgid "Dependencies:"
 #~ msgstr "ç?¸ä¾?é??ä¿?:"
 
@@ -10717,9 +10967,6 @@ msgstr "符è??"
 #~ msgid "No properties available for this group"
 #~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦é??å??群çµ?"
 
-#~ msgid "No properties available for this target"
-#~ msgstr "æ²?æ??å?¯ç?¨ç??屬æ?§çµ¦æ­¤ç?®æ¨?"
-
 #~ msgid ""
 #~ "Field \"%s\" must start with a letter, a digit or an underscore and "
 #~ "contain only letters, digits, underscore, minus and dot. Please fix it."
@@ -10791,7 +11038,6 @@ 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>"
@@ -10913,9 +11159,6 @@ msgstr "符è??"
 #~ msgid "Associate"
 #~ msgstr "é??è?¯"
 
-#~ msgid "Automatically add resources"
-#~ msgstr "è?ªå??å? å?¥ä¾?æº?"
-
 #~ msgid "Designer"
 #~ msgstr "設�師"
 
@@ -11104,9 +11347,6 @@ msgstr "符è??"
 #~ msgid "No Errors"
 #~ msgstr "æ²?æ??é?¯èª¤"
 
-#~ msgid "Loadingâ?¦"
-#~ msgstr "��中�"
-
 #~ msgid "Autocompletion pop up choices"
 #~ msgstr "è?ªå??è£?é½?å½?å?ºå¼?é?¸æ??"
 
@@ -11138,15 +11378,6 @@ msgstr "符è??"
 #~ msgid "<b>CVS Options</b>"
 #~ msgstr "<b>CVS ��</b>"
 
-#~ msgid "<b>Options:</b>"
-#~ msgstr "<b>���</b>"
-
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>��</b>"
-
-#~ msgid "<b>Repository: </b>"
-#~ msgstr "<b>��庫�</b>"
-
 #~ msgid "<b>Debugger:</b>"
 #~ msgstr "<b>��工��</b>"
 



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