[gedit] Updated Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 1d70f5f6f31f6cd225ca11425ff6f0eabd04f8fe
Author: Aron Xu <aronxu gnome org>
Date:   Wed Mar 24 15:58:13 2010 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 1641 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 869 insertions(+), 772 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 37502cb..0aff0d3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gedit master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 15:32+0800\n"
-"PO-Revision-Date: 2009-12-09 15:33+0800\n"
-"Last-Translator: æ¨?æ ?æ±?(Fan Qijiang) <fqj1994 gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gedit&component=general\n"
+"POT-Creation-Date: 2010-03-18 14:30+0000\n"
+"PO-Revision-Date: 2010-03-24 15:57+0800\n"
+"Last-Translator: Eleanor Chen <chenyueg gmail com>\n"
 "Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,80 +48,70 @@ msgid "Active plugins"
 msgstr "æ¿?æ´»æ??件"
 
 #: ../data/gedit.schemas.in.in.h:3
-msgid "Auto Detected Encodings"
-msgstr "è?ªå?¨æ£?æµ?ç??ç¼?ç ?"
+msgid "Automatic indent"
+msgstr "��缩�"
 
 #: ../data/gedit.schemas.in.in.h:4
-msgid "Auto Save"
-msgstr "����"
+msgid "Automatically Detected Encodings"
+msgstr "è?ªå?¨æ£?æµ?ç??ç¼?ç ?"
 
 #: ../data/gedit.schemas.in.in.h:5
-msgid "Auto Save Interval"
-msgstr "è?ªå?¨ä¿?å­?æ?¶é?´é?´é??"
+msgid "Autosave"
+msgstr "����"
 
 #: ../data/gedit.schemas.in.in.h:6
-msgid "Auto indent"
-msgstr "��缩�"
+msgid "Autosave Interval"
+msgstr "è?ªå?¨ä¿?å­?æ?¶é?´é?´é??"
 
 #: ../data/gedit.schemas.in.in.h:7
-msgid "Backup Copy Extension"
-msgstr "å¤?份æ??件æ?©å±?å??"
-
-#: ../data/gedit.schemas.in.in.h:8
 msgid "Body Font for Printing"
 msgstr "æ??å?°æ?¶æ??档主ä½?æ??ç?¨å­?ä½?"
 
-#: ../data/gedit.schemas.in.in.h:9
+#: ../data/gedit.schemas.in.in.h:8
 msgid "Bottom Panel is Visible"
 msgstr "������"
 
-#: ../data/gedit.schemas.in.in.h:10
+#: ../data/gedit.schemas.in.in.h:9
 msgid "Create Backup Copies"
 msgstr "ç??æ??å¤?份æ??件"
 
-#: ../data/gedit.schemas.in.in.h:11
+#: ../data/gedit.schemas.in.in.h:10
 msgid "Display Line Numbers"
 msgstr "�示��"
 
-#: ../data/gedit.schemas.in.in.h:12
+#: ../data/gedit.schemas.in.in.h:11
 msgid "Display Right Margin"
 msgstr "�示�边�"
 
-#: ../data/gedit.schemas.in.in.h:13
+#: ../data/gedit.schemas.in.in.h:12
 msgid "Editor Font"
 msgstr "ç¼?è¾?å­?ä½?"
 
-#: ../data/gedit.schemas.in.in.h:14
+#: ../data/gedit.schemas.in.in.h:13
 msgid "Enable Search Highlighting"
 msgstr "å?¯ç?¨æ??ç´¢çª?å?ºæ?¾ç¤º"
 
-#: ../data/gedit.schemas.in.in.h:15
+#: ../data/gedit.schemas.in.in.h:14
 msgid "Enable Syntax Highlighting"
 msgstr "��语����示"
 
-#: ../data/gedit.schemas.in.in.h:16
+#: ../data/gedit.schemas.in.in.h:15
 msgid "Encodings shown in menu"
 msgstr "è??å??中æ?¾ç¤ºç??ç¼?ç ?"
 
-#: ../data/gedit.schemas.in.in.h:17
-msgid ""
-"Extension or suffix to use for backup file names. This will only take effect "
-"if the \"Create Backup Copies\" option is turned on."
-msgstr "å¤?份æ??件ç??æ?©å±?å??æ??å??ç¼?ã??å?ªæ??å½?â??ç??æ??å¤?份æ??件â??é??项é??中æ?¶æ??æ??æ??ã??"
-
-#: ../data/gedit.schemas.in.in.h:18
+#: ../data/gedit.schemas.in.in.h:16
 msgid "Header Font for Printing"
 msgstr "æ??å?°æ?¶é¡µç??æ??ç?¨ç??å­?ä½?"
 
-#: ../data/gedit.schemas.in.in.h:19
+#: ../data/gedit.schemas.in.in.h:17
 msgid "Highlight Current Line"
 msgstr "çª?å?ºæ?¾ç¤ºå½?å??è¡?"
 
-#: ../data/gedit.schemas.in.in.h:20
+#: ../data/gedit.schemas.in.in.h:18
 msgid "Highlight Matching Bracket"
 msgstr "çª?å?ºæ?¾ç¤ºå?¹é??ç??æ?¬å?·"
 
-#: ../data/gedit.schemas.in.in.h:21
+#: ../data/gedit.schemas.in.in.h:19
 msgid ""
 "If this value is 0, then no line numbers will be inserted when printing a "
 "document. Otherwise, gedit will print line numbers every such number of "
@@ -128,25 +119,25 @@ msgid ""
 msgstr ""
 "å¦?æ??该å?¼(N)为0ï¼?å??å?¨æ??å?°æ??æ¡£æ?¶ä¸?æ??å?¥è¡?å?·ï¼?å?¦å??ï¼?gedit å°?æ¯?é?? N è¡?æ??å?¥è¡?å?·ã??"
 
-#: ../data/gedit.schemas.in.in.h:22
+#: ../data/gedit.schemas.in.in.h:20
 msgid "Insert spaces"
 msgstr "æ??å?¥ç©ºæ ¼"
 
-#: ../data/gedit.schemas.in.in.h:23
+#: ../data/gedit.schemas.in.in.h:21
 msgid "Line Number Font for Printing"
 msgstr "æ??å?°æ?¶è¡?å?·æ??ç?¨ç??å­?ä½?"
 
-#: ../data/gedit.schemas.in.in.h:24
+#: ../data/gedit.schemas.in.in.h:22
 msgid "Line Wrapping Mode"
 msgstr "����模�"
 
-#: ../data/gedit.schemas.in.in.h:25
+#: ../data/gedit.schemas.in.in.h:23
 msgid ""
 "List of VFS schemes gedit supports in write mode. The 'file' scheme is "
 "writable by default."
 msgstr "å??å?º gedit å?¨å??å?¥æ¨¡å¼?中æ?¯æ??ç?? VFS 大纲ã??â??fileâ??大纲é»?认å?¯å??ã??"
 
-#: ../data/gedit.schemas.in.in.h:26
+#: ../data/gedit.schemas.in.in.h:24
 msgid ""
 "List of active plugins. It contains the \"Location\" of the active plugins. "
 "See the .gedit-plugin file for obtaining the \"Location\" of a given plugin."
@@ -154,28 +145,28 @@ msgstr ""
 "å??å?ºæ¿?æ´»ç??æ??件ã??å?¶ä¸­å??å?«æ¿?æ´»æ??件ç??â??ä½?ç½®â??ã??请å??ç?? .gedit-plugin æ??件以便è?·å¾?ç»?"
 "å®?æ??件ç??â??ä½?ç½®â??ã??"
 
-#: ../data/gedit.schemas.in.in.h:27
+#: ../data/gedit.schemas.in.in.h:25
 msgid ""
-"List of encodings shown in Character Coding menu in open/save file selector. "
-"Only recognized encodings are used."
+"List of encodings shown in the Character Encoding menu in open/save file "
+"selector. Only recognized encodings are used."
 msgstr ""
 "å?¨æ??å¼?/ä¿?å­?æ??件é??æ?©å?¨ä¸­ç??å­?符代ç ?è??å??中æ?¾ç¤ºç??ç¼?ç ?å??表ã??å?ªä½¿ç?¨å?¯è¯?å?«ç??ç¼?ç ?ã??"
 
-#: ../data/gedit.schemas.in.in.h:28
-msgid "Max Number of Undo Actions"
+#: ../data/gedit.schemas.in.in.h:26
+msgid "Maximum Number of Undo Actions"
 msgstr "æ?¤æ¶?æ??ä½?ç??æ??å¤?æ?°é??"
 
-#: ../data/gedit.schemas.in.in.h:29
+#: ../data/gedit.schemas.in.in.h:27
 msgid "Maximum Recent Files"
 msgstr "æ??大å½?å??æ??件æ?°"
 
-#: ../data/gedit.schemas.in.in.h:30
+#: ../data/gedit.schemas.in.in.h:28
 msgid ""
 "Maximum number of actions that gedit will be able to undo or redo. Use \"-1"
 "\" for unlimited number of actions."
 msgstr "gedit æ?¤æ¶?æ??é??å??æ??ä½?ç??æ??å¤?次æ?°ã??使ç?¨â??-1â??代表æ? é??å?¶ã??"
 
-#: ../data/gedit.schemas.in.in.h:31
+#: ../data/gedit.schemas.in.in.h:29
 msgid ""
 "Maximum number of actions that gedit will be able to undo or redo. Use \"-1"
 "\" for unlimited number of actions. Deprecated since 2.12.0"
@@ -184,76 +175,76 @@ msgstr ""
 
 #. Translators: This is the Editor Font.
 #. This is a Pango font
-#: ../data/gedit.schemas.in.in.h:34
+#: ../data/gedit.schemas.in.in.h:32
 msgid "Monospace 12"
 msgstr "Monospace 12"
 
 #. Translators: This is the Body font for printing.
 #. This is a Pango font.
-#: ../data/gedit.schemas.in.in.h:37
+#: ../data/gedit.schemas.in.in.h:35
 msgid "Monospace 9"
 msgstr "Monospace 9"
 
-#: ../data/gedit.schemas.in.in.h:38
+#: ../data/gedit.schemas.in.in.h:36
 msgid ""
 "Number of minutes after which gedit will automatically save modified files. "
-"This will only take effect if the \"Auto Save\" option is turned on."
+"This will only take effect if the \"Autosave\" option is turned on."
 msgstr "æ??件修æ?¹å??å?°è?ªå?¨ä¿?å­?ç??æ?¶é?´ã??å?ªæ??å½?â??è?ªå?¨ä¿?å­?â??é??项æ??å¼?å??æ??æ??æ??ã??"
 
-#: ../data/gedit.schemas.in.in.h:39
+#: ../data/gedit.schemas.in.in.h:37
 msgid "Print Header"
 msgstr "æ??å?°é¡µç??"
 
-#: ../data/gedit.schemas.in.in.h:40
+#: ../data/gedit.schemas.in.in.h:38
 msgid "Print Line Numbers"
 msgstr "æ??å?°è¡?å?·"
 
-#: ../data/gedit.schemas.in.in.h:41
+#: ../data/gedit.schemas.in.in.h:39
 msgid "Print Syntax Highlighting"
 msgstr "æ??å?°è¯­æ³?çª?å?ºæ?¾ç¤º"
 
-#: ../data/gedit.schemas.in.in.h:42
+#: ../data/gedit.schemas.in.in.h:40
 msgid "Printing Line Wrapping Mode"
 msgstr "æ??å?°æ?¶æ?¢è¡?模å¼?"
 
-#: ../data/gedit.schemas.in.in.h:43
+#: ../data/gedit.schemas.in.in.h:41
 msgid "Restore Previous Cursor Position"
 msgstr "æ?¢å¤?ä¸?ä¸?次ç??å??æ ?ä½?ç½®"
 
-#: ../data/gedit.schemas.in.in.h:44
+#: ../data/gedit.schemas.in.in.h:42
 msgid "Right Margin Position"
 msgstr "�边��置"
 
 #. Translators: This is the Header font for printing.
 #. This is a Pango font.
-#: ../data/gedit.schemas.in.in.h:47
+#: ../data/gedit.schemas.in.in.h:45
 msgid "Sans 11"
 msgstr "Sans 11"
 
 #. Translators: This is the Line Number font for printing.
 #. This is a Pango font.
-#: ../data/gedit.schemas.in.in.h:50
+#: ../data/gedit.schemas.in.in.h:48
 msgid "Sans 8"
 msgstr "Sans 8"
 
-#: ../data/gedit.schemas.in.in.h:51
+#: ../data/gedit.schemas.in.in.h:49
 msgid "Side Pane is Visible"
 msgstr "侧边æ ?å?¯è§?"
 
-#: ../data/gedit.schemas.in.in.h:52
+#: ../data/gedit.schemas.in.in.h:50
 msgid "Smart Home End"
 msgstr "�� Home End"
 
-#: ../data/gedit.schemas.in.in.h:53
+#: ../data/gedit.schemas.in.in.h:51
 msgid ""
-"Sorted list of encodings used by gedit for auto-detecting the encoding of a "
-"file. \"CURRENT\" represents the current locale encoding. Only recognized "
-"encodings are used."
+"Sorted list of encodings used by gedit for automatically detecting the "
+"encoding of a file. \"CURRENT\" represents the current locale encoding. Only "
+"recognized encodings are used."
 msgstr ""
 "gedit è?ªå?¨æ£?æµ?æ??件ç¼?ç ?æ?¶æ??ç?¨ç??ç¼?ç ?æ¸?å??ã??â??CURRENTâ??为å½?å??å?ºå??ç¼?ç ?ã??å?ªè?½ä½¿ç?¨å?¯è¯?"
 "å?«ç??ç¼?ç ?ã??"
 
-#: ../data/gedit.schemas.in.in.h:54
+#: ../data/gedit.schemas.in.in.h:52
 msgid ""
 "Specifies how the cursor moves when the HOME and END keys are pressed. Use "
 "\"DISABLED\" to always move at the start/end of the line, \"AFTER\" to move "
@@ -268,7 +259,7 @@ msgstr ""
 "å?°ç§»å?¨å?°æ??æ?¬ç??å¼?å§?/ç»?å°¾ï¼?â??BEFOREâ??以å?¨ç§»å?¨å?°è¡?ç??å¼?å§?/ç»?å°¾å??å??移å?¨å?°æ??æ?¬ç??å¼?å§?/"
 "ç»?å°¾ï¼?â??ALWAYSâ??以æ?»æ?¯ç§»å?¨å?°æ??æ?¬ç??å¼?å§?/ç»?å°¾è??ä¸?æ?¯è¡?ç??å¼?å§?/ç»?å°¾ã??"
 
-#: ../data/gedit.schemas.in.in.h:55
+#: ../data/gedit.schemas.in.in.h:53
 msgid ""
 "Specifies how to wrap long lines for printing. Use \"GTK_WRAP_NONE\" for no "
 "wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and "
@@ -280,7 +271,7 @@ msgstr ""
 "æ??å??è¯?æ?¢è¡?ï¼?è??â??GTK_WRAP_CHARâ??代表æ??å­?符æ?¢è¡?ã??请注æ??ï¼?è¿?äº?å?¼æ?¯å?ºå??大å°?å??ç??ï¼?æ??"
 "以请确å®?å¿?é¡»æ??ç?§è¿?é??说æ??ç??大å°?å??å?ºç?°ã??"
 
-#: ../data/gedit.schemas.in.in.h:56
+#: ../data/gedit.schemas.in.in.h:54
 msgid ""
 "Specifies how to wrap long lines in the editing area. Use \"GTK_WRAP_NONE\" "
 "for no wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and "
@@ -292,48 +283,48 @@ msgstr ""
 "è¡?ï¼?â??GTK_WRAP_WORDâ??代表æ??å??è¯?æ?¢è¡?ï¼?è??â??GTK_WRAP_CHARâ??代表æ??å­?符æ?¢è¡?ã??请注æ??ï¼?"
 "è¿?äº?å?¼æ?¯å?ºå??大å°?å??ç??ï¼?æ??以请确å®?å¿?é¡»æ??ç?§è¿?é??说æ??ç??大å°?å??å?ºç?°ã??"
 
-#: ../data/gedit.schemas.in.in.h:57
+#: ../data/gedit.schemas.in.in.h:55
 msgid ""
 "Specifies the font to use for a document's body when printing documents."
 msgstr "设å®?æ??å?°æ?¶æ??档主ä½?æ??ç?¨ç??å­?ä½?ã??"
 
-#: ../data/gedit.schemas.in.in.h:58
+#: ../data/gedit.schemas.in.in.h:56
 msgid ""
 "Specifies the font to use for line numbers when printing. This will only "
 "take effect if the \"Print Line Numbers\" option is non-zero."
 msgstr "设å®?æ??å?°æ?¶è¡?å?·æ??ç?¨ç??å­?ä½?ã??å?ªæ??å½?â??æ??å?°è¡?å?·â??é??项æ??å¼?æ?¶æ??æ??æ??ã??"
 
-#: ../data/gedit.schemas.in.in.h:59
+#: ../data/gedit.schemas.in.in.h:57
 msgid ""
 "Specifies the font to use for page headers when printing a document. This "
 "will only take effect if the \"Print Header\" option is turned on."
 msgstr "设å®?æ??å?°æ?¶é¡µç??æ??ç?¨ç??å­?ä½?ã??å?ªæ??å½?â??æ??å?°é¡µç??â??é??项æ??å¼?æ?¶æ??æ??æ??ã??"
 
-#: ../data/gedit.schemas.in.in.h:60
+#: ../data/gedit.schemas.in.in.h:58
 msgid ""
 "Specifies the maximum number of recently opened files that will be displayed "
 "in the \"Recent Files\" submenu."
 msgstr "设å®?æ??è¿?æ??å¼?æ??件æ?°ç??æ??大å?¼ï¼?è¿?个å°?å?¨â??æ??è¿?æ??å¼?è¿?ç??æ??件â??å­?è??å??中æ?¾ç¤ºã??"
 
-#: ../data/gedit.schemas.in.in.h:61
+#: ../data/gedit.schemas.in.in.h:59
 msgid ""
 "Specifies the number of spaces that should be displayed instead of Tab "
 "characters."
 msgstr "设å®?ç?¨äº?代æ?¿å?¶è¡¨ç¬¦ç??ç©ºæ ¼æ?°ã??"
 
-#: ../data/gedit.schemas.in.in.h:62
+#: ../data/gedit.schemas.in.in.h:60
 msgid "Specifies the position of the right margin."
 msgstr "æ??å®?å?³è¾¹è·?ç??ä½?ç½®ã??"
 
-#: ../data/gedit.schemas.in.in.h:63
+#: ../data/gedit.schemas.in.in.h:61
 msgid "Status Bar is Visible"
 msgstr "ç?¶æ??æ ?å?¯è§?"
 
-#: ../data/gedit.schemas.in.in.h:64
+#: ../data/gedit.schemas.in.in.h:62
 msgid "Style Scheme"
 msgstr "é£?æ ¼å¤§çº²"
 
-#: ../data/gedit.schemas.in.in.h:65
+#: ../data/gedit.schemas.in.in.h:63
 msgid ""
 "Style for the toolbar buttons. Possible values are \"GEDIT_TOOLBAR_SYSTEM\" "
 "to use the system's default style, \"GEDIT_TOOLBAR_ICONS\" to display icons "
@@ -347,40 +338,40 @@ msgstr ""
 "å?¾æ ?å??æ??å­?ï¼?è??â??GEDIT_TOOLBAR_ICONS_BOTH_HORIZâ??代表å?¨å?¾æ ?æ??è¾¹æ?¾ç¤ºæ??å­?ã??请注"
 "æ??ï¼?è¿?äº?å?¼æ?¯å?ºå??大å°?å??ç??ï¼?æ??以请确å®?å¿?é¡»æ??ç?§è¿?é??说æ??ç??大å°?å??å?ºç?°ã??"
 
