[gnote/stable-0.8] Update Chinese simplified translation for ui



commit cb4d28e94bb5d7173160e92348c96982d18bf2a1
Author: Wylmer Wang <wylmerwang src gnome org>
Date:   Sun Jul 22 13:39:37 2012 +0800

    Update Chinese simplified translation for ui

 po/zh_CN.po | 1118 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 601 insertions(+), 517 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5eb7266..bfd920b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,128 +7,74 @@
 # Aron Xu <aronmalache 163 com>, 2009.
 # YunQiang Su <wzssyqa gmail com>, 2010.
 # Aron Xu <aronxu gnome org>, 2010.
+# Cheng Lu <chenglu1990 gmail com>, 2012.
+# Wylmer Wang <wantinghard gmail com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnote master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gnote&component=general\n"
-"POT-Creation-Date: 2011-02-28 19:57+0000\n"
-"PO-Revision-Date: 2011-03-02 23:12+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"product=gnote&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-06-06 21:39+0000\n"
+"PO-Revision-Date: 2012-07-22 13:39+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/GNOME_GnoteApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "éä"
-
-#: ../data/GNOME_GnoteApplet.server.in.in.h:2 ../data/gnote.desktop.in.in.h:1
+#: ../data/gnote.desktop.in.in.h:1
 msgid "Gnote"
 msgstr "Gnote"
 
-#: ../data/GNOME_GnoteApplet.server.in.in.h:3
-msgid "Gnote Applet Factory"
-msgstr "Gnote åçååå"
-
-#: ../data/GNOME_GnoteApplet.server.in.in.h:4
-msgid "Simple and easy to use note-taking"
-msgstr "çåæççéæå"
-
-#: ../data/GNOME_GnoteApplet.xml.h:1 ../src/actionmanager.cpp:217
-msgid "_About"
-msgstr "åä(_A)"
-
-#: ../data/GNOME_GnoteApplet.xml.h:2 ../src/actionmanager.cpp:208
-#: ../src/tray.cpp:466
-msgid "_Help"
-msgstr "åå(_H)"
-
-#: ../data/GNOME_GnoteApplet.xml.h:3 ../src/actionmanager.cpp:205
-#: ../src/tray.cpp:461
-msgid "_Preferences"
-msgstr "ééé(_P)"
-
 #: ../data/gnote.desktop.in.in.h:2
-msgid "Note-taker"
-msgstr "èäæ"
-
-#: ../data/gnote.desktop.in.in.h:3
 msgid "Take notes, link ideas, and stay organized"
 msgstr "èåäçïæéææïäæäçæå"
 
-#: ../data/gnote.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "æå SSL èä"
-
-#: ../data/gnote.schemas.in.h:2
-msgid "Create a new Note"
-msgstr "ååæäç"
-
-#: ../data/gnote.schemas.in.h:3
-msgid "Custom Font Face"
-msgstr "èåäåä"
-
-#: ../data/gnote.schemas.in.h:4
-msgid "Determines X coordinate of Search window; stored on Gnote exit."
-msgstr "ååæççåç X åæïå Gnote éåæäåã"
-
-#: ../data/gnote.schemas.in.h:5
-msgid "Determines Y coordinate of Search window; stored on Gnote exit."
-msgstr "ååæççåç Y åæïå Gnote éåæäåã"
-
-#: ../data/gnote.schemas.in.h:6
-msgid "Determines pixel height of Search window; stored on Gnote exit."
-msgstr "ååæççåçåçéåïå Gnote éåæäåã"
-
-#: ../data/gnote.schemas.in.h:7
-msgid "Determines pixel width of Search window; stored on Gnote exit."
-msgstr "ååæççåçåçååïå Gnote éåæäåã"
+#: ../data/gnote.desktop.in.in.h:3
+msgid "Note-taker"
+msgstr "èäæ"
 
-#: ../data/gnote.schemas.in.h:8
-msgid "Enable Auto bulleted lists"
-msgstr "åèèååèæå"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:1
+msgid "Enable spellchecking"
+msgstr "åèæåææ"
 
-#: ../data/gnote.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon"
-msgstr "åèååæäååäéçè"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:2
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
+msgstr ""
+"èäçïåæéçåèåèåçèäåçïèæççæååèåæçååéååèå"
+"äã"
 
-#: ../data/gnote.schemas.in.h:10
+#: ../data/org.gnome.gnote.gschema.xml.in.h:3
 msgid "Enable WikiWord highlighting"
 msgstr "åç WikiWord éäæç"
 
-#: ../data/gnote.schemas.in.h:11
-msgid "Enable closing notes with escape"
-msgstr "åèç Esc åéäç"
-
-#: ../data/gnote.schemas.in.h:12
-msgid "Enable custom font"
-msgstr "åèèåäåä"
-
-#: ../data/gnote.schemas.in.h:13
-msgid "Enable global keybindings"
-msgstr "åèååæéçå"
-
-#: ../data/gnote.schemas.in.h:14
-msgid "Enable spellchecking"
-msgstr "åèæåææ"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:4
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr "åçæééåå WikiWord èæçèéäæçãåååèåååèåççäçã"
 
-#: ../data/gnote.schemas.in.h:15
-msgid "Enable startup notes"
-msgstr "åèååäç"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:5
+msgid "Enable Auto bulleted lists"
+msgstr "åèèååèæå"
 
-#: ../data/gnote.schemas.in.h:16
+#: ../data/org.gnome.gnote.gschema.xml.in.h:6
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr ""
 "åææåæççåæåèéèå - æ * æåææèåèæäåèïèåçæééã"
 
-#: ../data/gnote.schemas.in.h:17
+#: ../data/org.gnome.gnote.gschema.xml.in.h:7
+msgid "Enable Middle-Click Paste On Icon"
+msgstr "åèååæäååäéçè"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:8
 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."
@@ -136,288 +82,322 @@ msgstr ""
 "åææåæçéæäéåå Gnote åææååææéæçååçèåâäèéååâä"
 "çïèåçæééã"
 
-#: ../data/gnote.schemas.in.h:18
-msgid ""
-"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-"will create a note with that name."
-msgstr "åçæééåå WikiWord èæçèéäæçãåååèåååèåççäçã"
-
-#: ../data/gnote.schemas.in.h:19
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE æèèæ (ms)"
-
-#: ../data/gnote.schemas.in.h:20
-msgid "HTML Export All Linked Notes"
-msgstr "HTML ååéæçåéäç"
-
-#: ../data/gnote.schemas.in.h:21
-msgid "HTML Export Last Directory"
-msgstr "HTML ååääçå"
-
-#: ../data/gnote.schemas.in.h:22
-msgid "HTML Export Linked Notes"
-msgstr "HTML ååéæçäç"
-
-#: ../data/gnote.schemas.in.h:23
-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:9
+msgid "Enable custom font"
+msgstr "åèèåäåä"
 
-#: ../data/gnote.schemas.in.h:24
+#: ../data/org.gnome.gnote.gschema.xml.in.h:10
 msgid ""
-"If enabled, all notes that were open when Gnote quit will automatically be "
-"reopened at startup."
+"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."
 msgstr ""
-"åæåçæééïGnote éåææåçåéäçåäåäæååæèåéææåã"
+"èäçïååäç èåäåä äèåçåäåçæçäçãåååäçéèçæéå"
+"äæçäçã"
 
-#: ../data/gnote.schemas.in.h:25
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "åæåçæééïååç Esc éåéæåçäçã"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:11
+msgid "Custom Font Face"
+msgstr "èåäåä"
 
-#: ../data/gnote.schemas.in.h:26
+#: ../data/org.gnome.gnote.gschema.xml.in.h:12
 msgid ""
-"If true, misspellings will be underlined in red, and correct spelling "
-"suggestions shown in the right-click menu."
-msgstr ""
-"èäçïåæéçåèåèåçèäåçïèæççæååèåæçååéååèå"
-"äã"
+"If enable-custom-font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr "è åèèåäåä åçïåæèåçåäåçåçäæçäçæçåäã"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:13
+msgid "Enable global keybindings"
+msgstr "åèååæéçå"
 
-#: ../data/gnote.schemas.in.h:27
+#: ../data/org.gnome.gnote.gschema.xml.in.h:14
 msgid ""
-"If true, the desktop-global keybindings set in /apps/gnote/"
-"global_keybindings will be enabled, allowing for useful Gnote actions to be "
+"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 ""
-"èäçïååç /apps/gnote/global_keybindings äèåçæéååæéçåïää"
+"èäçïååç /apps/gnote/global-keybindings äèåçæéååæéçåïää"
 "åèåääåççåäæè Gnote æäã"
 
