[gnote] Update Chinese (China) translation



commit 26d75697ecf35ce2a8f28061676ce957276b7e59
Author: Boyuan Yang <073plan gmail com>
Date:   Wed Jul 7 19:28:14 2021 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 2512 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1447 insertions(+), 1065 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f6047d29..0c5eec85 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,24 +7,33 @@
 # Aron Xu <aronmalache 163 com>, 2009.
 # YunQiang Su <wzssyqa gmail com>, 2010.
 # Aron Xu <aronxu gnome org>, 2010.
+# Junping Sun <junping nfschina com>, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnote master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gnote&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-15 18:38+0000\n"
-"PO-Revision-Date: 2014-03-30 22:35+0800\n"
-"Last-Translator: Yunqiang Su <wzssyqa gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues\n";
+"POT-Creation-Date: 2021-06-20 08:52+0000\n"
+"PO-Revision-Date: 2021-07-07 15:27-0400\n"
+"Last-Translator: Boyuan Yang <073plan gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 2.4.2\n"
 
-#: ../data/appdata/gnote.appdata.xml.in.h:1
+#: data/org.gnome.Gnote.appdata.xml.in:7 data/org.gnome.Gnote.desktop.in:3
+#: src/recentchanges.cpp:52 src/recentchanges.cpp:611
+msgid "Gnote"
+msgstr "Gnote"
+
+#: data/org.gnome.Gnote.appdata.xml.in:8
+msgid "A simple note-taking application"
+msgstr "简单的便笺应用程序"
+
+#: data/org.gnome.Gnote.appdata.xml.in:10
 msgid ""
 "Gnote is a simple note-taking application for GNOME desktop environment. It "
 "allows you to capture your ideas, link them together using WikiWiki-style "
@@ -34,34 +43,38 @@ msgstr ""
 "法,使用 WikiWiki 样式的讲其相互链接起来,在笔记本中分组。它还有日常使用中的"
 "其他功能。"
 
-#: ../data/appdata/gnote.appdata.xml.in.h:2
+#: data/org.gnome.Gnote.appdata.xml.in:13
+msgid "Notes can be printed or exported as HTML documents."
+msgstr "便笺可以作为 HTML 文档打印或导出。"
+
+#: data/org.gnome.Gnote.appdata.xml.in:14
+#, fuzzy
+#| msgid ""
+#| "Gnote also supports synchronization to make it possible to use on "
+#| "multiple devices."
 msgid ""
-"Gnote also supports synchronization to make it possible to use on multiple "
+"Gnote also supports synchronization, making it simple to use it on multiple "
 "devices."
 msgstr "Gnote 也支持同步,这样就可以在多个不同的设备上使用。"
 
-#: ../data/gnote.desktop.in.in.h:1 ../src/recentchanges.cpp:45
-#: ../src/recentchanges.cpp:479
-msgid "Gnote"
-msgstr "Gnote"
-
-#: ../data/gnote.desktop.in.in.h:2
+#: data/org.gnome.Gnote.desktop.in:4
 msgid "Take notes, link ideas, and stay organized"
 msgstr "记录便笺,汇集想法,保持井然有序"
 
-#: ../data/gnote.desktop.in.in.h:3
+#: data/org.gnome.Gnote.desktop.in:5
 msgid "Note-taker"
 msgstr "记事本"
 
-#: ../data/gnote.desktop.in.in.h:4
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: data/org.gnome.Gnote.desktop.in:7
 msgid "notes;idea;link;organize;"
 msgstr "notes;idea;link;organize;便笺;笔记;思想;点子;想法;组织;"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:1
+#: data/org.gnome.gnote.gschema.xml:6
 msgid "Enable spellchecking"
 msgstr "允许拼写检查"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:2
+#: data/org.gnome.gnote.gschema.xml:7
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -69,51 +82,50 @@ msgstr ""
 "若为真,则拼错的单词将被加红色下划线,而正确的拼写建议将显示在右键单击菜单"
 "中。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:3
+#: data/org.gnome.gnote.gschema.xml:11
 msgid "Automatically create links when typing"
 msgstr "输入时自动创建链接"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:4
+#: data/org.gnome.gnote.gschema.xml:12
 msgid ""
 "Enable this option to automatically create a link, when text matches note "
 "title."
 msgstr "启用此选项将会在匹配便笺标题时自动创建链接。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:5
-#| msgid "Update links in referencing notes"
+#: data/org.gnome.gnote.gschema.xml:16
 msgid "Create links for URLs in notes"
 msgstr "为便笺中的 URL 创建链接"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:6
+#: data/org.gnome.gnote.gschema.xml:17
 msgid "Enable this option to create links for URLs in notes."
 msgstr "启用此选项可以在便笺中为 URL 创建链接。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:7
+#: data/org.gnome.gnote.gschema.xml:21
 msgid "Enable WikiWord highlighting"
 msgstr "启用 WikiWord 高亮显示"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:8
+#: data/org.gnome.gnote.gschema.xml:22
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr "启用此选项将对 WikiWord 这样的词高亮显示。单击单词将创建该名称的便笺。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:9
+#: data/org.gnome.gnote.gschema.xml:26
 msgid "Enable Auto bulleted lists"
 msgstr "允许自动列表格式"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:10
+#: data/org.gnome.gnote.gschema.xml:27
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr ""
 "如果您希望系统当您在行首输入 - 或 * 时将文本自动转换为列表,请启用此选项。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:11
+#: data/org.gnome.gnote.gschema.xml:31
 msgid "Enable Middle-Click Paste On Icon"
 msgstr "允许在图标上单击中键粘贴"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:12
+#: data/org.gnome.gnote.gschema.xml:32
 msgid ""
 "Enable this option if you want to be able to middle-click the Gnote icon to "
 "paste timestamped content into the Start Here note."
@@ -121,11 +133,11 @@ msgstr ""
 "如果您希望用鼠标中键单击 Gnote 图标时将带有时间戳的内容粘贴到“从这里开始”便"
 "笺,请启用此选项。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:13
+#: data/org.gnome.gnote.gschema.xml:36
 msgid "Enable custom font"
 msgstr "允许自定义字体"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:14
+#: data/org.gnome.gnote.gschema.xml:37
 msgid ""
 "If true, the font name set in custom-font-face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -133,34 +145,21 @@ msgstr ""
 "若为真,将使用 custom_font_face 中设置的字体名称显示便笺。否则将使用默认的桌"
 "面字体显示便笺。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:15
+#: data/org.gnome.gnote.gschema.xml:41
 msgid "Custom Font Face"
 msgstr "自定义字体"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:16
+#: data/org.gnome.gnote.gschema.xml:42
 msgid ""
 "If enable-custom-font is true, the font name set here will be used as the "
 "font when displaying notes."
 msgstr "若 enable_custom_font 为真,显示便笺时将使用此处设置的字体名。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:17
-msgid "Enable global keybindings"
-msgstr "允许全局按键绑定"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:18
-msgid ""
-"If true, the desktop-global keybindings set in /org/gnome/gnote/global-"
-"keybindings will be enabled, allowing for useful Gnote actions to be "
-"available from any application."
-msgstr ""
-"若为真,将启用 /org/gnome/gnote/global-keybindings 中设定的桌面全局按键组合,"
-"以便允许在任何应用程序中执行 Gnote 操作。"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:19
+#: data/org.gnome.gnote.gschema.xml:46
 msgid "Start Here Note"
 msgstr "“从这里开始”便笺"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:20
+#: data/org.gnome.gnote.gschema.xml:47
 msgid ""
 "The note URI of the note that should be considered the \"Start Here\" note, "
 "which is always placed at the bottom of the Gnote note menu and also "
@@ -169,115 +168,114 @@ msgstr ""
 "应被视为“从这里开始”便笺的 URI,它将总显示在 Gnote 菜单的底端,并且可以用快捷"
 "键访问。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:21
+#: data/org.gnome.gnote.gschema.xml:51
 msgid "Minimum number of notes to show in menu"
 msgstr "菜单中要显示的最少便笺数"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:22
+#: data/org.gnome.gnote.gschema.xml:52
 msgid ""
 "Integer determining the minimum number of notes to show in the Gnote note "
 "menu."
 msgstr "整数值,决定在 Gnote 菜单中显示的最少便笺数。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:23
+#: data/org.gnome.gnote.gschema.xml:56
 msgid "List of pinned notes"
 msgstr "加钉便笺列表"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:24
+#: data/org.gnome.gnote.gschema.xml:57
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Gnote note menu."
 msgstr "总是出现在 Gnote 菜单中的 URI 列表,以空格分开。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:25
+#: data/org.gnome.gnote.gschema.xml:61
 msgid "Is main window maximized"
 msgstr "主窗口是否最大化"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:26
+#: data/org.gnome.gnote.gschema.xml:62
 msgid "If true, Gnote window will be maximized."
 msgstr "如果为 true,Gnote 窗口将被最大化。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:27
+#: data/org.gnome.gnote.gschema.xml:66
 msgid "Saved height of Search window"
 msgstr "保存的搜索窗口高度"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:28
+#: data/org.gnome.gnote.gschema.xml:67
 msgid "Determines pixel height of Search window; stored on Gnote exit."
 msgstr "决定搜索窗口的像素高度;当 Gnote 退出时保存。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:29
+#: data/org.gnome.gnote.gschema.xml:71
 msgid "Saved width of Search window"
 msgstr "保存的搜索窗口宽度"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:30
+#: data/org.gnome.gnote.gschema.xml:72
 msgid "Determines pixel width of Search window; stored on Gnote exit."
 msgstr "决定搜索窗口的像素宽度;当 Gnote 退出时保存。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:31
+#: data/org.gnome.gnote.gschema.xml:76
 msgid "Saved splitter position of Search window splitter."
 msgstr "保存的搜索窗口分隔器的位置"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:32
+#: data/org.gnome.gnote.gschema.xml:77
 msgid ""
 "Determines Search window splitter position in pixels; stored on Gnote exit."
 msgstr "决定搜索窗口的分隔器位置(像素);当 Gnote 退出时保存。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:33
-#| msgid "Saved height of Search window"
+#: data/org.gnome.gnote.gschema.xml:81
 msgid "Saved sorting of the Search window."
 msgstr "保存的搜索窗口排序。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:34
+#: data/org.gnome.gnote.gschema.xml:82
 msgid "Determines Search window initial sorting."
 msgstr "决定搜索窗口初始排序。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:35
+#: data/org.gnome.gnote.gschema.xml:86
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE 挂载超时(ms)"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:36
+#: data/org.gnome.gnote.gschema.xml:87
 msgid ""
 "Time (in milliseconds) Gnote should wait for a response when using FUSE to "
 "mount a sync share."
 msgstr "当使用 FUSE 来挂载一个同步共享时,Gnote 等待回应的时间(毫秒)。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:37
+#: data/org.gnome.gnote.gschema.xml:91
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS 远程同步文件夹"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:38
+#: data/org.gnome.gnote.gschema.xml:92
 msgid "Path on SSH server to Gnote synchronization directory (optional)."
 msgstr "SSH 服务器到 Gnote 同步目录的路径(可选)。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:39
+#: data/org.gnome.gnote.gschema.xml:96
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS 同步服务器 URL"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:40
+#: data/org.gnome.gnote.gschema.xml:97
 msgid "URL of SSH server containing Gnote synchronization directory."
 msgstr "包含 Gnote 同步目录的 SSH 服务器 URL。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:41
+#: data/org.gnome.gnote.gschema.xml:101
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "SSHFS 远程同步用户名"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:42
+#: data/org.gnome.gnote.gschema.xml:102
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr "通过 SSH 连接同步服务器时使用的用户名。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:43
+#: data/org.gnome.gnote.gschema.xml:106
 msgid "SSHFS Synchronization Server Port"
 msgstr "SSHFS 同步服务器端口"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:44
+#: data/org.gnome.gnote.gschema.xml:107
 msgid "The port to use when connecting to the synchronization server via SSH."
 msgstr "通过 SSH 连接同步服务器时使用的端口。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:45
+#: data/org.gnome.gnote.gschema.xml:111
 msgid "Link Updating Behavior on Note Rename"
 msgstr "重命名便笺时更新链接的行为"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:46
+#: data/org.gnome.gnote.gschema.xml:112
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific link updating behavior when a note is renamed, instead of prompting "
@@ -292,152 +290,78 @@ msgstr ""
 "提示。1 代表自动删除链接。2 代表将链接更新到新便笺名的文本,以便可以继续链接"
 "到重命名后的便笺。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:47
+#: data/org.gnome.gnote.gschema.xml:116
 msgid "Enable closing notes with escape"
 msgstr "允许用 Esc 关闭便笺"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:48
+#: data/org.gnome.gnote.gschema.xml:117
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "如果启用此选项,则可用 Esc 键关闭打开的便笺。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:49
+#: data/org.gnome.gnote.gschema.xml:121
 msgid "Use status icon, when started as an application"
 msgstr "在以应用程序方式启动时,使用状态图标"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:50
-msgid ""
-"Has affect only when started as an application. When set to TRUE, shows a "
-"status icon. If set to FALSE, Search All Notes window is used as main "
-"application window, closing which makes application to exit."
-msgstr ""
-"只在以应用程序方式启动时有效。若设为 TRUE,将显示一个状态图标。若设为 "
-"FALSE,“搜索全部便笺”窗口将用作主应用程序窗口,关闭它会退出应用程序。"
+#: data/org.gnome.gnote.gschema.xml:122
+msgid "Deprecated, has no effect."
+msgstr "已弃用,没有效果。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:51
-#| msgid "Open the Search All Notes window"
+#: data/org.gnome.gnote.gschema.xml:126
 msgid "Open notes in new window"
 msgstr "在新窗口打开便笺"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:52
+#: data/org.gnome.gnote.gschema.xml:127
 msgid ""
 "Open notes in new window instead of replacing active content of the same "
 "window"
 msgstr "在新窗口中打开便笺而不时替换相同窗口的活动内容"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:53
-msgid "Show applet menu"
-msgstr "显示小程序菜单"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:54
-msgid ""
-"The global keybinding for showing the Gnote applet's menu. The format looks "
-"like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"显示 Gnote 小程序菜单的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
-"Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
-"如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,那么"
-"此操作将没有按键组合。"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:55
-msgid "Open Start Here"
-msgstr "打开“从这里开始”"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:56
-msgid ""
-"The global keybinding for opening the \"Start Here\" note. The format looks "
-"like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"打开“从这里开始”便笺的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
-"Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
-"如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,那么"
-"此操作将没有按键组合。"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:57
-msgid "Create a new Note"
-msgstr "创建新便笺"
+#: data/org.gnome.gnote.gschema.xml:131
+msgid "Save note window size and autosize note window to it"
+msgstr "保存便笺窗口大小并自动调整便笺窗口大小"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:58
+#: data/org.gnome.gnote.gschema.xml:132
 msgid ""
-"The global keybinding for creating and displaying a new Note. The format "
-"looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
-"parser is fairly liberal and allows lower or upper case, and also "
-"abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the "
-"option to the special string \"disabled\", then there will be no keybinding "
-"for this action."
-msgstr ""
-"创建并显示新便笺的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
-"Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
-"如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,那么"
-"此操作将没有按键组合。"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:59
-msgid "Open Search Dialog"
-msgstr "打开搜索对话框"
+"Saves note window size and automatically resizes main window to this size, "
+"when note is opened."
+msgstr "保存便笺窗口大小,并在打开便笺时自动将主窗口调整为此大小。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:60
-msgid ""
-"The global keybinding for opening the Note Search dialog. The format looks "
-"like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
+#: data/org.gnome.gnote.gschema.xml:136
+msgid "Use client side window decorations"
 msgstr ""
-"打开便笺搜索对话框的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
-"Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
-"如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,那么"
-"此操作将没有按键组合。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:61
-msgid "Open Recent Changes"
-msgstr "打开最近的更改"
-
-#: ../data/org.gnome.gnote.gschema.xml.in.h:62
+#: data/org.gnome.gnote.gschema.xml:137
 msgid ""
-"The global keybinding for opening the Recent Changes dialog. The format "
-"looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
-"parser is fairly liberal and allows lower or upper case, and also "
-"abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the "
-"option to the special string \"disabled\", then there will be no keybinding "
-"for this action."
+"Should Gnote draw its window titlebar, or leave that to window manager. "
+"Possible values are 'enabled' to draw them, 'disabled' to leave them to "
+"window manager, or a comma separated list of desktop environments, where "
+"Gnote should draw decorations itself. Requires application restart."
 msgstr ""
-"打开最近更改对话框的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
-"Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
-"如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,那么"
-"此操作将没有按键组合。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:63
+#: data/org.gnome.gnote.gschema.xml:148
 msgid "HTML Export Last Directory"
 msgstr "上次 HTML 导出的目录"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:64
+#: data/org.gnome.gnote.gschema.xml:149
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr "上次使用“导出为 HTML”插件导出便笺时的导出目录。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:65
+#: data/org.gnome.gnote.gschema.xml:153
 msgid "HTML Export Linked Notes"
 msgstr "HTML 导出链接的便笺"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:66
+#: data/org.gnome.gnote.gschema.xml:154
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr "“导出为 HTML”插件中“导出链接的便笺”复选框上次的选中状态。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:67
+#: data/org.gnome.gnote.gschema.xml:158
 msgid "HTML Export All Linked Notes"
 msgstr "HTML 导出链接的全部便笺"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:68
+#: data/org.gnome.gnote.gschema.xml:159
 msgid ""
 "The last setting for the 'Include all other linked notes' checkbox in the "
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
@@ -447,41 +371,45 @@ msgstr ""
 "“导出为 HTML” 插件中“包含链接的全部便笺”的上次设置。此设置将与“HTML 导出链接"
 "的便笺”设置组合使用,用于指定在导出至 HTML 时是否应递归包含所涉及的全部便笺。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:69
+#: data/org.gnome.gnote.gschema.xml:165
 msgid "Synchronization Client ID"
 msgstr "同步客户端 ID"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:70
+#: data/org.gnome.gnote.gschema.xml:166
+#, fuzzy
+#| msgid ""
+#| "Unique identifier for this Gnote client, used when communicating with a "
+#| "sychronization server."
 msgid ""
 "Unique identifier for this Gnote client, used when communicating with a "
-"sychronization server."
+"synchronization server."
 msgstr "此 Gnote 客户端的唯一标识符,用于与同步服务器通讯。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:71
+#: data/org.gnome.gnote.gschema.xml:170
 msgid "Synchronization Local Server Path"
 msgstr "本地同步服务器路径"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:72
+#: data/org.gnome.gnote.gschema.xml:171
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr "使用文件系统同步服务插件时的同步服务器路径。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:73
+#: data/org.gnome.gnote.gschema.xml:175
 msgid "Selected Synchronization Service Addin"
 msgstr "所选的同步服务插件"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:74
+#: data/org.gnome.gnote.gschema.xml:176
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr "目前已配置的便笺同步服务插件的唯一标识符。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:75
+#: data/org.gnome.gnote.gschema.xml:180
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "便笺同步冲突保存行为"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:76
+#: data/org.gnome.gnote.gschema.xml:181
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -492,11 +420,11 @@ msgstr ""
 "整数值,代表检测到冲突时是否总是执行特定的行为,而不是提示用户。此值将会映射"
 "到内部枚举量上。0 代表用户希望发生冲突时得到提示,以便可以逐一处理这些冲突。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:77