-#: ../data/gedit.schemas.in.in.h:66
+#: ../data/gedit.schemas.in.in.h:64
 msgid "Tab Size"
 msgstr "�表符�度"
 
-#: ../data/gedit.schemas.in.in.h:67
-msgid "The id of a GtkSourceView Style Scheme used to color the text."
-msgstr "ç?¨äº?æ??æ?¬é¢?è?²ç?? GtkSourceView æ ·å¼?主é¢? idã??"
+#: ../data/gedit.schemas.in.in.h:65
+msgid "The ID of a GtkSourceView Style Scheme used to color the text."
+msgstr "ç?¨äº?æ??æ?¬é¢?è?²ç?? GtkSourceView æ ·å¼?主é¢? IDã??"
 
-#: ../data/gedit.schemas.in.in.h:68
+#: ../data/gedit.schemas.in.in.h:66
 msgid "Toolbar Buttons Style"
 msgstr "å·¥å?·æ ?æ??é?®é£?æ ¼"
 
-#: ../data/gedit.schemas.in.in.h:69
+#: ../data/gedit.schemas.in.in.h:67
 msgid "Toolbar is Visible"
 msgstr "æ?¾ç¤ºå·¥å?·æ ?"
 
-#: ../data/gedit.schemas.in.in.h:70
+#: ../data/gedit.schemas.in.in.h:68
 msgid "Undo Actions Limit (DEPRECATED)"
 msgstr "æ?¤æ¶?æ??ä½?次æ?°é??å?¶(ä¸?å??使ç?¨)"
 
-#: ../data/gedit.schemas.in.in.h:71
+#: ../data/gedit.schemas.in.in.h:69
 msgid "Use Default Font"
 msgstr "使��认��"
 
-#: ../data/gedit.schemas.in.in.h:72
+#: ../data/gedit.schemas.in.in.h:70
 msgid ""
 "Whether gedit should automatically save modified files after a time "
-"interval. You can set the time interval with the \"Auto Save Interval\" "
+"interval. You can set the time interval with the \"Autosave Interval\" "
 "option."
 msgstr ""
 "gedit æ?¯å?¦æ¯?é??ä¸?段æ?¶é?´è?ªå?¨ä¿?å­?已修æ?¹ç??æ??件ã??æ?¨å?¯ä»¥å?¨â??è?ªå?¨ä¿?å­?æ?¶é?´é?´é??â??é??项中"
 "设置该æ?¶é?´é?´é??ã??"
 
-#: ../data/gedit.schemas.in.in.h:73
+#: ../data/gedit.schemas.in.in.h:71
 msgid ""
 "Whether gedit should create backup copies for the files it saves. You can "
 "set the backup file extension with the \"Backup Copy Extension\" option."
@@ -388,73 +379,74 @@ msgstr ""
 "gedit æ?¯å?¦ä¸ºä¿?å­?ç??æ??件å??建å¤?份æ??件ã??æ?¨å?¯ä»¥å?¨â??å¤?份æ??件æ?©å±?å??â??é??项中设置å¤?份æ??"
 "件ç??æ?©å±?å??ã??"
 
-#: ../data/gedit.schemas.in.in.h:74
+#: ../data/gedit.schemas.in.in.h:72
 msgid "Whether gedit should display line numbers in the editing area."
 msgstr "gedit æ?¯å?¦å?¨ç¼?è¾?å?ºå??æ?¾ç¤ºè¡?å?·ã??"
 
-#: ../data/gedit.schemas.in.in.h:75
+#: ../data/gedit.schemas.in.in.h:73
 msgid "Whether gedit should display the right margin in the editing area."
 msgstr "gedit æ?¯å?¦å?¨ç¼?è¾?å?ºå??æ?¾ç¤ºå?³è¾¹è·?ã??"
 
-#: ../data/gedit.schemas.in.in.h:76
-msgid "Whether gedit should enable auto indentation."
+#: ../data/gedit.schemas.in.in.h:74
+msgid "Whether gedit should enable automatic indentation."
 msgstr "gedit æ?¯å?¦å?¯ç?¨è?ªå?¨ç¼©è¿?ã??"
 
-#: ../data/gedit.schemas.in.in.h:77
+#: ../data/gedit.schemas.in.in.h:75
 msgid "Whether gedit should enable syntax highlighting."
 msgstr "gedit æ?¯å?¦å?¯ç?¨è¯­æ³?çª?å?ºæ?¾ç¤ºã??"
 
-#: ../data/gedit.schemas.in.in.h:78
+#: ../data/gedit.schemas.in.in.h:76
 msgid ""
 "Whether gedit should highlight all the occurrences of the searched text."
 msgstr "gedit æ?¯å?¦åº?该çª?å?ºæ?¾ç¤ºè¢«æ??ç´¢æ??æ?¬ç??å?¨é?¨å?ºç?°ã??"
 
-#: ../data/gedit.schemas.in.in.h:79
-msgid "Whether gedit should highlight matching bracket."
-msgstr "gedit æ?¯å?¦å?¯ç?¨çª?å?ºæ?¾ç¤ºå?¹é??ç??æ?¬å?·ã??"
+#: ../data/gedit.schemas.in.in.h:77
+#, fuzzy
+#| msgid "Whether gedit should highlight the current line."
+msgid "Whether gedit should highlight the bracket matching the selected one."
+msgstr "gedit æ?¯å?¦åº?该çª?å?ºæ?¾ç¤ºå½?å??è¡?ã??"
 
-#: ../data/gedit.schemas.in.in.h:80
+#: ../data/gedit.schemas.in.in.h:78
 msgid "Whether gedit should highlight the current line."
 msgstr "gedit æ?¯å?¦åº?该çª?å?ºæ?¾ç¤ºå½?å??è¡?ã??"
 
-#: ../data/gedit.schemas.in.in.h:81
+#: ../data/gedit.schemas.in.in.h:79
 msgid "Whether gedit should include a document header when printing documents."
 msgstr "gedit æ?¯å?¦å?¨æ??å?°æ??æ¡£æ?¶å??å?«æ??档头ã??"
 
-#: ../data/gedit.schemas.in.in.h:82
+#: ../data/gedit.schemas.in.in.h:80
 msgid "Whether gedit should insert spaces instead of tabs."
 msgstr "gedit æ?¯å?¦è¦?æ??å?¥ç©ºæ ¼ä»£æ?¿å?¶è¡¨ç¬¦ã??"
 
-#: ../data/gedit.schemas.in.in.h:83
+#: ../data/gedit.schemas.in.in.h:81
 msgid "Whether gedit should print syntax highlighting when printing documents."
 msgstr "gedit æ?¯å?¦å?¨æ??å?°æ??æ¡£æ?¶æ??å?°è¯­æ³?çª?å?ºæ?¾ç¤ºã??"
 
-#: ../data/gedit.schemas.in.in.h:84
+#: ../data/gedit.schemas.in.in.h:82
 msgid ""
 "Whether gedit should restore the previous cursor position when a file is "
 "loaded."
 msgstr "å?¨è½½å?¥æ??件æ?¶ gedit æ?¯å?¦åº?æ?¢å¤?ä¸?次ç??å??æ ?ä½?ç½®ã??"
 
-#: ../data/gedit.schemas.in.in.h:85
+#: ../data/gedit.schemas.in.in.h:83
 msgid ""
 "Whether the bottom panel at the bottom of editing windows should be visible."
 msgstr "æ?¯å?¦æ?¾ç¤ºç¼?è¾?çª?å?£åº?é?¨ç??é?¢æ?¿ã??"
 
-#: ../data/gedit.schemas.in.in.h:86
-msgid ""
-"Whether the side pane at the left of the editing window should be visible."
+#: ../data/gedit.schemas.in.in.h:84
+msgid "Whether the side pane at the left of editing windows should be visible."
 msgstr "æ?¯å?¦æ?¾ç¤ºç¼?è¾?çª?å?£å·¦ä¾§ç??侧边æ ?ã??"
 
-#: ../data/gedit.schemas.in.in.h:87
+#: ../data/gedit.schemas.in.in.h:85
 msgid ""
 "Whether the status bar at the bottom of editing windows should be visible."
 msgstr "æ?¯å?¦æ?¾ç¤ºç¼?è¾?çª?å?£åº?é?¨ç??ç?¶æ??æ ?ã??"
 
-#: ../data/gedit.schemas.in.in.h:88
+#: ../data/gedit.schemas.in.in.h:86
 msgid "Whether the toolbar should be visible in editing windows."
 msgstr "æ?¯å?¦å?¨ç¼?è¾?çª?å?£ä¸­æ?¾ç¤ºå·¥å?·æ ?ã??"
 
-#: ../data/gedit.schemas.in.in.h:89
+#: ../data/gedit.schemas.in.in.h:87
 msgid ""
 "Whether to use the system's default fixed width font for editing text "
 "instead of a font specific to gedit. If this option is turned off, then the "
@@ -464,18 +456,18 @@ msgstr ""
 "æ?¯å?¦è¦?为ç¼?è¾?æ??æ?¬æ??å®?ä¸?å??äº?ç³»ç»?é»?认å­?ä½?ç??å­?ä½?ã??å¦?æ??å?³é?­äº?æ­¤é??项ï¼?â??ç¼?è¾?å?¨å­?"
 "ä½?â??é??项中ç??å­?ä½?å??称å°?ä¼?æ?¿ä»£ç³»ç»?å­?ä½?ã??"
 
-#: ../data/gedit.schemas.in.in.h:90
+#: ../data/gedit.schemas.in.in.h:88
 msgid "Writable VFS schemes"
 msgstr "å?¯å??å?¥ç?? VFS 大纲"
 
-#. Translators: This is the list of encodings shown by default in the Character Coding
+#. Translators: This is the list of encodings shown by default in the Character Encoding
 #. menu in open/save file selector. Only recognized encodings are displayed.
-#: ../data/gedit.schemas.in.in.h:93
+#: ../data/gedit.schemas.in.in.h:91
 msgid "[ISO-8859-15]"
 msgstr "[GB18030,GBK,GB2312,UTF-8]"
 
 #. Translators: This is the sorted list of encodings used by gedit
-#. for auto-detecting the encoding of a file. You may want to customize it adding
+#. for automatic detection of the file encoding. You may want to customize it adding
 #. encodings that are common in your country, for instance the GB18030 encoding
 #. for the Chinese	translation. You may also want to remove the ISO-8859-15 encoding
 #. (covering English and most Western European languages) if you think people
@@ -485,12 +477,12 @@ msgstr "[GB18030,GBK,GB2312,UTF-8]"
 #. Only recognized encodings are used.
 #. See http://svn.gnome.org/viewcvs/gedit/trunk/gedit/gedit-encodings.c?view=markup for
 #. a list of supported encodings
-#: ../data/gedit.schemas.in.in.h:105
+#: ../data/gedit.schemas.in.in.h:103
 msgid "[UTF-8,CURRENT,ISO-8859-15,UTF-16]"
 msgstr "[CURRENT,GB18030,GBK,GB2312,UTF-8,UTF-16]"
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:140
-msgid "Logout _without Saving"
+msgid "Log Out _without Saving"
 msgstr "注é??è??ä¸?ä¿?å­?(_W)"
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:144
@@ -601,16 +593,16 @@ msgid "If you don't save, all your changes will be permanently lost."
 msgstr "å¦?æ??æ?¨ä¸?ä¿?å­?ï¼?æ?¨æ??å??ç??å?¨é?¨æ?´æ?¹é?½å°?æ°¸ä¹?丢失ã??"
 
 #: ../gedit/dialogs/gedit-encodings-dialog.c:321
-msgid "Character Codings"
+msgid "Character Encodings"
 msgstr "å­?符ç¼?ç ?"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.c:384
-#: ../gedit/dialogs/gedit-encodings-dialog.c:445
+#: ../gedit/dialogs/gedit-encodings-dialog.c:385
+#: ../gedit/dialogs/gedit-encodings-dialog.c:446
 msgid "_Description"
 msgstr "æ??è¿°(_D)"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.c:393
-#: ../gedit/dialogs/gedit-encodings-dialog.c:454
+#: ../gedit/dialogs/gedit-encodings-dialog.c:394
+#: ../gedit/dialogs/gedit-encodings-dialog.c:455
 msgid "_Encoding"
 msgstr "ç¼?ç ?(_E)"
 
@@ -619,7 +611,7 @@ msgid "A_vailable encodings:"
 msgstr "å?¯ç?¨ç¼?ç ?(_V)ï¼?"
 
 #: ../gedit/dialogs/gedit-encodings-dialog.ui.h:2
-msgid "Character codings"
+msgid "Character encodings"
 msgstr "å­?符ç¼?ç ?"
 
 #: ../gedit/dialogs/gedit-encodings-dialog.ui.h:3
@@ -627,7 +619,7 @@ msgid "E_ncodings shown in menu:"
 msgstr "è??å??中æ?¾ç¤ºç??ç¼?ç ?(_N)ï¼?"
 
 #: ../gedit/dialogs/gedit-preferences-dialog.c:571
-msgid "Push this button to select the font to be used by the editor"
+msgid "Click on this button to select the font to be used by the editor"
 msgstr "æ??ä¸?æ­¤æ??é?®å?¯ä»¥é??æ?©ç¼?è¾?å?¨æ??ç?¨ç??å­?ä½?"
 
 #: ../gedit/dialogs/gedit-preferences-dialog.c:581
@@ -652,7 +644,7 @@ msgid "Color Scheme Files"
 msgstr "é??è?²æ?¹æ¡?æ??件"
 
 #: ../gedit/dialogs/gedit-preferences-dialog.c:831
-#: ../gedit/gedit-file-chooser-dialog.c:51
+#: ../gedit/gedit-file-chooser-dialog.c:52
 msgid "All Files"
 msgstr "å?¨é?¨æ??件"
 
@@ -805,19 +797,19 @@ msgid "_minutes"
 msgstr "å??é??(_M)"
 
 #: ../gedit/dialogs/gedit-search-dialog.c:300
-#: ../gedit/dialogs/gedit-search-dialog.ui.h:2 ../gedit/gedit-window.c:1460
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:2 ../gedit/gedit-window.c:1522
 msgid "Replace"
 msgstr "æ?¿æ?¢"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:311 ../gedit/gedit-window.c:1458
+#: ../gedit/dialogs/gedit-search-dialog.c:311 ../gedit/gedit-window.c:1520
 msgid "Find"
 msgstr "��"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:414
+#: ../gedit/dialogs/gedit-search-dialog.c:415
 msgid "Replace _All"
 msgstr "����(_A)"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:415
+#: ../gedit/dialogs/gedit-search-dialog.c:416
 #: ../gedit/gedit-commands-file.c:582
 msgid "_Replace"
 msgstr "æ?¿æ?¢(_R)"
@@ -850,47 +842,47 @@ msgstr "æ??ç´¢(_S)ï¼?"
 msgid "_Wrap around"
 msgstr "å??å?°æ??档头é?¨ç»§ç»­æ??ç´¢(_W)"
 
-#: ../gedit/gedit.c:122
+#: ../gedit/gedit.c:123
 msgid "Show the application's version"
 msgstr "æ?¾ç¤ºåº?ç?¨ç¨?åº?ç??æ?¬"
 
-#: ../gedit/gedit.c:125
+#: ../gedit/gedit.c:126
 msgid ""
 "Set the character encoding to be used to open the files listed on the "
 "command line"
 msgstr "设置æ??å¼?å?¨å?½ä»¤è¡?中å??å?ºç??æ??件æ?¶æ??ç?¨ç??å­?符ç¼?ç ?"
 
-#: ../gedit/gedit.c:125
+#: ../gedit/gedit.c:126
 msgid "ENCODING"
 msgstr "ç¼?ç ?"
 
-#: ../gedit/gedit.c:128
+#: ../gedit/gedit.c:129
 msgid "Display list of possible values for the encoding option"
 msgstr "æ?¾ç¤ºå?¯ä½¿ç?¨ç??ç¼?ç ?é??项å??表"
 
-#: ../gedit/gedit.c:131
-msgid "Create a new toplevel window in an existing instance of gedit"
+#: ../gedit/gedit.c:132
+msgid "Create a new top-level window in an existing instance of gedit"
 msgstr "å?¨å·²å­?å?¨ç?? gedit å®?ä¾?中å??建ä¸?个æ??ä¸?å±?çª?å?£"
 
-#: ../gedit/gedit.c:134
+#: ../gedit/gedit.c:135
 msgid "Create a new document in an existing instance of gedit"
 msgstr "å?¨å·²å­?å?¨ç?? gedit å®?ä¾?中å??建ä¸?个æ?°æ??æ¡£"
 
-#: ../gedit/gedit.c:137
+#: ../gedit/gedit.c:138
 msgid "[FILE...]"
 msgstr "[æ??件...]"
 
-#: ../gedit/gedit.c:192
+#: ../gedit/gedit.c:193
 #, c-format
 msgid "%s: invalid encoding.\n"
 msgstr "%sï¼?æ? æ??ç??ç¼?ç ?ã??\n"
 
 #. Setup command line options
-#: ../gedit/gedit.c:577
+#: ../gedit/gedit.c:576
 msgid "- Edit text files"
 msgstr "- ç¼?è¾?æ??æ?¬æ??件"
 
-#: ../gedit/gedit.c:613
+#: ../gedit/gedit.c:612
 #, c-format
 msgid ""
 "%s\n"
@@ -899,10 +891,6 @@ msgstr ""
 "%s\n"
 "è¿?è¡?â??%s --helpâ??å?¯æ?¥ç??å?¯ç?¨ç??å?½ä»¤è¡?é??项ç??å®?æ?´å??表ã??\n"
 
-#: ../gedit/gedit-app.c:404
-msgid "About gedit"
-msgstr "�� Gedit"
-
 #: ../gedit/gedit-commands-file.c:255
 #, c-format
 msgid "Loading file '%s'â?¦"
@@ -928,26 +916,26 @@ msgstr "æ??件â??%sâ??为å?ªè¯»ã??"
 msgid "Do you want to try to replace it with the one you are saving?"
 msgstr "æ?¨æ?³è¦?è¯?ç??å°?å?¶æ?¿æ?¢ä¸ºæ?¨æ­£å?¨ä¿?å­?ç??æ??件å??ï¼?"
 
-#: ../gedit/gedit-commands-file.c:641 ../gedit/gedit-commands-file.c:858
+#: ../gedit/gedit-commands-file.c:643 ../gedit/gedit-commands-file.c:866
 #, c-format
 msgid "Saving file '%s'â?¦"
 msgstr "æ­£å?¨ä¿?å­?æ??件â??%sâ??..."
 
-#: ../gedit/gedit-commands-file.c:748
+#: ../gedit/gedit-commands-file.c:751
 msgid "Save Asâ?¦"
 msgstr "��为..."
 
-#: ../gedit/gedit-commands-file.c:1072
+#: ../gedit/gedit-commands-file.c:1080
 #, c-format
 msgid "Reverting the document '%s'â?¦"
 msgstr "æ­£å?¨è¿?å??æ??æ¡£â??%sâ??..."
 
-#: ../gedit/gedit-commands-file.c:1117
+#: ../gedit/gedit-commands-file.c:1125
 #, c-format
 msgid "Revert unsaved changes to document '%s'?"
 msgstr "è¿?å??对æ??æ¡£â??%sâ??æ?ªä¿?å­?ç??æ?´æ?¹å??ï¼?"
 
-#: ../gedit/gedit-commands-file.c:1126
+#: ../gedit/gedit-commands-file.c:1134
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld second will be permanently lost."
@@ -956,12 +944,12 @@ msgid_plural ""
 "lost."
 msgstr[0] "å?? %ld ç§?å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1135
+#: ../gedit/gedit-commands-file.c:1143
 msgid ""
 "Changes made to the document in the last minute will be permanently lost."
 msgstr "ä¸?ä¸?å??é??å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1141
+#: ../gedit/gedit-commands-file.c:1149
 #, c-format
 msgid ""
 "Changes made to the document in the last minute and %ld second will be "