-#: ../data/gnote.schemas.in.h:28
+#: ../data/org.gnome.gnote.gschema.xml.in.h:15
+msgid "Start Here Note"
+msgstr "âäèéååâäç"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:16
 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."
+"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 "
+"accessible by hotkey."
 msgstr ""
-"èäçïååäç custom_font_face äèåçåäåçæçäçãåååäçéèç"
-"æéåäæçäçã"
+"åèèäâäèéååâäçç URIïååææçå Gnote èåçåçïåäåäçåæ"
+"éèéã"
 
-#: ../data/gnote.schemas.in.h:29
+#: ../data/org.gnome.gnote.gschema.xml.in.h:17
+msgid "Minimum number of notes to show in menu"
+msgstr "èåäèæççæåäçæ"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:18
 msgid ""
 "Integer determining the minimum number of notes to show in the Gnote note "
 "menu."
 msgstr "ææåïååå Gnote èåäæççæåäçæã"
 
-#: ../data/gnote.schemas.in.h:30
+#: ../data/org.gnome.gnote.gschema.xml.in.h:19
+msgid "List of pinned notes"
+msgstr "åéäçåè"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:20
 msgid ""
-"Integer value indicating if there is a preference to always perform a "
-"specific behavior when a conflict is detected, instead of prompting the "
-"user. The values map to an internal enumeration. 0 indicates that the user "
-"wishes to be prompted when a conflict occurs, so that they may handle each "
-"conflict situation on a case-by-case basis."
-msgstr ""
-"ææåïäèææååçææåæææèçåçèäïèäææççæãæååäæå"
-"ååéæäéäã0 äèçæåæåçåçæååæçïääåäéäåçèäåçã"
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Gnote note menu."
+msgstr "ææåçå Gnote èåäç URI åèïäçæååã"
 
-#: ../data/gnote.schemas.in.h:31
+#: ../data/org.gnome.gnote.gschema.xml.in.h:21
+msgid "Enable startup notes"
+msgstr "åèååäç"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:22
 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 "
-"the user. The values map to an internal enumeration. 0 indicates that the "
-"user wishes to be prompted when renaming a note may impact links that exist "
-"in other notes. 1 indicates that links should automatically be removed. 2 "
-"indicates that link text should be updated to the new note name so that it "
-"will continue linking to the renamed note."
+"If enabled, all notes that were open when Gnote quit will automatically be "
+"reopened at startup."
 msgstr ""
-"ææåïäèéååäçææåæææèæåçéæææåäïèäææççæãæå"
-"åäæåååéæäéäã0 äèçæåæååèåååååäçäååçéææåå"
-"æçã1 äèèååééæã2 äèåéæææåæäçåçææïääåäççéæ"
-"åéåååçäçã"
+"åæåçæééïGnote éåææåçåéäçåäåäæååæèåéææåã"
 
-#: ../data/gnote.schemas.in.h:32
-msgid "Link Updating Behavior on Note Rename"
-msgstr "éååäçæææéæçèä"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:23
+msgid "Saved height of Search window"
+msgstr "äåçæççåéå"
 
-#: ../data/gnote.schemas.in.h:33
-msgid "List of pinned notes"
-msgstr "åéäçåè"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:24
+msgid "Determines pixel height of Search window; stored on Gnote exit."
+msgstr "ååæççåçåçéåïå Gnote éåæäåã"
 
-#: ../data/gnote.schemas.in.h:34
-msgid "Minimum number of notes to show in menu"
-msgstr "èåäèæççæåäçæ"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:25
+msgid "Saved width of Search window"
+msgstr "äåçæççååå"
 
-#: ../data/gnote.schemas.in.h:35
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "äçåæåçäåèä"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:26
+msgid "Determines pixel width of Search window; stored on Gnote exit."
+msgstr "ååæççåçåçååïå Gnote éåæäåã"
 
-#: ../data/gnote.schemas.in.h:36
-msgid "Open Recent Changes"
-msgstr "æåæèçææ"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:27
+msgid "Saved horizontal position of Search window"
+msgstr "äåçæççåæåäç"
 
-#: ../data/gnote.schemas.in.h:37
-msgid "Open Search Dialog"
-msgstr "æåæçåèæ"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:28
+msgid "Determines X coordinate of Search window; stored on Gnote exit."
+msgstr "ååæççåç X åæïå Gnote éåæäåã"
 
-#: ../data/gnote.schemas.in.h:38
-msgid "Open Start Here"
-msgstr "æåâäèéååâ"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:29
+msgid "Saved vertical position of Search window"
+msgstr "äåçæççååçäç"
 
-#: ../data/gnote.schemas.in.h:39
-msgid "Path on SSH server to Gnote synchronization directory (optional)."
-msgstr "SSH æååå Gnote åæçåçèå(åé)ã"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:30
+msgid "Determines Y coordinate of Search window; stored on Gnote exit."
+msgstr "ååæççåç Y åæïå Gnote éåæäåã"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:31
+msgid "Saved splitter position of Search window splitter."
+msgstr "äåçæççååçäç"
 
-#: ../data/gnote.schemas.in.h:40
+#: ../data/org.gnome.gnote.gschema.xml.in.h:32
 msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr "äçæäççåææåæäæçåææååèåã"
+"Determines Search window splitter position in pixels; stored on Gnote exit."
+msgstr "ååæççåçåçååïå Gnote éåæäåã"
 
-#: ../data/gnote.schemas.in.h:41
+#: ../data/org.gnome.gnote.gschema.xml.in.h:33
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "FUSE æèèæ (ms)"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:34
+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:35
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS èçåææäå"
 
-#: ../data/gnote.schemas.in.h:42
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "SSHFS èçåæçæå"
-
-#: ../data/gnote.schemas.in.h:43
-msgid "SSHFS Synchronization Server Port"
-msgstr "SSHFS åææååçå"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:36
+msgid "Path on SSH server to Gnote synchronization directory (optional)."
+msgstr "SSH æååå Gnote åæçåçèå(åé)ã"
 
-#: ../data/gnote.schemas.in.h:44
+#: ../data/org.gnome.gnote.gschema.xml.in.h:37
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS åææåå URL"
 
-#: ../data/gnote.schemas.in.h:45
-msgid "Saved height of Search window"
-msgstr "äåçæççåéå"
-
-#: ../data/gnote.schemas.in.h:46
-msgid "Saved horizontal position of Search window"
-msgstr "äåçæççåæåäç"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:38
+msgid "URL of SSH server containing Gnote synchronization directory."
+msgstr "åå Gnote åæçåç SSH æåå URLã"
 
-#: ../data/gnote.schemas.in.h:47
-msgid "Saved vertical position of Search window"
-msgstr "äåçæççååçäç"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:39
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "SSHFS èçåæçæå"
 
-#: ../data/gnote.schemas.in.h:48
-msgid "Saved width of Search window"
-msgstr "äåçæççååå"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:40
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr "éè SSH èæåææååæäçççæåã"
 
-#: ../data/gnote.schemas.in.h:49
-msgid "Selected Synchronization Service Addin"
-msgstr "æéçåææåæä"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:41
+msgid "SSHFS Synchronization Server Port"
+msgstr "SSHFS åææååçå"
 
-#: ../data/gnote.schemas.in.h:50
-msgid "Set to TRUE to activate"
-msgstr "èä TRUE åææ"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:42
+msgid "The port to use when connecting to the synchronization server via SSH."
+msgstr "éè SSH èæåææååæäçççåã"
 
-#: ../data/gnote.schemas.in.h:51
-msgid "Show applet menu"
-msgstr "æçåçåèå"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:43
+msgid "Link Updating Behavior on Note Rename"
+msgstr "éååäçæææéæçèä"
 
-#: ../data/gnote.schemas.in.h:52
-msgid "Start Here Note"
-msgstr "âäèéååâäç"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:44
+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 "
+"the user. The values map to an internal enumeration. 0 indicates that the "
+"user wishes to be prompted when renaming a note may impact links that exist "
+"in other notes. 1 indicates that links should automatically be removed. 2 "
+"indicates that link text should be updated to the new note name so that it "
+"will continue linking to the renamed note."
+msgstr ""
+"ææåïäèéååäçææåæææèæåçéæææåäïèäææççæãæå"
+"åäæåååéæäéäã0 äèçæåæååèåååååäçäååçéææåå"
+"æçã1 äèèååééæã2 äèåéæææåæäçåçææïääåäççéæ"
+"åéåååçäçã"
 