+#: data/org.gnome.gnote.gschema.xml:185
 msgid "Automatic Background Synchronization Timeout"
 msgstr "后台自动同步超时"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:78
+#: data/org.gnome.gnote.gschema.xml:186
 msgid ""
 "Integer value indicating how frequently to perform a background sync of your "
 "notes (when sync is configured). Any value less than 1 indicates that "
@@ -506,196 +434,341 @@ msgstr ""
 "一个指定多久进行一次后台便笺同步的整数值(若配置了同步)。小于 1 的值表示禁用自"
 "动同步。可接受的最小取值为 5。单位为分钟。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:79
+#: data/org.gnome.gnote.gschema.xml:193
+msgid "Online directory URI"
+msgstr "在线目录 URI"
+
+#: data/org.gnome.gnote.gschema.xml:194
+#, fuzzy
+#| msgid "WebDAV share URL where notes are synchronized to."
+msgid "URI to online directory where notes are synchronized to."
+msgstr "便笺同步到的 WebDAV 共享 URL。"
+
+#: data/org.gnome.gnote.gschema.xml:200
 msgid "Accept SSL Certificates"
 msgstr "接受 SSL 证书"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:80
+#: data/org.gnome.gnote.gschema.xml:201
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr "使用 wdfs 选项“-ac”让用户接受 SSL 证书时不出现提示信息。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:81
+#: data/org.gnome.gnote.gschema.xml:205
 msgid "Share URL"
 msgstr "共享 URL"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:82
+#: data/org.gnome.gnote.gschema.xml:206
 msgid "WebDAV share URL where notes are synchronized to."
 msgstr "便笺同步到的 WebDAV 共享 URL。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:83
+#: data/org.gnome.gnote.gschema.xml:210
 msgid "Share username"
 msgstr "共享用户名"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:84
+#: data/org.gnome.gnote.gschema.xml:211
 msgid "Username to access WebDAV share."
 msgstr "访问 WebDAV 共享的用户名。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:85
+#: data/org.gnome.gnote.gschema.xml:217
 msgid "Timestamp format"
 msgstr "时间戳格式"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:86
+#: data/org.gnome.gnote.gschema.xml:218
 msgid ""
 "The date format that is used for the timestamp. It follows the format of "
 "strftime(3)."
 msgstr "用于时间戳的日期格式。格式与 strftime(3) 相同。"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:87
+#: data/org.gnome.gnote.gschema.xml:224
 msgid "Time between checks"
 msgstr "检查间隔"
 
-#: ../data/org.gnome.gnote.gschema.xml.in.h:88
+#: data/org.gnome.gnote.gschema.xml:225
 msgid ""
 "Time interval between note directory checks (in seconds). Min value is 5."
 msgstr "便笺目录的两次检查之间的时间间隔(以秒为单位),最小值为 5。"
 
-#: ../src/actionmanager.cpp:84 ../src/actionmanager.cpp:171
-#: ../src/tray.cpp:465
-msgid "_Quit"
-msgstr "退出(_Q)"
+#: data/shortcuts-gnote.ui:9
+msgctxt "shortcut window"
+msgid "Main Window"
+msgstr "主窗口"
 
-#: ../src/actionmanager.cpp:84
-msgid "Quit Gnote"
-msgstr "退出 Gnote"
+#: data/shortcuts-gnote.ui:13 data/shortcuts-gnote.ui:115
+msgctxt "shortcut window"
+msgid "General"
+msgstr "常规"
 
-#: ../src/actionmanager.cpp:89 ../src/actionmanager.cpp:168
-#: ../src/tray.cpp:448
-msgid "_Preferences"
-msgstr "首选项(_P)"
+#: data/shortcuts-gnote.ui:18
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "显示帮助"
+
+#: data/shortcuts-gnote.ui:25 data/shortcuts-gnote.ui:120
+#: data/shortcuts-gnote.ui:127
+msgctxt "shortcut window"
+msgid "Open actions menu"
+msgstr "打开操作菜单"
+
+#: data/shortcuts-gnote.ui:32 data/shortcuts-gnote.ui:141
+msgctxt "shortcut window"
+msgid "Hide search bar"
+msgstr "隐藏搜索框"
+
+#: data/shortcuts-gnote.ui:39 data/shortcuts-gnote.ui:148
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "关闭窗口"
+
+#: data/shortcuts-gnote.ui:47
+msgctxt "shortcut window"
+msgid "Search bar"
+msgstr "搜索栏"
+
+#: data/shortcuts-gnote.ui:52 data/shortcuts-gnote.ui:134
+msgctxt "shortcut window"
+msgid "Display search bar"
+msgstr "显示搜索框"
+
+#: data/shortcuts-gnote.ui:59
+#, fuzzy
+#| msgid "Select None"
+msgctxt "shortcut window"
+msgid "Select next match"
+msgstr "全部不选"
 
-#: ../src/actionmanager.cpp:89 ../src/preferencesdialog.cpp:103
-msgid "Gnote Preferences"
-msgstr "Gnote 首选项"
+#: data/shortcuts-gnote.ui:66
+msgctxt "shortcut window"
+msgid "Select previous match"
+msgstr "选择上一个匹配项"
 
-#: ../src/actionmanager.cpp:93
-msgid "_Contents"
-msgstr "目录(_C)"
+#: data/shortcuts-gnote.ui:74
+#, fuzzy
+#| msgid "Note Title"
+msgctxt "shortcut window"
+msgid "Notes list"
+msgstr "便笺标题"
 
-#: ../src/actionmanager.cpp:93
-msgid "Gnote Help"
-msgstr "Gnote 帮助"
+#: data/shortcuts-gnote.ui:79
+#, fuzzy
+#| msgid "Create _new note"
+msgctxt "shortcut window"
+msgid "Create new note"
+msgstr "创建新便笺(_N)"
 
-#: ../src/actionmanager.cpp:98 ../src/actionmanager.cpp:170
-msgid "_About"
-msgstr "关于(_A)"
+#: data/shortcuts-gnote.ui:86
+#, fuzzy
+#| msgid "Open the selected note"
+msgctxt "shortcut window"
+msgid "Open selected note"
+msgstr "打开选中便笺"
 
-#: ../src/actionmanager.cpp:98
-msgid "About Gnote"
-msgstr "关于 Gnote"
+#: data/shortcuts-gnote.ui:93
+#, fuzzy
+#| msgid "Open notes in new window"
+msgctxt "shortcut window"
+msgid "Open selected note in new window"
+msgstr "在新窗口打开便笺"
 
-#: ../src/actionmanager.cpp:102
-msgid "TrayIcon"
-msgstr "托盘图标"
+#: data/shortcuts-gnote.ui:100
+#, fuzzy
+#| msgid "Delete the selected note"
+msgctxt "shortcut window"
+msgid "Delete selected note"
+msgstr "删除选中便笺"
 
-#: ../src/actionmanager.cpp:107 ../src/tray.cpp:225
-msgid "Create _New Note"
-msgstr "创建新便笺(_N)"
+#: data/shortcuts-gnote.ui:111
+#, fuzzy
+#| msgid "New _Window"
+msgctxt "shortcut window"
+msgid "Note Window"
+msgstr "新建窗口(_W)"
 
-#: ../src/actionmanager.cpp:107 ../src/tray.cpp:227
-msgid "Create a new note"
-msgstr "创建新便笺"
+#: data/shortcuts-gnote.ui:156
+#, fuzzy
+#| msgid "Editing"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "编辑"
+
+#: data/shortcuts-gnote.ui:161
+msgctxt "shortcut window"
+msgid "Undo last edit"
+msgstr "撤销上次编辑"
+
+#: data/shortcuts-gnote.ui:168
+msgctxt "shortcut window"
+msgid "Redo last edit"
+msgstr "重做上次编辑"
+
+#: data/shortcuts-gnote.ui:175
+#, fuzzy
+#| msgid "Delete the selected note"
+msgctxt "shortcut window"
+msgid "Create link to note on selected text"
+msgstr "删除选中便笺"
+
+#: data/shortcuts-gnote.ui:183
+#, fuzzy
+#| msgid "Formatting"
+msgctxt "shortcut window"
+msgid "Formatting"
+msgstr "格式"
+
+#: data/shortcuts-gnote.ui:188
+msgctxt "shortcut window"
+msgid "Toggle bold"
+msgstr "切换粗体"
+
+#: data/shortcuts-gnote.ui:195
+msgctxt "shortcut window"
+msgid "Toggle italic"
+msgstr "切换斜体"
+
+#: data/shortcuts-gnote.ui:202
+msgctxt "shortcut window"
+msgid "Toggle strikethrough"
+msgstr "切换删除线"
+
+#: data/shortcuts-gnote.ui:209
+msgctxt "shortcut window"
+msgid "Toggle highlight"
+msgstr "切换高亮"
+
+#: data/shortcuts-gnote.ui:216
+msgctxt "shortcut window"
+msgid "Toggle fixed width"
+msgstr "切换等宽"
+
+#: data/shortcuts-gnote.ui:223
+msgctxt "shortcut window"
+msgid "Toggle underline"
+msgstr "切换下划线"
+
+#: data/shortcuts-gnote.ui:230
+msgctxt "shortcut window"
+msgid "Increase font size"
+msgstr "增大字号"
 
-#: ../src/actionmanager.cpp:112 ../src/tray.cpp:234
-msgid "_Search All Notes"
-msgstr "搜索全部便笺(_S)"
+#: data/shortcuts-gnote.ui:237
+msgctxt "shortcut window"
+msgid "Decrease font size"
+msgstr "减小字号"
 
-#: ../src/actionmanager.cpp:112 ../src/tray.cpp:236
-msgid "Open the Search All Notes window"
-msgstr "打开“搜索全部便笺”窗口"
+#: data/shortcuts-gnote.ui:244
+msgctxt "shortcut window"
+msgid "Enable bullets/increase indent for line with selection"
+msgstr ""
 
-#: ../src/actionmanager.cpp:166
+#: data/shortcuts-gnote.ui:251
+msgctxt "shortcut window"
+msgid "Decrease indent/disable bullets for current line"
+msgstr ""
+
+#: src/actionmanager.cpp:128 src/notewindow.cpp:278
 msgid "_New Note"
 msgstr "新建便笺(_N)"
 
-#: ../src/actionmanager.cpp:167
+#: src/actionmanager.cpp:129 src/notewindow.cpp:280
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../src/actionmanager.cpp:169 ../src/tray.cpp:453
+#: src/actionmanager.cpp:130 src/preferencesdialog.cpp:631
+msgid "_Preferences"
+msgstr "首选项(_P)"
+
+#: src/actionmanager.cpp:131
+msgid "_Shortcuts"
+msgstr "快捷键(_S)"
+
+#: src/actionmanager.cpp:132
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/addininfo.cpp:74
+#: src/actionmanager.cpp:133
+msgid "_About Gnote"
+msgstr "关于 Gnote(_A)"
+
+#: src/addininfo.cpp:71
 msgid "Failed to load plugin information!"
 msgstr "加载插件信息失败!"
 
-#: ../src/addininfo.cpp:124
+#: src/addininfo.cpp:145
 #, c-format
 msgid "Incompatible plug-in %s: expected %s, got %s"
 msgstr "不兼容的插件 %s:期望 %s,但是获取到 %s"
 
-#: ../src/addinmanager.cpp:133
+#: src/addinmanager.cpp:149
 #, c-format
 msgid "Note plugin info %s already present"
 msgstr "便笺插件信息 %s 已经存在"
 
-#: ../src/addinmanager.cpp:141
+#: src/addinmanager.cpp:157
 #, c-format
 msgid "%s does not implement %s"
 msgstr "%s 没有实现 %s"
 
-#: ../src/addinmanager.cpp:156
+#: src/addinmanager.cpp:172
 #, c-format
 msgid "Note plugin %s already present"
 msgstr "便笺插件 %s 已经存在"
 
-#: ../src/addinmanager.cpp:174
+#: src/addinmanager.cpp:190
 #, c-format
 msgid "Note plugin info %s is absent"
 msgstr "便笺插件信息 %s 不存在"
 
-#: ../src/addinmanager.cpp:187
+#: src/addinmanager.cpp:203
 #, c-format
 msgid "Note plugin %s is absent"
 msgstr "便笺插件 %s 不存在"
 
-#: ../src/addinmanager.cpp:224
+#: src/addinmanager.cpp:239
 #, c-format
 msgid "Failed to find module %s for addin %s"
 msgstr "无法为插件%2$s 找到模块 %1$s"
 
-#: ../src/addinmanager.cpp:228
+#: src/addinmanager.cpp:243
 #, c-format
 msgid "Failed to load addin info for %s: %s"
 msgstr "无法为 %s 加载插件信息:%s"
 
-#: ../src/addinmanager.cpp:352
+#: src/addinmanager.cpp:369
 msgid "Trying to load addins when they are already loaded"
 msgstr "插件已经加载了的情况下尝试加载插件"
 
-#: ../src/addins/backlinks/backlinkmenuitem.cpp:41
-msgid "What links here?"
-msgstr "反向链接"
-
-#: ../src/addins/backlinks/backlinkmenuitem.cpp:42
-#| msgid "What links here?"
-msgid "Which notes have links to here?"
-msgstr "哪个便笺链接到此处?"
-
-#: ../src/addins/backlinks/backlinks.desktop.in.in.h:1
+#: src/plugins/backlinks/backlinks.desktop.in.in:4
 msgid "Backlinks"
 msgstr "反向链接"
 
-#: ../src/addins/backlinks/backlinks.desktop.in.in.h:2
+#: src/plugins/backlinks/backlinks.desktop.in.in:5
 msgid "See which notes link to the one you're currently viewing."
 msgstr "查看哪些便笺链接到了您当前查看的这条便笺。"
 
-#: ../src/addins/backlinks/backlinks.desktop.in.in.h:3
-#: ../src/addins/inserttimestamp/inserttimestamp.desktop.in.in.h:3
+#: src/plugins/backlinks/backlinks.desktop.in.in:6
+#: src/plugins/inserttimestamp/inserttimestamp.desktop.in.in:6
 msgid "Hubert Figuiere and Tomboy Project"
 msgstr "Hubert Figuiere 和 Tomboy 项目"
 
-#: ../src/addins/backlinks/backlinksnoteaddin.cpp:86
+#: src/plugins/backlinks/backlinksnoteaddin.cpp:76
+msgid "What links here?"
+msgstr ""
+
+#: src/plugins/backlinks/backlinksnoteaddin.cpp:97
 msgid "(none)"
 msgstr "(无)"
 
-#: ../src/addins/bugzilla/bugzilla.desktop.in.in.h:1
+#: src/plugins/backlinks/backlinksnoteaddin.cpp:102
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:157
+#: src/notebooks/notebooknoteaddin.cpp:167
+msgid "_Back"
+msgstr "返回(_B)"
+
+#: src/plugins/bugzilla/bugzilla.desktop.in.in:4
 msgid "Bugzilla Links"
 msgstr "Bugzilla 链接"
 
-#: ../src/addins/bugzilla/bugzilla.desktop.in.in.h:2
+#: src/plugins/bugzilla/bugzilla.desktop.in.in:5
 msgid ""
 "Allows you to drag a Bugzilla URL from your browser directly into a Gnote "
 "note.  The bug number is inserted as a link with a little bug icon next to "
@@ -704,15 +777,15 @@ msgstr ""
 "允许您将 Bugzilla URL 地址直接从浏览器拖拽至 Gnote 便笺中。Bug 号码将与一个"
 "小 bug 图标一起插入。"
 
-#: ../src/addins/bugzilla/bugzilla.desktop.in.in.h:3
-#: ../src/addins/exporttohtml/exporttohtml.desktop.in.in.h:3
-#: ../src/addins/fixedwidth/fixedwidth.desktop.in.in.h:3
-#: ../src/addins/printnotes/printnotes.desktop.in.in.h:3
-#: ../src/addins/stickynoteimport/stickynoteimport.desktop.in.in.h:3
+#: src/plugins/bugzilla/bugzilla.desktop.in.in:6
+#: src/plugins/exporttohtml/exporttohtml.desktop.in.in:6
+#: src/plugins/fixedwidth/fixedwidth.desktop.in.in:6
+#: src/plugins/printnotes/printnotes.desktop.in.in:6
+#: src/plugins/stickynoteimport/stickynoteimport.desktop.in.in:6
 msgid "Hubert Figuiere and the Tomboy Project"
 msgstr "Hubert Figuiere 和 Tomboy 项目"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:64
+#: src/plugins/bugzilla/bugzillapreferences.cpp:64
 msgid ""
 "You can use any bugzilla just by dragging links into notes.  If you want a "
 "special icon for certain hosts, add them here."
@@ -720,607 +793,672 @@ msgstr ""
 "您可以使用任何 Bugzilla 项目,只需将其链接拖曳到便笺中。如果你希望为特定主机"
 "使用特殊图标,请在此处添加。"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:81
+#: src/plugins/bugzilla/bugzillapreferences.cpp:81
 msgid "Host Name"
 msgstr "主机名"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:94
+#: src/plugins/bugzilla/bugzillapreferences.cpp:94
 msgid "Icon"
 msgstr "图标"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:229
+#: src/plugins/bugzilla/bugzillapreferences.cpp:113
+msgid "_Add"
+msgstr "添加(_A)"
+
+#: src/plugins/bugzilla/bugzillapreferences.cpp:117
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: src/plugins/bugzilla/bugzillapreferences.cpp:225
 msgid "Select an icon..."
 msgstr "选择图标..."
 
+#: src/plugins/bugzilla/bugzillapreferences.cpp:227
+#: src/plugins/bugzilla/bugzillapreferences.cpp:370
+#: src/plugins/exporttohtml/exporttohtmldialog.cpp:46
+#: src/notebooks/createnotebookdialog.cpp:65 src/note.cpp:71 src/utils.cpp:368
+#: src/utils.cpp:375
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: src/plugins/bugzilla/bugzillapreferences.cpp:228
+#: src/searchnoteswidget.cpp:1305
+msgid "_Open"
+msgstr "打开(_O)"
+
 #. Extra Widget
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:244
+#: src/plugins/bugzilla/bugzillapreferences.cpp:240
 msgid "_Host name:"
 msgstr "主机名(_H):"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:278
+#: src/plugins/bugzilla/bugzillapreferences.cpp:274
 msgid "Host name invalid"
 msgstr "主机名无效"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:279
+#: src/plugins/bugzilla/bugzillapreferences.cpp:275
 msgid "You must specify a valid Bugzilla host name to use with this icon."
 msgstr "要使用此图标,您必须指定一个有效的 Bugzilla 主机名。"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:298
+#: src/plugins/bugzilla/bugzillapreferences.cpp:294
 msgid "Error saving icon"
 msgstr "保存图标时出错"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:299
+#: src/plugins/bugzilla/bugzillapreferences.cpp:295
 msgid "Could not save the icon file."
 msgstr "无法保存图标文件。"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:371