@@ -971,7 +959,7 @@ msgid_plural ""
 "permanently lost."
 msgstr[0] "ä¸?ä¸?å??é??é?¶ %ld ç§?å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1151
+#: ../gedit/gedit-commands-file.c:1159
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld minute will be permanently lost."
@@ -980,11 +968,11 @@ msgid_plural ""
 "lost."
 msgstr[0] "å?? %ld å??é??å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1166
+#: ../gedit/gedit-commands-file.c:1174
 msgid "Changes made to the document in the last hour will be permanently lost."
 msgstr "ä¸? %d å°?æ?¶å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1172
+#: ../gedit/gedit-commands-file.c:1180
 #, c-format
 msgid ""
 "Changes made to the document in the last hour and %d minute will be "
@@ -994,7 +982,7 @@ msgid_plural ""
 "permanently lost."
 msgstr[0] "ä¸?ä¸?å°?æ?¶é?¶ %d å??é??å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1187
+#: ../gedit/gedit-commands-file.c:1195
 #, c-format
 msgid ""
 "Changes made to the document in the last %d hour will be permanently lost."
@@ -1002,15 +990,15 @@ msgid_plural ""
 "Changes made to the document in the last %d hours will be permanently lost."
 msgstr[0] "ä¸? %d å°?æ?¶å??对æ??æ¡£æ??å??ç??æ?´æ?¹å°?æ°¸ä¹?丢失ã??"
 
-#: ../gedit/gedit-commands-file.c:1213
+#: ../gedit/gedit-commands-file.c:1221
 msgid "_Revert"
 msgstr "è¿?å??(_R)"
 
-#: ../gedit/gedit-commands-help.c:81
+#: ../gedit/gedit-commands-help.c:83
 msgid "gedit is a small and lightweight text editor for the GNOME Desktop"
 msgstr "gedit æ?¯ GNOME æ¡?é?¢ç??å°?å??æ??æ?¬ç¼?è¾?å?¨"
 
-#: ../gedit/gedit-commands-help.c:106
+#: ../gedit/gedit-commands-help.c:108
 msgid "translator-credits"
 msgstr ""
 "Dillion Chen <dillon chen turbolinux com cn>\n"
@@ -1022,385 +1010,419 @@ msgstr ""
 "ç??é?²(Gan Lu) <rhythm gan gmail com>, 2009\n"
 "æ¨?æ ?æ±?(Fan Qijiang) <fqj1994 gmail com>, 2009"
 
-#: ../gedit/gedit-commands-search.c:114
+#: ../gedit/gedit-commands-search.c:111
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
 msgstr[0] "��并��� %d �"
 
-#: ../gedit/gedit-commands-search.c:124
+#: ../gedit/gedit-commands-search.c:121
 msgid "Found and replaced one occurrence"
 msgstr "��并�����"
 
 #. Translators: %s is replaced by the text
 #. entered by the user in the search box
-#: ../gedit/gedit-commands-search.c:145
+#: ../gedit/gedit-commands-search.c:142
 #, c-format
 msgid "\"%s\" not found"
 msgstr "â??%sâ??æ?ªæ?¾å?°"
 
-#: ../gedit/gedit-document.c:990 ../gedit/gedit-document.c:1003
+#: ../gedit/gedit-document.c:1071 ../gedit/gedit-document.c:1086
 #, c-format
 msgid "Unsaved Document %d"
 msgstr "æ?ªä¿?å­?æ??æ¡£ %d"
 
-#: ../gedit/gedit-documents-panel.c:89 ../gedit/gedit-documents-panel.c:103
-#: ../gedit/gedit-window.c:2209 ../gedit/gedit-window.c:2214
-msgid "Read Only"
+#: ../gedit/gedit-documents-panel.c:97 ../gedit/gedit-documents-panel.c:111
+#: ../gedit/gedit-window.c:2271 ../gedit/gedit-window.c:2276
+msgid "Read-Only"
 msgstr "�读"
 
-#: ../gedit/gedit-documents-panel.c:771 ../gedit/gedit-window.c:3588
+#: ../gedit/gedit-documents-panel.c:780 ../gedit/gedit-window.c:3670
 msgid "Documents"
 msgstr "æ??æ¡£"
 
-#: ../gedit/gedit-encodings.c:140 ../gedit/gedit-encodings.c:184
+#: ../gedit/gedit-encodings.c:138 ../gedit/gedit-encodings.c:180
+#: ../gedit/gedit-encodings.c:182 ../gedit/gedit-encodings.c:184
 #: ../gedit/gedit-encodings.c:186 ../gedit/gedit-encodings.c:188
 #: ../gedit/gedit-encodings.c:190 ../gedit/gedit-encodings.c:192
-#: ../gedit/gedit-encodings.c:194 ../gedit/gedit-encodings.c:196
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../gedit/gedit-encodings.c:153 ../gedit/gedit-encodings.c:179
-#: ../gedit/gedit-encodings.c:231 ../gedit/gedit-encodings.c:274
+#: ../gedit/gedit-encodings.c:151 ../gedit/gedit-encodings.c:175
+#: ../gedit/gedit-encodings.c:225 ../gedit/gedit-encodings.c:268
 msgid "Western"
 msgstr "西欧"
 
-#: ../gedit/gedit-encodings.c:155 ../gedit/gedit-encodings.c:233
-#: ../gedit/gedit-encodings.c:270
+#: ../gedit/gedit-encodings.c:153 ../gedit/gedit-encodings.c:227
+#: ../gedit/gedit-encodings.c:264
 msgid "Central European"
 msgstr "中欧"
 
-#: ../gedit/gedit-encodings.c:157
+#: ../gedit/gedit-encodings.c:155
 msgid "South European"
 msgstr "å??欧"
 
-#: ../gedit/gedit-encodings.c:159 ../gedit/gedit-encodings.c:175
-#: ../gedit/gedit-encodings.c:284
+#: ../gedit/gedit-encodings.c:157 ../gedit/gedit-encodings.c:171
+#: ../gedit/gedit-encodings.c:278
 msgid "Baltic"
 msgstr "æ³¢ç½?ç??语"
 
-#: ../gedit/gedit-encodings.c:161 ../gedit/gedit-encodings.c:235
-#: ../gedit/gedit-encodings.c:248 ../gedit/gedit-encodings.c:252
-#: ../gedit/gedit-encodings.c:254 ../gedit/gedit-encodings.c:272
+#: ../gedit/gedit-encodings.c:159 ../gedit/gedit-encodings.c:229
+#: ../gedit/gedit-encodings.c:242 ../gedit/gedit-encodings.c:246
+#: ../gedit/gedit-encodings.c:248 ../gedit/gedit-encodings.c:266
 msgid "Cyrillic"
 msgstr "西é??å°?语"
 
-#: ../gedit/gedit-encodings.c:163 ../gedit/gedit-encodings.c:241
-#: ../gedit/gedit-encodings.c:282
+#: ../gedit/gedit-encodings.c:161 ../gedit/gedit-encodings.c:235
+#: ../gedit/gedit-encodings.c:276
 msgid "Arabic"
 msgstr "é?¿æ??伯语"
 
-#: ../gedit/gedit-encodings.c:165 ../gedit/gedit-encodings.c:276
+#: ../gedit/gedit-encodings.c:163 ../gedit/gedit-encodings.c:270
 msgid "Greek"
 msgstr "å¸?è??语"
 
-#: ../gedit/gedit-encodings.c:167
+#: ../gedit/gedit-encodings.c:165
 msgid "Hebrew Visual"
 msgstr "���伯�语"
 
-#: ../gedit/gedit-encodings.c:169 ../gedit/gedit-encodings.c:239
-#: ../gedit/gedit-encodings.c:280
-msgid "Hebrew"
-msgstr "�伯�语"
-
-#: ../gedit/gedit-encodings.c:171 ../gedit/gedit-encodings.c:237
-#: ../gedit/gedit-encodings.c:278
+#: ../gedit/gedit-encodings.c:167 ../gedit/gedit-encodings.c:231
+#: ../gedit/gedit-encodings.c:272
 msgid "Turkish"
 msgstr "å??è?³å?¶è¯­"
 
-#: ../gedit/gedit-encodings.c:173
+#: ../gedit/gedit-encodings.c:169
 msgid "Nordic"
 msgstr "���语"
 
-#: ../gedit/gedit-encodings.c:177
+#: ../gedit/gedit-encodings.c:173
 msgid "Celtic"
 msgstr "���语"
 
-#: ../gedit/gedit-encodings.c:181
+#: ../gedit/gedit-encodings.c:177
 msgid "Romanian"
 msgstr "�马尼�语"
 
-#: ../gedit/gedit-encodings.c:199
+#: ../gedit/gedit-encodings.c:195
 msgid "Armenian"
 msgstr "��尼�语"
 
-#: ../gedit/gedit-encodings.c:201 ../gedit/gedit-encodings.c:203
-#: ../gedit/gedit-encodings.c:217
+#: ../gedit/gedit-encodings.c:197 ../gedit/gedit-encodings.c:199
+#: ../gedit/gedit-encodings.c:213
 msgid "Chinese Traditional"
 msgstr "ç¹?ä½?中æ??"
 
-#: ../gedit/gedit-encodings.c:205
+#: ../gedit/gedit-encodings.c:201
 msgid "Cyrillic/Russian"
 msgstr "西é??å°?语/ä¿?语"
 
-#: ../gedit/gedit-encodings.c:208 ../gedit/gedit-encodings.c:210
-#: ../gedit/gedit-encodings.c:212 ../gedit/gedit-encodings.c:244
-#: ../gedit/gedit-encodings.c:259
+#: ../gedit/gedit-encodings.c:204 ../gedit/gedit-encodings.c:206
+#: ../gedit/gedit-encodings.c:208 ../gedit/gedit-encodings.c:238
+#: ../gedit/gedit-encodings.c:253
 msgid "Japanese"
 msgstr "�语"
 
-#: ../gedit/gedit-encodings.c:215 ../gedit/gedit-encodings.c:246
-#: ../gedit/gedit-encodings.c:250 ../gedit/gedit-encodings.c:265
+#: ../gedit/gedit-encodings.c:211 ../gedit/gedit-encodings.c:240
+#: ../gedit/gedit-encodings.c:244 ../gedit/gedit-encodings.c:259
 msgid "Korean"
 msgstr "æ??é²?语"
 
-#: ../gedit/gedit-encodings.c:220 ../gedit/gedit-encodings.c:222
-#: ../gedit/gedit-encodings.c:224 ../gedit/gedit-encodings.c:228
+#: ../gedit/gedit-encodings.c:216 ../gedit/gedit-encodings.c:218
+#: ../gedit/gedit-encodings.c:220
 msgid "Chinese Simplified"
 msgstr "ç®?ä½?中æ??"
 
-#: ../gedit/gedit-encodings.c:226
+#: ../gedit/gedit-encodings.c:222
 msgid "Georgian"
 msgstr "æ ¼é²?å??äº?语"
 
-#: ../gedit/gedit-encodings.c:256
+#: ../gedit/gedit-encodings.c:233 ../gedit/gedit-encodings.c:274
+msgid "Hebrew"
+msgstr "�伯�语"
+
+#: ../gedit/gedit-encodings.c:250
 msgid "Cyrillic/Ukrainian"
 msgstr "西é??å°?语/ä¹?å??å?°è¯­"
 
-#: ../gedit/gedit-encodings.c:261 ../gedit/gedit-encodings.c:267
-#: ../gedit/gedit-encodings.c:286
+#: ../gedit/gedit-encodings.c:255 ../gedit/gedit-encodings.c:261
+#: ../gedit/gedit-encodings.c:280
 msgid "Vietnamese"
 msgstr "è¶?å??语"
 
-#: ../gedit/gedit-encodings.c:263
+#: ../gedit/gedit-encodings.c:257
 msgid "Thai"
 msgstr "泰语"
 
-#: ../gedit/gedit-encodings.c:437
+#: ../gedit/gedit-encodings.c:431
 msgid "Unknown"
 msgstr "��"
 
-#: ../gedit/gedit-encodings-option-menu.c:220
-msgid "Auto Detected"
+#: ../gedit/gedit-encodings-combo-box.c:272
+msgid "Automatically Detected"
 msgstr "����"
 
-#: ../gedit/gedit-encodings-option-menu.c:240
-#: ../gedit/gedit-encodings-option-menu.c:262
+#: ../gedit/gedit-encodings-combo-box.c:288
+#: ../gedit/gedit-encodings-combo-box.c:303
 #, c-format
 msgid "Current Locale (%s)"
 msgstr "å½?å??语系(%s)"
 
-#: ../gedit/gedit-encodings-option-menu.c:323
-msgid "Add or _Remove..."
-msgstr "æ·»å? æ??å? é?¤(_R)..."
+#: ../gedit/gedit-encodings-combo-box.c:353
+msgid "Add or Remove..."
+msgstr "æ·»å? æ??å? é?¤..."
 
-#: ../gedit/gedit-file-chooser-dialog.c:52
+#: ../gedit/gedit-file-chooser-dialog.c:53
 msgid "All Text Files"
 msgstr "å?¨é?¨æ??æ?¬æ??件"
 
-#: ../gedit/gedit-file-chooser-dialog.c:78
-msgid "C_haracter Coding:"
+#: ../gedit/gedit-file-chooser-dialog.c:81
+msgid "C_haracter Encoding:"
 msgstr "å­?符ç¼?ç ?(_H)ï¼?"
 
+#: ../gedit/gedit-file-chooser-dialog.c:141
+msgid "L_ine Ending:"
+msgstr "è¡?å°¾(_I)"
+
+#: ../gedit/gedit-file-chooser-dialog.c:160
+msgid "Unix/Linux"
+msgstr ""
+
+#: ../gedit/gedit-file-chooser-dialog.c:166
+msgid "Mac OS Classic"
+msgstr ""
+
+#: ../gedit/gedit-file-chooser-dialog.c:172
+msgid "Windows"
+msgstr ""
+
 #: ../gedit/gedit-help.c:104
-msgid "There was an error displaying help."
+msgid "There was an error displaying the help."
 msgstr "æ?¾ç¤ºå¸®å?©å?ºé??ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:213
+#: ../gedit/gedit-io-error-message-area.c:196
+#: ../gedit/gedit-io-error-message-area.c:201
+#: ../gedit/gedit-io-error-message-area.c:505
+#: ../gedit/gedit-io-error-message-area.c:528
+msgid "_Retry"
+msgstr "é??è¯?(_R)"
+
+#: ../gedit/gedit-io-error-message-area.c:223
 #, c-format
 msgid "Could not find the file %s."
 msgstr "æ?¾ä¸?å?°æ??件 %sã??"
 
-#: ../gedit/gedit-io-error-message-area.c:215
-#: ../gedit/gedit-io-error-message-area.c:254
-#: ../gedit/gedit-io-error-message-area.c:261
+#: ../gedit/gedit-io-error-message-area.c:225
+#: ../gedit/gedit-io-error-message-area.c:264
+#: ../gedit/gedit-io-error-message-area.c:271
 msgid "Please check that you typed the location correctly and try again."
 msgstr "请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../gedit/gedit-io-error-message-area.c:230
+#: ../gedit/gedit-io-error-message-area.c:240
 #, c-format
 msgid "gedit cannot handle %s locations."
 msgstr "gedit æ? æ³?å¤?ç?? %s ä½?ç½®ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:236
+#: ../gedit/gedit-io-error-message-area.c:246
 msgid "gedit cannot handle this location."
 msgstr "gedit æ? æ³?å¤?ç??æ­¤ä½?ç½®ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:244
+#: ../gedit/gedit-io-error-message-area.c:254
 msgid "The location of the file cannot be mounted."
 msgstr "æ??件ç??ä½?ç½®æ? æ³?æ??è½½ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:248
+#: ../gedit/gedit-io-error-message-area.c:258
 msgid "The location of the file cannot be accessed because it is not mounted."
 msgstr "æ??件ç??ä½?ç½®æ? æ³?访é?®ï¼?å??å? æ?¯æ?ªæ??è½½ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:252
+#: ../gedit/gedit-io-error-message-area.c:262
 #, c-format
 msgid "%s is a directory."
 msgstr "%s æ?¯ç?®å½?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:259
+#: ../gedit/gedit-io-error-message-area.c:269
 #, c-format
 msgid "%s is not a valid location."
 msgstr "%s ä¸?æ?¯æ??æ??ç??ä½?ç½®"
 
-#: ../gedit/gedit-io-error-message-area.c:289
+#: ../gedit/gedit-io-error-message-area.c:299
 #, c-format
 msgid ""
 "Host %s could not be found. Please check that your proxy settings are "
 "correct and try again."
 msgstr "æ?¾ä¸?å?°ä¸»æ?º %sã??请æ£?æ?¥æ?¨ç??代ç??æ??å?¡å?¨è®¾ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:302
+#: ../gedit/gedit-io-error-message-area.c:312
 #, c-format
 msgid ""
-"Host name was invalid. Please check that you typed the location correctly "
-"and try again."
+"Hostname was invalid. Please check that you typed the location correctly and "
+"try again."
 msgstr "主æ?ºå??æ? æ??ã??请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:310
+#: ../gedit/gedit-io-error-message-area.c:320
 #, c-format
 msgid "%s is not a regular file."
 msgstr "%s ä¸?æ?¯æ?®é??æ??件ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:315
+#: ../gedit/gedit-io-error-message-area.c:325
 msgid "Connection timed out. Please try again."
 msgstr "è¿?æ?¥è¶?æ?¶ã??请å??è¯?ä¸?次ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:338
+#: ../gedit/gedit-io-error-message-area.c:348
 msgid "The file is too big."
 msgstr "æ??件太大ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:379
+#: ../gedit/gedit-io-error-message-area.c:389
 #, c-format
 msgid "Unexpected error: %s"
 msgstr "æ??å¤?é??误ï¼?%s"
 
-#: ../gedit/gedit-io-error-message-area.c:415
-msgid ""
-"The number of followed links is limited and the actual file could not be "
-"found within this limit."
-msgstr "è¾¾å?°äº?è·?é??é?¾æ?¥ç??å±?æ?°æ??é??ï¼?å?¨æ­¤æ??é??å??æ?¾ä¸?å?°ç??å®?æ??件ã??"
-
-#: ../gedit/gedit-io-error-message-area.c:419
-msgid "You do not have the permissions necessary to open the file."
-msgstr "æ?¨æ²¡æ??æ??å¼?æ??件æ??é??ç??æ??é??ã??"
-
-#: ../gedit/gedit-io-error-message-area.c:427
-#: ../gedit/gedit-io-error-message-area.c:669
-#, c-format
-msgid "Could not open the file %s."
-msgstr "æ? æ³?æ??å¼?æ??件 %sã??"
-
-#: ../gedit/gedit-io-error-message-area.c:437
-#: ../gedit/gedit-io-error-message-area.c:442
-#: ../gedit/gedit-io-error-message-area.c:563
-#: ../gedit/gedit-io-error-message-area.c:572
-msgid "_Retry"
-msgstr "é??è¯?(_R)"
-
-#: ../gedit/gedit-io-error-message-area.c:486
+#: ../gedit/gedit-io-error-message-area.c:425
 msgid "gedit cannot find the file. Perhaps it has recently been deleted."
 msgstr "gedit æ?¾ä¸?å?°æ??件ã??å?¯è?½å®?已被å? é?¤ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:495
+#: ../gedit/gedit-io-error-message-area.c:435
 #, c-format
 msgid "Could not revert the file %s."
 msgstr "æ? æ³?è¿?å??æ??件 %sã??"
 
-#: ../gedit/gedit-io-error-message-area.c:519
-msgid "Ch_aracter Coding:"
+#: ../gedit/gedit-io-error-message-area.c:461
+msgid "Ch_aracter Encoding:"
 msgstr "å­?符ç¼?ç ?(_A)ï¼?"
 
