[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.12.0-1ubuntu1-20-g2c0dee1
Iain Lane
laney at debian.org
Sun Jun 9 19:16:05 UTC 2013
The following commit has been merged in the ubuntu branch:
commit d98b5612f427c573bca5ddc80f85e9ec2ec7979f
Author: Iain Lane <laney at debian.org>
Date: Sun Jun 9 19:40:56 2013 +0100
Imported Upstream version 1.11.6
diff --git a/ChangeLog b/ChangeLog
index 8fce006..5d9b9f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,47 @@
# Generated by Makefile. Do not edit.
+commit da098224318b23e136cd7fa8c3fd0f0fd5aef0e8
+Author: Jiro Matsuzawa <jmatsuzawa at gnome.org>
+Date: Fri Aug 10 21:40:29 2012 +0900
+
+ [l10n] Update Japanese translation
+
+ Modify the About label
+
+ po/ja.po | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit de58dd4cf96c8531c4d998c8e11b940b61a9e2d5
+Author: Jiro Matsuzawa <jmatsuzawa at gnome.org>
+Date: Fri Aug 10 21:35:14 2012 +0900
+
+ [l10n] Update Japanese translation
+
+ Merge latest pot
+
+ po/ja.po | 1045 +++++++++++++++++++++-----------------------------------------
+ 1 files changed, 356 insertions(+), 689 deletions(-)
+
+commit 15bff46bd009136f0a6618a45c031aba7d97957b
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 6 09:20:12 2012 -0700
+
+ Bump version to 1.11.6
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit d4099f448be08a9f9fc834a369603d924b004227
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 6 09:16:38 2012 -0700
+
+ Update NEWS for 1.11.5
+
+ NEWS | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
commit 03e92f524fd632e339f1f74f8cb12eab97f32e3d
Author: Aurimas Černius <aurisc4 at gmail.com>
Date: Sun Aug 5 17:47:41 2012 +0300
diff --git a/NEWS b/NEWS
index 53e8ad5..6c3bde9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ 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.11.6
+* Translation updates: ja
+
Version 1.11.5
* Fix Evolution add-in gmime dependency for Ubuntu 12.04 (Alex Tereschenko)
* Add match count in note search (#666194)
diff --git a/configure b/configure
index a9f2067..8cd194f 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.11.5.
+# Generated by GNU Autoconf 2.68 for tomboy 1.11.6.
#
#
# 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.11.5'
-PACKAGE_STRING='tomboy 1.11.5'
+PACKAGE_VERSION='1.11.6'
+PACKAGE_STRING='tomboy 1.11.6'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1458,7 +1458,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.11.5 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.11.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1532,7 +1532,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 1.11.5:";;
+ short | recursive ) echo "Configuration of tomboy 1.11.6:";;
esac
cat <<\_ACEOF
@@ -1699,7 +1699,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 1.11.5
+tomboy configure 1.11.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2064,7 +2064,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.11.5, which was
+It was created by tomboy $as_me 1.11.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2880,7 +2880,7 @@ fi
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='1.11.5'
+ VERSION='1.11.6'
cat >>confdefs.h <<_ACEOF
@@ -16893,7 +16893,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.11.5, which was
+This file was extended by tomboy $as_me 1.11.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16959,7 +16959,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.11.5
+tomboy config.status 1.11.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index bd9e1ff..02ad214 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.11.5)
+AC_INIT(tomboy, 1.11.6)
AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
AM_INIT_AUTOMAKE([foreign tar-ustar])
AM_MAINTAINER_MODE
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/WebSyncServiceAddin.dll.config b/debian/WebSyncServiceAddin.dll.config
deleted file mode 100644
index 27ad5cf..0000000
--- a/debian/WebSyncServiceAddin.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
- <dllmap dll="gobject-2.0" target="libgobject-2.0.so.0"/>
- <dllmap dll="proxy" target="libproxy.so.1"/>
-</configuration>
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index d879cde..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,1402 +0,0 @@
-tomboy (1.11.5-1ubuntu1) quantal; urgency=low
-
- * Merge with Debian unstable, remaining changes
- + Use dh-translations
- + Ubuntu patches:
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- - Set save button sensitive when needed
-
- -- Iain Lane <laney at debian.org> Mon, 06 Aug 2012 18:13:55 +0100
-
-tomboy (1.11.5-1) experimental; urgency=low
-
- * [b67c86c] Imported Upstream version 1.11.5
- - Fix Evolution add-in gmime dependency
- - Add match count in note search
- - Sanitize sync url
- * [3b08591] Delete 40_use_gmime_2.6.patch: applied upstream.
-
- -- Iain Lane <laney at debian.org> Mon, 06 Aug 2012 17:56:45 +0100
-
-tomboy (1.11.2-1ubuntu1) quantal; urgency=low
-
- * Merge with Debian unstable, remaining changes
- + Use dh-translations
- + Ubuntu patches:
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- - Set save button sensitive when needed
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
- * [8f7dae7] Refresh patches to apply cleanly
- * [81884e2] Deduplicate libgconf2-dev BD
-
- -- Iain Lane <laney at ubuntu.com> Tue, 05 Jun 2012 22:05:14 +0100
-
-tomboy (1.11.2-1) experimental; urgency=low
-
- * [9be0acb] Imported Upstream version 1.11.2
- - Performance fix for note deletion
- - Bump Mono profile to 4.0
- - Ignore acronyms in spell-check
- - Update documentation, command-line usage
- * [b8da4f4] Drop obsolete 30_fix_manpage_syntax patch
- * [aea1cb8] Refresh other patches
-
- -- Iain Lane <laney at debian.org> Tue, 05 Jun 2012 14:28:12 +0100
-
-tomboy (1.11.1-1ubuntu2) quantal; urgency=low
-
- * debian/control:
- - Drop dependency on liblaunchpad-integration-cil-dev
- * debian/patches/11_lpi.patch:
- - Dropped, we no longer do Launchpad integration
-
- -- Robert Ancell <robert.ancell at canonical.com> Tue, 15 May 2012 09:49:23 +1200
-
-tomboy (1.11.1-1ubuntu1) quantal; urgency=low
-
- * [42fc674] Update gbp.conf for Ubuntu branch
- * Merge with Debian, remaining changes
- + Use dh-translations
- + Ubuntu patches:
- - Add Launchpad integration
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- - Set save button sensitive when needed
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- -- Iain Lane <laney at ubuntu.com> Thu, 03 May 2012 21:17:32 +0100
-
-tomboy (1.11.1-1) experimental; urgency=low
-
- * [decde44] gbp.conf back to exp branches
- * [4e4e74f] Imported Upstream version 1.11.1
- - Allow cmdline args to be passed to add-ins
- - Fix for multi-monitor configurations and notes off the screen
- - Fix Typo in manpage '---note-path'
- - Fix for RemoveBrokenLinks-with-search
-
- -- Iain Lane <laney at debian.org> Thu, 03 May 2012 20:15:51 +0100
-
-tomboy (1.10.1-0ubuntu1) precise; urgency=low
-
- * New upstream version
-
- -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 16 Apr 2012 21:06:48 +0200
-
-tomboy (1.10.0-1ubuntu1) precise; urgency=low
-
- * Merge from unstable, remaining changes
- + Use dh-translations
- + Ubuntu patches:
- - Add Launchpad integration
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- - Set save button sensitive when needed
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- -- Iain Lane <laney at ubuntu.com> Wed, 28 Mar 2012 22:49:23 +0100
-
-tomboy (1.10.0-1) unstable; urgency=low
-
- * [277fd7f] Imported Upstream version 1.10.0
- - Remember last open notes on hard shutdown
- * [b863565] Stable release; update gbp.conf branches
-
- -- Iain Lane <laney at debian.org> Wed, 28 Mar 2012 11:32:48 +0100
-
-tomboy (1.9.10-1) unstable; urgency=low
-
- * [91a0237] Imported Upstream version 1.9.10
- - Fix doc errors for sync
- - New and updated (doc) translations
-
- -- Iain Lane <laney at debian.org> Tue, 20 Mar 2012 22:34:39 +0000
-
-tomboy (1.9.10-0ubuntu1) precise; urgency=low
-
- * New upstream version
-
- -- Sebastien Bacher <seb128 at ubuntu.com> Tue, 20 Mar 2012 15:28:51 +0100
-
-tomboy (1.9.9-2) experimental; urgency=low
-
- * Merge from unstable
- * [b6e36a3] Use GMime 2.6 instead of 2.4; the latter is being dropped.
- (Closes: #663216)
- * [934f580] Use dh sequence explicitly instead of via deprecated cli.make
- include
- * [7cb46e3] Standards-Version → 3.9.3, no changes required
-
- -- Iain Lane <laney at debian.org> Mon, 12 Mar 2012 21:44:18 +0000
-
-tomboy (1.9.9-1) experimental; urgency=low
-
- * New upstream release 1.9.9 (still no pristine-tar)
- - Fix link names after HTML export
- - fix Export All to HTML
-
- -- Iain Lane <laney at debian.org> Tue, 06 Mar 2012 19:00:41 +0000
-
-tomboy (1.9.9-0ubuntu1) precise; urgency=low
-
- * New upstream version
-
- -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 05 Mar 2012 22:44:28 +0100
-
-tomboy (1.9.8-0ubuntu1) precise; urgency=low
-
- * New upstream version
- * debian/control:
- - updated libappindicator version requirement for set_title()
- * debian/patches/04_app_indicator.patch:
- - updated to set a title to the indicator ("Tomboy Notes"), mostly to
- have it listed under its name in the unity-hud (lp: #943418)
-
- -- Sebastien Bacher <seb128 at ubuntu.com> Wed, 29 Feb 2012 15:11:36 +0100
-
-tomboy (1.9.5-1ubuntu3) precise; urgency=low
-
- * debian/WebSyncServiceAddin.dll.config: Bump libproxy SONAME.
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Thu, 16 Feb 2012 10:20:55 +0100
-
-tomboy (1.9.5-1ubuntu2) precise; urgency=low
-
- * No-change rebuild against libproxy1.
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Thu, 16 Feb 2012 08:42:56 +0100
-
-tomboy (1.9.5-1ubuntu1) precise; urgency=low
-
- * [42fc674] Update gbp.conf for Ubuntu branch
- * [d407c7c] Drop git_logout_delay: upstreamed
- * Merge with experimental, remaining changes:
- + Use dh-translations
- + Ubuntu patches:
- - Add Launchpad integration
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- - Set save button sensitive when needed
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- -- Iain Lane <laney at ubuntu.com> Mon, 06 Feb 2012 14:18:43 +0000
-
-tomboy (1.9.5-1) experimental; urgency=low
-
- * [ceb1079] Update watchfile to look for xz tarballs
- * [ef866ec] Imported Upstream version 1.9.5 (note: no pristine-tar data for
- this yet, due to missing pristine-xz)
- * Fix validation errors in docs
- * Fix delayed logouts with GnomeSession (Closes: #645990)
- * Sync thread improvements
- * Add missing commandline options to man pages (#665532)
- * Add 256x256 icon for GNOME 3
- * [fcde26a] Drop deprecated cli.make and use --with cli directly
-
- -- Iain Lane <laney at debian.org> Wed, 18 Jan 2012 13:16:27 +0000
-
-tomboy (1.9.3-1) experimental; urgency=low
-
- * [7e76896] Imported Upstream version 1.9.3
- + Translation updates
-
- -- Iain Lane <laney at debian.org> Tue, 22 Nov 2011 14:49:18 +0000
-
-tomboy (1.9.2-1) experimental; urgency=low
-
- * [72d7885] Update gbp.conf for experimental
- * [fca59c6] Imported Upstream version 1.9.2
- + Add support for latest versions of Firefox
- + Translation updates
-
- -- Iain Lane <laney at debian.org> Wed, 16 Nov 2011 16:02:47 +0000
-
-tomboy (1.8.3-2) unstable; urgency=low
-
- * [b6e36a3] Use GMime 2.6 instead of 2.4; the latter is being dropped.
- (Closes: #663216)
- * [934f580] Use dh sequence explicitly instead of via deprecated cli.make include
- * [7cb46e3] Standards-Version → 3.9.3, no changes required
-
- -- Iain Lane <laney at debian.org> Mon, 12 Mar 2012 21:28:55 +0000
-
-tomboy (1.8.3-1) unstable; urgency=low
-
- * [6d2edf9] Imported Upstream version 1.8.3
- + Translation updates
-
- -- Iain Lane <laney at debian.org> Wed, 16 Nov 2011 15:58:39 +0000
-
-tomboy (1.8.0-1ubuntu1.2) precise; urgency=low
-
- * debian/patches/git_logout_delay.patch: upstream fix, should fix the issue
- where tomboy is delaying the session logout (lp: #880299)
-
- -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 16 Jan 2012 18:39:47 +0100
-
-tomboy (1.8.0-1ubuntu1.1) oneiric-proposed; urgency=low
-
- [ Iain Lane ]
- * debian/control: Remove syncdaemon BD which is no longer required due to
- the dropping of the SSO patch in 1.8.0-1ubuntu1
-
- [ Ken VanDine ]
- * debian/patches/02_sync_save_button_sensitive.patch
- - Set save button sensitive when needed (LP: #845321)
-
- -- Ken VanDine <ken.vandine at canonical.com> Fri, 14 Oct 2011 09:38:21 -0400
-
-tomboy (1.8.0-1ubuntu1) oneiric; urgency=low
-
- [ Iain Lane ]
- * Merge with Debian experimental, remaning changes:
- + Use dh-translations
- + Ubuntu patches:
- - Add Launchpad integration
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- [ Rodrigo Moya ]
- * [a6712fc] Disable U1 SSO patch & refresh u1_as_default_sync_source patch
- * debian/patches/06_use_ubuntu_sso.patch:
- - Disabled SSO patch, as it's not working on Oneiric, and also allows
- to remove the dependency on libubuntuone.
- * debian/patches/03_u1_as_default_sync.patch:
- - Rebased
-
- -- Iain Lane <laney at debian.org> Mon, 26 Sep 2011 23:39:59 +0100
-
-tomboy (1.8.0-1) unstable; urgency=low
-
- * Upload to unstable
- * [74507b7] Imported Upstream stable version 1.8.0
- + Translation Updates
- * [9ccc75f] Remove merge conflict marker in debian/changelog
- * [d583cfa] Change branches in gbp.conf to unstable
-
- -- Iain Lane <laney at debian.org> Mon, 26 Sep 2011 22:26:48 +0100
-
-tomboy (1.7.6-1ubuntu1) oneiric; urgency=low
-
- * Merge with Debian experimental, remaning changes:
- + Use dh-translations
- + Ubuntu patches:
- - Add Launchpad integration
- - Use Ubuntu One SSO
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- -- Iain Lane <laney at debian.org> Tue, 06 Sep 2011 17:28:04 +0100
-
-tomboy (1.7.6-1) experimental; urgency=low
-
- * [e29c8c1] Imported Upstream version 1.7.6
- + Translation updates
-
- -- Iain Lane <laney at debian.org> Tue, 06 Sep 2011 17:04:32 +0100
-
-tomboy (1.7.4-1ubuntu1) oneiric; urgency=low
-
- * Merge with Debian experimental, remaning changes:
- + Use dh-translations
- + Ubuntu patches:
- - Add Launchpad integration
- - Use Ubuntu One SSO
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- + autoreconf for some of the above changes
- + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
- * [268e4a9] Update 03_u1_as_default_sync to apply against new source
- * [26f26a0] Update gbp.conf for Ubuntu branch
- * [c61756e] Update 06_ubuntu_sso.patch for new SyncService interface
-
- -- Iain Lane <laney at debian.org> Tue, 23 Aug 2011 22:47:32 +0100
-
-tomboy (1.7.4-1) experimental; urgency=low
-
- * [aae3ba7] Delete debian/ltmain-as-needed.sh. Not necessary any more.
- * [d4687c3] Remove Ubuntu customisation from debian/rules; done differently now
- * [6e75a5b] Imported Upstream version 1.7.4
- + Name note being deleted in confirmation dialog
- + Autolinking notes should not update modification time
- + Fix translation string in Export All Notes Addin
- + Don't create nested links
- + Save button in Sync Preferences should be insensitive until fields a
- filled
- + Tune down autosync frequency
- + Keep selection after Notebook rename
- + Allow renaming of template notes
- + Improve template note functionality
-
- -- Iain Lane <laney at debian.org> Tue, 23 Aug 2011 22:09:33 +0100
-
-tomboy (1.7.3-1ubuntu1) oneiric; urgency=low
-
- * Merge with Debian experimental, remaning changes:
- + Use dh-translations instead of manually stripping schemas
- + Ubuntu patches:
- - Add Launchpad integration
- - Use Ubuntu One SSO
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- + autoreconf for some of the above changes
- * Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- -- Iain Lane <laney at debian.org> Mon, 15 Aug 2011 23:09:48 +0100
-
-tomboy (1.7.3-1) experimental; urgency=low
-
- * [25db012] Imported Upstream version 1.7.3
- + Make NUNIT conditional
- * [c2709c3] Remove 10_disable_unit_tests patch; now supported via configure
- flag
-
- -- Iain Lane <laney at debian.org> Mon, 15 Aug 2011 22:20:55 +0100
-
-tomboy (1.7.2-1ubuntu1) oneiric; urgency=low
-
- * Merge with Debian experimental, remaning changes:
- + Use dh-translations instead of manually stripping schema
- + Ubuntu patches:
- - Add Launchpad integration
- - Use Ubuntu One SSO
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- + autoreconf for some of the above changes
- * Refresh patches that don't apply cleanly
- * Run dh_autoreconf with --as-needed to enable support in ltmain.sh
-
- -- Iain Lane <laney at debian.org> Wed, 27 Jul 2011 10:46:04 +0100
-
-tomboy (1.7.2-1) experimental; urgency=low
-
- * [6a8551d] Imported Upstream version 1.7.2
- + New addin for advanced preferences
- + Remove minumum size on Search All Notes window
- + Fix note title matching in TrieTree
- + Enforce minimum size on Name column in Search All Notes window
-
- -- Iain Lane <laney at debian.org> Tue, 26 Jul 2011 16:44:05 +0100
-
-tomboy (1.7.1-1ubuntu1) oneiric; urgency=low
-
- * Merge with Debian experimental, remaning changes:
- + Use dh-translations instead of manually stripping schema
- + Ubuntu patches:
- - Add Launchpad integration
- - Use Ubuntu One SSO
- - Add app indicator support
- - Use Ubuntu One as default sync server
- - Add initial note about Ubuntu One
- + autoreconf for some of the above changes
-
- -- Iain Lane <laney at ubuntu.com> Wed, 06 Jul 2011 10:06:49 +0100
-
-tomboy (1.7.1-1) experimental; urgency=low
-
- * [dbee52f] Imported Upstream version 1.7.1
- + New addin to Export All Notes
- + Drop dependency for gconf-sharp-peditors
- + Fix delete key behavior in bullet lists
- + Resolve relative paths when exporting notes
- + Fix string in Preferences UI
- + Handle ending slashes in sync URLs
- + Don't allow rename of special notebooks
- + Don't open URL twice in Addin preferences
- + Handle invalid files when loading notes
- + Add UI for no search results in notebook
- + Update copyright to 2011
- + Handle matching brackets in links
- * [e324eb0] Drop gnome# BD in line with upstream's configure
- * [d31575d] Disable schema install in the build
-
- -- Iain Lane <laney at debian.org> Tue, 05 Jul 2011 23:17:55 +0100
-
-tomboy (1.7.0-1) experimental; urgency=low
-
- * [de22824] Modify watch file to look for bz2 orig files
- + Search does not give preference to note title
- + Cleanup strings in sync dialog dialogs
- + Context-menu key now opens next to selected notes
- + Fix string references to *Search All Notes* window
- + Disable Delete action when note list not in focus
- + Allow the user to open multiple notes via keypress or menu
- + Update tar usage to ensure OpenBSD compatibility
- + Switch from NDesk Dbus to dbus-sharp
- + Specify utf8 encoding for sync confirmation page
- + Fix focus chain in Search All Notes window
- + New addin for removing broken links from notes
- + Remove unmanaged window present code
- + Improvements for translators
- + Don't save unchanged new notes
- * [aafe1b2] Imported Upstream version 1.7.0
- * [309d0af] Switch BDs from ndesk-dbus to dbus-sharp
- * [0e77616] Disable panel applet, panel will be deprecated with GNOME 3
- * [645383d] Convert to 3.0 (quilt) for bz2 orig support
-
- -- Iain Lane <laney at debian.org> Tue, 21 Jun 2011 16:42:35 +0100
-
-tomboy (1.6.1-1) unstable; urgency=low
-
- * [e32a2d3] Imported Upstream version 1.6.1
- + Hungarian and Catalan translation updates
- * [780d74b] Standards-Version → 3.9.2, no changes required
- * [a296fa0] Update to use my d.o email address
-
- -- Iain Lane <laney at debian.org> Wed, 25 May 2011 15:24:52 +0100
-
-tomboy (1.6.0-2) unstable; urgency=low
-
- * [8a1e57b] Drop dh_autoreconf, no longer necessary and causes FTBFS due to
- a bug somewhere (Closes: #622207)
- * [fb9dcfe] Disable unit tests in a way that doesn't require autoreconfing
- * [bf19fc0] Patch tomboy.exe dllmap to use DLL names as in the source
-
- -- Iain Lane <laney at ubuntu.com> Mon, 11 Apr 2011 21:15:28 +0100
-
-tomboy (1.6.0-1) unstable; urgency=low
-
- * [3460d94] Imported Upstream version 1.6.0
- + Changed GetSelectedNotebook from private to public so it can be used by
- add-ins
- + Fix tomboy insecure LD_LIBRARY_PATH
- + Fix CVE-2010-4005
- + Fix Remove title format from add-ins descriptions
- + Fix Replace Computer Name with Login Name in SSH sync setup
- * [71513fe] Add BD on libproxy-dev for proxy support
- * [e6de4c3] Remove no longer needed PrintNotes DLLMap
- * [e88f9be] Add DLLMap for WebSyncServiceAddin to map libproxy
-
- -- Iain Lane <laney at ubuntu.com> Thu, 07 Apr 2011 23:00:15 +0100
-
-tomboy (1.2.2-2) unstable; urgency=high
-
- * [bc0695b] Fix insecure LD_LIBRARY_PATH. A vulnerability existed
- where if LD_LIBRARY_PATH were set but empty, a trailing : as a path
- separator would still be appended to the path, exposing an
- insecure/invalid search path. Using :+: instead of +: prevents this
- as ${X:+:$X} returns X iff X is set and not empty whereas ${X+:$X}
- returns X iff X is set (it may be empty). References: CVE-2010-4005
- (Closes: #605096)
-
- -- Iain Lane <laney at ubuntu.com> Mon, 29 Nov 2010 18:59:02 +0000
-
-tomboy (1.5.2-1) experimental; urgency=low
-
- * [40c7e88] Imported Upstream version 1.3.4
- + Stop building libtomboy with *DISABLE_DEPRECATED flags (for now)
- * [d8bee18] Imported Upstream version 1.5.2
- + Fix potential sync dataloss bug for former Gnote users
- + Documentation fixes
- + Fix windows crash when libproxy not available
- + Stop using deprecated GDK API in libtomboy
- + Various documentation bugs fixed
-
- -- Iain Lane <laney at ubuntu.com> Tue, 26 Oct 2010 21:26:50 +0100
-
-tomboy (1.2.2-1) unstable; urgency=low
-
- * New upstream bugfix release 1.2.2:
- + Fix potential sync dataloss bug for former Gnote users
- + Support latest GTK# installer on Windows
- + Translation updates: hu, id
-
- -- Iain Lane <laney at ubuntu.com> Tue, 26 Oct 2010 20:26:32 +0100
-
-tomboy (1.3.3-1) experimental; urgency=low
-
- * [c12a7eb] Imported Upstream version 1.3.2
- + Fix ExportToHtml to export linked notes on Windows
- + Fix GtkPopup focus problems on Windows
- + Various help text fixes
- + Fix Windows installer to require .Net 3.5 support upgrades
- + Don't open the search dialog if tray is not ready
- + Allow empty username field for SSH sync
- + Fix Windows installer to detect GTK# >=2.12.10
- * [980af20] Imported Upstream version 1.3.3
- + Update Print add-in license to LGPL (not GPL)
- * [7656f59] Standards-Version → 3.9.1, no changes required
-
- -- Iain Lane <laney at ubuntu.com> Tue, 14 Sep 2010 00:02:37 +0100
-
-tomboy (1.3.1-1) experimental; urgency=low
-
- * New upstream release 1.3.1
- + Disable panel applet support by default
- + New topic-based help
- + Add libproxy support to web sync
- + Support LaTeX add-in on Mac
- + Fix `make run` for developers
- + Document --debug option in manpage
- * New upstream release 1.3.0
- + Use GNOME Session D-Bus API for session management
- + Fix indentation of bullet list items when printing
- + Fix keyboard navigation in bullet lists
- + Applet now uses correct icon
- + Add hidden preference for quiet note deletion
- + Add hidden preference for disabling tray icon
- + HIG menu item clean-ups on Mac
- + Proper formatting when typing in timestamp text
- + Allow building with -DGSEAL_ENABLE
- + Fix crash in autosync when certain server types are unavailable
- + Clean up stream usage in attempt to fix LP#556628
- * [803d6e9] Add debian/gbp.conf to build for exp
- * [d5362ee] Update build-deps to match new configure checks
- * [1e80e86] Enable panel applet
- * [10012c1] debian/patches/*: Add patch headers
- * [5c308ae] 30_fix_manpage_syntax: Remove line in manpage which causes
- warning
- * [b57ab2b] debian/{control,rules}: Replace manual autoreconf with dh-
- autoreconf
- * [2fe5306] Increase Standards-Version to 3.9.0, no changes required
-
- -- Iain Lane <laney at ubuntu.com> Sun, 04 Jul 2010 19:07:59 +0100
-
-tomboy (1.2.1-1) unstable; urgency=low
-
- * New upstream release 1.2.1:
- + Fix bullet list indentation when printing (Closes: #551059)
- + Add timestamp to logger messages, useful for watching autosync output, etc
- * debian/watch: Remove unnecessary "debian"
-
- -- Iain Lane <laney at ubuntu.com> Wed, 28 Apr 2010 11:56:27 +0100
-
-tomboy (1.2.0-1) unstable; urgency=low
-
- * New upstream release 1.2.0
- + Handle new application/x-note mimetype
- + Add a text/path-list target when drag-and-dropping from Search window,
- allowing basic note transfer via Empathy
- + Allow icon themes to customize the panel/tray icon separately
- + Fix errors when using GTK+ >= 2.19.7
- * New upstream release 1.1.4
- + Autosync improvements:
- - Enable the preference in the UI
- - Try to only sync when idle (to avoid interrupting your writing)
- - Do not attempt to sync when the server is unavailable
- - Fix focus/cursor issues that were occurring after autosync
- * New upstream realease 1.1.2
- + Experimental automatic background synchronization support
- + Allow user to decide if links are updated when renaming a note
- + Fix crashers related to new Jump List feature
- * New upstream release 1.1.1
- + Copy rich text from notes to apps like Evolution and OpenOffice.org Writer.
- Feature requires gtk-sharp 2.12.10
- + Rearrange Tomboy startup so icon appears within 0.5-1.0 seconds
- + Prevent crash when entering empty notebook name
- * New upstream release 1.1.0
- + Add support for Ubuntu One and others using OAuth 1.0a
- + Add CreateNamedNoteWithUri method to dbus interface
- + Add dbus methods for working with notebooks
- + Always show icons for note items in recent notes menu
- + Add Sync menu item to panel applet
- + Stop cutting off message text in the Sync dialog
- * debian/rules: Pass --disable-update-mimdb to configure as it doesn't make
- sense to update the mimedb in a buildd build.
- * debian/control: Increase Standards-Version to 3.8.4, no changes required
- * debian/source/format: Specify 1.0 explicitly (hello there Lintian, old
- friend)
-
-
- -- Iain Lane <laney at ubuntu.com> Fri, 02 Apr 2010 23:31:19 +0100
-
-tomboy (1.0.1-4) unstable; urgency=low
-
- * debian/patches/20_remove_pcfile_requires: Remove requires from
- tomboy-addins.pc.in. These are not needed for linkage. (Closes: #564372)
- * debian/control: Update CLI library deps to use new -dev packages which
- contain pcfiles now.
-
- -- Iain Lane <laney at ubuntu.com> Sat, 09 Jan 2010 14:52:59 +0000
-
-tomboy (1.0.1-3) unstable; urgency=low
-
- * The "Won't somebody think of the dep chain" release
- * debian/patches/10_disable_unit_tests.patch: Disable unit tests
- unconditionally as they cause a non-deterministic build depending on
- whether nunit is present or not.
- * debian/control: Remove all build-deps from `mono' source package and
- instead rely on mono-devel (>= 2.4.3) to pull them in.
-
- -- Iain Lane <laney at ubuntu.com> Thu, 17 Dec 2009 22:25:15 +0000
-
-tomboy (1.0.1-2) unstable; urgency=low
-
- * debian/ltmain-as-needed.sh: Update, as a version mismatch with
- Debian's libtool caused FTBFS (Closes: #560664)
-
- -- Iain Lane <laney at ubuntu.com> Wed, 16 Dec 2009 16:04:59 +0000
-
-tomboy (1.0.1-1) unstable; urgency=low
-
- * New upstream release 1.0.1:
- - Add support for Ubuntu One and others using OAuth 1.0a (Rodrigo Moya)
- - Always show icons for note items in recent notes menu
- * debian/patches/02_support_oauth_1.0a.patch: Drop, now upstream
- * debian/control: Switch to gmime2.4 - Tomboy got support for this at
- 0.15.0. (Closes: #556412)
- * debian/control: Bump cli-common-dev version requirement to that which
- provides the DH7 integration
-
- -- Iain Lane <laney at ubuntu.com> Tue, 24 Nov 2009 14:17:51 +0000
-
-tomboy (1.0.0-2) unstable; urgency=low
-
- [ Iain Lane ]
- * debian/rules: Update the translation template after the build, doesn't
- affect Debian but is required for Ubuntu. Reduces the delta.
- * debian/patches/02_support_oauth_1.0a.patch: Add upstream/Ubuntu patch to
- support new OAuth protocol required by some services such as U1.
-
- [ Stefan Ebner ]
- * debian/rules:
- + Directly convert and install the icon
- + Remove debian/clean
- + Remove debian/tomboy.install
- * Added debian/dirs
- * debian/watch: Bump version to 3
-
- -- Iain Lane <laney at ubuntu.com> Wed, 07 Oct 2009 16:01:38 +0100
-
-tomboy (1.0.0-1) unstable; urgency=low
-
- * New upstream version 1.0.0:
- - Fix crash when showing Search from panel applet
- - Redirect complete applet output to ~/.config/tomboy/tomboy-panel.log.
- - Every patch contributor goes in the About dialog now.
- - Add Underline add-in to Windows/Mac builds.
- - WebSync fixes on Windows.
- * New upstream version 0.15.7:
- - Update for latest (hopefully final) REST API spec (Rodrigo Moya).
- - Initial support for OAuth 1.0a servers
- - Drop heavy System.Web dependency by bundling HttpUtility class.
- - Fix parsing bug that caused Tomboy to upload empty notes to the server.
- - More streamlined initial auth procedure (less clicks).
- - Fix error when connecting before logged in to Snowy
- - Prevent crash on PPC and ARM when showing menus
- - Don't connect to session manager when running as applet
- - When closing search window, do not quit if Tomboy icon is visible
- * New upstream version 0.15.6:
- - Migrate notes from ~/.tomboy, following Free Desktop standards on Linux
- and appropriate conventions on Windows and Mac OS X
- - Don't force port 22 when no port is specified for SSH sync
- - Add preference in GConf for maximum width of note menu Jeff Tickle).
- * New upstream version 0.15.5:
- - Option to sync from Tomboy icon's contextual menu (#468459, Buchner
- Johannes).
- - Rename notebooks from the Search window (#435734).
- - Clean up wasted space in Search and Preferences windows
- - Maintain scroll position when notes change while Search window open
- - Fix Notebook toolbar button appearance with 'text beside icons' setting.
- * New upstream version 0.15.4:
- - Improved behavior when changing font sizes (Stefan Schweizer).
- - Builds fixes on Windows and Mac OS X (Matt Johnston, Sandy Armstrong).
- - Require gtk+ 2.14 and stop using obsolete libgnome APIs.
- * debian/control: Bump gtk build-dep to 2.14.0 per configure
- * debian/rules: Remove some unnecessary variables and exports
- * debian/README.source: Add, thanks Lintian
- * debian/control: Add myself to Uploaders
- * debian/control: Update standards-version to 3.8.3, no changes
- * debian/control: Use mono-csc instead of csc as compiler, bump mono-devel
- build-dep version for this
- * debian/control: Update Vcs-Browser to point to new correct URL
-
- -- Iain Lane <laney at ubuntu.com> Fri, 25 Sep 2009 20:55:58 +0100
-
-tomboy (0.15.3-1) experimental; urgency=low
-
- * New upstream version 0.15.3:
- - New underline formatting add-in (disabled by default) from Mark Wakim.
- - Add ctrl +/- shortcuts for changing font size (Stefan Schweizer).
- - Fix bullet display in HTML export (Stefan Schweizer).
- - Update WebSync to use OAuth for authentication, and use the latest REST API.
- - Fix i18n issue in WebSync (Anders Petersson).
- - Add "Get More Add-Ins..." link in the Add-Ins tab of Preferences.
- - Reduce command line output when not running Tomboy with --debug.
- - Fix tarball for those that need panelapplet-sharp bundled.
- - Documentation updates (Paul Culter).
- - New Translations: vi
- - Translation updates: bn_IN, es, et, he, sv, ta, th, uk, zh_CN
-
- -- Iain Lane <laney at ubuntu.com> Wed, 15 Jul 2009 19:46:45 +0100
-
-tomboy (0.15.2-1) experimental; urgency=low
-
- * New upstream release 0.15.1:
- - New WebSync add-in syncs to any server that implements the Tomboy Web REST API,
- such as Snowy [http://live.gnome.org/Snowy]. Baby-eating preview release.
- - Require Mono 1.9.1 to *build* Tomboy. Should still run on older Mono.
- - Prevent PATH problems on Windows from breaking Tomboy.
- - Search for phrases by quoting search text.
- - Fix drag&drop & middle-click paste of linked text.
- - Save width of notebook pane in Search window.
- - Disable sync menu items until backend configured.
- - Close note find bar on escape, even when not focused.
- - Support FUSE being built-in to kernel.
- - Prevent crashes when reading unexpected note XML.
- - Change "Open New Note Template" LinkButton to Button to prevent error.
- - Focus search field every time Search window summoned.
- - Only show Start Here note on first run if not running as applet.
- - HIG compliance in Sync preferences.
- - Use correct "info" icon in add-in info windows.
- - Use relative path to load help.
- - Cache frequently-used text tags in one place instead of five.
- - Documentation updates.
- - Translation updates: el, es, et, gl
- * New upstream release 0.15.2:
- - Fix HTML Export on Mac OS X.
- - Translation updates: es, et, nb, sv, zh_CN
- * debian/control: Add help/ as GFDL 1.1+
- * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz and
- could cause rule to be nondeterministic
-
- -- Iain Lane <laney at ubuntu.com> Mon, 01 Jun 2009 22:08:22 +0100
-
-tomboy (0.15.0-0ubuntu1) karmic; urgency=low
-
- * New upstream release
- * debian/rules:
- + Add get-orig-source rule
- * debian/watch:
- + Do not run "uupdate" as it does not permit preparing Debian
- revision on Ubuntu
- * debian/patches/02_configurable_compiler.patch:
- + Deleted, merged upstream
- * debian/patches/03_03_sm-name.patch:
- + Deleted, no longer relevant
-
- -- Jo Shields <directhex at apebox.org> Wed, 06 May 2009 23:37:55 +0100
-
-tomboy (0.14.3-1) unstable; urgency=low
-
- [ Stefan Ebner ]
- * Replace the tomboy icon misery with a proper method:
- + debian/control:
- - Replace b-p on shareutils with imagemagick.
- - Bump Standards-Version to 3.8.2
- + debian/rules: Convert the icons at build time.
- + Delete tomboy.dirs and tomboy-{16/32}.xpm.uu.
- + Add debian/tomboy.install to install the generated icons properly.
- + Add debian/clean to remove the generated xpm files.
-
- [ Iain Lane ]
- * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz
- and this could cause rule to be nondeterministic
- * Update watch file to scan for stable releases only
- * New upstrem release 0.14.3
- - Fix build for those with gnome-sharp < 2.23.90 (Stefan Schweizer).
- - Fix HTML Export add-in on Mac OS X.
- - Translation updates: el, es
-
- -- Iain Lane <laney at ubuntu.com> Mon, 13 Jul 2009 18:32:54 +0100
-
-tomboy (0.14.2-2) unstable; urgency=low
-
- [ Mirco Bauer ]
- * The "Squeeze it!" release
- + The installed package size was reduced from 13MB to 8MB.
- * debian/rules
- debian/control
- debian/compat:
- + Rewrote for dh7 (automatically uses dh_clistrip).
- * debian/paches/*
- debian/control:
- + Switched to quilt.
- * debian/rules:
- debian/control:
- + Use pngquant to optimize the file size of the PNG files.
- * debian/rules:
- + autoreconf, update gnome-doc-utils.make (for symlinking the same
- picture files) and put patched ltmain.sh in place for --as-needed
- magic before build.
- + Removed --with-mono-addins parameter from configure call, as the
- parameter no longer exist.
-
- [ Iain Lane ]
- * debian/control: Update VCS info to point to git repo
-
- -- Mirco Bauer <meebey at debian.org> Sat, 13 Jun 2009 02:10:01 +0200
-
-tomboy (0.14.2-1) unstable; urgency=low
-
- [ Jo Shields ]
- * New upstream release
- * debian/rules:
- + Add get-orig-source rule
- * debian/watch:
- + Do not run "uupdate" as it does not permit preparing Debian
- revision on Ubuntu
- * debian/patches/02_configurable_compiler.patch:
- + Deleted, merged upstream
- * debian/patches/03_03_sm-name.patch:
- + Deleted, no longer relevant
-
- [ Sebastian Dröge ]
- * debian/control:
- + Update build dependencies.
- + Change maintainer to pkg-cli-apps.
-
- -- Sebastian Dröge <slomo at debian.org> Thu, 14 May 2009 08:23:41 +0200
-
-tomboy (0.12.2-5) unstable; urgency=low
-
- [ Stefan Ebner ]
- * Update libgnome-cil build-dependency for GNOME# 2.24 transition
- * Bump Standards version to 3.8.1
-
- [ Mirco Bauer ]
- * debian/control:
- + Added libgnomepanel2.24-cil to build-deps.
-
- -- Stefan Ebner <sebner at ubuntu.com> Sun, 22 Mar 2009 14:54:14 +0100
-
-tomboy (0.12.2-4) unstable; urgency=low
-
- * debian/control:
- + Build depend on libgmime2.2a-cil.
-
- -- Sebastian Dröge <slomo at debian.org> Sat, 21 Mar 2009 11:24:05 +0100
-
-tomboy (0.12.2-3) unstable; urgency=low
-
- [ Jo Shields ]
- * debian/control:
- + Add Vcs-* fields
-
- [ Sebastian Dröge ]
- * Upload to unstable (Closes: #518414).
- * debian/control:
- + Use Gnome# 2.20 for now.
-
- -- Sebastian Dröge <slomo at debian.org> Fri, 06 Mar 2009 11:02:03 +0100
-
-tomboy (0.12.2-2) experimental; urgency=low
-
- * debian/control:
- + Build against Gnome# 2.24 and GnomeDesktop# 2.24.
-
- -- Sebastian Dröge <slomo at debian.org> Sat, 24 Jan 2009 20:53:58 +0100
-
-tomboy (0.12.2-1) experimental; urgency=low
-
- [ Pedro Fragoso ]
- * Wrap Build-deps Deps and Suggests
- * Don't install la files
- * Update debian/copyright to reflect tomboykeybinder tomboyutil
-
- [ Iain Lane ]
- * debian/rules, debian/control,
- debian/patches/02_configurable_compiler.patch:
- + Update for Mono 2.0 transition (Closes: #509056).
- + Replace mono-gmcs build-dep with mono-devel to pull in csc
- + Remove obsolote libmono-dev build-dep
- + Pass GMCS=/usr/bin/csc to configure to use csc for the build
- + Patch the build system to respect the passed compiler (Patch from James
- Westby)
-
- [ Sebastian Dröge ]
- * New upstream bugfix release.
- * debian/patches/03_sm-name.patch:
- + Register as "tomboy" to the session manager instead
- of "Tomboy" (Closes: #508995). Thanks to Josselin Mouette
- for the patch idea.
-
- -- Sebastian Dröge <slomo at debian.org> Sat, 20 Dec 2008 12:58:35 +0100
-
-tomboy (0.12.1-1) experimental; urgency=low
-
- * New upstream stable release:
- + debian/control:
- - Add gnomeprint and gnomeprintui to build depends.
- * debian/watch:
- + Fix URL for the upstream taraball for the
- new versions (Closes: #500284).
-
- -- Sebastian Dröge <slomo at debian.org> Thu, 20 Nov 2008 13:11:00 +0100
-
-tomboy (0.11.3-1) experimental; urgency=low
-
- * New upstream development release.
-
- -- Sebastian Dröge <slomo at debian.org> Fri, 22 Aug 2008 10:15:20 +0200
-
-tomboy (0.11.1-1) experimental; urgency=low
-
- * New upstream development release:
- + debian/control:
- - Update build dependencies.
- - Update Standards-Version to 3.8.0.
- - Suggest tasque.
-
- -- Sebastian Dröge <slomo at debian.org> Sat, 09 Aug 2008 14:58:30 +0200
-
-tomboy (0.10.2-1) unstable; urgency=low
-
- * New upstream bugfix release.
-
- -- Sebastian Dröge <slomo at debian.org> Tue, 20 May 2008 11:05:10 +0200
-
-tomboy (0.10.1-1) unstable; urgency=low
-
- * New upstream bugfix release.
-
- -- Sebastian Dröge <slomo at debian.org> Mon, 07 Apr 2008 21:40:51 +0200
-
-tomboy (0.10.0-1) unstable; urgency=low
-
- * New upstream stable release:
- + Upload to unstable.
-
- -- Sebastian Dröge <slomo at debian.org> Mon, 10 Mar 2008 19:34:31 +0100
-
-tomboy (0.9.8-1) experimental; urgency=low
-
- * New upstream release:
- + debian/patches/02_link-libX11.patch,
- debian/patches/99_autoreconf.patch:
- - Dropped, not needed anymore.
- * debian/rules,
- debian/PrintNotes.dll.config:
- + Install dll mappings for the Print Notes addin.
-
- -- Sebastian Dröge <slomo at debian.org> Tue, 04 Mar 2008 11:46:34 +0100
-
-tomboy (0.9.7-2) experimental; urgency=low
-
- * Rebuild against gtk-sharp2 2.10.4-2 (Closes: #468906).
-
- -- Sebastian Dröge <slomo at debian.org> Mon, 03 Mar 2008 05:06:13 +0100
-
-tomboy (0.9.7-1) experimental; urgency=low
-
- * New upstream development release:
- + debian/control:
- - Updated build dependencies.
- + debian/patches/01_external-mono-addins.patch:
- - Dropped, merged upstream.
- + debian/watch:
- - Updated for the new release series.
- + debian/patches/01_dllmaps.patch:
- - Fix dllmap to point to the correct path.
- * debian/rules,
- debian/patches/99_ltmain_as-needed.patch:
- + Link the native libraries with --as-needed to get fewer dependencies.
- * debian/patches/02_link-libX11.patch:
- + Link libtomboy with libX11.
- * debian/patches/99_autoreconf.patch:
- + Regenerated for the above change.
- * debian/control:
- + Update Standards-Version to 3.7.3, no additional changes needed.
- + Use Homepage field.
- + Build depend on autotools-dev.
-
- -- Sebastian Dröge <slomo at debian.org> Fri, 29 Feb 2008 08:02:26 +0100
-
-tomboy (0.8.2-1) unstable; urgency=low
-
- * New upstream bugfix release:
- + debian/patches/02_CVE-2005-4790-insecure-search-path.patch:
- - Dropped, merged upstream.
- + debian/patches/99_autoreconf.patch:
- - Updated for the new version.
-
- -- Sebastian Dröge <slomo at debian.org> Mon, 26 Nov 2007 17:05:20 +0100
-
-tomboy (0.8.1-2) unstable; urgency=high
-
- * debian/patches/02_CVE-2005-4790-insecure-search-path.patch:
- + SECURITY, CVE-2005-4790:
- Multiple untrusted search path vulnerabilities in SUSE Linux 9.3 and
- 10.0, and possibly other distributions, cause the working directory to
- be added to LD_LIBRARY_PATH, which might allow local users to execute
- arbitrary code via (1) beagle, (2) tomboy, or (3) blam.
- NOTE: in August 2007, the tomboy vector was reported for other
- distributions.
- Patch taken from upstream SVN.
- * debian/tomboy.menu:
- + Fix section. It's now "Applications/Data Management".
-
- -- Sebastian Dröge <slomo at debian.org> Wed, 14 Nov 2007 05:34:45 +0100
-
-tomboy (0.8.1-1) unstable; urgency=low
-
- * New upstream bugfix release, with many translation updates.
- * debian/patches/99_autoreconf.patch:
- + Updated for the new version.
-
- -- Sebastian Dröge <slomo at debian.org> Tue, 16 Oct 2007 12:58:54 +0200
-
-tomboy (0.8.0-2) unstable; urgency=low
-
- * debian/patches/01_external-mono-addins.patch,
- debian/patches/99_autoreconf.patch,
- debian/control.in,
- debian/rules:
- + Build against an external Mono.Addins. Patch taken from upstream SVN.
-
- -- Sebastian Dröge <slomo at debian.org> Sat, 22 Sep 2007 11:23:05 +0200
-
-tomboy (0.8.0-1) unstable; urgency=low
-
- * New upstream release (Closes: #436809):
- + Adds sync support (Closes: #313302).
- + debian/patches/01_define.cs.patch:
- - Dropped, merged upstream.
- + debian/tomboy.desktop:
- - Dropped, upstream's desktop file is usable now and we use it since
- some time already anyway.
-
- -- Sebastian Dröge <slomo at debian.org> Mon, 17 Sep 2007 15:41:26 +0200
-
-tomboy (0.6.3-2) unstable; urgency=low
-
- * debian/patches/01_define.cs.patch:
- + Fix FTBFS caused by having an "[assembly: ..." attribute in the end.
- It's only allowed directly after "using ..." (Closes: #441657).
- * debian/rules:
- + Call dh_clifixperms to get proper permissions on all files.
-
- -- Sebastian Dröge <slomo at debian.org> Wed, 12 Sep 2007 07:04:21 +0200
-
-tomboy (0.6.3-1) unstable; urgency=low
-
- * New maintainer with permission of the old maintainer. Thanks to Dave
- Beckett for the work on this package in the past.
- * New upstream release (Closes: #418566, #415420):
- + DBus support is fixed and tomboy is single-instance
- again (Closes: #407744, #313298, #400552)
- + Fixes crash when opening preferences (Closes: #386271)
- + Ship fixed width plugin (Closes: #372776)
- + Fixes interaction with session manager (Closes: #356833)
- + Fixes bad interaction with different linking mechanisms (Closes: #396177)
- + debian/control:
- - Update build dependencies. Tomboy uses C# 2.0 now and also uses the
- external ndesk-dbus packages.
- - Suggest evolution as tomboy has a evolution plugin which allows
- dragging mails from evolution to notes and adds a nice link to the
- mail in the note.
- + debian/patches/01-dbus0.9.patch:
- - Dropped, not needed anymore with the new version.
- * Acknowledge NMU by Michael Ablassmeier (Closes: #388205)
- * debian/control:
- + Set me as maintainer.
- * debian/rules,
- debian/tomboy.desktop:
- + Use upstream's desktop file now as it has proper translations.
- * debian/rules:
- + Drop now unecessary restoring of config.{sub,guess} as it is done
- properly by cdbs since some time already.
- + Drop unecessary cleaning of the plugins as upstream's build system cares
- for this now.
- * debian/watch:
- + Update watch file for the 0.6 series.
-
- -- Sebastian Dröge <slomo at debian.org> Sat, 14 Apr 2007 17:09:41 +0200
-
-tomboy (0.5.0-1) experimental; urgency=low
-
- * New upstream release
- * Added new plugins: Bugzilla, FixedWidth, NoteOfTheDay
-
- -- Dave Beckett <dajobe at debian.org> Thu, 16 Nov 2006 13:58:37 -0800
-
-tomboy (0.4.1-2) unstable; urgency=low
-
- * Added Build-Depends: on libdbus-glib-1-dev to get D-Bus remote
- control enabled (Closes: #393484)
- * Updated Build-Depends: for cli-common-dev to >= 0.4.4
-
- -- Dave Beckett <dajobe at debian.org> Thu, 19 Oct 2006 00:02:29 -0700
-
-tomboy (0.4.1-1) unstable; urgency=low
-
- * New upstream release
- * Upstream sources now DFSG as last old icon removed.
- - removed 01_image_name patch
- * Added D-BUS API change patch 04_dbus0.9.patch. (Closes: #385382)
- * Acknowledge NMU in 0.3.9+dfsg-2.1 for previous patch.
- * Depend on libdbus-1-dev (>= 0.90), no longer use libdbus-cil
- * Packaged new Sticky Notes import plugin
-
- -- Dave Beckett <dajobe at debian.org> Sat, 23 Sep 2006 19:30:03 -0700
-
-tomboy (0.3.9+dfsg-2.1) unstable; urgency=high
-
- * Non-maintainer upload.
- * Add Patch for deprecated dbus functions (Closes: #385382)
-
- -- Michael Ablassmeier <abi at debian.org> Tue, 19 Sep 2006 09:11:38 +0200
-
-tomboy (0.3.9+dfsg-2) unstable; urgency=medium
-
- * Added postint to rebuild broken scrollkeeper database using
- patch to fix it from Loïc Minier - Thanks (Closes: #383201)
- * Fixes RC bug, thus urgency medium.
-
- -- Dave Beckett <dajobe at debian.org> Sun, 3 Sep 2006 09:48:52 -0700
-
-tomboy (0.3.9+dfsg-1) unstable; urgency=medium
-
- * Provide DFSG version of sources
- * Disable scrollkeeper from installing into /var (Closes: #382800)
-
- -- Dave Beckett <dajobe at debian.org> Sun, 13 Aug 2006 12:36:00 -0700
-
-tomboy (0.3.9-1) unstable; urgency=medium
-
- * New upstream release
- - Builds against GTK 2.0, removed patch 02_gtk-sharp2.patch
- - Builds against dbus directly rather than using dbus-sharp. Change
- from Build-Depends on libdbus-cil-1 to libdbus-glib-1-2
- - Preference dialog modality fixed (Closes: #313295)
- - Italic pasting fixed (Closes: #329476)
- - Added StickyNoteImport plugin
- - Uses gnome document tools. Add Build-Depends on gnome-doc-utils and
- scrollkeeper
- * Upstream application icon changed "due to legal restrictions"
- - Remove the replacement third-party images we were using.
- - Continue to remove one use of the old icon from the source tarball.
- - Updated patch 01_image_name to remove the last use of the old icon
- - Added XPM versions of the new icons
- * Standards version 3.7.2 (no changes)
- * Updated to latest Debian Mono Policy. Build-Depend on cli-common-dev
- * Build depend on libgmime2.2-cil replacing libgmime2.1-cil which was
- removed from Debian yesterday fixing FTBFS on arm (Closes: #382653)
- * Urgency medium due to FTBFS fix.
-
- -- Dave Beckett <dajobe at debian.org> Sat, 12 Aug 2006 09:43:31 -0700
-
-tomboy (0.3.5-2) unstable; urgency=low
-
- * Add dependencies to native library (Closes: #364778)
- * Enable Evolution plugin (Closes: #364779)
-
- -- Dave Beckett <dajobe at debian.org> Tue, 25 Apr 2006 20:59:25 -0700
-
-tomboy (0.3.5-1) unstable; urgency=low
-
- * New upstream release (Closes: #352531)
- * Require dbus 0.61-3 to get a non-broken assembly version (see bug #354798)
- * Packaging updates from Ubuntu 0.3.5-0ubuntu1 thanks to Sebastian Dröge
- * 02_Trie.cs_mcs119.patch deleted as merged into upstream.
-
- -- Dave Beckett <dajobe at debian.org> Sat, 18 Mar 2006 19:47:02 -0800
-
-tomboy (0.3.5-0ubuntu1) dapper; urgency=low
-
- * New upstream release
- * 01_image_name.patch:
- + Updated for new upstream version
- * 02_gtk-sharp2.patch:
- + Use Gtk#2 instead of Gtk#
- * Tightened and adjusted Build-Depends
- * Added ${misc:Depends} to Depends
- * Updated debhelper compat version to 5
-
- -- Sebastian Dröge <slomo at ubuntu.com> Fri, 24 Feb 2006 17:01:15 +0100
-
-tomboy (0.3.3-3) unstable; urgency=low
-
- * Build against libdbus-1-cil (Closes: #338495)
-
- -- Dave Beckett <dajobe at debian.org> Thu, 12 Jan 2006 19:41:41 -0800
-
-tomboy (0.3.3-2) unstable; urgency=low
-
- * Added patch from CVS to fix Mono 1.1.9.x build (Closes: 337356)
- - 02_Trie.cs_mcs119.patch from CVS
-
- -- Dave Beckett <dajobe at debian.org> Thu, 3 Nov 2005 19:59:02 -0800
-
-tomboy (0.3.3-1) unstable; urgency=low
-
- * New upstream release
- * New ExportToHTML plugin
- * Updated image name fixing patch 01_image_name.patch
- * Removed Mono 1.1.8.x build patches merged upstream:
- - 02_mono118_Trie.patch
- - 03_mono118_AppletFactory.patch
-
- -- Dave Beckett <dajobe at debian.org> Wed, 10 Aug 2005 19:33:28 +0100
-
-tomboy (0.3.2-9) unstable; urgency=low
-
- * Removed obsolete Build-Depend: on mono-jit and mono-utils
- * Updated debian/watch file to new location.
- * Added 24x24 icon from same author as the other icons, cleaned up by
- Gordon Ingram to help the toolbar icon look better (Closes: 316765)
- * Rebuild for mono 1.1.8.1
- * Applied patches from CVS to fix 1.1.8.x builds:
- 02_mono118_Trie.patch and 03_mono118_AppletFactory.patch
- * Add MONO_SHARED_DIR to stop monodis core dumping when called
- inside dh_clideps
-
- -- Dave Beckett <dajobe at debian.org> Mon, 11 Jul 2005 17:13:26 +0100
-
-tomboy (0.3.2-8) unstable; urgency=low
-
- * Added 16x16 and 32x32 pixmap xpm icons
- * Added menu and tomboy.desktop linked to the icons
-
- -- Dave Beckett <dajobe at debian.org> Tue, 14 Jun 2005 23:07:01 +0100
-
-tomboy (0.3.2-7) unstable; urgency=low
-
- * Upload to unstable
- * Depend on libdbus-cil 0.23.4-3 built with mono in unstable
- * Remove dependency on mono-mint (Closes: 311956)
-
- -- Dave Beckett <dajobe at debian.org> Fri, 10 Jun 2005 16:22:59 +0100
-
-tomboy (0.3.2-6) experimental; urgency=low
-
- * Merge with ubuntu up to 0.3.2-4ubuntu5:
- - changed the uudecode line from update-config to post-patches in
- debian/rules
- - not applying Tomboy/Trie.cs patch
-
- -- Dave Beckett <dajobe at debian.org> Wed, 1 Jun 2005 20:13:48 +0100
-
-tomboy (0.3.2-5) experimental; urgency=low
-
- * Rebuild package with source inside changes
-
- -- Dave Beckett <dajobe at debian.org> Fri, 27 May 2005 13:20:41 +0100
-
-tomboy (0.3.2-4) experimental; urgency=low
-
- * Upload of tomboy to experimental (Closes: 272264)
- * Require mono 1.1.6+
- * Build-Depends on sharutils for uudecode
-
- -- Dave Beckett <dajobe at debian.org> Fri, 27 May 2005 13:09:47 +0100
-
-tomboy (0.3.2-3) experimental; urgency=low
-
- * Standards-Version 3.6.1.0 and depend on newer debhelper for cdbs
-
- -- Dave Beckett <dajobe at debian.org> Fri, 15 Apr 2005 22:21:52 +0100
-
-tomboy (0.3.2-2) experimental; urgency=low
-
- * Rebuild against mono 1.1 packages.
- * Require cli-common
-
- -- Dave Beckett <dajobe at debian.org> Fri, 15 Apr 2005 22:04:15 +0100
-
-tomboy (0.3.2-1) experimental; urgency=low
-
- * New upstream release
-
- -- Dave Beckett <dajobe at debian.org> Sun, 10 Apr 2005 15:48:23 +0100
-
-tomboy (0.3.1-1) experimental; urgency=low
-
- * Port of the packaging from Ubuntu to Debian
- * Removed non-distributable image from orig.tar.gz and
- added debian/README.Debian-source to explain this
- * Added replacement image debian/tomboy.png.uu from Jacub Steiner
- * Added patches/01_image_name.patch to rename mentions to the image
-
- -- Dave Beckett <dajobe at debian.org> Sun, 10 Apr 2005 15:29:35 +0100
-
-tomboy (0.3.1-0ubuntu6) hoary; urgency=low
-
- * Rebuilt against new libdbus-cil.
-
- -- Daniel Holbach <dh at mailempfang.de> Wed, 16 Mar 2005 21:11:11 +0100
-
-tomboy (0.3.1-0ubuntu5) hoary; urgency=low
-
- * Rebuild with current libs.
-
- -- Sebastien Bacher <seb128 at canonical.com> Sat, 19 Feb 2005 14:57:09 +0100
-
-tomboy (0.3.1-0ubuntu4) hoary; urgency=low
-
- * Er, libpanel-applet2-dev
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 2 Feb 2005 20:49:44 -0800
-
-tomboy (0.3.1-0ubuntu3) hoary; urgency=low
-
- * Build-Depend on libpanel-applet-dev, not libpanel-applet2-0
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 2 Feb 2005 11:01:26 -0800
-
-tomboy (0.3.1-0ubuntu2) hoary; urgency=low
-
- * debian/control
- build-dep on libpanel-applet2-0 to fix FTBFS.
-
- -- Brandon Hale <brandon at smarterits.com> Mon, 31 Jan 2005 23:52:04 -0500
-
-tomboy (0.3.1-0ubuntu1) hoary; urgency=low
-
- * New upstream release
- - Made the move to Gnome Panel applet. (TrayIcon mode is still supported).
- - New plugin system, so anyone can customize their Tomboy notes.
- - A Note printing plugin
- - A new preferences dialog
- * debian/control
- - Add libdbus-cil to build-deps
-
- -- Brandon Hale <brandon at smarterits.com> Thu, 27 Jan 2005 18:35:41 -0500
-
-tomboy (0.2.2-1ubuntu1) hoary; urgency=low
-
- * Update Build-Dep and fix FTBFS.
-
- -- Fabio M. Di Nitto <fabbione at fabbione.net> Mon, 22 Nov 2004 13:10:03 +0100
-
-tomboy (0.2.2-1) hoary; urgency=low
-
- * New upstream release
-
- -- Brandon Hale <brandon at localhost.localdomain> Sun, 21 Nov 2004 15:35:03 -0500
-
-tomboy (0.2.0-1) unstable; urgency=low
-
- * New upstream release
-
- -- Brandon Hale <brandon at smarterits.com> Mon, 11 Oct 2004 09:31:35 -0400
-
-tomboy (0.1.2-2) unstable; urgency=low
-
- * Fix up build-depends in debian/control, use ${net:Depends} and dh_netdeps
- as well.
-
- -- Brandon Hale <brandon at smarterits.com> Thu, 7 Oct 2004 11:14:29 -0400
-
-tomboy (0.1.2-1) unstable; urgency=low
-
- * New upstream release
-
- -- Brandon Hale <brandon.hale at gmail.com> Sat, 25 Sep 2004 08:59:36 -0400
-
-tomboy (0.1.1-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Brandon Hale <brandon.hale at gmail.com> Mon, 20 Sep 2004 20:08:46 -0400
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 3fb83dd..0000000
--- a/debian/control
+++ /dev/null
@@ -1,46 +0,0 @@
-Source: tomboy
-Section: gnome
-Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at debian.org>
-Build-Depends: debhelper (>= 7.0.50),
- dh-autoreconf,
- gnome-common,
- intltool,
- pngquant,
- mono-devel (>= 2.4.3),
- libgtk2.0-cil-dev (>= 2.10.4),
- libgconf2-dev,
- libgconf2.0-cil-dev (>= 2.24),
- libgtkspell-dev (>= 2.0.9),
- cli-common-dev (>= 0.5.7),
- imagemagick,
- libgtk2.0-dev (>= 2.14.0),
- libatk1.0-dev (>= 1.2.4),
- libgmime2.6-cil-dev,
- gnome-doc-utils (>= 0.3.2),
- scrollkeeper,
- libdbus1.0-cil-dev (>= 0.4),
- libdbus-glib1.0-cil-dev (>= 0.3),
- libmono-addins-cil-dev (>= 0.3),
- libmono-addins-gui-cil-dev (>= 0.3),
- libappindicator0.1-cil-dev (>= 0.4.90),
- libproxy-dev
-Standards-Version: 3.9.3
-Homepage: http://www.gnome.org/projects/tomboy/
-Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
-Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tomboy.git
-
-Package: tomboy
-Architecture: any
-Depends: ${cli:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: evolution,
- tasque
-Description: desktop note taking program using Wiki style links
- Tomboy is a desktop note-taking application which is simple and easy to
- use. It lets you organise your notes intelligently by allowing you to
- easily link ideas together with Wiki style interconnects.
-
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 2cbc20d..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,94 +0,0 @@
-This package was debianized by Brandon Hale <brandon.hale at gmail.com> on
-Mon, 20 Sep 2004 20:08:46 -0400.
-
-It was downloaded from http://www.beatniksoftware.com/tomboy/
-
-Upstream Author: Alex Graveley <alex at beatniksoftware.com>
- Sandy Armstrong <sanfordarmstrong at gmail.com>
- Boyd Timothy <btimothy at gmail.com>
-
-Copyright (C) 2004-2008 Alex Graveley <alex at beatniksoftware.com>
- (C) 2006-2009 Sandy Armstrong <sanfordarmstrong at gmail.com>
- (C) 2006-2008 Boyd Timothy <btimothy at gmail.com>
-
-Tomboy is licensed under the LGPL V2.1, see COPYING for more details.
-On Debian systems, the complete text of the GNU Lesser General Public
-License V2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
-
----
-
-tomboykeybinder.{c,h} and tomboyutil.{c,h} are MIT/X11 (BSD like)
-
-Copyright:
-
- Copyright (C) 2008 Alex Graveley
-
-License:
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- IABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- F CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
-help/* are under the GFDL version 1.1+
-
-Copyright:
- Alex Graveley <alex at beatniksoftware.com>
- Boyd Timothy <btimothy at gmail.com>
- Brent Smith <gnome at nextreality.net>
- Christophe Bliard <christophe.bliard at trux.info>
- Claude Paroz <claude at 2xlibre.net>
- Daniel Nylander <po at danielnylander.se>
- David Lodge <dave at cirt.net>
- Francisco Javier F. Serrador
- Inaki Larranaga Murgoitio <dooteo at euskalgnu.org>
- Jochen Skulj <jochen at jochenskulj.de>
- Jonh Wendell <jwendell at gnome.org>
- Jorge Gonzalez <jorgegonz at svn.gnome.org>
- Luca Ferretti <elle.uca at libero.it>
- Maslov <conma at yandex.ru>
- Maxim Dziumanenko <dziumanenko at gmail.com>
- Milo Casagrande <milo at ubuntu.com>
- Nickolay V. Shmyrev <nshmyrev at yandex.ru>
- Philip Withnall <philip at tecnocode.co.uk>
- Sandy Armstrong <sanfordarmstrong at gmail.com>
- Simos Xenitellis <simos at gnome.org>
- Vasiliy Faronov <qvvx at yandex.ru>
- Wadim Dziedzic <wadimd at svn.gnome.org>
- Yannig Marchegay <yannig at marchegay.org>
-
-License:
- This program is free software: you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, either
- version 1.1 of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-The tomboy-16.xpm.uu, tomboy-32.xpm.uu, tomboy.png.uu and
-tomboy-24.png.uu files are uuencodings of icons in PNG format that are:
-
- Copyright Jakub Steiner, Copyright Novell
- from http://jimmac.musichall.cz/i.php?i=tomboy
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index c1da623..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/pixmaps
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 6566d6a..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-debian-branch = ubuntu
-upstream-branch = experimental
-compression = xz
diff --git a/debian/patches/01_dllmaps.patch b/debian/patches/01_dllmaps.patch
deleted file mode 100644
index 7989d88..0000000
--- a/debian/patches/01_dllmaps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Update libtomboy dllmap to use absolute path
-Index: tomboy/Tomboy/Tomboy.exe.config.in
-===================================================================
---- tomboy.orig/Tomboy/Tomboy.exe.config.in 2012-05-03 21:16:57.732547227 +0100
-+++ tomboy/Tomboy/Tomboy.exe.config.in 2012-05-03 21:17:00.364547139 +0100
-@@ -1,7 +1,7 @@
- <configuration>
-- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-+ <dllmap dll="glib-2.0.dll" target="libglib-2.0.so.0"/>
- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
- <dllmap dll="libgtkspell" target="libgtkspell.so.0"/>
-- <dllmap dll="libtomboy" target="libtomboy.so"/>
-+ <dllmap dll="libtomboy" target="/usr/lib/tomboy/libtomboy.so"/>
- <dllmap dll="panel-applet-2" target="libpanel-applet-2.so.0"/>
- </configuration>
diff --git a/debian/patches/02_sync_save_button_sensitive.patch b/debian/patches/02_sync_save_button_sensitive.patch
deleted file mode 100644
index 0f68a02..0000000
--- a/debian/patches/02_sync_save_button_sensitive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Ensure the save button is sensitive when setting up WebSync.
-This is a work around, but gets us back to where we were in Natty. Upstream
-relies on the entries changing to set the button sensitive, however we
-pre-populate the fields with ubuntuone settings. If these don't get changed
-the user can not save the settings even after successful auth. Ideally it
-should become sensitive when Auth.IsAccessToken becomes true.
-Author: Ken VanDine <ken.vandine at ubuntu.com>
-Bug-Ubuntu: https://launchpad.net/bugs/845321
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=473332
-Forwarded: not-needed
-
-=== modified file 'Tomboy/PreferencesDialog.cs'
-Index: tomboy/Tomboy/PreferencesDialog.cs
-===================================================================
---- tomboy.orig/Tomboy/PreferencesDialog.cs 2012-05-03 21:16:57.692547228 +0100
-+++ tomboy/Tomboy/PreferencesDialog.cs 2012-05-03 21:17:00.604547100 +0100
-@@ -1113,7 +1113,7 @@
- syncAddinPrefsContainer.PackStart (syncAddinPrefsWidget, false, false, 0);
-
- resetSyncAddinButton.Sensitive = false;
-- saveSyncAddinButton.Sensitive = false;
-+ saveSyncAddinButton.Sensitive = true;
- }
- } else {
- selectedSyncAddin = null;
diff --git a/debian/patches/03_u1_as_default_sync.patch b/debian/patches/03_u1_as_default_sync.patch
deleted file mode 100644
index 02590d4..0000000
--- a/debian/patches/03_u1_as_default_sync.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
-===================================================================
---- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs 2012-05-03 21:16:57.656547230 +0100
-+++ tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs 2012-05-03 21:17:00.788547091 +0100
-@@ -97,6 +97,8 @@
- string serverPref;
- Api.OAuth oauth;
- GetConfigSettings (out oauth, out serverPref);
-+ if (string.IsNullOrEmpty (serverPref))
-+ serverPref = "https://one.ubuntu.com/notes/";
- prefsWidget = new WebSyncPreferencesWidget (oauth, serverPref, requiredPrefChanged);
- return prefsWidget;
- }
diff --git a/debian/patches/04_app_indicator.patch b/debian/patches/04_app_indicator.patch
deleted file mode 100644
index 7d75c5a..0000000
--- a/debian/patches/04_app_indicator.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-=== modified file 'Tomboy/Makefile.am'
-Index: tomboy/Tomboy/Makefile.am
-===================================================================
---- tomboy.orig/Tomboy/Makefile.am 2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/Makefile.am 2012-06-05 22:05:45.753783550 +0100
-@@ -122,6 +122,7 @@
- $(srcdir)/Tag.cs \
- $(srcdir)/TagButton.cs \
- $(srcdir)/TagManager.cs \
-+ $(srcdir)/TomboyIndicatorTray.cs \
- $(srcdir)/Tray.cs \
- $(srcdir)/Trie.cs \
- $(srcdir)/Undo.cs \
-@@ -147,6 +148,7 @@
-
- ASSEMBLIES = \
- $(GTKSHARP_LIBS) \
-+ $(APPINDICATORSHARP_LIBS) \
- $(GNOME_LIBS) \
- -r:Mono.Posix \
- $(DBUS_LIBS) \
-Index: tomboy/Tomboy/NoteManager.cs
-===================================================================
---- tomboy.orig/Tomboy/NoteManager.cs 2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/NoteManager.cs 2012-06-05 22:05:45.753783550 +0100
-@@ -369,6 +369,9 @@
- // Update the trie so addins can access it, if they want.
- trie_controller.Update ();
-
-+ if (NotesLoaded != null)
-+ NotesLoaded (this, EventArgs.Empty);
-+
- bool startup_notes_enabled = (bool)
- Preferences.Get (Preferences.ENABLE_STARTUP_NOTES);
-
-Index: tomboy/Tomboy/RecentChanges.cs
-===================================================================
---- tomboy.orig/Tomboy/RecentChanges.cs 2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/RecentChanges.cs 2012-06-05 22:05:45.753783550 +0100
-@@ -247,7 +247,8 @@
- am ["DeleteNotebookAction"].Activated += OnDeleteNotebook;
- am ["CloseWindowAction"].Activated += OnCloseWindow;
- if (Tomboy.TrayIconShowing == false &&
-- (bool) Preferences.Get (Preferences.ENABLE_TRAY_ICON))
-+ (bool) Preferences.Get (Preferences.ENABLE_TRAY_ICON) &&
-+ !TomboyIndicatorTray.IndicatorTrayPresent)
- am ["CloseWindowAction"].Visible = false;
-
- // Allow Escape to close the window as well as <Control>W
-@@ -1141,7 +1142,8 @@
- instance = null;
- #if !MAC
- if (Tomboy.TrayIconShowing == false &&
-- (bool) Preferences.Get (Preferences.ENABLE_TRAY_ICON))
-+ (bool) Preferences.Get (Preferences.ENABLE_TRAY_ICON) &&
-+ !TomboyIndicatorTray.IndicatorTrayPresent)
- Tomboy.ActionManager ["QuitTomboyAction"].Activate ();
- #endif
- }
-Index: tomboy/Tomboy/Tomboy.cs
-===================================================================
---- tomboy.orig/Tomboy/Tomboy.cs 2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/Tomboy.cs 2012-06-05 22:05:45.753783550 +0100
-@@ -191,11 +191,17 @@
- #endif
- }
-
-+ static TomboyIndicatorTray indicator;
- static void StartTrayIcon ()
- {
-- // Create the tray icon and run the main loop
-- tray_icon = new TomboyTrayIcon (manager);
-- tray = tray_icon.Tray;
-+ if (TomboyIndicatorTray.IndicatorTrayPresent) {
-+ indicator = new TomboyIndicatorTray (manager);
-+ } else {
-+ // Create the tray icon and run the main loop
-+ tray_icon = new TomboyTrayIcon (manager);
-+ tray = tray_icon.Tray;
-+ }
-+
- StartMainLoop ();
- }
-
-Index: tomboy/Tomboy/TomboyIndicatorTray.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tomboy/Tomboy/TomboyIndicatorTray.cs 2012-06-05 22:05:45.753783550 +0100
-@@ -0,0 +1,180 @@
-+//
-+// Copyright (C) 2009 GNOME Do
-+//
-+// This program is free software: you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation, either version 3 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-+//
-+
-+using System;
-+using System.Collections.Generic;
-+using System.Linq;
-+
-+using Mono.Unix;
-+
-+using Gnome;
-+using AppIndicator;
-+
-+namespace Tomboy
-+{
-+ public class TomboyIndicatorTray
-+ {
-+ public static bool IndicatorTrayPresent {
-+ get {
-+ return true;
-+ }
-+ }
-+
-+ ApplicationIndicator indicator;
-+ NoteManager manager;
-+ Gtk.Menu menu;
-+ int idle_source = 0;
-+
-+ public TomboyIndicatorTray (NoteManager manager)
-+ {
-+ this.manager = manager;
-+ indicator = new ApplicationIndicator ("tomboy-notes", "tomboy", Category.ApplicationStatus);
-+
-+ SetMenuItems ();
-+ indicator.Status = Status.Active;
-+ indicator.Title = Catalog.GetString ("Tomboy Notes");
-+
-+ manager.NoteDeleted += OnNoteDeleted;
-+ manager.NoteAdded += OnNoteAdded;
-+ manager.NoteRenamed += OnNoteRenamed;
-+ manager.NotesLoaded += OnNotesLoaded;
-+ }
-+
-+ void OnNoteAdded (object sender, Note added)
-+ {
-+ SetMenuItems ();
-+ }
-+
-+ void OnNoteDeleted (object sender, Note deleted)
-+ {
-+ SetMenuItems ();
-+ }
-+
-+ void OnNoteRenamed (Note renamed, string old_title)
-+ {
-+ SetMenuItems ();
-+ }
-+
-+ void OnNotesLoaded (object sender, EventArgs args)
-+ {
-+ SetMenuItems ();
-+ }
-+
-+ void SetMenuItems ()
-+ {
-+ if (idle_source == 0)
-+ GLib.Idle.Add(SetMenuItemsIdle);
-+ }
-+
-+ bool SetMenuItemsIdle ()
-+ {
-+ idle_source = 0;
-+
-+ if (menu != null) {
-+ foreach (Gtk.Widget widget in menu.Children) {
-+ menu.Remove (widget);
-+ widget.Destroy ();
-+ }
-+ }
-+
-+ menu = new Gtk.Menu ();
-+
-+ foreach (Gtk.MenuItem item in CurrentMenuItems ()) {
-+ menu.Append (item);
-+ item.Show();
-+ }
-+
-+ menu.Show();
-+
-+ //if (indicator.Menu == null)
-+ indicator.Menu = menu;
-+
-+ return false;
-+ }
-+
-+ Gtk.MenuItem CreateNoteMenuItem(Note n)
-+ {
-+ var item = new Gtk.MenuItem (n.Title);
-+ item.Activated += (o, a) => SetMenuItems ();
-+ item.Activated += (o, a) => n.Window.Present ();
-+ return item;
-+ }
-+
-+ IEnumerable<Gtk.MenuItem> CurrentMenuItems ()
-+ {
-+ Gtk.ImageMenuItem item;
-+
-+ item = new Gtk.ImageMenuItem (Catalog.GetString ("Create New Note"));
-+ item.Image = new Gtk.Image (Gtk.Stock.New, Gtk.IconSize.Menu);
-+ item.Activated += (o, a) => Tomboy.ActionManager["NewNoteAction"].Activate ();
-+ item.Activated += (o, a) => SetMenuItems ();
-+ yield return item;
-+
-+ item = new Gtk.ImageMenuItem (Catalog.GetString ("_Search All Notes"));
-+ item.Image = new Gtk.Image (Gtk.Stock.Find, Gtk.IconSize.Menu);
-+ item.Activated += (o, a) => Tomboy.ActionManager["ShowSearchAllNotesAction"].Activate ();
-+ yield return item;
-+
-+ yield return new Gtk.SeparatorMenuItem ();
-+
-+ if (manager != null && manager.Notes != null) {
-+ Tag template_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
-+ var menuItems = manager.Notes
-+ .Where (n => !n.IsSpecial && !n.ContainsTag(template_tag))
-+ .OrderByDescending (n => n.ChangeDate)
-+ .Take (10)
-+ .Select (n => CreateNoteMenuItem(n))
-+ .ToArray ();
-+ // avoid lazy eval for menu item construction
-+
-+ foreach (Gtk.MenuItem mi in menuItems) {
-+ yield return mi;
-+ }
-+ }
-+
-+ yield return new Gtk.SeparatorMenuItem ();
-+
-+ Gtk.MenuItem mitem = new Gtk.MenuItem (Catalog.GetString ("S_ynchronize Notes"));
-+ // setting this changes the menu text to "Convert"
-+ // item.Image = new Gtk.Image (Gtk.Stock.Convert, Gtk.IconSize.Menu);
-+ mitem.Activated += (o, a) => Tomboy.ActionManager["NoteSynchronizationAction"].Activate ();
-+ yield return mitem;
-+
-+ item = new Gtk.ImageMenuItem (Catalog.GetString ("_Preferences"));
-+ item.Image = new Gtk.Image (Gtk.Stock.Preferences, Gtk.IconSize.Menu);
-+ item.Activated += (o, a) => Tomboy.ActionManager["ShowPreferencesAction"].Activate ();
-+ yield return item;
-+
-+ item = new Gtk.ImageMenuItem (Catalog.GetString ("_Help"));
-+ item.Image = new Gtk.Image (Gtk.Stock.Help, Gtk.IconSize.Menu);
-+ item.Activated += (o, a) => Tomboy.ActionManager["ShowHelpAction"].Activate ();
-+ yield return item;
-+
-+ item = new Gtk.ImageMenuItem (Catalog.GetString ("_About Tomboy"));
-+ item.Image = new Gtk.Image (Gtk.Stock.About, Gtk.IconSize.Menu);
-+ item.Activated += (o, a) => Tomboy.ActionManager["ShowAboutAction"].Activate ();
-+ yield return item;
-+
-+ yield return new Gtk.SeparatorMenuItem ();
-+
-+ item = new Gtk.ImageMenuItem (Catalog.GetString ("_Quit"));
-+ item.Image = new Gtk.Image (Gtk.Stock.Quit, Gtk.IconSize.Menu);
-+ item.Activated += (o, a) => Tomboy.ActionManager["QuitTomboyAction"].Activate ();
-+ yield return item;
-+ }
-+ }
-+}
-Index: tomboy/configure.in
-===================================================================
---- tomboy.orig/configure.in 2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/configure.in 2012-06-05 22:05:45.753783550 +0100
-@@ -207,6 +207,10 @@
- gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
- AC_SUBST(GTKSHARP_LIBS)
-
-+APPINDICATOR_MINIMUM_VERSION=0.0.5
-+PKG_CHECK_MODULES(APPINDICATORSHARP,
-+ appindicator-sharp-0.1 >= $APPINDICATOR_MINIMUM_VERSION)
-+AC_SUBST(APPINDICATORSHARP_LIBS)
- #
- # Printing at least needs Mono.Cairo
- #
-Index: tomboy/po/POTFILES.in
-===================================================================
---- tomboy.orig/po/POTFILES.in 2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/po/POTFILES.in 2012-06-05 22:05:45.757783549 +0100
-@@ -68,6 +68,7 @@
- Tomboy/Synchronization/SyncManager.cs
- Tomboy/Synchronization/SyncUtils.cs
- Tomboy/Tomboy.cs
-+Tomboy/TomboyIndicatorTray.cs
- Tomboy/Tray.cs
- Tomboy/Utils.cs
- Tomboy/Watchers.cs
diff --git a/debian/patches/05_add_start_u1_note.patch b/debian/patches/05_add_start_u1_note.patch
deleted file mode 100644
index 50b9c9c..0000000
--- a/debian/patches/05_add_start_u1_note.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: tomboy/Tomboy/NoteManager.cs
-===================================================================
---- tomboy.orig/Tomboy/NoteManager.cs 2012-05-03 21:17:00.972547084 +0100
-+++ tomboy/Tomboy/NoteManager.cs 2012-05-03 21:17:01.280547071 +0100
-@@ -298,6 +298,24 @@
- "Also, if you type the name of another note in your " +
- "current note, it will automatically be linked for you." +
- "</note-content>");
-+ string u1_note_content =
-+ Catalog.GetString ("<note-content>" +
-+ "Ubuntu One\n\n" +
-+ "<bold>Tomboy is better with Ubuntu One</bold> - " +
-+ "the personal cloud that brings your digital life together.\n\n" +
-+ "Ubuntu One does more than sync your files - whether you need " +
-+ "to access your contacts, notes or bookmarks from any computer or " +
-+ "the web, enjoy your favorite music from a cloud integrated store " +
-+ "or stream your entire collection to iPhone and Android mobile phones " +
-+ "- we've raised the bar on personal clouds. Learn more at " +
-+ "<link:url>http://one.ubuntu.com/</link:url>.\n\n" +
-+ "Already have an Ubuntu One account? Setup Tomboy to sync with your " +
-+ "personal cloud by clicking Edit > Preferences and then the Synchronization "+
-+ "tab. Select \"Tomboy Web\" from the list of services and then click the "+
-+ "\"Connect to Server\" button. A web browser will appear with a few " +
-+ "additional instructions.\n\n" +
-+ "You can even enable automatic sync with Ubuntu One!" +
-+ "</note-content>");
-
- try {
- Note start_note = Create (Catalog.GetString ("Start Here"),
-@@ -309,6 +327,9 @@
- links_note_content);
- links_note.QueueSave (ChangeType.ContentChanged);
-
-+ Note u1_note = Create ("Ubuntu One", u1_note_content);
-+ u1_note.QueueSave (ChangeType.ContentChanged);
-+
- if (!Tomboy.IsPanelApplet)
- start_note.Window.Show ();
- } catch (Exception e) {
diff --git a/debian/patches/06_use_ubuntu_sso.patch b/debian/patches/06_use_ubuntu_sso.patch
deleted file mode 100644
index 1abfa68..0000000
--- a/debian/patches/06_use_ubuntu_sso.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-Index: tomboy/Tomboy/Addins/WebSyncService/Makefile.am
-===================================================================
---- tomboy.orig/Tomboy/Addins/WebSyncService/Makefile.am 2011-08-23 22:54:40.127231333 +0100
-+++ tomboy/Tomboy/Addins/WebSyncService/Makefile.am 2011-08-23 23:11:21.488427309 +0100
-@@ -27,6 +27,8 @@
- $(srcdir)/WebSyncPreferencesWidget.cs \
- $(srcdir)/WebSyncServer.cs \
- $(srcdir)/WebSyncServiceAddin.cs \
-+ $(srcdir)/U1SyncServiceAddin.cs \
-+ $(srcdir)/U1SyncPreferencesWidget.cs \
- $(srcdir)/Tests/*.cs \
- $(srcdir)/Api/*.cs \
- $(srcdir)/Api/Tests/*.cs \
-Index: tomboy/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tomboy/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs 2011-08-23 23:18:01.453092749 +0100
-@@ -0,0 +1,290 @@
-+// Permission is hereby granted, free of charge, to any person obtaining
-+// a copy of this software and associated documentation files (the
-+// "Software"), to deal in the Software without restriction, including
-+// without limitation the rights to use, copy, modify, merge, publish,
-+// distribute, sublicense, and/or sell copies of the Software, and to
-+// permit persons to whom the Software is furnished to do so, subject to
-+// the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be
-+// included in all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+// Copyright (c) 2010 Canonical, Ltd. (http://www.canonical.com)
-+//
-+// Authors:
-+// Rodrigo Moya <rodrigo.moya at canonical.com>
-+//
-+
-+using System;
-+using System.Runtime.InteropServices;
-+using System.Web;
-+using GLib;
-+
-+using Mono.Unix;
-+using Tomboy.WebSync.Api;
-+#if !WIN32
-+using HL = System.Net;
-+#else
-+using HL = MonoHttp;
-+#endif
-+
-+namespace Tomboy.WebSync
-+{
-+ public class U1SyncPreferencesWidget : Gtk.VBox
-+ {
-+ private Api.OAuth oauth;
-+ private Gtk.Button authButton;
-+ private SyncdaemonAuthentication sdAuth;
-+
-+ public U1SyncPreferencesWidget (Api.OAuth oauth, string server) : base (false, 5)
-+ {
-+ sdAuth = new SyncdaemonAuthentication ();
-+ sdAuth.CredentialsFound += OnCredentialsFound;
-+ sdAuth.AuthenticationCancelled += OnAuthCancelled;
-+ sdAuth.AuthenticationError += OnAuthError;
-+
-+ this.oauth = oauth;
-+
-+ authButton = new Gtk.Button ();
-+ if (!Auth.IsAccessToken) {
-+ if (this.sdAuth.HasCredentials ()) {
-+ Auth.AuthorizeLocation = "https://one.ubuntu.com/oauth/authorize/";
-+ Auth.AccessTokenBaseUrl = "https://one.ubuntu.com/oauth/access/";
-+ Auth.RequestTokenBaseUrl = "https://one.ubuntu.com/oauth/request/";
-+ Auth.ConsumerKey = sdAuth.ConsumerKey;
-+ Auth.ConsumerSecret = sdAuth.ConsumerSecret;
-+ Auth.Token = sdAuth.Token;
-+ Auth.TokenSecret = sdAuth.TokenSecret;
-+
-+ authButton.Label = Catalog.GetString ("Already registered");
-+ authButton.Sensitive = false;
-+
-+ } else
-+ authButton.Label = Catalog.GetString ("Register this computer");
-+ } else {
-+ authButton.Label = Catalog.GetString ("Already registered");
-+ authButton.Sensitive = false;
-+ }
-+ authButton.Clicked += OnAuthButtonClicked;
-+
-+ Add (authButton);
-+
-+ ShowAll ();
-+ }
-+
-+ public string Server {
-+ get {
-+ return "https://one.ubuntu.com/notes/";
-+ }
-+ }
-+
-+ public Api.OAuth Auth {
-+ get { return oauth; }
-+ set {
-+ oauth = value;
-+ if (oauth == null) {
-+ authButton.Label =
-+ Catalog.GetString ("Register this computer");
-+ authButton.Sensitive = true;
-+ }
-+ }
-+ }
-+
-+ public void OnAuthButtonClicked (object sender, EventArgs args)
-+ {
-+ Auth.AuthorizeLocation = "https://one.ubuntu.com/oauth/authorize/";
-+ Auth.AccessTokenBaseUrl = "https://one.ubuntu.com/oauth/access/";
-+ Auth.RequestTokenBaseUrl = "https://one.ubuntu.com/oauth/request/";
-+ Auth.ConsumerKey = "";
-+ Auth.ConsumerSecret = "";
-+ Auth.Realm = "";
-+ Auth.Token = "";
-+ Auth.TokenSecret = "";
-+
-+ authButton.Label = Catalog.GetString ("Authenticating...");
-+ authButton.Sensitive = false;
-+
-+ // Call com.ubuntu.sso
-+ sdAuth.LoginOrRegister ();
-+ }
-+
-+ public void OnCredentialsFound (object sender, EventArgs args)
-+ {
-+ Auth.AuthorizeLocation = "https://one.ubuntu.com/oauth/authorize/";
-+ Auth.AccessTokenBaseUrl = "https://one.ubuntu.com/oauth/access/";
-+ Auth.RequestTokenBaseUrl = "https://one.ubuntu.com/oauth/request/";
-+ Auth.ConsumerKey = sdAuth.ConsumerKey;
-+ Auth.ConsumerSecret = sdAuth.ConsumerSecret;
-+ Auth.Token = sdAuth.Token;
-+ Auth.TokenSecret = sdAuth.TokenSecret;
-+
-+ authButton.Label = Catalog.GetString ("Authentication complete. Press Save to start synchronizing");
-+ }
-+
-+ public void OnAuthCancelled (object sender, EventArgs args)
-+ {
-+ authButton.Label = Catalog.GetString ("Register this computer");
-+ authButton.Sensitive = false;
-+ }
-+
-+ public void OnAuthError (object sender, EventArgs args)
-+ {
-+ }
-+
-+
-+ }
-+
-+ class SyncdaemonAuthentication
-+ {
-+ private IntPtr syncdaemon = IntPtr.Zero;
-+ private IntPtr handle = IntPtr.Zero;
-+ private IntPtr credentials = IntPtr.Zero;
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern IntPtr syncdaemon_daemon_new ();
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern IntPtr syncdaemon_daemon_get_authentication (IntPtr daemon);
-+
-+ [DllImport("gobject-2.0")]
-+ static extern uint g_signal_connect_data (IntPtr obj, IntPtr name, Delegate cb, IntPtr data, IntPtr p, int flags);
-+
-+ public SyncdaemonAuthentication ()
-+ {
-+ IntPtr native_name;
-+
-+ this.syncdaemon = syncdaemon_daemon_new ();
-+ this.handle = syncdaemon_daemon_get_authentication (this.syncdaemon);
-+
-+ native_name = Marshaller.StringToPtrGStrdup ("credentials_found");
-+ g_signal_connect_data (this.handle, native_name,
-+ new CredentialsFoundDelegate (credentials_found_cb),
-+ new IntPtr (0), new IntPtr (0), 0);
-+ GLib.Marshaller.Free (native_name);
-+
-+ native_name = Marshaller.StringToPtrGStrdup ("authorization_cancelled");
-+ g_signal_connect_data (this.handle, native_name,
-+ new AuthCancelledDelegate (auth_cancelled_cb),
-+ new IntPtr (0), new IntPtr (0), 0);
-+ GLib.Marshaller.Free (native_name);
-+
-+ native_name = Marshaller.StringToPtrGStrdup ("error");
-+ g_signal_connect_data (this.handle, native_name,
-+ new AuthErrorDelegate (auth_error_cb),
-+ new IntPtr (0), new IntPtr (0), 0);
-+ GLib.Marshaller.Free (native_name);
-+
-+ }
-+
-+ [GLib.CDeclCallback]
-+ delegate void CredentialsFoundDelegate (IntPtr auth, IntPtr credentials, IntPtr user_data);
-+
-+ void credentials_found_cb (IntPtr auth, IntPtr credentials, IntPtr user_data)
-+ {
-+ Logger.Debug ("credentials_found_cb called");
-+ if (this.CredentialsFound != null)
-+ this.CredentialsFound (this, new EventArgs ());
-+ }
-+
-+ [GLib.CDeclCallback]
-+ delegate void AuthCancelledDelegate (IntPtr auth, IntPtr user_data);
-+
-+ void auth_cancelled_cb (IntPtr auth, IntPtr user_data)
-+ {
-+ Logger.Debug ("auth_cancelled_cb called");
-+ if (this.AuthenticationCancelled != null)
-+ this.AuthenticationCancelled (this, new EventArgs ());
-+ }
-+
-+ [GLib.CDeclCallback]
-+ delegate void AuthErrorDelegate (IntPtr auth, IntPtr error, IntPtr user_data);
-+
-+ void auth_error_cb (IntPtr auth, IntPtr error, IntPtr user_data)
-+ {
-+ Logger.Debug ("auth_error_cb called");
-+ if (this.AuthenticationError != null)
-+ this.AuthenticationError (this, new EventArgs ());
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern IntPtr syncdaemon_authentication_find_credentials (IntPtr auth);
-+
-+ private IntPtr FindCredentials ()
-+ {
-+ if (IntPtr.Zero == this.credentials)
-+ this.credentials = syncdaemon_authentication_find_credentials (this.handle);
-+
-+ return this.credentials;
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern string syncdaemon_credentials_get_consumer_key (IntPtr credentials);
-+
-+ public string ConsumerKey {
-+ get {
-+ IntPtr raw = syncdaemon_authentication_find_credentials (this.handle);
-+ return syncdaemon_credentials_get_consumer_key (raw);
-+ }
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern string syncdaemon_credentials_get_consumer_secret (IntPtr credentials);
-+
-+ public string ConsumerSecret {
-+ get {
-+ IntPtr raw = syncdaemon_authentication_find_credentials (this.handle);
-+ return syncdaemon_credentials_get_consumer_secret (raw);
-+ }
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern string syncdaemon_credentials_get_token (IntPtr credentials);
-+
-+ public string Token {
-+ get {
-+ IntPtr raw = syncdaemon_authentication_find_credentials (this.handle);
-+ return syncdaemon_credentials_get_token (raw);
-+ }
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern string syncdaemon_credentials_get_token_secret (IntPtr credentials);
-+
-+ public string TokenSecret {
-+ get {
-+ IntPtr raw = syncdaemon_authentication_find_credentials (this.handle);
-+ return syncdaemon_credentials_get_token_secret (raw);
-+ }
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern bool syncdaemon_authentication_has_credentials (IntPtr auth);
-+
-+ public bool HasCredentials ()
-+ {
-+ return syncdaemon_authentication_has_credentials (this.handle);
-+ }
-+
-+ [DllImport("syncdaemon-1.0")]
-+ static extern void syncdaemon_authentication_login_or_register (IntPtr auth);
-+
-+ public void LoginOrRegister ()
-+ {
-+ syncdaemon_authentication_login_or_register (this.handle);
-+ }
-+
-+ public event EventHandler CredentialsFound;
-+
-+ public event EventHandler AuthenticationCancelled;
-+
-+ public event EventHandler AuthenticationError;
-+ }
-+}
-Index: tomboy/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tomboy/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs 2011-08-23 23:14:17.277675713 +0100
-@@ -0,0 +1,229 @@
-+// Permission is hereby granted, free of charge, to any person obtaining
-+// a copy of this software and associated documentation files (the
-+// "Software"), to deal in the Software without restriction, including
-+// without limitation the rights to use, copy, modify, merge, publish,
-+// distribute, sublicense, and/or sell copies of the Software, and to
-+// permit persons to whom the Software is furnished to do so, subject to
-+// the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be
-+// included in all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+// Copyright (c) 2010 Canonical, Ltd. (http://www.canonical.com)
-+//
-+// Authors:
-+// Rodrigo Moya <rodrigo.moya at canonical.com>
-+//
-+
-+using System;
-+
-+using Mono.Unix;
-+
-+using Tomboy.Sync;
-+
-+namespace Tomboy.WebSync
-+{
-+ public class U1SyncServiceAddin : SyncServiceAddin
-+ {
-+ private bool initialized;
-+ private U1SyncPreferencesWidget prefsWidget;
-+
-+ private const string serverUrlPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/server";
-+ private const string accessTokenBaseUrlPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_access_token_base_url";
-+ private const string authorizeLocationPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_authorize_location";
-+ private const string consumerKeyPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_consumer_key";
-+ private const string consumerSecretPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_consumer_secret";
-+ private const string realmPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_realm";
-+ private const string requestTokenBaseUrlPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_request_token_base_url";
-+ private const string tokenPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_token";
-+ private const string tokenSecretPrefPath =
-+ "/apps/tomboy/sync/ubuntuone/oauth_token_secret";
-+
-+ public U1SyncServiceAddin ()
-+ {
-+ }
-+
-+ #region SyncServiceAddin Overrides
-+
-+ public override string Id {
-+ get { return "ubuntuone"; }
-+ }
-+
-+ public override string Name {
-+ get {
-+ return Catalog.GetString ("Ubuntu One");
-+ }
-+ }
-+
-+ public override bool IsConfigured {
-+ get {
-+ string serverPref;
-+ Api.OAuth oauth;
-+ GetConfigSettings (out oauth, out serverPref);
-+ return !string.IsNullOrEmpty (serverPref) &&
-+ oauth != null &&
-+ oauth.IsAccessToken;
-+ }
-+ }
-+
-+ public override bool IsSupported {
-+ get {
-+ return true; // TODO: Ever false?
-+ }
-+ }
-+
-+ public override Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged)
-+ {
-+ string serverPref;
-+ Api.OAuth oauth;
-+ GetConfigSettings (out oauth, out serverPref);
-+ prefsWidget = new U1SyncPreferencesWidget (oauth, serverPref);
-+ return prefsWidget;
-+ }
-+
-+ public override SyncServer CreateSyncServer ()
-+ {
-+ string serverPref;
-+ Api.OAuth oauth;
-+ GetConfigSettings (out oauth, out serverPref);
-+ return new WebSyncServer (serverPref, oauth);
-+ }
-+
-+ public override void PostSyncCleanup ()
-+ {
-+ }
-+
-+ public override void ResetConfiguration ()
-+ {
-+ SaveConfigSettings (null, null);
-+ prefsWidget.Auth = null;
-+ }
-+
-+ public override bool SaveConfiguration ()
-+ {
-+ // TODO: Is this really sufficient validation?
-+ // Should we try a REST API request?
-+ if (prefsWidget.Auth == null ||
-+ prefsWidget.Auth.ConsumerKey == null ||
-+ prefsWidget.Auth.ConsumerSecret == null ||
-+ prefsWidget.Auth.Token == null ||
-+ prefsWidget.Auth.TokenSecret == null)
-+ return false;
-+ SaveConfigSettings (prefsWidget.Auth, prefsWidget.Server);
-+ return true;
-+ }
-+
-+ #endregion
-+
-+ #region ApplicationAddin Overrides
-+
-+ public override void Initialize ()
-+ {
-+ initialized = true;
-+ }
-+
-+ public override void Shutdown ()
-+ {
-+ initialized = false;
-+ }
-+
-+ public override bool Initialized {
-+ get { return initialized; }
-+ }
-+
-+ #endregion
-+
-+ #region Private Members
-+
-+ private void GetConfigSettings (out Api.OAuth oauthConfig, out string serverPref)
-+ {
-+ serverPref = (string)
-+ Preferences.Get (serverUrlPrefPath);
-+
-+ oauthConfig = new Api.OAuth ();
-+ oauthConfig.AccessTokenBaseUrl =
-+ Preferences.Get (accessTokenBaseUrlPrefPath) as string;
-+ oauthConfig.AuthorizeLocation =
-+ Preferences.Get (authorizeLocationPrefPath) as string;
-+ oauthConfig.ConsumerKey =
-+ Preferences.Get (consumerKeyPrefPath) as string;
-+ oauthConfig.ConsumerSecret =
-+ Preferences.Get (consumerSecretPrefPath) as string;
-+ oauthConfig.Realm =
-+ Preferences.Get (realmPrefPath) as string;
-+ oauthConfig.RequestTokenBaseUrl =
-+ Preferences.Get (requestTokenBaseUrlPrefPath) as string;
-+ oauthConfig.Token =
-+ Preferences.Get (tokenPrefPath) as string;
-+ oauthConfig.TokenSecret =
-+ Preferences.Get (tokenSecretPrefPath) as string;
-+
-+ // The fact that the configuration was saved at all
-+ // implies that the token is an access token.
-+ // TODO: Any benefit in actually storing this bool, in
-+ // case of weird circumstances?
-+ oauthConfig.IsAccessToken =
-+ !String.IsNullOrEmpty (oauthConfig.Token);
-+ }
-+
-+ private void SaveConfigSettings (Api.OAuth oauthConfig, string serverPref)
-+ {
-+ Preferences.Set (serverUrlPrefPath, GetConfigString (serverPref));
-+ Preferences.Set (accessTokenBaseUrlPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.AccessTokenBaseUrl) :
-+ String.Empty);
-+ Preferences.Set (authorizeLocationPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.AuthorizeLocation) :
-+ String.Empty);
-+ Preferences.Set (consumerKeyPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.ConsumerKey) :
-+ String.Empty);
-+ Preferences.Set (consumerSecretPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.ConsumerSecret) :
-+ String.Empty);
-+ Preferences.Set (realmPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.Realm) :
-+ String.Empty);
-+ Preferences.Set (requestTokenBaseUrlPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.RequestTokenBaseUrl) :
-+ String.Empty);
-+ Preferences.Set (tokenPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.Token) :
-+ String.Empty);
-+ Preferences.Set (tokenSecretPrefPath,
-+ oauthConfig != null ?
-+ GetConfigString (oauthConfig.TokenSecret) :
-+ String.Empty);
-+ }
-+
-+ private string GetConfigString (string val)
-+ {
-+ return val ?? String.Empty;
-+ }
-+
-+ #endregion
-+ }
-+}
-Index: tomboy/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml
-===================================================================
---- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml 2011-08-23 22:54:40.139230862 +0100
-+++ tomboy/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml 2011-08-23 23:11:21.488427309 +0100
-@@ -18,4 +18,8 @@
- <Extension path="/Tomboy/SyncServiceAddins">
- <SyncServiceAddin type="Tomboy.WebSync.WebSyncServiceAddin" />
- </Extension>
-+
-+ <Extension path="/Tomboy/SyncServiceAddins">
-+ <SyncServiceAddin type="Tomboy.WebSync.U1SyncServiceAddin" />
-+ </Extension>
- </Addin>
diff --git a/debian/patches/20_remove_pcfile_requires b/debian/patches/20_remove_pcfile_requires
deleted file mode 100644
index 8e87795..0000000
--- a/debian/patches/20_remove_pcfile_requires
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove unnecessary Requires: from gtk-sharp in tomboy-addins pcfile
-Forwarded: not-needed
-Origin: vendor
-Author: Iain Lane <laney at ubuntu.com>
-
-Index: tomboy/data/tomboy-addins.pc.in
-===================================================================
---- tomboy.orig/data/tomboy-addins.pc.in 2012-05-03 21:16:57.232547251 +0100
-+++ tomboy/data/tomboy-addins.pc.in 2012-05-03 21:17:01.720547051 +0100
-@@ -5,6 +5,5 @@
-
- Name: Tomboy Addin Library
- Description: Library providing the interfaces for Tomboy addins
--Requires: gtk-sharp-2.0
- Version: @VERSION@
- Libs: -r:${libdir}/tomboy/Tomboy.exe
diff --git a/debian/patches/31_prevent_inadvertent_deletion_of_notes.patch b/debian/patches/31_prevent_inadvertent_deletion_of_notes.patch
deleted file mode 100644
index b586f35..0000000
--- a/debian/patches/31_prevent_inadvertent_deletion_of_notes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Prevents accidental deletion of notes in case user hits the
- delete key when the focus is in the search box.
-Author: Abhinav Upadhyay <er.abhinav.upadhyay at gmail.com>
-Bug-Ubuntu: https://launchpad.net/bugs/757635
-Bug: https://bugzilla.gnome.org/647462
-Forwarded: yes
-Index: ubuntu/Tomboy/RecentChanges.cs
-===================================================================
---- ubuntu.orig/Tomboy/RecentChanges.cs 2011-07-27 10:46:28.386952944 +0100
-+++ ubuntu/Tomboy/RecentChanges.cs 2011-07-27 10:46:37.674595285 +0100
-@@ -105,6 +105,8 @@
- find_combo.Changed += OnEntryChanged;
- find_combo.Entry.ActivatesDefault = false;
- find_combo.Entry.Activated += OnEntryActivated;
-+ find_combo.Entry.FocusInEvent += OnSearchBoxFocused;
-+ find_combo.Entry.FocusOutEvent += OnSearchBoxFocusedOut;
- if (previous_searches != null) {
- foreach (string prev in previous_searches) {
- find_combo.AppendText (prev);
-@@ -1288,7 +1290,22 @@
- PerformSearch ();
- AddToPreviousSearches (SearchText);
- }
--
-+
-+ // called when the user moves the focus in the search combo box
-+ void OnSearchBoxFocused (object sender, EventArgs args)
-+ {
-+ // disable the Delete Note option in the menu bar (bug #647462)
-+ Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = false;
-+ }
-+
-+ // called when the focus moves out of the search combo box.
-+ void OnSearchBoxFocusedOut (object sender, EventArgs args)
-+ {
-+ // Enable the Delete Note option in the menu bar, which might have been
-+ // disabled in case the focus was in the search combo box perviously.
-+ Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = true;
-+ }
-+
- void AddToPreviousSearches (string text)
- {
- // Update previous searches, by adding a new term to the
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3321877..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-01_dllmaps.patch
-02_sync_save_button_sensitive.patch
-03_u1_as_default_sync.patch
-04_app_indicator.patch
-05_add_start_u1_note.patch
-#06_use_ubuntu_sso.patch
-20_remove_pcfile_requires
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index e9d3a57..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/make -f
-
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-MAKEFILE = $(firstword $(MAKEFILE_LIST))
-DEBIAN_DIR = $(dir $(MAKEFILE))
-DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
-DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
-VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
-
-override_dh_autoreconf:
- NOCONFIGURE=1 dh_autoreconf /usr/bin/gnome-autogen.sh
-
-override_dh_auto_configure:
- dh_auto_configure -- \
- --disable-scrollkeeper \
- --disable-update-mimedb \
- --disable-panel-applet \
- --disable-schemas-install \
- --disable-tests \
- LDFLAGS="$(LDFLAGS)" \
- GMCS=/usr/bin/mono-csc
-
-override_dh_auto_install:
- dh_auto_install -- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
- convert $(CURDIR)/data/icons/hicolor_apps_16x16_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-16.xpm
- convert $(CURDIR)/data/icons/hicolor_apps_32x32_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-32.xpm
- rm -rf debian/tomboy/usr/lib/tomboy/*.la
- # crush it good
- find $(CURDIR)/debian/tomboy/usr/share/gnome/help/tomboy -type f -name "*.png" -exec sh -c 'pngquant 256 < {} > {}.crushed; mv {}.crushed {}' \;
-
-# disable tests
-override_dh_auto_test:
-
-get-orig-source:
- uscan \
- --package $(DEB_SOURCE_NAME) \
- --watchfile $(DEBIAN_DIR)/watch \
- --upstream-version $(VERSION) \
- --download-version $(VERSION) \
- --destdir . \
- --force-download \
- --rename
-
-%:
- dh $@ --with autoreconf,cli
-
-.PHONY: get-orig-source
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/tomboy.docs b/debian/tomboy.docs
deleted file mode 100644
index 9eafbe1..0000000
--- a/debian/tomboy.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-NEWS
diff --git a/debian/tomboy.install b/debian/tomboy.install
deleted file mode 100644
index acfb4f5..0000000
--- a/debian/tomboy.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/WebSyncServiceAddin.dll.config /usr/lib/tomboy/addins/
diff --git a/debian/tomboy.menu b/debian/tomboy.menu
deleted file mode 100644
index d3ab500..0000000
--- a/debian/tomboy.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(tomboy):needs="X11" section="Applications/Data Management" \
- title="Tomboy" command="/usr/bin/tomboy" \
- longtitle="Tomboy notetaker" \
- description="Take notes on the desktop" \
- icon16x16="/usr/share/pixmaps/tomboy-16.xpm" \
- icon32x32="/usr/share/pixmaps/tomboy-32.xpm"
diff --git a/debian/tomboy.postinst b/debian/tomboy.postinst
deleted file mode 100644
index 8ed2373..0000000
--- a/debian/tomboy.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-# version 0.3.9-1 started shipping /var/lib/scrollkeeper erroneously, hence
-# the database was overwritten and needs a full rebuild
-#
-# this fix was added in version 0.3.9+dfsg-2
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" ge "0.3.9-1" && dpkg --compare-versions "$2" lt "0.3.9+dfsg-2" && which scrollkeeper-rebuilddb >/dev/null 2>&1; then
- echo "Upgrade from broken Tomboy version detected, running scrollkeeper-rebuilddb..."
- scrollkeeper-rebuilddb -q
-fi
-
-#DEBHELPER#
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index a378052..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-# watch file for tomboy
-version=3
-http://download.gnome.org/sources/tomboy/([0-9.]+)/tomboy-([0-9.]+)\.tar\.xz
diff --git a/po/ja.po b/po/ja.po
index 3a41014..57818b4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,608 +1,406 @@
# tomboy ja.po.
-# Copyright (C) 2004-2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the tomboy package.
# Takeshi AIHANA <takeshi.aihana at gmail.com>, 2004-2009.
# Satoru SATOH <ss at gnome.gr.jp>, 2006.
# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2009.
# Takayuki KUSANO <AE5T-KSN at asahi-net.or.jp>, 2010.
# Hiroyuki Sekihara <hiroyuki.sekihara at gmail.com>, 2010.
-# Jiro Matsuzawa <matsuzawa.jr at gmail.com>, 2011.
+# Jiro Matsuzawa <jmatsuzawa at gnome.org>, 2011-2012.
#
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-11-16 11:45+0000\n"
-"PO-Revision-Date: 2011-11-16 21:55+0900\n"
-"Last-Translator: OKANO Takayoshi <kano at na.rim.or.jp>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-05-01 16:57+0000\n"
+"PO-Revision-Date: 2012-08-10 21:39+0900\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa at gnome.org>\n"
"Language-Team: Japanese <gnome-translation at gnome.gr.jp>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "アクセサリー"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "シンプルで使いやすいメモ用アプリケーションです"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
msgid "Tomboy Applet Factory"
msgstr "Tomboy アプレットのファクトリー"
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../data/GNOME_TomboyApplet.server.in.in.h:2 ../data/tomboy.desktop.in.h:1
#: ../Tomboy/Tray.cs:579
msgid "Tomboy Notes"
msgstr "Tomboy メモ"
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Simple and easy to use note-taking"
+msgstr "シンプルで使いやすいメモ用アプリケーションです"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+msgid "Accessories"
+msgstr "アクセサリー"
+
#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "メモの同期(_Y)"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "情報(_A)"
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "設定(_P)"
#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "ヘルプ(_H)"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "設定(_P)"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "メモ"
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "このアプリケーションについて(_A)"
#: ../data/tomboy.desktop.in.h:2
msgid "Take notes, link ideas, and stay organized"
msgstr "メモを取ってアイデアを関連づけ、そして体系化します"
+#: ../data/tomboy.desktop.in.h:3
+msgid "Note-taker"
+msgstr "メモ"
+
#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "SSL の証明書を受け取るかどうか"
+msgid "Enable spellchecking"
+msgstr "スペルチェックを有効にするかどうか"
#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "バックグラウンドでの自動同期のタイムアウト"
+msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
+msgstr "TRUE の場合、スペル違いは赤色の下線がつき、右クリックメニューに妥当なスペルを提示します。"
#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "新規にメモを生成するキー"
+msgid "Enable WikiWord highlighting"
+msgstr "WikiWord の強調表示を有効にするかどうか"
#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "独自のフォント名"
+msgid "Enable this option to highlight words ThatLookLikeThis. Clicking the word will create a note with that name."
+msgstr "ThatLookLikeThis のような単語を強調表示するにはこのオプションを有効にします。その単語をクリックすると、単語の名前をタイトルにした新しいメモを作成します。"
#: ../data/tomboy.schemas.in.h:5
-msgid ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-" \"すべてのメモを検索\"ウィンドウのX座標で、Tomboy を終了する際に格納されま"
-"す。"
+msgid "Enable automatic bulleted lists."
+msgstr "自動的な箇条書きを有効にするかどうか。"
#: ../data/tomboy.schemas.in.h:6
-msgid ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-" \"すべてのメモを検索\"ウィンドウのY座標で、Tomboy を終了する際に格納されま"
-"す。"
+msgid "Enable this option if you want bulleted lists to be automatic when you place - or * at the beginning of a line."
+msgstr "行頭に '-' や '*' という文字を入力したら自動的に箇条書きモードにしたい場合、このオプションを有効にします。"
#: ../data/tomboy.schemas.in.h:7
-msgid ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-" \"すべてのメモを検索\"ウィンドウの高さ (ピクセル単位) で、Tomboy を終了する"
-"際に格納されます。"
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "中ボタンのクリックで貼り付けるかどうか。"
#: ../data/tomboy.schemas.in.h:8
-msgid ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr ""
-" \"すべてのメモを検索\"ウィンドウの幅 (ピクセル単位) で、Tomboy を終了する際"
-"に格納されます。"
+msgid "Enable this option if you want to be able to middle-click the Tomboy icon to paste timestamped content into the Start Here note."
+msgstr "Tomboy のアイコンをマウスの中ボタンでクリックすると「ここから開始」のメモにタイムスタンプの付いた内容を貼り付けられるようにしたい場合、このオプションを有効にします。"
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "中ボタンのクリックで貼り付けるかどうか。"
+msgid "Enable custom font"
+msgstr "フォントを指定できるかどうか"
#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "トレイアイコンを有効化"
+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 "TRUE の場合、メモを表示するときに custom_font_face にセットしたフォント名を使用します。それ以外は、デスクトップのデフォルトフォントを使用します。"
#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "WikiWord の強調表示を有効にするかどうか"
+msgid "Custom Font Face"
+msgstr "独自のフォント名"
#: ../data/tomboy.schemas.in.h:12
-msgid "Enable automatic bulleted lists."
-msgstr "自動的な箇条書きを有効にするかどうか。"
+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 が TRUE の場合、メモを表示する際に、ここで指定したフォントを使用します。"
#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Escキーでメモを閉じるかどうか。"
+msgid "Enable global keybindings"
+msgstr "グローバルなホットキーを有効にするかどうか"
#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "フォントを指定できるかどうか"
+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 "TRUE の場合、/apps/tomboy/global_keybindings の desktop-global キーバインドが有効になり、別のアプリケーションから Tomboy の操作が可能になります。"
#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "グローバルなホットキーを有効にするかどうか"
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "メモの削除の確認ダイアログを有効にする"
#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "スペルチェックを有効にするかどうか"
+msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr "無効化されると、「メモの削除」の確認ダイアログは表示されません。"
#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "起動時にメモを開くかどうか"
+msgid "Enable Tray Icon"
+msgstr "トレイアイコンを有効化"
#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "メモの削除の確認ダイアログを有効にする"
+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 "TRUE の場合、Tomboy のトレイアイコンが通知領域に表示されます。これを無効化するのは、他のアプリケーションがトレイアイコンの機能を提供している場合に役に立ちます。"
#: ../data/tomboy.schemas.in.h:19
-msgid ""
-"Enable this option if you want bulleted lists to be automatic when you place "
-"- or * at the beginning of a line."
-msgstr ""
-"行頭に '-' や '*' という文字を入力したら自動的に箇条書きモードにしたい場合、"
-"このオプションを有効にします。"
+msgid "Start Here Note"
+msgstr "ここから開始のメモ"
#: ../data/tomboy.schemas.in.h:20
-msgid ""
-"Enable this option if you want to be able to middle-click the Tomboy icon to "
-"paste timestamped content into the Start Here note."
-msgstr ""
-"Tomboy のアイコンをマウスの中ボタンでクリックすると「ここから開始」のメモにタ"
-"イムスタンプの付いた内容を貼り付けられるようにしたい場合、このオプションを有"
-"効にします。"
+msgid "The note URI of the note that should be considered the \"Start Here\" note, which is always placed at the bottom of the Tomboy note menu and also accessible by hotkey."
+msgstr "\"ここから開始\" のメモの URI です。\"ここから開始\" のメモは常に Tomboy のメニューの最下位に表示されるようになっており、ホットキーでアクセスできるようになっています。"
#: ../data/tomboy.schemas.in.h:21
-msgid ""
-"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-"will create a note with that name."
-msgstr ""
-"ThatLookLikeThis のような単語を強調表示するにはこのオプションを有効にします。"
-"その単語をクリックすると、単語の名前をタイトルにした新しいメモを作成します。"
+msgid "Minimum number of notes to show in menu"
+msgstr "メニューに表示するメモ数 (最小値)"
#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE によるマウント時間 (ms)"
+msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
+msgstr "Tomboy のメニューの中に表示するメモの個数 (最小値) を表す整数値です。"
#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "リンク先のすべてのメモを HTML にエクスポートするかどうか"
+msgid "List of pinned notes."
+msgstr "ピン付きのメモの一覧。"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "リンク先のメモを HTML にエクスポートするかどうか"
+msgid "Whitespace-separated list of note URIs for notes that should always appear in the Tomboy note menu."
+msgstr "ホワイトスペース (空白) で区切ったメモの URI の一覧を Tomboy のメニューの中に常に表示します。"
#: ../data/tomboy.schemas.in.h:25
-msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
-msgstr "無効化されると、「メモの削除」の確認ダイアログは表示されません。"
+msgid "Maximum note title length to show in tray menu."
+msgstr "トレイメニューに表示するメモのタイトルの長さ (最大値) です。"
#: ../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 が TRUE の場合、メモを表示する際に、ここで指定したフォント"
-"を使用します。"
+msgid "Maximum characters of note title to show in the Tomboy tray or panel applet note menu."
+msgstr "Tomboy のトレイアイコンやパネルアプレットメニューで表示されるメモのタイトルの最大文字数です。"
#: ../data/tomboy.schemas.in.h:27
-msgid ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
-msgstr ""
-"有効にした場合、Tomboy を終了した時にオープンされていたすべてのメモを起動時に"
-"もう一度、自動的にオープンします。"
+msgid "Enable startup notes"
+msgstr "起動時にメモを開くかどうか"
#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr ""
-"有効にした場合、Esc キーの押下で開いているメモを閉じられるようになります。"
+msgid "If enabled, all notes that were open when Tomboy quit will automatically be reopened at startup."
+msgstr "有効にした場合、Tomboy を終了した時にオープンされていたすべてのメモを起動時にもう一度、自動的にオープンします。"
#: ../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 ""
-"TRUE の場合、Tomboy のトレイアイコンが通知領域に表示されます。これを無効化す"
-"るのは、他のアプリケーションがトレイアイコンの機能を提供している場合に役に立"
-"ちます。"
+msgid "Show applet menu"
+msgstr "アプレットメニューを表示するキー"
#: ../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 ""
-"TRUE の場合、スペル違いは赤色の下線がつき、右クリックメニューに妥当なスペルを"
-"提示します。"
+msgid "The global keybinding for showing the Tomboy applet's menu. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
+msgstr "\"Tomboy アプレット\" メニューを表示するためのグローバルなホットキー (キーボードショートカット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当ては行われません"
#: ../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 ""
-"TRUE の場合、/apps/tomboy/global_keybindings の desktop-global キーバインドが"
-"有効になり、別のアプリケーションから Tomboy の操作が可能になります。"
+msgid "Open Start Here"
+msgstr "\"ここから開始\" のメモを開くキー"
#: ../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 ""
-"TRUE の場合、メモを表示するときに custom_font_face にセットしたフォント名を使"
-"用します。それ以外は、デスクトップのデフォルトフォントを使用します。"
+msgid "The global keybinding for opening the \"Start Here\" note. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
+msgstr "\"ここから開始\" メモを開くためのグローバルなホットキー (キーボードショートカット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当ては行われません。"
#: ../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 を起動したら自動的にインポートを行うことになります。"
+msgid "Create a new Note"
+msgstr "新規にメモを生成するキー"
#: ../data/tomboy.schemas.in.h:34
-msgid ""
-"Integer determining the minimum number of notes to show in the Tomboy note "
-"menu."
-msgstr "Tomboy のメニューの中に表示するメモの個数 (最小値) を表す整数値です。"
+msgid "The global keybinding for creating and displaying a new Note. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
+msgstr "新しいメモを作成して表示するためのグローバルなホットキー (キーボードショートカット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに、\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当ては行われません。"
#: ../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 です。値は分単位です。"
+msgid "Open Search Dialog"
+msgstr "検索ダイアログを開くキー"
#: ../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 は矛盾が発"
-"生した時にユーザーに問い合わせを行います。"
+msgid "The global keybinding for opening the Note Search dialog. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
+msgstr "\"メモの検索\" ダイアログを開くためのグローバルなホットキー (キーボードショートカット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当ては行われません。"
#: ../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 なら"
-"ば、メモの名前を変更した時、他のメモに存在するリンクに影響を与えるようであれ"
-"ばユーザーに確認をとることを示します。1 ならば、リンクが自動的に削除されるこ"
-"とを示します。2 ならば、名前の変更されたメモへリンクし続けるようにリンクの文"
-"字列が更新されることを示します。"
+msgid "Open Recent Changes"
+msgstr "最近変更したメモを開くキー"
#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "HTML エクスポートで使用した最後のディレクトリ"
+msgid "The global keybinding for opening the Recent Changes dialog. The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
+msgstr "\"最近の変更\" ダイアログを開くためのグローバルなホットキー (キーボードショートカット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当ては行われません"
#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr "メモの名前の変更の時のリンクの更新の挙動"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr " \"すべてのメモを検索\" ウィンドウの高さ"
#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "ピン付きのメモの一覧。"
+msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr " \"すべてのメモを検索\"ウィンドウの高さ (ピクセル単位) で、Tomboy を終了する際に格納されます。"
#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr ""
-"Tomboy のトレイアイコンやパネルアプレットメニューで表示されるメモのタイトルの"
-"最大文字数です。"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "\"すべてのメモを検索\" ウィンドウの幅"
#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr "トレイメニューに表示するメモのタイトルの長さ (最大値) です。"
+msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr " \"すべてのメモを検索\"ウィンドウの幅 (ピクセル単位) で、Tomboy を終了する際に格納されます。"
#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "メニューに表示するメモ数 (最小値)"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr " \"すべてのメモを検索\" ウィンドウの水平位置"
#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "メモの同期で矛盾が発生した時の対応"
+msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr " \"すべてのメモを検索\"ウィンドウのX座標で、Tomboy を終了する際に格納されます。"
#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "最近変更したメモを開くキー"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr " \"すべてのメモを検索\" ウィンドウの垂直位置"
#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "検索ダイアログを開くキー"
+msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr " \"すべてのメモを検索\"ウィンドウのY座標で、Tomboy を終了する際に格納されます。"
#: ../data/tomboy.schemas.in.h:47
-msgid "Open Start Here"
-msgstr "\"ここから開始\" のメモを開くキー"
+msgid "Last Directory used in HTML Export"
+msgstr "HTML エクスポートで使用した最後のディレクトリ"
#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr "リモートにある Tomboy の同期フォルダーのパス名です (オプション)。"
+msgid "The last directory a note was exported to using the Export To HTML plugin."
+msgstr "\"Export To HTML\" アドインを使って、最後にエクスポートしたメモの HTML を格納したフォルダーです。"
#: ../data/tomboy.schemas.in.h:49
-msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr "ファイルシステムの同期サービスで使用するサーバーのパスです。"
+msgid "HTML Export Linked Notes"
+msgstr "リンク先のメモを HTML にエクスポートするかどうか"
#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "SSHFS で使うリモートの同期フォルダー"
+msgid "The last setting for the 'Export linked notes' checkbox in the Export to HTML plugin."
+msgstr "\"Export To HTML\" アドインの \"メモのエクスポート\" で最後に設定したチェックボックスの状態です。"
#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "SSHFS で使うユーザー名"
+msgid "HTML Export All Linked Notes"
+msgstr "リンク先のすべてのメモを HTML にエクスポートするかどうか"
#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "SSHFS で使う SSH サーバーのポート番号"
+msgid "The last setting for the 'Include all other linked notes' checkbox in the Export to HTML plugin. This setting is used in conjunction with the 'HTML Export Linked Notes' setting and is used to specify whether all notes (found recursively) should be included during an export to HTML."
+msgstr "Export To HTML アドインで設定した \"その他のリンク付きメモをすべて含める\" のチェックボックスの最後の状態です。この設定は \"リンク付きメモを HTML にエクスポートする\" 設定と連動して、(再帰的に検出した) メモをすべて HTML 形式にエクスポートするかどうかを指定する際に使用します。"
#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "SSHFS で使う同期先の URL"
+msgid "Sticky Note Importer First Run"
+msgstr "初回起動時に付箋紙アプレットのインポートを行うかどうか"
#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr " \"すべてのメモを検索\" ウィンドウの高さ"
+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:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr " \"すべてのメモを検索\" ウィンドウの水平位置"
+msgid "Synchronization Client ID"
+msgstr "同期クライアントの ID"
#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr " \"すべてのメモを検索\" ウィンドウの垂直位置"
+msgid "Unique identifier for this Tomboy client, used when communicating with a sychronization server."
+msgstr "Tomboy クライアントを識別する重複しない ID です (サーバーと同期する際に使用します)。"
#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "\"すべてのメモを検索\" ウィンドウの幅"
+msgid "Synchronization Local Server Path"
+msgstr "同期するローカルのサーバーへのパス"
#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "選択した Synchronization サービス アドイン"
+msgid "Path to the synchronization server when using the filesystem synchronization service addin."
+msgstr "ファイルシステムの同期サービスで使用するサーバーのパスです。"
#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "有効にする場合は TRUE にする"
+msgid "Selected Synchronization Service Addin"
+msgstr "選択した Synchronization サービス アドイン"
#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "アプレットメニューを表示するキー"
+msgid "Unique identifier for the currently configured note synchronization service addin."
+msgstr "Synchronization サービスアドインで現在設定している重複しない識別子です。"
#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "ここから開始のメモ"
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "FUSE によるマウント時間 (ms)"
#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "初回起動時に付箋紙アプレットのインポートを行うかどうか"
+msgid "Time (in milliseconds) Tomboy should wait for a response when using FUSE to mount a sync share."
+msgstr "FUSE を使って共有メモをマウントする際に Tomboy が応答待ちする時間 (ミリ秒単位) です。"
#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "同期クライアントの ID"
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "SSHFS で使うリモートの同期フォルダー"
#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "同期するローカルのサーバーへのパス"
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "リモートにある Tomboy の同期フォルダーのパス名です (オプション)。"
#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "タイムスタンプに使用する日時の書式です。"
+msgid "SSHFS Synchronization Server URL"
+msgstr "SSHFS で使う同期先の URL"
#: ../data/tomboy.schemas.in.h:66
-msgid ""
-"The global keybinding for creating and displaying a new Note. The format "
-"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
-"parser is fairly liberal and allows lower or upper case, and also "
-"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
-"option to the special string \"disabled\", then there will be no keybinding "
-"for this action."
-msgstr ""
-"新しいメモを作成して表示するためのグローバルなホットキー (キーボードショート"
-"カット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1"
-"\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに、"
-"\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
-"て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
-"ては行われません。"
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr "Tomboy の同期フォルダーを格納した SSH サーバーの URL です。"
#: ../data/tomboy.schemas.in.h:67
-msgid ""
-"The global keybinding for opening the \"Start Here\" note. The format looks "
-"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"\"ここから開始\" メモを開くためのグローバルなホットキー (キーボードショート"
-"カット) です。書式は \"<Control>a\" または \"<Shift><Alt>F1"
-"\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに "
-"\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
-"て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
-"ては行われません。"
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "SSHFS で使うユーザー名"
#: ../data/tomboy.schemas.in.h:68
-msgid ""
-"The global keybinding for opening the Note Search dialog. The format looks "
-"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"\"メモの検索\" ダイアログを開くためのグローバルなホットキー (キーボードショー"
-"トカット) です。書式は \"<Control>a\" または \"<Shift><Alt>"
-"F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに "
-"\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
-"て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
-"ては行われません。"
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr "Tomboy の同期フォルダーを持つサーバーに接続する際に使用するユーザー名です。"
#: ../data/tomboy.schemas.in.h:69
-msgid ""
-"The global keybinding for opening the Recent Changes dialog. The format "
-"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
-"parser is fairly liberal and allows lower or upper case, and also "
-"abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the "
-"option to the special string \"disabled\", then there will be no keybinding "
-"for this action."
-msgstr ""
-"\"最近の変更\" ダイアログを開くためのグローバルなホットキー (キーボードショー"
-"トカット) です。書式は \"<Control>a\" または \"<Shift><Alt>"
-"F1\" です。パーサーはかなり自由度が高く、大文字/小文字を利用できます。さらに "
-"\"<Ctl>\" や \"<Ctrl>\" のような省略形も可能です。オプションとし"
-"て特殊な文字列 \"disabled\" を指定すると、このアクションに対するキーの割り当"
-"ては行われません"
+msgid "SSHFS Synchronization Server Port"
+msgstr "SSHFS で使う SSH サーバーのポート番号"
#: ../data/tomboy.schemas.in.h:70
-msgid ""
-"The global keybinding for showing the Tomboy applet's menu. The format looks "
-"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
-"fairly liberal and allows lower or upper case, and also abbreviations such "
-"as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the "
-"special string \"disabled\", then there will be no keybinding for this "
-"action."
-msgstr ""
-"\"Tomboy アプレット\" メニューを表示するためのグローバルなホットキー (キー"
-"ボードショートカット) です。書式は \"<Control>a\" または \"<"
-"Shift><Alt>F1\" です。パーサーはかなり自由度が高く、大文字/小文字を"
-"利用できます。さらに \"<Ctl>\" や \"<Ctrl>\" のような省略形も可能"
-"です。オプションとして特殊な文字列 \"disabled\" を指定すると、このアクション"
-"に対するキーの割り当ては行われません"
+msgid "The port to use when connecting to the synchronization server via SSH. Set to -1 or less if default SSH port settings should be used instead."
+msgstr "SSH 経由で同期サーバーに接続する際に使うポート番号です。デフォルトの SSH ポート番号を使う場合は -1 かそれより小さい値を設定してください。"
#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "URI \"note://\" で使用するハンドラー"
+msgid "Accept SSL Certificates"
+msgstr "SSL の証明書を受け取るかどうか"
#: ../data/tomboy.schemas.in.h:72
-msgid ""
-"The last directory a note was exported to using the Export To HTML plugin."
-msgstr ""
-"\"Export To HTML\" アドインを使って、最後にエクスポートしたメモの HTML を格納"
-"したフォルダーです。"
+msgid "Use wdfs option \"-ac\" to accept SSL certificates without prompting the user."
+msgstr "ユーザーに問い合わせを行うことなく SSL の証明書を受け入れる \"-ac\" オプションを使うかどうか。"
#: ../data/tomboy.schemas.in.h:73
-msgid ""
-"The last setting for the 'Export linked notes' checkbox in the Export to "
-"HTML plugin."
-msgstr ""
-"\"Export To HTML\" アドインの \"メモのエクスポート\" で最後に設定したチェック"
-"ボックスの状態です。"
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "メモの同期で矛盾が発生した時の対応"
#: ../data/tomboy.schemas.in.h:74
-msgid ""
-"The last setting for the 'Include all other linked notes' checkbox in the "
-"Export to HTML plugin. This setting is used in conjunction with the 'HTML "
-"Export Linked Notes' setting and is used to specify whether all notes (found "
-"recursively) should be included during an export to HTML."
-msgstr ""
-"Export To HTML アドインで設定した \"その他のリンク付きメモをすべて含める\" の"
-"チェックボックスの最後の状態です。この設定は \"リンク付きメモを HTML にエクス"
-"ポートする\" 設定と連動して、(再帰的に検出した) メモをすべて HTML 形式にエク"
-"スポートするかどうかを指定する際に使用します。"
+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:75
-msgid ""
-"The note URI of the note that should be considered the \"Start Here\" note, "
-"which is always placed at the bottom of the Tomboy note menu and also "
-"accessible by hotkey."
-msgstr ""
-"\"ここから開始\" のメモの URI です。\"ここから開始\" のメモは常に Tomboy のメ"
-"ニューの最下位に表示されるようになっており、ホットキーでアクセスできるように"
-"なっています。"
+msgid "Automatic Background Synchronization Timeout"
+msgstr "バックグラウンドでの自動同期のタイムアウト"
#: ../data/tomboy.schemas.in.h:76
-msgid ""
-"The port to use when connecting to the synchronization server via SSH. Set "
-"to -1 or less if default SSH port settings should be used instead."
-msgstr ""
-"SSH 経由で同期サーバーに接続する際に使うポート番号です。デフォルトの SSH ポー"
-"ト番号を使う場合は -1 かそれより小さい値を設定してください。"
+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:77
-msgid ""
-"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
-"mount a sync share."
-msgstr ""
-"FUSE を使って共有メモをマウントする際に Tomboy が応答待ちする時間 (ミリ秒単"
-"位) です。"
+msgid "Link Updating Behavior on Note Rename"
+msgstr "メモの名前の変更の時のリンクの更新の挙動"
#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "タイムスタンプの書式"
+msgid "Integer value indicating if there is a preference to always perform a specific link updating behavior when a note is renamed, instead of prompting the user. The values map to an internal enumeration. 0 indicates that the user wishes to be prompted when renaming a note may impact links that exist in other notes. 1 indicates that links should automatically be removed. 2 indicates that link text should be updated to the new note name so that it will continue linking to the renamed note."
+msgstr "メモの名前が変更された場合、ユーザーに確認をするかわりにリンクの更新を必ずどうするのか、を示す整数値です。値は内部的な列挙値にマッピングされます。0 ならば、メモの名前を変更した時、他のメモに存在するリンクに影響を与えるようであればユーザーに確認をとることを示します。1 ならば、リンクが自動的に削除されることを示します。2 ならば、名前の変更されたメモへリンクし続けるようにリンクの文字列が更新されることを示します。"
#: ../data/tomboy.schemas.in.h:79
-msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr "Tomboy の同期フォルダーを格納した SSH サーバーの URL です。"
+msgid "Timestamp format"
+msgstr "タイムスタンプの書式"
#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
-msgstr ""
-"Synchronization サービスアドインで現在設定している重複しない識別子です。"
+msgid "The date format that is used for the timestamp."
+msgstr "タイムスタンプに使用する日時の書式です。"
#: ../data/tomboy.schemas.in.h:81
-msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
-msgstr ""
-"Tomboy クライアントを識別する重複しない ID です (サーバーと同期する際に使用し"
-"ます)。"
+msgid "Enable closing notes with escape."
+msgstr "Escキーでメモを閉じるかどうか。"
#: ../data/tomboy.schemas.in.h:82
-msgid ""
-"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
-"user."
-msgstr ""
-"ユーザーに問い合わせを行うことなく SSL の証明書を受け入れる \"-ac\" オプショ"
-"ンを使うかどうか。"
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr "有効にした場合、Esc キーの押下で開いているメモを閉じられるようになります。"
#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr ""
-"Tomboy の同期フォルダーを持つサーバーに接続する際に使用するユーザー名です。"
+msgid "The handler for \"note://\" URLs"
+msgstr "URI \"note://\" で使用するハンドラー"
#: ../data/tomboy.schemas.in.h:84
-msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
-msgstr ""
-"ホワイトスペース (空白) で区切ったメモの URI の一覧を Tomboy のメニューの中に"
-"常に表示します。"
+msgid "Set to TRUE to activate"
+msgstr "有効にする場合は TRUE にする"
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -666,7 +464,7 @@ msgstr "Tomboy のヘルプです"
#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
msgid "About Tomboy"
-msgstr "Tomboy について"
+msgstr "このアプリケーションについて"
#: ../Tomboy/ActionManager.cs:168
msgid "TrayIcon"
@@ -708,13 +506,8 @@ msgid "(none)"
msgstr " (なし)"
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
-msgid ""
-"You can use any bugzilla just by dragging links into notes. If you want a "
-"special icon for certain hosts, add them here."
-msgstr ""
-"メモの中にリンクをドラッグすることで Bugzilla を利用できるようになります。特"
-"定のホストに対して特別なアイコンを用意したい場合は、ここでアイコンを追加して"
-"おいてください。"
+msgid "You can use any bugzilla just by dragging links into notes. If you want a special icon for certain hosts, add them here."
+msgstr "メモの中にリンクをドラッグすることで Bugzilla を利用できるようになります。特定のホストに対して特別なアイコンを用意したい場合は、ここでアイコンを追加しておいてください。"
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
msgid "Host Name"
@@ -791,14 +584,14 @@ msgid "Note exported successfully"
msgstr "メモのエクスポートが完了しました"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
-#: ../Tomboy/ExportAllApplicationAddin.cs:195
-#: ../Tomboy/ExportAllApplicationAddin.cs:273
+#: ../Tomboy/ExportAllApplicationAddin.cs:250
+#: ../Tomboy/ExportAllApplicationAddin.cs:328
msgid "Access denied."
msgstr "アクセスが拒否されました。"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
-#: ../Tomboy/ExportAllApplicationAddin.cs:200
-#: ../Tomboy/ExportAllApplicationAddin.cs:278
+#: ../Tomboy/ExportAllApplicationAddin.cs:255
+#: ../Tomboy/ExportAllApplicationAddin.cs:333
msgid "Folder does not exist."
msgstr "フォルダーがありません。"
@@ -820,11 +613,8 @@ msgid "Folder path field is empty."
msgstr "フォルダーのパス名が空です。"
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
-msgid ""
-"Specified folder path does not exist, and Tomboy was unable to create it."
-msgstr ""
-"指定したフォルダーのパスが存在しないので、Tomboyはファイルを作成することが出"
-"来ませんでした。"
+msgid "Specified folder path does not exist, and Tomboy was unable to create it."
+msgstr "指定したフォルダーのパスが存在しないので、Tomboyはファイルを作成することが出来ませんでした。"
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
@@ -850,14 +640,13 @@ msgstr "タイムスタンプの挿入"
#. initial newline
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:155
msgid "dddd, MMMM d, h:mm tt"
msgstr "MMMMd日 (dddd) tth:mm"
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
msgid "Choose one of the predefined formats or use your own."
-msgstr ""
-"事前に用意された書式から一つ選択するか、または独自の書式を指定してください。"
+msgstr "事前に用意された書式から一つ選択するか、または独自の書式を指定してください。"
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
msgid "Use _Selected Format"
@@ -889,12 +678,8 @@ msgid "Appointments"
msgstr "予定"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid ""
-"Change the <b>Today: Template</b> note to customize the text that new Today "
-"notes have."
-msgstr ""
-"新しい今日のメモに表示するテキストをカスタマイズするために<span weight=\"bold"
-"\">今日: テンプレート</span>のメモを変更します。"
+msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
+msgstr "新しい今日のメモに表示するテキストをカスタマイズするために<span weight=\"bold\">今日: テンプレート</span>のメモを変更します。"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -920,10 +705,22 @@ msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "yyyy/MM/dd (dddd) tt hh:mm:ss"
#. Adding menu item when note is opened and window created
-#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:31
msgid "Remove broken links"
msgstr "壊れたリンクを削除"
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:42
+#: ../Tomboy/ExportAllApplicationAddin.cs:70
+#: ../Tomboy/Synchronization/SyncManager.cs:162
+msgid "_Tools"
+msgstr "ツール(_T)"
+
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:44
+#, fuzzy
+#| msgid "Remove broken links"
+msgid "_Remove broken links"
+msgstr "壊れたリンクを削除"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "スケッチの追加"
@@ -944,12 +741,8 @@ msgstr "フォルダー(オプション)(_F): "
#. Text for label describing setup required for SSH sync addin to work
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
-msgid ""
-"SSH synchronization requires an existing SSH key for this server and user, "
-"added to a running SSH daemon."
-msgstr ""
-"SSH による同期を行うには、予め実行中の SSH デーモンに追加しておいたユーザー名"
-"と鍵が必要です。"
+msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
+msgstr "SSH による同期を行うには、予め実行中の SSH デーモンに追加しておいたユーザー名と鍵が必要です。"
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
@@ -960,12 +753,8 @@ msgid "SSH"
msgstr "SSH"
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
-msgid ""
-"Timeout connecting to server. Please ensure that your SSH key has been added "
-"to a running SSH daemon."
-msgstr ""
-"サーバーへ接続している最中にタイムアウトしました。SSH の鍵を起動中の SSH デー"
-"モンに追加したかどうかを確認してください。"
+msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
+msgstr "サーバーへ接続している最中にタイムアウトしました。SSH の鍵を起動中の SSH デーモンに追加したかどうかを確認してください。"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
msgid "Import from Sticky Notes"
@@ -987,8 +776,7 @@ msgstr "付箋紙のインポートが完了しました"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
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."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
msgstr[0] "<b>{0}</b>/<b>{1}</b> 個の付箋紙アプレットをインポートしました。"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
@@ -1036,12 +824,8 @@ msgid "WebDAV"
msgstr "WebDAV"
#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:192
-msgid ""
-"There was an error connecting to the server. This may be caused by using an "
-"incorrect user name and/or password."
-msgstr ""
-"サーバーへ接続している最中にエラーが発生しました。これはユーザー名とパスワー"
-"ド、またはそのどちらかが間違っていることが原因かもしれません。"
+msgid "There was an error connecting to the server. This may be caused by using an incorrect user name and/or password."
+msgstr "サーバーへ接続している最中にエラーが発生しました。これはユーザー名とパスワード、またはそのどちらかが間違っていることが原因かもしれません。"
#. TODO: If the above fails (no keyring daemon), save all but password
#. to GConf, and notify user.
@@ -1049,8 +833,7 @@ msgstr ""
#. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
#. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
-msgid ""
-"Saving configuration to the GNOME keyring failed with the following message:"
+msgid "Saving configuration to the GNOME keyring failed with the following message:"
msgstr "GNOME キーリングの設定を保存できませんでした:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
@@ -1080,12 +863,8 @@ msgstr "Tomboy のウェブ認証は成功しました"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
-msgid ""
-"Please return to the Tomboy Preferences window and press Save to start "
-"synchronizing."
-msgstr ""
-"Tomboy の設定ウィンドウに戻り、\"保存\" をクリックして同期を開始してくださ"
-"い。"
+msgid "Please return to the Tomboy Preferences window and press Save to start synchronizing."
+msgstr "Tomboy の設定ウィンドウに戻り、\"保存\" をクリックして同期を開始してください。"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
@@ -1106,96 +885,98 @@ msgstr "デフォルトブラウザーを設定して再度表示してくださ
msgid "Tomboy Web"
msgstr "Tomboy のウェブサイト"
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
#, csharp-format
msgid "Export All Notes to {0}"
msgstr "すべてのメモを{0}にエクスポート"
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
#, csharp-format
msgid "Start exporting notes to {0}"
msgstr "{0}へメモのエクスポートを開始"
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#: ../Tomboy/ExportAllApplicationAddin.cs:63
#, csharp-format
msgid "Export selected notebook to {0}"
msgstr "選択したノートを{0}にエクスポート"
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#: ../Tomboy/ExportAllApplicationAddin.cs:64
#, csharp-format
msgid "Start exporting notebook to {0}"
msgstr "{0}へノートのエクスポートを開始"
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "ツール(_T)"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#: ../Tomboy/ExportAllApplicationAddin.cs:73
msgid "Export"
msgstr "エクスポート"
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#: ../Tomboy/ExportAllApplicationAddin.cs:74
msgid "Export your notes."
msgstr "メモをエクスポートする。"
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
#, csharp-format
msgid "Export All Notes To {0}"
msgstr "すべてのメモを{0}へエクスポート"
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#: ../Tomboy/ExportAllApplicationAddin.cs:82
#, csharp-format
msgid "Export Selected Notebook To {0}"
msgstr "選択したノートを{0}へエクスポート"
-#: ../Tomboy/ExportAllApplicationAddin.cs:153
-#, csharp-format
-msgid "All Notes {0} Export"
-msgstr "すべてのメモ{0}をエクスポート"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:193
-#: ../Tomboy/ExportAllApplicationAddin.cs:271
+#: ../Tomboy/ExportAllApplicationAddin.cs:171
+#: ../Tomboy/ExportAllApplicationAddin.cs:248
+#: ../Tomboy/ExportAllApplicationAddin.cs:326
msgid "Could not export, access denied."
msgstr "アクセスが拒否されたので、エクスポートできませんでした。"
-#: ../Tomboy/ExportAllApplicationAddin.cs:198
-#: ../Tomboy/ExportAllApplicationAddin.cs:276
+#: ../Tomboy/ExportAllApplicationAddin.cs:173
+#: ../Tomboy/ExportAllApplicationAddin.cs:253
+#: ../Tomboy/ExportAllApplicationAddin.cs:331
msgid "Could not export, folder does not exist."
msgstr "フォルダーが無いため、エクスポートできませんでした。"
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#: ../Tomboy/ExportAllApplicationAddin.cs:175
+msgid "Could not export, error with the path. (No ending \"?)"
+msgstr ""
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:177
+#: ../Tomboy/ExportAllApplicationAddin.cs:258
+#: ../Tomboy/ExportAllApplicationAddin.cs:336
#, csharp-format
msgid "Could not export: {0}"
msgstr "エクスポートできませんでした: {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
+#: ../Tomboy/ExportAllApplicationAddin.cs:231
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "すべてのメモ{0}をエクスポート"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:260
+#: ../Tomboy/ExportAllApplicationAddin.cs:338
msgid "Unknown error."
msgstr "不明なエラー。"
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:237
+#: ../Tomboy/ExportAllApplicationAddin.cs:291
+#: ../Tomboy/Notebooks/Notebook.cs:243
msgid "Unfiled Notes"
msgstr "未ファイルのメモ"
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#: ../Tomboy/ExportAllApplicationAddin.cs:445
#, csharp-format
msgid "Your notes were exported to \"{0}\"."
msgstr "メモを \"{0}\" にエクスポートしました。"
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#: ../Tomboy/ExportAllApplicationAddin.cs:454
msgid "Notes exported successfully"
msgstr "メモのエクスポートが完了しました"
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#: ../Tomboy/ExportAllApplicationAddin.cs:477
#, csharp-format
msgid "Could not save the files in \"{0}\""
msgstr "\"{0}\" にあるファイルを保存できませんでした"
#. Translators: {0} is the export type, e.g. HTML
-#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#: ../Tomboy/ExportAllApplicationAddin.cs:563
#, csharp-format
msgid "Create destination folder for {0} export"
msgstr "{0}エクスポート用のフォルダーを作成"
@@ -1308,11 +1089,11 @@ msgstr "ノート"
msgid "{0} Notebook Template"
msgstr "{0}メモのテンプレート"
-#: ../Tomboy/Notebooks/Notebook.cs:153
+#: ../Tomboy/Notebooks/Notebook.cs:159
msgid "New Note"
msgstr "新しいメモ"
-#: ../Tomboy/Notebooks/Notebook.cs:205
+#: ../Tomboy/Notebooks/Notebook.cs:211
msgid "All Notes"
msgstr "すべてのメモ"
@@ -1321,12 +1102,8 @@ msgid "Really delete this notebook?"
msgstr "このノートを本当に削除してもよろしいですか?"
#: ../Tomboy/Notebooks/NotebookManager.cs:369
-msgid ""
-"The notes that belong to this notebook will not be deleted, but they will no "
-"longer be associated with this notebook. This action cannot be undone."
-msgstr ""
-"このノートの中にあるメモは削除されません (単にこのノートとの関連付けがなくな"
-"るだけです)。但し、この操作を取り消して元に戻すことはできません。"
+msgid "The notes that belong to this notebook will not be deleted, but they will no longer be associated with this notebook. This action cannot be undone."
+msgstr "このノートの中にあるメモは削除されません (単にこのノートとの関連付けがなくなるだけです)。但し、この操作を取り消して元に戻すことはできません。"
#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
msgid "No notebook"
@@ -1353,7 +1130,7 @@ msgstr "ノート"
msgid "_New notebook..."
msgstr "新しいノート(_N)..."
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
#, csharp-format
msgid "New Note {0}"
msgstr "新しいメモ {0}"
@@ -1375,14 +1152,8 @@ msgstr "メモを削除すると、メモの内容を完全に失うことにな
#: ../Tomboy/Note.cs:1655
#, 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} を参照してくださ"
-"い。"
+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:1671
msgid "Error saving note data."
@@ -1396,56 +1167,41 @@ msgstr "新しいメモのテンプレート"
#. Create migration notification note
#. Translators: The title of the data migration note
-#: ../Tomboy/NoteManager.cs:147
+#: ../Tomboy/NoteManager.cs:151
msgid "Your Notes Have Moved!"
msgstr "メモは移動されました!"
#. Translators: The contents (not including the title) of the data migration note. {0}, {1}, {2}, {3}, and {4} are replaced by directory paths and should not be changed
-#: ../Tomboy/NoteManager.cs:160
+#: ../Tomboy/NoteManager.cs:164
#, csharp-format
msgid ""
-"In the latest version of Tomboy, your note files have moved. You have "
-"probably never cared where your notes are stored, and if you still don't "
-"care, please go ahead and <bold>delete this note</bold>. :-)\n"
+"In the latest version of Tomboy, your note files have moved. You have probably never cared where your notes are stored, and if you still don't care, please go ahead and <bold>delete this note</bold>. :-)\n"
"\n"
-"Your old note directory is still safe and sound at <link:url>{0}</link:"
-"url> . If you go back to an older version of Tomboy, it will look for notes "
-"there.\n"
+"Your old note directory is still safe and sound at <link:url>{0}</link:url> . If you go back to an older version of Tomboy, it will look for notes there.\n"
"\n"
-"But we've copied your notes and configuration info into new directories, "
-"which will be used from now on:\n"
+"But we've copied your notes and configuration info into new directories, which will be used from now on:\n"
"\n"
-"<list><list-item dir=\"ltr\">Notes can now be found at <link:url>{1}</link:"
-"url>\n"
-"</list-item><list-item dir=\"ltr\">Configuration is at <link:url>{2}</link:"
-"url>\n"
-"</list-item><list-item dir=\"ltr\">You can install add-ins at <link:url>{3}</"
-"link:url>\n"
-"</list-item><list-item dir=\"ltr\">Log files can be found at <link:url>{4}</"
-"link:url></list-item></list>\n"
+"<list><list-item dir=\"ltr\">Notes can now be found at <link:url>{1}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Configuration is at <link:url>{2}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">You can install add-ins at <link:url>{3}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Log files can be found at <link:url>{4}</link:url></list-item></list>\n"
"\n"
"Ciao!"
msgstr ""
-"Tomboy の最新版では、メモのファイルが移動されました。今までメモがどこに保存さ"
-"れているのかを気にしたことは全く無いでしょうし、今でも気にしていないのであれ"
-"ば、そのまま<bold>このメモを削除してください</bold> :-)\n"
+"Tomboy の最新版では、メモのファイルが移動されました。今までメモがどこに保存されているのかを気にしたことは全く無いでしょうし、今でも気にしていないのであれば、そのまま<bold>このメモを削除してください</bold> :-)\n"
"\n"
-"古いメモのディレクトリはそのまま <link:url>{0}</link:url> に置かれています。"
-"Tomboy を古いバージョンに戻す場合は、メモはそこから探してください。\n"
+"古いメモのディレクトリはそのまま <link:url>{0}</link:url> に置かれています。Tomboy を古いバージョンに戻す場合は、メモはそこから探してください。\n"
"\n"
-"しかし、メモと設定情報は新しいディレクトリにコピーしてあり、これからは新しい"
-"のを使います:\n"
+"しかし、メモと設定情報は新しいディレクトリにコピーしてあり、これからは新しいのを使います:\n"
"\n"
"<list><list-item dir=\"ltr\">メモは <link:url>{1}</link:url> で参照できます\n"
"</list-item><list-item dir=\"ltr\">設定は <link:url>{2}</link:url> です\n"
-"</list-item><list-item dir=\"ltr\">アドインは <link:url>{3}</link:url> からイ"
-"ンストールできます\n"
-"</list-item><list-item dir=\"ltr\">ログファイルは <link:url>{4}</link:url> で"
-"参照できます</list-item></list>\n"
+"</list-item><list-item dir=\"ltr\">アドインは <link:url>{3}</link:url> からインストールできます\n"
+"</list-item><list-item dir=\"ltr\">ログファイルは <link:url>{4}</link:url> で参照できます</list-item></list>\n"
"\n"
"それじゃ!"
-#: ../Tomboy/NoteManager.cs:265
+#: ../Tomboy/NoteManager.cs:269
msgid ""
"<note-content>Start Here\n"
"\n"
@@ -1453,75 +1209,54 @@ msgid ""
"\n"
"Use this \"Start Here\" note to begin organizing your ideas and thoughts.\n"
"\n"
-"You can create new notes to hold your ideas by selecting the \"Create New "
-"Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will "
-"be saved automatically.\n"
+"You can create new notes to hold your ideas by selecting the \"Create New Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will be saved automatically.\n"
"\n"
-"Then organize the notes you create by linking related notes and ideas "
-"together!\n"
+"Then organize the notes you create by linking related notes and ideas together!\n"
"\n"
-"We've created a note called <link:internal>Using Links in Tomboy</link:"
-"internal>. Notice how each time we type <link:internal>Using Links in "
-"Tomboy</link:internal> it automatically gets underlined? Click on the link "
-"to open the note.</note-content>"
+"We've created a note called <link:internal>Using Links in Tomboy</link:internal>. Notice how each time we type <link:internal>Using Links in Tomboy</link:internal> it automatically gets underlined? Click on the link to open the note.</note-content>"
msgstr ""
"<note-content>ここから開始\n"
"\n"
"<bold>Tomboy へようこそ!</bold>\n"
"\n"
-"これをアイデアや思いついたことを体系づけてまとめる際の \"最初のメモ\" として"
-"ご利用ください。\n"
+"これをアイデアや思いついたことを体系づけてまとめる際の \"最初のメモ\" としてご利用ください。\n"
"\n"
-"GNOME パネルにある Tomboy メニューの \"新しいメモの作成\" を選択してアイデア"
-"をまとめるためのメモを作成できます。メモは自動的に保存されます。\n"
+"GNOME パネルにある Tomboy メニューの \"新しいメモの作成\" を選択してアイデアをまとめるためのメモを作成できます。メモは自動的に保存されます。\n"
"\n"
-"それから、そのアイデアに関連する複数のメモを一緒にリンクして体系づけてみてく"
-"ださい!\n"
+"それから、そのアイデアに関連する複数のメモを一緒にリンクして体系づけてみてください!\n"
"\n"
-"このバージョンでは、<link:internal>Tomboy でリンクを利用する</link:internal> "
-"というメモを追加しました。<link:internal>Tomboy でリンクを利用する</link:"
-"internal> と入力する度に下線が自動的に付与されることに気づきましたか? リンク"
-"をクリックしてメモを開いてみてください。</note-content>"
+"このバージョンでは、<link:internal>Tomboy でリンクを利用する</link:internal> というメモを追加しました。<link:internal>Tomboy でリンクを利用する</link:internal> と入力する度に下線が自動的に付与されることに気づきましたか? リンクをクリックしてメモを開いてみてください。</note-content>"
-#: ../Tomboy/NoteManager.cs:284
+#: ../Tomboy/NoteManager.cs:288
msgid ""
"<note-content>Using Links in Tomboy\n"
"\n"
-"Notes in Tomboy can be linked together by highlighting text in the current "
-"note and clicking the <bold>Link</bold> button above in the toolbar. Doing "
-"so will create a new note and also underline the note's title in the current "
-"note.\n"
+"Notes in Tomboy can be linked together by highlighting text in the current note and clicking the <bold>Link</bold> button above in the toolbar. Doing so will create a new note and also underline the note's title in the current note.\n"
"\n"
-"Changing the title of a note will update links present in other notes. This "
-"prevents broken links from occurring when a note is renamed.\n"
+"Changing the title of a note will update links present in other notes. This prevents broken links from occurring when a note is renamed.\n"
"\n"
-"Also, if you type the name of another note in your current note, it will "
-"automatically be linked for you.</note-content>"
+"Also, if you type the name of another note in your current note, it will automatically be linked for you.</note-content>"
msgstr ""
"<note-content>Tomboy でリンクを利用する\n"
"\n"
-"Tomboy ではメモの中で強調表示した文字列にまとめてリンクを付与し、ツールバーに"
-"ある<bold>リンク</bold>ボタンからアクセスできるようになっています。ここで新し"
-"いメモを作成すると、そのメモのタイトルに下線が付与されます。\n"
+"Tomboy ではメモの中で強調表示した文字列にまとめてリンクを付与し、ツールバーにある<bold>リンク</bold>ボタンからアクセスできるようになっています。ここで新しいメモを作成すると、そのメモのタイトルに下線が付与されます。\n"
"\n"
-"メモのタイトルを変更すると、他のメモにあるすべてのリンクが更新されます。これ"
-"により、メモのタイトルを変更してもリンクが無効になることはありません。\n"
+"メモのタイトルを変更すると、他のメモにあるすべてのリンクが更新されます。これにより、メモのタイトルを変更してもリンクが無効になることはありません。\n"
"\n"
-"さらにメモの中に他のメモのタイトルを入力すると、自動的にリンクが付与されま"
-"す。</note-content>"
+"さらにメモの中に他のメモのタイトルを入力すると、自動的にリンクが付与されます。</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
+#: ../Tomboy/NoteManager.cs:303 ../Tomboy/NoteManager.cs:398
msgid "Start Here"
msgstr "ここから開始"
-#: ../Tomboy/NoteManager.cs:304
+#: ../Tomboy/NoteManager.cs:308
msgid "Using Links in Tomboy"
msgstr "Tomboy でリンクを利用する"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
+#: ../Tomboy/NoteManager.cs:560 ../Tomboy/NoteManager.cs:663
msgid "Describe your new note here."
msgstr "新しいメモをここに記述してください。"
@@ -1540,13 +1275,11 @@ msgstr "リンクの名前を変更しない(_D)"
#: ../Tomboy/NoteRenameDialog.cs:67
#, csharp-format
msgid ""
-"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" "
-"to \"<span underline=\"single\">{1}</span>\"?\n"
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" to \"<span underline=\"single\">{1}</span>\"?\n"
"\n"
"If you do not rename the links, they will no longer link to anything."
msgstr ""
-"他のメモ中のリンクの名前を \"<span underline=\"single\">{0}</span>\" から "
-"\"<span underline=\"single\">{1}</span>\" に変更しますか?\n"
+"他のメモ中のリンクの名前を \"<span underline=\"single\">{0}</span>\" から \"<span underline=\"single\">{1}</span>\" に変更しますか?\n"
"\n"
"リンクの名前を変更しない場合、無効なリンクになります。"
@@ -1642,17 +1375,13 @@ msgstr "いろいろなツールを利用します"
msgid "Delete this note"
msgstr "このメモを削除します"
-#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:164
msgid "Synchronize Notes"
msgstr "メモの同期"
#: ../Tomboy/NoteWindow.cs:565
-msgid ""
-"This note is a template note. It determines the default content of regular "
-"notes, and will not show up in the note menu or search window."
-msgstr ""
-"このメモはテンプレートメモです。通常のメモの標準の内容を決定し、メモのメ"
-"ニューや検索ウィンドウに表示しません。"
+msgid "This note is a template note. It determines the default content of regular notes, and will not show up in the note menu or search window."
+msgstr "このメモはテンプレートメモです。通常のメモの標準の内容を決定し、メモのメニューや検索ウィンドウに表示しません。"
#: ../Tomboy/NoteWindow.cs:571
msgid "Convert to regular note"
@@ -1767,12 +1496,8 @@ msgid "_Spell check while typing"
msgstr "入力中にスペルをチェックする(_S)"
#: ../Tomboy/PreferencesDialog.cs:183
-msgid ""
-"Misspellings will be underlined in red, with correct spelling suggestions "
-"shown in the context menu."
-msgstr ""
-"スペル違いの文字には赤色の下線がつき、コンテキストメニューの中に妥当なスペル"
-"を提示します。"
+msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
+msgstr "スペル違いの文字には赤色の下線がつき、コンテキストメニューの中に妥当なスペルを提示します。"
#. WikiWords...
#: ../Tomboy/PreferencesDialog.cs:194
@@ -1780,12 +1505,8 @@ msgid "Highlight _WikiWords"
msgstr "WikiWord を強調表示する(_W)"
#: ../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>ThatLookLikeThis</b> のような単語を強調表示し"
-"ます。その単語をクリックすると、それをタイトルにした新しいメモを作成します。"
+msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
+msgstr "このオプションを有効にすると <b>ThatLookLikeThis</b> のような単語を強調表示します。その単語をクリックすると、それをタイトルにした新しいメモを作成します。"
#. Auto bulleted list
#: ../Tomboy/PreferencesDialog.cs:209
@@ -1813,12 +1534,8 @@ msgid "Always rename links"
msgstr "常にリンクの名前を変更する"
#: ../Tomboy/PreferencesDialog.cs:261
-msgid ""
-"Use the new note template to specify the text that should be used when "
-"creating a new note."
-msgstr ""
-"メモのテンプレートを利用して、新しく作成するメモに記録する情報をあらかじめ指"
-"定しておくことが可能です。"
+msgid "Use the new note template to specify the text that should be used when creating a new note."
+msgstr "メモのテンプレートを利用して、新しく作成するメモに記録する情報をあらかじめ指定しておくことが可能です。"
#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
@@ -1830,13 +1547,8 @@ msgid "Listen for _Hotkeys"
msgstr "ホットキーを監視する(_H)"
#: ../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>"
+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:356
@@ -1915,11 +1627,8 @@ msgid "Other Synchronization Options"
msgstr "その他の同期オプション"
#: ../Tomboy/PreferencesDialog.cs:981
-msgid ""
-"When a conflict is detected between a local note and a note on the "
-"configured synchronization server:"
-msgstr ""
-"ローカルのメモと同期先のサーバーにあるメモとの間に矛盾が生じている場合:"
+msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
+msgstr "ローカルのメモと同期先のサーバーにあるメモとの間に矛盾が生じている場合:"
#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
@@ -1938,44 +1647,29 @@ msgid "Are you sure?"
msgstr "本当によろしいですか?"
#: ../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 ""
-"同期の設定をクリアするのはお奨めしません。新しい設定を保存する際に再びメモを"
-"強制的に同期できるからです。"
+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:1157
msgid "Resetting Synchronization 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."
-msgstr ""
-"同期サービスの設定を無効にしました。同期の設定がクリアされます。新しい設定を"
-"保存すると再びノートを強制的に同期できるようになります。"
+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:1237
msgid "Connection successful"
msgstr "接続に成功"
#: ../Tomboy/PreferencesDialog.cs:1239
-msgid ""
-"Tomboy is ready to synchronize your notes. Would you like to synchronize "
-"them now?"
+msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
msgstr "メモの同期を行う準備が整いました。今すぐ同期しますか?"
#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-msgid ""
-"Please check your information and try again. The log file {0} may contain "
-"more information about the error."
-msgstr ""
-"情報を確認して、もう一度実施してみてください。ログファイル{0}にこのエラーにつ"
-"いての情報が含まれているかもしれません。"
+msgid "Please check your information and try again. The log file {0} may contain more information about the error."
+msgstr "情報を確認して、もう一度実施してみてください。ログファイル{0}にこのエラーについての情報が含まれているかもしれません。"
#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
@@ -2053,12 +1747,8 @@ 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 ""
-"お使いのシステムでは Synchronization アドインがサポートされていません。FUSE "
-"と {0} が正しくインストールされ設定されているか確認してください"
+msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
+msgstr "お使いのシステムでは Synchronization アドインがサポートされていません。FUSE と {0} が正しくインストールされ設定されているか確認してください"
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
msgid "Could not read testfile."
@@ -2134,12 +1824,8 @@ msgid "Server is locked"
msgstr "サーバーがロックされています"
#: ../Tomboy/Synchronization/SyncDialog.cs:270
-msgid ""
-"One of your other computers is currently synchronizing. Please wait 2 "
-"minutes and try again."
-msgstr ""
-"現在、他のコンピューターで同期を行っています。2分ほど待ってからもう一度実施し"
-"てみてください。"
+msgid "One of your other computers is currently synchronizing. Please wait 2 minutes and try again."
+msgstr "現在、他のコンピューターで同期を行っています。2分ほど待ってからもう一度実施してみてください。"
#: ../Tomboy/Synchronization/SyncDialog.cs:274
msgid "Preparing to download updates from server..."
@@ -2163,8 +1849,7 @@ msgstr "同期に失敗しました"
#: ../Tomboy/Synchronization/SyncDialog.cs:285
msgid "Could not synchronize notes. Check the details below and try again."
-msgstr ""
-"メモを同期できませんでした。詳細を確認してもう一度実施してみてください。"
+msgstr "メモを同期できませんでした。詳細を確認してもう一度実施してみてください。"
#: ../Tomboy/Synchronization/SyncDialog.cs:291
msgid "Synchronization Complete"
@@ -2218,8 +1903,7 @@ msgstr "サービスのエラー"
#: ../Tomboy/Synchronization/SyncDialog.cs:317
msgid "Error connecting to the synchronization service. Please try again."
-msgstr ""
-"同期サービスとの接続でエラーが発生しました。もう一度実施してみてください。"
+msgstr "同期サービスとの接続でエラーが発生しました。もう一度実施してみてください。"
#: ../Tomboy/Synchronization/SyncDialog.cs:334
msgid "Deleted locally"
@@ -2277,12 +1961,8 @@ msgstr "メモの矛盾を検出しました"
#: ../Tomboy/Synchronization/SyncDialog.cs:565
#, csharp-format
-msgid ""
-"The server version of \"{0}\" conflicts with your local note. What do you "
-"want to do with your local note?"
-msgstr ""
-"サーバーにある \"{0}\" のメモがローカルのメモと矛盾が生じました。どのように対"
-"処しますか?"
+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/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
@@ -2291,12 +1971,8 @@ msgstr "FUSE を有効にできませんでした"
#: ../Tomboy/Synchronization/SyncUtils.cs:120
#: ../Tomboy/Synchronization/SyncUtils.cs:164
-msgid ""
-"The FUSE module could not be loaded. Please check that it is installed "
-"properly and try again."
-msgstr ""
-"FUSE モジュールをロードできませんでした。モジュールが正しくインストールされて"
-"いるか確認し、もう一度試してみてください。"
+msgid "The FUSE module could not be loaded. Please check that it is installed properly and try again."
+msgstr "FUSE モジュールをロードできませんでした。モジュールが正しくインストールされているか確認し、もう一度試してみてください。"
#: ../Tomboy/Synchronization/SyncUtils.cs:135
msgid "Enable FUSE?"
@@ -2308,30 +1984,25 @@ msgstr "FUSE を有効にしますか?"
msgid ""
"The synchronization you've chosen requires the FUSE module to be loaded.\n"
"\n"
-"To avoid getting this prompt in the future, you should load FUSE at "
-"startup. Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
-"etc/modules."
+"To avoid getting this prompt in the future, you should load FUSE at startup. Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /etc/modules."
msgstr ""
"指定した同期を行うには FUSE のモジュールが必要です。\n"
"\n"
-"この問題を解決するには、システムの起動時に FUSE カーネルモジュールをロードし"
-"ておく必要があります。\"modprobe fuse\" という文を /etc/init.d/boot.local "
-"ファイルに追加するか、または \"fuse\" という文を /etc/modules ファイルに追加"
-"しておいてください。"
+"この問題を解決するには、システムの起動時に FUSE カーネルモジュールをロードしておく必要があります。\"modprobe fuse\" という文を /etc/init.d/boot.local ファイルに追加するか、または \"fuse\" という文を /etc/modules ファイルに追加しておいてください。"
-#: ../Tomboy/Tomboy.cs:251
+#: ../Tomboy/Tomboy.cs:253
msgid "Cannot create new note"
msgstr "新しいメモを作成できません"
-#: ../Tomboy/Tomboy.cs:317
+#: ../Tomboy/Tomboy.cs:319
msgid "Primary Development:"
msgstr "初期の開発:"
-#: ../Tomboy/Tomboy.cs:330
+#: ../Tomboy/Tomboy.cs:332
msgid "Contributors:"
msgstr "貢献者一覧:"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:418
msgid "translator-credits"
msgstr ""
"相花 毅 <takeshi.aihana at gmail.com>\n"
@@ -2342,7 +2013,7 @@ msgstr ""
"Kentaro KAZUHAMA <kazken3 at gmail.com>\n"
"日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
-#: ../Tomboy/Tomboy.cs:424
+#: ../Tomboy/Tomboy.cs:427
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2350,15 +2021,15 @@ msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:429
msgid "A simple and easy to use desktop note-taking application."
msgstr "シンプルで使いやすいデスクトップメモです。"
-#: ../Tomboy/Tomboy.cs:436
+#: ../Tomboy/Tomboy.cs:439
msgid "Homepage"
msgstr "ホームページ"
-#: ../Tomboy/Tomboy.cs:554
+#: ../Tomboy/Tomboy.cs:575
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2372,7 +2043,7 @@ msgstr ""
"\n"
"Copyright © 2004-2011 Others\n"
-#: ../Tomboy/Tomboy.cs:568
+#: ../Tomboy/Tomboy.cs:589
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -2384,10 +2055,9 @@ msgstr ""
" --version\t\t\tバージョン情報を表示する\n"
" --help\t\t\tこのヘルプを表示する\n"
" --note-path [path]\t\tメモのデータを読み込む/保存する path を指定する\n"
-" --search [text]\t\t検索ウィンドウを開いて指定した text をすべてのメモから検"
-"索する\n"
+" --search [text]\t\t検索ウィンドウを開いて指定した text をすべてのメモから検索する\n"
-#: ../Tomboy/Tomboy.cs:578
+#: ../Tomboy/Tomboy.cs:599
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"
@@ -2396,13 +2066,18 @@ msgid ""
" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
msgstr ""
" --new-note\t\t\t新しいメモを作成して表示する\n"
-" --new-note [title]\t\t指定した title をタイトルとする新しいメモを作成し表示"
-"する\n"
+" --new-note [title]\t\t指定した title をタイトルとする新しいメモを作成し表示する\n"
" --open-note [title/url]\t指定した title/url に一致するメモを表示する\n"
" --start-here\t\t\t\"ここから開始\" メモを表示する\n"
" --highlight-search [text]\t開いたメモから text を検索して強調表示する\n"
-#: ../Tomboy/Tomboy.cs:592
+#: ../Tomboy/Tomboy.cs:609
+msgid ""
+" --addin:html-export-all [path]\tExports all notes to HTML in the given location.\n"
+" --addin:html-export-all-quit [path]\tExports all notes to HTML in the given location and then quits.\n"
+msgstr ""
+
+#: ../Tomboy/Tomboy.cs:619
#, csharp-format
msgid "Version {0}"
msgstr "バージョン {0}"
@@ -2413,15 +2088,11 @@ msgstr " (新規)"
#: ../Tomboy/Tray.cs:293
msgid "_About Tomboy"
-msgstr "Tomboy について(_A)"
+msgstr "このアプリケーションについて(_A)"
#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"\"Tomboy メモのマニュアル\" が見つかりませんでした。インストールが問題なく行"
-"われているかどうか確認してみてください。"
+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"
@@ -2509,12 +2180,8 @@ 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> が付いたメモが既に存在します。続行する前に別のタイトルを"
-"選択してください。"
+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"
diff --git a/tomboy.spec b/tomboy.spec
index 200ac0e..3e4d58c 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.11.5
+Version: 1.11.6
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