+#: src/plugins/bugzilla/bugzillapreferences.cpp:367
 msgid "Really remove this icon?"
 msgstr "真的要删除此图标吗?"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:372
+#: src/plugins/bugzilla/bugzillapreferences.cpp:368
 msgid "If you remove an icon it is permanently lost."
 msgstr "如果您删除了图标,其内容将永久丢失。"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:394
+#: src/plugins/bugzilla/bugzillapreferences.cpp:376 src/note.cpp:77
+#: src/searchnoteswidget.cpp:1315 src/searchnoteswidget.cpp:1356
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: src/plugins/bugzilla/bugzillapreferences.cpp:388
 #, c-format
-#| msgid "Error saving icon"
 msgid "Error removing icon %s: %s"
 msgstr "移除图标 %s 时出错:%s"
 
-#: ../src/addins/exporttogtg/exporttogtg.desktop.in.in.h:1
-#: ../src/addins/exporttogtg/exporttogtgnoteaddin.cpp:71
+#: src/plugins/exporttogtg/exporttogtg.desktop.in.in:4
+#: src/plugins/exporttogtg/exporttogtgnoteaddin.cpp:78
 msgid "Export to Getting Things GNOME"
 msgstr "导出到 Getting Things GNOME"
 
-#: ../src/addins/exporttogtg/exporttogtg.desktop.in.in.h:2
-#| msgid "Exports individual notes to HTML."
+#: src/plugins/exporttogtg/exporttogtg.desktop.in.in:5
 msgid "Exports individual notes as Getting Things GNOME tasks"
 msgstr "将独立便笺导出为 Getting Things GNOME 任务"
 
-#: ../src/addins/exporttogtg/exporttogtg.desktop.in.in.h:3
-#: ../src/addins/specialnotes/specialnotes.desktop.in.in.h:3
-#: ../src/addins/statistics/statistics.desktop.in.in.h:3
+#: src/plugins/exporttogtg/exporttogtg.desktop.in.in:6
+#: src/plugins/gvfssyncservice/gvfssyncservice.desktop.in.in:6
+#: src/plugins/specialnotes/specialnotes.desktop.in.in:6
+#: src/plugins/statistics/statistics.desktop.in.in:6
 msgid "Aurimas Černius"
 msgstr "Aurimas Černius"
 
-#: ../src/addins/exporttogtg/exporttogtgnoteaddin.cpp:72
-msgid "Export note as Getting Things GNOME task"
-msgstr "将便笺导出为 Getting Things GNOME 任务"
-
-#: ../src/addins/exporttogtg/exporttogtgnoteaddin.cpp:86
+#: src/plugins/exporttogtg/exporttogtgnoteaddin.cpp:91
 msgid "GTG XML loaded, but interface not found"
 msgstr "GTG XML 已加载,但是没有找到接口"
 
-#: ../src/addins/exporttogtg/exporttogtgnoteaddin.cpp:92
+#: src/plugins/exporttogtg/exporttogtgnoteaddin.cpp:97
 #, c-format
 msgid "Failed to create GTG interface from XML: %s"
 msgstr "从 XML 创建 GTG 接口失败:%s"
 
-#: ../src/addins/exporttogtg/exporttogtgnoteaddin.cpp:100
-msgid "Failed to create D_Bus proxy for GTG"
+#: src/plugins/exporttogtg/exporttogtgnoteaddin.cpp:105
+#, fuzzy
+#| msgid "Failed to create D_Bus proxy for GTG"
+msgid "Failed to create D-Bus proxy for GTG"
 msgstr "为 GTG 创建 D_Bus 代理失败"
 
-#: ../src/addins/exporttogtg/exporttogtgnoteaddin.cpp:116
+#: src/plugins/exporttogtg/exporttogtgnoteaddin.cpp:121
 #, c-format
 msgid "Failed to call GTG: %s"
 msgstr "调用 GTG 失败:%s"
 
-#: ../src/addins/exporttohtml/exporttohtml.desktop.in.in.h:1
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:76
+#: src/plugins/exporttohtml/exporttohtml.desktop.in.in:4
 msgid "Export to HTML"
 msgstr "导出为 HTML"
 
-#: ../src/addins/exporttohtml/exporttohtml.desktop.in.in.h:2
+#: src/plugins/exporttohtml/exporttohtml.desktop.in.in:5
 msgid "Exports individual notes to HTML."
 msgstr "将单个便笺导出为 HTML。"
 
-#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:41
+#: src/plugins/exporttohtml/exporttohtmldialog.cpp:39
 msgid "Destination for HTML Export"
 msgstr "HTML 导出的目标位置"
 
-#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:43
+#: src/plugins/exporttohtml/exporttohtmldialog.cpp:42
 msgid "Export linked notes"
 msgstr "导出链接的便笺"
 
-#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:44
+#: src/plugins/exporttohtml/exporttohtmldialog.cpp:43
 msgid "Include all other linked notes"
 msgstr "包含链接的全部其它便笺"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:77
-#| msgid "Export to HTML"
-msgid "Export note to HTML"
-msgstr "将便笺导出为 HTML"
+#. TODO: Tabbing should go directly from sync prefs widget to here
+#. TODO: Consider connecting to "Enter" pressed in sync prefs widget
+#: src/plugins/exporttohtml/exporttohtmldialog.cpp:47
+#: src/preferencesdialog.cpp:555
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:83
+msgid "Export to HTML…"
+msgstr "导出为 HTML…"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:117
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:122
 #, c-format
 msgid "Could not open exported note in a web browser: %s"
 msgstr "无法在网页浏览器中打开导出的便笺:%s"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:121
-msgid "Your note was exported to \"%1%\"."
+#. TRANSLATORS: %1%: boost format placeholder for the path
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:127
+#, fuzzy
+#| msgid "Your note was exported to \"%1%\"."
+msgid "Your note was exported to \"%1\"."
 msgstr "您的便笺已导出为“%1%”。"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:130
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:136
 msgid "Note exported successfully"
 msgstr "便笺导出成功"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:144
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:152
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:150
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:158
 #, c-format
-#| msgid "Could not save the file \"%s\""
 msgid "Could not export: %s"
 msgstr "无法导出:%s"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:155
-#, c-format
-msgid "Could not save the file \"%s\""
+#: src/plugins/exporttohtml/exporttohtmlnoteaddin.cpp:161
+#, fuzzy
+#| msgid "Could not save the file \"%s\""
+msgid "Could not save the file \"%1\""
 msgstr "无法保存文件“%s”"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:102
+#: src/plugins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:103
 msgid "_Folder Path:"
 msgstr "文件夹路径(_F):"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:109
+#: src/plugins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:107
 msgid "Select Synchronization Folder..."
 msgstr "选择同步文件夹..."
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:134
+#: src/plugins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:129
 msgid "Folder path field is empty."
 msgstr "文件夹路径字段为空。"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:141
+#: src/plugins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:136
+#: src/synchronization/gvfssyncservice.cpp:76
 msgid ""
 "Specified folder path does not exist, and Gnote was unable to create it."
 msgstr "指定的文件夹路径不存在,Gnote 无法创建便笺。"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:217
+#: src/plugins/filesystemsyncservice/filesystemsyncserviceaddin.cpp:200
 msgid "Local Folder"
 msgstr "本地文件夹"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncservice.desktop.in.in.h:1
-#| msgid "Local Directory Sync Service Add-in"
+#: src/plugins/filesystemsyncservice/filesystemsyncservice.desktop.in.in:4
 msgid "Local Directory Sync Service Plugin"
 msgstr "本地目录同步服务插件"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncservice.desktop.in.in.h:2
+#: src/plugins/filesystemsyncservice/filesystemsyncservice.desktop.in.in:5
 msgid "Synchronize Gnote Notes to a local file system path"
 msgstr "将 Gnote 便笺同步到一个本地文件系统路径"
 
-#: ../src/addins/filesystemsyncservice/filesystemsyncservice.desktop.in.in.h:3
-#: ../src/addins/webdavsyncservice/webdavsyncservice.desktop.in.in.h:3
-#| msgid "Aurimas Cernius and the Tomboy Project"
+#: src/plugins/filesystemsyncservice/filesystemsyncservice.desktop.in.in:6
+#: src/plugins/webdavsyncservice/webdavsyncservice.desktop.in.in:6
 msgid "Aurimas Černius and the Tomboy Project"
 msgstr "Aurimas Černius  和 Tomboy 项目"
 
-#: ../src/addins/fixedwidth/fixedwidth.desktop.in.in.h:1
+#: src/plugins/fixedwidth/fixedwidth.desktop.in.in:4
 msgid "Fixed Width"
 msgstr "等宽"
 
-#: ../src/addins/fixedwidth/fixedwidth.desktop.in.in.h:2
+#: src/plugins/fixedwidth/fixedwidth.desktop.in.in:5
 msgid "Adds fixed-width font style."
 msgstr "添加等宽字体样式。"
 
-#: ../src/addins/fixedwidth/fixedwidthmenuitem.cpp:35
+#: src/plugins/fixedwidth/fixedwidthnoteaddin.cpp:57
 msgid "Fixed Wid_th"
 msgstr "等宽(_T)"
 
-#: ../src/addins/inserttimestamp/inserttimestamp.desktop.in.in.h:1
-#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:45
+#: src/plugins/gvfssyncservice/gvfssyncservice.desktop.in.in:4
+#, fuzzy
+#| msgid "Local Directory Sync Service Plugin"
+msgid "Online Directory Sync Service Plugin"
+msgstr "本地目录同步服务插件"
+
+#: src/plugins/gvfssyncservice/gvfssyncservice.desktop.in.in:5
+#, fuzzy
+#| msgid "Synchronize Gnote Notes to a local file system path"
+msgid "Synchronize Gnote Notes to an online directory"
+msgstr "将 Gnote 便笺同步到一个本地文件系统路径"
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:75
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:162
+#, fuzzy
+#| msgid "Failed to update note format: %s"
+msgid "Failed to mount the folder"
+msgstr "更新便笺格式失败:%s"
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:102
+msgid "Folder _URI:"
+msgstr "文件夹 _URI:"
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:114
+#, fuzzy
+msgid "Example: google-drive://name surname gmail com/notes"
+msgstr "示例:google-drive://name surname gmail com/note"
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:117
+msgid "Please, register your account in Online Accounts"
+msgstr ""
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:133
+msgid "The URI is empty"
+msgstr "该路径为空"
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:134
+#, fuzzy
+#| msgid "Folder path field is empty."
+msgid "URI field is empty."
+msgstr "文件夹路径字段为空。"
+
+#: src/plugins/gvfssyncservice/gvfssyncserviceaddin.cpp:176
+#, fuzzy
+#| msgid "Local Folder"
+msgid "Online Folder"
+msgstr "本地文件夹"
+
+#: src/plugins/inserttimestamp/inserttimestamp.desktop.in.in:4
+#: src/plugins/inserttimestamp/inserttimestampnoteaddin.cpp:76
 msgid "Insert Timestamp"
 msgstr "插入时间戳"
 
-#: ../src/addins/inserttimestamp/inserttimestamp.desktop.in.in.h:2
+#: src/plugins/inserttimestamp/inserttimestamp.desktop.in.in:5
 msgid "Inserts current date and time at the cursor position."
 msgstr "在光标出插入当前日期和时间。"
 
-#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:46
-#| msgid "Insert Timestamp"
-msgid "Insert Timestamp into note"
-msgstr "在便笺中插入时间戳"
-
 #. Label
-#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:70
+#: src/plugins/inserttimestamp/inserttimestamppreferences.cpp:76
 msgid "Choose one of the predefined formats or use your own."
 msgstr "选择预先定义的格式,或使用自己的格式。"
 
-#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:78
+#: src/plugins/inserttimestamp/inserttimestamppreferences.cpp:84
 msgid "Use _Selected Format"
 msgstr "使用选中的格式(_S)"
 
-#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:110
+#: src/plugins/inserttimestamp/inserttimestamppreferences.cpp:114
 msgid "_Use Custom Format"
 msgstr "使用自定义字体(_U)"
 
 #. TRANSLATORS: first %s is file name, second is error
-#: ../src/addins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:236
+#: src/plugins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:227
 #, c-format
 msgid "NoteDirectoryWatcher: Update aborted, error reading %s: %s"
 msgstr "NoteDirectoryWatcher:更新异常中断,读取 %s 出错:%s"
 
 #. TRANSLATORS: %s is file
-#: ../src/addins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:263
+#: src/plugins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:254
 #, c-format
 msgid "NoteDirectoryWatcher: Error reading note title from %s"
 msgstr "NoteDirectoryWatcher:从 %s 读取便笺标题出错"
 
 #. TRANSLATORS: %s is file
-#: ../src/addins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:271
+#: src/plugins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:262
 #, c-format
 msgid "NoteDirectoryWatcher: Unknown error creating note from %s"
 msgstr "NoteDirectoryWatcher:从 %s 创建便笺发生未知错误"
 
 #. TRANSLATORS: first %s is file, second is error
-#: ../src/addins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:277
+#: src/plugins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:268
 #, c-format
 msgid "NoteDirectoryWatcher: Error creating note from %s: %s"
 msgstr "NoteDirectoryWatcher:从 %s 创建便笺出错:%s"
 
 #. TRANSLATORS: first %s is file, second is error
-#: ../src/addins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:290
+#: src/plugins/notedirectorywatcher/notedirectorywatcherapplicationaddin.cpp:281
 #, c-format
 msgid "NoteDirectoryWatcher: Update aborted, error parsing %s: %s"
 msgstr "NoteDirectoryWatcher:更新异常退出,解析 %s 出错:%s"
 
-#: ../src/addins/notedirectorywatcher/notedirectorywatcherpreferences.cpp:35
-msgid "_Directory check interval:"
-msgstr "目录检查间隔(_D)"
-
-#: ../src/addins/notedirectorywatcher/notedirectorywatcher.desktop.in.in.h:1
+#: src/plugins/notedirectorywatcher/notedirectorywatcher.desktop.in.in:4
 msgid "Note Directory Watcher"
 msgstr "便笺目录监视器"
 
-#: ../src/addins/notedirectorywatcher/notedirectorywatcher.desktop.in.in.h:2
+#: src/plugins/notedirectorywatcher/notedirectorywatcher.desktop.in.in:5
 msgid "Watch your Gnote note directory for changes to your notes."
 msgstr "监视 Gnote 便笺目录获取便笺更改。"
 
-#: ../src/addins/notedirectorywatcher/notedirectorywatcher.desktop.in.in.h:3
-#| msgid "and Tomboy original authors."
+#: src/plugins/notedirectorywatcher/notedirectorywatcher.desktop.in.in:6
 msgid "Aurimas Černius and Tomboy original authors"
-msgstr "Aurimas Černius 和 Tomboy 原作者。"
+msgstr "Aurimas Černius 和 Tomboy 原作者"
+
+#: src/plugins/notedirectorywatcher/notedirectorywatcherpreferences.cpp:46
+msgid "_Directory check interval:"
+msgstr "目录检查间隔(_D)"
 
-#: ../src/addins/noteoftheday/noteoftheday.cpp:33
+#: src/plugins/noteoftheday/noteoftheday.cpp:33
 msgid "Today: Template"
 msgstr "今天:模板"
 
-#: ../src/addins/noteoftheday/noteoftheday.cpp:35
+#: src/plugins/noteoftheday/noteoftheday.cpp:35
 msgid "Today: "
 msgstr "今天:"
 
 #. TRANSLATORS: first %s is note title, second is error
 #. TRANSLATORS: first %s is template note title, second is error
-#: ../src/addins/noteoftheday/noteoftheday.cpp:49
-#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:72
+#: src/plugins/noteoftheday/noteoftheday.cpp:49
+#: src/plugins/noteoftheday/noteofthedaypreferences.cpp:73
 #, c-format
 msgid "NoteOfTheDay could not create %s: %s"
 msgstr "当日便笺无法创建 %s:%s"
 
-#: ../src/addins/noteoftheday/noteoftheday.cpp:155
+#: src/plugins/noteoftheday/noteoftheday.cpp:150
 msgid "Tasks"
 msgstr "任务"
 
-#: ../src/addins/noteoftheday/noteoftheday.cpp:156
+#: src/plugins/noteoftheday/noteoftheday.cpp:151
 msgid "Appointments"
 msgstr "约会"
 
 #. Format: "Today: Friday, July 01 2005"
-#: ../src/addins/noteoftheday/noteoftheday.cpp:162
+#: src/plugins/noteoftheday/noteoftheday.cpp:157
 msgid "%A, %B %d %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../src/addins/noteoftheday/noteoftheday.desktop.in.in.h:1
+#: src/plugins/noteoftheday/noteoftheday.desktop.in.in:4
 msgid "Note of the Day"
 msgstr "今日便笺"
 
-#: ../src/addins/noteoftheday/noteoftheday.desktop.in.in.h:2
+#: src/plugins/noteoftheday/noteoftheday.desktop.in.in:5
 msgid ""
 "Automatically creates a \"Today\" note for easily jotting down daily thoughts"
 msgstr "自动创建一个“今日”便笺,以便容易接合每天的想法"
 
-#: ../src/addins/noteoftheday/noteoftheday.desktop.in.in.h:3
+#: src/plugins/noteoftheday/noteoftheday.desktop.in.in:6
 msgid "Debarshi Ray and the Tomboy Project"
 msgstr "Debarshi Ray 和 Tomboy 项目"
 
-#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:34
+#: src/plugins/noteoftheday/noteofthedaypreferences.cpp:34
 msgid "_Open Today: Template"
 msgstr "打开今天:模板(_O)"
 
-#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:35
+#: src/plugins/noteoftheday/noteofthedaypreferences.cpp:35
 msgid ""
 "Change the <span weight=\"bold\">Today: Template</span> note to customize "
 "the text that new Today notes have."
 msgstr ""
 "修改<span weight=\"bold\">今天:模板</span>便笺以便自定义新的今天便笺文本。"
 
-#: ../src/addins/printnotes/printnotes.desktop.in.in.h:1
+#: src/plugins/printnotes/printnotes.desktop.in.in:4
 msgid "Printing Support"
 msgstr "打印支持"
 
-#: ../src/addins/printnotes/printnotes.desktop.in.in.h:2
+#: src/plugins/printnotes/printnotes.desktop.in.in:5
 msgid "Allows you to print a note."
 msgstr "允许您打印便笺。"
 
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:61
-msgid "Print"
-msgstr "打印"
+#: src/plugins/printnotes/printnotesnoteaddin.cpp:62
+msgid "Print…"
+msgstr "打印…"
 
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:61
-#| msgid "Quit Gnote"
-msgid "Print note"
-msgstr "打印便笺"
-
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:136
+#: src/plugins/printnotes/printnotesnoteaddin.cpp:110
 msgid "Error printing note"
 msgstr "打印便笺时出错"
 
-#. %1% is the page number, %2% is the total number of pages
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:303
-msgid "Page %1% of %2%"
+#. %1 is the page number, %2 is the total number of pages
+#: src/plugins/printnotes/printnotesnoteaddin.cpp:273
+#, fuzzy
+#| msgid "Page %1% of %2%"
+msgid "Page %1 of %2"
 msgstr "第 %1% 页,共 %2% 页"
 