-#: ../gedit/gedit-io-error-message-area.c:671
-msgid "gedit has not been able to detect the character coding."
+#. Translators: the access key chosen for this string should be
+#. different from other main menu access keys (Open, Edit, View...)
+#: ../gedit/gedit-io-error-message-area.c:512
+#: ../gedit/gedit-io-error-message-area.c:537
+#: ../gedit/gedit-io-error-message-area.c:814
+#: ../gedit/gedit-io-error-message-area.c:824
+msgid "Edit Any_way"
+msgstr "����(_W)"
+
+#. Translators: the access key chosen for this string should be
+#. different from other main menu access keys (Open, Edit, View...)
+#: ../gedit/gedit-io-error-message-area.c:515
+#: ../gedit/gedit-io-error-message-area.c:542
+#: ../gedit/gedit-io-error-message-area.c:817
+#: ../gedit/gedit-io-error-message-area.c:829
+msgid "D_on't Edit"
+msgstr "����(_O)"
+
+#: ../gedit/gedit-io-error-message-area.c:638
+msgid ""
+"The number of followed links is limited and the actual file could not be "
+"found within this limit."
+msgstr "è¾¾å?°äº?è·?é??é?¾æ?¥ç??å±?æ?°æ??é??ï¼?å?¨æ­¤æ??é??å??æ?¾ä¸?å?°ç??å®?æ??件ã??"
+
+#: ../gedit/gedit-io-error-message-area.c:642
+msgid "You do not have the permissions necessary to open the file."
+msgstr "æ?¨æ²¡æ??æ??å¼?æ??件æ??é??ç??æ??é??ã??"
+
+#: ../gedit/gedit-io-error-message-area.c:648
+msgid "gedit has not been able to detect the character encoding."
 msgstr "gedit æ? æ³?æ£?æµ?å­?符ç¼?ç ?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:673
-#: ../gedit/gedit-io-error-message-area.c:682
+#: ../gedit/gedit-io-error-message-area.c:650
+#: ../gedit/gedit-io-error-message-area.c:672
 msgid "Please check that you are not trying to open a binary file."
 msgstr "请æ£?æ?¥æ?¨æ?¯å?¦æ­£å?¨å°?è¯?æ??å¼?ä¸?个äº?è¿?å?¶æ??件ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:674
-msgid "Select a character coding from the menu and try again."
+#: ../gedit/gedit-io-error-message-area.c:651
+msgid "Select a character encoding from the menu and try again."
 msgstr "ä»?è??å??中é??æ?©ä¸?ç§?å­?符ç¼?ç ?ï¼?ç?¶å??å??è¯?ä¸?次ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:679
+#: ../gedit/gedit-io-error-message-area.c:657
+#, c-format
+msgid "There was a problem opening the file %s."
+msgstr "å?¨æ??å¼?æ??件 %s ç??æ?¶å??å?ºç?°é?®é¢?ã??"
+
+#: ../gedit/gedit-io-error-message-area.c:659
+msgid ""
+"The file you opened has some invalid characters. If you continue editing "
+"this file you could make this document useless."
+msgstr ""
+"æ?¨æ??å¼?ç??æ??件æ??ä¸?äº?é??æ³?å­?符ã??å¦?æ??æ?¨ç»§ç»­ç¼?è¾?è¿?个æ??件ï¼?è¿?个æ??件æ??å?¯è?½ä¸?è?½ä½¿ç?¨ã??"
+
+#: ../gedit/gedit-io-error-message-area.c:662
+msgid "You can also choose another character encoding and try again."
+msgstr "æ?¨å?¯ä»¥é??æ?©å?¦å¤?ä¸?ç§?å­?符ç¼?ç ?ï¼?ç?¶å??å??è¯?ä¸?次ã??"
+
+#: ../gedit/gedit-io-error-message-area.c:669
 #, c-format
-msgid "Could not open the file %s using the %s character coding."
+msgid "Could not open the file %s using the %s character encoding."
 msgstr "æ? æ³?使ç?¨ç¼?ç ? %2$s ç¼?ç ?æ??å¼?æ??件 %1$sã??"
 
-#: ../gedit/gedit-io-error-message-area.c:683
-#: ../gedit/gedit-io-error-message-area.c:735
-msgid "Select a different character coding from the menu and try again."
+#: ../gedit/gedit-io-error-message-area.c:673
+#: ../gedit/gedit-io-error-message-area.c:747
+msgid "Select a different character encoding from the menu and try again."
 msgstr "ä»?è??å??中é??æ?©ä¸?ç§?ä¸?å??ç??å­?符ç¼?ç ?ï¼?ç?¶å??å??è¯?ä¸?次ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:730
+#: ../gedit/gedit-io-error-message-area.c:683
+#, c-format
+msgid "Could not open the file %s."
+msgstr "æ? æ³?æ??å¼?æ??件 %sã??"
+
+#: ../gedit/gedit-io-error-message-area.c:742
 #, c-format
-msgid "Could not save the file %s using the %s character coding."
+msgid "Could not save the file %s using the %s character encoding."
 msgstr "æ? æ³?使ç?¨ %2$s å­?符ç¼?ç ?ä¿?å­?æ??件 %1$sã??"
 
-#: ../gedit/gedit-io-error-message-area.c:733
+#: ../gedit/gedit-io-error-message-area.c:745
 msgid ""
 "The document contains one or more characters that cannot be encoded using "
-"the specified character coding."
+"the specified character encoding."
 msgstr "æ??æ¡£å??å?«æ? æ³?使ç?¨æ??å®?å­?符ç¼?ç ?表示ç??ä¸?个æ??å¤?个å­?符ã??"
 
-#. Translators: the access key chosen for this string should be
-#. different from other main menu access keys (Open, Edit, View...)
-#: ../gedit/gedit-io-error-message-area.c:801
-#: ../gedit/gedit-io-error-message-area.c:811
-msgid "Edit Any_way"
-msgstr "����(_W)"
-
-#. Translators: the access key chosen for this string should be
-#. different from other main menu access keys (Open, Edit, View...)
-#: ../gedit/gedit-io-error-message-area.c:804
-#: ../gedit/gedit-io-error-message-area.c:816
-msgid "D_on't Edit"
-msgstr "����(_O)"
-
-#: ../gedit/gedit-io-error-message-area.c:834
+#: ../gedit/gedit-io-error-message-area.c:844
 #, c-format
 msgid "This file (%s) is already open in another gedit window."
 msgstr "æ­¤æ??件(%s)å·²ç»?å?¨å?¦å¤?ç?? gedit çª?å?£ä¸­æ??å¼?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:849
+#: ../gedit/gedit-io-error-message-area.c:858
 msgid ""
 "gedit opened this instance of the file in a non-editable way. Do you want to "
 "edit it anyway?"
 msgstr "gedit å·²ç»?å?¨é??ç¼?è¾?æ?¹å¼?中æ??å¼?äº?æ­¤æ??件ç??å?¶å®?å®?ä¾?ã??æ?¨æ?¯å?¦æ?³è¦?ä»?ç?¶ç¼?è¾?ï¼?"
 
-#: ../gedit/gedit-io-error-message-area.c:908
-#: ../gedit/gedit-io-error-message-area.c:918
-#: ../gedit/gedit-io-error-message-area.c:1018
-#: ../gedit/gedit-io-error-message-area.c:1028
+#: ../gedit/gedit-io-error-message-area.c:917
+#: ../gedit/gedit-io-error-message-area.c:927
+#: ../gedit/gedit-io-error-message-area.c:1023
+#: ../gedit/gedit-io-error-message-area.c:1033
 msgid "S_ave Anyway"
 msgstr "����(_A)"
 
-#: ../gedit/gedit-io-error-message-area.c:912
-#: ../gedit/gedit-io-error-message-area.c:922
-#: ../gedit/gedit-io-error-message-area.c:1022
-#: ../gedit/gedit-io-error-message-area.c:1032
+#: ../gedit/gedit-io-error-message-area.c:921
+#: ../gedit/gedit-io-error-message-area.c:931
+#: ../gedit/gedit-io-error-message-area.c:1027
+#: ../gedit/gedit-io-error-message-area.c:1037
 msgid "D_on't Save"
 msgstr "���(_O)"
 
 #. FIXME: review this message, it's not clear since for the user the "modification"
 #. could be interpreted as the changes he made in the document. beside "reading" is
 #. not accurate (since last load/save)
-#: ../gedit/gedit-io-error-message-area.c:943
+#: ../gedit/gedit-io-error-message-area.c:949
 #, c-format
 msgid "The file %s has been modified since reading it."
 msgstr "æ??件 %s è?ªä¸?次读å??ä¹?å??å??ç??äº?ä¿®æ?¹ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:959
+#: ../gedit/gedit-io-error-message-area.c:964
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr "å¦?æ??æ?¨ä¿?å­?ç??è¯?ï¼?å¤?é?¨ç??æ??æ??æ?´æ?¹é?½å°?丢失ã??ä»?ç?¶ä¿?å­?å??ï¼?"
 
-#: ../gedit/gedit-io-error-message-area.c:1053
+#: ../gedit/gedit-io-error-message-area.c:1055
 #, c-format
 msgid "Could not create a backup file while saving %s"
 msgstr "ä¿?å­? %s æ?¶æ? æ³?å??建å¤?份æ??件"
 
-#: ../gedit/gedit-io-error-message-area.c:1056
+#: ../gedit/gedit-io-error-message-area.c:1058
 #, c-format
 msgid "Could not create a temporary backup file while saving %s"
 msgstr "ä¿?å­? %s æ?¶æ? æ³?å??建临æ?¶å¤?份æ??件"
 
-#: ../gedit/gedit-io-error-message-area.c:1073
+#: ../gedit/gedit-io-error-message-area.c:1074
 msgid ""
-"gedit could not backup the old copy of the file before saving the new one. "
+"gedit could not back up the old copy of the file before saving the new one. "
 "You can ignore this warning and save the file anyway, but if an error occurs "
 "while saving, you could lose the old copy of the file. Save anyway?"
 msgstr ""
@@ -1408,63 +1430,63 @@ msgstr ""
 "æ?¯å¦?æ??æ?¯å?¨ä¿?å­?中å??ç??äº?é??误ï¼?ï¼?æ?¨å?¯è?½ä¼?丢失æ??件ç??æ?§å?¯æ?¬ã??ä»?ç?¶ä¿?å­?å??ï¼?"
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../gedit/gedit-io-error-message-area.c:1133
+#: ../gedit/gedit-io-error-message-area.c:1134
 #, c-format
 msgid ""
 "gedit cannot handle %s locations in write mode. Please check that you typed "
 "the location correctly and try again."
 msgstr "gedit æ? æ³?以å??å?¥æ¨¡å¼?å¤?ç?? %s ä½?ç½®ã??请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1141
+#: ../gedit/gedit-io-error-message-area.c:1142
 msgid ""
 "gedit cannot handle this location in write mode. Please check that you typed "
 "the location correctly and try again."
 msgstr "gedit æ? æ³?以å??å?¥æ¨¡å¼?å¤?ç??æ­¤ä½?ç½®ã??请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1150
+#: ../gedit/gedit-io-error-message-area.c:1151
 #, c-format
 msgid ""
 "%s is not a valid location. Please check that you typed the location "
 "correctly and try again."
 msgstr "%s ä¸?æ?¯æ??æ??ç??ä½?ç½®ã??请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1156
+#: ../gedit/gedit-io-error-message-area.c:1157
 msgid ""
 "You do not have the permissions necessary to save the file. Please check "
 "that you typed the location correctly and try again."
 msgstr "æ?¨æ²¡æ??æ??é??ä¿?å­?æ??件ã??请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1162
+#: ../gedit/gedit-io-error-message-area.c:1163
 msgid ""
 "There is not enough disk space to save the file. Please free some disk space "
 "and try again."
 msgstr "没æ??足å¤?ç??ç£?ç??空é?´ç?¨äº?ä¿?å­?æ??件ã??请é??æ?¾ä¸?äº?ç£?ç??空é?´ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1167
+#: ../gedit/gedit-io-error-message-area.c:1168
 msgid ""
 "You are trying to save the file on a read-only disk. Please check that you "
 "typed the location correctly and try again."
 msgstr "æ?¨è¯?å?¾å°?æ??件ä¿?å­?è?³å?ªè¯»ç£?ç??ã??请æ£?æ?¥é?®å?¥ç??ä½?ç½®æ?¯å?¦æ­£ç¡®ï¼?ç?¶å??é??è¯?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1173
+#: ../gedit/gedit-io-error-message-area.c:1174
 msgid "A file with the same name already exists. Please use a different name."
 msgstr "å·²ç»?å­?å?¨å??å??æ??件ã??请使ç?¨ä¸?å??ç??å??称ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1178
+#: ../gedit/gedit-io-error-message-area.c:1179
 msgid ""
 "The disk where you are trying to save the file has a limitation on length of "
 "the file names. Please use a shorter name."
 msgstr "æ?¨è¯?å?¾ç?¨æ?¥ä¿?å­?æ??件ç??ç£?ç??æ??æ??件å??é?¿åº¦ç??é??å?¶ã??请使ç?¨è¾?ç?­ç??å??称ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1185
+#: ../gedit/gedit-io-error-message-area.c:1186
 msgid ""
 "The disk where you are trying to save the file has a limitation on file "
-"sizes.  Please try saving a smaller file or saving it to a disk that does "
-"not have this limitation."
+"sizes. Please try saving a smaller file or saving it to a disk that does not "
+"have this limitation."
 msgstr ""
 "ç£?ç??æ??æ??件大å°?ç??é??å?¶ï¼?请ä¿?å­?è¾?å°?ç??æ??件æ??è??å°?æ??件ä¿?å­?å?°æ²¡æ??æ­¤é??å?¶ç??ç£?ç??ä¸?ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1200
+#: ../gedit/gedit-io-error-message-area.c:1202
 #, c-format
 msgid "Could not save the file %s."
 msgstr "æ? æ³?ä¿?å­?æ??件 %sã??"
@@ -1472,38 +1494,29 @@ msgstr "æ? æ³?ä¿?å­?æ??件 %sã??"
 #. FIXME: review this message, it's not clear since for the user the "modification"
 #. could be interpreted as the changes he made in the document. beside "reading" is
 #. not accurate (since last load/save)
-#: ../gedit/gedit-io-error-message-area.c:1242
+#: ../gedit/gedit-io-error-message-area.c:1246
 #, c-format
 msgid "The file %s changed on disk."
 msgstr "æ??件 %s å·²å?¨ç£?ç??ä¸?æ?´æ?¹ã??"
 
-#: ../gedit/gedit-io-error-message-area.c:1247
+#: ../gedit/gedit-io-error-message-area.c:1251
 msgid "Do you want to drop your changes and reload the file?"
 msgstr "æ?¨æ?¯æ?³è¦?丢å¼?æ?¨ç??æ?´æ?¹è¿?æ?¯é??æ?°è½½å?¥æ??件ï¼?"
 
-#: ../gedit/gedit-io-error-message-area.c:1249
+#: ../gedit/gedit-io-error-message-area.c:1253
 msgid "Do you want to reload the file?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?é??æ?°è½½å?¥æ??件ï¼?"
 
-#: ../gedit/gedit-io-error-message-area.c:1255
-#: ../gedit/gedit-io-error-message-area.c:1266
+#: ../gedit/gedit-io-error-message-area.c:1259
+#: ../gedit/gedit-io-error-message-area.c:1270
 msgid "_Reload"
 msgstr "é??æ?°è½½å?¥(_R)"
 
-#. bad bad luck...
-#: ../gedit/gedit-local-document-saver.c:390
-msgid "Could not obtain backup filename"
-msgstr "æ? æ³?è?·å¾?å¤?份æ??件å??"
-
-#: ../gedit/gedit-notebook.c:914
-msgid "Close document"
-msgstr "å?³é?­æ??æ¡£"
-
-#: ../gedit/gedit-panel.c:355 ../gedit/gedit-panel.c:563
+#: ../gedit/gedit-panel.c:356 ../gedit/gedit-panel.c:528
 msgid "Empty"
 msgstr "空"
 
-#: ../gedit/gedit-panel.c:508 ../gedit/gedit-panel.c:582
+#: ../gedit/gedit-panel.c:418
 msgid "Hide panel"
 msgstr "é??è??é?¢æ?¿"
 
@@ -1551,9 +1564,10 @@ msgstr "é??ç½®æ??件(_O)"
 msgid "Cannot initialize preferences manager."
 msgstr "æ? æ³?å??å§?å??é¦?é??项管ç??å?¨ã??"
 
-#: ../gedit/gedit-prefs-manager.c:1148
-#, c-format
-msgid "Expected `%s' got `%s' for key %s"
+#: ../gedit/gedit-prefs-manager.c:1138
+#, fuzzy, c-format
+#| msgid "Expected `%s' got `%s' for key %s"
+msgid "Expected `%s', got `%s' for key %s"
 msgstr "Gconf 项 %3$s æ??æ??ç??ç±»å??æ?¯â??%1$sâ??ï¼?å¾?å?°ç??ç±»å??æ?¯â??%2$sâ??"
 
 #: ../gedit/gedit-print-job.c:541
@@ -1605,15 +1619,17 @@ msgstr "主�(_B)�"
 msgid "_Line numbers:"
 msgstr "è¡?å?·(_L)ï¼?"
 
-#: ../gedit/gedit-print-preferences.ui.h:14
+#. 'Number every' from 'Number every 3 lines' in the 'Text Editor' tab of the print preferences.
+#: ../gedit/gedit-print-preferences.ui.h:15
 msgid "_Number every"
 msgstr "æ¯?å? è¡?æ??å?°ä¸?次è¡?å?·(_N)"
 
-#: ../gedit/gedit-print-preferences.ui.h:15
+#: ../gedit/gedit-print-preferences.ui.h:16
 msgid "_Restore Default Fonts"
 msgstr "��为�认��(_R)"
 
-#: ../gedit/gedit-print-preferences.ui.h:16
+#. 'lines' from 'Number every 3 lines' in the 'Text Editor' tab of the print preferences.
+#: ../gedit/gedit-print-preferences.ui.h:18
 msgid "lines"
 msgstr "è¡?"
 
@@ -1629,59 +1645,64 @@ msgstr "�示��页"
 msgid "Current page (Alt+P)"
 msgstr "å½?å??页é?¢(Alt+P)"
 
-#: ../gedit/gedit-print-preview.c:615
+#. Translators: the "of" from "1 of 19" in print preview.
+#: ../gedit/gedit-print-preview.c:616
 msgid "of"
 msgstr "/"
 
-#: ../gedit/gedit-print-preview.c:623
+#: ../gedit/gedit-print-preview.c:624
 msgid "Page total"
 msgstr "�计页�"
 
-#: ../gedit/gedit-print-preview.c:624
+#: ../gedit/gedit-print-preview.c:625
 msgid "The total number of pages in the document"
 msgstr "æ??æ¡£ç??æ?»é¡µæ?°"
 
-#: ../gedit/gedit-print-preview.c:641
+#: ../gedit/gedit-print-preview.c:642
 msgid "Show multiple pages"
 msgstr "�示�页"
 
-#: ../gedit/gedit-print-preview.c:654
+#: ../gedit/gedit-print-preview.c:655
 msgid "Zoom 1:1"
 msgstr "缩æ?¾è?³å??大"
 
-#: ../gedit/gedit-print-preview.c:663
+#: ../gedit/gedit-print-preview.c:664
 msgid "Zoom to fit the whole page"
 msgstr "缩æ?¾è?³é??å??æ?´ä¸ªé¡µé?¢"
 
-#: ../gedit/gedit-print-preview.c:672
+#: ../gedit/gedit-print-preview.c:673
 msgid "Zoom the page in"
 msgstr "缩�页�"
 
-#: ../gedit/gedit-print-preview.c:681
+#: ../gedit/gedit-print-preview.c:682
 msgid "Zoom the page out"
 msgstr "缩�页�"
 
