[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, experimental, updated. debian/1.7.3-1-5-g600f4db
Iain Lane
laney at debian.org
Tue Aug 23 22:41:16 UTC 2011
The following commit has been merged in the experimental branch:
commit 6e75a5b0b63f8033c6081fa046e2bf6b08d22bef
Author: Iain Lane <laney at debian.org>
Date: Tue Aug 23 22:09:22 2011 +0100
Imported Upstream version 1.7.4
diff --git a/ChangeLog b/ChangeLog
index a8f773b..c01b1b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,303 @@
# Generated by Makefile. Do not edit.
+commit 1741f40299943f8f50cd916cdc5ffd17ca4af057
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 22 12:46:23 2011 -0700
+
+ Remove code from bad merge
+
+ Tomboy/NoteManager.cs | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit e0bf39a123a64b75e860e5955d619bc54a8128db
+Author: Aaron Borden <adborden at live.com>
+Date: Wed Apr 27 17:10:25 2011 -0700
+
+ Save title option for template bar
+
+ Adds a setting to the template bar to allow new notes based on the template to
+ use the template note's title as the base title for the new note. e.g. a note
+ based on a template named "Tomboy Bug Note" would have the name "Tomboy Bug
+ Note 101"
+
+ Tomboy/NoteManager.cs | 4 ++++
+ Tomboy/NoteWindow.cs | 11 +++++++++++
+ Tomboy/TagManager.cs | 1 +
+ 3 files changed, 16 insertions(+), 0 deletions(-)
+
+commit 6dcc433d6261a6aeec20c352e33f84d6d96d74a1
+Author: Aaron Borden <adborden at live.com>
+Date: Fri Apr 15 08:01:19 2011 -0700
+
+ Save selection bound using template-bar
+
+ Choosing "Save Selection" will save the selection bound in addition to the
+ cursor's position.
+
+ Tomboy/NoteManager.cs | 13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 72699901d3559bd5fde4a92d72abe1fac0d4a42f
+Author: Aaron Borden <adborden at live.com>
+Date: Fri Apr 15 07:36:47 2011 -0700
+
+ Save selection per note
+
+ New property selection-bound-position which stores the position of the text
+ buffer's selection mark.
+
+ Tomboy/Note.cs | 44 ++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 36 insertions(+), 8 deletions(-)
+
+commit 0a0115c4f079d64cd9b8c6e69283e214c2fc11c9
+Author: Aaron Borden <adborden at live.com>
+Date: Tue Apr 12 19:08:54 2011 -0700
+
+ Template bar functionality for size and cursor pos
+
+ The template bar allows saving the note's size and text selection. When these
+ options are selected, new notes based on the template will be created with the
+ same size and cursor position as the template.
+
+ Tomboy/NoteManager.cs | 21 +++++++++++++++++++++
+ Tomboy/NoteWindow.cs | 6 +++---
+ Tomboy/TagManager.cs | 2 ++
+ 3 files changed, 26 insertions(+), 3 deletions(-)
+
+commit c43cc3696af9150a3225602af1be9e95fab87b19
+Author: Aaron Borden <adborden at live.com>
+Date: Fri Apr 8 19:08:51 2011 -0700
+
+ Add CreateNoteFromTemplate method
+
+ CreateNoteFromTemplate method cleans up the logic of creating a new note whose
+ body is based on a template. This also fixes an issue where trailing whitespace
+ on the title line of a template note will appear in the new note.
+
+ Tomboy/NoteManager.cs | 68 +++++++++++++++++++++++++++++++++--------
+ Tomboy/Notebooks/Notebook.cs | 15 +++++++++
+ 2 files changed, 69 insertions(+), 14 deletions(-)
+
+commit faa29b032abb4b8ffd330dfcf76d42678812078c
+Author: Aaron Borden <adborden at live.com>
+Date: Sat Apr 9 00:06:39 2011 -0700
+
+ Allow renaming of template notes
+
+ Find temlpate notes by tag instead of by name. This allows the user to modify
+ the template's name without losing it.
+
+ http://bugzilla.gnome.org/show_bug.cgi?id=509147
+
+ Tomboy/Note.cs | 2 +-
+ Tomboy/NoteManager.cs | 48 ++++++++++++++++++++++-----
+ Tomboy/Notebooks/Notebook.cs | 27 +++++++++-----
+ Tomboy/Notebooks/NotebookManager.cs | 4 ++-
+ Tomboy/Notebooks/NotebookNewNoteMenuItem.cs | 4 ++-
+ Tomboy/RecentChanges.cs | 4 ++-
+ 6 files changed, 66 insertions(+), 23 deletions(-)
+
+commit b5c481da5e9dafd6973411c640c05b243e01dba1
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date: Sun Jul 25 21:56:21 2010 -0700
+
+ Prevent NRE exposed by previous commit
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/Watchers.cs | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d07211a71bd2ae2460ba8b65d2b8ef6115ab8978
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date: Sun Jul 25 21:56:06 2010 -0700
+
+ Add non-functional UI for saving size/selection
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/NoteWindow.cs | 30 +++++++++++++++++++++++++++++-
+ 1 files changed, 29 insertions(+), 1 deletions(-)
+
+commit 14c603fc7c8ba80b362164af52c113a32b730d53
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date: Sun Jul 25 09:42:35 2010 -0700
+
+ Wrap translatable string in Catalog call
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/NoteWindow.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f79c0c7c9aacfa36b6e09d3cff1880d9ba0c3f75
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date: Sun Jul 25 09:39:50 2010 -0700
+
+ Make NotebookNoteAddin handle button sensitivity when untemplating
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/Notebooks/NotebookNoteAddin.cs | 41 +++++++++++++++++++++++++--------
+ 1 files changed, 31 insertions(+), 10 deletions(-)
+
+commit ffe7e2631d8c6fc2e66b0989a03ea6a45476171b
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date: Sun Jul 25 09:39:23 2010 -0700
+
+ Add beginnings of template bar, including button to untemplate
+
+ Signed-off-by: Aaron Borden <adborden at live.com>
+
+ Tomboy/NoteWindow.cs | 36 ++++++++++++++++++++++++++++++++++++
+ 1 files changed, 36 insertions(+), 0 deletions(-)
+
+commit 3ee9006bad2e414d201026d8296ca36f7c4639a7
+Author: Yuri Myasoedov <omerta13 at yandex.ru>
+Date: Sun Aug 21 21:44:15 2011 +0400
+
+ Updated Russian translation
+
+ po/ru.po | 1075 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 624 insertions(+), 451 deletions(-)
+
+commit be9b9ed7acb4243d8a0acd25dad95eaed76f8619
+Author: Jorge González <jorgegonz at svn.gnome.org>
+Date: Sun Aug 21 14:43:24 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 415b11a5beae043f5f18bcb489545e2b178e4af5
+Author: Jorge González <jorgegonz at svn.gnome.org>
+Date: Sun Aug 21 14:35:30 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 52 +++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 29 insertions(+), 23 deletions(-)
+
+commit 5672126ba5211993ed14261ea1bbc874b6edac05
+Author: Aaron Borden <adborden at live.com>
+Date: Thu Feb 17 18:48:13 2011 -0800
+
+ Port fix for 625679
+
+ Tomboy/Notebooks/NotebookManager.cs | 12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 89f234fb08c8f95cb6b00f808a0f7e5896880fe0
+Author: Aaron Borden <adborden at live.com>
+Date: Sat Aug 20 15:18:02 2011 -0700
+
+ Tune down autosync frequency
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=632615
+
+ Tomboy/Synchronization/SyncManager.cs | 21 +++++++++++++--------
+ 1 files changed, 13 insertions(+), 8 deletions(-)
+
+commit 6135f29b23527acfb31a6f9f066d411a4cbe4241
+Author: Aaron Borden <adborden at live.com>
+Date: Sat Aug 20 15:10:15 2011 -0700
+
+ Make Save button insensitive in Sync Preferences
+
+ Save button should be insensitive until required fields are filled in.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=473332
+
+ .../FileSystemSyncServiceAddin.cs | 3 +-
+ .../Addins/SshSyncService/SshSyncServiceAddin.cs | 17 ++++++++++++++-
+ .../WebDavSyncService/WebDavSyncServiceAddin.cs | 16 ++++++++++++++-
+ .../WebSyncService/WebSyncPreferencesWidget.cs | 3 +-
+ .../Addins/WebSyncService/WebSyncServiceAddin.cs | 21 +++++++++++++------
+ Tomboy/PreferencesDialog.cs | 13 +++++++++--
+ Tomboy/Synchronization/SyncServiceAddin.cs | 15 ++++++++++++-
+ 7 files changed, 71 insertions(+), 17 deletions(-)
+
+commit 77dc2ab38bedc0f3ef067dfda5431e8cc93bddaf
+Author: Aaron Borden <adborden at live.com>
+Date: Fri Jun 10 14:18:29 2011 -0700
+
+ Don't create links inside of links
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=627060
+
+ Tomboy/NoteTag.cs | 5 +++++
+ Tomboy/Watchers.cs | 13 ++++++++-----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 6ad6f26f1ed331a792de7741b512f7d5d0436198
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Jul 18 16:13:32 2011 -0700
+
+ Fix translation string in ExportAllNotes addin
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=654865
+
+ Tomboy/ExportAllApplicationAddin.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 67682e9a88576f17eceeb6d65dae6e550b7e0600
+Author: Aaron Borden <adborden at live.com>
+Date: Sat Nov 20 12:03:33 2010 -0500
+
+ Added Tag.SaveType for saving note tag changes
+
+ Tomboy/Note.cs | 4 +-
+ Tomboy/NoteTag.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 60 insertions(+), 2 deletions(-)
+
+commit 6a3bb1c863cd775e1eb01780460c27d4457ee96d
+Author: Aaron Borden <adborden at live.com>
+Date: Fri Nov 19 10:21:27 2010 -0500
+
+ Name note being deleted in confirmation
+
+ Tomboy/Note.cs | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit d784d5b085a14fbb28d3fe2796de953369f9930b
+Author: Andika Triwidada <andika at gmail.com>
+Date: Thu Aug 18 16:22:11 2011 +0700
+
+ Updated Indonesian translation
+
+ po/id.po | 1011 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 582 insertions(+), 429 deletions(-)
+
+commit 730a9d929e1d1d464a259e738174c499f6d3231e
+Author: Fran Dieguez <fran at openhost.es>
+Date: Tue Aug 16 19:25:01 2011 +0200
+
+ Updated Galician translations
+
+ po/gl.po | 530 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 270 insertions(+), 260 deletions(-)
+
+commit 0805689444c653f88d62563143f89bf0d4df56ca
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 15 13:55:38 2011 -0700
+
+ Bumping version to 1.7.4
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 6b99ab60459bc78fed72a48e607aa87632a5489e
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 15 13:52:25 2011 -0700
+
+ Update NEWS file for 1.7.3
+
+ NEWS | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
commit 31c4dbf60e14a7b008dc11a4c672d4b28fcc6792
Author: Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>
Date: Sat Aug 13 20:23:31 2011 +0800
diff --git a/NEWS b/NEWS
index 3dbc45c..ab19a1d 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,19 @@ Please send questions and suggestions to
Please report bugs using http://bugzilla.gnome.org/
(http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
+Version 1.7.4
+* Name note being deleted in confirmation dialog (#627034)
+* Autolinking notes should not update modification time (#634035)
+* Fix translation string in Export All Notes Addin (#654865)
+* Don't create nested links (#627060)
+* Save button in Sync Preferences should be insensitive until fields are
+ filled (#473332)
+* Tune down autosync frequency (#473332)
+* Keep selection after Notebook rename (#625679)
+* Allow renaming of template notes (#509147)
+* Improve template note functionality (#653062)
+* Translation Updates: es, gl, id, ru
+
Version 1.7.3
* Make NUNIT conditional (#647591)
* Translation Updates: bg, sv, zh
diff --git a/Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs b/Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs
index b29a441..c0e0402 100644
--- a/Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs
+++ b/Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs
@@ -79,7 +79,7 @@ namespace Tomboy.Sync
/// not automatically be saved by a GConf Property Editor. Preferences
/// should be saved when SaveConfiguration () is called.
/// </summary>
- public override Gtk.Widget CreatePreferencesControl ()
+ public override Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged)
{
Gtk.Table table = new Gtk.Table (1, 2, false);
table.RowSpacing = 5;
@@ -99,6 +99,7 @@ namespace Tomboy.Sync
pathButton = new FileChooserButton (Catalog.GetString ("Select Synchronization Folder..."),
FileChooserAction.SelectFolder);
+ pathButton.CurrentFolderChanged += requiredPrefChanged;
l.MnemonicWidget = pathButton;
pathButton.SetFilename (syncPath);
diff --git a/Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs b/Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs
index 79e5b95..7e8038b 100644
--- a/Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs
+++ b/Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs
@@ -23,7 +23,7 @@ namespace Tomboy.Sync
/// not automatically be saved by a GConf Property Editor. Preferences
/// should be saved when SaveConfiguration () is called.
/// </summary>
- public override Gtk.Widget CreatePreferencesControl ()
+ public override Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged)
{
Gtk.Table table = new Gtk.Table (3, 2, false);
table.RowSpacing = 5;
@@ -44,6 +44,7 @@ namespace Tomboy.Sync
serverEntry = new Entry ();
serverEntry.Text = server;
+ serverEntry.Changed += requiredPrefChanged;
AddRow (table, serverEntry, Catalog.GetString ("Se_rver:"), 0);
usernameEntry = new Entry ();
@@ -119,6 +120,18 @@ namespace Tomboy.Sync
return GetConfigSettings (out server, out folder, out username, out port);
}
}
+
+ /// <summary>
+ /// Returns true if required widget settings are non-empty
+ /// </summary>
+ public override bool AreSettingsValid
+ {
+ get {
+ string server, folder, username;
+ int port;
+ return GetPrefWidgetSettings (out server, out folder, out username, out port);
+ }
+ }
/// <summary>
/// The name that will be shown in the preferences to distinguish
@@ -187,6 +200,7 @@ namespace Tomboy.Sync
/// <summary>
/// Get config settings
/// </summary>
+ /// <returns>true if saved settings are valid</returns>
private bool GetConfigSettings (out string server, out string folder, out string username, out int port)
{
server = Preferences.Get ("/apps/tomboy/sync_sshfs_server") as String;
@@ -200,7 +214,6 @@ namespace Tomboy.Sync
return !string.IsNullOrEmpty (server) && !string.IsNullOrEmpty (username);
}
-
/// <summary>
/// Get config settings
/// </summary>
diff --git a/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs b/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
index dcd07d1..a627759 100644
--- a/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
+++ b/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
@@ -33,7 +33,7 @@ namespace Tomboy.Sync
/// not automatically be saved by a GConf Property Editor. Preferences
/// should be saved when SaveConfiguration () is called.
/// </summary>
- public override Gtk.Widget CreatePreferencesControl ()
+ public override Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged)
{
Gtk.Table table = new Gtk.Table (3, 2, false);
table.RowSpacing = 5;
@@ -52,15 +52,18 @@ namespace Tomboy.Sync
urlEntry = new Entry ();
urlEntry.Text = url;
+ urlEntry.Changed += requiredPrefChanged;
AddRow (table, urlEntry, Catalog.GetString ("_URL:"), 0);
usernameEntry = new Entry ();
usernameEntry.Text = username;
+ usernameEntry.Changed += requiredPrefChanged;
AddRow (table, usernameEntry, Catalog.GetString ("User_name:"), 1);
passwordEntry = new Entry ();
passwordEntry.Text = password;
passwordEntry.Visibility = false;
+ passwordEntry.Changed += requiredPrefChanged;
AddRow (table, passwordEntry, Catalog.GetString ("_Password:"), 2);
table.ShowAll ();
@@ -108,6 +111,17 @@ namespace Tomboy.Sync
return GetConfigSettings (out url, out username, out password);
}
}
+
+ /// <summary>
+ /// Returns true if required settings are non-empty in the preferences widget
+ /// </summary>
+ public override bool AreSettingsValid
+ {
+ get {
+ string url, username, password;
+ return GetPrefWidgetSettings (out url, out username, out password);
+ }
+ }
/// <summary>
/// The name that will be shown in the preferences to distinguish
diff --git a/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs b/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs
index 602b100..45d0de9 100644
--- a/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs
+++ b/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs
@@ -46,7 +46,7 @@ namespace Tomboy.WebSync
private const string callbackHtmlTemplate =
@"<html><head><meta http-equiv=""content-type"" content=""text/html; charset=utf-8""><title>{0}</title></head><body><div><h1>{0}</h1>{1}</div></body></html>";
- public WebSyncPreferencesWidget (Api.OAuth oauth, string server) : base (false, 5)
+ public WebSyncPreferencesWidget (Api.OAuth oauth, string server, EventHandler requiredPrefChanged) : base (false, 5)
{
this.oauth = oauth;
@@ -73,6 +73,7 @@ namespace Tomboy.WebSync
serverEntry.Changed += delegate {
Auth = null;
};
+ serverEntry.Changed += requiredPrefChanged;
Add (authButton);
diff --git a/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs b/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
index 366c2dd..f20350b 100644
--- a/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
+++ b/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
@@ -75,10 +75,14 @@ namespace Tomboy.WebSync
get {
string serverPref;
Api.OAuth oauth;
- GetConfigSettings (out oauth, out serverPref);
- return !string.IsNullOrEmpty (serverPref) &&
- oauth != null &&
- oauth.IsAccessToken;
+ return GetConfigSettings (out oauth, out serverPref);
+ }
+ }
+
+ public override bool AreSettingsValid
+ {
+ get {
+ return prefsWidget != null && !String.IsNullOrEmpty(prefsWidget.Server);
}
}
@@ -88,12 +92,12 @@ namespace Tomboy.WebSync
}
}
- public override Gtk.Widget CreatePreferencesControl ()
+ public override Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged)
{
string serverPref;
Api.OAuth oauth;
GetConfigSettings (out oauth, out serverPref);
- prefsWidget = new WebSyncPreferencesWidget (oauth, serverPref);
+ prefsWidget = new WebSyncPreferencesWidget (oauth, serverPref, requiredPrefChanged);
return prefsWidget;
}
@@ -148,7 +152,7 @@ namespace Tomboy.WebSync
#region Private Members
- private void GetConfigSettings (out Api.OAuth oauthConfig, out string serverPref)
+ private bool GetConfigSettings (out Api.OAuth oauthConfig, out string serverPref)
{
serverPref = (string)
Preferences.Get (serverUrlPrefPath);
@@ -177,6 +181,9 @@ namespace Tomboy.WebSync
// case of weird circumstances?
oauthConfig.IsAccessToken =
!String.IsNullOrEmpty (oauthConfig.Token);
+
+ return !string.IsNullOrEmpty (serverPref)
+ && oauthConfig.IsAccessToken;
}
private void SaveConfigSettings (Api.OAuth oauthConfig, string serverPref)
diff --git a/Tomboy/ExportAllApplicationAddin.cs b/Tomboy/ExportAllApplicationAddin.cs
index 6bfdad9..8838d94 100644
--- a/Tomboy/ExportAllApplicationAddin.cs
+++ b/Tomboy/ExportAllApplicationAddin.cs
@@ -503,7 +503,7 @@ namespace Tomboy
{
public ExportMultipleDialog (string default_folder, string export_type_name) :
- base (Catalog.GetString ("Create destination folder for " + export_type_name + " Export"),
+ base (String.Format (Catalog.GetString ("Create destination folder for {0} export"), export_type_name),
null, Gtk.FileChooserAction.Save, new object[] {})
//Using action Save insted of CreateFolder because of Win32 issue
{
diff --git a/Tomboy/Note.cs b/Tomboy/Note.cs
index cf332cf..0504d1d 100644
--- a/Tomboy/Note.cs
+++ b/Tomboy/Note.cs
@@ -31,7 +31,7 @@ namespace Tomboy
DateTime change_date;
DateTime metadata_change_date;
- int cursor_pos;
+ int cursor_pos, selection_bound_pos;
int width, height;
int x, y;
bool open_on_startup;
@@ -46,6 +46,7 @@ namespace Tomboy
this.text = "";
x = noPosition;
y = noPosition;
+ selection_bound_pos = noPosition;
tags = new Dictionary<string, Tag> ();
@@ -121,7 +122,7 @@ namespace Tomboy
}
- // FIXME: the next five attributes don't belong here (the data
+ // FIXME: the next six attributes don't belong here (the data
// model), but belong into the view; for now they are kept here
// for backwards compatibility
@@ -134,6 +135,16 @@ namespace Tomboy
cursor_pos = value;
}
}
+
+ public int SelectionBoundPosition
+ {
+ get {
+ return selection_bound_pos;
+ }
+ set {
+ selection_bound_pos = value;
+ }
+ }
public int Width
{
@@ -317,6 +328,13 @@ namespace Tomboy
cursor = buffer.GetIterAtLine (2);
}
buffer.PlaceCursor (cursor);
+
+ if (data.SelectionBoundPosition >= 0) {
+ // Move selection bound to last-saved position
+ Gtk.TextIter selection_bound;
+ selection_bound = buffer.GetIterAtOffset (data.SelectionBoundPosition);
+ buffer.MoveMark (buffer.SelectionBound.Name, selection_bound);
+ }
// New events should create Undo actions
buffer.Undoer.ThawUndo ();
@@ -535,7 +553,7 @@ namespace Tomboy
{
if (NoteTagTable.TagIsSerializable (args.Tag)) {
DebugSave ("BufferTagApplied queueing save: {0}", args.Tag.Name);
- QueueSave (ChangeType.ContentChanged);
+ QueueSave (TagTable.GetChangeType (args.Tag));
}
}
@@ -543,18 +561,20 @@ namespace Tomboy
{
if (NoteTagTable.TagIsSerializable (args.Tag)) {
DebugSave ("BufferTagRemoved queueing save: {0}", args.Tag.Name);
- QueueSave (ChangeType.ContentChanged);
+ QueueSave (TagTable.GetChangeType (args.Tag));
}
}
- void BufferInsertMarkSet (object sender, Gtk.MarkSetArgs args)
+ void OnBufferMarkSet (object sender, Gtk.MarkSetArgs args)
{
- if (args.Mark != buffer.InsertMark)
+ if (args.Mark == buffer.InsertMark)
+ data.Data.CursorPosition = args.Location.Offset;
+ else if (args.Mark == buffer.SelectionBound)
+ data.Data.SelectionBoundPosition = args.Location.Offset;
+ else
return;
- data.Data.CursorPosition = args.Location.Offset;
-
- DebugSave ("BufferInsertSetMark queueing save");
+ DebugSave ("OnBufferSetMark queueing save");
QueueSave (ChangeType.NoChange);
}
@@ -683,7 +703,7 @@ namespace Tomboy
public bool ContainsTag (Tag tag)
{
- if (data.Data.Tags.ContainsKey (tag.NormalizedName) == true)
+ if (tag != null && data.Data.Tags.ContainsKey (tag.NormalizedName))
return true;
return false;
@@ -1082,7 +1102,7 @@ namespace Tomboy
buffer.Changed += OnBufferChanged;
buffer.TagApplied += BufferTagApplied;
buffer.TagRemoved += BufferTagRemoved;
- buffer.MarkSet += BufferInsertMarkSet;
+ buffer.MarkSet += OnBufferMarkSet;
}
return buffer;
}
@@ -1340,6 +1360,10 @@ namespace Tomboy
if (int.TryParse (xml.ReadString (), out num))
note.CursorPosition = num;
break;
+ case "selection-bound-position":
+ if (int.TryParse (xml.ReadString (), out num))
+ note.SelectionBoundPosition = num;
+ break;
case "width":
if (int.TryParse (xml.ReadString (), out num))
note.Width = num;
@@ -1475,6 +1499,10 @@ namespace Tomboy
xml.WriteStartElement (null, "cursor-position", null);
xml.WriteString (note.CursorPosition.ToString ());
xml.WriteEndElement ();
+
+ xml.WriteStartElement (null, "selection-bound-position", null);
+ xml.WriteString (note.SelectionBoundPosition.ToString ());
+ xml.WriteEndElement ();
xml.WriteStartElement (null, "width", null);
xml.WriteString (note.Width.ToString ());
@@ -1574,9 +1602,10 @@ namespace Tomboy
if ((bool) Preferences.Get (Preferences.ENABLE_DELETE_CONFIRM)) {
// show confirmation dialog
- if (notes.Count == 1)
- message = Catalog.GetString ("Really delete this note?");
- else
+ if (notes.Count == 1) {
+ Note note = notes[0];
+ message = string.Format (Catalog.GetString ("Really delete \"{0}\"?"), note.Title) ;
+ } else
message = string.Format (Catalog.GetPluralString (
"Really delete this {0} note?",
"Really delete these {0} notes?",
diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
index 000841e..97fe345 100644
--- a/Tomboy/NoteManager.cs
+++ b/Tomboy/NoteManager.cs
@@ -522,10 +522,9 @@ Ciao!");
return CreateNewNote (title, guid);
}
- // Create a new note with the specified title, and a simple
- // "Describe..." body or the body from the "New Note Template"
- // note if it exists. If the "New Note Template" body is found
- // the text will not automatically be highlighted.
+ // Create a new note with the specified title from the default
+ // template note. Optionally the body can be overridden by appending
+ // it to title.
private Note CreateNewNote (string title, string guid)
{
string body = null;
@@ -534,14 +533,10 @@ Ciao!");
if (title == null)
return null;
- Note note_template = Find (NoteTemplateTitle);
- if (note_template != null) {
- // Use the body from the "New Note Template" note
- string xml_content =
- note_template.XmlContent.Replace (NoteTemplateTitle,
- XmlEncoder.Encode (title));
- return CreateNewNote (title, xml_content, guid);
- }
+ Note template_note = GetOrCreateTemplateNote ();
+
+ if (String.IsNullOrEmpty (body))
+ return CreateNoteFromTemplate (title, template_note, guid);
// Use a simple "Describe..." body and highlight
// it so it can be easily overwritten
@@ -555,8 +550,7 @@ Ciao!");
Note new_note = CreateNewNote (title, content, guid);
- // Select the inital
- // "Describe..." text so typing will overwrite the body text,
+ // Select the inital text so typing will overwrite the body text
NoteBuffer buffer = new_note.Buffer;
Gtk.TextIter iter = buffer.GetIterAtOffset (header.Length);
buffer.MoveMark (buffer.SelectionBound, iter);
@@ -606,7 +600,19 @@ Ciao!");
/// </returns>
public Note GetOrCreateTemplateNote ()
{
- Note template_note = Find (NoteTemplateTitle);
+ // The default template note will have the system template tag and
+ // will belong to zero notebooks. We find this by searching all
+ // notes with the TemplateNoteSystemTag and check that it's
+ // notebook == null
+ Note template_note = null;
+ Tag template_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
+ foreach (Note note in template_tag.Notes) {
+ if (Notebooks.NotebookManager.GetNotebookFromNote (note) == null) {
+ template_note = note;
+ break;
+ }
+ }
+
if (template_note == null) {
template_note =
Create (NoteTemplateTitle,
@@ -619,8 +625,7 @@ Ciao!");
buffer.MoveMark (buffer.InsertMark, buffer.EndIter);
// Flag this as a template note
- Tag tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
- template_note.AddTag (tag);
+ template_note.AddTag (template_tag);
template_note.QueueSave (ChangeType.ContentChanged);
}
@@ -658,6 +663,98 @@ Ciao!");
}
return null;
}
+
+ // Removes any trailing whitespace on the title line
+ public static string SanitizeXmlContent (string xml_content)
+ {
+ int i = String.IsNullOrEmpty (xml_content) ? -1 : xml_content.IndexOf ('\n');
+ while (--i >= 0) {
+ if (xml_content [i].Equals ('\r'))
+ continue;
+
+ if (Char.IsWhiteSpace (xml_content [i]))
+ xml_content = xml_content.Remove (i,1);
+ else
+ break;
+ }
+
+ return xml_content;
+ }
+
+ /// <summary>
+ /// Creates a new note with the given titel based on the template note.
+ /// </summary>
+ /// <param name="title">
+ /// A <see cref="System.String"/>
+ /// </param>
+ /// <param name="template_note">
+ /// A <see cref="Note"/>
+ /// </param>
+ /// <returns>
+ /// A <see cref="Note"/>
+ /// </returns>
+ public Note CreateNoteFromTemplate (string title, Note template_note)
+ {
+ return CreateNoteFromTemplate (title, template_note, null);
+ }
+
+ // Creates a new note with the given title and guid with body based on
+ // the template note.
+ private Note CreateNoteFromTemplate (string title, Note template_note, string guid)
+ {
+ Tag template_save_title = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSaveTitleSystemTag);
+ if (template_note.ContainsTag (template_save_title))
+ title = GetUniqueName (template_note.Title, notes.Count);
+
+ // Use the body from the template note
+ string xml_content =
+ template_note.XmlContent.Replace (XmlEncoder.Encode (template_note.Title),
+ XmlEncoder.Encode (title));
+ xml_content = SanitizeXmlContent (xml_content);
+
+ Note new_note = CreateNewNote (title, xml_content, guid);
+
+ // Copy template note's properties
+ Tag template_save_size = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSaveSizeSystemTag);
+ if (template_note.Data.HasExtent () && template_note.ContainsTag (template_save_size)) {
+ new_note.Data.Height = template_note.Data.Height;
+ new_note.Data.Width = template_note.Data.Width;
+ }
+
+ Tag template_save_selection = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSaveSelectionSystemTag);
+ if (template_note.Data.CursorPosition > 0 && template_note.ContainsTag (template_save_selection)) {
+ Gtk.TextBuffer buffer = new_note.Buffer;
+ Gtk.TextIter iter;
+
+ // Because the titles will be different between template and
+ // new note, we can't just drop the cursor at template's
+ // CursorPosition. Whitespace after the title makes this more
+ // complicated so let's just start counting from the line after the title.
+ int title_offset_difference = buffer.GetIterAtLine (1).Offset - template_note.Buffer.GetIterAtLine (1).Offset;
+
+ iter = buffer.GetIterAtOffset (template_note.Data.CursorPosition + title_offset_difference);
+ buffer.PlaceCursor(iter);
+
+ iter = buffer.GetIterAtOffset (template_note.Data.SelectionBoundPosition + title_offset_difference);
+ buffer.MoveMark (buffer.SelectionBound.Name, iter);
+ }
+
+ return new_note;
+ }
+
+ // Find a title that does not exist using basename and id as
+ // a starting point
+ public string GetUniqueName (string basename, int id)
+ {
+ string title;
+ while (true) {
+ title = String.Concat (basename, " ", id++);
+ if (Find (title) == null)
+ break;
+ }
+
+ return title;
+ }
class CompareDates : IComparer<Note>
{
diff --git a/Tomboy/NoteTag.cs b/Tomboy/NoteTag.cs
index 1982382..410113b 100644
--- a/Tomboy/NoteTag.cs
+++ b/Tomboy/NoteTag.cs
@@ -11,6 +11,12 @@ namespace Tomboy
NoteEditor editor,
Gtk.TextIter start,
Gtk.TextIter end);
+
+ public enum TagSaveType {
+ NoSave,
+ Meta,
+ Content
+ };
public class NoteTag : Gtk.TextTag
{
@@ -62,6 +68,7 @@ namespace Tomboy
this.element_name = element_name;
flags = TagFlags.CanSerialize | TagFlags.CanSplit;
+ SaveType = TagSaveType.Content;
}
public string ElementName
@@ -70,6 +77,11 @@ namespace Tomboy
return element_name;
}
}
+
+ /// <summary>
+ /// How the note should be saved when this tag is modified
+ /// </summary>
+ public TagSaveType SaveType;
public bool CanSerialize
{
@@ -555,6 +567,7 @@ namespace Tomboy
tag.Background = "green";
tag.CanSerialize = false;
tag.CanSpellCheck = true;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
tag = new NoteTag ("note-title");
@@ -564,12 +577,14 @@ namespace Tomboy
tag.Scale = Pango.Scale.XXLarge;
// FiXME: Hack around extra rewrite on open
tag.CanSerialize = false;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
tag = new NoteTag ("related-to");
tag.Scale = Pango.Scale.Small;
tag.LeftMargin = 40;
tag.Editable = false;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
tag = new NoteTag ("datetime");
@@ -578,6 +593,7 @@ namespace Tomboy
tag.PaletteForeground =
ContrastPaletteColor.Grey;
tag.CanGrow = true;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
// Font sizes
@@ -617,6 +633,7 @@ namespace Tomboy
tag.PaletteForeground =
ContrastPaletteColor.Grey;
tag.CanActivate = true;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
BrokenLinkTag = tag;
@@ -625,6 +642,7 @@ namespace Tomboy
tag.PaletteForeground =
ContrastPaletteColor.Blue;
tag.CanActivate = true;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
LinkTag = tag;
@@ -633,6 +651,7 @@ namespace Tomboy
tag.PaletteForeground =
ContrastPaletteColor.Blue;
tag.CanActivate = true;
+ tag.SaveType = TagSaveType.Meta;
Add (tag);
UrlTag = tag;
}
@@ -680,6 +699,11 @@ namespace Tomboy
return false;
}
+ public bool HasLinkTag (Gtk.TextIter iter)
+ {
+ return iter.HasTag (LinkTag) || iter.HasTag (UrlTag) || iter.HasTag (BrokenLinkTag);
+ }
+
public DepthNoteTag GetDepthTag(int depth, Pango.Direction direction)
{
string name = "depth:" + depth + ":" + direction;
@@ -702,6 +726,45 @@ namespace Tomboy
return tag;
}
+
+ /// <summary>
+ /// Maps a Gtk.TextTag to ChangeType for saving notes
+ /// </summary>
+ /// <param name="tag">Gtk.TextTag to map</param>
+ /// <returns>ChangeType to save this NoteTag</returns>
+ public ChangeType GetChangeType (Gtk.TextTag tag)
+ {
+ ChangeType change;
+
+ // Use tag Name for Gtk.TextTags
+ switch (tag.Name)
+ {
+ // For extensibility, add Gtk.TextTag names here
+ default:
+ change = ChangeType.OtherDataChanged;
+ break;
+ }
+
+ // Use SaveType for NoteTags
+ NoteTag note_tag = tag as NoteTag;
+ if (note_tag != null) {
+ switch (note_tag.SaveType)
+ {
+ case TagSaveType.Meta:
+ change = ChangeType.OtherDataChanged;
+ break;
+ case TagSaveType.Content:
+ change = ChangeType.ContentChanged;
+ break;
+ case TagSaveType.NoSave:
+ default:
+ change = ChangeType.NoChange;
+ break;
+ }
+ }
+
+ return change;
+ }
public DynamicNoteTag CreateDynamicTag (string tag_name)
{
diff --git a/Tomboy/NoteWindow.cs b/Tomboy/NoteWindow.cs
index 9efb78a..cc8be4f 100644
--- a/Tomboy/NoteWindow.cs
+++ b/Tomboy/NoteWindow.cs
@@ -22,6 +22,7 @@ namespace Tomboy
Gtk.ScrolledWindow editor_window;
NoteFindBar find_bar;
Gtk.ToolButton delete;
+ Gtk.Box template_widget;
GlobalKeybinder global_keys;
InterruptableTimeout mark_set_timeout;
@@ -71,6 +72,9 @@ namespace Tomboy
toolbar = MakeToolbar ();
toolbar.Show ();
+
+ template_widget = MakeTemplateBar ();
+
// The main editor widget
editor = new NoteEditor (note.Buffer);
editor.PopulatePopup += OnPopulatePopup;
@@ -99,6 +103,7 @@ namespace Tomboy
Gtk.VBox box = new Gtk.VBox (false, 2);
box.PackStart (toolbar, false, false, 0);
+ box.PackStart (template_widget, false, false, 0);
box.PackStart (editor_window, true, true, 0);
box.PackStart (find_bar, false, false, 0);
@@ -547,6 +552,76 @@ namespace Tomboy
return menu;
}
+ private Gtk.Box MakeTemplateBar ()
+ {
+ // TODO: Move these to static area
+ Tag template_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
+ Tag template_save_size_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSaveSizeSystemTag);
+ Tag template_save_selection_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSaveSelectionSystemTag);
+ Tag template_save_title_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSaveTitleSystemTag);
+
+ var bar = new Gtk.VBox ();
+
+ var infoLabel = new Gtk.Label (Catalog.GetString ("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."));
+ infoLabel.Wrap = true;
+
+ var untemplateButton = new Gtk.Button ();
+ untemplateButton.Label = Catalog.GetString ("Convert to regular note");
+ untemplateButton.Clicked += (o, e) => {
+ note.RemoveTag (template_tag);
+ };
+
+ var saveSizeCheckbutton = new Gtk.CheckButton (Catalog.GetString ("Save Si_ze"));
+ saveSizeCheckbutton.Active = note.ContainsTag (template_save_size_tag);
+ saveSizeCheckbutton.Toggled += (o, e) => {
+ if (saveSizeCheckbutton.Active)
+ note.AddTag (template_save_size_tag);
+ else
+ note.RemoveTag (template_save_size_tag);
+ };
+
+ var saveSelectionCheckbutton = new Gtk.CheckButton (Catalog.GetString ("Save Se_lection"));
+ saveSelectionCheckbutton.Active = note.ContainsTag (template_save_selection_tag);
+ saveSelectionCheckbutton.Toggled += (o, e) => {
+ if (saveSelectionCheckbutton.Active)
+ note.AddTag (template_save_selection_tag);
+ else
+ note.RemoveTag (template_save_selection_tag);
+ };
+
+ var saveTitleCheckbutton = new Gtk.CheckButton (Catalog.GetString ("Save _Title"));
+ saveTitleCheckbutton.Active = note.ContainsTag (template_save_title_tag);
+ saveTitleCheckbutton.Toggled += (o, e) => {
+ if (saveTitleCheckbutton.Active)
+ note.AddTag (template_save_title_tag);
+ else
+ note.RemoveTag (template_save_title_tag);
+ };
+
+ bar.PackStart (infoLabel);
+ bar.PackStart (untemplateButton);
+ bar.PackStart (saveSizeCheckbutton);
+ bar.PackStart (saveSelectionCheckbutton);
+ bar.PackStart (saveTitleCheckbutton);
+
+ if (note.ContainsTag (template_tag))
+ bar.ShowAll ();
+
+ note.TagAdded += delegate (Note taggedNote, Tag tag) {
+ if (taggedNote == note && tag == template_tag)
+ bar.ShowAll ();
+ };
+
+ note.TagRemoved += delegate (Note taggedNote, string tag) {
+ if (taggedNote == note && tag == template_tag.NormalizedName)
+ bar.HideAll ();
+ };
+
+ return bar;
+ }
+
//
// Find context menu
//
diff --git a/Tomboy/Notebooks/Notebook.cs b/Tomboy/Notebooks/Notebook.cs
index 7e2daf3..c41124e 100644
--- a/Tomboy/Notebooks/Notebook.cs
+++ b/Tomboy/Notebooks/Notebook.cs
@@ -109,31 +109,53 @@ namespace Tomboy.Notebooks
public virtual Note GetTemplateNote ()
{
NoteManager noteManager = Tomboy.DefaultNoteManager;
- Note note = noteManager.Find (templateNoteTitle);
- if (note == null) {
- note =
+ Note template_note = null;
+ Tag template_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
+ Tag notebook_tag = TagManager.GetOrCreateSystemTag (NotebookTagPrefix + Name);
+ foreach (Note note in template_tag.Notes) {
+ if (note.ContainsTag (notebook_tag)) {
+ template_note = note;
+ break;
+ }
+ }
+
+ if (template_note == null) {
+ template_note =
noteManager.Create (templateNoteTitle,
NoteManager.GetNoteTemplateContent (templateNoteTitle));
// Select the initial text
- NoteBuffer buffer = note.Buffer;
+ NoteBuffer buffer = template_note.Buffer;
Gtk.TextIter iter = buffer.GetIterAtLineOffset (2, 0);
buffer.MoveMark (buffer.SelectionBound, iter);
buffer.MoveMark (buffer.InsertMark, buffer.EndIter);
// Flag this as a template note
- Tag tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
- note.AddTag (tag);
+ template_note.AddTag (template_tag);
// Add on the notebook system tag so Tomboy
// will persist the tag/notebook across sessions
// if no other notes are added to the notebook.
- tag = TagManager.GetOrCreateSystemTag (NotebookTagPrefix + Name);
- note.AddTag (tag);
+ template_note.AddTag (notebook_tag);
- note.QueueSave (ChangeType.ContentChanged);
+ template_note.QueueSave (ChangeType.ContentChanged);
}
+ return template_note;
+ }
+
+ public Note CreateNotebookNote ()
+ {
+ string temp_title;
+ Note template = GetTemplateNote ();
+ NoteManager note_manager = Tomboy.DefaultNoteManager;
+
+ temp_title = note_manager.GetUniqueName (Catalog.GetString ("New Note"), note_manager.Notes.Count);
+ Note note = note_manager.CreateNoteFromTemplate (temp_title, template);
+
+ // Add the notebook tag
+ note.AddTag (tag);
+
return note;
}
diff --git a/Tomboy/Notebooks/NotebookManager.cs b/Tomboy/Notebooks/NotebookManager.cs
index 9c0fb44..2a7d4da 100644
--- a/Tomboy/Notebooks/NotebookManager.cs
+++ b/Tomboy/Notebooks/NotebookManager.cs
@@ -208,9 +208,15 @@ namespace Tomboy.Notebooks
/// </returns>
public static bool GetNotebookIter (Notebook notebook, out Gtk.TreeIter iter)
{
- if (notebookMap.ContainsKey (notebook.NormalizedName) == true) {
- iter = notebookMap [notebook.NormalizedName];
- return true;
+ Gtk.TreeIter current_iter;
+ if (sortedNotebooks.GetIterFirst (out current_iter)) {
+ do {
+ Notebook current_notebook = (Notebook)sortedNotebooks.GetValue (current_iter, 0);
+ if (notebook == current_notebook) {
+ iter = current_iter;
+ return true;
+ }
+ } while (sortedNotebooks.IterNext (ref current_iter));
}
iter = Gtk.TreeIter.Zero;
@@ -369,10 +375,12 @@ namespace Tomboy.Notebooks
if (response != (int) Gtk.ResponseType.Yes)
return;
+ // Grab the template note before removing all the notebook tags
+ Note templateNote = notebook.GetTemplateNote ();
+
DeleteNotebook (notebook);
// Delete the template note
- Note templateNote = notebook.GetTemplateNote ();
if (templateNote != null) {
NoteManager noteManager = Tomboy.DefaultNoteManager;
noteManager.Delete (templateNote);
diff --git a/Tomboy/Notebooks/NotebookNewNoteMenuItem.cs b/Tomboy/Notebooks/NotebookNewNoteMenuItem.cs
index 04e7f72..a28fd8a 100644
--- a/Tomboy/Notebooks/NotebookNewNoteMenuItem.cs
+++ b/Tomboy/Notebooks/NotebookNewNoteMenuItem.cs
@@ -47,7 +47,9 @@ namespace Tomboy.Notebooks
note = noteManager.Create ();
if (templateNote != null) {
// Use the body from the template note
- string xmlContent = templateNote.XmlContent.Replace (templateNote.Title, note.Title);
+ string xmlContent = templateNote.XmlContent.Replace (XmlEncoder.Encode (templateNote.Title),
+ XmlEncoder.Encode (note.Title));
+ xmlContent = NoteManager.SanitizeXmlContent (xmlContent);
note.XmlContent = xmlContent;
}
diff --git a/Tomboy/Notebooks/NotebookNoteAddin.cs b/Tomboy/Notebooks/NotebookNoteAddin.cs
index 201db5a..b066e54 100644
--- a/Tomboy/Notebooks/NotebookNoteAddin.cs
+++ b/Tomboy/Notebooks/NotebookNoteAddin.cs
@@ -11,6 +11,16 @@ namespace Tomboy.Notebooks
Gtk.Menu menu;
static Gdk.Pixbuf notebookIcon;
static Gdk.Pixbuf newNotebookIcon;
+ static Tag templateTag;
+
+ static Tag TemplateTag
+ {
+ get {
+ if (templateTag == null)
+ templateTag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
+ return templateTag;
+ }
+ }
static Gdk.Pixbuf NotebookIcon
{
@@ -53,6 +63,18 @@ namespace Tomboy.Notebooks
NotebookManager.NoteAddedToNotebook += OnNoteAddedToNotebook;
NotebookManager.NoteRemovedFromNotebook += OnNoteRemovedFromNotebook;
+
+
+ Note.TagAdded += delegate (Note taggedNote, Tag tag) {
+ if (taggedNote == Note && tag == TemplateTag)
+ UpdateButtonSensitivity (true);
+ };
+
+ // TODO: Make sure this is handled in NotebookNoteAddin, too
+ Note.TagRemoved += delegate (Note taggedNote, string tag) {
+ if (taggedNote == Note && tag == TemplateTag.NormalizedName)
+ UpdateButtonSensitivity (false);
+ };
}
public override void Shutdown ()
@@ -77,18 +99,17 @@ namespace Tomboy.Notebooks
if (toolButton == null) {
InitializeToolButton ();
-
- // Disable the notebook button if this note is a template note
- Tag templateTag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
- if (Note.ContainsTag (templateTag) == true) {
- toolButton.Sensitive = false;
-
- // Also prevent notebook templates from being deleted
- if (NotebookManager.GetNotebookFromNote (Note) != null)
- Note.Window.DeleteButton.Sensitive = false;
- }
+ UpdateButtonSensitivity (Note.ContainsTag (TemplateTag));
}
}
+
+ private void UpdateButtonSensitivity (bool isTemplate)
+ {
+ if (toolButton != null)
+ toolButton.Sensitive = !isTemplate;
+ if (Note.HasWindow)
+ Note.Window.DeleteButton.Sensitive = !isTemplate || NotebookManager.GetNotebookFromNote (Note) == null;
+ }
void OnMenuShown (object sender, EventArgs args)
{
diff --git a/Tomboy/PreferencesDialog.cs b/Tomboy/PreferencesDialog.cs
index d6c5a42..7619446 100644
--- a/Tomboy/PreferencesDialog.cs
+++ b/Tomboy/PreferencesDialog.cs
@@ -482,7 +482,7 @@ namespace Tomboy
selectedSyncAddin = syncAddinStore.GetValue (active_iter, 0) as SyncServiceAddin;
if (selectedSyncAddin != null)
- syncAddinPrefsWidget = selectedSyncAddin.CreatePreferencesControl ();
+ syncAddinPrefsWidget = selectedSyncAddin.CreatePreferencesControl (OnSyncAddinPrefsChanged);
if (syncAddinPrefsWidget == null) {
Gtk.Label l = new Gtk.Label (Catalog.GetString ("Not configurable"));
l.Yalign = 0.5f;
@@ -1101,7 +1101,7 @@ namespace Tomboy
syncAddinStore.GetValue (iter, 0) as SyncServiceAddin;
if (newAddin != null) {
selectedSyncAddin = newAddin;
- syncAddinPrefsWidget = selectedSyncAddin.CreatePreferencesControl ();
+ syncAddinPrefsWidget = selectedSyncAddin.CreatePreferencesControl (OnSyncAddinPrefsChanged);
if (syncAddinPrefsWidget == null) {
Gtk.Label l = new Gtk.Label (Catalog.GetString ("Not configurable"));
l.Yalign = 0.5f;
@@ -1113,7 +1113,7 @@ namespace Tomboy
syncAddinPrefsContainer.PackStart (syncAddinPrefsWidget, false, false, 0);
resetSyncAddinButton.Sensitive = false;
- saveSyncAddinButton.Sensitive = true;
+ saveSyncAddinButton.Sensitive = false;
}
} else {
selectedSyncAddin = null;
@@ -1277,6 +1277,13 @@ namespace Tomboy
dialog.Destroy ();
}
}
+
+ void OnSyncAddinPrefsChanged (object sender, EventArgs args)
+ {
+ // Enable/disable the save button based on required fields
+ if (selectedSyncAddin != null)
+ saveSyncAddinButton.Sensitive = selectedSyncAddin.AreSettingsValid;
+ }
void OpenTemplateButtonClicked (object sender, EventArgs args)
{
diff --git a/Tomboy/RecentChanges.cs b/Tomboy/RecentChanges.cs
index 9f6547c..8d90a06 100644
--- a/Tomboy/RecentChanges.cs
+++ b/Tomboy/RecentChanges.cs
@@ -1420,7 +1420,9 @@ namespace Tomboy
note = manager.Create ();
if (templateNote != null) {
// Use the body from the template note
- string xmlContent = templateNote.XmlContent.Replace (templateNote.Title, note.Title);
+ string xmlContent = templateNote.XmlContent.Replace (XmlEncoder.Encode (templateNote.Title),
+ XmlEncoder.Encode (note.Title));
+ xmlContent = NoteManager.SanitizeXmlContent (xmlContent);
note.XmlContent = xmlContent;
}
diff --git a/Tomboy/Synchronization/SyncManager.cs b/Tomboy/Synchronization/SyncManager.cs
index 832b34b..a175929 100644
--- a/Tomboy/Synchronization/SyncManager.cs
+++ b/Tomboy/Synchronization/SyncManager.cs
@@ -232,14 +232,19 @@ namespace Tomboy.Sync
static void HandleNoteBufferChanged (Note note)
{
- // If note text changes, kill the timer. It will
- // automatically be resurrected once a Save occurs.
+ // Note changed, iff a sync is coming up we kill the
+ // timer to avoid interupting the user (we want to
+ // make sure not to sync more often than the user's pref)
if (syncThread == null && autosyncTimer != null) {
- Logger.Debug ("Note edited...killing autosync timer until next save or delete event");
- autosyncTimer.Dispose ();
- autosyncTimer = null;
+ TimeSpan timeSinceLastCheck =
+ DateTime.Now - lastBackgroundCheck;
+ if (timeSinceLastCheck.TotalMinutes > autosyncTimeoutPrefMinutes - 1) {
+ Logger.Debug ("Note edited...killing autosync timer until next save or delete event");
+ autosyncTimer.Dispose ();
+ autosyncTimer = null;
+ NoteMgr.NoteBufferChanged -= HandleNoteBufferChanged;
+ }
}
- NoteMgr.NoteBufferChanged -= HandleNoteBufferChanged;
}
static void Preferences_SettingChanged (object sender, EventArgs args)
@@ -271,8 +276,8 @@ namespace Tomboy.Sync
Logger.Debug ("Autosync pref changed...restarting sync timer");
autosyncTimeoutPrefMinutes = autosyncTimeoutPrefMinutes >= 5 ? autosyncTimeoutPrefMinutes : 5;
lastBackgroundCheck = DateTime.Now;
- // Perform a sync one minute after setting change
- currentAutosyncTimeoutMinutes = 1;
+ // Perform a sync no sooner than user specified
+ currentAutosyncTimeoutMinutes = autosyncTimeoutPrefMinutes;
autosyncTimer = new Timer ((o) => BackgroundSyncChecker (),
null,
currentAutosyncTimeoutMinutes * 60000,
diff --git a/Tomboy/Synchronization/SyncServiceAddin.cs b/Tomboy/Synchronization/SyncServiceAddin.cs
index 3377877..c5a94ac 100644
--- a/Tomboy/Synchronization/SyncServiceAddin.cs
+++ b/Tomboy/Synchronization/SyncServiceAddin.cs
@@ -23,9 +23,11 @@ namespace Tomboy.Sync
/// Creates a Gtk.Widget that's used to configure the service. This
/// will be used in the Synchronization Preferences. Preferences should
/// not automatically be saved by a GConf Property Editor. Preferences
- /// should be saved when SaveConfiguration () is called.
+ /// should be saved when SaveConfiguration () is called. requiredPrefChanged
+ /// should be called when a required setting is changed.
/// </summary>
- public abstract Gtk.Widget CreatePreferencesControl ();
+ /// <param name="requiredPrefChanged">Delegate to be called when a required preference is changed</param>
+ public abstract Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged);
/// <summary>
/// The Addin should verify and check the connection to the service
@@ -46,6 +48,15 @@ namespace Tomboy.Sync
{
get;
}
+
+ /// <summary>
+ /// Returns true if required settings are valid in the widget
+ /// (Required setings are non-empty)
+ /// </summary>
+ public virtual bool AreSettingsValid
+ {
+ get { return true; }
+ }
/// <summary>
/// The name that will be shown in the preferences to distinguish
diff --git a/Tomboy/TagManager.cs b/Tomboy/TagManager.cs
index 0063ded..6b5d45d 100644
--- a/Tomboy/TagManager.cs
+++ b/Tomboy/TagManager.cs
@@ -25,6 +25,9 @@ namespace Tomboy
/// certain places such as, Search All Notes Window, Main Menu, etc.
/// </summary>
public static string TemplateNoteSystemTag = "template";
+ public static string TemplateNoteSaveSizeSystemTag = TemplateNoteSystemTag + ":save-size";
+ public static string TemplateNoteSaveSelectionSystemTag = TemplateNoteSystemTag + ":save-selection";
+ public static string TemplateNoteSaveTitleSystemTag = TemplateNoteSystemTag + ":save-title";
#region Constructors
static TagManager ()
diff --git a/Tomboy/Watchers.cs b/Tomboy/Watchers.cs
index 4c906d8..2be096d 100644
--- a/Tomboy/Watchers.cs
+++ b/Tomboy/Watchers.cs
@@ -755,7 +755,7 @@ namespace Tomboy
return;
// Don't create links inside URLs
- if (title_start.HasTag (Note.TagTable.UrlTag))
+ if (Note.TagTable.HasLinkTag (title_start))
return;
Logger.Debug ("Matching Note title '{0}' at {1}-{2}...",
@@ -930,16 +930,19 @@ namespace Tomboy
match = match.NextMatch ()) {
System.Text.RegularExpressions.Group group = match.Groups [1];
- Logger.Debug ("Highlighting wikiword: '{0}' at offset {1}",
- group,
- group.Index);
-
Gtk.TextIter start_cpy = start;
start_cpy.ForwardChars (group.Index);
end = start_cpy;
end.ForwardChars (group.Length);
+ if (Note.TagTable.HasLinkTag (start_cpy))
+ break;
+
+ Logger.Debug ("Highlighting wikiword: '{0}' at offset {1}",
+ group,
+ group.Index);
+
if (Manager.Find (group.ToString ()) == null) {
Buffer.ApplyTag (broken_link_tag, start_cpy, end);
}
@@ -1132,8 +1135,8 @@ namespace Tomboy
void OnTagRemoved (Note note, string tag_name)
{
Tag tag = TagManager.GetTag (tag_name);
- Logger.Debug ("Watchers.OnTagRemoved popularity count: {0}", tag.Popularity);
- if (tag.Popularity == 0)
+ Logger.Debug ("Watchers.OnTagRemoved popularity count: {0}", tag != null ? tag.Popularity : 0);
+ if (tag != null && tag.Popularity == 0)
TagManager.RemoveTag (tag);
}
}
diff --git a/configure b/configure
index a55975e..d6f38d3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for tomboy 1.7.3.
+# Generated by GNU Autoconf 2.68 for tomboy 1.7.4.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tomboy'
PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='tomboy 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='tomboy 1.7.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1451,7 +1451,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tomboy 1.7.3 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.7.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1525,7 +1525,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 1.7.3:";;
+ short | recursive ) echo "Configuration of tomboy 1.7.4:";;
esac
cat <<\_ACEOF
@@ -1692,7 +1692,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 1.7.3
+tomboy configure 1.7.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2057,7 +2057,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tomboy $as_me 1.7.3, which was
+It was created by tomboy $as_me 1.7.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2873,7 +2873,7 @@ fi
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='1.7.3'
+ VERSION='1.7.4'
cat >>confdefs.h <<_ACEOF
@@ -16742,7 +16742,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tomboy $as_me 1.7.3, which was
+This file was extended by tomboy $as_me 1.7.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16808,7 +16808,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-tomboy config.status 1.7.3
+tomboy config.status 1.7.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index e1de3a9..3b39ef4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.7.3)
+AC_INIT(tomboy, 1.7.4)
AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
AM_INIT_AUTOMAKE([foreign tar-ustar])
AM_MAINTAINER_MODE
diff --git a/po/es.po b/po/es.po
index aa75b71..eea205b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,13 +12,13 @@ msgstr ""
"Project-Id-Version: tomboy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-07-10 12:21+0000\n"
-"PO-Revision-Date: 2011-07-10 15:37+0200\n"
+"POT-Creation-Date: 2011-08-20 21:18+0000\n"
+"PO-Revision-Date: 2011-08-21 14:43+0200\n"
"Last-Translator: Jorge González <jorgegonz at svn.gnome.org>\n"
"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: KBabel 1.11.4\n"
@@ -711,13 +711,11 @@ msgstr "Comenzar a sincronizar las notas"
#. Addin's tab caption
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
-#| msgid "Ad_vanced"
msgid "Advanced"
msgstr "Avanzadas"
#. Menu Note Count option
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-#| msgid "Minimum number of notes to show in menu"
msgid "Minimum number of notes to show in Recent list (maximum 18)"
msgstr ""
"Número mínimo de notas que mostrar en la lista de recientes (máximo 18)"
@@ -1208,8 +1206,10 @@ msgid "Could not save the files in \"{0}\""
msgstr "No se pudieron guardar los archivos «{0}»"
#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Crear carpeta de destino para "
+#, csharp-format
+#| msgid "Create destination folder for "
+msgid "Create destination folder for {0} export"
+msgstr "Crear carpeta de destino para exportar {0}"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1366,22 +1366,25 @@ msgstr "Cuaderno de _notas nuevo…"
msgid "New Note {0}"
msgstr "Nota nueva {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "¿Desea eliminar esta nota?"
+#: ../Tomboy/Note.cs:1579
+#, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "¿Quiere eliminar «{0}»?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1582
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "¿Desea eliminar esta nota?"
msgstr[1] "¿Desea eliminar estas {0} notas?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1593
msgid "If you delete a note it is permanently lost."
msgstr "Si borra esta nota se perderá permanentemente."
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1627
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1392,7 +1395,7 @@ msgstr ""
"espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
"detalles sobre el error en {1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1643
msgid "Error saving note data."
msgstr "Error al guardar los datos de la nota"
@@ -1999,40 +2002,40 @@ msgstr "_Buscar:"
msgid "Note"
msgstr "Nota"
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Último cambio"
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Coincidencias"
-#: ../Tomboy/RecentChanges.cs:562
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "Coincidir con el título"
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} coincidencia"
msgstr[1] "{0} coincidencias"
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Total: {0} nota"
msgstr[1] "Total: {0} notas"
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Coincide con: {0} nota"
msgstr[1] "Coincide con: {0} notas"
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -2040,11 +2043,11 @@ msgstr ""
"No se han encontrado resultados en el cuaderno de notas seleccionado.\n"
"Pulse aquí para buscar en todas las notas."
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "Pulse aquí para buscar en todos los cuadernos de notas"
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Notas"
@@ -2530,6 +2533,9 @@ msgstr "_Copiar la dirección del enlace"
msgid "_Open Link"
msgstr "_Abrir enlace"
+#~ msgid "Really delete this note?"
+#~ msgstr "¿Desea eliminar esta nota?"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "Exportar al último directorio usado en formato HTML"
diff --git a/po/gl.po b/po/gl.po
index 2ee6cbe..087c75f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy-master-po-gl-54142\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-04 21:46+0200\n"
-"PO-Revision-Date: 2011-07-04 21:46+0200\n"
+"POT-Creation-Date: 2011-08-16 19:24+0200\n"
+"PO-Revision-Date: 2011-08-16 19:24+0200\n"
"Last-Translator: Fran Diéguez <frandieguez at gnome.org>\n"
"Language-Team: Galician <gnome-l10n-gl at gnome.org>\n"
"Language: gl\n"
@@ -707,6 +707,16 @@ msgstr "Abre a xanela de buscar en todas as notas"
msgid "Start synchronizing notes"
msgstr "Comezar a sincronizar notas"
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avanzado"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Número mínimo de notas para mostrar na lista de recentes (máximo 18)"
+
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
msgstr "Que liga aquí?"
@@ -765,10 +775,26 @@ msgstr "Está seguro de que quere eliminar esta icona?"
msgid "If you remove an icon it is permanently lost."
msgstr "Se elimina unha icona perderase permanentemente."
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Non foi posíbel abrir o correo electrónico"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
msgid "HTML"
msgstr "HTML"
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destino para a exportación a HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exportar as notas ligadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Incluír todas as notas ligadas"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Exportar a HTML"
@@ -799,22 +825,6 @@ msgstr "O cartafol non existe."
msgid "Could not save the file \"{0}\""
msgstr "Non foi posíbel gardar o ficheiro «{0}»"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destino para a exportación a HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exportar as notas ligadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Incluír todas as notas ligadas"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Non foi posíbel abrir o correo electrónico"
-
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
msgid "_Folder Path:"
msgstr "Ruta do _cartafol:"
@@ -1061,10 +1071,6 @@ msgstr ""
"Produciuse un fallo ao gardar a configuración no anel de chaves coa seguinte "
"mensaxe:"
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Sitio web do Tomboy"
-
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
msgid "Connect to Server"
@@ -1114,6 +1120,10 @@ msgstr "Autorizando no navegador (prema para reiniciar a conexión)"
msgid "Set the default browser and try again"
msgstr "Configure o navegador predeterminado e probe outra vez"
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Sitio web do Tomboy"
+
#: ../Tomboy/ExportAllApplicationAddin.cs:53
msgid "Export All Notes to "
msgstr "Exportar tódalas notas a"
@@ -1248,22 +1258,6 @@ msgstr "O nome xa existe"
msgid "C_reate"
msgstr "C_rear"
-#. The templateNoteTite should show the name of the
-#. 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 "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Modelo de caderno de {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Todas as notas"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "C_adernos"
@@ -1303,10 +1297,26 @@ msgid "Delete the selected notebook"
msgstr "Eliminar o carderno seleccionado"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:285
+#: ../Tomboy/RecentChanges.cs:276
msgid "Notebooks"
msgstr "Cadernos"
+#. The templateNoteTite should show the name of the
+#. 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 "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Modelo de caderno de {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:183
+msgid "All Notes"
+msgstr "Todas as notas"
+
#: ../Tomboy/Notebooks/NotebookManager.cs:361
msgid "Really delete this notebook?"
msgstr "Está seguro de que quere eliminar este caderno?"
@@ -1979,44 +1989,44 @@ msgstr "Dependencias dos engadidos:"
msgid "_Search:"
msgstr "_Buscar:"
-#: ../Tomboy/RecentChanges.cs:359
+#: ../Tomboy/RecentChanges.cs:350
msgid "Note"
msgstr "Nota"
-#: ../Tomboy/RecentChanges.cs:381
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Último cambio"
-#: ../Tomboy/RecentChanges.cs:520
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Coincidencias"
-#: ../Tomboy/RecentChanges.cs:571
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "Coincidencia de título"
-#: ../Tomboy/RecentChanges.cs:574
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} coincidencia"
msgstr[1] "{0} coincidencias"
-#: ../Tomboy/RecentChanges.cs:588
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Total: {0} nota"
msgstr[1] "Total: {0} notas"
-#: ../Tomboy/RecentChanges.cs:599
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Coincidencias: {0} nota"
msgstr[1] "Coincidencias: {0} notas"
-#: ../Tomboy/RecentChanges.cs:611
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -2024,225 +2034,14 @@ msgstr ""
"Non foi posíbel atopar resultados no caderno de notas seleccionado.\n"
"Prema aquí para buscar en tódalas notas."
-#: ../Tomboy/RecentChanges.cs:617
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "Prema aquí para buscar en tódolos cadernos de notas"
-#: ../Tomboy/RecentChanges.cs:783
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Notas"
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Non foi posíbel crear unha nota nova"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Desenvolvemento primario:"
-
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Contribuidores:"
-
-#: ../Tomboy/Tomboy.cs:412
-msgid "translator-credits"
-msgstr ""
-"Fran Diéguez <frandieguez at ubuntu.com>, 2009, 2010.\n"
-"Antón Méixome <meixome at mancomun.org>, 2009.\n"
-"Ignacio Casal Quinteiro <icq at cvs.gnome.org>, 2005, 2006, 2007, 2008."
-
-#: ../Tomboy/Tomboy.cs:421
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Outros\n"
-
-#: ../Tomboy/Tomboy.cs:423
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Un aplicativo sinxelo e fácil de usar para tomar notas no escritorio."
-
-#: ../Tomboy/Tomboy.cs:433
-msgid "Homepage"
-msgstr "Páxina de inicio"
-
-#: ../Tomboy/Tomboy.cs:551
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Tomboy: Un aplicativo sinxelo e doado de usar para tomar notas no "
-"escritorio.\n"
-"Copyright © 2004-2007 Alex Graveley \n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"\n"
-"Copyright © 2004-2011 Otros\n"
-
-#: ../Tomboy/Tomboy.cs:565
-msgid ""
-"Usage:\n"
-" --version\t\t\tPrint version information.\n"
-" --help\t\t\tPrint this usage message.\n"
-" --note-path [path]\t\tLoad/store note data in this directory.\n"
-" --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Uso:\n"
-" --version\t\t\tImprime información da versión.\n"
-" --help\t\t\tImprime esta mensaxe de uso.\n"
-" --note-path [ruta]\t\tCargar ou almacenar datos da nota neste directorio.\n"
-" --search [texto]\t\tAbre a xanela buscar en todas as notas co texto a "
-"buscar.\n"
-
-#: ../Tomboy/Tomboy.cs:575
-msgid ""
-" --new-note\t\t\tCreate and display a new note.\n"
-" --new-note [title]\t\tCreate and display a new note, with a title.\n"
-" --open-note [title/url]\tDisplay the existing note matching title.\n"
-" --start-here\t\t\tDisplay the 'Start Here' note.\n"
-" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-" --new-note\t\t\tCrea e mostra unha nota.\n"
-" --new-note [título]\t\tCrea e mostra unha nova nota, cun título.\n"
-" --open-note [título/url]\tMostra a nota existente que coincida co título.\n"
-" --start-here\t\t\tMostra a nota 'Comezar aquí'.\n"
-" --highlight-search [texto]\tBuscar e realzar o texto coincidente na nota "
-"aberta.\n"
-
-#: ../Tomboy/Tomboy.cs:589
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versión {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nova)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Sobre o Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Non foi posíbel atopar o \"Manual de Notas de Tomboy\". Comprobe que a súa "
-"instalación rematou correctamente."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Non foi posíbel atopar a axuda"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Non é posíbel abrir a localización"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hoxe, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hoxe"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Onte, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Onte"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "fai {0} día, {1}"
-msgstr[1] "fai {0} días, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "fai {0} días"
-msgstr[1] "fai {0} días"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Mañá, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Mañán"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "En {0} día, {1}"
-msgstr[1] "En {0} días, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "En {0} día"
-msgstr[1] "En {0} días"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sen data"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sen título {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Xa existe unha nota co título <b>{0}</b>. Escolla outro nome para esta nota "
-"antes de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "O título da nota xa existe"
-
-#: ../Tomboy/Watchers.cs:587
-msgid "_Copy Link Address"
-msgstr "_Copiar a ligazón do enderezo"
-
-#: ../Tomboy/Watchers.cs:592
-msgid "_Open Link"
-msgstr "_Abrir a ligazón"
-
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
#, csharp-format
msgid ""
@@ -2513,6 +2312,217 @@ msgstr ""
"inicio. Engada «modprobe fuse» a /etc/init.d/boot.local ou «fuse» a /etc/"
"modules."
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Non foi posíbel crear unha nota nova"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Desenvolvemento primario:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Contribuidores:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Fran Diéguez <frandieguez at ubuntu.com>, 2009, 2010.\n"
+"Antón Méixome <meixome at mancomun.org>, 2009.\n"
+"Ignacio Casal Quinteiro <icq at cvs.gnome.org>, 2005, 2006, 2007, 2008."
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Outros\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Un aplicativo sinxelo e fácil de usar para tomar notas no escritorio."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Páxina de inicio"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Un aplicativo sinxelo e doado de usar para tomar notas no "
+"escritorio.\n"
+"Copyright © 2004-2007 Alex Graveley \n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"\n"
+"Copyright © 2004-2011 Otros\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+" --version\t\t\tPrint version information.\n"
+" --help\t\t\tPrint this usage message.\n"
+" --note-path [path]\t\tLoad/store note data in this directory.\n"
+" --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Uso:\n"
+" --version\t\t\tImprime información da versión.\n"
+" --help\t\t\tImprime esta mensaxe de uso.\n"
+" --note-path [ruta]\t\tCargar ou almacenar datos da nota neste directorio.\n"
+" --search [texto]\t\tAbre a xanela buscar en todas as notas co texto a "
+"buscar.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+" --new-note\t\t\tCreate and display a new note.\n"
+" --new-note [title]\t\tCreate and display a new note, with a title.\n"
+" --open-note [title/url]\tDisplay the existing note matching title.\n"
+" --start-here\t\t\tDisplay the 'Start Here' note.\n"
+" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+" --new-note\t\t\tCrea e mostra unha nota.\n"
+" --new-note [título]\t\tCrea e mostra unha nova nota, cun título.\n"
+" --open-note [título/url]\tMostra a nota existente que coincida co título.\n"
+" --start-here\t\t\tMostra a nota 'Comezar aquí'.\n"
+" --highlight-search [texto]\tBuscar e realzar o texto coincidente na nota "
+"aberta.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versión {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nova)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Sobre o Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Non foi posíbel atopar o \"Manual de Notas de Tomboy\". Comprobe que a súa "
+"instalación rematou correctamente."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Non foi posíbel atopar a axuda"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Non é posíbel abrir a localización"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hoxe, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hoxe"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Onte, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Onte"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "fai {0} día, {1}"
+msgstr[1] "fai {0} días, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "fai {0} días"
+msgstr[1] "fai {0} días"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Mañá, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Mañán"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "En {0} día, {1}"
+msgstr[1] "En {0} días, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "En {0} día"
+msgstr[1] "En {0} días"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sen data"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sen título {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Xa existe unha nota co título <b>{0}</b>. Escolla outro nome para esta nota "
+"antes de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "O título da nota xa existe"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copiar a ligazón do enderezo"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Abrir a ligazón"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "Último directorio de exportación en HTML"
diff --git a/po/id.po b/po/id.po
index deab290..cae1f65 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-30 11:16+0000\n"
-"PO-Revision-Date: 2011-05-16 08:32+0700\n"
+"POT-Creation-Date: 2011-07-19 07:37+0000\n"
+"PO-Revision-Date: 2011-08-18 16:21+0700\n"
"Last-Translator: Andika Triwidada <andika at gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome at i15n.org>\n"
"MIME-Version: 1.0\n"
@@ -30,26 +30,31 @@ msgstr "Pembuat catatan yang sederhana dan mudah dipakai"
msgid "Tomboy Applet Factory"
msgstr "Pabrik Aplet Tomboy"
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+#: ../data/tomboy.desktop.in.h:3
#: ../Tomboy/Tray.cs:579
msgid "Tomboy Notes"
msgstr "Tomboy Catatan"
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../data/GNOME_TomboyApplet.xml.h:1
+#: ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "_Selaraskan Catatan"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:2
+#: ../Tomboy/ActionManager.cs:164
msgid "_About"
msgstr "Tent_ang"
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../data/GNOME_TomboyApplet.xml.h:3
+#: ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "Ba_ntuan"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../data/GNOME_TomboyApplet.xml.h:4
+#: ../Tomboy/ActionManager.cs:153
#: ../Tomboy/Tray.cs:283
msgid "_Preferences"
msgstr "_Preferensi"
@@ -79,41 +84,38 @@ msgid "Custom Font Face"
msgstr "Fonta Gubahan"
#: ../data/tomboy.schemas.in.h:5
-#| msgid "Determines X coordinate of Search window; stored on Tomboy exit."
msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Menentukan koordinat X dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
#: ../data/tomboy.schemas.in.h:6
-#| msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Menentukan koordinat Y dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
#: ../data/tomboy.schemas.in.h:7
-#| msgid "Determines pixel height of Search window; stored on Tomboy exit."
msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Menentukan tinggi dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
#: ../data/tomboy.schemas.in.h:8
-#| msgid "Determines pixel width of Search window; stored on Tomboy exit."
msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Menentukan lebar dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Aktifkan daftar dibulet otomatis."
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Aktifkan Klik Tengah Tempel Pada Ikon."
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Aktifkan Ikon Baki Sistem"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Aktifkan penandaan KataWiki"
+#: ../data/tomboy.schemas.in.h:12
+#| msgid "Enable Auto bulleted lists."
+msgid "Enable automatic bulleted lists."
+msgstr "Aktifkan daftar dibulet otomatis."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Aktifkan penutupan catatan dengan tombol escape."
@@ -159,65 +161,65 @@ msgid "HTML Export All Linked Notes"
msgstr "Ekspor Ke HTML Semua Catatan Tertaut"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Direktori Terakhir Ekspor HTML"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "Ekspor Ke HTML Catatan Tertaut"
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr "Apabila dinonaktifkan, dialog konfirmasi \"Hapus Catatan\" tidak akan tampil."
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
msgid "If enable_custom_font is true, the font name set here will be used as the font when displaying notes."
msgstr "Bila enable_custom_font diisi true, nama fonta yang diisikan di sini akan dipakai sebagai fonta untuk menayangkan catatan."
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
msgid "If enabled, all notes that were open when Tomboy quit will automatically be reopened at startup."
msgstr "Bila difungsikan, semua catatan yang terbuka ketika Tomboy keluar akan otomatis dibuka ulang saat mulai."
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr "Bila diaktifkan, sebuah catatan terbuka dapat ditutup dengan menekan tombol escape."
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
msgid "If true, Tomboy's tray icon will be displayed in the notification area. Disabling this may be useful when another application is providing the functionality of the tray icon."
msgstr "Bila true, ikon baki Tomboy akan ditampilkan di area pemberitahuan. Mematikan ini mungkin berguna bila aplikasi lain menyediakan fungsionalitas ikon baki."
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
msgstr "Bila benar, salah eja akan digaris-bawahi merah, dan saran ejaan yang benar ditayangkan pada menu klik kanan."
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
msgid "If true, the desktop-global keybindings set in /apps/tomboy/global_keybindings will be enabled, allowing for useful Tomboy actions to be available from any application."
msgstr "Bila benar, keybinding desktop-global yand ditata di /apps/tomboy/global_keybindings akan diaktifkan, menyebabkan berbagai aksi Tomboy yang berguna tersedia dari sebarang aplikasi."
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
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."
msgstr "Bila benar, nama fonta yang diisikan di custom_font_face akan dipakai sebagai fonta ketika menampilkan catatan. Bila tidak fonta baku desktop akan dipakai."
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
msgstr "Menandakan bahwa plugin Pengimpor Catatan Lengket belum dijalankan, sehingga mesti otomatis jalan kala berikutnya Tomboy mulai."
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
msgstr "Bilangan bulat yang menentukan cacah minimum catatan yang ditampilkan di menu catatan Tomboy."
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
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 autosync is disabled. The lowest acceptable positive value is 5. Value is in minutes."
msgstr "Nilai bulat yang menyatakan seberapa sering perlu melakukan penyelarasan latar belakang dari catatan-catatan Anda (ketika penyelarasan diaktifkan). Sebarang nilai kurang dari 1 menyatakan bahwa penyelarasan otomatis dimatikan. Nilai positif terkecil yang dapat diterima adalah 5. Nilai dalam satuan menit."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
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 "Nilai bulat yang menandakan bila ada preferensi untuk selalu melakukan suatu tindakan spesifik ketika pertentangan terdeteksi, alih-alih bertanya ke pengguna. Nilai ini merujuk ke enumerasi internal. 0 menandakan bahwa pengguna ingin ditanyai ketika pertentangan terjadi, sehingga mereka mungkin bisa menangani setiap keadaan pertentangan secara kasus per kasus."
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
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 "Nilai bulat yang menandakan bila ada preferensi untuk selalu melakukan suatu perilaku pembaruan taut spesifik ketika sebuah catatan diubah namanya, alih-alih bertanya ke pengguna. Nilai ini merujuk ke enumerasi internal. 0 menandakan bahwa pengguna ingin ditanyai ketika mengubah nama suatu catatan mungkin mempengaruhi tautan yang ada di catatan-catatan lain. 1 menandakan bahwa tautan tersebut mesti dihapus secara otomatis. 2 menandakan bahwa teks tautan mesti diperbarui ke nama catatan baru sehingga itu akan tetap merujuk ke catatan yang diubah namanya."
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Direktori yang terakhir dipakai dalam Ekspor HTML"
+
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
msgstr "Perilaku Pembaruan Tautan Saat Mengubah Nama Catatan"
@@ -279,22 +281,18 @@ msgid "SSHFS Synchronization Server URL"
msgstr "URL Server Penyelarasan Jauh SSHFS"
#: ../data/tomboy.schemas.in.h:54
-#| msgid "Saved height of Search window"
msgid "Saved height of \"Search All Notes\" window"
msgstr "Tinggi tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:55
-#| msgid "Saved horizontal position of Search window"
msgid "Saved horizontal position of \"Search All Notes\" window"
msgstr "Posisi mendatar tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:56
-#| msgid "Saved vertical position of Search window"
msgid "Saved vertical position of \"Search All Notes\" window"
msgstr "Posisi tegak tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:57
-#| msgid "Saved width of Search window"
msgid "Saved width of \"Search All Notes\" window"
msgstr "Lebar tersimpan jendela \"Cari Semua Catatan\""
@@ -414,7 +412,8 @@ msgstr "_Berkas"
msgid "_New"
msgstr "_Baru"
-#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
+#: ../Tomboy/ActionManager.cs:131
+#: ../Tomboy/ActionManager.cs:172
msgid "Create a new note"
msgstr "Membuat catatan baru"
@@ -434,7 +433,8 @@ msgstr "_Hapus"
msgid "Delete the selected note"
msgstr "Menghapus catatan yang dipilih"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142
+#: ../Tomboy/NoteWindow.cs:406
msgid "_Close"
msgstr "_Tutup"
@@ -442,7 +442,8 @@ msgstr "_Tutup"
msgid "Close this window"
msgstr "Menutup jendela ini"
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
+#: ../Tomboy/ActionManager.cs:146
+#: ../Tomboy/Tray.cs:300
msgid "_Quit"
msgstr "_Keluar"
@@ -454,7 +455,8 @@ msgstr "Keluar dari Tomboy"
msgid "_Edit"
msgstr "_Sunting"
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+#: ../Tomboy/ActionManager.cs:154
+#: ../Tomboy/PreferencesDialog.cs:65
msgid "Tomboy Preferences"
msgstr "Preferensi Tomboy"
@@ -466,7 +468,8 @@ msgstr "_Isi"
msgid "Tomboy Help"
msgstr "Bantuan Tomboy"
-#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
+#: ../Tomboy/ActionManager.cs:165
+#: ../Tomboy/MacApplication.cs:233
msgid "About Tomboy"
msgstr "Tentang Tomboy"
@@ -478,7 +481,8 @@ msgstr "IkonBaki"
msgid "Create _New Note"
msgstr "Buat Catata_n Baru"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175
+#: ../Tomboy/NoteWindow.cs:349
msgid "_Search All Notes"
msgstr "_Cari di Semua Catatan"
@@ -490,11 +494,24 @@ msgstr "Membuka jendela Cari di Semua Catatan"
msgid "Start synchronizing notes"
msgstr "Memulai penyelarasan catatan"
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#| msgid "Ad_vanced"
+msgid "Advanced"
+msgstr "Tingkat Lanjut"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+#| msgid "Minimum number of notes to show in menu"
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Cacah minimal catatan yang ditampilkan di daftar Baru-baru ini (maksimal 18)"
+
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
msgstr "Apa yang mengait ke sini?"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(nihil)"
@@ -543,6 +560,26 @@ msgstr "Yakin menghapus ikon ini?"
msgid "If you remove an icon it is permanently lost."
msgstr "Bila Anda menghapus sebuah ikon dia akan hilang selamanya."
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Tidak dapat membuka surel"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Tujuan bagi Ekspor HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Ekspor catatan tertaut"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Sertakan semua catatan terkait lain"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Ekspor ke HTML"
@@ -557,10 +594,14 @@ msgid "Note exported successfully"
msgstr "Catatan sukses diekspor"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "Akses ditolak."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "Folder tidak ada."
@@ -569,22 +610,6 @@ msgstr "Folder tidak ada."
msgid "Could not save the file \"{0}\""
msgstr "Tidak dapat menyimpan berkas \"{0}\""
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Tujuan bagi Ekspor HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Ekspor catatan tertaut"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Sertakan semua catatan terkait lain"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Tidak dapat membuka surel"
-
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
msgid "_Folder Path:"
msgstr "Lokasi _Folder:"
@@ -625,7 +650,8 @@ msgstr "Sisipkan Tanda Waktu"
#. initial newline
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223
+#: ../Tomboy/Preferences.cs:154
msgid "dddd, MMMM d, h:mm tt"
msgstr "dddd, MMMM d, h:mm tt"
@@ -663,8 +689,11 @@ msgid "Appointments"
msgstr "Janji"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid "Change the <span weight=\"bold\">Today: Template</span> note to customize the text that new Today notes have."
-msgstr "Ubah catatan <span weight=\"bold\">Hari Ini: Templat</span> untuk menggubah teks yang dipunyai oleh catatan Hari Ini yang baru."
+#| msgid ""
+#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
+#| "the text that new Today notes have."
+msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
+msgstr "Ubah catatan <b>Hari Ini: Templat</b> untuk menggubah teks yang dipunyai oleh catatan Hari Ini yang baru."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -689,6 +718,12 @@ msgstr "Halaman {0} dari {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd/MM/yyyy, HH:mm:ss"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+#| msgid "Never rename links"
+msgid "Remove broken links"
+msgstr "Buang taut yang rusak"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Tambah suatu sketsa"
@@ -743,14 +778,16 @@ msgstr "Impor Catatan Lengket telah lengkap"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> dari <b>{1}</b> Catatan Lengket telah sukses diimpor."
+#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> dari <b>{1}</b> Catatan Lengket telah sukses diimpor."
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "Tanpa judul"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "Catatan Lengket:"
@@ -803,10 +840,6 @@ msgstr "Ada galat menyambung ke server. Ini mungkin disebabkan oleh nama penggun
msgid "Saving configuration to the GNOME keyring failed with the following message:"
msgstr "Menyimpan konfigurasi ke gantungan kunci GNOME gagal dengan pesan berikut:"
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Web Tomboy"
-
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
msgid "Connect to Server"
@@ -852,7 +885,106 @@ msgstr "Otorisasi di peramban (Tekan untuk mereset sambungan)"
msgid "Set the default browser and try again"
msgstr "Tata peramban baku dan coba lagi"
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Web Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#| msgid "HTML Export All Linked Notes"
+msgid "Export All Notes to "
+msgstr "Ekspor Semua Catatan ke"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#| msgid "Start synchronizing notes"
+msgid "Start exporting notes to "
+msgstr "Memulai mengekspor catatan ke"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#| msgid "Delete the selected notebook"
+msgid "Export selected notebook to "
+msgstr "Ekspor buku catatan yang dipilih ke"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "Mulai mengekspor buku catatan ke"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Perkakas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#| msgid "Export to HTML"
+msgid "Export"
+msgstr "Ekspor"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#| msgid "Export linked notes"
+msgid "Export your notes."
+msgstr "Ekspor catatan Anda."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#| msgid "HTML Export All Linked Notes"
+msgid "Export All Notes To "
+msgstr "Ekspor Semua Catatan Ke"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#| msgid "Delete Note_book"
+msgid "Export Selected Notebook To "
+msgstr "Ekspor Buku Catatan Yang Dipilih Ke"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+#| msgid "Could not read testfile."
+msgid "Could not export, access denied."
+msgstr "Tak bisa mengekspor, akses ditolak."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+#| msgid "Folder does not exist."
+msgid "Could not export, folder does not exist."
+msgstr "Tak bisa mengekspor, folder tidak ada."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+#| msgid "Your note was exported to \"{0}\"."
+msgid "Could not export: {0}"
+msgstr "Tak bisa mengekspor: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Galat tak dikenal."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "Catatan Belum Diberkaskan"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+#| msgid "Your note was exported to \"{0}\"."
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Catatan Anda diekspor ke \"{0}\"."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#| msgid "Note exported successfully"
+msgid "Notes exported successfully"
+msgstr "Catatan sukses diekspor"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+#| msgid "Could not save the file \"{0}\""
+msgid "Could not save the files in \"{0}\""
+msgstr "Tak dapat menyimpan berkas di \"{0}\""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+msgid "Create destination folder for "
+msgstr "Buat folder tujuan bagi"
+
+#: ../Tomboy/JumpListManager.cs:96
+#: ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "Cari Semua Catatan"
@@ -905,26 +1037,6 @@ msgstr "Nama sudah ada"
msgid "C_reate"
msgstr "_Buat"
-#. The templateNoteTite should show the name of the
-#. 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 "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Templat Notebook {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Semua Catatan"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Catatan Belum Diberkaskan"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "Note_book"
@@ -964,10 +1076,26 @@ msgid "Delete the selected notebook"
msgstr "Menghapus buku catatan yang dipilih"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
msgid "Notebooks"
msgstr "Notebook"
+#. The templateNoteTite should show the name of the
+#. 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 "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Templat Notebook {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:183
+msgid "All Notes"
+msgstr "Semua Catatan"
+
#: ../Tomboy/Notebooks/NotebookManager.cs:361
msgid "Really delete this notebook?"
msgstr "Yakin menghapus notebook ini?"
@@ -1001,32 +1129,39 @@ msgstr "Notebook"
msgid "_New notebook..."
msgstr "_Notebook Baru..."
-#: ../Tomboy/Note.cs:1568
+#: ../Tomboy/Note.cs:497
+#: ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Catatan Baru {0}"
+
+#: ../Tomboy/Note.cs:1578
msgid "Really delete this note?"
msgstr "Yakin hapus catatan ini?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1581
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Yakin hapus {0} catatan ini?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1592
msgid "If you delete a note it is permanently lost."
msgstr "Jika Anda menghapus catatan, isinya akan hilang."
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1626
#, csharp-format
msgid "An error occurred while saving your notes. Please check that you have sufficient disk space, and that you have appropriate rights on {0}. Error details can be found in {1}."
msgstr "Galat terjadi saat menyimpan catatan Anda. Silakan periksa bahwa Anda memiliki ruang cakram yang cukup, dan Anda memiliki hak yang sesuai pada {0}. Rincian galat dapat ditemukan di {1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1642
msgid "Error saving note data."
msgstr "Galat menyimpan data catatan."
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21
+#: ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "Templat Catatan Baru"
@@ -1109,7 +1244,8 @@ msgstr ""
"Bila Anda mengetikkan nama dari catatan lain pada catatan kini, dia juga akan ditautkan secara otomatis untuk Anda.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299
+#: ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "Mulai Di Sini"
@@ -1117,14 +1253,10 @@ msgstr "Mulai Di Sini"
msgid "Using Links in Tomboy"
msgstr "Memakai Tautan di Tomboy"
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Catatan Baru {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548
+#: ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "Uraikan catatan baru Anda di sini."
@@ -1210,115 +1342,119 @@ msgstr "Tutup Semua Catatan"
msgid "Search"
msgstr "Cari"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Temukan di catatan Anda (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+#| msgid "Search All Notes"
+msgid "Search your notes"
+msgstr "Cari catatan Anda"
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "Taut"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Tautkan teks terpilih ke sebuah catatan baru (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:459
+#| msgid "Link selected text to a new note (Ctrl-L)"
+msgid "Link selected text to a new note"
+msgstr "Tautkan teks terpilih ke sebuah catatan baru"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_Teks"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "Tata properti teks"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "_Perkakas"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "Gunakan alat pada catatan ini"
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "Menghapus catatan ini"
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:502
+#: ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Menyelaraskan Catatan"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
msgid "_Find..."
msgstr "_Cari..."
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "Cari _Berikutnya"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "Cari _Sebelumnya"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "Tidak dapat membuat catatan"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_Temukan: "
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "M_undur"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "Sela_njutnya"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "Te_bal"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "M_iring"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_Coret"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "_Penandaan"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "Ukuran Fonta"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "Raksasa"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_Besar"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "_Kecil"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "Besarkan Ukuran Fonta"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "Kecilkan Ukuran Fonta"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "Bulet"
@@ -1338,486 +1474,306 @@ msgstr "Penyelarasan"
msgid "Add-ins"
msgstr "Add-in"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "Periksa ejaan _saat mengetik"
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
msgstr "Salah eja akan digaris-bawahi warna merah, dengan saran pengejaan yang benar ditampilkan di menu konteks."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "Tandai Kata_Wiki"
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
msgstr "Fungsikan opsi ini untuk menandai kata <b>BerpenampilanSepertiIni</b>. Mengklik kata tersebut akan membuat satu catatan dengan nama tersebut."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "Aktifkan daftar di_bulet otomatis"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "Gunakan _fonta pilihan sendiri"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "Ketika mengubah nama catatan tertaut:"
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "Tanyakan padaku apa yang akan dilakukan"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "Tak pernah mengubah nama tautan"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "Selalu ubah nama tautan"
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
msgid "Use the new note template to specify the text that should be used when creating a new note."
msgstr "Gunakan templat catatan baru untuk menyatakan teks yang mesti dipakai ketika membuat suatu catatan baru."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "Buka Templat Catatan Baru"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "Mendengar _Tombol Singkat"
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
msgid "Hotkeys allow you to quickly access your notes from anywhere with a keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
msgstr "Kunci pintas memungkinkan Anda mengakses secara cepat catatan Anda dari manapun dengan menekan tombol. Contoh Kunci Pintas: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "Tampilkan _menu catatan"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "Buka \"Mulai Di_sini\""
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "Membuat catata_n baru"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "Membuka \"C_ari Semua Catatan\""
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "_Pelayan:"
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487
+#: ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "Tidak dapat dikonfigurasi"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "_Otomatis Selaraskan di Latar Belakang Setiap"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "Menit"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "Tingk_at lanjut..."
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "Add-in berikut terpasang"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "Dapatkan Add-In Lagi..."
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "_Aktifkan"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "_Nonaktif"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "Tak diimplementasikan"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "Preferensi {0}"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "Pilih Fonta Catatan"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "Opsi Penyelarasan Lainnya"
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
msgstr "Ketika pertentangan terdeteksi antara catatan lokal dan catatan pada server penyelarasan yang dikonfigurasi:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "Selalu tanyakan padaku apa yang akan dilakukan."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "Ubah nama catatan lokal saya."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "Gantikan catatan lokalku dengan pembaruan dari server."
-#: ../Tomboy/PreferencesDialog.cs:1149
-#| msgid "WARNING: Are you sure?"
+#: ../Tomboy/PreferencesDialog.cs:1142
msgid "Are you sure?"
msgstr "Anda yakin?"
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
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 "Membersihkan penataan penyelarasan Anda tidak disarankan. Anda mungkin dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Menata Ulang Pengaturan Penyelarasan"
-#: ../Tomboy/PreferencesDialog.cs:1166
-msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings"
+#: ../Tomboy/PreferencesDialog.cs:1159
+#| msgid ""
+#| "You have disabled the configured synchronization service. Your "
+#| "synchronization settings will now be cleared. You may be forced to "
+#| "synchronize all of your notes again when you save new settings"
+msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings."
msgstr "Anda telah mematikan layanan penyelarasan yang dikonfigurasi. Penataan penyelarasan Anda kini akan dibersihkan. Anda mungkin dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
-#: ../Tomboy/PreferencesDialog.cs:1244
+#: ../Tomboy/PreferencesDialog.cs:1237
msgid "Connection successful"
msgstr "Koneksi sukses"
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
msgstr "Tomboy siap menyelaraskan catatan Anda. Anda ingin menyelaraskan sekarang?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-#| msgid ""
-#| "Sorry, but something went wrong. Please check your information and try "
-#| "again. The {0} might be useful too."
msgid "Please check your information and try again. The log file {0} may contain more information about the error."
msgstr "Silakan periksa informasi Anda dan coba lagi. Berkas log {0} mungkin memuat informasi lebih banyak tentang galat."
-#: ../Tomboy/PreferencesDialog.cs:1281
-#| msgid "Error connecting :("
+#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
msgstr "Galat menyambung"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "Versi:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "Pembuat:"
-#: ../Tomboy/PreferencesDialog.cs:1371
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "Hak Cipta:"
-#: ../Tomboy/PreferencesDialog.cs:1377
+#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "Ketergantungan Add-in"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_Cari:"
-#: ../Tomboy/RecentChanges.cs:334
+#: ../Tomboy/RecentChanges.cs:350
msgid "Note"
msgstr "Catatan"
-#: ../Tomboy/RecentChanges.cs:356
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Terakhir Diubah"
-#: ../Tomboy/RecentChanges.cs:487
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Cocok"
-#: ../Tomboy/RecentChanges.cs:538
-#| msgid "{0} match"
-#| msgid_plural "{0} matches"
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "Judul cocok"
-#: ../Tomboy/RecentChanges.cs:541
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} cocok"
-#: ../Tomboy/RecentChanges.cs:555
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Total: {0} catatan"
-#: ../Tomboy/RecentChanges.cs:566
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Cocok: {0} catatan"
-#: ../Tomboy/RecentChanges.cs:702
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"Tak ditemukan hasil pada buku catatan yang dipilih.\n"
+"Klik disini untuk mencari di semua catatan."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Klik disini untuk mencari pada semua buku catatan"
+
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Catatan"
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Tidak dapat membuat catatan baru"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
+msgstr "Addin penyelarasan ini tidak didukung pada komputer Anda. Silakan pastikan Anda punya FUSE dan {0} terpasang dan tertata dengan benar."
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Pengembangan Primer:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Tidak dapat membaca testfile."
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Penyumbang:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Uji tulis gagal."
-#: ../Tomboy/Tomboy.cs:405
-msgid "translator-credits"
-msgstr ""
-"Andika Triwidada <andika at gmail.com>, 2009, 2010.\n"
-"Dirgita <dirgitadevina at yahoo.co.id>, 2010."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Waktu habis ketika menghubungi server."
-#: ../Tomboy/Tomboy.cs:414
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Hak Cipta © 2004-2007 Alex Graveley\n"
-"Hak Cipta © 2004-2010 Lainnya\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Galat ketika menghubungi server."
-#: ../Tomboy/Tomboy.cs:416
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "FUSE tidak dapat diaktifkan."
-#: ../Tomboy/Tomboy.cs:426
-msgid "Homepage"
-msgstr "Laman Web"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Galat terjadi ketika menyambung ke server yang dinyatakan:"
-#: ../Tomboy/Tomboy.cs:544
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai.\n"
-"Hak Cipta (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detail"
-#: ../Tomboy/Tomboy.cs:556
-msgid ""
-"Usage:\n"
-" --version\t\t\tPrint version information.\n"
-" --help\t\t\tPrint this usage message.\n"
-" --note-path [path]\t\tLoad/store note data in this directory.\n"
-" --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Cara pakai:\n"
-" --version\t\t\tCetak informasi versi.\n"
-" --help\t\t\tCetak pesan cara pakai ini.\n"
-" --note-path [lokasi]\t\tMuat/simpan data catatan dalam direktori ini.\n"
-" --search [teks]\t\tBuka jendela cari di semua catatan dengan teks pencarian.\n"
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
+msgid "Status"
+msgstr "Status"
-#: ../Tomboy/Tomboy.cs:566
-msgid ""
-" --new-note\t\t\tCreate and display a new note.\n"
-" --new-note [title]\t\tCreate and display a new note, with a title.\n"
-" --open-note [title/url]\tDisplay the existing note matching title.\n"
-" --start-here\t\t\tDisplay the 'Start Here' note.\n"
-" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-" --new-note\t\t\tBuat dan tampilkan sebuah catatan baru.\n"
-" --new-note [title]\t\tBuat dan tampilkan sebuah catatan baru, dengan sebuah judul.\n"
-" --open-note [title/url]\tTampilkan catatan yang telah ada dengan judul cocok.\n"
-" --start-here\t\t\tTampilkan catatan 'Mulai Di Sini'.\n"
-" --highlight-search [teks]\tCari dan tandai teks di catatan yang dibuka.\n"
-
-#: ../Tomboy/Tomboy.cs:580
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versi {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (baru)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "Tent_ang Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid "The \"Tomboy Notes Manual\" could not be found. Please verify that your installation has been completed successfully."
-msgstr "\"Manual Catatan Tomboy\" tak ditemukan. Silahkan periksa bahwa instalasi Anda telah lengkap dan sukses."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Bantuan tak ditemukan"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Tak bisa membuka lokasi"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hari ini, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hari ini"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Kemarin, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Kemarin"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} hari lalu, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} hari lalu"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Besok, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Besok"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Dalam {0} hari, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Dalam {0} hari"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Tanpa Tanggal"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Nirjudul {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
-msgstr "Catatan dengan judul <b>{0}</b> telah ada. Silakan pilih nama lain bagi catatan ini sebelum melanjutkan."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Judul catatan telah terpakai"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Salin Alamat Taut"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Buka Taut"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
-msgstr "Addin penyelarasan ini tidak didukung pada komputer Anda. Silakan pastikan Anda punya FUSE dan {0} terpasang dan tertata dengan benar."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Tidak dapat membaca testfile."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Uji tulis gagal."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Waktu habis ketika menghubungi server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Galat ketika menghubungi server."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "FUSE tidak dapat diaktifkan."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Galat terjadi ketika menyambung ke server yang dinyatakan:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detail"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:126
-msgid "Status"
-msgstr "Status"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:236
-msgid "Acquiring sync lock..."
-msgstr "Menyiapkan pengunci sync..."
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
+msgid "Acquiring sync lock..."
+msgstr "Menyiapkan pengunci sync..."
#: ../Tomboy/Synchronization/SyncDialog.cs:239
msgid "Committing changes..."
@@ -1996,10 +1952,6 @@ msgstr "Pertentangan catatan terdeteksi"
msgid "The server version of \"{0}\" conflicts with your local note. What do you want to do with your local note?"
msgstr "Versi server dari \"{0}\" bertentangan dengan catatan lokal Anda. Apa yang ingin Anda lakukan dengan catatan lokal Anda?"
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Perkakas"
-
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
msgid "Could not enable FUSE"
@@ -2026,3 +1978,204 @@ msgstr ""
"\n"
"Untuk menghindari mendapat pertanyaan ini di masa mendatang, Anda mesti memuat FUSE saat startup. Tambahkan \"modprobe fuse\" ke /etc/init.d/boot.local atau \"fuse\" ke /etc/modules."
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Tidak dapat membuat catatan baru"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Pengembangan Primer:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Penyumbang:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Andika Triwidada <andika at gmail.com>, 2009, 2010.\n"
+"Dirgita <dirgitadevina at yahoo.co.id>, 2010."
+
+#: ../Tomboy/Tomboy.cs:424
+#| msgid ""
+#| "Copyright © 2004-2007 Alex Graveley\n"
+#| "Copyright © 2004-2010 Others\n"
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Hak Cipta © 2004-2007 Alex Graveley\n"
+"Hak Cipta © 2004-2011 Lainnya\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Laman Web"
+
+#: ../Tomboy/Tomboy.cs:554
+#| msgid ""
+#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
+#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+#| "\n"
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai.\n"
+"Hak Cipta © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Hak Cipta © 2004-2011 Lainnya\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+" --version\t\t\tPrint version information.\n"
+" --help\t\t\tPrint this usage message.\n"
+" --note-path [path]\t\tLoad/store note data in this directory.\n"
+" --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Cara pakai:\n"
+" --version\t\t\tCetak informasi versi.\n"
+" --help\t\t\tCetak pesan cara pakai ini.\n"
+" --note-path [lokasi]\t\tMuat/simpan data catatan dalam direktori ini.\n"
+" --search [teks]\t\tBuka jendela cari di semua catatan dengan teks pencarian.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+" --new-note\t\t\tCreate and display a new note.\n"
+" --new-note [title]\t\tCreate and display a new note, with a title.\n"
+" --open-note [title/url]\tDisplay the existing note matching title.\n"
+" --start-here\t\t\tDisplay the 'Start Here' note.\n"
+" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+" --new-note\t\t\tBuat dan tampilkan sebuah catatan baru.\n"
+" --new-note [title]\t\tBuat dan tampilkan sebuah catatan baru, dengan sebuah judul.\n"
+" --open-note [title/url]\tTampilkan catatan yang telah ada dengan judul cocok.\n"
+" --start-here\t\t\tTampilkan catatan 'Mulai Di Sini'.\n"
+" --highlight-search [teks]\tCari dan tandai teks di catatan yang dibuka.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versi {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (baru)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "Tent_ang Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid "The \"Tomboy Notes Manual\" could not be found. Please verify that your installation has been completed successfully."
+msgstr "\"Manual Catatan Tomboy\" tak ditemukan. Silahkan periksa bahwa instalasi Anda telah lengkap dan sukses."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Bantuan tak ditemukan"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Tak bisa membuka lokasi"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hari ini, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hari ini"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Kemarin, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Kemarin"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} hari lalu, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} hari lalu"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Besok, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Besok"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Dalam {0} hari, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Dalam {0} hari"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Tanpa Tanggal"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Nirjudul {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
+msgstr "Catatan dengan judul <b>{0}</b> telah ada. Silakan pilih nama lain bagi catatan ini sebelum melanjutkan."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Judul catatan telah terpakai"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Salin Alamat Taut"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Buka Taut"
+
diff --git a/po/ru.po b/po/ru.po
index 6bfb25d..b0f2233 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-19 14:45+0000\n"
-"PO-Revision-Date: 2011-03-19 20:45+0400\n"
-"Last-Translator: Yuri Myaseodov <omerta13 at yandex.ru>\n"
+"POT-Creation-Date: 2011-08-20 21:18+0000\n"
+"PO-Revision-Date: 2011-08-21 21:42+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13 at yandex.ru>\n"
"Language-Team: Russian <gnome-cyr at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -88,37 +88,42 @@ msgid "Custom Font Face"
msgstr "Другой шрифт"
#: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Определяет координату X окна поиска. Координата сохраняется при выходе из Tomboy."
+#| msgid "Determines X coordinate of Search window; stored on Tomboy exit."
+msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Определяет координату X окна «Искать во всех заметках». Координата сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Определяет координату Y окна поиска. Координата сохраняется при выходе из Tomboy."
+#| msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
+msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Определяет координату Y окна «Искать во всех заметках». Координата сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "Высота окна поиска в точках растра. Сохраняется при выходе из Tomboy."
+#| msgid "Determines pixel height of Search window; stored on Tomboy exit."
+msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Определяет высоту окна «Искать во всех заметках» в пикселах. Высота сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "Ширина окна поиска в точках растра. Сохраняется при выходе из Tomboy."
+#| msgid "Determines pixel width of Search window; stored on Tomboy exit."
+msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Определяет ширину окна «Искать во всех заметках» в пикселах. Ширина сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Включить автоматические списки"
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Включить вставку по среднему щелчку на значке"
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Включить пиктограмму в системном лотке"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Включить выделение ВикиСлов"
+#: ../data/tomboy.schemas.in.h:12
+#| msgid "Enable Auto bulleted lists."
+msgid "Enable automatic bulleted lists."
+msgstr "Включить автоматические маркированные списки."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Включить закрытие заметок клавишей Esc"
@@ -164,65 +169,65 @@ msgid "HTML Export All Linked Notes"
msgstr "Включать все связанные заметки при экспорте в HTML"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Последний каталог экспорта в HTML"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "Включать связанные заметки при экспорте в HTML"
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr "Если этот ключ не установлен, диалог подтверждения «Удалить заметку» не будет появляться."
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
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/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
msgid "If enabled, all notes that were open when Tomboy quit will automatically be reopened at startup."
msgstr "Если этот ключ установлен, все заметки, оставленные открытыми перед выходом, будут восстановлены при следующем запуске."
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr "Если этот ключ установлен, открытую заметку можно закрыть путём нажатия клавиши Esc."
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
msgid "If true, Tomboy's tray icon will be displayed in the notification area. Disabling this may be useful when another application is providing the functionality of the tray icon."
msgstr "Если этот ключ установлен, Tomboy будет показывать пиктограмму в системном лотке в области уведомлений. Отключение ключа может быть полезным, когда другое приложение предоставляет функциональность пиктограммы в системном лотке."
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
msgstr "Если этот ключ установлен, слова с орфографическими ошибками будут подчёркиваться красным. Варианты исправления будут предлагаться в контекстном меню по щелчку правой кнопкой мыши."
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
msgid "If true, the desktop-global keybindings set in /apps/tomboy/global_keybindings will be enabled, allowing for useful Tomboy actions to be available from any application."
msgstr "Если этот ключ установлен, будут включены глобальные комбинации клавиш из /apps/tomboy/global_keybindings, что позволит выполнять некоторые полезные действия с Tomboy во время работы в других приложениях."
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
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."
msgstr "Если этот ключ установлен, для показа заметок будет использоваться шрифт, заданный в custom_font_face. Иначе будет использоваться системный шрифт."
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
msgstr "Говорит о том, что расширение для импорта из Липких записок не запускалось, то есть оно должно быть автоматически запущено при следующем запуске Tomboy."
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
msgstr "Целое число, определяющее минимальное количество заметок, которые должны показываться в меню заметок Tomboy."
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
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 autosync is disabled. The lowest acceptable positive value is 5. Value is in minutes."
msgstr "Целое число, определяющее как часто выполнять фоновую синхронизацию заметок (если настроена). Любое значение меньше 1 отключает автоматическую синхронизацию. Минимальное значение равно 5. Указывается в минутах."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
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 означает необходимость запроса подтверждения, таким образом пользователь может обрабатывать каждую конфликтную ситуацию в отдельности."
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
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 означает, что пользователь хочет получить запрос, если переименование заметки может повлиять на ссылки, существующие в других заметках. 2 означает, что ссылка в тексте должна быть заменена на новое имя заметки, так чтобы продолжить ссылаться на переименованную заметку."
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Последний каталог, используемый в экспортировании HTML"
+
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
msgstr "Как обновлять ссылки на переименовываемую заметку"
@@ -284,20 +289,24 @@ msgid "SSHFS Synchronization Server URL"
msgstr "Адрес (URL) сервера синхронизации SSHFS"
#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Высота окна поиска"
+#| msgid "Saved height of Search window"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Сохранённое значение высоты окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Координата окна поиска по горизонтали"
+#| msgid "Saved horizontal position of Search window"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Сохранённое значение положения по горизонтали высоты окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Координата окна поиска по вертикали"
+#| msgid "Saved vertical position of Search window"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Сохранённое значение положения по вертикали высоты окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Ширина окна поиска"
+#| msgid "Saved width of Search window"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Сохранённое значение ширины окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:58
msgid "Selected Synchronization Service Addin"
@@ -497,11 +506,24 @@ msgstr "Открыть окно поиска во всех заметках"
msgid "Start synchronizing notes"
msgstr "Запустить синхронизацию заметок"
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+#| msgid "Ad_vanced"
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+#| msgid "Minimum number of notes to show in menu"
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Минимальное количество заметок в списке недавних заметок (максимум — 18)"
+
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
msgstr "Ссылки сюда"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(нет)"
@@ -550,6 +572,26 @@ msgstr "Вы действительно хотите удалить этот з
msgid "If you remove an icon it is permanently lost."
msgstr "Если вы удалите значок, он будет утерян навсегда."
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Не удалось открыть адрес электронной почты"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Папка для экспорта в HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Экспортировать связанные заметки"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Включить все прочие связанные заметки"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Экспортировать в HTML"
@@ -564,10 +606,14 @@ msgid "Note exported successfully"
msgstr "Заметка успешно экспортирована"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "Доступ запрещён."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "Папка не существует."
@@ -576,22 +622,6 @@ msgstr "Папка не существует."
msgid "Could not save the file \"{0}\""
msgstr "Не удалось сохранить файл «{0}»"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Папка для экспорта в HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Экспортировать связанные заметки"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Включить все прочие связанные заметки"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Не удалось открыть адрес электронной почты"
-
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
msgid "_Folder Path:"
msgstr "П_уть к папке:"
@@ -671,8 +701,11 @@ msgid "Appointments"
msgstr "Встречи"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid "Change the <span weight=\"bold\">Today: Template</span> note to customize the text that new Today notes have."
-msgstr "Измените заметку <span weight=\"bold\">Сегодня: Шаблон</span>, чтобы указать текст, появляющийся в заметках дня."
+#| msgid ""
+#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
+#| "the text that new Today notes have."
+msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
+msgstr "Изменить заметку <b>Сегодня: Шаблон</b>, чтобы изменить текст для заметок дня."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -697,6 +730,12 @@ msgstr "Страница {0} из {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd.MM.yyyy, hh:mm:ss tt"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+#| msgid "Never rename links"
+msgid "Remove broken links"
+msgstr "Удалить битые ссылки"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Добавить набросок"
@@ -725,8 +764,8 @@ msgid "Server or username field is empty."
msgstr "Сервер или имя пользователя не указаны."
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+msgid "SSH"
+msgstr "SSH"
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
@@ -751,14 +790,18 @@ msgstr "Импорт из апплета Липкие записки завер
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "Успешно импортировано <b>{0}</b> из <b>{1}</b> записок."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> заметка из <b>{1}</b> успешно импортирована."
+msgstr[1] "<b>{0}</b> заметки из <b>{1}</b> успешно импортированы."
+msgstr[2] "<b>{0}</b> заметок из <b>{1}</b> успешно импортированы."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "Без названия"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "Липкая записка: "
@@ -795,8 +838,8 @@ msgid "URL, username, or password field is empty."
msgstr "URL, имя пользователя или пароль не указаны."
#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+msgid "WebDAV"
+msgstr "WebDAV"
#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
msgid "There was an error connecting to the server. This may be caused by using an incorrect user name and/or password."
@@ -811,10 +854,6 @@ msgstr "При соединении с сервером произошла ош
msgid "Saving configuration to the GNOME keyring failed with the following message:"
msgstr "Не удалось сохранить параметры в связке ключей GNOME:"
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy на веб"
-
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
msgid "Connect to Server"
@@ -860,8 +899,108 @@ msgstr "Авторизация через браузер (Нажмите для
msgid "Set the default browser and try again"
msgstr "Укажите браузер по умолчанию и попробуйте ещё раз"
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy на веб"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#| msgid "HTML Export All Linked Notes"
+msgid "Export All Notes to "
+msgstr "Экспортировать все заметки в"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#| msgid "Start synchronizing notes"
+msgid "Start exporting notes to "
+msgstr "Начать экспортирование заметок в"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#| msgid "Delete the selected notebook"
+msgid "Export selected notebook to "
+msgstr "Экспортировать выделенный блокнот в"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "Начать экспортирование блокнота"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "С_ервис"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#| msgid "Export to HTML"
+msgid "Export"
+msgstr "Экспортировать"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#| msgid "Export linked notes"
+msgid "Export your notes."
+msgstr "Экспортировать заметки."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#| msgid "HTML Export All Linked Notes"
+msgid "Export All Notes To "
+msgstr "Экспортировать все заметки в"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#| msgid "Delete Note_book"
+msgid "Export Selected Notebook To "
+msgstr "Экспортировать выделенный блокнот в"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+#| msgid "Could not read testfile."
+msgid "Could not export, access denied."
+msgstr "Не удалось экспортировать, доступ запрещён."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+#| msgid "Folder does not exist."
+msgid "Could not export, folder does not exist."
+msgstr "Не удалось экспортировать, папка не существует."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+#| msgid "Your note was exported to \"{0}\"."
+msgid "Could not export: {0}"
+msgstr "Не удалось экспортировать: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "Неупорядоченные заметки"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+#| msgid "Your note was exported to \"{0}\"."
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Заметки были экспортированы в «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#| msgid "Note exported successfully"
+msgid "Notes exported successfully"
+msgstr "Заметки успешно экспортированы"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+#| msgid "Could not save the file \"{0}\""
+msgid "Could not save the files in \"{0}\""
+msgstr "Не удалось сохранить файлы в «{0}»"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+#, csharp-format
+#| msgid "Destination for HTML Export"
+msgid "Create destination folder for {0} export"
+msgstr "Создать целевую папку для экспортирования {0}"
+
#: ../Tomboy/JumpListManager.cs:96
-#: ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "Искать во всех заметках"
@@ -914,26 +1053,6 @@ msgstr "Это имя уже используется"
msgid "C_reate"
msgstr "Со_здать"
-#. The templateNoteTite should show the name of the
-#. 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 "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Шаблон для блокнота {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Все заметки"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Неупорядоченные заметки"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "_Блокноты"
@@ -973,10 +1092,26 @@ msgid "Delete the selected notebook"
msgstr "Удалить выделенный блокнот"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
msgid "Notebooks"
msgstr "Блокноты"
+#. The templateNoteTite should show the name of the
+#. 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 "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Шаблон для блокнота {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:183
+msgid "All Notes"
+msgstr "Все заметки"
+
#: ../Tomboy/Notebooks/NotebookManager.cs:361
msgid "Really delete this notebook?"
msgstr "Вы действительно хотите удалить этот блокнот?"
@@ -1010,11 +1145,20 @@ msgstr "Блокнот"
msgid "_New notebook..."
msgstr "_Новый блокнот..."
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Вы действительно хотите удалить эту заметку?"
+#: ../Tomboy/Note.cs:497
+#: ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Новая заметка {0}"
+
+#: ../Tomboy/Note.cs:1579
+#, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "Действительно удалить «{0}»?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1582
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
@@ -1022,23 +1166,23 @@ msgstr[0] "Вы действительно хотите удалить {0} за
msgstr[1] "Вы действительно хотите удалить {0} заметки?"
msgstr[2] "Вы действительно хотите удалить {0} заметок?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1593
msgid "If you delete a note it is permanently lost."
msgstr "Если вы удалите заметку, она будет утеряна навсегда."
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1627
#, csharp-format
msgid "An error occurred while saving your notes. Please check that you have sufficient disk space, and that you have appropriate rights on {0}. Error details can be found in {1}."
msgstr "Во время сохранения заметок возникла ошибка. Проверьте, что места на диске достаточно и права доступа к {0}. Подробности об ошибке находятся в {1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1643
msgid "Error saving note data."
msgstr "Ошибка при сохранении данных заметки."
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
#: ../Tomboy/NoteManager.cs:21
-#: ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "Шаблон новой заметки"
@@ -1124,7 +1268,7 @@ msgstr ""
#. Attempt to find an existing Start Here note
#: ../Tomboy/NoteManager.cs:299
-#: ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "Первая заметка"
@@ -1132,15 +1276,10 @@ msgstr "Первая заметка"
msgid "Using Links in Tomboy"
msgstr "Использование ссылок в Tomboy"
-#: ../Tomboy/NoteManager.cs:449
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Новая заметка {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:522
-#: ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548
+#: ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "Опишите здесь свою новую заметку."
@@ -1226,116 +1365,119 @@ msgstr "Закрыть _все заметки"
msgid "Search"
msgstr "Искать"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Искать в заметках (Ctrl+Shift+F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+#| msgid "Search All Notes"
+msgid "Search your notes"
+msgstr "Поиск заметок"
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "Связать"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Связать выделенный текст с новой заметкой (Ctrl+L)"
+#: ../Tomboy/NoteWindow.cs:459
+#| msgid "Link selected text to a new note (Ctrl-L)"
+msgid "Link selected text to a new note"
+msgstr "Связать выделенный текст с новой заметкой"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_Текст"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "Установить свойства текста"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "С_ервис"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "Применить инструменты к этой заметке"
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "Удалить эту заметку"
-#: ../Tomboy/NoteWindow.cs:500
+#: ../Tomboy/NoteWindow.cs:502
#: ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Синхронизировать заметки"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
msgid "_Find..."
msgstr "_Найти..."
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "Найти _следующее"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "Найти _предыдущее"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "Не удалось создать заметку"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_Найти:"
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "_Предыдущее"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "_Далее"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "_Жирный"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "_Наклонный"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_Зачёркнутый"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "_Выделенный"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "Размер шрифта"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_Нормальный"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "_Огромный"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_Большой"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "_Маленький"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "Увеличить размер шрифта"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "Уменьшить размер шрифта"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "Маркёры"
@@ -1355,224 +1497,239 @@ msgstr "Синхронизация"
msgid "Add-ins"
msgstr "Модули"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "_Проверять орфографию при наборе"
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
msgstr "Слова с ошибками будут подчёркиваться красным. Варианты исправления будут предлагаться в контекстном меню."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "_Выделять ВикиСлова"
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
msgstr "Включите этот параметр, чтобы автоматически выделять слова, <b>КоторыеВыглядятВотТак</b>. Если щёлкнуть на таком слове, будет создана заметка с таким именем."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "Включить авто_матические списки"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "Использовать другой _шрифт"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "Когда переименовывается заметка, на которую есть ссылки: "
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "Спрашивать меня, что делать"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "Никогда не переименовывать ссылки"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "Всегда переименовывать ссылки"
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
msgid "Use the new note template to specify the text that should be used when creating a new note."
msgstr "Чтобы указать текст, используемый при создании новых заметок, воспользуйтесь шаблоном новой заметки."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "Открыть шаблон новой заметки"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "Реагировать на комбинации _клавиш"
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
msgid "Hotkeys allow you to quickly access your notes from anywhere with a keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
msgstr "Комбинации клавиш позволяют быстро обратиться к заметкам откуда угодно простым нажатием клавиш. Примеры комбинаций: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "Показать _меню заметок"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "Открыть «_Первую заметку»"
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "Создать _новую заметку"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "Открыть окно поиска во _всех заметках"
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "Слу_жба:"
-#: ../Tomboy/PreferencesDialog.cs:486
-#: ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487
+#: ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "Нет изменяемых параметров"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "Всегда синхронизировать _автоматически в фоновом режиме"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "Минуты"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "Про_чие параметры..."
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "Установлены следующие модули:"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "Ещё дополнения..."
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "_Включить"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "От_ключить"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "Не реализовано"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "Параметры {0}"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "Выбрать шрифт заметки"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "Прочие параметры синхронизации"
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
msgstr "При обнаружении конфликта между локальной заметкой и заметкой на удалённом сервере:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "Всегда спрашивать меня, что делать."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "Переименовывать локальную заметку."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "Заменять локальную заметку заметкой с сервера."
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Вы уверены?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+#| msgid "WARNING: Are you sure?"
+msgid "Are you sure?"
+msgstr "Вы уверены?"
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
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 "Не рекомендуется обнулять параметры синхронизации. Не исключено, что вам придётся заново синхронизировать все ваши заметки при сохранении новых параметров."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Сброс параметров синхронизации"
-#: ../Tomboy/PreferencesDialog.cs:1166
-msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings"
-msgstr "Вы отключили настроенную службу синхронизации. Теперь параметры синхронизации будут обнулены. Не исключено, что вам придётся заново синхронизовать все ваши заметки при сохранении новых параметров."
+#: ../Tomboy/PreferencesDialog.cs:1159
+#| msgid ""
+#| "You have disabled the configured synchronization service. Your "
+#| "synchronization settings will now be cleared. You may be forced to "
+#| "synchronize all of your notes again when you save new settings"
+msgid "You have disabled the configured synchronization service. Your synchronization settings will now be cleared. You may be forced to synchronize all of your notes again when you save new settings."
+msgstr "Вы отключили настроенную службу синхронизации. Теперь параметры синхронизации будут обнулены. Возможно, вам потребуется заново синхронизировать все заметки при сохранении новых параметров."
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Соединение установлено!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Успешное подключение"
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
msgstr "Tomboy готов синхронизировать ваши заметки. Синхронизировать сейчас?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-msgid "Sorry, but something went wrong. Please check your information and try again. The {0} might be useful too."
-msgstr "Извините, но что-то пошло не так. Проверьте введённые данные и попытайтесь снова. Вам может помочь журнал {0}."
+#| msgid ""
+#| "Sorry, but something went wrong. Please check your information and try "
+#| "again. The {0} might be useful too."
+msgid "Please check your information and try again. The log file {0} may contain more information about the error."
+msgstr "Проверьте информация и попробуйте ещё раз. Файл журнала {0} может содержать более подробные сведения об ошибке."
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Ошибка при соединении"
+#: ../Tomboy/PreferencesDialog.cs:1274
+#| msgid "Error connecting :("
+msgid "Error connecting"
+msgstr "Ошибка подключения"
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "Версия:"
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "Автор:"
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "Авторские права:"
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "Зависимости модуля:"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_Искать:"
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
msgid "Note"
msgstr "Заметка"
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Время последнего изменения"
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Совпадения"
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+#| msgid "{0} match"
+#| msgid_plural "{0} matches"
+msgid "Title match"
+msgstr "Соответствие названия"
+
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
@@ -1580,7 +1737,7 @@ msgstr[0] "{0} совпадение"
msgstr[1] "{0} совпадения"
msgstr[2] "{0} совпадений"
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
@@ -1588,7 +1745,7 @@ msgstr[0] "Всего: {0} заметка"
msgstr[1] "Всего: {0} заметки"
msgstr[2] "Всего: {0} заметок"
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
@@ -1596,257 +1753,67 @@ msgstr[0] "Совпадает: {0} заметка"
msgstr[1] "Совпадает: {0} заметки"
msgstr[2] "Совпадает: {0} заметок"
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"В выбранном блокноте результатов не найдено.\n"
+"Щёлкните здесь, чтобы выполнить поиск по всем заметкам."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Щёлкните здесь, чтобы выполнить поиск по всем блокнотам"
+
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Заметки"
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Не удалось создать новую заметку"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+#, csharp-format
+msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
+msgstr "Модуль для синхронизации не поддерживается на этом компьютере. Убедитесь в наличии FUSE и правильно установленного и настроенного {0}."
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Основные разработчики:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "Не удалось провести пробное чтение."
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Разработчики:"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Не удалось провести пробную запись."
-#: ../Tomboy/Tomboy.cs:401
-msgid "translator-credits"
-msgstr ""
-"Дмитрий Костенко <bis0n at mail.ru>\n"
-"Александр Прокудин <alexandre.prokoudine at gmail.com>\n"
-"Василий Фаронов <qvvx at yandex.ru>"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Время ожидания соединения с сервером истекло."
-#: ../Tomboy/Tomboy.cs:410
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2009 Others\n"
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2010 Others\n"
-msgstr ""
-"Авторское право © 2004-2007 Alex Graveley\n"
-"Авторское право © 2004-2010 другие\n"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Произошла ошибка при соединении с сервером."
-#: ../Tomboy/Tomboy.cs:412
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Простое, лёгкое в использовании приложение для ведения заметок."
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "Не удалось включить FUSE."
-#: ../Tomboy/Tomboy.cs:422
-msgid "Homepage"
-msgstr "Домашняя страница"
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Произошла ошибка при установке соединения с указанным сервером:"
-#: ../Tomboy/Tomboy.cs:540
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Простое, лёгкое в использовании приложение для ведения заметок.\n"
-"Авторские права © 2004—2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Подробнее"
-#: ../Tomboy/Tomboy.cs:552
-msgid ""
-"Usage:\n"
-" --version\t\t\tPrint version information.\n"
-" --help\t\t\tPrint this usage message.\n"
-" --note-path [path]\t\tLoad/store note data in this directory.\n"
-" --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Вызов:\n"
-" --version\t\t\tВывести сведения о версии.\n"
-" --help\t\t\tВывести это справочное сообщение.\n"
-" --note-path [путь]\t\tЗагружать/сохранять данные заметок в этот каталог.\n"
-" --search [путь]\t\tОткрыть окно поиска во всех заметках с указанным текстом поиска.\n"
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
+msgid "Status"
+msgstr "Состояние"
-#: ../Tomboy/Tomboy.cs:562
-msgid ""
-" --new-note\t\t\tCreate and display a new note.\n"
-" --new-note [title]\t\tCreate and display a new note, with a title.\n"
-" --open-note [title/url]\tDisplay the existing note matching title.\n"
-" --start-here\t\t\tDisplay the 'Start Here' note.\n"
-" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-" --new-note\t\t\tСоздать и показать новую заметку.\n"
-" --new-note [название]\t\tСоздать и показать заметку с указанным названием.\n"
-" --open-note [название/url]\tПоказать существующую заметку с указанным названием.\n"
-" --start-here\t\t\tПоказать «Первую заметку».\n"
-" --highlight-search [текст]\tНайти и подсветить текст в открытой заметке.\n"
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
+msgid "Acquiring sync lock..."
+msgstr "Идёт получение блокировки доступа..."
-#: ../Tomboy/Tomboy.cs:576
-#, csharp-format
-msgid "Version {0}"
-msgstr "Версия {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (новая)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_О программе Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid "The \"Tomboy Notes Manual\" could not be found. Please verify that your installation has been completed successfully."
-msgstr "«Руководство по Tomboy» не найдено. Убедитесь, что установка была выполнена успешно."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Справка не найдена"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Не удалось открыть местоположение"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Сегодня, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Сегодня"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Вчера, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Вчера"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0} день назад, {1}"
-msgstr[1] "{0} дня назад, {1}"
-msgstr[2] "{0} дней назад, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "{0} день назад"
-msgstr[1] "{0} дня назад"
-msgstr[2] "{0} дней назад"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Завтра, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Завтра"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Через {0} день, {1}"
-msgstr[1] "Через {0} дня, {1}"
-msgstr[2] "Через {0} дней, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Через {0} день"
-msgstr[1] "Через {0} дня"
-msgstr[2] "Через {0} дней"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, h:mm:tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d ММММ"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Без даты"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, h:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Без названия {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
-msgstr "Заметка с названием <b>{0}</b> уже существует. Выберите другое имя для этой заметки перед тем, как продолжить."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Название уже используется"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Скопировать адрес ссылки"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Открыть ссылку"
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
-#, csharp-format
-msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
-msgstr "Модуль для синхронизации не поддерживается на этом компьютере. Убедитесь в наличии FUSE и правильно установленного и настроенного {0}."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "Не удалось провести пробное чтение."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Не удалось провести пробную запись."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Время ожидания соединения с сервером истекло."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Произошла ошибка при соединении с сервером."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "Не удалось включить FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Произошла ошибка при установке соединения с указанным сервером:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Подробнее"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:126
-msgid "Status"
-msgstr "Состояние"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:236
-msgid "Acquiring sync lock..."
-msgstr "Идёт получение блокировки доступа..."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:239
-msgid "Committing changes..."
-msgstr "Идёт внесение изменений..."
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
+msgid "Committing changes..."
+msgstr "Идёт внесение изменений..."
#: ../Tomboy/Synchronization/SyncDialog.cs:242
msgid "Synchronizing Notes"
@@ -2023,10 +1990,6 @@ msgstr "Выявлен конфликт заметок"
msgid "The server version of \"{0}\" conflicts with your local note. What do you want to do with your local note?"
msgstr "Версия «{0}» на сервере конфликтует с локальной заметкой. Что вы хотите сделать с вашей локальной заметкой?"
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "С_ервис"
-
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
msgid "Could not enable FUSE"
@@ -2053,3 +2016,213 @@ msgstr ""
"\n"
"Чтобы не встречаться с этим сообщением в будущем, загружайте FUSE при запуске системы. Добавьте строчку «modprobe fuse» в файл /etc/init.d/boot.local или строчку «fuse» в файл /etc/modules."
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Не удалось создать новую заметку"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Основные разработчики:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Разработчики:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Дмитрий Костенко <bis0n at mail.ru>\n"
+"Александр Прокудин <alexandre.prokoudine at gmail.com>\n"
+"Василий Фаронов <qvvx at yandex.ru>"
+
+#: ../Tomboy/Tomboy.cs:424
+#| msgid ""
+#| "Copyright © 2004-2007 Alex Graveley\n"
+#| "Copyright © 2004-2010 Others\n"
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Авторское право © 2004-2007 Alex Graveley\n"
+"Авторское право © 2004-2011 другие\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Простое, лёгкое в использовании приложение для ведения заметок."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Домашняя страница"
+
+#: ../Tomboy/Tomboy.cs:554
+#| msgid ""
+#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
+#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
+#| "\n"
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy — простое, лёгкое в использовании приложение для ведения заметок.\n"
+"Авторские права © 2004—2007 Alex Graveley <alex at beatniksoftware.com>\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Авторские права © 2004-2011 другие\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+" --version\t\t\tPrint version information.\n"
+" --help\t\t\tPrint this usage message.\n"
+" --note-path [path]\t\tLoad/store note data in this directory.\n"
+" --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Вызов:\n"
+" --version\t\t\tВывести сведения о версии.\n"
+" --help\t\t\tВывести это справочное сообщение.\n"
+" --note-path [путь]\t\tЗагружать/сохранять данные заметок в этот каталог.\n"
+" --search [путь]\t\tОткрыть окно поиска во всех заметках с указанным текстом поиска.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+" --new-note\t\t\tCreate and display a new note.\n"
+" --new-note [title]\t\tCreate and display a new note, with a title.\n"
+" --open-note [title/url]\tDisplay the existing note matching title.\n"
+" --start-here\t\t\tDisplay the 'Start Here' note.\n"
+" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+" --new-note\t\t\tСоздать и показать новую заметку.\n"
+" --new-note [название]\t\tСоздать и показать заметку с указанным названием.\n"
+" --open-note [название/url]\tПоказать существующую заметку с указанным названием.\n"
+" --start-here\t\t\tПоказать «Первую заметку».\n"
+" --highlight-search [текст]\tНайти и подсветить текст в открытой заметке.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Версия {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (новая)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_О программе Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid "The \"Tomboy Notes Manual\" could not be found. Please verify that your installation has been completed successfully."
+msgstr "«Руководство по Tomboy» не найдено. Убедитесь, что установка была выполнена успешно."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Справка не найдена"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Не удалось открыть местоположение"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Сегодня, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Сегодня"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Вчера, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Вчера"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} день назад, {1}"
+msgstr[1] "{0} дня назад, {1}"
+msgstr[2] "{0} дней назад, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} день назад"
+msgstr[1] "{0} дня назад"
+msgstr[2] "{0} дней назад"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Завтра, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Завтра"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Через {0} день, {1}"
+msgstr[1] "Через {0} дня, {1}"
+msgstr[2] "Через {0} дней, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Через {0} день"
+msgstr[1] "Через {0} дня"
+msgstr[2] "Через {0} дней"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, h:mm:tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d ММММ"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Без даты"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, h:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Без названия {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
+msgstr "Заметка с названием <b>{0}</b> уже существует. Выберите другое имя для этой заметки перед тем, как продолжить."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Название уже используется"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Скопировать адрес ссылки"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Открыть ссылку"
+
diff --git a/tomboy.spec b/tomboy.spec
index 8a6eec8..f5bcf11 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.7.3
+Version: 1.7.4
Release: 1
Epoch: 0
Summary: Tomboy is a desktop note-taking application for Linux and Unix.
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list