-#: ../data/gnote.schemas.in.h:53
-msgid "Synchronization Client ID"
-msgstr "åæåæç ID"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:45
+msgid "Enable closing notes with escape"
+msgstr "åèç Esc åéäç"
 
-#: ../data/gnote.schemas.in.h:54
-msgid "Synchronization Local Server Path"
-msgstr "æååææååèå"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:46
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr "åæåçæééïååç Esc éåéæåçäçã"
 
-#: ../data/gnote.schemas.in.h:55
-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:47
+msgid "Use status icon, when started as an application"
+msgstr "åäåççåæåååæïäççæåæ"
 
-#: ../data/gnote.schemas.in.h:56
+#: ../data/org.gnome.gnote.gschema.xml.in.h:48
 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."
+"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 ""
-"åååæçæäççååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
-"Shift&gt;&lt;Alt&gt;F1âãèåæçåçæåçåèçååèåååæèçåï"
-"åâ&lt;Ctl&gt;âåâ&lt;Ctrl&gt;âãåæåèééèçäçæåçäâdisabledâïéä"
-"ææäåæææéçåã"
+"äåäåççåæåååæææãèèçä TRUEïåæçääçæåæïèèçä "
+"FALSE ïæçææäç çååäääçåçåïåéåääåççåéåã"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:49
+msgid "Show applet menu"
+msgstr "æçåçåèå"
 
-#: ../data/gnote.schemas.in.h:57
+#: ../data/org.gnome.gnote.gschema.xml.in.h:50
 msgid ""
-"The global keybinding for opening the \"Start Here\" note. The format looks "
+"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 ""
-"æåâäèéååâäççååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
+"æç Gnote åçåèåçååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
 "Shift&gt;&lt;Alt&gt;F1âãèåæçåçæåçåèçååèåååæèçåï"
 "åâ&lt;Ctl&gt;âåâ&lt;Ctrl&gt;âãåæåèééèçäçæåçäâdisabledâïéä"
 "ææäåæææéçåã"
 
-#: ../data/gnote.schemas.in.h:58
+#: ../data/org.gnome.gnote.gschema.xml.in.h:51
+msgid "Open Start Here"
+msgstr "æåâäèéååâ"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:52
 msgid ""
-"The global keybinding for opening the Note Search dialog. The format looks "
+"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;"
+"æåâäèéååâäççååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
 "Shift&gt;&lt;Alt&gt;F1âãèåæçåçæåçåèçååèåååæèçåï"
 "åâ&lt;Ctl&gt;âåâ&lt;Ctrl&gt;âãåæåèééèçäçæåçäâdisabledâïéä"
 "ææäåæææéçåã"
 
-#: ../data/gnote.schemas.in.h:59
+#: ../data/org.gnome.gnote.gschema.xml.in.h:53
+msgid "Create a new Note"
+msgstr "ååæäç"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:54
 msgid ""
-"The global keybinding for opening the Recent Changes dialog. The format "
+"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;"
+"åååæçæäççååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
 "Shift&gt;&lt;Alt&gt;F1âãèåæçåçæåçåèçååèåååæèçåï"
 "åâ&lt;Ctl&gt;âåâ&lt;Ctrl&gt;âãåæåèééèçäçæåçäâdisabledâïéä"
 "ææäåæææéçåã"
 
-#: ../data/gnote.schemas.in.h:60
+#: ../data/org.gnome.gnote.gschema.xml.in.h:55
+msgid "Open Search Dialog"
+msgstr "æåæçåèæ"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:56
 msgid ""
-"The global keybinding for showing the Gnote applet's menu. The format looks "
+"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 ""
-"æç Gnote åçåèåçååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
+"æåäçæçåèæçååæéçåãåæåçääâ&lt;Control&gt;aâæèâ&lt;"
 "Shift&gt;&lt;Alt&gt;F1âãèåæçåçæåçåèçååèåååæèçåï"
 "åâ&lt;Ctl&gt;âåâ&lt;Ctrl&gt;âãåæåèééèçäçæåçäâdisabledâïéä"
 "ææäåæææéçåã"
 
-#: ../data/gnote.schemas.in.h:61
-msgid "The handler for \"note://\" URLs"
-msgstr "ânote://â çå URL çåççå"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:57
+msgid "Open Recent Changes"
+msgstr "æåæèçææ"
 
-#: ../data/gnote.schemas.in.h:62
+#: ../data/org.gnome.gnote.gschema.xml.in.h:58
+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âïéä"
+"ææäåæææéçåã"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:59
+msgid "HTML Export Last Directory"
+msgstr "HTML ååääçå"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:60
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr "äçååè HTML æäååäçæäæäçççåã"
 
-#: ../data/gnote.schemas.in.h:63
+#: ../data/org.gnome.gnote.gschema.xml.in.h:61
+msgid "HTML Export Linked Notes"
+msgstr "HTML ååéæçäç"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:62
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr "ååå HTML æääâååéæçäçâåéæäæçéäçæã"
 
-#: ../data/gnote.schemas.in.h:64
+#: ../data/org.gnome.gnote.gschema.xml.in.h:63
+msgid "HTML Export All Linked Notes"
+msgstr "HTML ååéæçåéäç"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:64
 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 "
@@ -427,60 +407,70 @@ msgstr ""
 "ååè HTML æääâååéæçåéäçâçäæèçãæèçåäâHTML ååéæç"
 "äçâèççåäçïçäæååååè HTML ææååéåååææåçåéäçã"
 
-#: ../data/gnote.schemas.in.h:65
+#: ../data/org.gnome.gnote.gschema.xml.in.h:65
+msgid "Synchronization Client ID"
+msgstr "åæåæç ID"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:66
 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 "
-"accessible by hotkey."
-msgstr ""
-"åèèäâäèéååâäçç URIïååææçå Gnote èåçåçïåäåäçåæ"
-"éèéã"
+"Unique identifier for this Gnote client, used when communicating with a "
+"sychronization server."
+msgstr "æ Gnote åæççåäæèçïçääåææååéèã"
 
-#: ../data/gnote.schemas.in.h:66
-msgid "The port to use when connecting to the synchronization server via SSH."
-msgstr "éè SSH èæåææååæäçççåã"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:67
+msgid "Synchronization Local Server Path"
+msgstr "æååææååèå"
 
-#: ../data/gnote.schemas.in.h:67
+#: ../data/org.gnome.gnote.gschema.xml.in.h:68
 msgid ""
-"Time (in milliseconds) Gnote should wait for a response when using FUSE to "
-"mount a sync share."
-msgstr "æé (æç) åäç FUSE ææèääåæåäæïGnote éèçåääååã"
-
-#: ../data/gnote.schemas.in.h:68
-msgid "Timestamp format"
-msgstr "æéææå"
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr "äçæäççåææåæäæçåææååèåã"
 
-#: ../data/gnote.schemas.in.h:69
-msgid "URL of SSH server containing Gnote synchronization directory."
-msgstr "åå Gnote åæçåç SSH æåå URLã"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:69
+msgid "Selected Synchronization Service Addin"
+msgstr "æéçåææåæä"
 
-#: ../data/gnote.schemas.in.h:70
+#: ../data/org.gnome.gnote.gschema.xml.in.h:70
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr "çååéççäçåææåæäçåäæèçã"
 
-#: ../data/gnote.schemas.in.h:71
+#: ../data/org.gnome.gnote.gschema.xml.in.h:71
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "äçåæåçäåèä"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:72
 msgid ""
-"Unique identifier for this Gnote client, used when communicating with a "
-"sychronization server."
-msgstr "æ Gnote åæççåäæèçïçääåææååéèã"
+"Integer value indicating if there is a preference to always perform a "
+"specific behavior when a conflict is detected, instead of prompting the "
+"user. The values map to an internal enumeration. 0 indicates that the user "
+"wishes to be prompted when a conflict occurs, so that they may handle each "
+"conflict situation on a case-by-case basis."
+msgstr ""
+"ææåïäèææååçææåæææèçåçèäïèäææççæãæååäæå"
+"ååéæäéäã0 äèçæåæåçåçæååæçïääåäéäåçèäåçã"
+
+#: ../data/org.gnome.gnote.gschema.xml.in.h:73
+msgid "Accept SSL Certificates"
+msgstr "æå SSL èä"
 
-#: ../data/gnote.schemas.in.h:72
+#: ../data/org.gnome.gnote.gschema.xml.in.h:74
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr "äç wdfs ééâ-acâèçææå SSL èäæäåçæçäæã"
 