-#: ../gedit/gedit-print-preview.c:693
+#: ../gedit/gedit-print-preview.c:694
 msgid "_Close Preview"
 msgstr "����(_C)"
 
-#: ../gedit/gedit-print-preview.c:696
+#: ../gedit/gedit-print-preview.c:697
 msgid "Close print preview"
 msgstr "å?³é?­æ??å?°é¢?è§?"
 
-#: ../gedit/gedit-print-preview.c:766
+#: ../gedit/gedit-print-preview.c:767
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页�� %d 页"
 
-#: ../gedit/gedit-print-preview.c:950
+#: ../gedit/gedit-print-preview.c:951
 msgid "Page Preview"
 msgstr "页���"
 
-#: ../gedit/gedit-print-preview.c:951
+#: ../gedit/gedit-print-preview.c:952
 msgid "The preview of a page in the document to be printed"
 msgstr "è¦?æ??å?°æ??档中页é?¢ç??é¢?è§?"
 
+#: ../gedit/gedit-smart-charset-converter.c:308
+msgid "It is not possible to detect the encoding automatically"
+msgstr "ä¸?è?½è?ªå?¨æ£?æµ?ç¼?ç ?"
+
 #: ../gedit/gedit-statusbar.c:70 ../gedit/gedit-statusbar.c:76
 msgid "OVR"
 msgstr "è¦?ç??"
@@ -1710,76 +1731,80 @@ msgstr "æ? æ³?å??建ç?®å½?â??%sâ??ï¼?g_mkdir_with_parents() 失败ï¼?%s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:669
+#: ../gedit/gedit-tab.c:660
 #, c-format
 msgid "Reverting %s from %s"
 msgstr "ä»? %2$s è¿?å?? %1$s"
 
-#: ../gedit/gedit-tab.c:676
+#: ../gedit/gedit-tab.c:667
 #, c-format
 msgid "Reverting %s"
 msgstr "è¿?å?? %s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:692
+#: ../gedit/gedit-tab.c:683
 #, c-format
 msgid "Loading %s from %s"
 msgstr "� %2$s 载� %1$s"
 
-#: ../gedit/gedit-tab.c:699
+#: ../gedit/gedit-tab.c:690
 #, c-format
 msgid "Loading %s"
 msgstr "载� %s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:782
+#: ../gedit/gedit-tab.c:773
 #, c-format
 msgid "Saving %s to %s"
 msgstr "å°? %s ä¿?å­?å?° %s"
 
-#: ../gedit/gedit-tab.c:789
+#: ../gedit/gedit-tab.c:780
 #, c-format
 msgid "Saving %s"
 msgstr "ä¿?å­? %s"
 
 #. Read only
-#: ../gedit/gedit-tab.c:1706
+#: ../gedit/gedit-tab.c:1670
 msgid "RO"
 msgstr "�读"
 
-#: ../gedit/gedit-tab.c:1753
+#: ../gedit/gedit-tab.c:1717
 #, c-format
 msgid "Error opening file %s"
 msgstr "æ??å¼?æ??件 %s å?ºé??"
 
-#: ../gedit/gedit-tab.c:1758
+#: ../gedit/gedit-tab.c:1722
 #, c-format
 msgid "Error reverting file %s"
 msgstr "è¿?å??æ??件 %s å?ºé??"
 
-#: ../gedit/gedit-tab.c:1763
+#: ../gedit/gedit-tab.c:1727
 #, c-format
 msgid "Error saving file %s"
 msgstr "ä¿?å­?æ??件 %s å?ºé??"
 
-#: ../gedit/gedit-tab.c:1784
+#: ../gedit/gedit-tab.c:1748
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../gedit/gedit-tab.c:1791
+#: ../gedit/gedit-tab.c:1755
 msgid "Name:"
 msgstr "å??称ï¼?"
 
-#: ../gedit/gedit-tab.c:1792
+#: ../gedit/gedit-tab.c:1756
 msgid "MIME Type:"
 msgstr "MIME ç±»å??ï¼?"
 
-#: ../gedit/gedit-tab.c:1793
+#: ../gedit/gedit-tab.c:1757
 msgid "Encoding:"
 msgstr "ç¼?ç ?ï¼?"
 
+#: ../gedit/gedit-tab-label.c:200
+msgid "Close document"
+msgstr "å?³é?­æ??æ¡£"
+
 #. Toplevel
 #: ../gedit/gedit-ui.h:47
 msgid "_File"
@@ -1817,7 +1842,7 @@ msgstr "æ?°å»ºä¸?个æ??æ¡£"
 msgid "_Open..."
 msgstr "æ??å¼?(_O)..."
 
-#: ../gedit/gedit-ui.h:59 ../gedit/gedit-window.c:1389
+#: ../gedit/gedit-ui.h:59 ../gedit/gedit-window.c:1450
 msgid "Open a file"
 msgstr "æ??å¼?ä¸?个æ??件"
 
@@ -1868,7 +1893,7 @@ msgid "Page Set_up..."
 msgstr "页�设置(_U)..."
 
 #: ../gedit/gedit-ui.h:88
-msgid "Setup the page settings"
+msgid "Set up the page settings"
 msgstr "设置页�设置"
 
 #: ../gedit/gedit-ui.h:90
@@ -2047,7 +2072,7 @@ msgid "Show or hide the statusbar in the current window"
 msgstr "å?¨å½?å??çª?å?£ä¸­æ?¾ç¤ºæ??é??è??æ?¾ç¤ºç?¶æ??æ ?"
 
 #: ../gedit/gedit-ui.h:171
-msgid "Edit text at fullscreen"
+msgid "Edit text in fullscreen"
 msgstr "å?¨å±?ç¼?è¾?æ??æ?¬æ??件"
 
 #: ../gedit/gedit-ui.h:178
@@ -2066,22 +2091,22 @@ msgstr "����(_B)"
 msgid "Show or hide the bottom pane in the current window"
 msgstr "å?¨å½?å??çª?å?£ä¸­æ?¾ç¤ºæ??é??è??åº?é?¨é?¢æ?¿"
 
-#: ../gedit/gedit-utils.c:1072
+#: ../gedit/gedit-utils.c:1071
 msgid "Please check your installation."
 msgstr "请æ£?æ?¥æ?¨ç??å®?è£?ã??"
 
-#: ../gedit/gedit-utils.c:1141
+#: ../gedit/gedit-utils.c:1140
 #, c-format
-msgid "Unable to open ui file %s. Error: %s"
+msgid "Unable to open UI file %s. Error: %s"
 msgstr "æ? æ³?æ??å¼?ç??é?¢æ??件 %sã??é??误ï¼?%s"
 
-#: ../gedit/gedit-utils.c:1161
+#: ../gedit/gedit-utils.c:1160
 #, c-format
 msgid "Unable to find the object '%s' inside file %s."
 msgstr "å?¨æ??件 %s 中æ?¾ä¸?å?°æ??é??ç??对象â??%sâ??ã??"
 
 #. Translators: '/ on <remote-share>'
-#: ../gedit/gedit-utils.c:1321
+#: ../gedit/gedit-utils.c:1320
 #, c-format
 msgid "/ on %s"
 msgstr "%s ä¸?ç?? /"
@@ -2109,7 +2134,7 @@ msgstr "æ?¨æ?³è¦?æ??ç´¢ç??å­?符串"
 msgid "Line you want to move the cursor to"
 msgstr "æ?¨æ?³è¦?å°?å??æ ?移å?¨å?°ç??è¡?"
 
-#: ../gedit/gedit-window.c:942
+#: ../gedit/gedit-window.c:1003
 #, c-format
 msgid "Use %s highlight mode"
 msgstr "使� %s ���示模�"
@@ -2117,7 +2142,7 @@ msgstr "使� %s ���示模�"
 #. add the "Plain Text" item before all the others
 #. Translators: "Plain Text" means that no highlight mode is selected in the
 #. * "View->Highlight Mode" submenu and so syntax highlighting is disabled
-#: ../gedit/gedit-window.c:999 ../gedit/gedit-window.c:1910
+#: ../gedit/gedit-window.c:1060 ../gedit/gedit-window.c:1972
 #: ../plugins/externaltools/tools/manager.py:121
 #: ../plugins/externaltools/tools/manager.py:419
 #: ../plugins/externaltools/tools/manager.py:529
@@ -2125,46 +2150,50 @@ msgstr "使� %s ���示模�"
 msgid "Plain Text"
 msgstr "纯æ??æ?¬"
 
-#: ../gedit/gedit-window.c:1000
+#: ../gedit/gedit-window.c:1061
 msgid "Disable syntax highlighting"
 msgstr "��语����示"
 
 #. Translators: %s is a URI
-#: ../gedit/gedit-window.c:1286
+#: ../gedit/gedit-window.c:1347
 #, c-format
 msgid "Open '%s'"
 msgstr "æ??å¼?â??%sâ??"
 
-#: ../gedit/gedit-window.c:1391
+#: ../gedit/gedit-window.c:1452
 msgid "Open a recently used file"
 msgstr "æ??å¼?æ??è¿?ç?¨è¿?ç??æ??件"
 
-#: ../gedit/gedit-window.c:1397
+#: ../gedit/gedit-window.c:1458
 msgid "Open"
 msgstr "æ??å¼?"
 
-#: ../gedit/gedit-window.c:1454
+#: ../gedit/gedit-window.c:1516
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../gedit/gedit-window.c:1456
+#: ../gedit/gedit-window.c:1518
 msgid "Print"
 msgstr "æ??å?°(_P)..."
 
 #. Translators: %s is a URI
-#: ../gedit/gedit-window.c:1635
+#: ../gedit/gedit-window.c:1697
 #, c-format
 msgid "Activate '%s'"
 msgstr "æ¿?æ´»â??%sâ??"
 
-#: ../gedit/gedit-window.c:1888
+#: ../gedit/gedit-window.c:1950
 msgid "Use Spaces"
 msgstr "使ç?¨ç©ºæ ¼"
 
-#: ../gedit/gedit-window.c:1959
+#: ../gedit/gedit-window.c:2021
 msgid "Tab Width"
 msgstr "è·³æ ¼å®½åº¦"
 
+#: ../gedit/gedit-window.c:3874
+msgid "About gedit"
+msgstr "�� Gedit"
+
 #: ../plugins/changecase/changecase.gedit-plugin.desktop.in.h:1
 msgid "Change Case"
 msgstr "æ?´æ?¹å¤§å°?å??"
@@ -2217,23 +2246,33 @@ msgstr "æ£?æ?¥æ?°ç??æ?¬"
 msgid "Check update"
 msgstr "����"
 
-#: ../plugins/checkupdate/gedit-check-update-plugin.c:199
-msgid "There was an error displaying the url."
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:246
+msgid "There was an error displaying the URI."
 msgstr "æ?¾ç¤ºé?¾æ?¥å?ºé??ã??"
 
-#: ../plugins/checkupdate/gedit-check-update-plugin.c:231
-#: ../plugins/checkupdate/gedit-check-update-plugin.c:242
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:293
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:308
 msgid "_Download"
 msgstr "�载(_D)"
 
-#: ../plugins/checkupdate/gedit-check-update-plugin.c:257
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:297
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:316
+msgid "_Ignore Version"
+msgstr "忽ç?¥ç??æ?¬(_I)"
+
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:332
 msgid "There is a new version of gedit"
 msgstr "æ??æ?°ç??æ?¬ç?? Gedit"
 
-#: ../plugins/checkupdate/gedit-check-update-plugin.c:261
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:336
 msgid ""
-"You can download the new version of gedit by pressing on the download button"
-msgstr "ç?¹å?»ä¸?è½½æ??é?®ä¸?è½½æ??æ?°ç??æ?¬ç?? Gedit"
+"You can download the new version of gedit by clicking on the download button "
+"or ignore that version and wait for a new one"
+msgstr "ç?¹å?»ä¸?è½½æ??é?®ä¸?è½½æ??æ?°ç??æ?¬ç?? Gedit æ??è??忽ç?¥é?£ä¸ªç??æ?¬å¹¶ç­?å¾?æ?°ç??æ?¬å??è¡?"
+
+#: ../plugins/checkupdate/gedit-check-update.schemas.in.h:1
+msgid "Version to ignore until the next version is released"
+msgstr ""
 
 #: ../plugins/docinfo/docinfo.gedit-plugin.desktop.in.h:1
 msgid ""
@@ -2242,47 +2281,43 @@ msgid ""
 msgstr "å??æ??å½?å??æ??æ¡£ï¼?并æ?¥å??æ??档中ç??å??è¯?æ?°ã??è¡?æ?°ã??å­?符æ?°å??é??ç©ºæ ¼å­?符æ?°ã??"
 
 #: ../plugins/docinfo/docinfo.gedit-plugin.desktop.in.h:2
-#: ../plugins/docinfo/docinfo.ui.h:8
+#: ../plugins/docinfo/docinfo.ui.h:6
 msgid "Document Statistics"
 msgstr "æ??æ¡£ç»?计"
 
 #: ../plugins/docinfo/docinfo.ui.h:2
-msgid "0"
-msgstr "0"
-
-#: ../plugins/docinfo/docinfo.ui.h:3
-msgid "<span weight=\"bold\">File Name</span>"
-msgstr "<span weight=\"bold\">æ??件å??</span>"
-
-#: ../plugins/docinfo/docinfo.ui.h:4
 msgid "Bytes"
 msgstr "å­?è??æ?°"
 
-#: ../plugins/docinfo/docinfo.ui.h:5
+#: ../plugins/docinfo/docinfo.ui.h:3
 msgid "Characters (no spaces)"
 msgstr "å­?符æ?°(ä¸?å?«ç©ºæ ¼)"
 
-#: ../plugins/docinfo/docinfo.ui.h:6
+#: ../plugins/docinfo/docinfo.ui.h:4
 msgid "Characters (with spaces)"
 msgstr "å­?符æ?°(å?«ç©ºæ ¼)"
 
-#: ../plugins/docinfo/docinfo.ui.h:7
+#: ../plugins/docinfo/docinfo.ui.h:5
 msgid "Document"
 msgstr "æ??æ¡£"
 
-#: ../plugins/docinfo/docinfo.ui.h:9
+#: ../plugins/docinfo/docinfo.ui.h:7
+msgid "File Name"
+msgstr "æ??件å??"
+
+#: ../plugins/docinfo/docinfo.ui.h:8
 msgid "Lines"
 msgstr "è¡?æ?°"
 
-#: ../plugins/docinfo/docinfo.ui.h:10
+#: ../plugins/docinfo/docinfo.ui.h:9
 msgid "Selection"
 msgstr "é??中è??å?´"
 
-#: ../plugins/docinfo/docinfo.ui.h:11
+#: ../plugins/docinfo/docinfo.ui.h:10
 msgid "Words"
 msgstr "å??è¯?æ?°"
 
-#: ../plugins/docinfo/docinfo.ui.h:12
+#: ../plugins/docinfo/docinfo.ui.h:11
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
@@ -2291,9 +2326,19 @@ msgid "_Document Statistics"
 msgstr "æ??æ¡£ç»?计(_D)"
 
 #: ../plugins/docinfo/gedit-docinfo-plugin.c:424
-msgid "Get statistic info on current document"
+msgid "Get statistical information on the current document"
 msgstr "è?·å??å½?å??æ??æ¡£ç??ç»?计信æ?¯"
 
+#: ../plugins/externaltools/data/open-terminal-here-osx.desktop.in.h:1
+#: ../plugins/externaltools/data/open-terminal-here.desktop.in.h:1
+msgid "Open a terminal in the document location"
+msgstr "å?¨æ??æ¡£ä½?置中æ??å¼?ç»?端"
+
+#: ../plugins/externaltools/data/open-terminal-here-osx.desktop.in.h:2
+#: ../plugins/externaltools/data/open-terminal-here.desktop.in.h:2
+msgid "Open terminal here"
+msgstr "å?¨æ­¤æ??å¼?ç»?端"
+
 #: ../plugins/externaltools/externaltools.gedit-plugin.desktop.in.h:1
 msgid "Execute external commands and shell scripts."
 msgstr "æ?§è¡?å¤?é?¨å?½ä»¤å?? Shell è??æ?¬ã??"
@@ -2371,7 +2416,7 @@ msgstr "è¾?å?¥æ?°å? é??é?®æ??æ?? Backspace æ¸?é?¤"
 msgid "Type a new accelerator"
 msgstr "è¾?å?¥æ?°å? é??é?®"
 
-#: ../plugins/externaltools/tools/outputpanel.py:100
+#: ../plugins/externaltools/tools/outputpanel.py:105
 msgid "Stopped."
 msgstr "å·²å??æ­¢ã??"
 
@@ -2484,14 +2529,6 @@ msgstr "æ??建"
 msgid "Run \"make\" in the document directory"
 msgstr "å?¨æ??æ¡£ç?®å½?中è¿?è¡?â??makeâ??"
 
-#: ../plugins/externaltools/data/open-terminal-here.desktop.in.h:1
-msgid "Open a terminal in the document location"
-msgstr "å?¨æ??æ¡£ä½?置中æ??å¼?ç»?端"
-
-#: ../plugins/externaltools/data/open-terminal-here.desktop.in.h:2
-msgid "Open terminal here"
-msgstr "å?¨æ­¤æ??å¼?ç»?端"
-
 #: ../plugins/externaltools/data/remove-trailing-spaces.desktop.in.h:1
 msgid "Remove trailing spaces"
 msgstr "å? é?¤å°¾é??ç©ºæ ¼"
@@ -2546,7 +2583,7 @@ msgid ""
 "If TRUE the file browser plugin will view the directory of the first opened "
 "document given that the file browser hasn't been used yet. (Thus this "
 "generally applies to opening a document from the command line or opening it "
-"with nautilus etc)"
+"with Nautilus, etc.)"
 msgstr ""
 "å¦?æ??为 TRUEï¼?å??æ??件æµ?è§?å?¨æ??件å°?æ?¥ç??第ä¸?个æ??å¼?ç??æ??件æ??å?¨ç?®å½?ï¼?å¦?æ??æ??件æµ?è§?å?¨æ²¡"
 "æ??使ç?¨è¿?ç??è¯?ã??(è¿?ç§?æ??å?µé??常å?ºç?°å?¨ä»?å?½ä»¤è¡?æ??è?? Nautilus æ??å¼?æ??æ¡£)"
@@ -2562,7 +2599,7 @@ msgid ""
 msgstr "æ??件æµ?è§?å?¨æ??件载å?¥æ?¶ä»¥æ ?è§?å?¾è??ä¸?æ?¯ä¹¦ç­¾è§?å?¾æ??å¼?"
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:9
-msgid "Set Location To First Document"
+msgid "Set Location to First Document"
 msgstr "å°?ä½?置设å®?为第ä¸?个æ??æ¡£"
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:10
@@ -2693,170 +2730,176 @@ msgid ""
 "settings to make the file visible"
 msgstr "é??å?½å??ç??æ??件ç?°å?¨å·²è¢«è¿?滤æ??ã??æ?¨é??è¦?è°?æ?´æ?¨ç??è¿?滤å?¨è®¾ç½®æ??è?½ç??å?°æ??件"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3543
+#. Translators: This is the default name of new files created by the file browser pane.
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3544
 msgid "file"
 msgstr "æ??件"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3567
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3568
 msgid ""
 "The new file is currently filtered out. You need to adjust your filter "
 "settings to make the file visible"
 msgstr "æ?°æ??件ç?°å?¨å·²è¢«è¿?滤æ??ã??æ?¨é??è¦?è°?æ?´æ?¨ç??è¿?滤å?¨è®¾ç½®æ??è?½ç??å?°æ??件"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3595
+#. Translators: This is the default name of new directories created by the file browser pane.
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3597
 msgid "directory"
 msgstr "��"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3615
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3617
 msgid ""
 "The new directory is currently filtered out. You need to adjust your filter "
 "settings to make the directory visible"
 msgstr "æ?°ç?®å½?ç?°å?¨å·²è¢«è¿?滤æ??ã??æ?¨é??è¦?è°?æ?´æ?¨ç??è¿?滤å?¨è®¾ç½®æ??è?½ç??å?°æ??件"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:701
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:704
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:782
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:785
 msgid "_Filter"
 msgstr "�滤�(_F)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:787