-#: ../src/addins/readonly/readonly.desktop.in.in.h:1
-#: ../src/addins/readonly/readonlynoteaddin.cpp:53
+#: src/plugins/readonly/readonly.desktop.in.in:4
+#: src/plugins/readonly/readonlynoteaddin.cpp:69
 msgid "Read Only"
 msgstr "只读"
 
-#: ../src/addins/readonly/readonly.desktop.in.in.h:2
+#: src/plugins/readonly/readonly.desktop.in.in:5
 msgid "Mark certain notes as read only"
 msgstr "将特定便笺标记为只读"
 
-#: ../src/addins/readonly/readonly.desktop.in.in.h:3
+#: src/plugins/readonly/readonly.desktop.in.in:6
 msgid "Aurimas Černius, Debarshi Ray and Arief Bayu Purwanto"
 msgstr "Aurimas Černius, Debarshi Ray 和 Arief Bayu Purwanto"
 
-#: ../src/addins/readonly/readonlynoteaddin.cpp:54
-msgid "Make this note read-only"
-msgstr "将便笺设置为只读"
-
-#: ../src/addins/replacetitle/replacetitle.desktop.in.in.h:1
-#: ../src/addins/replacetitle/replacetitlenoteaddin.cpp:51
+#: src/plugins/replacetitle/replacetitle.desktop.in.in:4
+#: src/plugins/replacetitle/replacetitlenoteaddin.cpp:53
 msgid "Replace title"
 msgstr "替换标题"
 
-#: ../src/addins/replacetitle/replacetitle.desktop.in.in.h:2
+#: src/plugins/replacetitle/replacetitle.desktop.in.in:5
 msgid "Replace title with selection."
 msgstr "用选中部分替换便笺标题。"
 
-#: ../src/addins/replacetitle/replacetitle.desktop.in.in.h:3
+#: src/plugins/replacetitle/replacetitle.desktop.in.in:6
 msgid "Pierre-Yves Luyten"
 msgstr "Pierre-Yves Luyten"
 
-#: ../src/addins/specialnotes/specialnotes.desktop.in.in.h:1
-#: ../src/addins/specialnotes/specialnotesapplicationaddin.cpp:38
-#| msgid "Search All Notes"
+#: src/plugins/specialnotes/specialnotesapplicationaddin.cpp:39
+#: src/plugins/specialnotes/specialnotes.desktop.in.in:4
 msgid "Special Notes"
 msgstr "特殊便笺"
 
-#: ../src/addins/specialnotes/specialnotes.desktop.in.in.h:2
+#: src/plugins/specialnotes/specialnotes.desktop.in.in:5
 msgid "Show special notes, that are otherwise hidden"
 msgstr "显示特定的便笺,其他的隐藏"
 
-#: ../src/addins/statistics/statisticsapplicationaddin.cpp:50
+#: src/plugins/statistics/statisticsapplicationaddin.cpp:70
 msgid "Show Statistics"
 msgstr "显示统计"
 
-#: ../src/addins/statistics/statistics.desktop.in.in.h:1
-#: ../src/addins/statistics/statisticswidget.cpp:171
-#| msgid "Status"
+#: src/plugins/statistics/statistics.desktop.in.in:4
+#: src/plugins/statistics/statisticswidget.cpp:173
 msgid "Statistics"
 msgstr "统计"
 
-#: ../src/addins/statistics/statistics.desktop.in.in.h:2
+#: src/plugins/statistics/statistics.desktop.in.in:5
 msgid "Show various statistics about notes."
 msgstr "显示关于便笺的多种统计信息。"
 
-#: ../src/addins/statistics/statisticswidget.cpp:91
-#| msgid "All Notes"
+#: src/plugins/statistics/statisticswidget.cpp:91
 msgid "Total Notes:"
 msgstr "总便笺数:"
 
-#: ../src/addins/statistics/statisticswidget.cpp:97
-#| msgid "Notebooks"
+#: src/plugins/statistics/statisticswidget.cpp:97
 msgid "Total Notebooks:"
 msgstr "便笺本总计:"
 
-#: ../src/addins/statistics/statisticswidget.cpp:127
-#| msgid "Total: %1% note"
-#| msgid_plural "Total: %1% notes"
-msgid "%1% note"
-msgid_plural "%1% notes"
+#. TRANSLATORS: %1 is the format placeholder for the number of notes.
+#: src/plugins/statistics/statisticswidget.cpp:128
+#, fuzzy
+#| msgid "%1% note"
+#| msgid_plural "%1% notes"
+msgid "%1 note"
+msgid_plural "%1 notes"
 msgstr[0] "%1% 条便笺"
 
 # Sticky Notes 是程序名。要翻译吗?
-#: ../src/addins/stickynoteimport/stickynoteimport.desktop.in.in.h:1
+#: src/plugins/stickynoteimport/stickynoteimport.desktop.in.in:4
 msgid "Sticky Notes Importer"
 msgstr "置顶便笺导入器"
 
-#: ../src/addins/stickynoteimport/stickynoteimport.desktop.in.in.h:2
+#: src/plugins/stickynoteimport/stickynoteimport.desktop.in.in:5
 msgid "Import your notes from the Sticky Notes applet."
 msgstr "从置顶便笺中导入。"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:87
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:84
 msgid "Import from Sticky Notes"
 msgstr "从置顶便笺中导入"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:214
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:206
 msgid "No Sticky Notes found"
 msgstr "未找到置顶便笺"
 
-#. %1% is a the file name
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:216
-msgid "No suitable Sticky Notes file was found at \"%1%\"."
+#. %1 is a the file name
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:208
+#, fuzzy
+#| msgid "No suitable Sticky Notes file was found at \"%1%\"."
+msgid "No suitable Sticky Notes file was found at \"%1\"."
 msgstr "“%1%”中未找到合适的置顶便笺文件。"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:224
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:216
 msgid "Sticky Notes import completed"
 msgstr "置顶便笺导入成功"
 
-#. here %1% is the number of notes imported, %2% the total number of notes.
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:226
-msgid "<b>%1%</b> of <b>%2%</b> Sticky Notes were successfully imported."
+#. here %1 is the number of notes imported, %2 the total number of notes.
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:218
+#, fuzzy
+#| msgid "<b>%1%</b> of <b>%2%</b> Sticky Notes were successfully imported."
+msgid "<b>%1</b> of <b>%2</b> Sticky Notes were successfully imported."
 msgstr "已成功导入 <b>%2%</b> 条置顶便笺中的 <b>%1%</b> 条。"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:245
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:237
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:283
+#: src/plugins/stickynoteimport/stickynoteimportnoteaddin.cpp:275
 msgid "Sticky Note: "
 msgstr "置顶便笺:"
 
-#. namespace
-#: ../src/addins/tableofcontents/tableofcontentsaction.cpp:37
-#: ../src/addins/tableofcontents/tableofcontentsaction.cpp:38
-#: ../src/addins/tableofcontents/tableofcontents.desktop.in.in.h:1
-#: ../src/addins/tableofcontents/tableofcontentsnoteaddin.cpp:66
-#| msgid "_Contents"
+#: src/plugins/tableofcontents/tableofcontents.desktop.in.in:4
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:67
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:130
 msgid "Table of Contents"
 msgstr "目录"
 
-#: ../src/addins/tableofcontents/tableofcontents.desktop.in.in.h:2
+#: src/plugins/tableofcontents/tableofcontents.desktop.in.in:5
 msgid ""
 "Navigate long structured notes. Set section and subsection headings in your "
 "note, and the Table of Contents will show in a menu."
 msgstr ""
 "在长结构便笺中导航。在便笺中设置章节和子章节标题,然后将在菜单中显示目录。"
 
-#: ../src/addins/tableofcontents/tableofcontents.desktop.in.in.h:3
+#: src/plugins/tableofcontents/tableofcontents.desktop.in.in:6
 msgid "Luc Pionchon"
 msgstr "Luc Pionchon"
 
-#: ../src/addins/tableofcontents/tableofcontents.desktop.in.in.h:4
+#: src/plugins/tableofcontents/tableofcontents.desktop.in.in:11
 msgid "© 2013 Luc Pionchon"
 msgstr "© 2013 Luc Pionchon"
 
-#. no toc items, and no action entries = empty menu
-#: ../src/addins/tableofcontents/tableofcontentsnoteaddin.cpp:140
-msgid "(empty table of contents)"
-msgstr "( 空目录 )"
-
-#: ../src/addins/tableofcontents/tableofcontentsnoteaddin.cpp:155
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:145
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:207
 msgid "Heading 1"
 msgstr "标题 1"
 
-#: ../src/addins/tableofcontents/tableofcontentsnoteaddin.cpp:161
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:149
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:213
 msgid "Heading 2"
 msgstr "标题 2"
 
-#: ../src/addins/tableofcontents/tableofcontentsnoteaddin.cpp:167
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:153
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:219
 msgid "Table of Contents Help"
 msgstr "帮助文档目录"
 
-#. namespace
-#: ../src/addins/todo/todo.desktop.in.in.h:1
+#. no toc items, and no action entries = empty menu
+#: src/plugins/tableofcontents/tableofcontentsnoteaddin.cpp:192
+msgid "(empty table of contents)"
+msgstr "( 空目录 )"
+
+#: src/plugins/todo/todo.desktop.in.in:4
 msgid "TODO"
 msgstr "TODO"
 
-#: ../src/addins/todo/todo.desktop.in.in.h:2
+#: src/plugins/todo/todo.desktop.in.in:5
 msgid "Highlight FIXME, TODO and XXX patterns in notes."
 msgstr "在便笺中高亮 FIXME,TODO 和 XXX。"
 
-#: ../src/addins/todo/todo.desktop.in.in.h:3
+#: src/plugins/todo/todo.desktop.in.in:6
 msgid "Aurimas Černius, Romain Tartière"
 msgstr "Aurimas Černius, Romain Tartière"
 
-#: ../src/addins/tomboyimport/tomboyimport.desktop.in.in.h:1
+#: src/plugins/tomboyimport/tomboyimport.desktop.in.in:4
 msgid "Tomboy Importer"
 msgstr "Tomboy 导入器"
 
-#: ../src/addins/tomboyimport/tomboyimport.desktop.in.in.h:2
+#: src/plugins/tomboyimport/tomboyimport.desktop.in.in:5
 msgid "Import your notes from Tomboy."
 msgstr "从 Tomboy 中导入便笺。"
 
-#: ../src/addins/tomboyimport/tomboyimport.desktop.in.in.h:3
+#: src/plugins/tomboyimport/tomboyimport.desktop.in.in:6
 msgid "Hubert Figuiere"
 msgstr "Hubert Figuiere"
 
-#: ../src/addins/underline/underline.desktop.in.in.h:1
+#: src/plugins/underline/underline.desktop.in.in:4
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/addins/underline/underline.desktop.in.in.h:2
+#: src/plugins/underline/underline.desktop.in.in:5
 msgid "Adds ability to underline text."
 msgstr "添加“文本下划线”功能。"
 
-#: ../src/addins/underline/underline.desktop.in.in.h:3
+#: src/plugins/underline/underline.desktop.in.in:6
 msgid "Hubert Figuière and the Tomboy Project"
 msgstr "Hubert Figuière 和 Tomboy 项目"
 
-#: ../src/addins/underline/underlinemenuitem.cpp:35
+#: src/plugins/underline/underlinenoteaddin.cpp:56
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:70
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:75
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:112
 msgid "User_name:"
 msgstr "用户名(_N)"
 
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:81
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:118
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:105
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:142
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:117
-msgid ""
-"There was an error connecting to the server.  This may be caused by using an "
-"incorrect user name and/or password."
-msgstr "连接到服务器出错,可能时因为使用了错误的用户名和/或密码。"
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:165
+#, fuzzy
+#| msgid "Synchronization is complete"
+msgid "Synchronization destination %1 doesn't exist!"
+msgstr "同步完成"
 
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:173
-#| msgid "Folder path field is empty."
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:180
 msgid "URL, username, or password field is empty."
 msgstr "URL、用户名或密码为空。"
 
-#. TODO: If the above fails (no keyring daemon), save all but password
-#. to GConf, and notify user.
-#. Save configuration into GConf
-#. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
-#. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
-#: ../src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp:262
+#. TRANSLATORS: %1 is the format placeholder for the error message.
+#: src/plugins/webdavsyncservice/webdavsyncserviceaddin.cpp:279
+#, fuzzy
+#| msgid ""
+#| "Saving configuration to the GNOME keyring failed with the following "
+#| "message:\n"
+#| "\n"
+#| "%1%"
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following "
 "message:\n"
 "\n"
-"%1%"
+"%1"
 msgstr ""
 "向 GNOME 密钥环保存配置时出错,出错信息是:\n"
 "\n"
 "%1%"
 
-#: ../src/addins/webdavsyncservice/webdavsyncservice.desktop.in.in.h:1
-#| msgid "Local Directory Sync Service Add-in"
+#: src/plugins/webdavsyncservice/webdavsyncservice.desktop.in.in:4
 msgid "WebDAV Sync Service Plugin"
 msgstr "WebDAV 同步服务插件"
 
-#: ../src/addins/webdavsyncservice/webdavsyncservice.desktop.in.in.h:2
-#| msgid "Synchronize Gnote Notes to a local file system path"
+#: src/plugins/webdavsyncservice/webdavsyncservice.desktop.in.in:5
 msgid "Synchronize Gnote Notes to a WebDAV URL."
 msgstr "将 Gnote 便笺同步到一个 WebDAV URL。"
 
-#: ../src/dbus/remotecontrol-client-glue.cpp:138
-#, c-format
-msgid "Remote call to %s failed"
-msgstr "远程调用 %s 失败"
-
-#: ../src/dbus/remotecontrol.cpp:82
+#: src/dbus/remotecontrol.cpp:83
 #, c-format
 msgid "Exception thrown when creating note: %s"
 msgstr "创建便笺时抛出了例外:%s"
 
-#: ../src/gnote.cpp:198
-msgid "Gnote is already running.  Exiting..."
-msgstr "Gnote 已在运行。退出..."
+#: src/gnote.cpp:211
+msgid ""
+"No D-Bus connection available, shell search and remote control will not work."
+msgstr ""
+
+#: src/gnote.cpp:244
+msgid "Failed to get shortcuts window!"
+msgstr "获取快捷键窗口失败!"
 
-#: ../src/gnote.cpp:359
+#: src/gnote.cpp:258
 msgid "and Tomboy original authors."
 msgstr "以及 Tomboy 原作者。"
 
-#: ../src/gnote.cpp:365
+#: src/gnote.cpp:264
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang gmail com>, 2005-2008。\n"
@@ -1328,14 +1466,15 @@ msgstr ""
 "Aron Xu <aronmalache 163 com>, 2009。\n"
 "YunQiang Su <wzssyqa gmail com>, 2010。"
 
-#: ../src/gnote.cpp:374
+#: src/gnote.cpp:273
+#, fuzzy
 #| msgid ""
-#| "Copyright © 2010-2012 Aurimas Cernius\n"
+#| "Copyright © 2010-2014 Aurimas Cernius\n"
 #| "Copyright © 2009-2011 Debarshi Ray\n"
 #| "Copyright © 2009 Hubert Figuiere\n"
 #| "Copyright © 2004-2009 the Tomboy original authors."
 msgid ""
-"Copyright © 2010-2014 Aurimas Cernius\n"
+"Copyright © 2010-2021 Aurimas Cernius\n"
 "Copyright © 2009-2011 Debarshi Ray\n"
 "Copyright © 2009 Hubert Figuiere\n"
 "Copyright © 2004-2009 the Tomboy original authors."
@@ -1345,123 +1484,134 @@ msgstr ""
 "版权所有 © 2009 Hubert Figuiere\n"
 "版权所有 © 2004-2009 Tomboy 原作者。"
 
-#: ../src/gnote.cpp:378
+#: src/gnote.cpp:277
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "简单易用的桌面随意帖应用程序。"
 
-#: ../src/gnote.cpp:389
+#: src/gnote.cpp:288
 msgid "Homepage"
 msgstr "主页"
 
-#: ../src/gnote.cpp:563
+#: src/gnote.cpp:483
 msgid "Run Gnote in background."
 msgstr "后台运行 Gnote。"
 
-#: ../src/gnote.cpp:564
+#: src/gnote.cpp:484
+#, fuzzy
+#| msgid "Run Gnote as a GNOME panel applet."
+msgid "Run Gnote as GNOME Shell search provider."
+msgstr "将 Gnote 作为 GNOME 面板小程序运行。"
+
+#: src/gnote.cpp:485
 msgid "Specify the path of the directory containing the notes."
 msgstr "给出包含便笺的目录路径。"
 
-#: ../src/gnote.cpp:564
+#: src/gnote.cpp:485
 msgid "path"
 msgstr "路径"
 
-#: ../src/gnote.cpp:565
+#: src/gnote.cpp:486
 msgid "Open the search all notes window with the search text."
 msgstr "打开搜索全部便笺窗口。"
 
-#: ../src/gnote.cpp:565 ../src/gnote.cpp:570
+#: src/gnote.cpp:486 src/gnote.cpp:491
 msgid "text"
 msgstr "文本"
 
-#: ../src/gnote.cpp:566
+#: src/gnote.cpp:487
 msgid "Print version information."
 msgstr "显示版本信息。"
 
-#: ../src/gnote.cpp:567
+#: src/gnote.cpp:488
 msgid "Create and display a new note, with a optional title."
 msgstr "创建并显示一条带有可选标题的新便笺。"
 
-#: ../src/gnote.cpp:567
+#: src/gnote.cpp:488
 msgid "title"
 msgstr "标题"
 
-#: ../src/gnote.cpp:568
+#: src/gnote.cpp:489
 msgid "Display the existing note matching title."
 msgstr "显示匹配标题的现有便笺。"
 
-#: ../src/gnote.cpp:568
+#: src/gnote.cpp:489
 msgid "title/url"
 msgstr "标题/url"
 
-#: ../src/gnote.cpp:569
+#: src/gnote.cpp:490
 msgid "Display the 'Start Here' note."
 msgstr "显示“从这里开始”便笺。"
 
-#: ../src/gnote.cpp:570
+#: src/gnote.cpp:491
 msgid "Search and highlight text in the opened note."
 msgstr "在开启的便笺中搜索文本(高亮显示)。"
 
-#: ../src/gnote.cpp:574
+#: src/gnote.cpp:495
 msgid "A note taking application"
 msgstr "一个记便笺应用程序"
 
-#: ../src/gnote.cpp:574
+#: src/gnote.cpp:495
 msgid "Gnote options at launch"
 msgstr "Gnote 启动选项"
 
-#: ../src/gnote.cpp:651
-msgid "Could not connect to remote instance."
-msgstr "无法连接到远程实例。"
-
-#: ../src/gnote.cpp:767
-msgid "Version %1%"
+#. TRANSLATORS: %1: format placeholder for the version string.
+#: src/gnote.cpp:679
+#, fuzzy
+#| msgid "Version %1%"
+msgid "Version %1"
 msgstr "版本 %1%"
 
 #. TRANSLATORS: the first %s is icon name, %d is for size, last %s is error description