-#: ../data/gnote.schemas.in.h:73
-msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr "éè SSH èæåææååæäçççæåã"
+#: ../data/org.gnome.gnote.gschema.xml.in.h:75
+msgid "Timestamp format"
+msgstr "æéææå"
 
-#: ../data/gnote.schemas.in.h:74
+#: ../data/org.gnome.gnote.gschema.xml.in.h:76
 msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Gnote note menu."
-msgstr "ææåçå Gnote èåäç URI åèïäçæååã"
+"The date format that is used for the timestamp. It follows the format of "
+"strftime(3)."
+msgstr "çäæéæçæææåãæåä strftime(3) çåã"
 
 #: ../src/sharp/addinstreemodel.cpp:93
 msgid "Name"
@@ -510,114 +500,128 @@ msgstr "åå"
 msgid "Unknown"
 msgstr "æç"
 
-#: ../src/actionmanager.cpp:170
+#: ../src/actionmanager.cpp:174
 msgid "_File"
 msgstr "æä(_F)"
 
-#: ../src/actionmanager.cpp:174
+#: ../src/actionmanager.cpp:178
 msgid "_New"
 msgstr "æå(_N)"
 
-#: ../src/actionmanager.cpp:175 ../src/actionmanager.cpp:226
+#: ../src/actionmanager.cpp:179 ../src/actionmanager.cpp:230
 msgid "Create a new note"
 msgstr "ååæäç"
 
-#: ../src/actionmanager.cpp:180
+#: ../src/actionmanager.cpp:184
 msgid "_Open..."
 msgstr "æå(_O)..."
 
-#: ../src/actionmanager.cpp:180
+#: ../src/actionmanager.cpp:184
 msgid "Open the selected note"
 msgstr "æåéääç"
 
-#: ../src/actionmanager.cpp:186
+#: ../src/actionmanager.cpp:190
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/actionmanager.cpp:186
+#: ../src/actionmanager.cpp:190
 msgid "Delete the selected note"
 msgstr "åééääç"
 
-#: ../src/actionmanager.cpp:192 ../src/notewindow.cpp:361
+#: ../src/actionmanager.cpp:196 ../src/notewindow.cpp:377
 msgid "_Close"
 msgstr "åé(_C)"
 
-#: ../src/actionmanager.cpp:192
+#: ../src/actionmanager.cpp:196
 msgid "Close this window"
 msgstr "åéæçå"
 
-#: ../src/actionmanager.cpp:197 ../src/tray.cpp:478
+#: ../src/actionmanager.cpp:201 ../src/tray.cpp:477
 msgid "_Quit"
 msgstr "éå(_Q)"
 
-#: ../src/actionmanager.cpp:197
+#: ../src/actionmanager.cpp:201
 msgid "Quit Gnote"
 msgstr "éå Gnote"
 
-#: ../src/actionmanager.cpp:200
+#: ../src/actionmanager.cpp:204
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/actionmanager.cpp:205 ../src/preferencesdialog.cpp:89
+#: ../src/actionmanager.cpp:209 ../src/applet.cpp:383 ../src/tray.cpp:460
+msgid "_Preferences"
+msgstr "ééé(_P)"
+
+#: ../src/actionmanager.cpp:209 ../src/preferencesdialog.cpp:88
 msgid "Gnote Preferences"
 msgstr "Gnote ééé"
 
-#: ../src/actionmanager.cpp:212
+#: ../src/actionmanager.cpp:212 ../src/applet.cpp:384 ../src/tray.cpp:465
+msgid "_Help"
+msgstr "åå(_H)"
+
+#: ../src/actionmanager.cpp:216
 msgid "_Contents"
 msgstr "çå(_C)"
 
-#: ../src/actionmanager.cpp:212
+#: ../src/actionmanager.cpp:216
 msgid "Gnote Help"
 msgstr "Gnote åå"
 
-#: ../src/actionmanager.cpp:217
+#: ../src/actionmanager.cpp:221 ../src/applet.cpp:385
+msgid "_About"
+msgstr "åä(_A)"
+
+#: ../src/actionmanager.cpp:221
 msgid "About Gnote"
 msgstr "åä Gnote"
 
-#: ../src/actionmanager.cpp:221
+#: ../src/actionmanager.cpp:225
 msgid "TrayIcon"
 msgstr "æçåæ"
 
-#: ../src/actionmanager.cpp:226
+#: ../src/actionmanager.cpp:230
 msgid "Create _New Note"
 msgstr "ååæäç(_N)"
 
-#: ../src/actionmanager.cpp:231 ../src/notewindow.cpp:313
+#: ../src/actionmanager.cpp:235 ../src/notewindow.cpp:329
 msgid "_Search All Notes"
 msgstr "æçåéäç(_S)"
 
-#: ../src/actionmanager.cpp:231
+#: ../src/actionmanager.cpp:235
 msgid "Open the Search All Notes window"
 msgstr "æåæçåéäççå"
 
-#: ../src/actionmanager.cpp:236
+#: ../src/actionmanager.cpp:240
 msgid "S_ynchronize Notes"
 msgstr "åæäç(_Y)"
 
-#: ../src/actionmanager.cpp:236
+#: ../src/actionmanager.cpp:240
 msgid "Start synchronizing notes"
 msgstr "åååæäç"
 
-#: ../src/gnote.cpp:278
+#: ../src/gnote.cpp:374
 msgid "Cannot create new note"
 msgstr "ææååæäç"
 
-#: ../src/gnote.cpp:327
+#: ../src/gnote.cpp:427
 msgid "and Tomboy original authors."
 msgstr "äå Tomboy åäèã"
 
-#: ../src/gnote.cpp:336
+#: ../src/gnote.cpp:436
 msgid "translator-credits"
 msgstr ""
-"Funda Wang <fundawang gmail com>, 2005-2008ã\n"
-"Ray Wang <wanglei1123 gmail com>, 2009ã\n"
-"Aron Xu <aronmalache 163 com>, 2009ã\n"
-"YunQiang Su <wzssyqa gmail com>, 2010ã"
-
-#: ../src/gnote.cpp:344
+"Funda Wang <fundawang gmail com>, 2005-2008.\n"
+"Ray Wang <wanglei1123 gmail com>, 2009.\n"
+"Aron Xu <aronmalache 163 com>, 2009.\n"
+"YunQiang Su <wzssyqa gmail com>, 2010.\n"
+"Cheng Lu <chenglu1990 gmail com>, 2012.\n"
+"Wylmer Wang <wantinghard gmail com>, 2012."
+
+#: ../src/gnote.cpp:445
 msgid ""
-"Copyright  2010-2011 Aurimas Cernius\n"
-"Copyright  2009-2010 Debarshi Ray\n"
+"Copyright  2010-2012 Aurimas Cernius\n"
+"Copyright  2009-2011 Debarshi Ray\n"
 "Copyright  2009 Hubert Figuiere\n"
 "Copyright  2004-2009 the Tomboy original authors."
 msgstr ""
@@ -626,102 +630,111 @@ msgstr ""
 "çæææ Â 2009 Hubert Figuiere\n"
 "çæææ Â 2004-2009 Tomboy åäèã"
 
-#: ../src/gnote.cpp:348
+#: ../src/gnote.cpp:449
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "çåæççæééæååççåã"
 
-#: ../src/gnote.cpp:359
+#: ../src/gnote.cpp:460
 msgid "Homepage"
 msgstr "äé"
 
-#: ../src/gnote.cpp:429
+#: ../src/gnote.cpp:552
 msgid "Run Gnote as a GNOME panel applet."
 msgstr "å Gnote ää GNOME éæåçåèèã"
 
-#: ../src/gnote.cpp:430
+#: ../src/gnote.cpp:553
+msgid "Run Gnote in background."
+msgstr "åååèè Gnoteã"
+
+#: ../src/gnote.cpp:554
 msgid "Specify the path of the directory containing the notes."
 msgstr "çåååäçççåèåã"
 
-#: ../src/gnote.cpp:430
+#: ../src/gnote.cpp:554
 msgid "path"
 msgstr "èå"
 
-#: ../src/gnote.cpp:431
+#: ../src/gnote.cpp:555
 msgid "Open the search all notes window with the search text."
 msgstr "æåæçåéäççåã"
 
-#: ../src/gnote.cpp:431 ../src/gnote.cpp:436 ../src/gnote.cpp:437
+#: ../src/gnote.cpp:555 ../src/gnote.cpp:560
 msgid "text"
 msgstr "ææ"
 
-#: ../src/gnote.cpp:432
+#: ../src/gnote.cpp:556
 msgid "Print version information."
 msgstr "æççæäæã"
 