-msgid "_Move To Trash"
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:790
+msgid "_Move to Trash"
 msgstr "移å?¨å?°å??æ?¶ç«?(_M)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:788
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:791
 msgid "Move selected file or folder to trash"
 msgstr "å°?é??中æ??件æ??æ??件夹移å?¨å?°å??æ?¶ç«?"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:790
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:793
 msgid "_Delete"
 msgstr "å? é?¤(_D)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:791
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:794
 msgid "Delete selected file or folder"
 msgstr "å? é?¤é??中ç??æ??件æ??æ??件夹"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:797
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:801
+msgid "Open selected file"
+msgstr "æ??å¼?é??中æ??件"
+
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:807
 msgid "Up"
 msgstr "å??ä¸?"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:798
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:808
 msgid "Open the parent folder"
 msgstr "æ??å¼?ç?¶æ??件夹"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:803
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:813
 msgid "_New Folder"
 msgstr "æ?°å»ºæ??件夹(_N)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:804
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:814
 msgid "Add new empty folder"
 msgstr "æ·»å? æ?°ç??空æ??件夹"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:806
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:816
 msgid "New F_ile"
 msgstr "æ?°å»ºæ??件(_I)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:807
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:817
 msgid "Add new empty file"
 msgstr "æ·»å? æ?°ç??空æ??件"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:812
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:822
 msgid "_Rename"
 msgstr "é??å?½å??(_R)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:813
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:823
 msgid "Rename selected file or folder"
 msgstr "é??å?½å??é??中ç??æ??件æ??æ??件夹"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:819
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:829
 msgid "_Previous Location"
 msgstr "��个�置(_P)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:821
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:831
 msgid "Go to the previous visited location"
 msgstr "转å?°æµ?è§?ç??ä¸?ä¸?个ä½?ç½®"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:823
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:833
 msgid "_Next Location"
 msgstr "��个�置(_N)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:824
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:834
 msgid "Go to the next visited location"
 msgstr "转å?°æµ?è§?ç??ä¸?ä¸?个ä½?ç½®"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:825
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:835
 msgid "Re_fresh View"
 msgstr "����(_F)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:826
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:836
 msgid "Refresh the view"
 msgstr "����"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:827
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:845
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:837
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:855
 msgid "_View Folder"
 msgstr "æ?¥ç??æ??件夹(_V)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:828
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:846
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:838
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:856
 msgid "View folder in file manager"
 msgstr "å?¨æ??件管ç??å?¨ä¸­æ?¥ç??æ??件夹"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:835
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:845
 msgid "Show _Hidden"
 msgstr "æ?¾ç¤ºé??è??æ??件(_H)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:836
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:846
 msgid "Show hidden files and folders"
 msgstr "æ?¾ç¤ºé??è??ç??æ??件å??æ??件夹"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:838
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:848
 msgid "Show _Binary"
 msgstr "�示���(_B)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:839
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:849
 msgid "Show binary files"
 msgstr "æ?¾ç¤ºäº?è¿?å?¶æ??件"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:962
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:971
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:992
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:981
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:990
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1011
 msgid "Previous location"
 msgstr "��个�置"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:964
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:983
 msgid "Go to previous location"
 msgstr "转���个�置"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:966
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:987
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:985
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1006
 msgid "Go to a previously opened location"
 msgstr "转å?°ä¸?ä¸?个æ??å¼?ç??ä½?ç½®"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:983
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1002
 msgid "Next location"
 msgstr "��个�置"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:985
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1004
 msgid "Go to next location"
 msgstr "转���个�置"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1197
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1216
 msgid "_Match Filename"
 msgstr "å?¹é??æ??件å??(_M)"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:2088
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2118
 #, c-format
 msgid "No mount object for mounted volume: %s"
 msgstr "æ??è½½ç??å?·æ²¡æ??æ??载对象ï¼?%s"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:2168
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2198
 #, c-format
 msgid "Could not open media: %s"
 msgstr "æ? æ³?æ??å¼?ä»?è´¨ï¼?%sã??"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:2215
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2245
 #, c-format
 msgid "Could not mount volume: %s"
 msgstr "æ? æ³?æ??è½½å?·ï¼?%s"
@@ -2871,11 +2914,11 @@ msgid "Modelines"
 msgstr "模��"
 
 #: ../plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in.h:1
-msgid "Interactive python console standing in the bottom panel"
+msgid "Interactive Python console standing in the bottom panel"
 msgstr "ä½?äº?åº?é?¨é?¢æ?¿ä¸­ç??交äº?å¼? Python æ?§å?¶å?°"
 
 #: ../plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in.h:2
-#: ../plugins/pythonconsole/pythonconsole/__init__.py:49
+#: ../plugins/pythonconsole/pythonconsole/__init__.py:50
 msgid "Python Console"
 msgstr "Python ���"
 
@@ -2889,16 +2932,16 @@ msgid "_Error color:"
 msgstr "é??误é¢?è?²(_E)ï¼?"
 
 #. ex:ts=8:et:
-#: ../plugins/quickopen/quickopen/popup.py:34
+#: ../plugins/quickopen/quickopen/popup.py:35
 #: ../plugins/quickopen/quickopen.gedit-plugin.desktop.in.h:1
 msgid "Quick Open"
 msgstr "å¿«é??æ??å¼?"
 
-#: ../plugins/quickopen/quickopen/windowhelper.py:68
+#: ../plugins/quickopen/quickopen/windowhelper.py:69
 msgid "Quick open"
 msgstr "å¿«é??æ??å¼?"
 
-#: ../plugins/quickopen/quickopen/windowhelper.py:69
+#: ../plugins/quickopen/quickopen/windowhelper.py:70
 msgid "Quickly open documents"
 msgstr "å¿«é??æ??å¼?æ??æ¡£"
 
@@ -2907,7 +2950,7 @@ msgid "Quickly open files"
 msgstr "å¿«é??æ??å¼?æ??件"
 
 #: ../plugins/snippets/snippets.gedit-plugin.desktop.in.h:1
-msgid "Insert often used pieces of text in a fast way"
+msgid "Insert often-used pieces of text in a fast way"
 msgstr "å¿«é??æ??å?¥æ??常使ç?¨ç??æ??æ?¬ç??æ?­"
 
 #: ../plugins/snippets/snippets.gedit-plugin.desktop.in.h:2
@@ -2916,8 +2959,8 @@ msgid "Snippets"
 msgstr "ç??æ?­"
 
 #: ../plugins/snippets/snippets/snippets.ui.h:2
-msgid "<b>Activation</b>"
-msgstr "<b>æ¿?æ´»</b>"
+msgid "Activation"
+msgstr "æ¿?æ´»"
 
 #: ../plugins/snippets/snippets/snippets.ui.h:3
 msgid "Create new snippet"
@@ -2948,7 +2991,9 @@ msgstr "æ­¤ç??æ?­ç??å¿«æ?·é?®å·²ç»?æ¿?æ´»"
 #. self['hbox_tab_trigger'].set_spacing(0)
 #: ../plugins/snippets/snippets/snippets.ui.h:9
 #: ../plugins/snippets/snippets/Manager.py:686
-msgid "Single word with which the snippet is activated after pressing tab"
+#, fuzzy
+#| msgid "Single word with which the snippet is activated after pressing tab"
+msgid "Single word the snippet is activated with after pressing Tab"
 msgstr "æ??ä¸? tab é?®å??æ¿?æ´»ç??æ?­æ??é??ç??å??å­?"
 
 #: ../plugins/snippets/snippets/snippets.ui.h:10
@@ -2994,8 +3039,8 @@ msgstr "è¿?å??é??中ç??ç??æ?­"
 #. self['hbox_tab_trigger'].set_spacing(3)
 #: ../plugins/snippets/snippets/Manager.py:679
 msgid ""
-"This is not a valid tab trigger. Triggers can either contain letters or a "
-"single, non alphanumeric, character like {, [, etcetera."
+"This is not a valid Tab trigger. Triggers can either contain letters or a "
+"single (non-alphanumeric) character like: {, [, etc."
 msgstr ""
 "è¿?ä¸?æ?¯æ??æ??ç??è·³æ ¼è§¦å??å?¨ã??触å??å?¨å¿?é¡»æ?¯å??å?«å??å?«å­?æ¯?æ??è??å??个é??å­?æ¯?å­?符ï¼?æ¯?å¦? "
 "{ æ?? [ ç­?ç­?ã??"
@@ -3072,38 +3117,38 @@ msgstr "���快��"
 
 #: ../plugins/snippets/snippets/Exporter.py:65
 #, python-format
-msgid "The archive `%s` could not be created"
+msgid "The archive \"%s\" could not be created"
 msgstr "æ? æ³?å??建å­?æ¡£â??%sâ??"
 
 #: ../plugins/snippets/snippets/Exporter.py:82
 #, python-format
-msgid "Target directory `%s` does not exist"
+msgid "Target directory \"%s\" does not exist"
 msgstr "ç?®ç??ç?®å½?â??%sâ??ä¸?å­?å?¨"
 
 #: ../plugins/snippets/snippets/Exporter.py:85
 #, python-format
-msgid "Target directory `%s` is not a valid directory"
+msgid "Target directory \"%s\" is not a valid directory"
 msgstr "ç?®ç??ç?®å½?â??%sâ??ä¸?æ?¯æ??æ??ç??ç?®å½?"
 
 #: ../plugins/snippets/snippets/Importer.py:29
 #: ../plugins/snippets/snippets/Importer.py:83
 #, python-format
-msgid "File `%s` does not exist"
+msgid "File \"%s\" does not exist"
 msgstr "æ??件â??%sâ??ä¸?å­?å?¨"
 
 #: ../plugins/snippets/snippets/Importer.py:32
 #, python-format
-msgid "File `%s` is not a valid snippets file"
+msgid "File \"%s\" is not a valid snippets file"
 msgstr "æ??件â??%sâ??ä¸?æ?¯æ??æ??ç??ç??æ?­æ??件"
 
 #: ../plugins/snippets/snippets/Importer.py:42
 #, python-format
-msgid "Imported file `%s` is not a valid snippets file"
+msgid "Imported file \"%s\" is not a valid snippets file"
 msgstr "导å?¥ç??æ??件â??%sâ??ä¸?æ?¯æ??æ??ç??ç??æ?­æ??件"
 
 #: ../plugins/snippets/snippets/Importer.py:52
 #, python-format
-msgid "The archive `%s` could not be extracted"
+msgid "The archive \"%s\" could not be extracted"
 msgstr "å­?æ¡£â??%sâ??æ? æ³?解å??缩"
 
 #: ../plugins/snippets/snippets/Importer.py:70
@@ -3114,26 +3159,26 @@ msgstr "æ? æ³?导å?¥ä¸?å??æ??件ï¼?%s"
 #: ../plugins/snippets/snippets/Importer.py:86
 #: ../plugins/snippets/snippets/Importer.py:99
 #, python-format
-msgid "File `%s` is not a valid snippets archive"
+msgid "File \"%s\" is not a valid snippets archive"
 msgstr "æ??件â??%sâ??ä¸?æ?¯æ??æ??ç??ç??æ?­å­?æ¡£"
 
-#: ../plugins/snippets/snippets/Placeholder.py:580
+#: ../plugins/snippets/snippets/Placeholder.py:594
 #, python-format
 msgid ""
-"Execution of the python command (%s) exceeds the maximum time, execution "
+"Execution of the Python command (%s) exceeds the maximum time, execution "
 "aborted."
 msgstr "æ?§è¡? Python å?½ä»¤(%s)è¶?è¿?æ??é?¿æ?¶é?´ï¼?æ?§è¡?被中止ã??"
 
-#: ../plugins/snippets/snippets/Placeholder.py:588
+#: ../plugins/snippets/snippets/Placeholder.py:602
 #, python-format
-msgid "Execution of the python command (%s) failed: %s"
+msgid "Execution of the Python command (%s) failed: %s"
 msgstr "�� Python �令(%s)失败�%s"
 
-#: ../plugins/sort/gedit-sort-plugin.c:86
+#: ../plugins/sort/gedit-sort-plugin.c:88
 msgid "S_ort..."
 msgstr "æ??åº?(_O)..."
 
-#: ../plugins/sort/gedit-sort-plugin.c:88
+#: ../plugins/sort/gedit-sort-plugin.c:90
 msgid "Sort the current document or selection"
 msgstr "å°?å½?å??æ??æ¡£æ??é??中ç??æ??å­?æ??åº?"
 
@@ -3170,42 +3215,46 @@ msgstr "é??åº?æ??åº?(_R)"
 msgid "_Sort"
 msgstr "æ??åº?(_S)"
 
-#: ../plugins/spell/gedit-automatic-spell-checker.c:418
-#: ../plugins/spell/gedit-spell-checker-dialog.c:499
+#. Translators: Displayed in the "Check Spelling" dialog if there are no suggestions for the current misspelled word
+#. Translators: Displayed in the "Check Spelling" dialog if there are no suggestions
+#. * for the current misspelled word
+#: ../plugins/spell/gedit-automatic-spell-checker.c:420
+#: ../plugins/spell/gedit-spell-checker-dialog.c:455
 msgid "(no suggested words)"
 msgstr "(没æ??建议ç??å??è¯?)"
 
-#: ../plugins/spell/gedit-automatic-spell-checker.c:442
+#: ../plugins/spell/gedit-automatic-spell-checker.c:444
 msgid "_More..."
 msgstr "��(_M)..."
 
 #. Ignore all
-#: ../plugins/spell/gedit-automatic-spell-checker.c:497
+#: ../plugins/spell/gedit-automatic-spell-checker.c:499
 msgid "_Ignore All"
 msgstr "��忽�(_I)"
 
 #. + Add to Dictionary
-#: ../plugins/spell/gedit-automatic-spell-checker.c:512
+#: ../plugins/spell/gedit-automatic-spell-checker.c:514
 msgid "_Add"
 msgstr "æ·»å? (_A)"
 
-#: ../plugins/spell/gedit-automatic-spell-checker.c:551
+#: ../plugins/spell/gedit-automatic-spell-checker.c:553
 msgid "_Spelling Suggestions..."
 msgstr "æ?¼å??建议(_S)..."
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:289
+#: ../plugins/spell/gedit-spell-checker-dialog.c:270
 msgid "Check Spelling"
 msgstr "æ£?æ?¥æ?¼å??"
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:300
+#: ../plugins/spell/gedit-spell-checker-dialog.c:281
 msgid "Suggestions"
 msgstr "建议"
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:605
+#. Translators: Displayed in the "Check Spelling" dialog if the current word isn't misspelled
+#: ../plugins/spell/gedit-spell-checker-dialog.c:562
 msgid "(correct spelling)"
 msgstr "(正确ç??æ?¼å??)"
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:748
+#: ../plugins/spell/gedit-spell-checker-dialog.c:705
 msgid "Completed spell checking"
 msgstr "å®?æ??æ?¼å??æ£?æ?¥"
 
@@ -3242,39 +3291,39 @@ msgstr "�认"
 msgid "Set language"
 msgstr "设置语�"
 
-#: ../plugins/spell/gedit-spell-language-dialog.c:195
+#: ../plugins/spell/gedit-spell-language-dialog.c:196
 msgid "Languages"
 msgstr "语�"
 
-#: ../plugins/spell/gedit-spell-plugin.c:85
+#: ../plugins/spell/gedit-spell-plugin.c:86
 msgid "_Check Spelling..."
 msgstr "æ?¼å??æ£?æ?¥(_C)..."
 
-#: ../plugins/spell/gedit-spell-plugin.c:87
+#: ../plugins/spell/gedit-spell-plugin.c:88
 msgid "Check the current document for incorrect spelling"
 msgstr "æ£?æ?¥å½?å??æ??æ¡£ç??æ?¼å??é??误"
 
-#: ../plugins/spell/gedit-spell-plugin.c:93
+#: ../plugins/spell/gedit-spell-plugin.c:94
 msgid "Set _Language..."
 msgstr "设置语�(_L)..."
 
-#: ../plugins/spell/gedit-spell-plugin.c:95
+#: ../plugins/spell/gedit-spell-plugin.c:96
 msgid "Set the language of the current document"
 msgstr "设置å½?å??æ??æ¡£ç??语è¨?"
 
-#: ../plugins/spell/gedit-spell-plugin.c:104
+#: ../plugins/spell/gedit-spell-plugin.c:105
 msgid "_Autocheck Spelling"
 msgstr "è?ªå?¨æ£?æ?¥æ?¼å??(_A)"
 
-#: ../plugins/spell/gedit-spell-plugin.c:106
+#: ../plugins/spell/gedit-spell-plugin.c:107
 msgid "Automatically spell-check the current document"
 msgstr "è?ªå?¨æ£?æ?¥å½?å??æ??æ¡£ç??æ?¼å??"
 
-#: ../plugins/spell/gedit-spell-plugin.c:751
+#: ../plugins/spell/gedit-spell-plugin.c:743
 msgid "The document is empty."
 msgstr "æ??档为空ã??"
 
-#: ../plugins/spell/gedit-spell-plugin.c:783
+#: ../plugins/spell/gedit-spell-plugin.c:773
 msgid "No misspelled words"
 msgstr "没æ??æ?¼é??ç??å??è¯?"
 
@@ -3283,67 +3332,61 @@ msgid "Select the _language of the current document."
 msgstr "é??æ?©å½?å??æ??æ¡£ç??语è¨?(_L)ã??"
 
 #: ../plugins/spell/spell-checker.ui.h:1
-#: ../plugins/time/gedit-time-dialog.ui.h:2
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:2
-msgid "*"
-msgstr "*"
-
-#: ../plugins/spell/spell-checker.ui.h:2
-msgid "<b>Language</b>"
-msgstr "<b>语�</b>"
-
-#: ../plugins/spell/spell-checker.ui.h:3
-msgid "<b>word</b>"
-msgstr "<b>å??è¯?</b>"
-
-#: ../plugins/spell/spell-checker.ui.h:4
 msgid "Add w_ord"
 msgstr "æ·»å? å??è¯?(_O)"
 
-#: ../plugins/spell/spell-checker.ui.h:5
+#: ../plugins/spell/spell-checker.ui.h:2
 msgid "Cha_nge"
 msgstr "æ?´æ?¹(_N)"
 
-#: ../plugins/spell/spell-checker.ui.h:6
+#: ../plugins/spell/spell-checker.ui.h:3
 msgid "Change A_ll"
 msgstr "����(_L)"
 
-#: ../plugins/spell/spell-checker.ui.h:7
+#: ../plugins/spell/spell-checker.ui.h:4
 msgid "Change _to:"
 msgstr "��为(_T)�"
 
-#: ../plugins/spell/spell-checker.ui.h:8
+#: ../plugins/spell/spell-checker.ui.h:5
 msgid "Check _Word"
 msgstr "æ£?æ?¥å??è¯?(_W)"
 
-#: ../plugins/spell/spell-checker.ui.h:9
+#: ../plugins/spell/spell-checker.ui.h:6
 msgid "Check spelling"
 msgstr "æ?¼å??æ£?æ?¥"
 
-#: ../plugins/spell/spell-checker.ui.h:10
+#: ../plugins/spell/spell-checker.ui.h:7
 msgid "Ignore _All"
 msgstr "��忽�(_A)"
 
-#: ../plugins/spell/spell-checker.ui.h:11
+#: ../plugins/spell/spell-checker.ui.h:8
+msgid "Language"
+msgstr "语�"
+
+#: ../plugins/spell/spell-checker.ui.h:9
 msgid "Language:"
 msgstr "语��"
 