-#: ../src/iconmanager.cpp:66
+#: src/iconmanager.cpp:63
 #, c-format
 msgid "Failed to load icon (%s, %d): %s"
 msgstr "加载图标 (%s, %d) 失败:%s"
 
-#: ../src/noteaddin.cpp:108 ../src/noteaddin.cpp:121 ../src/noteaddin.cpp:134
+#: src/noteaddin.cpp:138 src/noteaddin.cpp:152 src/noteaddin.cpp:164
 #, fuzzy
 msgid "Plugin is disposing already"
 msgstr "插件已经部署"
 
-#: ../src/noteaddin.cpp:138
+#: src/noteaddin.cpp:168
 msgid "Window is not embedded"
 msgstr "窗口未被嵌入"
 
-#: ../src/notebooks/createnotebookdialog.cpp:41
-#| msgid "Create a new notebook"
+#. Probably IOException or UnauthorizedAccessException?
+#: src/notebase.cpp:225 src/note.cpp:362
+#, c-format
+msgid "Exception while saving note: %s"
+msgstr "保存便笺时发生例外:%s"
+
+#. write failure, but not critical
+#: src/notebase.cpp:465
+#, c-format
+msgid "Failed to update note format: %s"
+msgstr "更新便笺格式失败:%s"
+
+#: src/notebase.cpp:583
+#, c-format
+msgid "Filesystem error: %s"
+msgstr "文件系统错误:%s"
+
+#: src/notebooks/createnotebookdialog.cpp:38
 msgid "Create Notebook"
 msgstr "创建便笺本"
 
-#: ../src/notebooks/createnotebookdialog.cpp:45
+#: src/notebooks/createnotebookdialog.cpp:43
 msgid "N_otebook name:"
 msgstr "便笺本名称(_O):"
 
-#: ../src/notebooks/createnotebookdialog.cpp:58
+#: src/notebooks/createnotebookdialog.cpp:56
 msgid "Name already taken"
 msgstr "此名称已被使用"
 
 #. Translation note: This is the Create button in the Create
 #. New Note Dialog.
-#: ../src/notebooks/createnotebookdialog.cpp:71
+#: src/notebooks/createnotebookdialog.cpp:68
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:66
-#: ../src/searchnoteswidget.cpp:229
-msgid "Notebooks"
-msgstr "便笺本"
-
-#: ../src/notebooks/notebookapplicationaddin.cpp:67
-msgid "Create a new note in a notebook"
-msgstr "在便笺本中创建新便笺"
-
-#: ../src/notebooks/notebookapplicationaddin.cpp:96
-#: ../src/notebooks/notebookapplicationaddin.cpp:146
+#: src/notebooks/notebookapplicationaddin.cpp:78
 msgid "New Note_book..."
 msgstr "新建便笺本(_B)..."
 
@@ -1469,98 +1619,88 @@ msgstr "新建便笺本(_B)..."
 #. notebook.  For example, if the name of the notebooks
 #. "Meetings", the templateNoteTitle should be "Meetings
 #. Notebook Template".  Translators should place the
-#. name of the notebook accordingly using "%1%".
-#: ../src/notebooks/notebook.cpp:109
-msgid "%1% Notebook Template"
+#. name of the notebook accordingly using "%1".
+#: src/notebooks/notebook.cpp:94
+#, fuzzy
+#| msgid "%1% Notebook Template"
+msgid "%1 Notebook Template"
 msgstr "%1% 便笺本模板"
 
-#: ../src/notebooks/notebook.cpp:185 ../src/notemanagerbase.cpp:301
+#: src/notebooks/notebook.cpp:168 src/notemanagerbase.cpp:304
 msgid "New Note"
 msgstr "新建便笺"
 
-#: ../src/notebooks/notebookmanager.cpp:364
+#: src/notebooks/notebookmanager.cpp:352
 msgid "Really delete this notebook?"
 msgstr "真的要删除此便笺本?"
 
-#: ../src/notebooks/notebookmanager.cpp:365
+#: src/notebooks/notebookmanager.cpp:353
 msgid ""
 "The notes that belong to this notebook will not be deleted, but they will no "
 "longer be associated with this notebook.  This action cannot be undone."
 msgstr ""
 "属于此便笺本的便笺不会被删除,但它们将不再属于此便笺本。此动作不可撤消。"
 
-#: ../src/notebooks/notebookmenuitem.cpp:35
+#: src/notebooks/notebookmenuitem.cpp:34
+#: src/notebooks/notebooknoteaddin.cpp:153
 msgid "No notebook"
 msgstr "没有便笺本"
 
-#: ../src/notebooks/notebooknewnotemenuitem.cpp:40
-msgid "New \"%1%\" Note"
-msgstr "新建“%1%”便笺"
-
-#: ../src/notebooks/notebooknoteaddin.cpp:81
-msgid "Place this note into a notebook"
-msgstr "将此便笺放入一个便笺本"
-
-#: ../src/notebooks/notebooknoteaddin.cpp:191
+#: src/notebooks/notebooknoteaddin.cpp:111
 msgid "Notebook"
 msgstr "便笺本"
 
-#: ../src/notebooks/notebooknoteaddin.cpp:214
+#. Add new notebook item
+#: src/notebooks/notebooknoteaddin.cpp:147
 msgid "_New notebook..."
 msgstr "新建便笺本(_N)..."
 
-#: ../src/notebooks/specialnotebooks.cpp:46
+#: src/notebooks/specialnotebooks.cpp:47
 msgid "All"
 msgstr "全部"
 
-#: ../src/notebooks/specialnotebooks.cpp:75
-#| msgid "Unfiled Notes"
+#: src/notebooks/specialnotebooks.cpp:76
 msgid "Unfiled"
 msgstr "未填写"
 
-#: ../src/notebooks/specialnotebooks.cpp:106
+#: src/notebooks/specialnotebooks.cpp:107
+msgctxt "notebook"
 msgid "Important"
 msgstr "重要"
 
-#: ../src/notebooks/specialnotebooks.cpp:133
+#: src/notebooks/specialnotebooks.cpp:134
 msgid "Active"
 msgstr "活动"
 
-#: ../src/notebuffer.cpp:1498
+#: src/notebuffer.cpp:1429
 msgid "</list> tag mismatch"
 msgstr "</list> 标签不匹配"
 
-#: ../src/notebuffer.cpp:1577
+#: src/notebuffer.cpp:1513
 #, c-format
 msgid "Exception: %s"
 msgstr "例外:%s"
 
-#. TRANSLATORS: %1% will be replaced by note title
-#: ../src/note.cpp:59
-#| msgid "Really delete %1% note?"
-#| msgid_plural "Really delete %1% notes?"
-msgid "Really delete \"%1%\"?"
-msgstr "真的要删除“%1%”?"
-
-#. TRANSLATORS: %1% is number of notes
-#: ../src/note.cpp:63
-msgid "Really delete %1% note?"
-msgid_plural "Really delete %1% notes?"
+#. TRANSLATORS: %1 will be replaced by note title
+#: src/note.cpp:56
+msgid "Really delete \"%1\"?"
+msgstr "真的要删除“%1”?"
+
+#. TRANSLATORS: %1 is number of notes
+#: src/note.cpp:60
+msgid "Really delete %1 note?"
+msgid_plural "Really delete %1 notes?"
 msgstr[0] "真的要删除这 %1% 条便笺吗?"
 
-#: ../src/note.cpp:70
+#: src/note.cpp:67
 msgid "If you delete a note it is permanently lost."
 msgstr "如果您删除了便笺,其内容将永久丢失。"
 
-#: ../src/note.cpp:106
+#: src/note.cpp:101
 msgid "Error saving note data."
 msgstr "保存便笺数据时出错。"
 
-#: ../src/note.cpp:107
-#| msgid ""
-#| "An error occurred while saving your notes. Please check that you have "
-#| "sufficient disk space, and that you have appropriate rights on ~/.gnote. "
-#| "Error details can be found in ~/.gnote.log."
+#: src/note.cpp:102
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
 "sufficient disk space, and that you have appropriate rights on ~/.local/"
@@ -1569,34 +1709,25 @@ msgstr ""
 "保存您的便笺时发生了错误。请检查您是否有足够的磁盘空间,以及您在 ~/.local/"
 "share/gnote 是否有足够的权限。错误细节可在 ~/.gnote.log 中找到。"
 
-#. Probably IOException or UnauthorizedAccessException?
-#: ../src/note.cpp:382 ../src/notebase.cpp:199
-#, c-format
-msgid "Exception while saving note: %s"
-msgstr "保存便笺时发生例外:%s"
-
-#: ../src/note.cpp:474
+#: src/note.cpp:453
 #, c-format
-#| msgid "Error saving icon"
 msgid "Error while saving: %s"
 msgstr "保存时出错:%s"
 
-#: ../src/note.cpp:699
+#: src/note.cpp:680
 msgid "Setting text content for closed notes not supported"
 msgstr "不支持为关闭的便笺设置文本内容"
 
-#. write failure, but not critical
-#: ../src/notebase.cpp:443
-#, c-format
-msgid "Failed to update note format: %s"
-msgstr "更新便笺格式失败:%s"
+#. TRANSLATORS: This is 'New Note' Template, not New 'Note Template'
+#: src/notemanagerbase.cpp:107 src/preferencesdialog.cpp:325
+msgid "New Note Template"
+msgstr "新建便笺模板"
 
-#: ../src/notebase.cpp:567
-#, c-format
-msgid "Filesystem error: %s"
-msgstr "文件系统错误:%s"
+#: src/notemanagerbase.cpp:358
+msgid "Describe your new note here."
+msgstr "在此描述您的新便笺。"
 
-#: ../src/notemanager.cpp:133
+#: src/notemanager.cpp:114
 msgid ""
 "<note-content xmlns:link=\"http://beatniksoftware.com/tomboy/link\";>Start "
 "Here\n"
@@ -1633,7 +1764,7 @@ msgstr ""
 "笺。您是否已经注意到,我们每次输入<link:internal>在 Gnote 中使用链接</link:"
 "internal>的时候,都会自动加下划线?单击链接即可打开该便笺。</note-content>"
 
-#: ../src/notemanager.cpp:152
+#: src/notemanager.cpp:133
 msgid ""
 "<note-content>Using Links in Gnote\n"
 "\n"
@@ -1661,72 +1792,58 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../src/notemanager.cpp:167 ../src/notemanager.cpp:208
+#: src/notemanager.cpp:148 src/notemanager.cpp:185
 msgid "Start Here"
 msgstr "从这里开始"
 
-#: ../src/notemanager.cpp:173
+#: src/notemanager.cpp:153
 msgid "Using Links in Gnote"
 msgstr "在 Gnote 中使用链接"
 
-#: ../src/notemanager.cpp:178
+#: src/notemanager.cpp:158
 #, c-format
-#| msgid "Error printing note"
 msgid "Error creating start notes: %s"
 msgstr "创建启动便笺出错:%s"
 
 #. TRANSLATORS: first %s is file, second is error
-#: ../src/notemanager.cpp:196
+#: src/notemanager.cpp:173
 #, c-format
 msgid "Error parsing note XML, skipping \"%s\": %s"
 msgstr "解析便笺 XML 失败,跳过“%s”: %s"
 
-#: ../src/notemanagerbase.cpp:105 ../src/preferencesdialog.cpp:332
-msgid "New Note Template"
-msgstr "新建便笺模板"
-
-#: ../src/notemanagerbase.cpp:356
-msgid "Describe your new note here."
-msgstr "在此描述您的新便笺。"
-
-#: ../src/noterenamedialog.cpp:123
+#: src/noterenamedialog.cpp:125
 msgid "Rename Note Links?"
 msgstr "重命名便笺链接吗?"
 
-#: ../src/noterenamedialog.cpp:127
+#: src/noterenamedialog.cpp:130
 msgid "_Don't Rename Links"
 msgstr "不重命名链接(_D)"
 
-#: ../src/noterenamedialog.cpp:128
+#: src/noterenamedialog.cpp:131
 msgid "_Rename Links"
 msgstr "重命名链接(_R)"
 
-#: ../src/noterenamedialog.cpp:129
+#: src/noterenamedialog.cpp:132
 msgid "Select All"
 msgstr "全选"
 
-#: ../src/noterenamedialog.cpp:130
+#: src/noterenamedialog.cpp:133
 msgid "Select None"
 msgstr "全部不选"
 
-#: ../src/noterenamedialog.cpp:131
+#: src/noterenamedialog.cpp:134
 msgid "Always show this _window"
 msgstr "总是显示此窗口(_W)"
 
-#: ../src/noterenamedialog.cpp:132
+#: src/noterenamedialog.cpp:135
 msgid "Alwa_ys rename links"
 msgstr "总是重命名链接(_Y)"
 
-#: ../src/noterenamedialog.cpp:134
+#: src/noterenamedialog.cpp:137
 msgid "Never rename _links"
 msgstr "决不重命名链接(_L)"
 
-#: ../src/noterenamedialog.cpp:152
-#| msgid ""
-#| "Rename links in other notes from \"<span underline=\"single\">%1</span>\" "
-#| "to\"<span underline=\"single\">%2</span>\"?\n"
-#| "\n"
-#| "If you do not rename the links, they will no longer link to anything."
+#: src/noterenamedialog.cpp:155
 msgid ""
 "Rename links in other notes from \"<span underline=\"single\">%1</span>\" to "
 "\"<span underline=\"single\">%2</span>\"?\n"
@@ -1738,60 +1855,44 @@ msgstr ""
 "\n"
 "如果不想重命名这些链接,它们将成为死链。"
 
-#: ../src/noterenamedialog.cpp:185
+#: src/noterenamedialog.cpp:188
 msgid "Rename Links"
 msgstr "重命名链接"
 
-#: ../src/noterenamedialog.cpp:200 ../src/synchronization/syncdialog.cpp:331
+#: src/noterenamedialog.cpp:203 src/synchronization/syncdialog.cpp:327
 msgid "Note Title"
 msgstr "便笺标题"
 
-#: ../src/noterenamedialog.cpp:237
+#: src/noterenamedialog.cpp:240
 msgid "Ad_vanced"
 msgstr "高级(_V)"
 
-#: ../src/notewindow.cpp:368
-msgid "_Link to New Note"
-msgstr "链接到新便笺(_L)"
-
-#: ../src/notewindow.cpp:376
-msgid "Te_xt"
-msgstr "文本(_X)"
-
-#: ../src/notewindow.cpp:404
-#| msgid "Print"
-msgid "Pin"
-msgstr "图钉"
-
-#: ../src/notewindow.cpp:408 ../src/notewindow.cpp:621
-msgid "Remove from important notes"
-msgstr "从重要的便笺移除"
+#: src/notewindow.cpp:282
+msgid "_Undo"
+msgstr "撤销(_U)"
 
-#: ../src/notewindow.cpp:412 ../src/notewindow.cpp:625
-msgid "Mark note as important"
-msgstr "将便笺标记为重要"
+#: src/notewindow.cpp:284
+msgid "_Redo"
+msgstr "重做(_R)"
 
-#: ../src/notewindow.cpp:422
-msgid "Link"
-msgstr "链接"
+#: src/notewindow.cpp:286 src/notewindow.cpp:340
+msgid "_Link to New Note"
+msgstr "链接到新便笺(_L)"
 
-#: ../src/notewindow.cpp:428
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "将选中文本链接到新便笺(Ctrl-L)"
+#: src/notewindow.cpp:288
+msgctxt "NoteActions"
+msgid "_Important"
+msgstr "重要(_I)"
 
-#: ../src/notewindow.cpp:434
-msgid "_Text"
-msgstr "文本(_T)"
+#: src/notewindow.cpp:298
+msgid "_Delete…"
+msgstr "删除(_D)…"
 
-#: ../src/notewindow.cpp:439
+#: src/notewindow.cpp:375
 msgid "Set properties of text"
 msgstr "设置文本属性"
 
-#: ../src/notewindow.cpp:449
-msgid "Delete this note"
-msgstr "删除此便笺"
-
-#: ../src/notewindow.cpp:467
+#: src/notewindow.cpp:389
 msgid ""
 "This note is a template note. It determines the default content of regular "
 "notes, and will not show up in the note menu or search window."
@@ -1799,319 +1900,289 @@ msgstr ""
 "该便笺为模板便笺。它决定了普通便笺的默认内容,而且不会显示在便笺菜单或搜索窗"
 "口中。"
 
-#: ../src/notewindow.cpp:470
+#: src/notewindow.cpp:392
 msgid "Convert to regular note"
 msgstr "转为普通便笺"
 
-#: ../src/notewindow.cpp:473
+#: src/notewindow.cpp:395
 msgid "Save Si_ze"
 msgstr "保存大小(_Z)"
 
-#: ../src/notewindow.cpp:477
+#: src/notewindow.cpp:399
 msgid "Save Se_lection"
 msgstr "保存所选(_L)"
 
-#: ../src/notewindow.cpp:481
+#: src/notewindow.cpp:403
 msgid "Save _Title"
 msgstr "保存标题(_T)"
 
-#: ../src/notewindow.cpp:583
+#: src/notewindow.cpp:505 src/notewindow.cpp:1011
 msgid "Cannot create note"
 msgstr "无法创建便笺"
 
-#: ../src/notewindow.cpp:849
-msgid "<b>_Bold</b>"
-msgstr "<b>粗体(_B)</b>"
+#: src/notewindow.cpp:781
+msgid "_Bold"
+msgstr "粗体(_B)"
 
-#: ../src/notewindow.cpp:850
-msgid "<i>_Italic</i>"
-msgstr "<i>斜体(_I)</i>"
+#: src/notewindow.cpp:782
+msgid "_Italic"
+msgstr "斜体(_I)"
 
-#: ../src/notewindow.cpp:851
-msgid "<s>_Strikeout</s>"
-msgstr "<s>删除线(_S)</s>"
+#: src/notewindow.cpp:783
+msgid "_Strikeout"
+msgstr "删除线(_S)"
 
-#: ../src/notewindow.cpp:853
+#: src/notewindow.cpp:787
 msgid "_Highlight"
 msgstr "高亮(_H)"
 
-#: ../src/notewindow.cpp:855
+#: src/notewindow.cpp:790
 msgid "_Normal"
 msgstr "普通(_N)"
 
-#: ../src/notewindow.cpp:857
-msgid "Hu_ge"
-msgstr "巨大(_G)"
+#: src/notewindow.cpp:791
+msgid "S_mall"
+msgstr "小(_M)"
 
-#: ../src/notewindow.cpp:859
+#: src/notewindow.cpp:792
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../src/notewindow.cpp:861
-msgid "S_mall"
-msgstr "小(_M)"
+#: src/notewindow.cpp:793
+msgid "Hu_ge"
+msgstr "巨大(_G)"
 
-#: ../src/notewindow.cpp:863
-msgid "Bullets"
-msgstr "项目符号"
+#: src/notewindow.cpp:815
+msgid "⦁ Bullets"
+msgstr "⦁ 项目符号"
 