-#: ../src/gnote.cpp:434
+#: ../src/gnote.cpp:557
 msgid "Create and display a new note, with a optional title."
 msgstr "åååæçääåæåéæéçæäçã"
 
-#: ../src/gnote.cpp:434
+#: ../src/gnote.cpp:557
 msgid "title"
 msgstr "æé"
 
-#: ../src/gnote.cpp:435
+#: ../src/gnote.cpp:558
 msgid "Display the existing note matching title."
 msgstr "æçåéæéççæäçã"
 
-#: ../src/gnote.cpp:435
+#: ../src/gnote.cpp:558
 msgid "title/url"
 msgstr "æé/url"
 
-#: ../src/gnote.cpp:436
+#: ../src/gnote.cpp:559
 msgid "Display the 'Start Here' note."
 msgstr "æçâäèéååâäçã"
 
-#: ../src/gnote.cpp:437
+#: ../src/gnote.cpp:560
 msgid "Search and highlight text in the opened note."
 msgstr "åååçäçäæçææ(éäæç)ã"
 
-#: ../src/gnote.cpp:442
+#: ../src/gnote.cpp:564
 msgid "A note taking application"
 msgstr "äääççå"
 
-#: ../src/gnote.cpp:442
+#: ../src/gnote.cpp:564
 msgid "Gnote options at launch"
 msgstr "Gnote ååéé"
 
-#: ../src/gnote.cpp:630
+#: ../src/gnote.cpp:757
 msgid "Version %1%"
 msgstr "çæ %1%"
 
-#: ../src/preferencesdialog.cpp:107
-msgid "Editing"
-msgstr "çè"
+#: ../src/preferencesdialog.cpp:106
+msgid "General"
+msgstr "åè"
 
-#: ../src/preferencesdialog.cpp:109
+#: ../src/preferencesdialog.cpp:108
 msgid "Hotkeys"
 msgstr "çé"
 
-#: ../src/preferencesdialog.cpp:114
+#: ../src/preferencesdialog.cpp:113
 msgid "Add-ins"
 msgstr "éåçä"
 
-#: ../src/preferencesdialog.cpp:222
+#. Status icon
+#: ../src/preferencesdialog.cpp:215
+msgid "Use Status _Icon"
+msgstr "äççæåæ(_I)"
+
+#: ../src/preferencesdialog.cpp:228
 msgid "_Spell check while typing"
 msgstr "èåææææå(_S)"
 
-#: ../src/preferencesdialog.cpp:228
+#: ../src/preferencesdialog.cpp:234
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr "æéçåèåäçèæçïèçææåéèçåèåæçååéèåäã"
 
 #. WikiWords...
-#: ../src/preferencesdialog.cpp:239
+#: ../src/preferencesdialog.cpp:245
 msgid "Highlight _WikiWords"
 msgstr "åä _WikiWords"
 
-#: ../src/preferencesdialog.cpp:245
+#: ../src/preferencesdialog.cpp:251
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -729,52 +742,52 @@ msgstr ""
 "åçæééååäçä <b>WikiWords</b> çåèãååæåèåäèåçååäçã"
 
 #. Auto bulleted list
-#: ../src/preferencesdialog.cpp:252
+#: ../src/preferencesdialog.cpp:258
 msgid "Enable auto-_bulleted lists"
 msgstr "åèååèèåçå(_B)"
 
-#: ../src/preferencesdialog.cpp:261
+#: ../src/preferencesdialog.cpp:267
 msgid "Use custom _font"
 msgstr "äçèåäåä(_F)"
 
-#: ../src/preferencesdialog.cpp:278
+#: ../src/preferencesdialog.cpp:284
 msgid "When renaming a linked note: "
 msgstr "éååæéæçäçæï"
 
-#: ../src/preferencesdialog.cpp:283
+#: ../src/preferencesdialog.cpp:289
 msgid "Ask me what to do"
 msgstr "èéææäå"
 
-#: ../src/preferencesdialog.cpp:284
+#: ../src/preferencesdialog.cpp:290
 msgid "Never rename links"
 msgstr "äéååéæ"
 
-#: ../src/preferencesdialog.cpp:285
+#: ../src/preferencesdialog.cpp:291
 msgid "Always rename links"
 msgstr "ææéååéæ"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../src/preferencesdialog.cpp:307 ../src/notemanager.cpp:110
+#: ../src/preferencesdialog.cpp:310 ../src/notemanager.cpp:112
 msgid "New Note Template"
 msgstr "æåäçææ"
 
-#: ../src/preferencesdialog.cpp:310
+#: ../src/preferencesdialog.cpp:313
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "ååæçäçæäçæçäçæææèååäççæåã"
 
-#: ../src/preferencesdialog.cpp:318
+#: ../src/preferencesdialog.cpp:321
 msgid "Open New Note Template"
 msgstr "æåæçäçææ"
 
 #. Hotkeys...
-#: ../src/preferencesdialog.cpp:376
+#: ../src/preferencesdialog.cpp:383
 msgid "Listen for _Hotkeys"
 msgstr "çåçé(_H)"
 
-#: ../src/preferencesdialog.cpp:383
+#: ../src/preferencesdialog.cpp:390
 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;"
@@ -784,77 +797,77 @@ msgstr ""
 "b>ï<b>&lt;Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../src/preferencesdialog.cpp:403
+#: ../src/preferencesdialog.cpp:410
 msgid "Show notes _menu"
 msgstr "æçäçèå(_M)"
 
 #. Open Start Here keybinding...
-#: ../src/preferencesdialog.cpp:419
+#: ../src/preferencesdialog.cpp:427
 msgid "Open \"_Start Here\""
 msgstr "æåâäèéååâ(_S)"
 
 #. Create new note keybinding...
-#: ../src/preferencesdialog.cpp:434
+#: ../src/preferencesdialog.cpp:443
 msgid "Create _new note"
 msgstr "ååæäç(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../src/preferencesdialog.cpp:449
+#: ../src/preferencesdialog.cpp:459
 msgid "Open \"Search _All Notes\""
 msgstr "æåâæçåéäçâ(_A)"
 
-#: ../src/preferencesdialog.cpp:475
+#: ../src/preferencesdialog.cpp:486
 msgid "Ser_vice:"
 msgstr "æå(_V)ï"
 
-#: ../src/preferencesdialog.cpp:532
+#: ../src/preferencesdialog.cpp:543
 msgid "Not configurable"
 msgstr "äåéç"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../src/preferencesdialog.cpp:552
+#: ../src/preferencesdialog.cpp:563
 msgid "_Advanced..."
 msgstr "éç(_A)..."
 
-#: ../src/preferencesdialog.cpp:599
+#: ../src/preferencesdialog.cpp:610
 msgid "The following add-ins 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:630
+#: ../src/preferencesdialog.cpp:641
 msgid "_Enable"
 msgstr "åç(_E)"
 
-#: ../src/preferencesdialog.cpp:636
+#: ../src/preferencesdialog.cpp:647
 msgid "_Disable"
 msgstr "çç(_D)"
 
-#: ../src/preferencesdialog.cpp:767
+#: ../src/preferencesdialog.cpp:778
 msgid "Not Implemented"
 msgstr "åæåç"
 
-#: ../src/preferencesdialog.cpp:781
+#: ../src/preferencesdialog.cpp:792
 msgid "%1% Preferences"
 msgstr "%1% ééé"
 
-#: ../src/preferencesdialog.cpp:922
+#: ../src/preferencesdialog.cpp:933
 msgid "Choose Note Font"
 msgstr "éæäçåä"
 
-#: ../src/preferencesdialog.cpp:1049
+#: ../src/preferencesdialog.cpp:1055
 msgid "Version:"
 msgstr "çæï"
 
-#: ../src/preferencesdialog.cpp:1054
+#: ../src/preferencesdialog.cpp:1060
 msgid "Author:"
 msgstr "äèï"
 
-#: ../src/preferencesdialog.cpp:1060
+#: ../src/preferencesdialog.cpp:1066
 msgid "Copyright:"
 msgstr "çæææï"
 
-#: ../src/notemanager.cpp:252
+#: ../src/notemanager.cpp:249
 msgid ""
 "<note-content xmlns:link=\"http://beatniksoftware.com/tomboy/link\";>Start "
 "Here\n"
@@ -891,7 +904,7 @@ msgstr ""
 "çãææååçææåïæäææèå<link:internal>å Gnote ääçéæ</link:"
 "internal>çæåïéäèååäåçïååéæååæåèäçã</note-content>"
 
-#: ../src/notemanager.cpp:271
+#: ../src/notemanager.cpp:268
 msgid ""
 "<note-content>Using Links in Gnote\n"
 "\n"