-#: ../plugins/spell/spell-checker.ui.h:12
+#: ../plugins/spell/spell-checker.ui.h:10
 msgid "Misspelled word:"
 msgstr "æ?¼é??ç??å??è¯?ï¼?"
 
-#: ../plugins/spell/spell-checker.ui.h:13
+#: ../plugins/spell/spell-checker.ui.h:11
 msgid "User dictionary:"
 msgstr "�����"
 
-#: ../plugins/spell/spell-checker.ui.h:14
+#: ../plugins/spell/spell-checker.ui.h:12
 msgid "_Ignore"
 msgstr "忽�(_I)"
 
-#: ../plugins/spell/spell-checker.ui.h:15
+#: ../plugins/spell/spell-checker.ui.h:13
 msgid "_Suggestions:"
 msgstr "建议(_S)�"
 
+#: ../plugins/spell/spell-checker.ui.h:14
+msgid "word"
+msgstr "å??è¯?"
+
 #: ../plugins/spell/spell.gedit-plugin.desktop.in.h:1
 msgid "Checks the spelling of the current document."
 msgstr "æ£?æ?¥å½?å??æ??æ¡£ç??æ?¼å??ã??"
@@ -3731,810 +3774,816 @@ msgid "Frame"
 msgstr "æ¡?æ?¶"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:102
+msgid "Frame border"
+msgstr "��边�"
+
+#: ../plugins/taglist/HTML.tags.xml.in.h:103
 msgid "Frame render parts"
 msgstr "è¾¹æ¡?渲æ??é?¨ä»¶"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:103
+#: ../plugins/taglist/HTML.tags.xml.in.h:104
 msgid "Frame source"
 msgstr "���"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:104
+#: ../plugins/taglist/HTML.tags.xml.in.h:105
+msgid "Frame spacing"
+msgstr "����"
+
+#: ../plugins/taglist/HTML.tags.xml.in.h:106
 msgid "Frame target"
 msgstr "æ¡?æ?¶ç?®æ ?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:105
+#: ../plugins/taglist/HTML.tags.xml.in.h:107
 msgid "Frameborder"
 msgstr "��边�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:106
+#: ../plugins/taglist/HTML.tags.xml.in.h:108
 msgid "Frameset"
 msgstr "æ¡?æ?¶é??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:107
+#: ../plugins/taglist/HTML.tags.xml.in.h:109
 msgid "Frameset columns"
 msgstr "æ¡?æ?¶é??å??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:108
+#: ../plugins/taglist/HTML.tags.xml.in.h:110
 msgid "Frameset rows"
 msgstr "æ¡?æ?¶é??è¡?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:109
+#: ../plugins/taglist/HTML.tags.xml.in.h:111
 msgid "Framespacing"
 msgstr "����"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:110
+#: ../plugins/taglist/HTML.tags.xml.in.h:112
 msgid "Generic embedded object"
 msgstr "é??ç?¨åµ?å?¥å¯¹è±¡"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:111
+#: ../plugins/taglist/HTML.tags.xml.in.h:113
 msgid "Generic metainformation"
 msgstr "é??ç?¨å??ä¿¡æ?¯"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:112
+#: ../plugins/taglist/HTML.tags.xml.in.h:114
 msgid "Generic span"
 msgstr "é??ç?¨ span"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:113
+#: ../plugins/taglist/HTML.tags.xml.in.h:115
 msgid "HREF URI"
 msgstr "HREF URI"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:114
+#: ../plugins/taglist/HTML.tags.xml.in.h:116
 msgid "HTML - Special Characters"
 msgstr "HTML - ���符"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:115
+#: ../plugins/taglist/HTML.tags.xml.in.h:117
 msgid "HTML - Tags"
 msgstr "HTML - æ ?è®°"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:116
+#: ../plugins/taglist/HTML.tags.xml.in.h:118
 msgid "HTML root element"
 msgstr "HTML æ ¹å??ç´ "
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:117
+#: ../plugins/taglist/HTML.tags.xml.in.h:119
 msgid "HTML version"
 msgstr "HTML ç??æ?¬"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:118
+#: ../plugins/taglist/HTML.tags.xml.in.h:120
 msgid "HTTP header name"
 msgstr "HTTP 头å??称"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:119
-msgid "Header cell ID's"
+#: ../plugins/taglist/HTML.tags.xml.in.h:121
+msgid "Header cell IDs"
 msgstr "表头å??å??æ ¼ ID"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:120
+#: ../plugins/taglist/HTML.tags.xml.in.h:122
 msgid "Heading"
 msgstr "æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:121
+#: ../plugins/taglist/HTML.tags.xml.in.h:123
 msgid "Heading 1"
 msgstr "ä¸?级æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:122
+#: ../plugins/taglist/HTML.tags.xml.in.h:124
 msgid "Heading 2"
 msgstr "äº?级æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:123
+#: ../plugins/taglist/HTML.tags.xml.in.h:125
 msgid "Heading 3"
 msgstr "ä¸?级æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:124
+#: ../plugins/taglist/HTML.tags.xml.in.h:126
 msgid "Heading 4"
 msgstr "å??级æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:125
+#: ../plugins/taglist/HTML.tags.xml.in.h:127
 msgid "Heading 5"
 msgstr "äº?级æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:126
+#: ../plugins/taglist/HTML.tags.xml.in.h:128
 msgid "Heading 6"
 msgstr "å?­çº§æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:127
+#: ../plugins/taglist/HTML.tags.xml.in.h:129
 msgid "Height"
 msgstr "�度"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:128
+#: ../plugins/taglist/HTML.tags.xml.in.h:130
 msgid "Horizontal rule"
 msgstr "水平线"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:129
+#: ../plugins/taglist/HTML.tags.xml.in.h:131
 msgid "Horizontal space"
 msgstr "水平��"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:131
+#: ../plugins/taglist/HTML.tags.xml.in.h:133
 msgid "Horizontal space (deprecated)"
 msgstr "水平��(已��)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:132
-msgid "HttP header name"
-msgstr "HTTP 头å??称"
-
-#: ../plugins/taglist/HTML.tags.xml.in.h:133
-msgid "I18N BiDi over-ride"
+#: ../plugins/taglist/HTML.tags.xml.in.h:134
+#, fuzzy
+#| msgid "I18N BiDi over-ride"
+msgid "I18N BiDi override"
 msgstr "I18N å??å??æ??å­?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:134
+#: ../plugins/taglist/HTML.tags.xml.in.h:135
 msgid "Image"
 msgstr "å?¾å??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:135
+#: ../plugins/taglist/HTML.tags.xml.in.h:136
 msgid "Image map"
 msgstr "å?¾å??æ? å°?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:136
+#: ../plugins/taglist/HTML.tags.xml.in.h:137
 msgid "Image map area"
 msgstr "å?¾å??æ? å°?å?ºå??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:137
+#: ../plugins/taglist/HTML.tags.xml.in.h:138
 msgid "Image map name"
 msgstr "å?¾å??æ? å°?å??称"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:138
+#: ../plugins/taglist/HTML.tags.xml.in.h:139
 msgid "Image source"
 msgstr "�象�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:139
+#: ../plugins/taglist/HTML.tags.xml.in.h:140
 msgid "Inline frame"
 msgstr "å??åµ?æ¡?æ?¶"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:140
+#: ../plugins/taglist/HTML.tags.xml.in.h:141
 msgid "Inline layer"
 msgstr "å??åµ?å±?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:141
+#: ../plugins/taglist/HTML.tags.xml.in.h:142
 msgid "Inserted text"
 msgstr "æ??å?¥ç??æ??å­?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:142
+#: ../plugins/taglist/HTML.tags.xml.in.h:143
 msgid "Instance definition"
 msgstr "å®?ä¾?å®?ä¹?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:143
+#: ../plugins/taglist/HTML.tags.xml.in.h:144
 msgid "Italic text"
 msgstr "æ??ä½?æ??å­?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:144
+#: ../plugins/taglist/HTML.tags.xml.in.h:145
 msgid "Java applet"
 msgstr "Java ���"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:146
+#: ../plugins/taglist/HTML.tags.xml.in.h:147
 msgid "Java applet (deprecated)"
 msgstr "Java ���(已��)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:147
+#: ../plugins/taglist/HTML.tags.xml.in.h:148
 msgid "Label"
 msgstr "æ ?ç­¾"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:148
+#: ../plugins/taglist/HTML.tags.xml.in.h:149
 msgid "Language code"
 msgstr "语è¨?代ç ?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:149
+#: ../plugins/taglist/HTML.tags.xml.in.h:150
 msgid "Large text style"
 msgstr "大æ??æ?¬æ ·å¼?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:150
+#: ../plugins/taglist/HTML.tags.xml.in.h:151
 msgid "Layer"
 msgstr "å±?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:151
+#: ../plugins/taglist/HTML.tags.xml.in.h:152
 msgid "Link color"
 msgstr "����"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:153
+#: ../plugins/taglist/HTML.tags.xml.in.h:154
 msgid "Link color (deprecated)"
 msgstr "����(已��)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:154
+#: ../plugins/taglist/HTML.tags.xml.in.h:155
 msgid "List item"
 msgstr "å??表项ç?®"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:155
+#: ../plugins/taglist/HTML.tags.xml.in.h:156
 msgid "List of MIME types for file upload"
 msgstr "å??å?ºä¸?ä¼ æ??件ç?? MIME ç±»å??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:156
+#: ../plugins/taglist/HTML.tags.xml.in.h:157
 msgid "List of supported character sets"
 msgstr "å??å?ºå?¯æ?¥å??ç??å­?符é??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:157
+#: ../plugins/taglist/HTML.tags.xml.in.h:158
 msgid "Listing"
 msgstr "å??表"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:158
+#: ../plugins/taglist/HTML.tags.xml.in.h:159
 msgid "Local change to font"
 msgstr "å­?ä½?ç??æ?¬å?°æ?´æ?¹"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:159
+#: ../plugins/taglist/HTML.tags.xml.in.h:160
 msgid "Long description link"
 msgstr "é?¿æ??è¿°é?¾æ?¥"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:160
+#: ../plugins/taglist/HTML.tags.xml.in.h:161
 msgid "Long quotation"
 msgstr "é?¿å¼?ç?¨"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:161
+#: ../plugins/taglist/HTML.tags.xml.in.h:162
 msgid "Mail link"
 msgstr "����"
 
 #. Supported in XHTML 1.0 Frameset DTD only.
-#: ../plugins/taglist/HTML.tags.xml.in.h:163
+#: ../plugins/taglist/HTML.tags.xml.in.h:164
 msgid "Margin pixel height"
 msgstr "è¾¹è·?å??ç´ é«?度"
 
 #. Supported in XHTML 1.0 Frameset DTD only.
-#: ../plugins/taglist/HTML.tags.xml.in.h:165
+#: ../plugins/taglist/HTML.tags.xml.in.h:166
 msgid "Margin pixel width"
 msgstr "è¾¹è·?å??ç´ å®½åº¦"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:166
+#: ../plugins/taglist/HTML.tags.xml.in.h:167
 msgid "Marquee"
 msgstr "å­?å¹?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:167
+#: ../plugins/taglist/HTML.tags.xml.in.h:168
 msgid "Maximum length of text field"
 msgstr "æ??æ?¬æ¡?ç??æ??大é?¿åº¦"
 
 #. Here I take some liberties: There's no mandatory attributes,
 #. but those are most common, and will likely be used.
-#: ../plugins/taglist/HTML.tags.xml.in.h:170
+#: ../plugins/taglist/HTML.tags.xml.in.h:171
 msgid "Media-independent link"
 msgstr "ç?¬ç«?äº?åª?ä½?ç??é?¾æ?¥"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:171
+#: ../plugins/taglist/HTML.tags.xml.in.h:172
 msgid "Menu list"
 msgstr "è??å??å??表"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:173
+#: ../plugins/taglist/HTML.tags.xml.in.h:174
 msgid "Menu list (deprecated)"
 msgstr "è??å??å??表(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:174
+#: ../plugins/taglist/HTML.tags.xml.in.h:175
 msgid "Multi-line text field"
 msgstr "å¤?è¡?æ??æ?¬æ¡?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:175
+#: ../plugins/taglist/HTML.tags.xml.in.h:176
 msgid "Multicolumn"
 msgstr "å¤?å??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:176
+#: ../plugins/taglist/HTML.tags.xml.in.h:177
 msgid "Multiple"
 msgstr "�个"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:177
+#: ../plugins/taglist/HTML.tags.xml.in.h:178
 msgid "Name"
 msgstr "å??称"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:178
+#: ../plugins/taglist/HTML.tags.xml.in.h:179
 msgid "Named property value"
 msgstr "å?½å??å±?æ?§å?¼"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:179
+#: ../plugins/taglist/HTML.tags.xml.in.h:180
 msgid "Next ID"
 msgstr "�� ID"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:180
+#: ../plugins/taglist/HTML.tags.xml.in.h:181
 msgid "No URI"
 msgstr "æ?  URI"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:181
+#: ../plugins/taglist/HTML.tags.xml.in.h:182
 msgid "No embedded objects"
 msgstr "æ? åµ?å?¥å¯¹è±¡"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:182
+#: ../plugins/taglist/HTML.tags.xml.in.h:183
 msgid "No frames"
 msgstr "æ? æ¡?æ?¶"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:183
+#: ../plugins/taglist/HTML.tags.xml.in.h:184
 msgid "No layers"
 msgstr "æ? å±?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:184
+#: ../plugins/taglist/HTML.tags.xml.in.h:185
 msgid "No line break"
 msgstr "æ? æ?¢è¡?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:185
+#: ../plugins/taglist/HTML.tags.xml.in.h:186
 msgid "No resize"
 msgstr "���大�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:186
+#: ../plugins/taglist/HTML.tags.xml.in.h:187
 msgid "No script"
 msgstr "æ? è??æ?¬"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:187
+#: ../plugins/taglist/HTML.tags.xml.in.h:188
 msgid "No shade"
 msgstr "æ? é?´å½±"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:189
+#: ../plugins/taglist/HTML.tags.xml.in.h:190
 msgid "No shade (deprecated)"
 msgstr "æ? é?´å½±(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:190
+#: ../plugins/taglist/HTML.tags.xml.in.h:191
 msgid "No word wrap"
 msgstr "æ? æ?¢è¡?"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:192
+#: ../plugins/taglist/HTML.tags.xml.in.h:193
 msgid "No word wrap (deprecated)"
 msgstr "æ? æ?¢è¡?(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:193
+#: ../plugins/taglist/HTML.tags.xml.in.h:194
 msgid "Non-breaking space"
 msgstr "æ? é?´è·?ç©ºæ ¼"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:194
+#: ../plugins/taglist/HTML.tags.xml.in.h:195
 msgid "Note"
 msgstr "��"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:195
+#: ../plugins/taglist/HTML.tags.xml.in.h:196
 msgid "Object applet file"
 msgstr "对象å°?ç¨?åº?æ??件"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:197
+#: ../plugins/taglist/HTML.tags.xml.in.h:198
 msgid "Object applet file (deprecated)"
 msgstr "对象å°?ç¨?åº?æ??件(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:198
+#: ../plugins/taglist/HTML.tags.xml.in.h:199
 msgid "Object data reference"
 msgstr "对象����"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:199
+#: ../plugins/taglist/HTML.tags.xml.in.h:200
 msgid "Offset for alignment character"
 msgstr "对é½?å­?符ç??å??移"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:200
+#: ../plugins/taglist/HTML.tags.xml.in.h:201
 msgid "OnBlur event"
 msgstr "OnBlur �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:201
+#: ../plugins/taglist/HTML.tags.xml.in.h:202
 msgid "OnChange event"
 msgstr "OnChange �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:202
+#: ../plugins/taglist/HTML.tags.xml.in.h:203
 msgid "OnClick event"
 msgstr "OnClick �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:203
+#: ../plugins/taglist/HTML.tags.xml.in.h:204
 msgid "OnDblClick event"
 msgstr "OnDblClick �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:204
+#: ../plugins/taglist/HTML.tags.xml.in.h:205
 msgid "OnFocus event"
 msgstr "OnFocus �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:205
+#: ../plugins/taglist/HTML.tags.xml.in.h:206
 msgid "OnKeyDown event"
 msgstr "OnKeyDown �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:206
+#: ../plugins/taglist/HTML.tags.xml.in.h:207
 msgid "OnKeyPress event"
 msgstr "OnKeyPress �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:207
+#: ../plugins/taglist/HTML.tags.xml.in.h:208
 msgid "OnKeyUp event"
 msgstr "OnKeyUp �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:208
+#: ../plugins/taglist/HTML.tags.xml.in.h:209
 msgid "OnLoad event"
 msgstr "OnLoad �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:209
+#: ../plugins/taglist/HTML.tags.xml.in.h:210
 msgid "OnMouseDown event"
 msgstr "OnMouseDown �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:210
+#: ../plugins/taglist/HTML.tags.xml.in.h:211
 msgid "OnMouseMove event"
 msgstr "OnMouseMove �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:211
+#: ../plugins/taglist/HTML.tags.xml.in.h:212
 msgid "OnMouseOut event"
 msgstr "OnMouseOut �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:212
+#: ../plugins/taglist/HTML.tags.xml.in.h:213
 msgid "OnMouseOver event"
 msgstr "OnMouseOver �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:213
+#: ../plugins/taglist/HTML.tags.xml.in.h:214
 msgid "OnMouseUp event"
 msgstr "OnMouseUp �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:214
+#: ../plugins/taglist/HTML.tags.xml.in.h:215
 msgid "OnReset event"
 msgstr "OnReset �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:215
+#: ../plugins/taglist/HTML.tags.xml.in.h:216
 msgid "OnSelect event"
 msgstr "OnSelect �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:216
+#: ../plugins/taglist/HTML.tags.xml.in.h:217
 msgid "OnSubmit event"
 msgstr "OnSubmit �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:217
+#: ../plugins/taglist/HTML.tags.xml.in.h:218
 msgid "OnUnload event"
 msgstr "OnUnload �件"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:218
+#: ../plugins/taglist/HTML.tags.xml.in.h:219
 msgid "Option group"
 msgstr "é??项ç»?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:219
+#: ../plugins/taglist/HTML.tags.xml.in.h:220
 msgid "Option selector"
 msgstr "é??æ?©å?¨"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:220
+#: ../plugins/taglist/HTML.tags.xml.in.h:221
 msgid "Ordered list"
 msgstr "æ??åº?å??表"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:221
+#: ../plugins/taglist/HTML.tags.xml.in.h:222
 msgid "Output media"
 msgstr "���质"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:222
+#: ../plugins/taglist/HTML.tags.xml.in.h:223
 msgid "Paragraph"
 msgstr "段�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:223
+#: ../plugins/taglist/HTML.tags.xml.in.h:224
 msgid "Paragraph class"
 msgstr "段�类"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:224
+#: ../plugins/taglist/HTML.tags.xml.in.h:225
 msgid "Paragraph style"
 msgstr "段è?½æ ·å¼?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:225
+#: ../plugins/taglist/HTML.tags.xml.in.h:226
 msgid "Preformatted listing"
 msgstr "é¢?æ ¼å¼?å??å??表"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:226
+#: ../plugins/taglist/HTML.tags.xml.in.h:227
 msgid "Preformatted text"
 msgstr "é¢?æ ¼å¼?å??æ??æ?¬"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:227
+#: ../plugins/taglist/HTML.tags.xml.in.h:228
 msgid "Profile metainfo dictionary"
 msgstr "é??ç½®æ??件å??ä¿¡æ?¯å­?å?¸"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:228
+#: ../plugins/taglist/HTML.tags.xml.in.h:229
 msgid "Prompt message"
 msgstr "æ??示信æ?¯"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:229
+#: ../plugins/taglist/HTML.tags.xml.in.h:230
 msgid "Push button"
 msgstr "æ??é?®"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:230
+#: ../plugins/taglist/HTML.tags.xml.in.h:231
 msgid "Quote"
 msgstr "å¼?ç?¨"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:231