-#: ../src/notewindow.cpp:866
-msgid "Increase Font Size"
-msgstr "增大字号"
+#: src/notewindow.cpp:817
+msgid "→ Increase indent"
+msgstr "→ 增加缩进量"
 
-#: ../src/notewindow.cpp:867
-msgid "Decrease Font Size"
-msgstr "减小字号"
+#: src/notewindow.cpp:819
+msgid "← Decrease indent"
+msgstr "← 减少缩进量"
+
+#: src/preferencesdialog.cpp:104
+msgid "Gnote Preferences"
+msgstr "Gnote 首选项"
 
-#: ../src/preferencesdialog.cpp:121
+#: src/preferencesdialog.cpp:121
 msgid "General"
 msgstr "常规"
 
-#: ../src/preferencesdialog.cpp:122
-#| msgid "Link"
+#: src/preferencesdialog.cpp:122
 msgid "Links"
 msgstr "链接"
 
-#: ../src/preferencesdialog.cpp:125
-msgid "Hotkeys"
-msgstr "热键"
-
 #. TRANSLATORS: Addin category.
-#: ../src/preferencesdialog.cpp:129 ../src/sharp/addinstreemodel.cpp:164
+#: src/preferencesdialog.cpp:125 src/sharp/addinstreemodel.cpp:165
 msgid "Synchronization"
 msgstr "同步"
 
-#: ../src/preferencesdialog.cpp:131
+#: src/preferencesdialog.cpp:127
 msgid "Plugins"
 msgstr "插件"
 
-#: ../src/preferencesdialog.cpp:208
+#. Ok button...
+#. Button to close dialog.
+#: src/preferencesdialog.cpp:152 src/preferencesdialog.cpp:801
+#: src/preferencesdialog.cpp:1064 src/preferencesdialog.cpp:1281
+#: src/synchronization/syncdialog.cpp:341 src/utils.cpp:365
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: src/preferencesdialog.cpp:202
 #, c-format
 msgid "Plugin %s is absent"
 msgstr "插件 %s 不存在"
 
-#. Status icon
-#: ../src/preferencesdialog.cpp:247
-#| msgid "Use Status _Icon"
-msgid "Use status _icon"
-msgstr "使用状态图标(_I)"
-
-#: ../src/preferencesdialog.cpp:248
-msgid "Show icon in tray, which is the central place of control."
-msgstr "在托盘显示图标,这是控制的中心。"
-
 #. Open in new window
-#: ../src/preferencesdialog.cpp:255
-#| msgid "Always show this _window"
+#: src/preferencesdialog.cpp:250
 msgid "Always _open notes in new window"
 msgstr "总是在新窗口中打开便笺(_O)"
 
-#: ../src/preferencesdialog.cpp:268
+#: src/preferencesdialog.cpp:263
 msgid "_Spell check while typing"
 msgstr "输入时检查拼写(_S)"
 
-#: ../src/preferencesdialog.cpp:269
+#: src/preferencesdialog.cpp:264
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr "拼错的单词将以红色显示,而纠正拼写错误的建议将显示在右键菜单中。"
 
 #. Auto bulleted list
-#: ../src/preferencesdialog.cpp:279
+#: src/preferencesdialog.cpp:274
 msgid "Enable auto-_bulleted lists"
 msgstr "允许对列表自动编号(_B)"
 
-#: ../src/preferencesdialog.cpp:280
+#: src/preferencesdialog.cpp:275
 msgid "Start new bulleted list by starting new line with character \"-\"."
 msgstr "通过使用“-”为行首,开始新的着重符号列表"
 
-#: ../src/preferencesdialog.cpp:289
+#: src/preferencesdialog.cpp:283
 msgid "Use custom _font"
 msgstr "使用自定义字体(_F)"
 
-#: ../src/preferencesdialog.cpp:307
+#: src/preferencesdialog.cpp:300
 msgid "When renaming a linked note: "
 msgstr "重命名有链接的便笺时:"
 
-#: ../src/preferencesdialog.cpp:311
+#: src/preferencesdialog.cpp:304
 msgid "Ask me what to do"
 msgstr "询问我怎么做"
 
-#: ../src/preferencesdialog.cpp:312
+#: src/preferencesdialog.cpp:305
 msgid "Never rename links"
 msgstr "不重命名链接"
 
-#: ../src/preferencesdialog.cpp:313
+#: src/preferencesdialog.cpp:306
 msgid "Always rename links"
 msgstr "总是重命名链接"
 
-#: ../src/preferencesdialog.cpp:333
+#: src/preferencesdialog.cpp:326
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "创建新的便笺时使用新的便笺模板来设定应使用的文字。"
 
-#: ../src/preferencesdialog.cpp:338
+#: src/preferencesdialog.cpp:331
 msgid "Open New Note Template"
 msgstr "打开新的便笺模板"
 
 #. internal links
-#: ../src/preferencesdialog.cpp:395
+#: src/preferencesdialog.cpp:385
 msgid "_Automatically link to notes"
 msgstr "自动链接到便笺(_A)"
 
-#: ../src/preferencesdialog.cpp:396
+#: src/preferencesdialog.cpp:386
 msgid "Enable this option to create a link when text matches note title."
 msgstr "启动此选项将会在文本匹配便笺标题时创建链接。   "
 
 #. URLs
-#: ../src/preferencesdialog.cpp:402
+#: src/preferencesdialog.cpp:392
 msgid "Create links for _URLs"
 msgstr "为 _URL 创建链接"
 
-#: ../src/preferencesdialog.cpp:403
+#: src/preferencesdialog.cpp:393
+#, fuzzy
 #| msgid ""
-#| "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-#| "will create a note with that name."
+#| "Enable this option to create a link for URLs. Clicking will open that URL "
+#| "with apropriate program."
 msgid ""
-"Enable this option to create a link for URLs. Clicking will open that URL "
-"with apropriate program."
+"Enable this option to create links for URLs. Clicking will open URL with "
+"appropriate program."
 msgstr "启用此选项将会为 URL 创建链接。点击之将会使用适当的程序打开。"
 
 #. WikiWords...
-#: ../src/preferencesdialog.cpp:410
+#: src/preferencesdialog.cpp:400
 msgid "Highlight _WikiWords"
 msgstr "加亮 _WikiWords"
 
-#: ../src/preferencesdialog.cpp:411
+#: src/preferencesdialog.cpp:401
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
 msgstr ""
 "启用此选项将加亮类似 <b>WikiWords</b> 的单词。单击此单词将以该名称创建便笺。"
 
-#. Hotkeys...
-#: ../src/preferencesdialog.cpp:441
-#| msgid "Listen for _Hotkeys"
-msgid "Listen for _hotkeys"
-msgstr "监听热键(_H)"
-
-#: ../src/preferencesdialog.cpp:442
-msgid ""
-"Hotkeys allow you to quickly access your notes from anywhere with a "
-"keypress. Example Hotkeys: <b>&lt;Control&gt;&lt;Shift&gt;F11</b>, <b>&lt;"
-"Alt&gt;N</b>"
-msgstr ""
-"热键允许随时随地访问您的便笺。热键示例:<b>&lt;Control&gt;&lt;Shift&gt;F11</"
-"b>,<b>&lt;Alt&gt;N</b>"
-
-#. Show notes menu keybinding...
-#: ../src/preferencesdialog.cpp:464
-msgid "Show notes _menu"
-msgstr "显示便笺菜单(_M)"
-
-#. Open Start Here keybinding...
-#: ../src/preferencesdialog.cpp:481
-msgid "Open \"_Start Here\""
-msgstr "打开“从这里开始”(_S)"
-
-#. Create new note keybinding...
-#: ../src/preferencesdialog.cpp:497
-msgid "Create _new note"
-msgstr "创建新便笺(_N)"
-
-#. Open Search All Notes window keybinding...
-#: ../src/preferencesdialog.cpp:513
-msgid "Open \"Search _All Notes\""
-msgstr "打开“搜索全部便笺(_A)”"
-
-#: ../src/preferencesdialog.cpp:553
+#: src/preferencesdialog.cpp:433
 msgid "Ser_vice:"
 msgstr "服务(_V):"
 
-#: ../src/preferencesdialog.cpp:609 ../src/preferencesdialog.cpp:1239
+#: src/preferencesdialog.cpp:487 src/preferencesdialog.cpp:1107
 msgid "Not configurable"
 msgstr "不可配置"
 
-#: ../src/preferencesdialog.cpp:636
-#| msgid "Automatic Background Synchronization Timeout"
-msgid "Automatical background s_ync interval (minutes)"
+#: src/preferencesdialog.cpp:512
+#, fuzzy
+#| msgid "Automatical background s_ync interval (minutes)"
+msgid "Automatic background s_ync interval (minutes)"
 msgstr "后台自动同步时间间隔 - 分钟(_Y)"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../src/preferencesdialog.cpp:660
+#: src/preferencesdialog.cpp:536
 msgid "_Advanced..."
 msgstr "高级(_A)..."
 
-#: ../src/preferencesdialog.cpp:707
-#| msgid "The following add-ins are installed"
+#: src/preferencesdialog.cpp:543
+msgid "Clear"
+msgstr "清除"
+
+#: src/preferencesdialog.cpp:584
 msgid "The following plugins are installed:"
 msgstr "已安装如下插件:"
 
 #. TODO: In a future version, add in an "Install Add-ins..." button
 #. TODO: In a future version, add in a "Repositories..." button
-#: ../src/preferencesdialog.cpp:742
+#: src/preferencesdialog.cpp:619
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: ../src/preferencesdialog.cpp:748
+#: src/preferencesdialog.cpp:625
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../src/preferencesdialog.cpp:906
+#: src/preferencesdialog.cpp:637
+msgid "In_formation"
+msgstr "信息(_F)"
+
+#: src/preferencesdialog.cpp:781
 msgid "Not Implemented"
 msgstr "尚未实现"
 
-#: ../src/preferencesdialog.cpp:922
-msgid "%1% Preferences"
+#. TRANSLATORS: %1 is the placeholder for the addin name.
+#: src/preferencesdialog.cpp:798
+#, fuzzy
+#| msgid "%1% Preferences"
+msgid "%1 Preferences"
 msgstr "%1% 首选项"
 
-#: ../src/preferencesdialog.cpp:1057
+#: src/preferencesdialog.cpp:931
 msgid "Choose Note Font"
 msgstr "选择便笺字体"
 
 #. Create dialog
-#: ../src/preferencesdialog.cpp:1155
+#: src/preferencesdialog.cpp:1024
 msgid "Other Synchronization Options"
 msgstr "其他的同步选项"
 
-#: ../src/preferencesdialog.cpp:1158
+#: src/preferencesdialog.cpp:1027
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "当检测到本地便笺和配置的同步服务器上的便笺之间有冲突时:"
 
 #. label.Xalign = 0;
-#: ../src/preferencesdialog.cpp:1162
-#| msgid "Always ask me what to do."
+#: src/preferencesdialog.cpp:1031
 msgid "Always ask me what to do"
 msgstr "总是询问我怎么做"
 
-#: ../src/preferencesdialog.cpp:1166
-#| msgid "Rename my local note."
+#: src/preferencesdialog.cpp:1035
 msgid "Rename my local note"
 msgstr "重命名我的本地便笺"
 
-#: ../src/preferencesdialog.cpp:1170
-#| msgid "Replace my local note with the server's update."
+#: src/preferencesdialog.cpp:1039
 msgid "Replace my local note with the server's update"
 msgstr "使用服务器上的更新覆盖我本地的便笺"
 
-#: ../src/preferencesdialog.cpp:1272
+#: src/preferencesdialog.cpp:1141
 msgid "Are you sure?"
 msgstr "您确定吗?"
 
-#: ../src/preferencesdialog.cpp:1273
+#: src/preferencesdialog.cpp:1142
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
 msgstr "不推荐您清除同步设置。当保存新设置时,可能会强制您再次同步所有的便笺。"
 
-#: ../src/preferencesdialog.cpp:1283
+#: src/preferencesdialog.cpp:1152
 msgid "Resetting Synchronization Settings"
 msgstr "重置同步设置"
 
-#: ../src/preferencesdialog.cpp:1284
+#: src/preferencesdialog.cpp:1153
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -2120,101 +2191,96 @@ msgstr ""
 "您已经禁用了配置的同步服务。您的同步设置将被清除。当您保存新设置时,可能得再"
 "次同步所有便笺。"
 
-#: ../src/preferencesdialog.cpp:1350
+#: src/preferencesdialog.cpp:1228
 msgid "Connection successful"
 msgstr "连接成功"
 
-#: ../src/preferencesdialog.cpp:1351
+#: src/preferencesdialog.cpp:1229
 msgid ""
 "Gnote is ready to synchronize your notes. Would you like to synchronize them "
 "now?"
 msgstr "Gnote 已准备同步您的便笺。您希望现在就同步它们吗?"
 
-#: ../src/preferencesdialog.cpp:1375
+#. TRANSLATORS: %1 is the placeholder for the log file path.
+#: src/preferencesdialog.cpp:1254
+#, fuzzy
 #| msgid ""
-#| "Please check your information and try again.  The log file {0} may "
+#| "Please check your information and try again.  The log file %1% may "
 #| "contain more information about the error."
 msgid ""
-"Please check your information and try again.  The log file %1% may contain "
+"Please check your information and try again.  The log file %1 may contain "
 "more information about the error."
 msgstr "请检查您的信息并重试。日志文件 %1% 可能包含了该错误的更多信息。"
 
-#: ../src/preferencesdialog.cpp:1380
+#: src/preferencesdialog.cpp:1259
 msgid "Error connecting"
 msgstr "连接出错"
 
-#: ../src/preferencesdialog.cpp:1443
+#: src/preferencesdialog.cpp:1321
 msgid "Version:"
 msgstr "版本:"
 
-#: ../src/preferencesdialog.cpp:1446
+#: src/preferencesdialog.cpp:1324
 msgid "Author:"
 msgstr "作者:"
 
-#: ../src/preferencesdialog.cpp:1451
+#: src/preferencesdialog.cpp:1328
 msgid "Copyright:"
 msgstr "版权所有:"
 
-#: ../src/recentchanges.cpp:129
+#: src/recentchanges.cpp:160
 msgid "All Notes"
 msgstr "全部便笺"
 
-#: ../src/recentchanges.cpp:135
-#| msgid "_New"
-msgid "New"
-msgstr "新建"
+#: src/recentchanges.cpp:171
+msgid "Create New Note"
+msgstr "创建新便笺"
 
-#: ../src/recentchanges.cpp:156
+#: src/recentchanges.cpp:193
 msgid "Search"
 msgstr "搜索"
 
-#: ../src/recentchanges.cpp:197
-msgid "Find _Next"
-msgstr "查找下一个(_N)"
+#: src/recentchanges.cpp:268
+msgid "Parent of embed box is not a Gtk::Grid, please report a bug!"
+msgstr ""
 
-#: ../src/recentchanges.cpp:205
-msgid "Find _Previous"
-msgstr "查找上一个(_P)"
+#: src/recentchanges.cpp:310
+msgid "Parent of search entry is not Gtk::Grid, please report a bug!"
+msgstr ""
 
-#: ../src/recentchanges.cpp:670
-msgid "_Close"
-msgstr "关闭(_C)"
+#: src/recentchanges.cpp:863
+#, fuzzy
+msgid "Expected widget to be a sub-menu!"
+msgstr "控件应为子菜单!"
 
-#: ../src/remotecontrolproxy.cpp:57
+#: src/recentchanges.cpp:868
+#, fuzzy
+#| msgid "Not configurable"
+msgid "No configured actions"
+msgstr "不可配置"
+
+#: src/remotecontrolproxy.cpp:46 src/remotecontrolproxy.cpp:49
 #, c-format
 msgid "Failed to load D-Bus interface %s: %s"
 msgstr "加载 D-Bus 接口 %s 失败:%s"
 
-#: ../src/searchnoteswidget.cpp:137
-#| msgid "_Open..."
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: ../src/searchnoteswidget.cpp:140
-msgid "Open In New _Window"
-msgstr "在新窗口打开(_W)"
-
-#: ../src/searchnoteswidget.cpp:144 ../src/searchnoteswidget.cpp:147
-msgid "_Delete"
-msgstr "删除(_D)"
-
-#: ../src/searchnoteswidget.cpp:150
-msgid "Re_name..."
-msgstr "重命名(_N)..."
+#: src/searchnoteswidget.cpp:212
+msgid "Notebooks"
+msgstr "便笺本"
 
-#: ../src/searchnoteswidget.cpp:659
+#: src/searchnoteswidget.cpp:684
 msgid "Note"
 msgstr "便笺"
 
-#: ../src/searchnoteswidget.cpp:681
+#: src/searchnoteswidget.cpp:706
 msgid "Modified"
 msgstr "已修改"
 
-#: ../src/searchnoteswidget.cpp:1000
+#: src/searchnoteswidget.cpp:1017
 msgid "Notes"
 msgstr "便笺"
 
-#: ../src/searchnoteswidget.cpp:1019
+#: src/searchnoteswidget.cpp:1036
 msgid ""
 "No results found in the selected notebook.\n"
 "Click here to search across all notes."
@@ -2222,114 +2288,156 @@ msgstr ""
 "在选定的便笺本中未发现结果。\n"
 "点击此处搜索全部便笺。"
 
-#: ../src/searchnoteswidget.cpp:1023
+#: src/searchnoteswidget.cpp:1040
 msgid "Click here to search across all notebooks"
 msgstr "点击此处搜索全部便笺本"
 
-#: ../src/searchnoteswidget.cpp:1044
+#: src/searchnoteswidget.cpp:1058
 msgid "Matches"
 msgstr "匹配项"
 
 #. TRANSLATORS: search found a match in note title
-#: ../src/searchnoteswidget.cpp:1096
+#: src/searchnoteswidget.cpp:1109
 msgid "Title match"
 msgstr "标题匹配"
 
-#: ../src/searchnoteswidget.cpp:1100
-msgid "%1% match"
-msgid_plural "%1% matches"
-msgstr[0] "%1% 个匹配项"
+#: src/searchnoteswidget.cpp:1113
+msgid "%1 match"
+msgid_plural "%1 matches"
+msgstr[0] "%1 个匹配项"
 
-#: ../src/searchnoteswidget.cpp:1311
+#: src/searchnoteswidget.cpp:1310
+msgid "Open In New _Window"
+msgstr "在新窗口打开(_W)"
+
+#: src/searchnoteswidget.cpp:1320
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../src/searchnoteswidget.cpp:1340
+#: src/searchnoteswidget.cpp:1349
 msgid "_Open Template Note"
 msgstr "打开模板便笺(_O)"
 
-#: ../src/searchnoteswidget.cpp:1351
-#| msgid "_New"
+#: src/searchnoteswidget.cpp:1353
+msgid "Re_name..."
+msgstr "重命名(_N)..."
+
+#: src/searchnoteswidget.cpp:1360
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../src/searchnoteswidget.cpp:1487 ../src/searchnoteswidget.cpp:1500
-#: ../src/searchnoteswidget.cpp:1511
-#, c-format
-msgid "Failed to parse setting %s (Value: %s):"
+#: src/searchnoteswidget.cpp:1511 src/searchnoteswidget.cpp:1524
+#: src/searchnoteswidget.cpp:1535
+#, fuzzy, c-format
+#| msgid "Failed to parse setting %s (Value: %s):"
+msgid "Failed to parse setting search-sorting (Value: %s):"
 msgstr "解析设置 %s 出错(值:%s):"
 