@@ -919,55 +932,55 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../src/notemanager.cpp:286 ../src/notemanager.cpp:338
+#: ../src/notemanager.cpp:283 ../src/notemanager.cpp:336
 msgid "Start Here"
 msgstr "äèéåå"
 
-#: ../src/notemanager.cpp:291
+#: ../src/notemanager.cpp:289
 msgid "Using Links in Gnote"
 msgstr "å Gnote ääçéæ"
 
-#: ../src/notemanager.cpp:555
+#: ../src/notemanager.cpp:555 ../src/notebooks/notebook.cpp:167
 msgid "New Note"
 msgstr "æåäç"
 
-#: ../src/notemanager.cpp:683
+#: ../src/notemanager.cpp:666
 msgid "Describe your new note here."
 msgstr "åææèæçæäçã"
 
-#: ../src/noterenamedialog.cpp:151
+#: ../src/noterenamedialog.cpp:121
 msgid "Rename Note Links?"
 msgstr "éååäçéæåï"
 
-#: ../src/noterenamedialog.cpp:156
+#: ../src/noterenamedialog.cpp:125
 msgid "_Don't Rename Links"
 msgstr "äéååéæ(_D)"
 
-#: ../src/noterenamedialog.cpp:157
+#: ../src/noterenamedialog.cpp:126
 msgid "_Rename Links"
 msgstr "éååéæ(_R)"
 
-#: ../src/noterenamedialog.cpp:158
+#: ../src/noterenamedialog.cpp:127
 msgid "Select All"
 msgstr "åé"
 
-#: ../src/noterenamedialog.cpp:159
+#: ../src/noterenamedialog.cpp:128
 msgid "Select None"
 msgstr "åéäé"
 
-#: ../src/noterenamedialog.cpp:160
+#: ../src/noterenamedialog.cpp:129
 msgid "Always show this _window"
 msgstr "æææçæçå(_W)"
 
-#: ../src/noterenamedialog.cpp:161
+#: ../src/noterenamedialog.cpp:130
 msgid "Alwa_ys rename links"
 msgstr "ææéååéæ(_Y)"
 
-#: ../src/noterenamedialog.cpp:163
+#: ../src/noterenamedialog.cpp:132
 msgid "Never rename _links"
 msgstr "åäéååéæ(_L)"
 
-#: ../src/noterenamedialog.cpp:182
+#: ../src/noterenamedialog.cpp:151
 msgid ""
 "Rename links in other notes from \"<span underline=\"single\">%1</span>\" to"
 "\"<span underline=\"single\">%2</span>\"?\n"
@@ -979,158 +992,182 @@ msgstr ""
 "\n"
 "åæäæéååèäéæïåäåæåæéã"
 
-#: ../src/noterenamedialog.cpp:215
+#: ../src/noterenamedialog.cpp:184
 msgid "Rename Links"
 msgstr "éååéæ"
 
-#: ../src/noterenamedialog.cpp:230
+#: ../src/noterenamedialog.cpp:199
 msgid "Note Title"
 msgstr "äçæé"
 
-#: ../src/noterenamedialog.cpp:266
+#: ../src/noterenamedialog.cpp:235
 msgid "Ad_vanced"
 msgstr "éç(_V)"
 
-#: ../src/notewindow.cpp:74
+#: ../src/notewindow.cpp:84
 msgid "Find in This Note"
 msgstr "åæäçäææ"
 
-#: ../src/notewindow.cpp:321
+#: ../src/notewindow.cpp:337
 msgid "_Link to New Note"
 msgstr "éæåæäç(_L)"
 
-#: ../src/notewindow.cpp:329
+#: ../src/notewindow.cpp:345
 msgid "Te_xt"
 msgstr "ææ(_X)"
 
-#: ../src/notewindow.cpp:338
+#: ../src/notewindow.cpp:354
 msgid "_Find in This Note"
 msgstr "åæäçäææ(_F)"
 
-#: ../src/notewindow.cpp:353
+#: ../src/notewindow.cpp:369
 msgid "Clos_e All Notes"
 msgstr "åéåéäç(_E)"
 
-#: ../src/notewindow.cpp:388
+#: ../src/notewindow.cpp:404
 msgid "Search"
 msgstr "æç"
 
-#: ../src/notewindow.cpp:392
+#: ../src/notewindow.cpp:408
 msgid "Search your notes (Ctrl-Shift-F)"
 msgstr "æçæçäç(Ctrl-Shift-F)"
 
-#: ../src/notewindow.cpp:402
+#: ../src/notewindow.cpp:418
 msgid "Link"
 msgstr "éæ"
 
-#: ../src/notewindow.cpp:408
+#: ../src/notewindow.cpp:424
 msgid "Link selected text to a new note (Ctrl-L)"
 msgstr "åéäææéæåæäç(Ctrl-L)"
 
-#: ../src/notewindow.cpp:417
+#: ../src/notewindow.cpp:433
 msgid "_Text"
 msgstr "ææ(_T)"
 
-#: ../src/notewindow.cpp:423
+#: ../src/notewindow.cpp:439
 msgid "Set properties of text"
 msgstr "èçææåæ"
 
-#: ../src/notewindow.cpp:427
+#: ../src/notewindow.cpp:443
 msgid "T_ools"
 msgstr "åå(_O)"
 
-#: ../src/notewindow.cpp:432
+#: ../src/notewindow.cpp:448
 msgid "Use tools on this note"
 msgstr "åæäçääçåå"
 
-#: ../src/notewindow.cpp:442
+#: ../src/notewindow.cpp:458
 msgid "Delete this note"
 msgstr "åéæäç"
 
-#: ../src/notewindow.cpp:452
+#: ../src/notewindow.cpp:468
 msgid "Synchronize Notes"
 msgstr "åæäç"
 
-#: ../src/notewindow.cpp:495
+#: ../src/notewindow.cpp:504
+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."
+msgstr ""
+"èääçæääææäçãåèåäåèäççéèååïäääæçåäçèåææ"
+"ççåäã"
+
+#: ../src/notewindow.cpp:507
+msgid "Convert to regular note"
+msgstr "èæäåèäç"
+
+#: ../src/notewindow.cpp:510
+msgid "Save Si_ze"
+msgstr "äååå(_Z)"
+
+#: ../src/notewindow.cpp:514
+msgid "Save Se_lection"
+msgstr "äåéæ(_L)"
+
+#: ../src/notewindow.cpp:518
+msgid "Save _Title"
+msgstr "äåæé(_T)"
+
+#: ../src/notewindow.cpp:606
 msgid "_Find..."
 msgstr "ææ(_F)..."
 
-#: ../src/notewindow.cpp:503
+#: ../src/notewindow.cpp:614
 msgid "Find _Next"
 msgstr "ææäää(_N)"
 
-#: ../src/notewindow.cpp:513
+#: ../src/notewindow.cpp:624
 msgid "Find _Previous"
 msgstr "ææäää(_P)"
 
-#: ../src/notewindow.cpp:583
+#: ../src/notewindow.cpp:694
 msgid "Cannot create note"
 msgstr "ææååäç"
 
-#: ../src/notewindow.cpp:625
+#: ../src/notewindow.cpp:749
 msgid "_Next"
 msgstr "äää(_N)"
 
-#: ../src/notewindow.cpp:626
+#: ../src/notewindow.cpp:750
 msgid "_Previous"
 msgstr "äää(_P)"
 
-#: ../src/notewindow.cpp:639
+#: ../src/notewindow.cpp:763
 msgid "_Find:"
 msgstr "ææ(_F)ï"
 
-#: ../src/notewindow.cpp:1081
+#: ../src/notewindow.cpp:1205
 msgid "<b>_Bold</b>"
 msgstr "<b>çä(_B)</b>"
 
-#: ../src/notewindow.cpp:1082
+#: ../src/notewindow.cpp:1206
 msgid "<i>_Italic</i>"
 msgstr "<i>æä(_I)</i>"
 
-#: ../src/notewindow.cpp:1083
+#: ../src/notewindow.cpp:1207
 msgid "<s>_Strikeout</s>"
 msgstr "<s>åéç(_S)</s>"
 
-#: ../src/notewindow.cpp:1085
+#: ../src/notewindow.cpp:1209
 msgid "_Highlight"
 msgstr "éä(_H)"
 
-#: ../src/notewindow.cpp:1087
+#: ../src/notewindow.cpp:1211
 msgid "_Normal"
 msgstr "æé(_N)"
 