+#: ../plugins/taglist/HTML.tags.xml.in.h:232
 msgid "Range"
 msgstr "è??å?´"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:232
+#: ../plugins/taglist/HTML.tags.xml.in.h:233
 msgid "ReadOnly text and password"
 msgstr "å?ªè¯»æ??å­?å??å¯?ç ?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:233
+#: ../plugins/taglist/HTML.tags.xml.in.h:234
 msgid "Reduced spacing"
 msgstr "å??å°?é?´è·?"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:235
+#: ../plugins/taglist/HTML.tags.xml.in.h:236
 msgid "Reduced spacing (deprecated)"
 msgstr "å??å°?é?´è·?(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:236
+#: ../plugins/taglist/HTML.tags.xml.in.h:237
 msgid "Reverse link"
 msgstr "ä¿?ç??é?¾æ?¥"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:237
+#: ../plugins/taglist/HTML.tags.xml.in.h:238
 msgid "Root"
 msgstr "æ ¹"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:238
+#: ../plugins/taglist/HTML.tags.xml.in.h:239
 msgid "Rows"
 msgstr "è¡?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:239
+#: ../plugins/taglist/HTML.tags.xml.in.h:240
 msgid "Rulings between rows and columns"
 msgstr "è¡?å??å?»åº¦"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:240
+#: ../plugins/taglist/HTML.tags.xml.in.h:241
 msgid "Sample program output, scripts"
 msgstr "示ä¾?ç¨?åº?è¾?å?ºï¼?è??æ?¬"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:241
+#: ../plugins/taglist/HTML.tags.xml.in.h:242
 msgid "Scope covered by header cells"
 msgstr "表头å??å??æ ¼è¦?ç??ç??è??å?´"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:243
+#: ../plugins/taglist/HTML.tags.xml.in.h:244
 msgid "Script language name"
 msgstr "è??æ?¬è¯­è¨?å??称"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:244
+#: ../plugins/taglist/HTML.tags.xml.in.h:245
 msgid "Script statements"
 msgstr "è??æ?¬å£°æ??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:245
+#: ../plugins/taglist/HTML.tags.xml.in.h:246
 msgid "Scrollbar"
 msgstr "���"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:246
+#: ../plugins/taglist/HTML.tags.xml.in.h:247
 msgid "Selectable option"
 msgstr "å?¯é??项"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:247
+#: ../plugins/taglist/HTML.tags.xml.in.h:248
 msgid "Selected"
 msgstr "é??中"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:248
+#: ../plugins/taglist/HTML.tags.xml.in.h:249
 msgid "Server-side image map"
 msgstr "æ??å?¡å?¨ç«¯å?¾å??æ? å°?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:249
+#: ../plugins/taglist/HTML.tags.xml.in.h:250
 msgid "Shape"
 msgstr "形�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:250
+#: ../plugins/taglist/HTML.tags.xml.in.h:251
 msgid "Short inline quotation"
 msgstr "�����"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:251
+#: ../plugins/taglist/HTML.tags.xml.in.h:252
 msgid "Single line prompt"
 msgstr "å??è¡?æ??示"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:252
+#: ../plugins/taglist/HTML.tags.xml.in.h:253
 msgid "Size"
 msgstr "大�"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:254
+#: ../plugins/taglist/HTML.tags.xml.in.h:255
 msgid "Size (deprecated)"
 msgstr "大�(已��)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:255
+#: ../plugins/taglist/HTML.tags.xml.in.h:256
 msgid "Small text style"
 msgstr "å°?æ??æ?¬æ ·å¼?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:256
+#: ../plugins/taglist/HTML.tags.xml.in.h:257
 msgid "Soft line break"
 msgstr "软��"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:257
+#: ../plugins/taglist/HTML.tags.xml.in.h:258
 msgid "Sound"
 msgstr "声�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:258
+#: ../plugins/taglist/HTML.tags.xml.in.h:259
 msgid "Source"
 msgstr "��"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:259
-msgid "Space separated archive list"
+#: ../plugins/taglist/HTML.tags.xml.in.h:260
+msgid "Space-separated archive list"
 msgstr "ä»¥ç©ºæ ¼å??é??ç??å­?æ¡£å??表"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:260
+#: ../plugins/taglist/HTML.tags.xml.in.h:261
 msgid "Spacer"
 msgstr "��符"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:261
+#: ../plugins/taglist/HTML.tags.xml.in.h:262
 msgid "Spacing between cells"
 msgstr "å??å??æ ¼é?´è·?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:262
+#: ../plugins/taglist/HTML.tags.xml.in.h:263
 msgid "Spacing within cells"
 msgstr "å??å??æ ¼å??é?´è·?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:263
+#: ../plugins/taglist/HTML.tags.xml.in.h:264
 msgid "Span"
 msgstr "Span"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:264
+#: ../plugins/taglist/HTML.tags.xml.in.h:265
 msgid "Square root"
 msgstr "å¹³æ?¹æ ¹"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:265
-msgid "Standby load msg"
+#: ../plugins/taglist/HTML.tags.xml.in.h:266
+msgid "Standby load message"
 msgstr "ç­?å??è½½å?¥ä¿¡æ?¯"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:266
+#: ../plugins/taglist/HTML.tags.xml.in.h:267
 msgid "Starting sequence number"
 msgstr "èµ·å§?åº?å??å?·"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:268
+#: ../plugins/taglist/HTML.tags.xml.in.h:269
 msgid "Starting sequence number (deprecated)"
 msgstr "èµ·å§?åº?å??å?·(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:269
+#: ../plugins/taglist/HTML.tags.xml.in.h:270
 msgid "Strike-through text"
 msgstr "å? é?¤çº¿æ??å­?"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:271
+#: ../plugins/taglist/HTML.tags.xml.in.h:272
 msgid "Strike-through text (deprecated)"
 msgstr "å? é?¤çº¿æ??å­?(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:272
+#: ../plugins/taglist/HTML.tags.xml.in.h:273
 msgid "Strike-through text style"
 msgstr "å? é?¤çº¿æ??å­?æ ·å¼?"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:274
+#: ../plugins/taglist/HTML.tags.xml.in.h:275
 msgid "Strike-through text style (deprecated)"
 msgstr "å? é?¤çº¿æ??å­?æ ·å¼?(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:275
+#: ../plugins/taglist/HTML.tags.xml.in.h:276
 msgid "Strong emphasis"
 msgstr "强�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:276
+#: ../plugins/taglist/HTML.tags.xml.in.h:277
 msgid "Style info"
 msgstr "æ ·å¼?ä¿¡æ?¯"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:277
+#: ../plugins/taglist/HTML.tags.xml.in.h:278
 msgid "Subscript"
 msgstr "ä¸?æ ?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:278
+#: ../plugins/taglist/HTML.tags.xml.in.h:279
 msgid "Superscript"
 msgstr "ä¸?æ ?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:279
+#: ../plugins/taglist/HTML.tags.xml.in.h:280
 msgid "Tab order position"
 msgstr "Tab 顺��置"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:280
+#: ../plugins/taglist/HTML.tags.xml.in.h:281
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:281
+#: ../plugins/taglist/HTML.tags.xml.in.h:282
 msgid "Table body"
 msgstr "表�"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:282
+#: ../plugins/taglist/HTML.tags.xml.in.h:283
 msgid "Table caption"
 msgstr "è¡¨æ ¼æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:283
+#: ../plugins/taglist/HTML.tags.xml.in.h:284
 msgid "Table column group properties"
 msgstr "表å??ç»?å±?æ?§"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:284
+#: ../plugins/taglist/HTML.tags.xml.in.h:285
 msgid "Table column properties"
 msgstr "表å??å±?æ?§"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:285
+#: ../plugins/taglist/HTML.tags.xml.in.h:286
 msgid "Table data cell"
 msgstr "è¡¨æ ¼æ?°æ?®å??å??æ ¼"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:286
+#: ../plugins/taglist/HTML.tags.xml.in.h:287
 msgid "Table footer"
 msgstr "表è??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:287
+#: ../plugins/taglist/HTML.tags.xml.in.h:288
 msgid "Table header"
 msgstr "表头"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:288
+#: ../plugins/taglist/HTML.tags.xml.in.h:289
 msgid "Table header cell"
 msgstr "表头å??ç´ "
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:289
+#: ../plugins/taglist/HTML.tags.xml.in.h:290
 msgid "Table row"
 msgstr "è¡¨æ ¼è¡?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:290
+#: ../plugins/taglist/HTML.tags.xml.in.h:291
 msgid "Table summary"
 msgstr "è¡¨æ ¼æ¦?è§?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:291
+#: ../plugins/taglist/HTML.tags.xml.in.h:292
 msgid "Target - Blank"
 msgstr "ç?®æ ? - Blank"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:292
+#: ../plugins/taglist/HTML.tags.xml.in.h:293
 msgid "Target - Parent"
 msgstr "ç?®æ ? - Parent"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:293
+#: ../plugins/taglist/HTML.tags.xml.in.h:294
 msgid "Target - Self"
 msgstr "ç?®æ ? - Self"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:294
+#: ../plugins/taglist/HTML.tags.xml.in.h:295
 msgid "Target - Top"
 msgstr "ç?®æ ? - Top"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:295
+#: ../plugins/taglist/HTML.tags.xml.in.h:296
 msgid "Teletype or monospace text style"
 msgstr "ç?µä¼ æ??ç­?宽æ??å­?æ ·å¼?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:296
+#: ../plugins/taglist/HTML.tags.xml.in.h:297
 msgid "Text"
 msgstr "æ??æ?¬"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:297
+#: ../plugins/taglist/HTML.tags.xml.in.h:298
 msgid "Text color"
 msgstr "æ??æ?¬é¢?è?²"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:299
+#: ../plugins/taglist/HTML.tags.xml.in.h:300
 msgid "Text color (deprecated)"
 msgstr "æ??æ?¬é¢?è?²(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:300
+#: ../plugins/taglist/HTML.tags.xml.in.h:301
 msgid "Text entered by user"
 msgstr "ç?¨æ?·è¾?å?¥ç??æ??å­?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:301
+#: ../plugins/taglist/HTML.tags.xml.in.h:302
 msgid "Title"
 msgstr "æ ?é¢?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:302
-msgid "Topmargin in pixels"
+#: ../plugins/taglist/HTML.tags.xml.in.h:303
+msgid "Top margin in pixels"
 msgstr "以å??ç´ è®¡ç??ä¸?è¾¹è·?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:303
+#: ../plugins/taglist/HTML.tags.xml.in.h:304
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:304
+#: ../plugins/taglist/HTML.tags.xml.in.h:305
 msgid "Underlined text style"
 msgstr "ä¸?å??线æ??å­?æ ·å¼?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:305
+#: ../plugins/taglist/HTML.tags.xml.in.h:306
 msgid "Unordered list"
 msgstr "æ? åº?å??表"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:306
+#: ../plugins/taglist/HTML.tags.xml.in.h:307
 msgid "Use image map"
 msgstr "使ç?¨å?¾å??æ? å°?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:307
+#: ../plugins/taglist/HTML.tags.xml.in.h:308
 msgid "Value"
 msgstr "å?¼"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:308
+#: ../plugins/taglist/HTML.tags.xml.in.h:309
 msgid "Value interpretation"
 msgstr "å?¼è§£é??"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:309
+#: ../plugins/taglist/HTML.tags.xml.in.h:310
 msgid "Variable or program argument"
 msgstr "å??é??æ??ç¨?åº?å??æ?°"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:310
+#: ../plugins/taglist/HTML.tags.xml.in.h:311
 msgid "Vertical cell alignment"
 msgstr "å??å??æ ¼å??ç?´å¯¹é½?"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:311
+#: ../plugins/taglist/HTML.tags.xml.in.h:312
 msgid "Vertical space"
 msgstr "å??ç?´é?´è·?"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:313
+#: ../plugins/taglist/HTML.tags.xml.in.h:314
 msgid "Vertical space (deprecated)"
 msgstr "å??ç?´é?´è·?(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:314
+#: ../plugins/taglist/HTML.tags.xml.in.h:315
 msgid "Visited link color"
 msgstr "å·²æµ?è§?ç??é?¾æ?¥é¢?è?²"
 
 #. Deprecated since HTML 4.01, not supported in XHTML 1.0 Strict DTD.
-#: ../plugins/taglist/HTML.tags.xml.in.h:316
+#: ../plugins/taglist/HTML.tags.xml.in.h:317
 msgid "Visited link color (deprecated)"
 msgstr "å·²æµ?è§?ç??é?¾æ?¥é¢?è?²(å·²åº?å¼?)"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:317
+#: ../plugins/taglist/HTML.tags.xml.in.h:318
 msgid "Width"
 msgstr "宽度"
 
-#: ../plugins/taglist/HTML.tags.xml.in.h:318
+#: ../plugins/taglist/HTML.tags.xml.in.h:319
 msgid "XHTML 1.0 - Tags"
 msgstr "XHTML 1.0 - æ ?è®°"
 
@@ -4579,8 +4628,9 @@ msgid "Footnote"
 msgstr "è??注"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:12
-msgid "Function cosin"
-msgstr "cos ��"
+#, fuzzy
+msgid "Function cosine"
+msgstr "�弦��"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:13
 msgid "Function e^"
@@ -4771,16 +4821,16 @@ msgid "Symbol dagger"
 msgstr "â? 符å?·"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:60
-msgid "Symbol equiv"
-msgstr "�符�"
+msgid "Symbol em-dash ---"
+msgstr "---符å?·(é?¿ç ´æ??å?·)"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:61
-msgid "Symbol hyphen --"
-msgstr "--符�"
+msgid "Symbol en-dash --"
+msgstr "--符å?·(ç?­ç ´æ??å?·)"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:62
-msgid "Symbol hyphen ---"
-msgstr "---符�"
+msgid "Symbol equiv"
+msgstr "�符�"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:63
 msgid "Symbol infinity"
@@ -4832,8 +4882,8 @@ msgstr "ä¸?å?¯æ?­æ??å­?"
 
 #: ../plugins/taglist/taglist.gedit-plugin.desktop.in.h:1
 msgid ""
-"Provides a method to easily insert into a document commonly used tags/"
-"strings without having to type them."
+"Provides a method to easily insert commonly used tags/strings into a "
+"document without having to type them."
 msgstr "æ??ä¾?ä¸?ç§?æ? é??é?®å?¥å?³å?¯å°?常ç?¨æ ?è®°/å­?符串轻æ??æ??å?¥æ??æ¡£ç??æ?¹æ³?ã??"
 
 #: ../plugins/taglist/taglist.gedit-plugin.desktop.in.h:2
@@ -4932,47 +4982,97 @@ msgstr "æ??å?¥æ?¥æ??/æ?¶é?´"
 msgid "Inserts current date and time at the cursor position."
 msgstr "å?¨å??æ ?å¤?æ??å?¥å½?å??ç??æ?¥æ??å??æ?¶é?´ã??"
 
+#. Translators: Use the more common date format in your locale
 #: ../plugins/time/gedit-time-dialog.ui.h:3
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:3
-msgid "<span size=\"small\">01/11/2002 17:52:00</span>"
-msgstr "<span size=\"small\">2002/01/11 17:52:00</span>"
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:4
+#, no-c-format
+msgid "%d/%m/%Y %H:%M:%S"
+msgstr ""
 
+#. Translators: This example should follow the date format defined in the entry above
 #: ../plugins/time/gedit-time-dialog.ui.h:4
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:6
+msgid "01/11/2009 17:52:00"
+msgstr ""
+
+#: ../plugins/time/gedit-time-dialog.ui.h:5
 msgid "Insert Date and Time"
 msgstr "æ??å?¥æ?¥æ??å??æ?¶é?´"
 
-#: ../plugins/time/gedit-time-dialog.ui.h:5
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:6
+#: ../plugins/time/gedit-time-dialog.ui.h:6
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:8
 msgid "Use the _selected format"
 msgstr "使ç?¨é??中ç??æ ¼å¼?(_S)"
 
-#: ../plugins/time/gedit-time-dialog.ui.h:6
+#: ../plugins/time/gedit-time-dialog.ui.h:7
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../plugins/time/gedit-time-dialog.ui.h:7
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:8
+#: ../plugins/time/gedit-time-dialog.ui.h:8
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:11
 msgid "_Use custom format"
 msgstr "使ç?¨è?ªå®?ä¹?æ ¼å¼?(_U)"
 
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:4
-msgid "<span weight=\"bold\"> When inserting date/time...</span>"
-msgstr "<span weight=\"bold\">æ??å?¥æ?¥æ??/æ?¶é?´æ?¶...</span>"
-
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:5
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:7
 msgid "Configure date/time plugin"
 msgstr "é??ç½®æ?¥æ??/æ?¶é?´æ??件"
 
-#: ../plugins/time/gedit-time-setup-dialog.ui.h:7
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:9
+#, fuzzy
+msgid "When inserting date/time..."
+msgstr "å?¨æ??å?¥æ?¥æ??/æ?¶é?´æ?¶..."
+
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:10
 msgid "_Prompt for a format"
 msgstr "æ??示å?¯ä½¿ç?¨ç??æ ¼å¼?(_P)"
 
+#~ msgid "Backup Copy Extension"
+#~ msgstr "å¤?份æ??件æ?©å±?å??"
+
+#~ msgid ""
+#~ "Extension or suffix to use for backup file names. This will only take "
+#~ "effect if the \"Create Backup Copies\" option is turned on."
+#~ msgstr "å¤?份æ??件ç??æ?©å±?å??æ??å??ç¼?ã??å?ªæ??å½?â??ç??æ??å¤?份æ??件â??é??项é??中æ?¶æ??æ??æ??ã??"
+
+#~ msgid "Whether gedit should highlight matching bracket."
+#~ msgstr "gedit æ?¯å?¦å?¯ç?¨çª?å?ºæ?¾ç¤ºå?¹é??ç??æ?¬å?·ã??"
+
+#~ msgid "Character Codings"
+#~ msgstr "å­?符ç¼?ç ?"
+
+#~ msgid "Ch_aracter Coding:"
+#~ msgstr "å­?符ç¼?ç ?(_A)ï¼?"
+
+#~ msgid "Could not obtain backup filename"
+#~ msgstr "æ? æ³?è?·å¾?å¤?份æ??件å??"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "<span weight=\"bold\">File Name</span>"
+#~ msgstr "<span weight=\"bold\">æ??件å??</span>"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Language</b>"
+#~ msgstr "<b>语�</b>"
+
+#~ msgid "<b>word</b>"
+#~ msgstr "<b>å??è¯?</b>"
+
+#~ msgid "HttP header name"
+#~ msgstr "HTTP 头å??称"
+
+#~ msgid "<span size=\"small\">01/11/2002 17:52:00</span>"
+#~ msgstr "<span size=\"small\">2002/01/11 17:52:00</span>"
+
+#~ msgid "<span weight=\"bold\"> When inserting date/time...</span>"
+#~ msgstr "<span weight=\"bold\">æ??å?¥æ?¥æ??/æ?¶é?´æ?¶...</span>"
+
 #~ msgid "_Indent"
 #~ msgstr "缩�(_I)"
 
-#~ msgid "Indent selected lines"
-#~ msgstr "缩è¿?é??中è¡?"
-
 #~ msgid "U_nindent"
 #~ msgstr "å??æ¶?缩è¿?(_N)"
 
@@ -5009,9 +5109,6 @@ msgstr "æ??示å?¯ä½¿ç?¨ç??æ ¼å¼?(_P)"
 #~ msgid "Open Location"
 #~ msgstr "æ??å¼?ä½?ç½®"
 
-#~ msgid "Ch_aracter coding:"
-#~ msgstr "å­?符ç¼?ç ?(_A)ï¼?"
-
 #~ msgid "Enter the _location (URI) of the file you would like to open:"
 #~ msgstr "è¾?å?¥æ?¨æ?³æ??å¼?æ??件ç??ä½?ç½®(URI)(_L)ï¼?"