-#: ../src/searchnoteswidget.cpp:1488
+#: src/searchnoteswidget.cpp:1512
 msgid "Expected format 'column:order'"
 msgstr "期望的格式“column:order”"
 
-#: ../src/searchnoteswidget.cpp:1501
+#: src/searchnoteswidget.cpp:1525
 #, c-format
 msgid "Unrecognized column %s"
 msgstr "未识别的列 %s"
 
-#: ../src/searchnoteswidget.cpp:1512
+#: src/searchnoteswidget.cpp:1536
 #, c-format
 msgid "Unrecognized order %s"
 msgstr "不可识别的排序 %s"
 
-#: ../src/sharp/addinstreemodel.cpp:109
+#: src/sharp/addinstreemodel.cpp:110
 msgid "Name"
 msgstr "名称"
 
-#: ../src/sharp/addinstreemodel.cpp:121
+#: src/sharp/addinstreemodel.cpp:122
 msgid "Version"
 msgstr "版本"
 
 #. TRANSLATORS: Addin category.
-#: ../src/sharp/addinstreemodel.cpp:155
+#: src/sharp/addinstreemodel.cpp:156
 msgid "Formatting"
 msgstr "格式"
 
 #. TRANSLATORS: Addin category.
-#: ../src/sharp/addinstreemodel.cpp:158
+#: src/sharp/addinstreemodel.cpp:159
 msgid "Desktop integration"
 msgstr "桌面集成"
 
 #. TRANSLATORS: Addin category.
-#: ../src/sharp/addinstreemodel.cpp:161
+#: src/sharp/addinstreemodel.cpp:162
 msgid "Tools"
 msgstr "工具"
 
 #. TRANSLATORS: Addin category is unknown.
-#: ../src/sharp/addinstreemodel.cpp:168
+#: src/sharp/addinstreemodel.cpp:169
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/sharp/modulemanager.cpp:62
+#: src/sharp/modulemanager.cpp:62
 #, c-format
-#| msgid "Error saving icon"
 msgid "Error loading %s"
 msgstr "加载 %s 时出错"
 
-#: ../src/sharp/modulemanager.cpp:69
+#: src/sharp/modulemanager.cpp:69
 #, c-format
 msgid "Error getting symbol dynamic_module_instanciate: %s"
 msgstr "获取符号 dynamic_module_instanciate 时出错:%s"
 
-#: ../src/sharp/xmlreader.cpp:195
+#: src/sharp/xmlreader.cpp:219
 #, c-format
 msgid "XML error: %s"
 msgstr "XML 错误:%s"
 
-#: ../src/sharp/xmlreader.cpp:195
+#: src/sharp/xmlreader.cpp:219
 msgid "unknown parse error"
 msgstr "未知的解析错误"
 
-#: ../src/sharp/xmlwriter.cpp:40
-msgid "%1% failed"
+#: src/sharp/xmlwriter.cpp:40
+#, fuzzy
+#| msgid "%1% failed"
+msgid "%1 failed"
 msgstr "%1% 已失败"
 
-#: ../src/sharp/xsltransform.cpp:67
+#: src/sharp/xsltransform.cpp:67
 msgid "NULL stylesheet, please fill a bug"
 msgstr "没有样式表,请报告 bug"
 
-#: ../src/synchronization/filesystemsyncserver.cpp:369
+#: src/synchronization/filesystemsyncserver.cpp:125
+#, fuzzy, c-format
+#| msgid "Failed to update note format: %s"
+msgid "Failed to upload note: %s"
+msgstr "更新便笺格式失败:%s"
+
+#: src/synchronization/filesystemsyncserver.cpp:143
+#, fuzzy
+#| msgid "Failed to load plugin information!"
+msgid "Failed to upload %1 note"
+msgid_plural "Failed to upload %1 notes"
+msgstr[0] "加载插件信息失败!"
+
+#: src/synchronization/filesystemsyncserver.cpp:237
+#, fuzzy, c-format
+#| msgid "Exception while saving note: %s"
+msgid "Exception when finishing note copy: %s"
+msgstr "保存便笺时发生例外:%s"
+
+#: src/synchronization/filesystemsyncserver.cpp:240
+#, fuzzy
+#| msgid "Exception while saving note: %s"
+msgid "Exception when finishing note copy"
+msgstr "保存便笺时发生例外:%s"
+
+#: src/synchronization/filesystemsyncserver.cpp:263
+#, fuzzy
+#| msgid "Failed to update note format: %s"
+msgid "Failed to download %1 note update"
+msgid_plural "Failed to download %1 note updates"
+msgstr[0] "更新便笺格式失败:%s"
+
+#: src/synchronization/filesystemsyncserver.cpp:427
+#: src/synchronization/filesystemsyncserver.cpp:431
 #, c-format
 msgid ""
 "Exception during server cleanup while committing. Server integrity is OK, "
@@ -2338,407 +2446,696 @@ msgstr ""
 "提交时服务器清理发生例外。服务器完整性没有问题但是可能会遗留一些文件。错误"
 "为:%s\n"
 
-#: ../src/synchronization/filesystemsyncserver.cpp:609
+#: src/synchronization/filesystemsyncserver.cpp:637
+#, fuzzy, c-format
+#| msgid "Error loading %s"
+msgid "Error updating lock: %s"
+msgstr "加载 %s 时出错"
+
+#: src/synchronization/filesystemsyncserver.cpp:676
 #, c-format
-#| msgid "Error connecting to the synchronization service.  Please try again."
 msgid "Error deleting the old synchronization lock \"%s\": %s"
 msgstr "删除旧的同步锁“%s”时出错:%s"
 
-#: ../src/synchronization/fusesyncserviceaddin.cpp:115
-msgid ""
-"This synchronization addin is not supported on your computer. Please make "
-"sure you have FUSE and %1% correctly installed and configured"
-msgstr "您的计算机不支持此同步插件。请确保 FUSE 和 %1% 已正确安装和配置"
-
-#: ../src/synchronization/fusesyncserviceaddin.cpp:158
-#| msgid "Could not save the icon file."
-msgid "Could not read testfile."
-msgstr "无法读取 testfile。"
-
-#: ../src/synchronization/fusesyncserviceaddin.cpp:167
-msgid "Write test failed."
-msgstr "写入测试失败。"
-
-#: ../src/synchronization/fusesyncserviceaddin.cpp:196
-msgid "Timeout connecting to server."
-msgstr "连接服务器超时。"
-
-#: ../src/synchronization/fusesyncserviceaddin.cpp:202
-msgid "Error connecting to server."
-msgstr "连接服务器出错"
-
-#: ../src/synchronization/fusesyncserviceaddin.cpp:215
-msgid "FUSE could not be enabled."
-msgstr "FUSE 无法启用。"
-
-#: ../src/synchronization/fusesyncserviceaddin.cpp:246
-#| msgid ""
-#| "The port to use when connecting to the synchronization server via SSH."
-msgid "An error ocurred while connecting to the specified server"
-msgstr "连接到指定的服务器出错"
-
 #. TRANSLATORS: %s is file
-#: ../src/synchronization/gnotesyncclient.cpp:154
+#: src/synchronization/gnotesyncclient.cpp:157
 #, c-format
 msgid "Unparsable last-sync-date element in %s"
 msgstr "%s 中不可解析的 last-sync-date 元素"
 
 #. TRANSLATORS: %s is file
-#: ../src/synchronization/gnotesyncclient.cpp:164
+#: src/synchronization/gnotesyncclient.cpp:167
 #, c-format
 msgid "Unparsable last-sync-rev element in %s"
 msgstr "%s 中不可解析的 last-sync-rev 元素"
 
-#: ../src/synchronization/syncdialog.cpp:64
+#: src/synchronization/gvfssyncservice.cpp:98
+#, fuzzy
+#| msgid "Write test failed."
+msgid "Failure writing test file"
+msgstr "写入测试失败。"
+
+#: src/synchronization/gvfssyncservice.cpp:103
+msgid "Failure when checking test file contents"
+msgstr "检查测试文件内容时失败"
+
+#: src/synchronization/gvfssyncservice.cpp:109
+msgid "Failure when trying to remove test file"
+msgstr "尝试删除测试文件时失败"
+
+#: src/synchronization/gvfssyncservice.cpp:125
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: src/synchronization/syncdialog.cpp:63
 msgid "Note Conflict"
 msgstr "便笺冲突"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../src/synchronization/syncdialog.cpp:69
+#: src/synchronization/syncdialog.cpp:68
 msgid " (old)"
 msgstr " (旧)"
 
-#: ../src/synchronization/syncdialog.cpp:114
+#: src/synchronization/syncdialog.cpp:113
 msgid "Rename local note:"
 msgstr "重命名本地便笺:"
 
-#: ../src/synchronization/syncdialog.cpp:121
+#: src/synchronization/syncdialog.cpp:120
 msgid "Update links in referencing notes"
 msgstr "更新引用便笺中的链接"
 
-#: ../src/synchronization/syncdialog.cpp:127
+#: src/synchronization/syncdialog.cpp:126
 msgid "Overwrite local note"
 msgstr "覆盖本地便笺"
 
-#: ../src/synchronization/syncdialog.cpp:131
+#: src/synchronization/syncdialog.cpp:130
 msgid "Always perform this action"
 msgstr "总是执行该动作"
 
+#: src/synchronization/syncdialog.cpp:133
+#, fuzzy
+#| msgid "_Contents"
+msgid "_Continue"
+msgstr "目录(_C)"
+
 #. Set initial dialog text
-#: ../src/synchronization/syncdialog.cpp:137
+#: src/synchronization/syncdialog.cpp:136
 msgid "Note conflict detected"
 msgstr "检测到便笺冲突"
 
-#: ../src/synchronization/syncdialog.cpp:139
+#: src/synchronization/syncdialog.cpp:138
+#, fuzzy
+#| msgid ""
+#| "The server version of \"%1%\" conflicts with your local note.  What do "
+#| "you want to do with your local note?"
 msgid ""
-"The server version of \"%1%\" conflicts with your local note.  What do you "
+"The server version of \"%1\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 msgstr "服务器版本“%1%”与您的本地便笺冲突。您要如何处理您本地便笺?"
 
 #. Expander containing TreeView
-#: ../src/synchronization/syncdialog.cpp:296
+#: src/synchronization/syncdialog.cpp:292
 msgid "Details"
 msgstr "细节"
 
-#: ../src/synchronization/syncdialog.cpp:338
+#: src/synchronization/syncdialog.cpp:334
 msgid "Status"
 msgstr "状态"
 
-#: ../src/synchronization/syncdialog.cpp:483
+#: src/synchronization/syncdialog.cpp:478
 msgid "Acquiring sync lock..."
 msgstr "正在获取同步锁..."
 
-#: ../src/synchronization/syncdialog.cpp:486
+#: src/synchronization/syncdialog.cpp:481
 msgid "Committing changes..."
 msgstr "正在提交更改..."
 
-#: ../src/synchronization/syncdialog.cpp:489
+#: src/synchronization/syncdialog.cpp:484
 msgid "Synchronizing Notes"
 msgstr "正在同步便笺"
 
-#: ../src/synchronization/syncdialog.cpp:490
+#: src/synchronization/syncdialog.cpp:485
 msgid "Synchronizing your notes..."
 msgstr "正在同步您的便笺..."
 
-#: ../src/synchronization/syncdialog.cpp:491
+#: src/synchronization/syncdialog.cpp:486
 msgid "This may take a while, kick back and enjoy!"
 msgstr "这可能需要一段时间,请稍安毋躁..."
 
-#: ../src/synchronization/syncdialog.cpp:493
+#: src/synchronization/syncdialog.cpp:488
 msgid "Connecting to the server..."
 msgstr "连接到服务器..."
 
-#: ../src/synchronization/syncdialog.cpp:499
+#: src/synchronization/syncdialog.cpp:494
 msgid "Deleting notes off of the server..."
 msgstr "从服务器上删除便笺..."
 
-#: ../src/synchronization/syncdialog.cpp:503
+#: src/synchronization/syncdialog.cpp:498
 msgid "Downloading new/updated notes..."
 msgstr "正在下载新/已更新的便笺..."
 
-#: ../src/synchronization/syncdialog.cpp:515
+#: src/synchronization/syncdialog.cpp:510
 msgid "Server Locked"
 msgstr "服务器锁定"
 
-#: ../src/synchronization/syncdialog.cpp:516
+#: src/synchronization/syncdialog.cpp:511
 msgid "Server is locked"
 msgstr "服务器已被锁定"
 
-#: ../src/synchronization/syncdialog.cpp:517
+#: src/synchronization/syncdialog.cpp:512
 msgid ""
 "One of your other computers is currently synchronizing.  Please wait 2 "
 "minutes and try again."
 msgstr "您的另一台计算机正在同步。请等待 2 分钟后重试。"
 
-#: ../src/synchronization/syncdialog.cpp:521
+#: src/synchronization/syncdialog.cpp:516
 msgid "Preparing to download updates from server..."
 msgstr "正准备从服务器下载更新..."
 
-#: ../src/synchronization/syncdialog.cpp:524
+#: src/synchronization/syncdialog.cpp:519
 msgid "Preparing to upload updates to server..."
 msgstr "正准备上传更新至服务器..."
 
-#: ../src/synchronization/syncdialog.cpp:527
+#: src/synchronization/syncdialog.cpp:522
 msgid "Uploading notes to server..."
 msgstr "正在上传便笺到服务器..."
 
-#: ../src/synchronization/syncdialog.cpp:530
+#: src/synchronization/syncdialog.cpp:525
 msgid "Synchronization Failed"
 msgstr "同步失败"
 
-#: ../src/synchronization/syncdialog.cpp:531
+#: src/synchronization/syncdialog.cpp:526
 msgid "Failed to synchronize"
 msgstr "无法同步"
 
-#: ../src/synchronization/syncdialog.cpp:532
+#: src/synchronization/syncdialog.cpp:527
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "无法同步便笺。检查下面的详细信息并重试。"
 
-#: ../src/synchronization/syncdialog.cpp:538
+#: src/synchronization/syncdialog.cpp:533
 msgid "Synchronization Complete"
 msgstr "同步完成"
 
-#: ../src/synchronization/syncdialog.cpp:539
+#: src/synchronization/syncdialog.cpp:534
 msgid "Synchronization is complete"
 msgstr "同步完成"
 
-#: ../src/synchronization/syncdialog.cpp:540
-msgid "%1% note updated."
-msgid_plural "%1% notes updated."
+#: src/synchronization/syncdialog.cpp:535
+#, fuzzy
+#| msgid "%1% note updated."
+#| msgid_plural "%1% notes updated."
+msgid "%1 note updated."
+msgid_plural "%1 notes updated."
 msgstr[0] "已更新 %1% 条便笺。"
 
-#: ../src/synchronization/syncdialog.cpp:541
+#: src/synchronization/syncdialog.cpp:536
 msgid "Your notes are now up to date."
 msgstr "您的便笺已经为最新。"
 
-#: ../src/synchronization/syncdialog.cpp:546
+#: src/synchronization/syncdialog.cpp:541
 msgid "Synchronization Canceled"
 msgstr "同步取消"
 
-#: ../src/synchronization/syncdialog.cpp:547
+#: src/synchronization/syncdialog.cpp:542
 msgid "Synchronization was canceled"
 msgstr "同步已取消"
 
-#: ../src/synchronization/syncdialog.cpp:548
+#: src/synchronization/syncdialog.cpp:543
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "您取消了同步。现在可以关闭此窗口。"
 
-#: ../src/synchronization/syncdialog.cpp:552
+#: src/synchronization/syncdialog.cpp:547
 msgid "Synchronization Not Configured"
 msgstr "未配置同步"
 
-#: ../src/synchronization/syncdialog.cpp:553
+#: src/synchronization/syncdialog.cpp:548
 msgid "Synchronization is not configured"
 msgstr "同步未配置"
 
-#: ../src/synchronization/syncdialog.cpp:554
+#: src/synchronization/syncdialog.cpp:549
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "请在首选项对话框内进行同步配置。"
 
-#: ../src/synchronization/syncdialog.cpp:558
+#: src/synchronization/syncdialog.cpp:553
 msgid "Synchronization Service Error"
 msgstr "同步服务器错误"
 
-#: ../src/synchronization/syncdialog.cpp:559
+#: src/synchronization/syncdialog.cpp:554
 msgid "Service error"
 msgstr "服务器错误"
 
-#: ../src/synchronization/syncdialog.cpp:560
+#: src/synchronization/syncdialog.cpp:555
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "同步服务连接错误。请重试。"
 
-#: ../src/synchronization/syncdialog.cpp:574
+#: src/synchronization/syncdialog.cpp:569
 msgid "Deleted locally"
 msgstr "已从本地删除"
 
-#: ../src/synchronization/syncdialog.cpp:577
+#: src/synchronization/syncdialog.cpp:572
 msgid "Deleted from server"
 msgstr "已从服务器删除"
 
-#: ../src/synchronization/syncdialog.cpp:580
+#: src/synchronization/syncdialog.cpp:575
 msgid "Updated"
 msgstr "已更新"
 
-#: ../src/synchronization/syncdialog.cpp:583
+#: src/synchronization/syncdialog.cpp:578
 msgid "Added"
 msgstr "已添加"
 
-#: ../src/synchronization/syncdialog.cpp:586
+#: src/synchronization/syncdialog.cpp:581
 msgid "Uploaded changes to server"
 msgstr "已上传更改到服务器"
 
-#: ../src/synchronization/syncdialog.cpp:589
+#: src/synchronization/syncdialog.cpp:584
 msgid "Uploaded new note to server"
 msgstr "已上传新便笺到服务器"
 
-#: ../src/synchronization/syncmanager.cpp:66
+#: src/synchronization/syncmanager.cpp:59
 msgid "Synchronize Notes"
 msgstr "同步便笺"
 
-#: ../src/synchronization/syncmanager.cpp:124
+#: src/synchronization/syncmanager.cpp:78
+#: src/synchronization/syncmanager.cpp:95
+#: src/synchronization/syncmanager.cpp:566
+#, fuzzy, c-format
+#| msgid "Remote call to %s failed"
+msgid "Report a bug. Cast failed: %s"
+msgstr "远程调用 %s 失败"
+
+#: src/synchronization/syncmanager.cpp:143
 #, c-format
 msgid "Error cleaning up addin after synchronization: %s"
 msgstr "同步后清理插件出错:%s"
 
-#: ../src/synchronization/syncmanager.cpp:149
+#: src/synchronization/syncmanager.cpp:168
 #, c-format
 msgid "Exception while creating SyncServer: %s"
 msgstr "创建 SyncServer 时失败:%s"
 