-#: ../src/notewindow.cpp:1089
+#: ../src/notewindow.cpp:1213
 msgid "Hu_ge"
 msgstr "åå(_G)"
 
-#: ../src/notewindow.cpp:1091
+#: ../src/notewindow.cpp:1215
 msgid "_Large"
 msgstr "å(_L)"
 
-#: ../src/notewindow.cpp:1093
+#: ../src/notewindow.cpp:1217
 msgid "S_mall"
 msgstr "å(_M)"
 
-#: ../src/notewindow.cpp:1095
+#: ../src/notewindow.cpp:1219
 msgid "Bullets"
 msgstr "éççå"
 
-#: ../src/notewindow.cpp:1098
+#: ../src/notewindow.cpp:1222
 msgid "Increase Font Size"
 msgstr "åååå"
 
-#: ../src/notewindow.cpp:1099
+#: ../src/notewindow.cpp:1223
 msgid "Decrease Font Size"
 msgstr "åååå"
 
-#: ../src/notewindow.cpp:1170
+#: ../src/notewindow.cpp:1294
 msgid "Font Size"
 msgstr "åäåå"
 
-#. %1% is the number of note.
-#: ../src/note.cpp:69
-msgid "Really delete this note?"
-msgid_plural "Really delete these %1% notes?"
+#. TRANSLATORS: %1% is number of notes
+#: ../src/note.cpp:74
+msgid "Really delete %1% note?"
+msgid_plural "Really delete %1% notes?"
 msgstr[0] "ççèåéè %1% ääçåï"
 
 #: ../src/note.cpp:81
@@ -1150,63 +1187,76 @@ msgstr ""
 "äåæçäçæåçäéèãèææææåæèåççççéïäåæå ~/.gnote æ"
 "åæèåçæéãéèçèåå ~/.gnote.log äæåã"
 
-#: ../src/recentchanges.cpp:84
+#: ../src/recentchanges.cpp:93
 msgid "Search All Notes"
 msgstr "æçåéäç"
 
-#: ../src/recentchanges.cpp:89
-msgid "C_ase Sensitive"
-msgstr "ååååå(_A)"
-
-#: ../src/recentchanges.cpp:107
+#: ../src/recentchanges.cpp:115
 msgid "_Search:"
 msgstr "æç(_S)ï"
 
-#: ../src/recentchanges.cpp:271
-#: ../src/notebooks/notebookapplicationaddin.cpp:120
+#: ../src/recentchanges.cpp:296
+#: ../src/notebooks/notebookapplicationaddin.cpp:128
 msgid "Notebooks"
 msgstr "äçæ"
 
-#: ../src/recentchanges.cpp:348
+#: ../src/recentchanges.cpp:373
 msgid "Note"
 msgstr "äç"
 
-#: ../src/recentchanges.cpp:369
+#: ../src/recentchanges.cpp:395
 msgid "Last Changed"
 msgstr "æèææ"
 
-#: ../src/recentchanges.cpp:513
+#: ../src/recentchanges.cpp:580
 msgid "Matches"
 msgstr "åéé"
 
-#: ../src/recentchanges.cpp:567
+#. TRANSLATORS: search found a match in note title
+#: ../src/recentchanges.cpp:634
+msgid "Title match"
+msgstr "æéåé"
+
+#: ../src/recentchanges.cpp:638
 msgid "%1% match"
 msgid_plural "%1% matches"
 msgstr[0] "%1% äåéé"
 
-#: ../src/recentchanges.cpp:581
+#: ../src/recentchanges.cpp:652
 msgid "Total: %1% note"
 msgid_plural "Total: %1% notes"
 msgstr[0] "æèï%1% ääç"
 
-#: ../src/recentchanges.cpp:597
+#: ../src/recentchanges.cpp:668
 msgid "Matches: %1% note"
 msgid_plural "Matches: %1% notes"
 msgstr[0] "åéï%1% ääç"
 
-#: ../src/recentchanges.cpp:739
+#: ../src/recentchanges.cpp:684
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"åéäçäçæäæææåçæã\n"
+"çåèéåææäçäæçã"
+
+#: ../src/recentchanges.cpp:688
+msgid "Click here to search across all notebooks"
+msgstr "çåèéåææäçæéæç"
+
+#: ../src/recentchanges.cpp:863
 msgid "Notes"
 msgstr "äç"
 
-#: ../src/tray.cpp:51
+#: ../src/tray.cpp:54
 msgid "Take notes"
 msgstr "èäç"
 
-#: ../src/tray.cpp:162
+#: ../src/tray.cpp:164
 msgid " (new)"
 msgstr " (æ)"
 
-#: ../src/tray.cpp:471
+#: ../src/tray.cpp:470
 msgid "_About Gnote"
 msgstr "åä Gnote(_A)"
 
@@ -1283,17 +1333,17 @@ msgstr[0] "%1% åå"
 msgid "No Date"
 msgstr "ææææ"
 
-#: ../src/watchers.cpp:209
+#: ../src/watchers.cpp:210
 msgid "(Untitled %1%)"
 msgstr "(ææé %1%)"
 
-#: ../src/watchers.cpp:244
+#: ../src/watchers.cpp:245
 msgid ""
 "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:258
+#: ../src/watchers.cpp:259
 msgid "Note title taken"
 msgstr "äçæéåèäç"
 
@@ -1306,7 +1356,7 @@ msgid "_Open Link"
 msgstr "æåéæ(_O)"
 
 #: ../src/notebooks/createnotebookdialog.cpp:38
-#: ../src/notebooks/notebookapplicationaddin.cpp:101
+#: ../src/notebooks/notebookapplicationaddin.cpp:109
 msgid "Create a new notebook"
 msgstr "ååæäçæ"
 
@@ -1345,49 +1395,49 @@ msgstr "åéäç"
 msgid "Unfiled Notes"
 msgstr "æåçäç"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:95
+#: ../src/notebooks/notebookapplicationaddin.cpp:103
 msgid "Note_books"
 msgstr "äçæ(_B)"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:96
-#: ../src/notebooks/notebookapplicationaddin.cpp:121
+#: ../src/notebooks/notebookapplicationaddin.cpp:104
+#: ../src/notebooks/notebookapplicationaddin.cpp:129
 msgid "Create a new note in a notebook"
 msgstr "åäçæäååæäç"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:100
-#: ../src/notebooks/notebookapplicationaddin.cpp:255
+#: ../src/notebooks/notebookapplicationaddin.cpp:108
+#: ../src/notebooks/notebookapplicationaddin.cpp:263
 msgid "New Note_book..."
 msgstr "æåäçæ(_B)..."
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:105
+#: ../src/notebooks/notebookapplicationaddin.cpp:113
 msgid "_New Note"
 msgstr "æåäç(_N)"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:106
+#: ../src/notebooks/notebookapplicationaddin.cpp:114
 msgid "Create a new note in this notebook"
 msgstr "åæäçæäååæäç"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:110
+#: ../src/notebooks/notebookapplicationaddin.cpp:118
 msgid "_Open Template Note"
 msgstr "æåææäç(_O)"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:111
+#: ../src/notebooks/notebookapplicationaddin.cpp:119
 msgid "Open this notebook's template note"
 msgstr "æåæäçæçææäç"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:115
+#: ../src/notebooks/notebookapplicationaddin.cpp:123
 msgid "Delete Note_book"
 msgstr "åéæäçæ(_B)"
 
-#: ../src/notebooks/notebookapplicationaddin.cpp:116
+#: ../src/notebooks/notebookapplicationaddin.cpp:124
 msgid "Delete the selected notebook"
 msgstr "åééäçäçæ"
 
-#: ../src/notebooks/notebookmanager.cpp:338
+#: ../src/notebooks/notebookmanager.cpp:337
 msgid "Really delete this notebook?"
 msgstr "ççèåéæäçæï"
 
-#: ../src/notebooks/notebookmanager.cpp:339
+#: ../src/notebooks/notebookmanager.cpp:338
 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."
@@ -1402,15 +1452,15 @@ msgstr "æåâ%1%âäç"
 msgid "No notebook"
 msgstr "ææäçæ"
 
-#: ../src/notebooks/notebooknoteaddin.cpp:83
+#: ../src/notebooks/notebooknoteaddin.cpp:86
 msgid "Place this note into a notebook"
 msgstr "åæäçæåäääçæ"
 
-#: ../src/notebooks/notebooknoteaddin.cpp:165
+#: ../src/notebooks/notebooknoteaddin.cpp:196
 msgid "Notebook"
 msgstr "äçæ"
 
-#: ../src/notebooks/notebooknoteaddin.cpp:190
+#: ../src/notebooks/notebooknoteaddin.cpp:222
 msgid "_New notebook..."
 msgstr "æåäçæ(_N)..."
 
@@ -1423,7 +1473,7 @@ msgid "See which notes link to the one you're currently viewing."
 msgstr "æçåääçéæåäæååæççèäã"
 
 #: ../src/addins/backlinks/backlinksnoteaddin.cpp:51
-#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:55
+#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:53
 msgid "Hubert Figuiere and Tomboy Project"
 msgstr "Hubert Figuiere å Tomboy éç"
 
@@ -1450,12 +1500,12 @@ msgstr ""
 
 #: ../src/addins/bugzilla/bugzillanoteaddin.cpp:68
 #: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:72
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:56
+#: ../src/addins/printnotes/printnotesnoteaddin.cpp:57
 #: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:67
 msgid "Hubert Figuiere and the Tomboy Project"
 msgstr "Hubert Figuiere å Tomboy éç"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:61
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:62
 msgid ""
 "You can use any bugzilla just by dragging links into notes.  If you want a "
 "special icon for certain hosts, add them here."
@@ -1463,56 +1513,56 @@ msgstr ""
 "æåääçää Bugzilla éçïåéååéæææåäçäãåæäåæäçåäæ"
 "äççæåæïèåæåæåã"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:78
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:79
 msgid "Host Name"
 msgstr "äæå"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:91
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:92
 msgid "Icon"
 msgstr "åæ"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:225
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:226
 msgid "Select an icon..."
 msgstr "éæåæ..."
 
 #. Extra Widget
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:240
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:241
 msgid "_Host name:"
 msgstr "äæå(_H)ï"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:272
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:273
 msgid "Host name invalid"
 msgstr "äæåææ"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:273
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:274
 msgid "You must specify a valid Bugzilla host name to use with this icon."
 msgstr "èäçæåæïæåéæåääææç Bugzilla äæåã"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:292
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:293
 msgid "Error saving icon"
 msgstr "äååææåé"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:293
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:294
 msgid "Could not save the icon file."
 msgstr "ææäååææäã"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:365
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:366
 msgid "Really remove this icon?"
 msgstr "ççèåéæåæåï"
 
-#: ../src/addins/bugzilla/bugzillapreferences.cpp:366
+#: ../src/addins/bugzilla/bugzillapreferences.cpp:367
 msgid "If you remove an icon it is permanently lost."
 msgstr "åææåéäåæïååååæääåã"
 
-#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:36
+#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:41
 msgid "Destination for HTML Export"
 msgstr "HTML ååççæäç"
 
-#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:38
+#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:43
 msgid "Export linked notes"
 msgstr "ååéæçäç"
 
-#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:39
+#: ../src/addins/exporttohtml/exporttohtmldialog.cpp:44
 msgid "Include all other linked notes"
 msgstr "ååéæçåéååäç"
 
@@ -1525,15 +1575,15 @@ msgstr "ååä HTML"
 msgid "Exports individual notes to HTML."
 msgstr "ååäçäççç HTMLã"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:151
+#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:145
 msgid "Your note was exported to \"%1%\"."
 msgstr "æçäçåååäâ%1%âã"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:160
+#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:154
 msgid "Note exported successfully"
 msgstr "äçååæå"
 
-#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:185
+#: ../src/addins/exporttohtml/exporttohtmlnoteaddin.cpp:179
 #, c-format
 msgid "Could not save the file \"%s\""
 msgstr "ææäåæäâ%sâ"
@@ -1552,25 +1602,25 @@ msgid "Adds fixed-width font style."
 msgstr "æåçååäæåã"
 
 #. Add the menu item when the window is created
-#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:47
-#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:80
+#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:45
+#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:78
 msgid "Insert Timestamp"
 msgstr "æåæéæ"
 
-#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:51
+#: ../src/addins/inserttimestamp/inserttimestampnoteaddin.cpp:49
 msgid "Inserts current date and time at the cursor position."
 msgstr "ååæåæåååææåæéã"
 
 #. Label
-#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:63
+#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:67
 msgid "Choose one of the predefined formats or use your own."
 msgstr "éæéååäçæåïæäçèåçæåã"
 
-#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:71
+#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:75
 msgid "Use _Selected Format"
 msgstr "äçéäçæå(_S)"
 
-#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:100
+#: ../src/addins/inserttimestamp/inserttimestamppreferences.cpp:104
 msgid "_Use Custom Format"
 msgstr "äçèåäåä(_U)"
 
@@ -1608,38 +1658,51 @@ msgstr "èåååääâäæâäçïääåææåæåçææ
 msgid "Debarshi Ray and the Tomboy Project"
 msgstr "Debarshi Ray å Tomboy éç"
 
-#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:34
+#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:35
 msgid "_Open Today: Template"
 msgstr "æåäåïææ(_O)"
 
-#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:35
+#: ../src/addins/noteoftheday/noteofthedaypreferences.cpp:36
 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/printnotesnoteaddin.cpp:48
+#: ../src/addins/printnotes/printnotesnoteaddin.cpp:49
 msgid "Printing Support"
 msgstr "æåææ"
 
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:52
+#: ../src/addins/printnotes/printnotesnoteaddin.cpp:53
 msgid "Allows you to print a note."
 msgstr "åèææåäçã"
 
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:79
+#: ../src/addins/printnotes/printnotesnoteaddin.cpp:80
 msgid "Print"
 msgstr "æå"
 
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:134
+#: ../src/addins/printnotes/printnotesnoteaddin.cpp:135
 msgid "Error printing note"
 msgstr "æåäçæåé"
 
 #. %1% is the page number, %2% is the total number of pages
-#: ../src/addins/printnotes/printnotesnoteaddin.cpp:298
+#: ../src/addins/printnotes/printnotesnoteaddin.cpp:299
 msgid "Page %1% of %2%"
 msgstr "ç %1% éïå %2% é"
 
+#: ../src/addins/replacetitle/replacetitlenoteaddin.cpp:43
+#: ../src/addins/replacetitle/replacetitlenoteaddin.cpp:77
+msgid "Replace title"
+msgstr "æææé"
+
+#: ../src/addins/replacetitle/replacetitlenoteaddin.cpp:48
+msgid "Replace title with selection."
+msgstr "çæéååæææéã"
+
+#: ../src/addins/replacetitle/replacetitlenoteaddin.cpp:54
+msgid "Pierre-Yves Luyten"
+msgstr "Pierre-Yves Luyten"
+
 #: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:59
 msgid "Sticky Notes Importer"
 msgstr "çéäçååå"
@@ -1648,33 +1711,33 @@ msgstr "çéäçååå"
 msgid "Import your notes from the Sticky Notes applet."
 msgstr "äçéäçäååã"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:112
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:109
 msgid "Import from Sticky Notes"
 msgstr "äçéäçäåå"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:242
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:209
 msgid "No Sticky Notes found"
 msgstr "ææåçéäç"
 
 #. %1% is a the file name
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:244
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:211
 msgid "No suitable Sticky Notes file was found at \"%1%\"."
 msgstr "â%1%âäææååéççéäçæäã"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:252
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:219
 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:254
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:221
 msgid "<b>%1%</b> of <b>%2%</b> Sticky Notes were successfully imported."
 msgstr "åæåååä <b>%1%</b> äçéäçäç <b>%2%</b> äã"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:273
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:240
 msgid "Untitled"
 msgstr "ææé"
 
-#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:320
+#: ../src/addins/stickynoteimport/stickynoteimportnoteaddin.cpp:278
 msgid "Sticky Note: "
 msgstr "çéäçï"
 
@@ -1707,6 +1770,27 @@ msgstr "æåâææäåçâåèã"
 msgid "Hubert FiguiÃre and the Tomboy Project"
 msgstr "Hubert FiguiÃre å Tomboy éç"
 
+#~ msgid "Accessories"
+#~ msgstr "éä"
+
+#~ msgid "Gnote Applet Factory"
+#~ msgstr "Gnote åçååå"
+
+#~ msgid "Simple and easy to use note-taking"
+#~ msgstr "çåæççéæå"
+
+#~ msgid "Set to TRUE to activate"
+#~ msgstr "èä TRUE åææ"
+
+#~ msgid "The handler for \"note://\" URLs"
+#~ msgstr "ânote://â çå URL çåççå"
+
+#~ msgid "Editing"
+#~ msgstr "çè"
+
+#~ msgid "C_ase Sensitive"
+#~ msgstr "ååååå(_A)"
+
 #~ msgid "Description"
 #~ msgstr "æè"
 



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