+#: src/synchronization/syncmanager.cpp:368
+#, fuzzy, c-format
+#| msgid "Synchronization failed with the following exception: %s"
+msgid "Synchronization failed with the following Glib exception: %s"
+msgstr "同步因如下例外而失败:%s"
+
 #. top-level try
-#: ../src/synchronization/syncmanager.cpp:353
+#: src/synchronization/syncmanager.cpp:372
 #, c-format
 msgid "Synchronization failed with the following exception: %s"
 msgstr "同步因如下例外而失败:%s"
 
-#: ../src/synchronization/syncutils.cpp:148
-#: ../src/synchronization/syncutils.cpp:180
-msgid "Could not enable FUSE"
-msgstr "无法启用 FUSE"
-
-#: ../src/synchronization/syncutils.cpp:149
-#: ../src/synchronization/syncutils.cpp:181
-msgid ""
-"The FUSE module could not be loaded. Please check that it is installed "
-"properly and try again."
-msgstr "FUSE 模块无法加载。请检查是否已经正确安装然后重试。"
-
-#: ../src/synchronization/syncutils.cpp:157
-#| msgid "_Enable"
-msgid "Enable FUSE?"
-msgstr "启用 FUSE?"
-
-#. TODO: This message isn't entirely accurate.
-#. We should fix it.
-#: ../src/synchronization/syncutils.cpp:160
-msgid ""
-"The synchronization you've chosen requires the FUSE module to be loaded.\n"
-"\n"
-"To avoid getting this prompt in the future, you should load FUSE at "
-"startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
-"etc/modules."
-msgstr ""
-"您选择的同步需要加载 FUSE 模块。\n"
-"\n"
-"要在未来避免显示此提示,需要在启动时加载 FUSE。向 /etc/init.d/boot.local 添"
-"加“modprobe fuse” 或向 /etc/modules 添加“fuse”。"
-
-#: ../src/tray.cpp:54
-msgid "Take notes"
-msgstr "记便笺"
-
-#: ../src/tray.cpp:167
-msgid " (new)"
-msgstr " (新)"
-
-#: ../src/tray.cpp:458
-msgid "_About Gnote"
-msgstr "关于 Gnote(_A)"
-
-#: ../src/utils.cpp:144
+#: src/utils.cpp:98
 msgid ""
 "The \"Gnote Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
 msgstr "找不到“Gnote 便笺手册”。请检查您的安装是否已成功完成。"
 
-#: ../src/utils.cpp:152
+#: src/utils.cpp:106
 msgid "Help not found"
 msgstr "帮助未找到"
 
-#: ../src/utils.cpp:185
+#: src/utils.cpp:138
 msgid "Cannot open location"
 msgstr "无法打开位置"
 
-#. TRANSLATORS: argument is time.
-#: ../src/utils.cpp:215
-msgid "Today, %1%"
+#: src/utils.cpp:155
+msgid "No Date"
+msgstr "没有日期"
+
+#. TRANSLATORS: argument %1 is time.
+#: src/utils.cpp:170
+#, fuzzy
+#| msgid "Today, %1%"
+msgid "Today, %1"
 msgstr "今天,%1%"
 
-#: ../src/utils.cpp:216
+#: src/utils.cpp:171
 msgid "Today"
 msgstr "今天"
 
-#. TRANSLATORS: argument is time.
-#: ../src/utils.cpp:222
-msgid "Yesterday, %1%"
+#. TRANSLATORS: argument %1 is time.
+#: src/utils.cpp:177
+#, fuzzy
+#| msgid "Yesterday, %1%"
+msgid "Yesterday, %1"
 msgstr "昨天,%1%"
 
-#: ../src/utils.cpp:223
+#: src/utils.cpp:178
 msgid "Yesterday"
 msgstr "昨天"
 
-#. TRANSLATORS: argument is time.
-#: ../src/utils.cpp:229
-msgid "Tomorrow, %1%"
+#. TRANSLATORS: argument %1 is time.
+#: src/utils.cpp:184
+#, fuzzy
+#| msgid "Tomorrow, %1%"
+msgid "Tomorrow, %1"
 msgstr "明天,%1%"
 
-#: ../src/utils.cpp:230
+#: src/utils.cpp:185
 msgid "Tomorrow"
 msgstr "明天"
 
 #. TRANSLATORS: date in current year.
-#: ../src/utils.cpp:234
+#: src/utils.cpp:189
 msgid "%b %d"
 msgstr "%b%d"
 
-#. TRANSLATORS: first argument is date, second is time.
-#: ../src/utils.cpp:237 ../src/utils.cpp:249
-#| msgid "In %1% day, %2%"
-#| msgid_plural "In %1% days, %2%"
-msgid "%1%, %2%"
+#. TRANSLATORS: argument %1 is date, %2 is time.
+#: src/utils.cpp:192 src/utils.cpp:201
+#, fuzzy
+#| msgid "%1%, %2%"
+msgid "%1, %2"
 msgstr "%1%, %2%"
 
-#: ../src/utils.cpp:242
-msgid "No Date"
-msgstr "没有日期"
-
 #. TRANSLATORS: date in other than current year.
-#: ../src/utils.cpp:246
-#| msgid "%A, %B %d %Y"
+#: src/utils.cpp:198
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../src/watchers.cpp:200
-msgid "(Untitled %1%)"
+#: src/utils.cpp:362 src/utils.cpp:376
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: src/utils.cpp:371
+#, fuzzy
+#| msgid "_Normal"
+msgid "_No"
+msgstr "普通(_N)"
+
+#: src/utils.cpp:372
+msgid "_Yes"
+msgstr ""
+
+#. TRANSLATORS: %1 is the placeholder for the number.
+#: src/watchers.cpp:198
+#, fuzzy
+#| msgid "(Untitled %1%)"
+msgid "(Untitled %1)"
 msgstr "(无标题 %1%)"
 
-#: ../src/watchers.cpp:231
+#. TRANSLATORS: %1 is the placeholder for the title.
+#: src/watchers.cpp:230
+#, fuzzy
+#| msgid ""
+#| "A note with the title <b>%1%</b> already exists. Please choose another "
+#| "name for this note before continuing."
 msgid ""
-"A note with the title <b>%1%</b> already exists. Please choose another name "
+"A note with the title <b>%1</b> already exists. Please choose another name "
 "for this note before continuing."
 msgstr "已经存在标题为 <b>%1%</b> 的便笺。请在继续前为此便笺选择另外的名称。"
 
-#: ../src/watchers.cpp:246
+#: src/watchers.cpp:245
 msgid "Note title taken"
 msgstr "便笺标题已被使用"
 
-#: ../src/watchers.cpp:309
+#: src/watchers.cpp:312
 msgid "Check spelling"
 msgstr "检查拼写"
 
-#: ../src/watchers.cpp:310
-#| msgid "Use tools on this note"
-msgid "Check spelling in this note"
-msgstr "在此便笺中进行拼写检查"
-
-#: ../src/watchers.cpp:674
+#: src/watchers.cpp:705
 msgid "_Copy Link Address"
 msgstr "复制链接地址(_C)"
 
-#: ../src/watchers.cpp:680
+#: src/watchers.cpp:711
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
+#~ msgid "Enable global keybindings"
+#~ msgstr "允许全局按键绑定"
+
+#~ msgid ""
+#~ "If true, the desktop-global keybindings set in /org/gnome/gnote/global-"
+#~ "keybindings will be enabled, allowing for useful Gnote actions to be "
+#~ "available from any application."
+#~ msgstr ""
+#~ "若为真,将启用 /org/gnome/gnote/global-keybindings 中设定的桌面全局按键组"
+#~ "合,以便允许在任何应用程序中执行 Gnote 操作。"
+
+#~ msgid ""
+#~ "Has affect only when started as an application. When set to TRUE, shows a "
+#~ "status icon. If set to FALSE, Search All Notes window is used as main "
+#~ "application window, closing which makes application to exit."
+#~ msgstr ""
+#~ "只在以应用程序方式启动时有效。若设为 TRUE,将显示一个状态图标。若设为 "
+#~ "FALSE,“搜索全部便笺”窗口将用作主应用程序窗口,关闭它会退出应用程序。"
+
+#~ msgid "Show applet menu"
+#~ msgstr "显示小程序菜单"
+
+#~ msgid ""
+#~ "The global keybinding for showing the Gnote applet's menu. The format "
+#~ "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
+#~ "parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
+#~ "keybinding for this action."
+#~ msgstr ""
+#~ "显示 Gnote 小程序菜单的全局按键组合。其格式类似于“&lt;Control&gt;a”或"
+#~ "者“&lt;Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩"
+#~ "写,如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符"
+#~ "串“disabled”,那么此操作将没有按键组合。"
+
+#~ msgid "Open Start Here"
+#~ msgstr "打开“从这里开始”"
+
+#~ msgid ""
+#~ "The global keybinding for opening the \"Start Here\" note. The format "
+#~ "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
+#~ "parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
+#~ "keybinding for this action."
+#~ msgstr ""
+#~ "打开“从这里开始”便笺的全局按键组合。其格式类似于“&lt;Control&gt;a”或"
+#~ "者“&lt;Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩"
+#~ "写,如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符"
+#~ "串“disabled”,那么此操作将没有按键组合。"
+
+#~ msgid "Create a new Note"
+#~ msgstr "创建新便笺"
+
+#~ msgid ""
+#~ "The global keybinding for creating and displaying a new Note. The format "
+#~ "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
+#~ "parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
+#~ "keybinding for this action."
+#~ msgstr ""
+#~ "创建并显示新便笺的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
+#~ "Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
+#~ "如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,"
+#~ "那么此操作将没有按键组合。"
+
+#~ msgid "Open Search Dialog"
+#~ msgstr "打开搜索对话框"
+
+#~ msgid ""
+#~ "The global keybinding for opening the Note Search dialog. The format "
+#~ "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
+#~ "parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
+#~ "keybinding for this action."
+#~ msgstr ""
+#~ "打开便笺搜索对话框的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
+#~ "Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
+#~ "如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,"
+#~ "那么此操作将没有按键组合。"
+
+#~ msgid "Open Recent Changes"
+#~ msgstr "打开最近的更改"
+
+#~ msgid ""
+#~ "The global keybinding for opening the Recent Changes dialog. The format "
+#~ "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
+#~ "parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
+#~ "keybinding for this action."
+#~ msgstr ""
+#~ "打开最近更改对话框的全局按键组合。其格式类似于“&lt;Control&gt;a”或者“&lt;"
+#~ "Shift&gt;&lt;Alt&gt;F1”。该分析程序的格式相当自由并允许大小写或者缩写,"
+#~ "如“&lt;Ctl&gt;”和“&lt;Ctrl&gt;”。如果将该选项设置为特殊字符串“disabled”,"
+#~ "那么此操作将没有按键组合。"
+
+#~ msgid "_Quit"
+#~ msgstr "退出(_Q)"
+
+#~ msgid "Quit Gnote"
+#~ msgstr "退出 Gnote"
+
+#~ msgid "Gnote Help"
+#~ msgstr "Gnote 帮助"
+
+#~ msgid "_About"
+#~ msgstr "关于(_A)"
+
+#~ msgid "About Gnote"
+#~ msgstr "关于 Gnote"
+
+#~ msgid "TrayIcon"
+#~ msgstr "托盘图标"
+
+#~ msgid "Create a new note"
+#~ msgstr "创建新便笺"
+
+#~ msgid "_Search All Notes"
+#~ msgstr "搜索全部便笺(_S)"
+
+#~ msgid "Open the Search All Notes window"
+#~ msgstr "打开“搜索全部便笺”窗口"
+
+#~| msgid "What links here?"
+#~ msgid "Which notes have links to here?"
+#~ msgstr "哪个便笺链接到此处?"
+
+#~ msgid "Export note as Getting Things GNOME task"
+#~ msgstr "将便笺导出为 Getting Things GNOME 任务"
+
+#~| msgid "Export to HTML"
+#~ msgid "Export note to HTML"
+#~ msgstr "将便笺导出为 HTML"
+
+#~| msgid "Insert Timestamp"
+#~ msgid "Insert Timestamp into note"
+#~ msgstr "在便笺中插入时间戳"
+
+#~| msgid "Quit Gnote"
+#~ msgid "Print note"
+#~ msgstr "打印便笺"
+
+#~ msgid "Make this note read-only"
+#~ msgstr "将便笺设置为只读"
+
+#~ msgid ""
+#~ "There was an error connecting to the server.  This may be caused by using "
+#~ "an incorrect user name and/or password."
+#~ msgstr "连接到服务器出错,可能时因为使用了错误的用户名和/或密码。"
+
+#~ msgid "Gnote is already running.  Exiting..."
+#~ msgstr "Gnote 已在运行。退出..."
+
+#~ msgid "Could not connect to remote instance."
+#~ msgstr "无法连接到远程实例。"
+
+#~ msgid "Create a new note in a notebook"
+#~ msgstr "在便笺本中创建新便笺"
+
+#~ msgid "New \"%1%\" Note"
+#~ msgstr "新建“%1%”便笺"
+
+#~ msgid "Place this note into a notebook"
+#~ msgstr "将此便笺放入一个便笺本"
+
+#~ msgid "Te_xt"
+#~ msgstr "文本(_X)"
+
+#~| msgid "Print"
+#~ msgid "Pin"
+#~ msgstr "图钉"
+
+#~ msgid "Remove from important notes"
+#~ msgstr "从重要的便笺移除"
+
+#~ msgid "Mark note as important"
+#~ msgstr "将便笺标记为重要"
+
+#~ msgid "Link"
+#~ msgstr "链接"
+
+#~ msgid "Link selected text to a new note (Ctrl-L)"
+#~ msgstr "将选中文本链接到新便笺(Ctrl-L)"
+
+#~ msgid "_Text"
+#~ msgstr "文本(_T)"
+
+#~ msgid "Delete this note"
+#~ msgstr "删除此便笺"
+
+#~ msgid "<b>_Bold</b>"
+#~ msgstr "<b>粗体(_B)</b>"
+
+#~ msgid "Hotkeys"
+#~ msgstr "热键"
+
+#~| msgid "Use Status _Icon"
+#~ msgid "Use status _icon"
+#~ msgstr "使用状态图标(_I)"
+
+#~ msgid "Show icon in tray, which is the central place of control."
+#~ msgstr "在托盘显示图标,这是控制的中心。"
+
+#~| msgid "Listen for _Hotkeys"
+#~ msgid "Listen for _hotkeys"
+#~ msgstr "监听热键(_H)"
+
+#~ msgid ""
+#~ "Hotkeys allow you to quickly access your notes from anywhere with a "
+#~ "keypress. Example Hotkeys: <b>&lt;Control&gt;&lt;Shift&gt;F11</b>, <b>&lt;"
+#~ "Alt&gt;N</b>"
+#~ msgstr ""
+#~ "热键允许随时随地访问您的便笺。热键示例:<b>&lt;Control&gt;&lt;Shift&gt;"
+#~ "F11</b>,<b>&lt;Alt&gt;N</b>"
+
+#~ msgid "Show notes _menu"
+#~ msgstr "显示便笺菜单(_M)"
+
+#~ msgid "Open \"_Start Here\""
+#~ msgstr "打开“从这里开始”(_S)"
+
+#~ msgid "Open \"Search _All Notes\""
+#~ msgstr "打开“搜索全部便笺(_A)”"
+
+#~| msgid "_New"
+#~ msgid "New"
+#~ msgstr "新建"
+
+#~ msgid "Find _Next"
+#~ msgstr "查找下一个(_N)"
+
+#~ msgid "Find _Previous"
+#~ msgstr "查找上一个(_P)"
+
+#~ msgid ""
+#~ "This synchronization addin is not supported on your computer. Please make "
+#~ "sure you have FUSE and %1% correctly installed and configured"
+#~ msgstr "您的计算机不支持此同步插件。请确保 FUSE 和 %1% 已正确安装和配置"
+
+#~| msgid "Could not save the icon file."
+#~ msgid "Could not read testfile."
+#~ msgstr "无法读取 testfile。"
+
+#~ msgid "Timeout connecting to server."
+#~ msgstr "连接服务器超时。"
+
+#~ msgid "Error connecting to server."
+#~ msgstr "连接服务器出错"
+
+#~ msgid "FUSE could not be enabled."
+#~ msgstr "FUSE 无法启用。"
+
+#~| msgid ""
+#~| "The port to use when connecting to the synchronization server via SSH."
+#~ msgid "An error ocurred while connecting to the specified server"
+#~ msgstr "连接到指定的服务器出错"
+
+#~ msgid "Could not enable FUSE"
+#~ msgstr "无法启用 FUSE"
+
+#~ msgid ""
+#~ "The FUSE module could not be loaded. Please check that it is installed "
+#~ "properly and try again."
+#~ msgstr "FUSE 模块无法加载。请检查是否已经正确安装然后重试。"
+
+#~| msgid "_Enable"
+#~ msgid "Enable FUSE?"
+#~ msgstr "启用 FUSE?"
+
+#~ msgid ""
+#~ "The synchronization you've chosen requires the FUSE module to be loaded.\n"
+#~ "\n"
+#~ "To avoid getting this prompt in the future, you should load FUSE at "
+#~ "startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
+#~ "etc/modules."
+#~ msgstr ""
+#~ "您选择的同步需要加载 FUSE 模块。\n"
+#~ "\n"
+#~ "要在未来避免显示此提示,需要在启动时加载 FUSE。向 /etc/init.d/boot.local "
+#~ "添加“modprobe fuse” 或向 /etc/modules 添加“fuse”。"
+
+#~ msgid "Take notes"
+#~ msgstr "记便笺"
+
+#~ msgid " (new)"
+#~ msgstr " (新)"
+
+#~| msgid "Use tools on this note"
+#~ msgid "Check spelling in this note"
+#~ msgstr "在此便笺中进行拼写检查"
+
 #~ msgid "Enable startup notes"
 #~ msgstr "允许启动便笺"
 
@@ -2763,15 +3160,6 @@ msgstr "打开链接(_O)"
 #~ msgid "_File"
 #~ msgstr "文件(_F)"
 
-#~ msgid "Open the selected note"
-#~ msgstr "打开选中便笺"
-
-#~ msgid "Delete the selected note"
-#~ msgstr "删除选中便笺"
-
-#~ msgid "Close this window"
-#~ msgstr "关闭此窗口"
-
 #~ msgid "_Edit"
 #~ msgstr "编辑(_E)"
 
@@ -2860,9 +3248,6 @@ msgstr "打开链接(_O)"
 #~ msgid_plural "In %1% days"
 #~ msgstr[0] "%1% 天内"
 
-#~ msgid "Run Gnote as a GNOME panel applet."
-#~ msgstr "将 Gnote 作为 GNOME 面板小程序运行。"
-
 #~ msgid "Accessories"
 #~ msgstr "附件"
 
@@ -2878,9 +3263,6 @@ msgstr "打开链接(_O)"
 #~ msgid "The handler for \"note://\" URLs"
 #~ msgstr "“note://” 类型 URL 的处理程序"
 
-#~ msgid "Editing"
-#~ msgstr "编辑"
-
 #~ msgid "C_ase Sensitive"
 #~ msgstr "区分大小写(_A)"
 


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