[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:07 UTC 2013
The following commit has been merged in the ubuntu branch:
commit 76caca6a8c59255713ca0f23e372d5640dcc12b4
Author: Rodney Dawes <rodney.dawes at ubuntu.com>
Date: Mon Feb 4 13:11:52 2013 -0500
Imported Debian patch 1.12.0-1ubuntu2
diff --git a/ChangeLog b/ChangeLog
index 5d9b9f8..4be2a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,156 @@
# Generated by Makefile. Do not edit.
+commit bf02b6c80e7fc2bbe367589d46e3677ee77bf446
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Sep 24 16:06:50 2012 -0700
+
+ Update NEWS for 1.12.0
+
+ NEWS | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 37bd0dc2c20ed63f7831d628a1e055562f0d7562
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Sep 24 16:06:36 2012 -0700
+
+ Bump version to 1.12.0
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1ff967157a3bbe43fe0f04b22b713b1effa087bb
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Sep 17 19:29:46 2012 -0700
+
+ Bumping version 1.11.8
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 859f7291e4f27ccf256c8953e5b1f063fc4d5d3d
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Sep 17 19:26:43 2012 -0700
+
+ Update NEWS for 1.11.7
+
+ NEWS | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 68734b1ecfad3b9038417673fa660935e16e095f
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date: Fri Sep 14 23:21:52 2012 +0300
+
+ Updated Lithuanian translation
+
+ po/lt.po | 102 ++++++++++++++++++++++---------------------------------------
+ 1 files changed, 37 insertions(+), 65 deletions(-)
+
+commit f8e5881e7f5c40eeb5b6d063750bee9a6c1504bf
+Author: Changwoo Ryu <cwryu at debian.org>
+Date: Sun Sep 9 07:03:21 2012 +0900
+
+ Updated Korean translation
+
+ po/ko.po | 810 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 417 insertions(+), 393 deletions(-)
+
+commit b3ba4bc3d823b9a821c508b79e908f0a155ed15f
+Author: Andika Triwidada <andika at gmail.com>
+Date: Sat Sep 8 23:16:05 2012 +0700
+
+ Updated Indonesian translation
+
+ po/id.po | 65 +++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 35 insertions(+), 30 deletions(-)
+
+commit f3b5c7b668713c9c79d506c7a27a9213cfb84248
+Author: Andika Triwidada <andika at gmail.com>
+Date: Sat Sep 8 23:10:12 2012 +0700
+
+ Updated Indonesian translation
+
+ po/id.po | 1098 ++++++++++++++++++++++++++++++++++++++++++--------------------
+ 1 files changed, 741 insertions(+), 357 deletions(-)
+
+commit 7894305eb7590e26ee5122ba7531d3cfcef004ea
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Tue Sep 4 00:55:07 2012 +0200
+
+ Updated Polish translation
+
+ po/pl.po | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 6e15afa93ef7e9a9c13cbabef8f9de6c13bd2cb1
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Tue Sep 4 00:52:24 2012 +0200
+
+ Updated Polish translation
+
+ po/pl.po | 20 +++++++++++++++++---
+ 1 files changed, 17 insertions(+), 3 deletions(-)
+
+commit 228d7a052fa94f25c662994acefbbc24729c9b4d
+Author: Milo Casagrande <milo at ubuntu.com>
+Date: Mon Sep 3 08:25:18 2012 +0200
+
+ [l10n] Updated Italian translation.
+
+ po/it.po | 985 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 510 insertions(+), 475 deletions(-)
+
+commit c959e6099580a7426ea2e0f512981995d7557c78
+Author: Chris Leonard <cjr at laptop.org>
+Date: Sat Sep 1 00:50:47 2012 +0100
+
+ Updated British English translation
+
+ po/en_GB.po | 945 +++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 491 insertions(+), 454 deletions(-)
+
+commit 4e31698df267a19f20d622d491999083016a9aa8
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Fri Aug 24 18:54:17 2012 +0200
+
+ Updated Polish translation
+
+ help/pl/pl.po | 115 ++++++++++++++++++++++++++++++--------------------------
+ po/pl.po | 12 +++---
+ 2 files changed, 68 insertions(+), 59 deletions(-)
+
+commit aa57072ed0e4ad5860ae2f21148bfa56341dbab1
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: Wed Aug 22 03:53:37 2012 +0200
+
+ Updated Polish translation
+
+ po/pl.po | 970 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 500 insertions(+), 470 deletions(-)
+
+commit 3de20e1e5340c7a5a67f0adc6ad9c37bc910c9d9
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 20 13:03:34 2012 -0700
+
+ Bumping version to 1.11.7
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit c14dff396f2305347a24327349282118809d68a8
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 20 13:02:01 2012 -0700
+
+ Update NEWS for 1.11.6
+
+ NEWS | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
commit da098224318b23e136cd7fa8c3fd0f0fd5aef0e8
Author: Jiro Matsuzawa <jmatsuzawa at gnome.org>
Date: Fri Aug 10 21:40:29 2012 +0900
diff --git a/Makefile.in b/Makefile.in
index 996b4d1..a2a0ac5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -58,6 +75,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -70,9 +92,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -100,6 +124,8 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -319,7 +345,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -355,10 +381,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -553,13 +577,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -594,7 +615,11 @@ dist-gzip: distdir
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
@@ -602,7 +627,7 @@ dist-lzma: distdir
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -633,6 +658,8 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -642,7 +669,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -652,6 +679,7 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -680,8 +708,16 @@ distcheck: dist
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -712,10 +748,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -804,18 +845,19 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am
+ dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
run: $(PROGRAM)
diff --git a/NEWS b/NEWS
index 6c3bde9..0b7d373 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,11 @@ 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.12.0
+
+Version 1.11.7
+* Translation updates: en_GB, id, it, ko, lt, pl
+
Version 1.11.6
* Translation updates: ja
diff --git a/Tomboy/Addins/AdvancedPreferences/Makefile.in b/Tomboy/Addins/AdvancedPreferences/Makefile.in
index e46a665..acfd9c4 100644
--- a/Tomboy/Addins/AdvancedPreferences/Makefile.in
+++ b/Tomboy/Addins/AdvancedPreferences/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -325,6 +353,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -342,8 +371,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,9 +389,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -414,10 +444,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Backlinks/Makefile.in b/Tomboy/Addins/Backlinks/Makefile.in
index 0b57ae2..376ddf9 100644
--- a/Tomboy/Addins/Backlinks/Makefile.in
+++ b/Tomboy/Addins/Backlinks/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -326,6 +354,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -343,8 +372,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -358,9 +390,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -415,10 +445,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Bugzilla/Makefile.in b/Tomboy/Addins/Bugzilla/Makefile.in
index 96f4d4d..43e2c49 100644
--- a/Tomboy/Addins/Bugzilla/Makefile.in
+++ b/Tomboy/Addins/Bugzilla/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA) $(noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -334,6 +362,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -351,8 +380,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -366,9 +398,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -423,10 +453,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Evolution/Makefile.in b/Tomboy/Addins/Evolution/Makefile.in
index fd0d0d1..f6bce53 100644
--- a/Tomboy/Addins/Evolution/Makefile.in
+++ b/Tomboy/Addins/Evolution/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA) $(noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -332,6 +360,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -349,8 +378,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -364,9 +396,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -421,10 +451,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/ExportToHtml/Makefile.in b/Tomboy/Addins/ExportToHtml/Makefile.in
index 8add74f..656abca 100644
--- a/Tomboy/Addins/ExportToHtml/Makefile.in
+++ b/Tomboy/Addins/ExportToHtml/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -329,6 +357,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -346,8 +375,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -361,9 +393,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -418,10 +448,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/FileSystemSyncService/Makefile.in b/Tomboy/Addins/FileSystemSyncService/Makefile.in
index 3e9e085..0ff46f0 100644
--- a/Tomboy/Addins/FileSystemSyncService/Makefile.in
+++ b/Tomboy/Addins/FileSystemSyncService/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -328,6 +356,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -345,8 +374,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -360,9 +392,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -417,10 +447,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/FixedWidth/Makefile.in b/Tomboy/Addins/FixedWidth/Makefile.in
index 559b541..b964a86 100644
--- a/Tomboy/Addins/FixedWidth/Makefile.in
+++ b/Tomboy/Addins/FixedWidth/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -327,6 +355,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -344,8 +373,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -359,9 +391,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -416,10 +446,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/GalagoPresence/Makefile.in b/Tomboy/Addins/GalagoPresence/Makefile.in
index 208c8ee..405b072 100644
--- a/Tomboy/Addins/GalagoPresence/Makefile.in
+++ b/Tomboy/Addins/GalagoPresence/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -326,6 +354,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -343,8 +372,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -358,9 +390,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -415,10 +445,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/InsertTimestamp/Makefile.in b/Tomboy/Addins/InsertTimestamp/Makefile.in
index a3240b2..e7a9f3b 100644
--- a/Tomboy/Addins/InsertTimestamp/Makefile.in
+++ b/Tomboy/Addins/InsertTimestamp/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -327,6 +355,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -344,8 +373,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -359,9 +391,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -416,10 +446,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Makefile.in b/Tomboy/Addins/Makefile.in
index 01ce513..41934fc 100644
--- a/Tomboy/Addins/Makefile.in
+++ b/Tomboy/Addins/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,6 +69,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -503,13 +525,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -544,10 +563,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
index 5cb9b05..46cbf42 100644
--- a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
+++ b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -325,6 +353,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -342,8 +371,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,9 +389,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -414,10 +444,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/NoteOfTheDay/Makefile.in b/Tomboy/Addins/NoteOfTheDay/Makefile.in
index f8e048a..a2eb50c 100644
--- a/Tomboy/Addins/NoteOfTheDay/Makefile.in
+++ b/Tomboy/Addins/NoteOfTheDay/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -328,6 +356,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -345,8 +374,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -360,9 +392,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -417,10 +447,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/PrintNotes/Makefile.in b/Tomboy/Addins/PrintNotes/Makefile.in
index 5d96a9d..f8300ba 100644
--- a/Tomboy/Addins/PrintNotes/Makefile.in
+++ b/Tomboy/Addins/PrintNotes/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -325,6 +353,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -342,8 +371,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,9 +389,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -414,10 +444,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
index 91c1790..4a6e682 100644
--- a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
+++ b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -327,6 +355,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -344,8 +373,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -359,9 +391,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -416,10 +446,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Sketching/Makefile.in b/Tomboy/Addins/Sketching/Makefile.in
index c301f7c..fc656f5 100644
--- a/Tomboy/Addins/Sketching/Makefile.in
+++ b/Tomboy/Addins/Sketching/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -331,6 +359,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -348,8 +377,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -363,9 +395,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -420,10 +450,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/SshSyncService/Makefile.in b/Tomboy/Addins/SshSyncService/Makefile.in
index 3dca11e..b3a2d62 100644
--- a/Tomboy/Addins/SshSyncService/Makefile.in
+++ b/Tomboy/Addins/SshSyncService/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -328,6 +356,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -345,8 +374,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -360,9 +392,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -417,10 +447,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/StickyNoteImport/Makefile.in b/Tomboy/Addins/StickyNoteImport/Makefile.in
index 9944abe..29138bf 100644
--- a/Tomboy/Addins/StickyNoteImport/Makefile.in
+++ b/Tomboy/Addins/StickyNoteImport/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -325,6 +353,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -342,8 +371,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,9 +389,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -414,10 +444,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Tasque/Makefile.in b/Tomboy/Addins/Tasque/Makefile.in
index 33d8e0d..d8831b9 100644
--- a/Tomboy/Addins/Tasque/Makefile.in
+++ b/Tomboy/Addins/Tasque/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -331,6 +359,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -348,8 +377,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -363,9 +395,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -420,10 +450,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/Underline/Makefile.in b/Tomboy/Addins/Underline/Makefile.in
index 2b05313..c9fd395 100644
--- a/Tomboy/Addins/Underline/Makefile.in
+++ b/Tomboy/Addins/Underline/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -327,6 +355,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -344,8 +373,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -359,9 +391,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -416,10 +446,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/WebDavSyncService/Makefile.in b/Tomboy/Addins/WebDavSyncService/Makefile.in
index d6162ed..82596d9 100644
--- a/Tomboy/Addins/WebDavSyncService/Makefile.in
+++ b/Tomboy/Addins/WebDavSyncService/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -328,6 +356,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -345,8 +374,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -360,9 +392,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -417,10 +447,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Addins/WebSyncService/Makefile.in b/Tomboy/Addins/WebSyncService/Makefile.in
index 2707b86..3e79879 100644
--- a/Tomboy/Addins/WebSyncService/Makefile.in
+++ b/Tomboy/Addins/WebSyncService/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(addinsdir)"
DATA = $(addins_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -342,6 +370,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -359,8 +388,11 @@ clean-libtool:
-rm -rf .libs _libs
install-addinsDATA: $(addins_DATA)
@$(NORMAL_INSTALL)
- test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(addinsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(addinsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -374,9 +406,7 @@ uninstall-addinsDATA:
@$(NORMAL_UNINSTALL)
@list='$(addins_DATA)'; test -n "$(addinsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(addinsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(addinsdir)" && rm -f $$files
+ dir='$(DESTDIR)$(addinsdir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -431,10 +461,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/Tomboy/Makefile.in b/Tomboy/Makefile.in
index 2b8cc9b..8cdefa2 100644
--- a/Tomboy/Makefile.in
+++ b/Tomboy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -68,6 +85,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(tomboylibdir)"
SCRIPTS = $(bin_SCRIPTS)
SOURCES =
@@ -79,6 +102,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(tomboylib_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
@@ -511,6 +539,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.include:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -522,8 +551,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -551,9 +583,7 @@ uninstall-binSCRIPTS:
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-libtool:
-rm -f *.lo
@@ -562,8 +592,11 @@ clean-libtool:
-rm -rf .libs _libs
install-tomboylibDATA: $(tomboylib_DATA)
@$(NORMAL_INSTALL)
- test -z "$(tomboylibdir)" || $(MKDIR_P) "$(DESTDIR)$(tomboylibdir)"
@list='$(tomboylib_DATA)'; test -n "$(tomboylibdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(tomboylibdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(tomboylibdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -577,9 +610,7 @@ uninstall-tomboylibDATA:
@$(NORMAL_UNINSTALL)
@list='$(tomboylib_DATA)'; test -n "$(tomboylibdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(tomboylibdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(tomboylibdir)" && rm -f $$files
+ dir='$(DESTDIR)$(tomboylibdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -748,13 +779,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -792,10 +820,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/aclocal.m4 b/aclocal.m4
index e748764..3a67f25 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -9467,12 +9468,55 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -9482,7 +9526,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -9498,19 +9542,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -9592,14 +9638,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -9639,6 +9685,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -9703,7 +9750,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -9768,10 +9815,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -10005,12 +10055,15 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -10050,8 +10103,8 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10071,7 +10124,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
@@ -10182,12 +10235,15 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -10210,13 +10266,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -10224,13 +10281,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -10241,12 +10298,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -10323,12 +10382,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -10351,13 +10412,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -10366,13 +10427,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10394,10 +10455,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/configure b/configure
index 8cd194f..9f4b96c 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.6.
+# Generated by GNU Autoconf 2.68 for tomboy 1.12.0.
#
#
# 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.6'
-PACKAGE_STRING='tomboy 1.11.6'
+PACKAGE_VERSION='1.12.0'
+PACKAGE_STRING='tomboy 1.12.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -724,6 +724,7 @@ DATADIRNAME
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -1458,7 +1459,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.6 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.12.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1532,7 +1533,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 1.11.6:";;
+ short | recursive ) echo "Configuration of tomboy 1.12.0:";;
esac
cat <<\_ACEOF
@@ -1699,7 +1700,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 1.11.6
+tomboy configure 1.12.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2064,7 +2065,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.6, which was
+It was created by tomboy $as_me 1.12.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2880,7 +2881,7 @@ fi
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='1.11.6'
+ VERSION='1.12.0'
cat >>confdefs.h <<_ACEOF
@@ -2910,9 +2911,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
@@ -3331,6 +3332,7 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -4144,6 +4146,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4203,7 +4206,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -5377,6 +5380,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -5436,7 +5440,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -16893,7 +16897,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.6, which was
+This file was extended by tomboy $as_me 1.12.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16959,7 +16963,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.6
+tomboy config.status 1.12.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index 02ad214..50830f0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.11.6)
+AC_INIT(tomboy, 1.12.0)
AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
AM_INIT_AUTOMAKE([foreign tar-ustar])
AM_MAINTAINER_MODE
diff --git a/data/Makefile.in b/data/Makefile.in
index 64b7d0d..dbf8db4 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -54,6 +71,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +97,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbusservicedir)" \
"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" \
@@ -392,11 +420,18 @@ clean-libtool:
-rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list=''; test -n "$(man1dir)" || exit 0; \
- { for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -425,13 +460,14 @@ uninstall-man1:
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-dbusserviceDATA: $(dbusservice_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dbusservicedir)" || $(MKDIR_P) "$(DESTDIR)$(dbusservicedir)"
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(dbusservicedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -445,13 +481,14 @@ uninstall-dbusserviceDATA:
@$(NORMAL_UNINSTALL)
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(dbusservicedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(dbusservicedir)" && rm -f $$files
+ dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -465,13 +502,14 @@ uninstall-desktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-mimeDATA: $(mime_DATA)
@$(NORMAL_INSTALL)
- test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
@list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -485,13 +523,14 @@ uninstall-mimeDATA:
@$(NORMAL_UNINSTALL)
@list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(mimedir)" && rm -f $$files
+ dir='$(DESTDIR)$(mimedir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -505,13 +544,14 @@ uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
install-schemasDATA: $(schemas_DATA)
@$(NORMAL_INSTALL)
- test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
@list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -525,13 +565,14 @@ uninstall-schemasDATA:
@$(NORMAL_UNINSTALL)
@list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(schemasdir)" && rm -f $$files
+ dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir)
install-serverDATA: $(server_DATA)
@$(NORMAL_INSTALL)
- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
@list='$(server_DATA)'; test -n "$(serverdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(serverdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(serverdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -545,9 +586,7 @@ uninstall-serverDATA:
@$(NORMAL_UNINSTALL)
@list='$(server_DATA)'; test -n "$(serverdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(serverdir)" && rm -f $$files
+ dir='$(DESTDIR)$(serverdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -729,13 +768,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -773,10 +809,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 8e3a1bf..d15319b 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -392,10 +414,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/debian/changelog b/debian/changelog
index 3afebce..a09e78d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,32 @@
-tomboy (1.11.6-0ubuntu1) quantal; urgency=low
+tomboy (1.12.0-1ubuntu2) raring; urgency=low
- * New upstream release
+ * debian/patches/02_sync_save_button_sensitive.patch:
+ * debian/patches/03_u1_as_default_sync.patch:
+ * debian/patches/05_add_start_u1_note.patch:
+ * debian/patches/06_use_ubuntu_sso.patch:
+ - Remove patches to default to Ubuntu One for notes sync. (LP: #1115460)
+
+ -- Rodney Dawes <rodney.dawes at ubuntu.com> Mon, 04 Feb 2013 13:11:52 -0500
+
+tomboy (1.12.0-1ubuntu1) quantal; urgency=low
- -- Robert Ancell <robert.ancell at canonical.com> Tue, 28 Aug 2012 15:18:59 +1200
+ * Rebase on Debian experimental, 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> Tue, 25 Sep 2012 11:01:34 +0100
+
+tomboy (1.12.0-1) experimental; urgency=low
+
+ * [9c1e942] Compress deb data member with xz (Closes: #688706)
+ * [43258af] Imported Upstream version 1.12.0
+ + Translation updates
+
+ -- Iain Lane <laney at debian.org> Tue, 25 Sep 2012 10:40:40 +0100
tomboy (1.11.5-1ubuntu1) quantal; urgency=low
@@ -96,6 +120,12 @@ tomboy (1.10.1-0ubuntu1) precise; urgency=low
-- Sebastien Bacher <seb128 at ubuntu.com> Mon, 16 Apr 2012 21:06:48 +0200
+tomboy (1.10.0-2) unstable; urgency=low
+
+ * [9c1e942] Compress deb data member with xz (Closes: #688706)
+
+ -- Iain Lane <laney at debian.org> Tue, 25 Sep 2012 09:56:42 +0100
+
tomboy (1.10.0-1ubuntu1) precise; urgency=low
* Merge from unstable, remaining changes
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/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/series b/debian/patches/series
index 3321877..639cd77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
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
index e9d3a57..1332826 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,9 @@ override_dh_auto_install:
# disable tests
override_dh_auto_test:
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
+
get-orig-source:
uscan \
--package $(DEB_SOURCE_NAME) \
diff --git a/help/Makefile.in b/help/Makefile.in
index b310749..8252d84 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -39,6 +39,23 @@
################################################################################
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -70,6 +87,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -438,6 +460,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/gnome-doc-utils.make:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -507,10 +530,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/help/pl/advanced.page b/help/pl/advanced.page
index 51a59c3..8441244 100644
--- a/help/pl/advanced.page
+++ b/help/pl/advanced.page
@@ -23,7 +23,7 @@
<section id="template">
- <title>Tworzenie wzorca notatki</title>
+ <title>Tworzenie wzoru notatki</title>
</section>
diff --git a/help/pl/delete-notes.page b/help/pl/delete-notes.page
index da3d3cc..7ea16c0 100644
--- a/help/pl/delete-notes.page
+++ b/help/pl/delete-notes.page
@@ -13,7 +13,7 @@
<email>pcutler at gnome.org</email>
</credit>
<credit type="author copyright">
- <name>GNOME Documentation Project</name>
+ <name>Projekt dokumentacji GNOME</name>
<years>2010</years>
</credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
@@ -24,8 +24,7 @@
<p>Aby usunąć notatkę, należy kliknąć na pasku narzędziowym usuwanej notatki ikonę <gui>Usuń</gui>.</p>
<note style="warning">
- <p>Opcja usunięcia notatki jest nieodwracalna. Nie można odzyskać notatki po jej usunięciu.</p> <p> You will be prompted <gui>Really delete
- this note?</gui> when deleting a note.</p>
+ <p>Opcja usunięcia notatki jest nieodwracalna. Nie można odzyskać notatki po jej usunięciu.</p> <p>Podczas usuwania notatki pojawi się monit potwierdzenia <gui>Na pewno usunąć tę notatkę?</gui>.</p>
</note>
</page>
diff --git a/help/pl/introduction.page b/help/pl/introduction.page
index 50c9c74..fc5ccca 100644
--- a/help/pl/introduction.page
+++ b/help/pl/introduction.page
@@ -28,7 +28,7 @@
<title>Okno programu <gui>Tomboy</gui></title>
<desc>Okno główne programu</desc>
<media type="image" src="figures/tomboy.png" mime="image/png" style="right">
- <p>Domyślna notatka <app>Tomboy</app>.</p>
+ <p>Domyślna notatka programu <app>Tomboy</app>.</p>
</media>
</figure>
diff --git a/help/pl/note-edit-prefs.page b/help/pl/note-edit-prefs.page
index 1d0db77..d1d6567 100644
--- a/help/pl/note-edit-prefs.page
+++ b/help/pl/note-edit-prefs.page
@@ -72,10 +72,10 @@
</section>
<section id="newnotetemplate">
- <title>Tworzenie nowego wzorca notatki</title>
- <p>Użytkownik może tworzyć nowe wzorce notatki przy każdym tworzeniu nowej notatki.</p>
+ <title>Tworzenie nowego wzoru notatki</title>
+ <p>Użytkownik może tworzyć nowe wzory notatki przy każdym tworzeniu nowej notatki.</p>
- <p>Naciśnij przycisk <gui>Otwórz wzorzec nowej notatki</gui> w preferencjach programu na karcie <gui>Modyfikowanie</gui>. Wyświetlony zostanie nowy szablon przypominający notatkę programu. Zamień domyślny tekst w notatce (<gui>"Treść nowej notatki"</gui>) na nowy tekst wzorca. Aby ukończyć tworzenie nowego wzorca, należy zamknąć notatkę. Nowy wzorzec pojawi się każdorazowo przy tworzeniu nowej notatki.</p>
+ <p>Naciśnij przycisk <gui>Otwórz wzór nowej notatki</gui> w preferencjach programu na karcie <gui>Modyfikowanie</gui>. Wyświetlony zostanie nowy szablon przypominający notatkę programu. Zamień domyślny tekst w notatce (<gui>"Treść nowej notatki"</gui>) na nowy tekst wzoru. Aby ukończyć tworzenie nowego wzoru, należy zamknąć notatkę. Nowy wzór pojawi się każdorazowo przy tworzeniu nowej notatki.</p>
</section>
diff --git a/help/pl/pl.po b/help/pl/pl.po
index 0a0567c..5b775bf 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -6,10 +6,10 @@
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
msgid ""
msgstr ""
-"Project-Id-Version: tomboy\n"
-"POT-Creation-Date: 2011-04-04 12:47+0000\n"
-"PO-Revision-Date: 2011-04-04 15:05+0200\n"
-"Last-Translator: js <asiaslowik at gmail.com>\n"
+"Project-Id-Version: tomboy-help\n"
+"POT-Creation-Date: 2012-03-08 22:08+0000\n"
+"PO-Revision-Date: 2012-08-24 18:53+0200\n"
+"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <gnomepl at aviary.pl>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Nowości w programie <app>Tomboy</app>."
#: C/search.page:12(name) C/problems.page:11(name) C/prefs.page:9(name)
#: C/note-edit-prefs.page:11(name) C/introduction.page:12(name)
#: C/index.page:9(name) C/hotkeys.page:11(name) C/edit-note.page:13(name)
-#: C/delete-notes.page:13(name) C/create-note.page:13(name)
+#: C/delete-notes.page:14(name) C/create-note.page:13(name)
#: C/create-notebook.page:13(name) C/advanced.page:11(name)
#: C/addins-tools.page:10(name) C/addins-sync.page:10(name)
#: C/addins.page:11(name) C/addins-formatting.page:10(name)
@@ -40,7 +40,7 @@ msgstr "Paul Cutler"
#: C/search.page:13(email) C/problems.page:12(email) C/prefs.page:10(email)
#: C/note-edit-prefs.page:12(email) C/introduction.page:13(email)
#: C/index.page:10(email) C/hotkeys.page:12(email) C/edit-note.page:14(email)
-#: C/delete-notes.page:14(email) C/create-note.page:14(email)
+#: C/delete-notes.page:15(email) C/create-note.page:14(email)
#: C/create-notebook.page:14(email) C/advanced.page:12(email)
#: C/addins-tools.page:11(email) C/addins-sync.page:11(email)
#: C/addins.page:12(email) C/addins-formatting.page:11(email)
@@ -90,17 +90,25 @@ msgstr ""
#: C/sync-setup.page:8(desc)
msgid "Configure Tomboy to synchronize your notes."
-msgstr "Konfiguracja synchronizacji notatek"
+msgstr "Konfiguracja synchronizacji notatek."
-#: C/sync-setup.page:23(title)
+#: C/sync-setup.page:15(name) C/delete-notes.page:18(name)
+msgid "GNOME Documentation Project"
+msgstr "Projekt dokumentacji GNOME"
+
+#: C/sync-setup.page:16(years)
+msgid "2010-2012"
+msgstr "2010-2012"
+
+#: C/sync-setup.page:21(title)
msgid "Configure and Setup Sync"
msgstr "Konfiguracja synchronizacji"
-#: C/sync-setup.page:27(title)
+#: C/sync-setup.page:25(title)
msgid "Enable Sync"
msgstr "Włączanie synchronizacji"
-#: C/sync-setup.page:29(p)
+#: C/sync-setup.page:27(p)
msgid ""
"<app>Tomboy</app> can synchronize your notes between multiple computers. "
"This allows you to have a backup of your notes on another computer or to "
@@ -111,7 +119,7 @@ msgstr ""
"notatek na innych komputerach lub udostępnianie notatek pomiędzy "
"komputerami, co pozwala na szybszy i łatwiejszy dostęp do notatek."
-#: C/sync-setup.page:35(p) C/sync.page:54(p)
+#: C/sync-setup.page:33(p) C/sync.page:54(p)
msgid ""
"You can enable sync by opening <gui>Tomboy Preferences</gui> by using your "
"mouse to right click on the Tomboy icon in your panel, taskbar or dock and "
@@ -129,11 +137,11 @@ msgstr ""
"notatek\"</gui>, wybierając opcję <guiseq><gui>Edycja</gui><gui>Preferencje</"
"gui></guiseq>."
-#: C/sync-setup.page:48(title)
+#: C/sync-setup.page:46(title)
msgid "Managing Note Conflict"
msgstr "Rozwiązywanie konfliktu notatek"
-#: C/sync-setup.page:50(p)
+#: C/sync-setup.page:48(p)
msgid ""
"You can set the default behavior for Tomboy when a note is discovered to be "
"a conflict. This can occur when notes are not synced on a regular basis."
@@ -142,7 +150,7 @@ msgstr ""
"pomiędzy notatkami. Konflikt może wystąpić, gdy notatki nie są regularnie "
"synchronizowane."
-#: C/sync-setup.page:55(p)
+#: C/sync-setup.page:53(p)
msgid ""
"In the <gui>Preferences</gui> dialog press the <gui>Advanced</gui> button. "
"You can select from three choices as the default behavior in managing "
@@ -152,7 +160,7 @@ msgstr ""
"Można zaznaczyć jedną z trzech opcji domyślnego zachowania programu w "
"rozwiązywaniu konfliktu notatek:"
-#: C/sync-setup.page:61(p)
+#: C/sync-setup.page:59(p)
msgid ""
"<gui>Always ask me what to do.</gui> This is the default choice and when "
"Tomboy encounters a conflict Tomboy will always prompt you to ask you if you "
@@ -164,7 +172,7 @@ msgstr ""
"chce zmienić nazwę lokalnej notatki lub zastąpić lokalną notatkę notatką "
"przechowywaną na serwerze."
-#: C/sync-setup.page:66(p)
+#: C/sync-setup.page:64(p)
msgid ""
"<gui>Rename my local note.</gui> If this option is selected, Tomboy will "
"automatically replace the note with a copy from the remote computer and "
@@ -176,10 +184,10 @@ msgstr ""
"nazwa lokalnej notatki zostanie zmieniona, zachowując informacje wprowadzone "
"przez użytkownika."
-#: C/sync-setup.page:72(p)
+#: C/sync-setup.page:70(p)
msgid ""
-"<gui>Replace my local note with the server's update. </gui>. If you have "
-"selected this option, when you sync Tomboy will overwrite and replace your "
+"<gui>Replace my local note with the server's update.</gui> If you have "
+"selected this option, when you sync, Tomboy will overwrite and replace your "
"note stored on your computer with a copy from the remote computer."
msgstr ""
"<gui>Zastąp kopię lokalną aktualizacją z serwera.</gui> Jeśli ta opcja "
@@ -187,7 +195,7 @@ msgstr ""
"komputerze użytkownika zostanie nadpisana i zastąpiona notatką z komputera "
"zdalnego."
-#: C/sync-setup.page:78(p)
+#: C/sync-setup.page:76(p)
msgid ""
"Automatically overwriting the note is permanent. Your local note will be "
"replaced by the copy on the remote computer and you will lose your "
@@ -197,11 +205,11 @@ msgstr ""
"zostanie zastąpiona kopią notatki z komputera zdalnego, a użytkownik utraci "
"informacje wprowadzone przed synchronizacją."
-#: C/sync-setup.page:91(title)
+#: C/sync-setup.page:90(title)
msgid "Configure Sync using WebDav"
msgstr "Konfiguracja synchronizacji przy użyciu protokołu WebDav "
-#: C/sync-setup.page:93(p)
+#: C/sync-setup.page:92(p)
msgid ""
"In order to synchronize your notes with a WebDAV server, you will need the "
"wdfs FUSE file system installed. Follow the documentation for your operating "
@@ -214,7 +222,7 @@ msgstr ""
"posiadanego systemu operacyjnego. Program \"Baza kluczy GNOME\" również musi "
"być zainstalowany."
-#: C/sync-setup.page:99(p)
+#: C/sync-setup.page:98(p)
msgid ""
"Choose <gui>WebDAV</gui> from the <gui>Service</gui> drop-down list. Fill in "
"the connection information for your server, and then select the <gui>Save</"
@@ -225,27 +233,27 @@ msgstr ""
"kliknąć przycisk <gui>Zapisz</gui>. Program jest gotowy do synchronizacji "
"notatek."
-#: C/sync-setup.page:108(title)
+#: C/sync-setup.page:107(title)
msgid "Configure Sync using SSH"
msgstr "Konfiguracja synchronizacji przy użyciu protokołu SSH"
-#: C/sync-setup.page:110(p)
+#: C/sync-setup.page:109(p)
msgid ""
"In order to synchronize your notes with an SSH server, you will need the "
"FUSE file system, also called <app>sshfs</app> installed. Follow the "
"documentation for your operating system to set up FUSE for your user. You "
"will also need an SSH key for your SSH server account that can be provided "
-"by the <app>GNOME Seahorse</app> application, which is also known as "
+"by the <app>Seahorse</app> application, which is also known as "
"<app>Passwords and Encryption Keys</app>."
msgstr ""
"Aby synchronizować notatki z serwerem SSH, w systemie powinien być "
"zainstalowany system plików sshfs FUSE. Aby go skonfigurować, należy "
"postępować zgodnie ze wskazówkami zawartymi w dokumentacji posiadanego "
"systemu operacyjnego. Potrzebny jest również klucz SSH do konta na serwerze "
-"SSH. Klucz można otrzymać w programie <app>GNOME Seahorse</app> (<app>Hasła "
-"i klucze szyfrujące</app>)."
+"SSH. Klucz można otrzymać w programie <app>Seahorse</app> (<app>Hasła i "
+"klucze</app>)."
-#: C/sync-setup.page:118(p)
+#: C/sync-setup.page:117(p)
msgid ""
"It is recommended to use a third computer or server as the remote computer "
"to store the synchronized notes that are to be synced between multiple "
@@ -255,7 +263,7 @@ msgstr ""
"przechowywania synchronizowanych notatek, które mają być synchronizowane "
"pomiędzy wieloma komputerami."
-#: C/sync-setup.page:122(p)
+#: C/sync-setup.page:121(p)
msgid ""
"Open <app>Passwords and Encryption Keys</app> by choosing "
"<guiseq><gui>Applications</gui><gui>Accessories</gui><gui>Passwords and "
@@ -276,7 +284,7 @@ msgstr ""
"prośbą o podanie hasła należy je wprowadzić. Konfiguracja klucza została "
"zakończona."
-#: C/sync-setup.page:134(p)
+#: C/sync-setup.page:133(p)
msgid ""
"In Tomboy, choose <gui>SSH</gui> from the <gui>Service</gui> drop-down list. "
"Fill in the connection information for your server, and select the "
@@ -289,11 +297,11 @@ msgstr ""
"powinno wskazywać na pusty katalog. Program jest gotowy do synchronizacji "
"notatek."
-#: C/sync-setup.page:144(title)
+#: C/sync-setup.page:143(title)
msgid "Configure Sync to a local folder"
msgstr "Konfiguracja synchronizacji do katalogu lokalnego"
-#: C/sync-setup.page:146(p)
+#: C/sync-setup.page:145(p)
msgid ""
"You may want to synchronize your notes to a local folder if that folder is "
"available to your other systems, or if that folder represents a local mount "
@@ -303,7 +311,7 @@ msgstr ""
"lokalnego, jeśli jest on udostępniany w innych systemach operacyjnych, lub "
"jeśli jest to lokalnie zamontowany katalog zdalnego serwera."
-#: C/sync-setup.page:151(p)
+#: C/sync-setup.page:150(p)
msgid ""
"Choose Local Folder from the <gui>Service</gui> drop-down list. Choose the "
"desired synchronization <gui>Folder Path</gui> and then click the <gui>Save</"
@@ -657,14 +665,14 @@ msgstr ""
#: C/note-edit-prefs.page:122(title)
msgid "Create a New Note Template"
-msgstr "Tworzenie nowego wzorca notatki"
+msgstr "Tworzenie nowego wzoru notatki"
#: C/note-edit-prefs.page:123(p)
msgid ""
"You can create a new template that is displayed every time you create a new "
"note."
msgstr ""
-"Użytkownik może tworzyć nowe wzorce notatki przy każdym tworzeniu nowej "
+"Użytkownik może tworzyć nowe wzory notatki przy każdym tworzeniu nowej "
"notatki."
#: C/note-edit-prefs.page:126(p)
@@ -676,11 +684,11 @@ msgid ""
"the note to complete creating a new template. Each time you create a new "
"note that template will be displayed in the new note."
msgstr ""
-"Naciśnij przycisk <gui>Otwórz wzorzec nowej notatki</gui> w preferencjach "
+"Naciśnij przycisk <gui>Otwórz wzór nowej notatki</gui> w preferencjach "
"programu na karcie <gui>Modyfikowanie</gui>. Wyświetlony zostanie nowy "
"szablon przypominający notatkę programu. Zamień domyślny tekst w notatce "
-"(<gui>\"Treść nowej notatki\"</gui>) na nowy tekst wzorca. Aby ukończyć "
-"tworzenie nowego wzorca, należy zamknąć notatkę. Nowy wzorzec pojawi się "
+"(<gui>\"Treść nowej notatki\"</gui>) na nowy tekst wzoru. Aby ukończyć "
+"tworzenie nowego wzoru, należy zamknąć notatkę. Nowy wzór pojawi się "
"każdorazowo przy tworzeniu nowej notatki."
#. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -738,7 +746,7 @@ msgstr "Okno główne programu"
#: C/introduction.page:45(p)
msgid "<app>Tomboy</app> default note."
-msgstr "Domyślna notatka <app>Tomboy</app>."
+msgstr "Domyślna notatka programu <app>Tomboy</app>."
#: C/index.page:21(title)
msgid "Tomboy Notes"
@@ -957,11 +965,15 @@ msgstr ""
msgid "Delete a note in Tomboy."
msgstr "Usuwanie notatek."
-#: C/delete-notes.page:25(title)
+#: C/delete-notes.page:19(years)
+msgid "2010"
+msgstr "2010"
+
+#: C/delete-notes.page:24(title)
msgid "Delete a note"
msgstr "Usuwanie notatki"
-#: C/delete-notes.page:27(p)
+#: C/delete-notes.page:26(p)
msgid ""
"You can delete a note by pressing the <gui>Delete</gui> icon in the toolbar "
"of the note you wish to delete."
@@ -969,23 +981,20 @@ msgstr ""
"Aby usunąć notatkę, należy kliknąć na pasku narzędziowym usuwanej notatki "
"ikonę <gui>Usuń</gui>."
-#: C/delete-notes.page:31(p)
+#: C/delete-notes.page:30(p)
msgid ""
"Deleting a note is permanent. After deletion, the note is not recoverable."
msgstr ""
"Opcja usunięcia notatki jest nieodwracalna. Nie można odzyskać notatki po "
"jej usunięciu."
-#: C/delete-notes.page:32(gui)
-msgid "Really delete this note?"
-msgstr "Na pewno usunąć notatkę?"
-
-#: C/delete-notes.page:30(note)
+#: C/delete-notes.page:31(p)
msgid ""
-"<placeholder-1/> You will be prompted <placeholder-2/> when deleting a note."
+"You will be prompted <gui>Really delete this note?</gui> when deleting a "
+"note."
msgstr ""
-"<placeholder-1> Podczas usuwania notatki pojawi się monit potwierdzenia "
-"<placeholder-2/>."
+"Podczas usuwania notatki pojawi się monit potwierdzenia <gui>Na pewno usunąć "
+"tę notatkę?</gui>."
#: C/create-note.page:10(desc)
msgid "Create a new note in Tomboy."
@@ -1099,7 +1108,7 @@ msgstr "Działania zaawansowane"
#: C/advanced.page:27(title)
msgid "Creating a Note Template"
-msgstr "Tworzenie wzorca notatki"
+msgstr "Tworzenie wzoru notatki"
#: C/advanced.page:33(title)
msgid "Tomboy Notes Location"
@@ -1431,7 +1440,7 @@ msgstr ""
#: C/index.page:0(None)
msgid "translator-credits"
msgstr ""
-"Aviary.pl <gnomepl at aviary.pl>, 2008, 2009, 2011\n"
+"Aviary.pl <gnomepl at aviary.pl>, 2008, 2009, 2011, 2012\n"
"Joanna Mazgaj <jmazgaj at aviary.pl>, 2008\n"
"Aleksander Łukasiewicz <aleksander at lukasiewicz.org>, 2009\n"
"Asia Słowik <asiaslowik at gmail.com>, 2011"
diff --git a/help/pl/sync-setup.page b/help/pl/sync-setup.page
index 491d9b5..7fd85c9 100644
--- a/help/pl/sync-setup.page
+++ b/help/pl/sync-setup.page
@@ -3,14 +3,14 @@
<info>
<link type="guide" xref="index#sync"/>
- <desc>Konfiguracja synchronizacji notatek</desc>
+ <desc>Konfiguracja synchronizacji notatek.</desc>
<revision pkgversion="3.0" version="0.1" date="2010-05-29" status="candidate"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
<credit type="author copyright">
- <name>GNOME Documentation Project</name>
+ <name>Projekt dokumentacji GNOME</name>
<years>2010-2012</years>
</credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
@@ -41,10 +41,7 @@
<item><p><gui>Zmień nazwę notatki lokalnej.</gui> Jeśli ta opcja zostanie zaznaczona, notatka zostanie automatycznie zastąpiona kopią z komputera zdalnego, a nazwa lokalnej notatki zostanie zmieniona, zachowując informacje wprowadzone przez użytkownika.</p>
</item>
- <item><p><gui>Replace my local note with the server's update.</gui>
- If you have selected this option, when you sync,
- Tomboy will overwrite and replace your note stored on your
- computer with a copy from the remote computer.</p>
+ <item><p><gui>Zastąp kopię lokalną aktualizacją z serwera.</gui> Jeśli ta opcja zostanie zaznaczona, w czasie synchronizacji notatka przechowywana w komputerze użytkownika zostanie nadpisana i zastąpiona notatką z komputera zdalnego.</p>
<note style="warning">
<p>Opcja automatycznego nadpisania notatki jest nieodwracalna. Notatka lokalna zostanie zastąpiona kopią notatki z komputera zdalnego, a użytkownik utraci informacje wprowadzone przed synchronizacją.</p>
@@ -70,13 +67,7 @@
<title>Konfiguracja synchronizacji przy użyciu protokołu SSH</title>
- <p>In order to synchronize your notes with an SSH server, you will need
- the FUSE file system, also called <app>sshfs</app> installed. Follow the
- documentation for your operating system to set up FUSE for your user.
- You will also need an SSH key for your SSH server account that can be
- provided by the <app>Seahorse</app> application, which is also known as
- <app>Passwords and Encryption Keys</app>.
- </p>
+ <p>Aby synchronizować notatki z serwerem SSH, w systemie powinien być zainstalowany system plików sshfs FUSE. Aby go skonfigurować, należy postępować zgodnie ze wskazówkami zawartymi w dokumentacji posiadanego systemu operacyjnego. Potrzebny jest również klucz SSH do konta na serwerze SSH. Klucz można otrzymać w programie <app>Seahorse</app> (<app>Hasła i klucze</app>).</p>
<p>Zaleca się używanie innego komputera lub serwera jako zdalnego komputera do przechowywania synchronizowanych notatek, które mają być synchronizowane pomiędzy wieloma komputerami.</p>
diff --git a/libtomboy/Makefile.in b/libtomboy/Makefile.in
index 7305163..9e6bb98 100644
--- a/libtomboy/Makefile.in
+++ b/libtomboy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -65,6 +82,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(tomboylibdir)"
LTLIBRARIES = $(tomboylib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -91,6 +114,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libtomboy_la_SOURCES)
DIST_SOURCES = $(libtomboy_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -342,7 +370,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-tomboylibLTLIBRARIES: $(tomboylib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(tomboylibdir)" || $(MKDIR_P) "$(DESTDIR)$(tomboylibdir)"
@list='$(tomboylib_LTLIBRARIES)'; test -n "$(tomboylibdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -350,6 +377,8 @@ install-tomboylibLTLIBRARIES: $(tomboylib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(tomboylibdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(tomboylibdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(tomboylibdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(tomboylibdir)"; \
}
@@ -371,7 +400,7 @@ clean-tomboylibLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libtomboy.la: $(libtomboy_la_OBJECTS) $(libtomboy_la_DEPENDENCIES)
+libtomboy.la: $(libtomboy_la_OBJECTS) $(libtomboy_la_DEPENDENCIES) $(EXTRA_libtomboy_la_DEPENDENCIES)
$(libtomboy_la_LINK) -rpath $(tomboylibdir) $(libtomboy_la_OBJECTS) $(libtomboy_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -531,10 +560,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/po/en_GB.po b/po/en_GB.po
index d52fd88..451d18a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,149 +4,96 @@
# David Lodge <dave at cirt.net>, 2004, 2009.
# Philip Withnall <philip at tecnocode.co.uk>, 2009, 2010.
# Bruce Cowan <bruce at bcowan.me.uk>, 2010, 2011.
+# Chris Leonard <cjl at laptop.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-07 16:42+0100\n"
-"PO-Revision-Date: 2011-09-07 16:45+0100\n"
-"Last-Translator: Bruce Cowan <bruce at bcowan.me.uk>\n"
-"Language-Team: British English <en at li.org>\n"
+"POT-Creation-Date: 2012-09-01 00:50+0100\n"
+"PO-Revision-Date: 2012-08-29 02:25-0400\n"
+"Last-Translator: Chris Leonard <cjl at laptop.org>\n"
+"Language-Team: Sugar Labs\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1-beta1\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "Accessories"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "Simple and easy to use note-taking"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
msgid "Tomboy Applet Factory"
msgstr "Tomboy Applet Factory"
-#: ../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 Notes"
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Simple and easy to use note-taking"
+msgstr "Simple and easy to use note-taking"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+msgid "Accessories"
+msgstr "Accessories"
+
#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "S_ynchronise Notes"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "_About"
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "_Preferences"
#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "_Help"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "_Preferences"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "Note-taker"
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "_About"
#: ../data/tomboy.desktop.in.h:2
msgid "Take notes, link ideas, and stay organized"
msgstr "Take notes, link ideas, and stay organised"
+#: ../data/tomboy.desktop.in.h:3
+msgid "Note-taker"
+msgstr "Note-taker"
+
#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "Accept SSL Certificates"
+msgid "Enable spellchecking"
+msgstr "Enable spellchecking"
#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "Automatic Background Synchronisation Timeout"
-
-#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "Create a new Note"
-
-#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "Custom Font Face"
-
-#: ../data/tomboy.schemas.in.h:5
-msgid ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
-
-#: ../data/tomboy.schemas.in.h:6
msgid ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
msgstr ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
-#: ../data/tomboy.schemas.in.h:7
-msgid ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
+#: ../data/tomboy.schemas.in.h:3
+msgid "Enable WikiWord highlighting"
+msgstr "Enable WikiWord highlighting"
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:4
msgid ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
msgstr ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
-
-#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Enable Middle-Click Paste On Icon."
-
-#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "Enable Tray Icon"
-
-#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "Enable WikiWord highlighting"
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:5
msgid "Enable automatic bulleted lists."
msgstr "Enable automatic bulleted lists."
-#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Enable closing notes with escape."
-
-#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "Enable custom font"
-
-#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "Enable global keybindings"
-
-#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "Enable spellchecking"
-
-#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "Enable startup notes"
-
-#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Enable the Delete Note confirmation dialogue"
-
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:6
msgid ""
"Enable this option if you want bulleted lists to be automatic when you place "
"- or * at the beginning of a line."
@@ -154,7 +101,11 @@ msgstr ""
"Enable this option if you want bulleted lists to be automatic when you place "
"- or * at the beginning of a line."
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:7
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Enable Middle-Click Paste On Icon."
+
+#: ../data/tomboy.schemas.in.h:8
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."
@@ -162,33 +113,23 @@ msgstr ""
"Enable this option if you want to be able to middle-click the Tomboy icon to "
"paste timestamped content into the Start Here note."
-#: ../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 ""
-"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-"will create a note with that name."
-
-#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "FUSE Mounting Timeout (ms)"
-
-#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "HTML Export All Linked Notes"
-
-#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "HTML Export Linked Notes"
+#: ../data/tomboy.schemas.in.h:9
+msgid "Enable custom font"
+msgstr "Enable custom font"
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:10
msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+"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 ""
-"If disabled, the \"Delete Note\" confirmation dialogue will be suppressed."
+"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."
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:11
+msgid "Custom Font Face"
+msgstr "Custom Font Face"
+
+#: ../data/tomboy.schemas.in.h:12
msgid ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
@@ -196,19 +137,35 @@ msgstr ""
"If enable_custom_font is true, the font name set here will be used as the "
"font when displaying notes."
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:13
+msgid "Enable global keybindings"
+msgstr "Enable global keybindings"
+
+#: ../data/tomboy.schemas.in.h:14
msgid ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
+"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 ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
+"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."
-#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "If enabled, an opened note can be closed by hitting the escape key."
+#: ../data/tomboy.schemas.in.h:15
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Enable the Delete Note confirmation dialogue"
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:16
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"If disabled, the \"Delete Note\" confirmation dialogue will be suppressed."
+
+#: ../data/tomboy.schemas.in.h:17
+msgid "Enable Tray Icon"
+msgstr "Enable Tray Icon"
+
+#: ../data/tomboy.schemas.in.h:18
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 "
@@ -218,41 +175,25 @@ msgstr ""
"Disabling this may be useful when another application is providing the "
"functionality of the tray icon."
-#: ../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 ""
-"If true, misspellings will be underlined in red, and correct spelling "
-"suggestions shown in the right-click menu."
-
-#: ../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 ""
-"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."
+#: ../data/tomboy.schemas.in.h:19
+msgid "Start Here Note"
+msgstr "Start Here Note"
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:20
msgid ""
-"If true, the font name set in custom_font_face will be used as the font when "
-"displaying notes. Otherwise the desktop default font will be used."
+"The note URI of the note that should be considered the \"Start Here\" note, "
+"which is always placed at the bottom of the Tomboy note menu and also "
+"accessible by hotkey."
msgstr ""
-"If true, the font name set in custom_font_face will be used as the font when "
-"displaying notes. Otherwise the desktop default font will be used."
+"The note URI of the note that should be considered the \"Start Here\" note, "
+"which is always placed at the bottom of the Tomboy note menu and also "
+"accessible by hotkey."
-#: ../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 ""
-"Indicates that the Sticky Note Importer plugin has not been run, so it "
-"should run automatically the next time Tomboy starts."
+#: ../data/tomboy.schemas.in.h:21
+msgid "Minimum number of notes to show in menu"
+msgstr "Minimum number of notes to show in menu"
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:22
msgid ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
@@ -260,63 +201,23 @@ msgstr ""
"Integer determining the minimum number of notes to show in the Tomboy note "
"menu."
-#: ../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 ""
-"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."
-
-#: ../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 ""
-"Integer value indicating if there is a preference to always perform a "
-"specific behaviour 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."
+#: ../data/tomboy.schemas.in.h:23
+msgid "List of pinned notes."
+msgstr "List of pinned notes."
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:24
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."
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
msgstr ""
-"Integer value indicating if there is a preference to always perform a "
-"specific link updating behaviour 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."
-
-#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "Last Directory used in HTML Export"
-
-#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr "Link Updating Behaviour on Note Rename"
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
-#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "List of pinned notes."
+#: ../data/tomboy.schemas.in.h:25
+msgid "Maximum note title length to show in tray menu."
+msgstr "Maximum note title length to show in tray menu."
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:26
msgid ""
"Maximum characters of note title to show in the Tomboy tray or panel applet "
"note menu."
@@ -324,107 +225,63 @@ msgstr ""
"Maximum characters of note title to show in the Tomboy tray or panel applet "
"note menu."
-#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr "Maximum note title length to show in tray menu."
-
-#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "Minimum number of notes to show in menu"
-
-#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "Note Synchronisation Conflict Saved Behaviour"
-
-#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "Open Recent Changes"
-
-#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "Open Search Dialogue"
-
-#: ../data/tomboy.schemas.in.h:47
-msgid "Open Start Here"
-msgstr "Open Start Here"
-
-#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr "Path on SSH server to Tomboy synchronisation directory (optional)."
+#: ../data/tomboy.schemas.in.h:27
+msgid "Enable startup notes"
+msgstr "Enable startup notes"
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:28
msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
msgstr ""
-"Path to the synchronisation server when using the filesystem synchronisation "
-"service addin."
-
-#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "SSHFS Remote Synchronisation Folder"
-
-#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "SSHFS Remote Synchronisation User Name"
-
-#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "SSHFS Synchronisation Server Port"
-
-#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "SSHFS Synchronisation Server URL"
-
-#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr "Saved height of \"Search All Notes\" window"
-
-#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Saved horizontal position of \"Search All Notes\" window"
-
-#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Saved vertical position of \"Search All Notes\" window"
-
-#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "Saved width of \"Search All Notes\" window"
-
-#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "Selected Synchronisation Service Addin"
-
-#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "Set to TRUE to activate"
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:29
msgid "Show applet menu"
msgstr "Show applet menu"
-#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "Start Here Note"
-
-#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "Sticky Note Importer First Run"
+#: ../data/tomboy.schemas.in.h:30
+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 ""
+"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."
-#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "Synchronisation Client ID"
+#: ../data/tomboy.schemas.in.h:31
+msgid "Open Start Here"
+msgstr "Open Start Here"
-#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "Synchronisation Local Server Path"
+#: ../data/tomboy.schemas.in.h:32
+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 ""
+"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."
-#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "The date format that is used for the timestamp."
+#: ../data/tomboy.schemas.in.h:33
+msgid "Create a new Note"
+msgstr "Create a new Note"
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:34
msgid ""
"The global keybinding for creating and displaying a new Note. The format "
"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -440,38 +297,31 @@ msgstr ""
"option to the special string \"disabled\", then there will be no keybinding "
"for this action."
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:35
+msgid "Open Search Dialog"
+msgstr "Open Search Dialogue"
+
+#: ../data/tomboy.schemas.in.h:36
msgid ""
-"The global keybinding for opening the \"Start Here\" note. The format looks "
+"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 ""
-"The global keybinding for opening the \"Start Here\" note. The format looks "
+"The global keybinding for opening the Note Search dialogue. 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."
-#: ../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 ""
-"The global keybinding for opening the Note Search dialogue. 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."
+#: ../data/tomboy.schemas.in.h:37
+msgid "Open Recent Changes"
+msgstr "Open Recent Changes"
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:38
msgid ""
"The global keybinding for opening the Recent Changes dialog. The format "
"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -487,33 +337,67 @@ msgstr ""
"option to the special string \"disabled\", then there will be no keybinding "
"for this action."
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:39
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Saved height of \"Search All Notes\" window"
+
+#: ../data/tomboy.schemas.in.h:40
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."
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+
+#: ../data/tomboy.schemas.in.h:41
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Saved width of \"Search All Notes\" window"
+
+#: ../data/tomboy.schemas.in.h:42
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+
+#: ../data/tomboy.schemas.in.h:43
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Saved horizontal position of \"Search All Notes\" window"
+
+#: ../data/tomboy.schemas.in.h:44
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+
+#: ../data/tomboy.schemas.in.h:45
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Saved vertical position of \"Search All Notes\" window"
+
+#: ../data/tomboy.schemas.in.h:46
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
msgstr ""
-"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."
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
-#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "The handler for \"note://\" URLs"
+#: ../data/tomboy.schemas.in.h:47
+msgid "Last Directory used in HTML Export"
+msgstr "Last Directory used in HTML Export"
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:48
msgid ""
"The last directory a note was exported to using the Export To HTML plugin."
msgstr ""
"The last directory a note was exported to using the Export To HTML plugin."
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:49
+msgid "HTML Export Linked Notes"
+msgstr "HTML Export Linked Notes"
+
+#: ../data/tomboy.schemas.in.h:50
msgid ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
@@ -521,7 +405,11 @@ msgstr ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:51
+msgid "HTML Export All Linked Notes"
+msgstr "HTML Export All Linked Notes"
+
+#: ../data/tomboy.schemas.in.h:52
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 "
@@ -533,25 +421,59 @@ msgstr ""
"Export Linked Notes' setting and is used to specify whether all notes (found "
"recursively) should be included during an export to HTML."
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:53
+msgid "Sticky Note Importer First Run"
+msgstr "Sticky Note Importer First Run"
+
+#: ../data/tomboy.schemas.in.h:54
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."
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
msgstr ""
-"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."
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:55
+msgid "Synchronization Client ID"
+msgstr "Synchronisation Client ID"
+
+#: ../data/tomboy.schemas.in.h:56
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."
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
msgstr ""
-"The port to use when connecting to the synchronisation server via SSH. Set "
-"to -1 or less if default SSH port settings should be used instead."
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronisation server."
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:57
+msgid "Synchronization Local Server Path"
+msgstr "Synchronisation Local Server Path"
+
+#: ../data/tomboy.schemas.in.h:58
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Path to the synchronisation server when using the filesystem synchronisation "
+"service addin."
+
+#: ../data/tomboy.schemas.in.h:59
+msgid "Selected Synchronization Service Addin"
+msgstr "Selected Synchronisation Service Addin"
+
+#: ../data/tomboy.schemas.in.h:60
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Unique identifier for the currently configured note synchronisation service "
+"addin."
+
+#: ../data/tomboy.schemas.in.h:61
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "FUSE Mounting Timeout (ms)"
+
+#: ../data/tomboy.schemas.in.h:62
msgid ""
"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
"mount a sync share."
@@ -559,31 +481,48 @@ msgstr ""
"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
"mount a synchronisation share."
-#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "Timestamp format"
+#: ../data/tomboy.schemas.in.h:63
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "SSHFS Remote Synchronisation Folder"
-#: ../data/tomboy.schemas.in.h:79
+#: ../data/tomboy.schemas.in.h:64
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "Path on SSH server to Tomboy synchronisation directory (optional)."
+
+#: ../data/tomboy.schemas.in.h:65
+msgid "SSHFS Synchronization Server URL"
+msgstr "SSHFS Synchronisation Server URL"
+
+#: ../data/tomboy.schemas.in.h:66
msgid "URL of SSH server containing Tomboy synchronization directory."
msgstr "URL of SSH server containing Tomboy synchronisation directory."
-#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
+#: ../data/tomboy.schemas.in.h:67
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "SSHFS Remote Synchronisation User Name"
+
+#: ../data/tomboy.schemas.in.h:68
+msgid "User name to use when connecting to the synchronization server via SSH."
msgstr ""
-"Unique identifier for the currently configured note synchronisation service "
-"addin."
+"User name to use when connecting to the synchronisation server via SSH."
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:69
+msgid "SSHFS Synchronization Server Port"
+msgstr "SSHFS Synchronisation Server Port"
+
+#: ../data/tomboy.schemas.in.h:70
msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
+"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 ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronisation server."
+"The port to use when connecting to the synchronisation server via SSH. Set "
+"to -1 or less if default SSH port settings should be used instead."
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:71
+msgid "Accept SSL Certificates"
+msgstr "Accept SSL Certificates"
+
+#: ../data/tomboy.schemas.in.h:72
msgid ""
"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
"user."
@@ -591,18 +530,85 @@ msgstr ""
"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
"user."
-#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
+#: ../data/tomboy.schemas.in.h:73
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "Note Synchronisation Conflict Saved Behaviour"
+
+#: ../data/tomboy.schemas.in.h:74
+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 ""
-"User name to use when connecting to the synchronisation server via SSH."
+"Integer value indicating if there is a preference to always perform a "
+"specific behaviour 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."
-#: ../data/tomboy.schemas.in.h:84
+#: ../data/tomboy.schemas.in.h:75
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Automatic Background Synchronisation Timeout"
+
+#: ../data/tomboy.schemas.in.h:76
msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
+"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 ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
+"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."
+
+#: ../data/tomboy.schemas.in.h:77
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Link Updating Behaviour on Note Rename"
+
+#: ../data/tomboy.schemas.in.h:78
+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 ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behaviour 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."
+
+#: ../data/tomboy.schemas.in.h:79
+msgid "Timestamp format"
+msgstr "Timestamp format"
+
+#: ../data/tomboy.schemas.in.h:80
+msgid "The date format that is used for the timestamp."
+msgstr "The date format that is used for the timestamp."
+
+#: ../data/tomboy.schemas.in.h:81
+msgid "Enable closing notes with escape."
+msgstr "Enable closing notes with escape."
+
+#: ../data/tomboy.schemas.in.h:82
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr "If enabled, an opened note can be closed by hitting the escape key."
+
+#: ../data/tomboy.schemas.in.h:83
+msgid "The handler for \"note://\" URLs"
+msgstr "The handler for \"note://\" URLs"
+
+#: ../data/tomboy.schemas.in.h:84
+msgid "Set to TRUE to activate"
+msgstr "Set to TRUE to activate"
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -790,14 +796,14 @@ msgid "Note exported successfully"
msgstr "Note exported successfully"
#: ../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 "Access denied."
#: ../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 "Folder does not exist."
@@ -848,7 +854,7 @@ msgstr "Insert Timestamp"
#. 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 "dddd, d MMMM, HH:mm"
@@ -917,10 +923,20 @@ msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd/MM/yyyy, HH:mm:ss"
#. Adding menu item when note is opened and window created
-#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:31
msgid "Remove broken links"
msgstr "Remove broken links"
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:42
+#: ../Tomboy/ExportAllApplicationAddin.cs:70
+#: ../Tomboy/Synchronization/SyncManager.cs:162
+msgid "_Tools"
+msgstr "_Tools"
+
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:44
+msgid "_Remove broken links"
+msgstr "_Remove broken links"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Add a sketch"
@@ -1105,96 +1121,98 @@ msgstr "Set the default browser and try again"
msgid "Tomboy Web"
msgstr "Tomboy Web"
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
#, csharp-format
msgid "Export All Notes to {0}"
msgstr "Export All Notes to {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
#, csharp-format
msgid "Start exporting notes to {0}"
msgstr "Start exporting notes to {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#: ../Tomboy/ExportAllApplicationAddin.cs:63
#, csharp-format
msgid "Export selected notebook to {0}"
msgstr "Export selected notebook to {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#: ../Tomboy/ExportAllApplicationAddin.cs:64
#, csharp-format
msgid "Start exporting notebook to {0}"
msgstr "Start exporting notebook to {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Tools"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#: ../Tomboy/ExportAllApplicationAddin.cs:73
msgid "Export"
msgstr "Export"
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#: ../Tomboy/ExportAllApplicationAddin.cs:74
msgid "Export your notes."
msgstr "Export your notes."
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
#, csharp-format
msgid "Export All Notes To {0}"
msgstr "Export All Notes To {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#: ../Tomboy/ExportAllApplicationAddin.cs:82
#, csharp-format
msgid "Export Selected Notebook To {0}"
msgstr "Export Selected Notebook To {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:153
-#, csharp-format
-msgid "All Notes {0} Export"
-msgstr "All Notes {0} Export"
-
-#: ../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 "Could not export, access denied."
-#: ../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 "Could not export, folder does not exist."
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#: ../Tomboy/ExportAllApplicationAddin.cs:175
+msgid "Could not export, error with the path. (No ending \"?)"
+msgstr "Could not export, error with the path. (No ending \"?)"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:177
+#: ../Tomboy/ExportAllApplicationAddin.cs:258
+#: ../Tomboy/ExportAllApplicationAddin.cs:336
#, csharp-format
msgid "Could not export: {0}"
msgstr "Could not export: {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
+#: ../Tomboy/ExportAllApplicationAddin.cs:231
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "All Notes {0} Export"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:260
+#: ../Tomboy/ExportAllApplicationAddin.cs:338
msgid "Unknown error."
msgstr "Unknown error."
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:237
+#: ../Tomboy/ExportAllApplicationAddin.cs:291
+#: ../Tomboy/Notebooks/Notebook.cs:243
msgid "Unfiled Notes"
msgstr "Unfiled Notes"
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#: ../Tomboy/ExportAllApplicationAddin.cs:445
#, csharp-format
msgid "Your notes were exported to \"{0}\"."
msgstr "Your notes were exported to \"{0}\"."
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#: ../Tomboy/ExportAllApplicationAddin.cs:454
msgid "Notes exported successfully"
msgstr "Notes exported successfully"
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#: ../Tomboy/ExportAllApplicationAddin.cs:477
#, csharp-format
msgid "Could not save the files in \"{0}\""
msgstr "Could not save the files in \"{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 "Create destination folder for {0} export"
@@ -1307,11 +1325,11 @@ msgstr "Notebooks"
msgid "{0} Notebook Template"
msgstr "{0} Notebook Template"
-#: ../Tomboy/Notebooks/Notebook.cs:153
+#: ../Tomboy/Notebooks/Notebook.cs:159
msgid "New Note"
msgstr "New Note"
-#: ../Tomboy/Notebooks/Notebook.cs:205
+#: ../Tomboy/Notebooks/Notebook.cs:211
msgid "All Notes"
msgstr "All Notes"
@@ -1352,7 +1370,7 @@ msgstr "Notebook"
msgid "_New notebook..."
msgstr "_New notebook…"
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
#, csharp-format
msgid "New Note {0}"
msgstr "New Note {0}"
@@ -1396,12 +1414,12 @@ msgstr "New Note Template"
#. 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 "Your Notes Have Moved!"
#. 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 "
@@ -1448,7 +1466,7 @@ msgstr ""
"\n"
"Ciao!"
-#: ../Tomboy/NoteManager.cs:265
+#: ../Tomboy/NoteManager.cs:269
msgid ""
"<note-content>Start Here\n"
"\n"
@@ -1486,7 +1504,7 @@ msgstr ""
"Tomboy</link:internal> it automatically gets underlined? Click on the link "
"to open the note.</note-content>"
-#: ../Tomboy/NoteManager.cs:284
+#: ../Tomboy/NoteManager.cs:288
msgid ""
"<note-content>Using Links in Tomboy\n"
"\n"
@@ -1515,17 +1533,17 @@ msgstr ""
"automatically be linked for you.</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 "Start Here"
-#: ../Tomboy/NoteManager.cs:304
+#: ../Tomboy/NoteManager.cs:308
msgid "Using Links in Tomboy"
msgstr "Using Links in 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 "Describe your new note here."
@@ -1646,7 +1664,7 @@ msgstr "Use tools on this note"
msgid "Delete this note"
msgstr "Delete this note"
-#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:164
msgid "Synchronize Notes"
msgstr "Synchronise Notes"
@@ -1690,63 +1708,69 @@ msgstr "Find _Previous"
msgid "Cannot create note"
msgstr "Cannote create note"
-#: ../Tomboy/NoteWindow.cs:832
+#: ../Tomboy/NoteWindow.cs:833
msgid "_Find:"
msgstr "_Find:"
-#: ../Tomboy/NoteWindow.cs:843
+#: ../Tomboy/NoteWindow.cs:847
msgid "_Previous"
msgstr "_Previous"
-#: ../Tomboy/NoteWindow.cs:852
+#: ../Tomboy/NoteWindow.cs:856
msgid "_Next"
msgstr "_Next"
-#: ../Tomboy/NoteWindow.cs:1335
+#. x of x - specifically Number of Matches and what location is the cursor in the list of matches
+#: ../Tomboy/NoteWindow.cs:885
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "Page {0} of {1}"
+
+#: ../Tomboy/NoteWindow.cs:1368
msgid "_Bold"
msgstr "_Bold"
-#: ../Tomboy/NoteWindow.cs:1347
+#: ../Tomboy/NoteWindow.cs:1380
msgid "_Italic"
msgstr "_Italic"
-#: ../Tomboy/NoteWindow.cs:1359
+#: ../Tomboy/NoteWindow.cs:1392
msgid "_Strikeout"
msgstr "_Strikeout"
-#: ../Tomboy/NoteWindow.cs:1371
+#: ../Tomboy/NoteWindow.cs:1404
msgid "_Highlight"
msgstr "_Highlight"
-#: ../Tomboy/NoteWindow.cs:1384
+#: ../Tomboy/NoteWindow.cs:1417
msgid "Font Size"
msgstr "Font Size"
-#: ../Tomboy/NoteWindow.cs:1387
+#: ../Tomboy/NoteWindow.cs:1420
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1404
+#: ../Tomboy/NoteWindow.cs:1437
msgid "Hu_ge"
msgstr "Hu_ge"
-#: ../Tomboy/NoteWindow.cs:1412
+#: ../Tomboy/NoteWindow.cs:1445
msgid "_Large"
msgstr "_Large"
-#: ../Tomboy/NoteWindow.cs:1420
+#: ../Tomboy/NoteWindow.cs:1453
msgid "S_mall"
msgstr "S_mall"
-#: ../Tomboy/NoteWindow.cs:1429
+#: ../Tomboy/NoteWindow.cs:1462
msgid "Increase Font Size"
msgstr "Increase Font Size"
-#: ../Tomboy/NoteWindow.cs:1447
+#: ../Tomboy/NoteWindow.cs:1480
msgid "Decrease Font Size"
msgstr "Decrease Font Size"
-#: ../Tomboy/NoteWindow.cs:1467
+#: ../Tomboy/NoteWindow.cs:1500
msgid "Bullets"
msgstr "Bullets"
@@ -2059,7 +2083,7 @@ msgstr ""
msgid "Click here to search across all notebooks"
msgstr "Click here to search across all notebooks"
-#: ../Tomboy/RecentChanges.cs:775
+#: ../Tomboy/RecentChanges.cs:780
msgid "Notes"
msgstr "Notes"
@@ -2329,28 +2353,29 @@ msgstr ""
"startup. Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
"etc/modules."
-#: ../Tomboy/Tomboy.cs:251
+#: ../Tomboy/Tomboy.cs:253
msgid "Cannot create new note"
msgstr "Cannot create new note"
-#: ../Tomboy/Tomboy.cs:317
+#: ../Tomboy/Tomboy.cs:319
msgid "Primary Development:"
msgstr "Primary Development:"
-#: ../Tomboy/Tomboy.cs:330
+#: ../Tomboy/Tomboy.cs:332
msgid "Contributors:"
msgstr "Contributors:"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:420
msgid "translator-credits"
msgstr ""
"David Lodge <dave at cirt.net>\n"
"James Ogley <james at usr-local-bin.org>\n"
"Christopher Orr <chris at orr.me.uk>\n"
"Philip Withnall <philip at tecnocode.co.uk>\n"
-"Bruce Cowan <bruce at bcowan.me.uk>"
+"Bruce Cowan <bruce at bcowan.me.uk>\n"
+"Chris Leonard <cjr at laptop.org>"
-#: ../Tomboy/Tomboy.cs:424
+#: ../Tomboy/Tomboy.cs:429
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2358,15 +2383,15 @@ msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:431
msgid "A simple and easy to use desktop note-taking application."
msgstr "A simple and easy to use desktop note-taking application."
-#: ../Tomboy/Tomboy.cs:436
+#: ../Tomboy/Tomboy.cs:441
msgid "Homepage"
msgstr "Homepage"
-#: ../Tomboy/Tomboy.cs:554
+#: ../Tomboy/Tomboy.cs:577
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2380,7 +2405,7 @@ msgstr ""
"\n"
"Copyright © 2004-2011 Others\n"
-#: ../Tomboy/Tomboy.cs:568
+#: ../Tomboy/Tomboy.cs:591
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -2394,7 +2419,7 @@ msgstr ""
" --note-path [path]\t\tLoad/store note data in this directory.\n"
" --search [text]\t\tOpen the search all notes window with the search text.\n"
-#: ../Tomboy/Tomboy.cs:578
+#: ../Tomboy/Tomboy.cs:601
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"
@@ -2408,7 +2433,19 @@ msgstr ""
" --start-here\t\t\tDisplay the 'Start Here' note.\n"
" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-#: ../Tomboy/Tomboy.cs:592
+#: ../Tomboy/Tomboy.cs:611
+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 ""
+" --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"
+
+#: ../Tomboy/Tomboy.cs:621
#, csharp-format
msgid "Version {0}"
msgstr "Version {0}"
@@ -2530,11 +2567,11 @@ msgstr ""
msgid "Note title taken"
msgstr "Note title taken"
-#: ../Tomboy/Watchers.cs:587
+#: ../Tomboy/Watchers.cs:601
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
-#: ../Tomboy/Watchers.cs:592
+#: ../Tomboy/Watchers.cs:606
msgid "_Open Link"
msgstr "_Open Link"
diff --git a/po/id.po b/po/id.po
index 5637cf0..77c9e58 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,14 +2,15 @@
# Copyright (C) 2004, 2005 Alex Graveley <alex at beatniksoftware.com>
# This file is distributed under the same license as the tomboy package.
#
-# Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011.
+# Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011, 2012.
# Dirgita <dirgitadevina at yahoo.co.id>, 2010.
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-09-05 17:55+0000\n"
-"PO-Revision-Date: 2011-09-06 13:29+0700\n"
+"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: 2012-09-08 16:10+0000\n"
+"PO-Revision-Date: 2012-09-08 23:15+0700\n"
"Last-Translator: Andika Triwidada <andika at gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome at i15n.org>\n"
"MIME-Version: 1.0\n"
@@ -19,384 +20,595 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "Aksesori"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "Pembuat catatan yang sederhana dan mudah dipakai"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
msgid "Tomboy Applet Factory"
msgstr "Pabrik Aplet Tomboy"
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../data/GNOME_TomboyApplet.server.in.in.h:2 ../data/tomboy.desktop.in.h:1
#: ../Tomboy/Tray.cs:579
msgid "Tomboy Notes"
msgstr "Tomboy Catatan"
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Simple and easy to use note-taking"
+msgstr "Pembuat catatan yang sederhana dan mudah dipakai"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+msgid "Accessories"
+msgstr "Aksesori"
+
#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "_Selaraskan Catatan"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "Tent_ang"
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "_Preferensi"
#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "Ba_ntuan"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "_Preferensi"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "Penyimpan-catatan"
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "Tent_ang"
#: ../data/tomboy.desktop.in.h:2
msgid "Take notes, link ideas, and stay organized"
msgstr "Menyimpan catatan, menyambung ide, dan tetap tertata"
+#: ../data/tomboy.desktop.in.h:3
+msgid "Note-taker"
+msgstr "Penyimpan-catatan"
+
#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "Terima Sertifikat SSL"
+msgid "Enable spellchecking"
+msgstr "Fungsikan penguji ejaan"
#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "Tenggang Waktu Penyelarasan Latar Belakang Otomatis"
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
+msgstr ""
+"Bila benar, salah eja akan digaris-bawahi merah, dan saran ejaan yang benar "
+"ditayangkan pada menu klik kanan."
#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "Membuat catatan baru"
+msgid "Enable WikiWord highlighting"
+msgstr "Aktifkan penandaan KataWiki"
#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "Fonta Gubahan"
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr ""
+"Fungsikan opsi ini untuk menandai kata BerpenampilanSepertiIni. Mengklik "
+"kata tersebut akan membuat satu catatan dengan nama tersebut."
#: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr "Menentukan koordinat X dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
+msgid "Enable automatic bulleted lists."
+msgstr "Aktifkan daftar dibulet otomatis."
#: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr "Menentukan koordinat Y dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
+msgid ""
+"Enable this option if you want bulleted lists to be automatic when you place "
+"- or * at the beginning of a line."
+msgstr ""
+"Fungsikan pilihan ini bila Anda ingin daftar butir dibuat sendiri ketika "
+"Anda menempatkan - atau * di awal suatu baris."
#: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr "Menentukan tinggi dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Aktifkan Klik Tengah Tempel Pada Ikon."
#: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr "Menentukan lebar dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan ketika Tomboy keluar."
+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 ""
+"Fungsikan pilihan ini bila Anda ingin dapat mengklik tengah ikon Tomboy "
+"untuk menempel isi dengan penanda waktu ke dalam catatan Mulai Di Sini."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Aktifkan Klik Tengah Tempel Pada Ikon."
+msgid "Enable custom font"
+msgstr "Aktifkan fonta pilihan sendiri"
#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "Aktifkan Ikon Baki Sistem"
+msgid ""
+"If true, the font name set in custom_font_face will be used as the font when "
+"displaying notes. Otherwise the desktop default font will be used."
+msgstr ""
+"Bila benar, nama fonta yang diisikan di custom_font_face akan dipakai "
+"sebagai fonta ketika menampilkan catatan. Bila tidak fonta baku desktop akan "
+"dipakai."
#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "Aktifkan penandaan KataWiki"
+msgid "Custom Font Face"
+msgstr "Fonta Gubahan"
#: ../data/tomboy.schemas.in.h:12
-msgid "Enable automatic bulleted lists."
-msgstr "Aktifkan daftar dibulet otomatis."
+msgid ""
+"If enable_custom_font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr ""
+"Bila enable_custom_font diisi true, nama fonta yang diisikan di sini akan "
+"dipakai sebagai fonta untuk menayangkan catatan."
#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Aktifkan penutupan catatan dengan tombol escape."
+msgid "Enable global keybindings"
+msgstr "Fungsikan keybinding global"
#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "Aktifkan fonta pilihan sendiri"
+msgid ""
+"If true, the desktop-global keybindings set in /apps/tomboy/"
+"global_keybindings will be enabled, allowing for useful Tomboy actions to be "
+"available from any application."
+msgstr ""
+"Bila benar, keybinding desktop-global yand ditata di /apps/tomboy/"
+"global_keybindings akan diaktifkan, menyebabkan berbagai aksi Tomboy yang "
+"berguna tersedia dari sebarang aplikasi."
#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "Fungsikan keybinding global"
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Aktifkan dialog konfirmasi Hapus Catatan"
#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "Fungsikan penguji ejaan"
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"Apabila dinonaktifkan, dialog konfirmasi \"Hapus Catatan\" tidak akan tampil."
#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "Aktifkan catatan awal"
+msgid "Enable Tray Icon"
+msgstr "Aktifkan Ikon Baki Sistem"
#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Aktifkan dialog konfirmasi Hapus Catatan"
+msgid ""
+"If true, Tomboy's tray icon will be displayed in the notification area. "
+"Disabling this may be useful when another application is providing the "
+"functionality of the tray icon."
+msgstr ""
+"Bila true, ikon baki Tomboy akan ditampilkan di area pemberitahuan. "
+"Mematikan ini mungkin berguna bila aplikasi lain menyediakan fungsionalitas "
+"ikon baki."
#: ../data/tomboy.schemas.in.h:19
-msgid "Enable this option if you want bulleted lists to be automatic when you place - or * at the beginning of a line."
-msgstr "Fungsikan pilihan ini bila Anda ingin daftar butir dibuat sendiri ketika Anda menempatkan - atau * di awal suatu baris."
+msgid "Start Here Note"
+msgstr "Menu Mulai Disini"
#: ../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 "Fungsikan pilihan ini bila Anda ingin dapat mengklik tengah ikon Tomboy untuk menempel isi dengan penanda waktu ke dalam catatan Mulai Di Sini."
+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 catatan yang dijadikan catatan \"Mulai Di Sini\", yang selalu "
+"ditempatkan di dasar menu catatan Tomboy dan juga dapat diakses melalui "
+"tombol singkat."
#: ../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 "Fungsikan opsi ini untuk menandai kata BerpenampilanSepertiIni. Mengklik kata tersebut akan membuat satu catatan dengan nama tersebut."
+msgid "Minimum number of notes to show in menu"
+msgstr "Cacah maksimum catatan yang ditampilkan di menu"
#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "Tenggang Waktu Pengaitan FUSE (ms)"
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Bilangan bulat yang menentukan cacah minimum catatan yang ditampilkan di "
+"menu catatan Tomboy."
#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "Ekspor Ke HTML Semua Catatan Tertaut"
+msgid "List of pinned notes."
+msgstr "Daftar catatan yang dipatok."
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "Ekspor Ke HTML Catatan Tertaut"
+msgid ""
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
+msgstr ""
+"Daftar yang dipisah dengan whitespace dari URI catatan bagi catatan yang "
+"mesti selalu tampil di menu catatan Tomboy."
#: ../data/tomboy.schemas.in.h:25
-msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
-msgstr "Apabila dinonaktifkan, dialog konfirmasi \"Hapus Catatan\" tidak akan tampil."
+msgid "Maximum note title length to show in tray menu."
+msgstr "Panjang judul catatan maksimum untuk ditampilkan di menu baki."
#: ../data/tomboy.schemas.in.h:26
-msgid "If enable_custom_font is true, the font name set here will be used as the font when displaying notes."
-msgstr "Bila enable_custom_font diisi true, nama fonta yang diisikan di sini akan dipakai sebagai fonta untuk menayangkan catatan."
+msgid ""
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr ""
+"Cacah karakter maksimum dari judul catatan yang ditampilkan pada menu "
+"catatan aplet panel atau baki 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 "Bila difungsikan, semua catatan yang terbuka ketika Tomboy keluar akan otomatis dibuka ulang saat mulai."
+msgid "Enable startup notes"
+msgstr "Aktifkan catatan awal"
#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "Bila diaktifkan, sebuah catatan terbuka dapat ditutup dengan menekan tombol escape."
+msgid ""
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
+msgstr ""
+"Bila difungsikan, semua catatan yang terbuka ketika Tomboy keluar akan "
+"otomatis dibuka ulang saat mulai."
#: ../data/tomboy.schemas.in.h:29
-msgid "If true, Tomboy's tray icon will be displayed in the notification area. Disabling this may be useful when another application is providing the functionality of the tray icon."
-msgstr "Bila true, ikon baki Tomboy akan ditampilkan di area pemberitahuan. Mematikan ini mungkin berguna bila aplikasi lain menyediakan fungsionalitas ikon baki."
+msgid "Show applet menu"
+msgstr "Tampilkan menu aplet"
#: ../data/tomboy.schemas.in.h:30
-msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
-msgstr "Bila benar, salah eja akan digaris-bawahi merah, dan saran ejaan yang benar ditayangkan pada menu klik kanan."
+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 ""
+"Keybinding global untuk menampilkan menu aplet Tomboy. Bentuknya seperti "
+"\"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup "
+"bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti "
+"\"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata "
+"khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
#: ../data/tomboy.schemas.in.h:31
-msgid "If true, the desktop-global keybindings set in /apps/tomboy/global_keybindings will be enabled, allowing for useful Tomboy actions to be available from any application."
-msgstr "Bila benar, keybinding desktop-global yand ditata di /apps/tomboy/global_keybindings akan diaktifkan, menyebabkan berbagai aksi Tomboy yang berguna tersedia dari sebarang aplikasi."
+msgid "Open Start Here"
+msgstr "Buka Mulai Disini"
#: ../data/tomboy.schemas.in.h:32
-msgid "If true, the font name set in custom_font_face will be used as the font when displaying notes. Otherwise the desktop default font will be used."
-msgstr "Bila benar, nama fonta yang diisikan di custom_font_face akan dipakai sebagai fonta ketika menampilkan catatan. Bila tidak fonta baku desktop akan dipakai."
+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 ""
+"Keybinding global untuk membuka catatan \"Mulai Di Sini\". Bentuknya seperti "
+"\"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup "
+"bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti "
+"\"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata "
+"khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
#: ../data/tomboy.schemas.in.h:33
-msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
-msgstr "Menandakan bahwa plugin Pengimpor Catatan Lengket belum dijalankan, sehingga mesti otomatis jalan kala berikutnya Tomboy mulai."
+msgid "Create a new Note"
+msgstr "Membuat catatan baru"
#: ../data/tomboy.schemas.in.h:34
-msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
-msgstr "Bilangan bulat yang menentukan cacah minimum catatan yang ditampilkan di menu catatan Tomboy."
+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 ""
+"Keybinding global untuk membuat dan menampilkan suatu Catatan baru. "
+"Bentuknya seperti \"<Control>a\" atau \"<Shift><Alt>F1\". "
+"Pengurai cukup bebas dan mengijinkan huruf besar atau kecil, dan juga "
+"singkatan seperti \"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata "
+"pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk "
+"aksi ini."
#: ../data/tomboy.schemas.in.h:35
-msgid "Integer value indicating how frequently to perform a background sync of your notes (when sync is configured). Any value less than 1 indicates that autosync is disabled. The lowest acceptable positive value is 5. Value is in minutes."
-msgstr "Nilai bulat yang menyatakan seberapa sering perlu melakukan penyelarasan latar belakang dari catatan-catatan Anda (ketika penyelarasan diaktifkan). Sebarang nilai kurang dari 1 menyatakan bahwa penyelarasan otomatis dimatikan. Nilai positif terkecil yang dapat diterima adalah 5. Nilai dalam satuan menit."
+msgid "Open Search Dialog"
+msgstr "Buka Dialog Pencarian"
#: ../data/tomboy.schemas.in.h:36
-msgid "Integer value indicating if there is a preference to always perform a specific behavior when a conflict is detected, instead of prompting the user. The values map to an internal enumeration. 0 indicates that the user wishes to be prompted when a conflict occurs, so that they may handle each conflict situation on a case-by-case basis."
-msgstr "Nilai bulat yang menandakan bila ada preferensi untuk selalu melakukan suatu tindakan spesifik ketika pertentangan terdeteksi, alih-alih bertanya ke pengguna. Nilai ini merujuk ke enumerasi internal. 0 menandakan bahwa pengguna ingin ditanyai ketika pertentangan terjadi, sehingga mereka mungkin bisa menangani setiap keadaan pertentangan secara kasus per kasus."
+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 ""
+"Keybinding global untuk membuka dialog Cari Catatan. Bentuknya seperti \"<"
+"Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup bebas dan "
+"mengijinkan huruf besar atau kecil, dan juga singkatan seperti \"<Ctl>"
+"\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled"
+"\", maka tidak akan ada keybinding untuk aksi ini."
#: ../data/tomboy.schemas.in.h:37
-msgid "Integer value indicating if there is a preference to always perform a specific link updating behavior when a note is renamed, instead of prompting the user. The values map to an internal enumeration. 0 indicates that the user wishes to be prompted when renaming a note may impact links that exist in other notes. 1 indicates that links should automatically be removed. 2 indicates that link text should be updated to the new note name so that it will continue linking to the renamed note."
-msgstr "Nilai bulat yang menandakan bila ada preferensi untuk selalu melakukan suatu perilaku pembaruan taut spesifik ketika sebuah catatan diubah namanya, alih-alih bertanya ke pengguna. Nilai ini merujuk ke enumerasi internal. 0 menandakan bahwa pengguna ingin ditanyai ketika mengubah nama suatu catatan mungkin mempengaruhi tautan yang ada di catatan-catatan lain. 1 menandakan bahwa tautan tersebut mesti dihapus secara otomatis. 2 menandakan bahwa teks tautan mesti diperbarui ke nama catatan baru sehingga itu akan tetap merujuk ke catatan yang diubah namanya."
+msgid "Open Recent Changes"
+msgstr "Buka Perubahan Terkini"
#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "Direktori yang terakhir dipakai dalam Ekspor 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 ""
+"Keybinding global untuk membuka dialog Perubahan Terkini. Bentuknya seperti "
+"\"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup "
+"bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti "
+"\"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata "
+"khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr "Perilaku Pembaruan Tautan Saat Mengubah Nama Catatan"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Tinggi tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "Daftar catatan yang dipatok."
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Menentukan tinggi dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan "
+"ketika Tomboy keluar."
#: ../data/tomboy.schemas.in.h:41
-msgid "Maximum characters of note title to show in the Tomboy tray or panel applet note menu."
-msgstr "Cacah karakter maksimum dari judul catatan yang ditampilkan pada menu catatan aplet panel atau baki Tomboy."
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Lebar tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr "Panjang judul catatan maksimum untuk ditampilkan di menu baki."
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Menentukan lebar dalam piksel dari jendela \"Cari Semua Catatan\"; disimpan "
+"ketika Tomboy keluar."
#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "Cacah maksimum catatan yang ditampilkan di menu"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posisi mendatar tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "Perilaku Tersimpan Pertentangan Penyelarasan Catatan"
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Menentukan koordinat X dari jendela \"Cari Semua Catatan\"; disimpan ketika "
+"Tomboy keluar."
#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "Buka Perubahan Terkini"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posisi tegak tersimpan jendela \"Cari Semua Catatan\""
#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "Buka Dialog Pencarian"
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Menentukan koordinat Y dari jendela \"Cari Semua Catatan\"; disimpan ketika "
+"Tomboy keluar."
#: ../data/tomboy.schemas.in.h:47
-msgid "Open Start Here"
-msgstr "Buka Mulai Disini"
+msgid "Last Directory used in HTML Export"
+msgstr "Direktori yang terakhir dipakai dalam Ekspor HTML"
#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr "Lokasi pada server SSH ke direktori penyelarasan Tomboy (tak wajib)."
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr ""
+"Direktori terakhir tempat ekspor catatan yang memakai plugin Ekspor Ke HTML."
#: ../data/tomboy.schemas.in.h:49
-msgid "Path to the synchronization server when using the filesystem synchronization service addin."
-msgstr "Lokasi ke server penyelarasan ketika memakai addin layanan penyelarasan sistem berkas."
+msgid "HTML Export Linked Notes"
+msgstr "Ekspor Ke HTML Catatan Tertaut"
#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "Folder Penyelarasan Jauh SSHFS"
+msgid ""
+"The last setting for the 'Export linked notes' checkbox in the Export to "
+"HTML plugin."
+msgstr ""
+"Tatanan terakhir bagi checkbox 'Ekspor catatan tertaut' di plugin Ekspor ke "
+"HTML."
#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "Nama Pengguna Penyelarasan Jauh SSHFS"
+msgid "HTML Export All Linked Notes"
+msgstr "Ekspor Ke HTML Semua Catatan Tertaut"
#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "Port Server Penyelarasan Jauh SSHFS"
+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 ""
+"Tatanan terakhir bagi checkbox 'sertakan semua catatan tertaut lain' di "
+"plugin Ekspor ke HTML. Tatanan ini dipakai berkaitan dengan tatanan 'Ekspor "
+"Catatan Tertaut ke HTML' dan dipakai untuk menyatakan apakah semua catatan "
+"(ditemukan secara rekursif) mesti disertakan selama ekspor ke HTML."
#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "URL Server Penyelarasan Jauh SSHFS"
+msgid "Sticky Note Importer First Run"
+msgstr "Run Pertama Pengimpor Catatan Lengket"
#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr "Tinggi tersimpan jendela \"Cari Semua Catatan\""
+msgid ""
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
+msgstr ""
+"Menandakan bahwa plugin Pengimpor Catatan Lengket belum dijalankan, sehingga "
+"mesti otomatis jalan kala berikutnya Tomboy mulai."
#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Posisi mendatar tersimpan jendela \"Cari Semua Catatan\""
+msgid "Synchronization Client ID"
+msgstr "Penyelarasan ID Klien"
#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Posisi tegak tersimpan jendela \"Cari Semua Catatan\""
+msgid ""
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
+msgstr ""
+"Identifier unik bagi klien Tomboy ini, dipakai ketika berkomunikasi dengan "
+"suatu server penyelarasan."
#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "Lebar tersimpan jendela \"Cari Semua Catatan\""
+msgid "Synchronization Local Server Path"
+msgstr "Lokasi Penyelarasan Server Lokal"
#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "Addin Layanan Penyelarasan Terpilih"
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Lokasi ke server penyelarasan ketika memakai addin layanan penyelarasan "
+"sistem berkas."
#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "Tata ke TRUE untuk mengaktifkan"
+msgid "Selected Synchronization Service Addin"
+msgstr "Addin Layanan Penyelarasan Terpilih"
#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "Tampilkan menu aplet"
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Identifier unik bagi addin layanan penyelarasan catatan yang kini ditata."
#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "Menu Mulai Disini"
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "Tenggang Waktu Pengaitan FUSE (ms)"
#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "Run Pertama Pengimpor Catatan Lengket"
+msgid ""
+"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
+"mount a sync share."
+msgstr ""
+"Waktu (dalam milidetik) Tomboy mesti menunggu jawaban ketika memakai FUSE "
+"untuk mengkait suatu share selaras."
#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "Penyelarasan ID Klien"
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "Folder Penyelarasan Jauh SSHFS"
#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "Lokasi Penyelarasan Server Lokal"
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "Lokasi pada server SSH ke direktori penyelarasan Tomboy (tak wajib)."
#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "Bentuk tanggal yang dipakai untuk penanda waktu."
+msgid "SSHFS Synchronization Server URL"
+msgstr "URL Server Penyelarasan Jauh SSHFS"
#: ../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 "Keybinding global untuk membuat dan menampilkan suatu Catatan baru. Bentuknya seperti \"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti \"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr "URL dari server SSH yang memuat direktori penyelarasan Tomboy."
#: ../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 "Keybinding global untuk membuka catatan \"Mulai Di Sini\". Bentuknya seperti \"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti \"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "Nama Pengguna Penyelarasan Jauh 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 "Keybinding global untuk membuka dialog Cari Catatan. Bentuknya seperti \"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti \"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr ""
+"Nama pengguna yang dipakai ketika menyambung ke server penyelarasan melalui "
+"SSH."
#: ../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 "Keybinding global untuk membuka dialog Perubahan Terkini. Bentuknya seperti \"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti \"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
+msgid "SSHFS Synchronization Server Port"
+msgstr "Port Server Penyelarasan Jauh SSHFS"
#: ../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 "Keybinding global untuk menampilkan menu aplet Tomboy. Bentuknya seperti \"<Control>a\" atau \"<Shift><Alt>F1\". Pengurai cukup bebas dan mengijinkan huruf besar atau kecil, dan juga singkatan seperti \"<Ctl>\" dan \"<Ctrl>\". Bila Anda menata pilihan ke kata khusus \"disabled\", maka tidak akan ada keybinding untuk aksi ini."
+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 ""
+"Nomor port yang dipakai ketika menyambung ke server penyelarasan melalui "
+"SSH. Atur ke -1 atau kurang bila tatanan port SSH baku yang akan dipakai."
#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "Pemroses bagi URL \"note://\""
+msgid "Accept SSL Certificates"
+msgstr "Terima Sertifikat SSL"
#: ../data/tomboy.schemas.in.h:72
-msgid "The last directory a note was exported to using the Export To HTML plugin."
-msgstr "Direktori terakhir tempat ekspor catatan yang memakai plugin Ekspor Ke HTML."
+msgid ""
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
+"user."
+msgstr ""
+"Gunakan opsi wdfs \"-ac\" untuk menerima sertifikat SSL tanpa bertanya ke "
+"pengguna."
#: ../data/tomboy.schemas.in.h:73
-msgid "The last setting for the 'Export linked notes' checkbox in the Export to HTML plugin."
-msgstr "Tatanan terakhir bagi checkbox 'Ekspor catatan tertaut' di plugin Ekspor ke HTML."
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "Perilaku Tersimpan Pertentangan Penyelarasan Catatan"
#: ../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 "Tatanan terakhir bagi checkbox 'sertakan semua catatan tertaut lain' di plugin Ekspor ke HTML. Tatanan ini dipakai berkaitan dengan tatanan 'Ekspor Catatan Tertaut ke HTML' dan dipakai untuk menyatakan apakah semua catatan (ditemukan secara rekursif) mesti disertakan selama ekspor ke 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 ""
+"Nilai bulat yang menandakan bila ada preferensi untuk selalu melakukan suatu "
+"tindakan spesifik ketika pertentangan terdeteksi, alih-alih bertanya ke "
+"pengguna. Nilai ini merujuk ke enumerasi internal. 0 menandakan bahwa "
+"pengguna ingin ditanyai ketika pertentangan terjadi, sehingga mereka mungkin "
+"bisa menangani setiap keadaan pertentangan secara kasus per kasus."
#: ../data/tomboy.schemas.in.h: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 catatan yang dijadikan catatan \"Mulai Di Sini\", yang selalu ditempatkan di dasar menu catatan Tomboy dan juga dapat diakses melalui tombol singkat."
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Tenggang Waktu Penyelarasan Latar Belakang Otomatis"
#: ../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 "Nomor port yang dipakai ketika menyambung ke server penyelarasan melalui SSH. Atur ke -1 atau kurang bila tatanan port SSH baku yang akan dipakai."
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"Nilai bulat yang menyatakan seberapa sering perlu melakukan penyelarasan "
+"latar belakang dari catatan-catatan Anda (ketika penyelarasan diaktifkan). "
+"Sebarang nilai kurang dari 1 menyatakan bahwa penyelarasan otomatis "
+"dimatikan. Nilai positif terkecil yang dapat diterima adalah 5. Nilai dalam "
+"satuan menit."
#: ../data/tomboy.schemas.in.h:77
-msgid "Time (in milliseconds) Tomboy should wait for a response when using FUSE to mount a sync share."
-msgstr "Waktu (dalam milidetik) Tomboy mesti menunggu jawaban ketika memakai FUSE untuk mengkait suatu share selaras."
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Perilaku Pembaruan Tautan Saat Mengubah Nama Catatan"
#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "Format penanda waktu"
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"the user. The values map to an internal enumeration. 0 indicates that the "
+"user wishes to be prompted when renaming a note may impact links that exist "
+"in other notes. 1 indicates that links should automatically be removed. 2 "
+"indicates that link text should be updated to the new note name so that it "
+"will continue linking to the renamed note."
+msgstr ""
+"Nilai bulat yang menandakan bila ada preferensi untuk selalu melakukan suatu "
+"perilaku pembaruan taut spesifik ketika sebuah catatan diubah namanya, alih-"
+"alih bertanya ke pengguna. Nilai ini merujuk ke enumerasi internal. 0 "
+"menandakan bahwa pengguna ingin ditanyai ketika mengubah nama suatu catatan "
+"mungkin mempengaruhi tautan yang ada di catatan-catatan lain. 1 menandakan "
+"bahwa tautan tersebut mesti dihapus secara otomatis. 2 menandakan bahwa teks "
+"tautan mesti diperbarui ke nama catatan baru sehingga itu akan tetap merujuk "
+"ke catatan yang diubah namanya."
#: ../data/tomboy.schemas.in.h:79
-msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr "URL dari server SSH yang memuat direktori penyelarasan Tomboy."
+msgid "Timestamp format"
+msgstr "Format penanda waktu"
#: ../data/tomboy.schemas.in.h:80
-msgid "Unique identifier for the currently configured note synchronization service addin."
-msgstr "Identifier unik bagi addin layanan penyelarasan catatan yang kini ditata."
+msgid "The date format that is used for the timestamp."
+msgstr "Bentuk tanggal yang dipakai untuk penanda waktu."
#: ../data/tomboy.schemas.in.h:81
-msgid "Unique identifier for this Tomboy client, used when communicating with a sychronization server."
-msgstr "Identifier unik bagi klien Tomboy ini, dipakai ketika berkomunikasi dengan suatu server penyelarasan."
+msgid "Enable closing notes with escape."
+msgstr "Aktifkan penutupan catatan dengan tombol escape."
#: ../data/tomboy.schemas.in.h:82
-msgid "Use wdfs option \"-ac\" to accept SSL certificates without prompting the user."
-msgstr "Gunakan opsi wdfs \"-ac\" untuk menerima sertifikat SSL tanpa bertanya ke pengguna."
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr ""
+"Bila diaktifkan, sebuah catatan terbuka dapat ditutup dengan menekan tombol "
+"escape."
#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr "Nama pengguna yang dipakai ketika menyambung ke server penyelarasan melalui SSH."
+msgid "The handler for \"note://\" URLs"
+msgstr "Pemroses bagi URL \"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 "Daftar yang dipisah dengan whitespace dari URI catatan bagi catatan yang mesti selalu tampil di menu catatan Tomboy."
+msgid "Set to TRUE to activate"
+msgstr "Tata ke TRUE untuk mengaktifkan"
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -490,7 +702,8 @@ msgstr "Tingkat Lanjut"
#. Menu Note Count option
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
msgid "Minimum number of notes to show in Recent list (maximum 18)"
-msgstr "Cacah minimal catatan yang ditampilkan di daftar Baru-baru ini (maksimal 18)"
+msgstr ""
+"Cacah minimal catatan yang ditampilkan di daftar Baru-baru ini (maksimal 18)"
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
@@ -502,8 +715,12 @@ msgid "(none)"
msgstr "(nihil)"
#: ../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 "Anda dapat memakai sebarang bugzilla hanya dengan menyeret taut ke dalam catatan. Bila Anda ingin ikon khusus bagi host tertentu, tambahkan di sini."
+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 ""
+"Anda dapat memakai sebarang bugzilla hanya dengan menyeret taut ke dalam "
+"catatan. Bila Anda ingin ikon khusus bagi host tertentu, tambahkan di sini."
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
msgid "Host Name"
@@ -528,7 +745,8 @@ msgstr "Tidak ada nama host yang dinyatakan"
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr "Anda mesti menyatakan nama host Bugzilla untuk dipakai dengan ikon ini."
+msgstr ""
+"Anda mesti menyatakan nama host Bugzilla untuk dipakai dengan ikon ini."
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
msgid "Error saving icon"
@@ -580,14 +798,14 @@ msgid "Note exported successfully"
msgstr "Catatan sukses diekspor"
#: ../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 "Akses ditolak."
#: ../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 "Folder tidak ada."
@@ -609,7 +827,8 @@ msgid "Folder path field is empty."
msgstr "Ruas lokasi folder kosong."
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
-msgid "Specified folder path does not exist, and Tomboy was unable to create it."
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "Lokasi folder yang dinyatakan tak ada, dan Tomboy tak bisa membuatnya."
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
@@ -636,7 +855,7 @@ msgstr "Sisipkan Tanda Waktu"
#. initial newline
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:155
msgid "dddd, MMMM d, h:mm tt"
msgstr "dddd, MMMM d, h:mm tt"
@@ -674,8 +893,12 @@ msgid "Appointments"
msgstr "Janji"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
-msgstr "Ubah catatan <b>Hari Ini: Templat</b> untuk menggubah teks yang dipunyai oleh catatan Hari Ini yang baru."
+msgid ""
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr ""
+"Ubah catatan <b>Hari Ini: Templat</b> untuk menggubah teks yang dipunyai "
+"oleh catatan Hari Ini yang baru."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -701,10 +924,20 @@ msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd/MM/yyyy, HH:mm:ss"
#. Adding menu item when note is opened and window created
-#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:31
msgid "Remove broken links"
msgstr "Buang taut yang rusak"
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:42
+#: ../Tomboy/ExportAllApplicationAddin.cs:70
+#: ../Tomboy/Synchronization/SyncManager.cs:162
+msgid "_Tools"
+msgstr "_Perkakas"
+
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:44
+msgid "_Remove broken links"
+msgstr "Buang taut yang _rusak"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Tambah suatu sketsa"
@@ -725,8 +958,12 @@ msgstr "Lokasi _Folder (tidak wajib):"
#. 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 "Penyelarasan SSH memerlukan kunci SSH yang telah ada bagi user dan server ini, ditambahkan ke daemon SSH yang sedang berjalan."
+msgid ""
+"SSH synchronization requires an existing SSH key for this server and user, "
+"added to a running SSH daemon."
+msgstr ""
+"Penyelarasan SSH memerlukan kunci SSH yang telah ada bagi user dan server "
+"ini, ditambahkan ke daemon SSH yang sedang berjalan."
#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
@@ -737,8 +974,12 @@ 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 "Waktu tunggu habis saat menyambung ke server. Silakan pastikan bahwa kunci SSH Anda telah ditambahkan ke suatu daemon SSH yang sedang berjalan."
+msgid ""
+"Timeout connecting to server. Please ensure that your SSH key has been added "
+"to a running SSH daemon."
+msgstr ""
+"Waktu tunggu habis saat menyambung ke server. Silakan pastikan bahwa kunci "
+"SSH Anda telah ditambahkan ke suatu daemon SSH yang sedang berjalan."
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
msgid "Import from Sticky Notes"
@@ -760,7 +1001,8 @@ msgstr "Impor Catatan Lengket telah lengkap"
#: ../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> dari <b>{1}</b> Catatan Lengket telah sukses diimpor."
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
@@ -808,8 +1050,12 @@ 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 "Ada galat menyambung ke server. Ini mungkin disebabkan oleh nama pengguna dan/atau sandi salah."
+msgid ""
+"There was an error connecting to the server. This may be caused by using an "
+"incorrect user name and/or password."
+msgstr ""
+"Ada galat menyambung ke server. Ini mungkin disebabkan oleh nama pengguna "
+"dan/atau sandi salah."
#. TODO: If the above fails (no keyring daemon), save all but password
#. to GConf, and notify user.
@@ -817,8 +1063,10 @@ msgstr "Ada galat menyambung ke server. Ini mungkin disebabkan oleh nama penggun
#. 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:"
-msgstr "Menyimpan konfigurasi ke gantungan kunci GNOME gagal dengan pesan berikut:"
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
+msgstr ""
+"Menyimpan konfigurasi ke gantungan kunci GNOME gagal dengan pesan berikut:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
@@ -847,8 +1095,12 @@ msgstr "Otorisasi Web Tomboy Sukses"
#. 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 "Silakan kembali ke jendela Preferensi Tomboy dan tekan Simpan untuk mulai menyelaraskan."
+msgid ""
+"Please return to the Tomboy Preferences window and press Save to start "
+"synchronizing."
+msgstr ""
+"Silakan kembali ke jendela Preferensi Tomboy dan tekan Simpan untuk mulai "
+"menyelaraskan."
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
@@ -869,105 +1121,99 @@ msgstr "Tata peramban baku dan coba lagi"
msgid "Tomboy Web"
msgstr "Web Tomboy"
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
#, csharp-format
-#| msgid "Export All Notes to "
msgid "Export All Notes to {0}"
msgstr "Ekspor Semua Catatan ke {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
#, csharp-format
-#| msgid "Start exporting notes to "
msgid "Start exporting notes to {0}"
msgstr "Memulai mengekspor catatan ke {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#: ../Tomboy/ExportAllApplicationAddin.cs:63
#, csharp-format
-#| msgid "Export selected notebook to "
msgid "Export selected notebook to {0}"
msgstr "Ekspor buku catatan yang dipilih ke {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#: ../Tomboy/ExportAllApplicationAddin.cs:64
#, csharp-format
-#| msgid "Start exporting notebook to "
msgid "Start exporting notebook to {0}"
msgstr "Mulai mengekspor buku catatan ke {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Perkakas"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#: ../Tomboy/ExportAllApplicationAddin.cs:73
msgid "Export"
msgstr "Ekspor"
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#: ../Tomboy/ExportAllApplicationAddin.cs:74
msgid "Export your notes."
msgstr "Ekspor catatan Anda."
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
#, csharp-format
-#| msgid "Export All Notes To "
msgid "Export All Notes To {0}"
msgstr "Ekspor Semua Catatan ke {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#: ../Tomboy/ExportAllApplicationAddin.cs:82
#, csharp-format
-#| msgid "Export Selected Notebook To "
msgid "Export Selected Notebook To {0}"
msgstr "Ekspor Buku Catatan Yang Dipilih ke {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:153
-#, csharp-format
-#| msgid "All Notes"
-msgid "All Notes {0} Export"
-msgstr "Ekspor {0} Semua Catatan"
-
-#: ../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 "Tak bisa mengekspor, akses ditolak."
-#: ../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 "Tak bisa mengekspor, folder tidak ada."
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#: ../Tomboy/ExportAllApplicationAddin.cs:175
+msgid "Could not export, error with the path. (No ending \"?)"
+msgstr "Tak bisa mengekspor, galat dengan path. (Tak ada akhiran \"?)"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:177
+#: ../Tomboy/ExportAllApplicationAddin.cs:258
+#: ../Tomboy/ExportAllApplicationAddin.cs:336
#, csharp-format
msgid "Could not export: {0}"
msgstr "Tak bisa mengekspor: {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
+#: ../Tomboy/ExportAllApplicationAddin.cs:231
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Ekspor {0} Semua Catatan"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:260
+#: ../Tomboy/ExportAllApplicationAddin.cs:338
msgid "Unknown error."
msgstr "Galat tak dikenal."
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:237
+#: ../Tomboy/ExportAllApplicationAddin.cs:291
+#: ../Tomboy/Notebooks/Notebook.cs:243
msgid "Unfiled Notes"
msgstr "Catatan Belum Diberkaskan"
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#: ../Tomboy/ExportAllApplicationAddin.cs:445
#, csharp-format
msgid "Your notes were exported to \"{0}\"."
msgstr "Catatan Anda diekspor ke \"{0}\"."
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#: ../Tomboy/ExportAllApplicationAddin.cs:454
msgid "Notes exported successfully"
msgstr "Catatan sukses diekspor"
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#: ../Tomboy/ExportAllApplicationAddin.cs:477
#, csharp-format
msgid "Could not save the files in \"{0}\""
msgstr "Tak dapat menyimpan berkas di \"{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 "
msgid "Create destination folder for {0} export"
msgstr "Buat folder tujuan bagi ekspor {0}"
@@ -1079,12 +1325,11 @@ msgstr "Notebook"
msgid "{0} Notebook Template"
msgstr "Templat Notebook {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:153
-#| msgid "_New Note"
+#: ../Tomboy/Notebooks/Notebook.cs:159
msgid "New Note"
msgstr "Catatan Baru"
-#: ../Tomboy/Notebooks/Notebook.cs:205
+#: ../Tomboy/Notebooks/Notebook.cs:211
msgid "All Notes"
msgstr "Semua Catatan"
@@ -1093,8 +1338,13 @@ msgid "Really delete this notebook?"
msgstr "Yakin menghapus notebook ini?"
#: ../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 "Catatan yang menjadi milik notebook ini tidak akan dihapus, tapi mereka tidak akan dihubungkan lagi dengan notebook ini. Aksi ini tidak dapat dibatalkan."
+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 ""
+"Catatan yang menjadi milik notebook ini tidak akan dihapus, tapi mereka "
+"tidak akan dihubungkan lagi dengan notebook ini. Aksi ini tidak dapat "
+"dibatalkan."
#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
msgid "No notebook"
@@ -1121,15 +1371,13 @@ msgstr "Notebook"
msgid "_New notebook..."
msgstr "_Notebook Baru..."
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
#, csharp-format
msgid "New Note {0}"
msgstr "Catatan Baru {0}"
#: ../Tomboy/Note.cs:1607
#, csharp-format
-#| msgid "Really delete this {0} note?"
-#| msgid_plural "Really delete these {0} notes?"
msgid "Really delete \"{0}\"?"
msgstr "Yakin hapus {0}?"
@@ -1145,8 +1393,14 @@ msgstr "Jika Anda menghapus catatan, isinya akan hilang."
#: ../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 "Galat terjadi saat menyimpan catatan Anda. Silakan periksa bahwa Anda memiliki ruang cakram yang cukup, dan Anda memiliki hak yang sesuai pada {0}. Rincian galat dapat ditemukan di {1}."
+msgid ""
+"An error occurred while saving your notes. Please check that you have "
+"sufficient disk space, and that you have appropriate rights on {0}. Error "
+"details can be found in {1}."
+msgstr ""
+"Galat terjadi saat menyimpan catatan Anda. Silakan periksa bahwa Anda "
+"memiliki ruang cakram yang cukup, dan Anda memiliki hak yang sesuai pada "
+"{0}. Rincian galat dapat ditemukan di {1}."
#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
@@ -1160,41 +1414,59 @@ msgstr "Templat Catatan Baru"
#. 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 "Catatan Anda Telah Dipindah!"
#. 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 ""
-"Pada versi terakhir Tomboy, berkas catatan Anda telah dipindah. Anda mungkin tidak pernah peduli di mana catatan Anda disimpan, dan bila Anda masih tidak peduli, silakan lanjutkan dan <bold>hapus catatan ini</b>. :-)\n"
+"Pada versi terakhir Tomboy, berkas catatan Anda telah dipindah. Anda mungkin "
+"tidak pernah peduli di mana catatan Anda disimpan, dan bila Anda masih tidak "
+"peduli, silakan lanjutkan dan <bold>hapus catatan ini</b>. :-)\n"
"\n"
-"Direktori catatan lama Anda masih aman di <link:url>{0}</link:url>. Bila Anda kembali ke versi Tomboy yang lebih lama, dia akan mencari catatan di sana.\n"
+"Direktori catatan lama Anda masih aman di <link:url>{0}</link:url>. Bila "
+"Anda kembali ke versi Tomboy yang lebih lama, dia akan mencari catatan di "
+"sana.\n"
"\n"
-"Tapi kami telah menyalin catatan dan info konfigurasi Anda ke dalam direktori baru, yang akan dipakai mulai sekarang:\n"
+"Tapi kami telah menyalin catatan dan info konfigurasi Anda ke dalam "
+"direktori baru, yang akan dipakai mulai sekarang:\n"
"\n"
-"<list><list-item dir=\"ltr\">Catatan kini dapat ditemukan di <link:url>{1}</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Konfigurasi ada di <link:url>{2}</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Anda dapat memasang add-in pada <link:url>{3}</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Berkas log dapat ditemukan di <link:url>{4}</link:url></list-item></list>\n"
+"<list><list-item dir=\"ltr\">Catatan kini dapat ditemukan di <link:url>{1}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">Konfigurasi ada di <link:url>{2}</link:"
+"url>\n"
+"</list-item><list-item dir=\"ltr\">Anda dapat memasang add-in pada <link:url>"
+"{3}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Berkas log dapat ditemukan di <link:url>"
+"{4}</link:url></list-item></list>\n"
"\n"
"Ciao!"
-#: ../Tomboy/NoteManager.cs:265
+#: ../Tomboy/NoteManager.cs:269
msgid ""
"<note-content>Start Here\n"
"\n"
@@ -1202,52 +1474,75 @@ 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>Mulai Di Sini\n"
"\n"
"<bold>Selamat Datang ke Tomboy!</bold>\n"
"\n"
-"Anda dapat membuat catatan baru untuk menyimpan ide-ide Anda dengan memilih \"Buat Catatan Baru\" dari menu Catatan Tomboy di Panel GNOME Anda. Catatan Anda akan otomatis disimpan.\n"
+"Anda dapat membuat catatan baru untuk menyimpan ide-ide Anda dengan memilih "
+"\"Buat Catatan Baru\" dari menu Catatan Tomboy di Panel GNOME Anda. Catatan "
+"Anda akan otomatis disimpan.\n"
"\n"
-"Lalu atur catatan yang Anda buat dengan menautkan catatan-catatan dan ide-ide yang berhubungan bersama-sama!\n"
+"Lalu atur catatan yang Anda buat dengan menautkan catatan-catatan dan ide-"
+"ide yang berhubungan bersama-sama!\n"
"\n"
-"Kami telah membuat suatu catatan bernama <link:internal>Memakai Tautan di Tomboy</link:internal>. Perhatikan bagaimana setiap kali kami mengetik <link:internal>Memakai Tautan di Tomboy</link:internal> dia secara otomatis digaris-bawahi? Klik pada taut untuk membuka catatan.</note-content>"
+"Kami telah membuat suatu catatan bernama <link:internal>Memakai Tautan di "
+"Tomboy</link:internal>. Perhatikan bagaimana setiap kali kami mengetik <link:"
+"internal>Memakai Tautan di Tomboy</link:internal> dia secara otomatis "
+"digaris-bawahi? Klik pada taut untuk membuka catatan.</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>Memakai Tautan di Tomboy\n"
"\n"
-"Catatan di Tomboy dapat ditautkan satu sama lain dengan memilih teks pada catatan kini dan mengklik tombol <bold>Taut</bold> di atas pada toolbar. Hal itu akan membuat suatu catatan baru dan juga menggaris-bawahi judul catatan pada catatan kini.\n"
+"Catatan di Tomboy dapat ditautkan satu sama lain dengan memilih teks pada "
+"catatan kini dan mengklik tombol <bold>Taut</bold> di atas pada toolbar. Hal "
+"itu akan membuat suatu catatan baru dan juga menggaris-bawahi judul catatan "
+"pada catatan kini.\n"
"\n"
-"Mengubah judul dari suatu catatan akan memperbarui tautan yang ada di catatan-catatan lain. Hal ini mencegah terjadinya taut rusak ketika sebuah catatan diubah namanya.\n"
+"Mengubah judul dari suatu catatan akan memperbarui tautan yang ada di "
+"catatan-catatan lain. Hal ini mencegah terjadinya taut rusak ketika sebuah "
+"catatan diubah namanya.\n"
"\n"
-"Bila Anda mengetikkan nama dari catatan lain pada catatan kini, dia juga akan ditautkan secara otomatis untuk Anda.</note-content>"
+"Bila Anda mengetikkan nama dari catatan lain pada catatan kini, dia juga "
+"akan ditautkan secara otomatis untuk Anda.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
+#: ../Tomboy/NoteManager.cs:303 ../Tomboy/NoteManager.cs:398
msgid "Start Here"
msgstr "Mulai Di Sini"
-#: ../Tomboy/NoteManager.cs:304
+#: ../Tomboy/NoteManager.cs:308
msgid "Using Links in Tomboy"
msgstr "Memakai Tautan di 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 "Uraikan catatan baru Anda di sini."
@@ -1266,11 +1561,13 @@ msgstr "_Jangan Ubah Nama Tautan"
#: ../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 ""
-"Ubah nama tautan di catatan-catatan lain dari \"<span underline=\"single\">{0}</span>\" menjadi \"<span underline=\"single\">{1}</span>\"?\n"
+"Ubah nama tautan di catatan-catatan lain dari \"<span underline=\"single\">"
+"{0}</span>\" menjadi \"<span underline=\"single\">{1}</span>\"?\n"
"\n"
"Bila Anda tidak mengubah nama tautan, mereka tak akan merujuk kemanapun."
@@ -1366,16 +1663,19 @@ msgstr "Gunakan alat pada catatan ini"
msgid "Delete this note"
msgstr "Menghapus catatan ini"
-#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:164
msgid "Synchronize Notes"
msgstr "Menyelaraskan Catatan"
#: ../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 "Catatan ini adalah catatan templat. Ini menentukan isi baku dari catatan biasa, dan tak akan muncul di menu catatan atau jendela pencarian."
+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 ""
+"Catatan ini adalah catatan templat. Ini menentukan isi baku dari catatan "
+"biasa, dan tak akan muncul di menu catatan atau jendela pencarian."
#: ../Tomboy/NoteWindow.cs:571
-#| msgid "Connect to Server"
msgid "Convert to regular note"
msgstr "Ubah ke catatan biasa"
@@ -1384,12 +1684,10 @@ msgid "Save Si_ze"
msgstr "_Simpan Ukuran"
#: ../Tomboy/NoteWindow.cs:585
-#| msgid "Select None"
msgid "Save Se_lection"
msgstr "Simpan Pi_lihan"
#: ../Tomboy/NoteWindow.cs:594
-#| msgid "Note Title"
msgid "Save _Title"
msgstr "Simpan _Judul"
@@ -1409,63 +1707,69 @@ msgstr "Cari _Sebelumnya"
msgid "Cannot create note"
msgstr "Tidak dapat membuat catatan"
-#: ../Tomboy/NoteWindow.cs:832
+#: ../Tomboy/NoteWindow.cs:833
msgid "_Find:"
msgstr "_Temukan: "
-#: ../Tomboy/NoteWindow.cs:843
+#: ../Tomboy/NoteWindow.cs:847
msgid "_Previous"
msgstr "M_undur"
-#: ../Tomboy/NoteWindow.cs:852
+#: ../Tomboy/NoteWindow.cs:856
msgid "_Next"
msgstr "Sela_njutnya"
-#: ../Tomboy/NoteWindow.cs:1335
+#. x of x - specifically Number of Matches and what location is the cursor in the list of matches
+#: ../Tomboy/NoteWindow.cs:885
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} dari {1}"
+
+#: ../Tomboy/NoteWindow.cs:1368
msgid "_Bold"
msgstr "Te_bal"
-#: ../Tomboy/NoteWindow.cs:1347
+#: ../Tomboy/NoteWindow.cs:1380
msgid "_Italic"
msgstr "M_iring"
-#: ../Tomboy/NoteWindow.cs:1359
+#: ../Tomboy/NoteWindow.cs:1392
msgid "_Strikeout"
msgstr "_Coret"
-#: ../Tomboy/NoteWindow.cs:1371
+#: ../Tomboy/NoteWindow.cs:1404
msgid "_Highlight"
msgstr "_Penandaan"
-#: ../Tomboy/NoteWindow.cs:1384
+#: ../Tomboy/NoteWindow.cs:1417
msgid "Font Size"
msgstr "Ukuran Fonta"
-#: ../Tomboy/NoteWindow.cs:1387
+#: ../Tomboy/NoteWindow.cs:1420
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1404
+#: ../Tomboy/NoteWindow.cs:1437
msgid "Hu_ge"
msgstr "Raksasa"
-#: ../Tomboy/NoteWindow.cs:1412
+#: ../Tomboy/NoteWindow.cs:1445
msgid "_Large"
msgstr "_Besar"
-#: ../Tomboy/NoteWindow.cs:1420
+#: ../Tomboy/NoteWindow.cs:1453
msgid "S_mall"
msgstr "_Kecil"
-#: ../Tomboy/NoteWindow.cs:1429
+#: ../Tomboy/NoteWindow.cs:1462
msgid "Increase Font Size"
msgstr "Besarkan Ukuran Fonta"
-#: ../Tomboy/NoteWindow.cs:1447
+#: ../Tomboy/NoteWindow.cs:1480
msgid "Decrease Font Size"
msgstr "Kecilkan Ukuran Fonta"
-#: ../Tomboy/NoteWindow.cs:1467
+#: ../Tomboy/NoteWindow.cs:1500
msgid "Bullets"
msgstr "Bulet"
@@ -1490,8 +1794,12 @@ msgid "_Spell check while typing"
msgstr "Periksa ejaan _saat mengetik"
#: ../Tomboy/PreferencesDialog.cs:183
-msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
-msgstr "Salah eja akan digaris-bawahi warna merah, dengan saran pengejaan yang benar ditampilkan di menu konteks."
+msgid ""
+"Misspellings will be underlined in red, with correct spelling suggestions "
+"shown in the context menu."
+msgstr ""
+"Salah eja akan digaris-bawahi warna merah, dengan saran pengejaan yang benar "
+"ditampilkan di menu konteks."
#. WikiWords...
#: ../Tomboy/PreferencesDialog.cs:194
@@ -1499,8 +1807,12 @@ msgid "Highlight _WikiWords"
msgstr "Tandai Kata_Wiki"
#: ../Tomboy/PreferencesDialog.cs:202
-msgid "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the word will create a note with that name."
-msgstr "Fungsikan opsi ini untuk menandai kata <b>BerpenampilanSepertiIni</b>. Mengklik kata tersebut akan membuat satu catatan dengan nama tersebut."
+msgid ""
+"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
+"word will create a note with that name."
+msgstr ""
+"Fungsikan opsi ini untuk menandai kata <b>BerpenampilanSepertiIni</b>. "
+"Mengklik kata tersebut akan membuat satu catatan dengan nama tersebut."
#. Auto bulleted list
#: ../Tomboy/PreferencesDialog.cs:209
@@ -1528,8 +1840,12 @@ msgid "Always rename links"
msgstr "Selalu ubah nama tautan"
#: ../Tomboy/PreferencesDialog.cs:261
-msgid "Use the new note template to specify the text that should be used when creating a new note."
-msgstr "Gunakan templat catatan baru untuk menyatakan teks yang mesti dipakai ketika membuat suatu catatan baru."
+msgid ""
+"Use the new note template to specify the text that should be used when "
+"creating a new note."
+msgstr ""
+"Gunakan templat catatan baru untuk menyatakan teks yang mesti dipakai ketika "
+"membuat suatu catatan baru."
#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
@@ -1541,8 +1857,14 @@ msgid "Listen for _Hotkeys"
msgstr "Mendengar _Tombol Singkat"
#: ../Tomboy/PreferencesDialog.cs:336
-msgid "Hotkeys allow you to quickly access your notes from anywhere with a keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
-msgstr "Kunci pintas memungkinkan Anda mengakses secara cepat catatan Anda dari manapun dengan menekan tombol. Contoh Kunci Pintas: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
+msgid ""
+"Hotkeys allow you to quickly access your notes from anywhere with a "
+"keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
+"Alt>N</b>"
+msgstr ""
+"Kunci pintas memungkinkan Anda mengakses secara cepat catatan Anda dari "
+"manapun dengan menekan tombol. Contoh Kunci Pintas: <b><Control><"
+"Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
#: ../Tomboy/PreferencesDialog.cs:356
@@ -1621,8 +1943,12 @@ msgid "Other Synchronization Options"
msgstr "Opsi Penyelarasan Lainnya"
#: ../Tomboy/PreferencesDialog.cs:981
-msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
-msgstr "Ketika pertentangan terdeteksi antara catatan lokal dan catatan pada server penyelarasan yang dikonfigurasi:"
+msgid ""
+"When a conflict is detected between a local note and a note on the "
+"configured synchronization server:"
+msgstr ""
+"Ketika pertentangan terdeteksi antara catatan lokal dan catatan pada server "
+"penyelarasan yang dikonfigurasi:"
#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
@@ -1641,29 +1967,47 @@ msgid "Are you sure?"
msgstr "Anda yakin?"
#: ../Tomboy/PreferencesDialog.cs:1144
-msgid "Clearing your synchronization settings is not recommended. You may be forced to synchronize all of your notes again when you save new settings."
-msgstr "Membersihkan penataan penyelarasan Anda tidak disarankan. Anda mungkin dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
+msgid ""
+"Clearing your synchronization settings is not recommended. You may be "
+"forced to synchronize all of your notes again when you save new settings."
+msgstr ""
+"Membersihkan penataan penyelarasan Anda tidak disarankan. Anda mungkin "
+"dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan "
+"tatanan baru."
#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Menata Ulang Pengaturan Penyelarasan"
#: ../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 "Anda telah mematikan layanan penyelarasan yang dikonfigurasi. Penataan penyelarasan Anda kini akan dibersihkan. Anda mungkin dipaksa untuk menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
+msgid ""
+"You have disabled the configured synchronization service. Your "
+"synchronization settings will now be cleared. You may be forced to "
+"synchronize all of your notes again when you save new settings."
+msgstr ""
+"Anda telah mematikan layanan penyelarasan yang dikonfigurasi. Penataan "
+"penyelarasan Anda kini akan dibersihkan. Anda mungkin dipaksa untuk "
+"menyelaraskan semua catatan Anda lagi ketika Anda menyimpan tatanan baru."
#: ../Tomboy/PreferencesDialog.cs:1237
msgid "Connection successful"
msgstr "Koneksi sukses"
#: ../Tomboy/PreferencesDialog.cs:1239
-msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
-msgstr "Tomboy siap menyelaraskan catatan Anda. Anda ingin menyelaraskan sekarang?"
+msgid ""
+"Tomboy is ready to synchronize your notes. Would you like to synchronize "
+"them now?"
+msgstr ""
+"Tomboy siap menyelaraskan catatan Anda. Anda ingin menyelaraskan sekarang?"
#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-msgid "Please check your information and try again. The log file {0} may contain more information about the error."
-msgstr "Silakan periksa informasi Anda dan coba lagi. Berkas log {0} mungkin memuat informasi lebih banyak tentang galat."
+msgid ""
+"Please check your information and try again. The log file {0} may contain "
+"more information about the error."
+msgstr ""
+"Silakan periksa informasi Anda dan coba lagi. Berkas log {0} mungkin memuat "
+"informasi lebih banyak tentang galat."
#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
@@ -1735,14 +2079,18 @@ msgstr ""
msgid "Click here to search across all notebooks"
msgstr "Klik disini untuk mencari pada semua buku catatan"
-#: ../Tomboy/RecentChanges.cs:775
+#: ../Tomboy/RecentChanges.cs:780
msgid "Notes"
msgstr "Catatan"
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
#, csharp-format
-msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
-msgstr "Addin penyelarasan ini tidak didukung pada komputer Anda. Silakan pastikan Anda punya FUSE dan {0} terpasang dan tertata dengan benar."
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"Addin penyelarasan ini tidak didukung pada komputer Anda. Silakan pastikan "
+"Anda punya FUSE dan {0} terpasang dan tertata dengan benar."
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
msgid "Could not read testfile."
@@ -1818,8 +2166,12 @@ msgid "Server is locked"
msgstr "Server terkunci"
#: ../Tomboy/Synchronization/SyncDialog.cs:270
-msgid "One of your other computers is currently synchronizing. Please wait 2 minutes and try again."
-msgstr "Salah satu dari komputer lain Anda kini sedang menyelaraskan. Silakan tunggu 2 menit dan coba lagi."
+msgid ""
+"One of your other computers is currently synchronizing. Please wait 2 "
+"minutes and try again."
+msgstr ""
+"Salah satu dari komputer lain Anda kini sedang menyelaraskan. Silakan tunggu "
+"2 menit dan coba lagi."
#: ../Tomboy/Synchronization/SyncDialog.cs:274
msgid "Preparing to download updates from server..."
@@ -1843,7 +2195,8 @@ msgstr "Gagal menyelaraskan"
#: ../Tomboy/Synchronization/SyncDialog.cs:285
msgid "Could not synchronize notes. Check the details below and try again."
-msgstr "Tidak dapat menyelaraskan catatan. Periksa rincian di bawah dan coba lagi."
+msgstr ""
+"Tidak dapat menyelaraskan catatan. Periksa rincian di bawah dan coba lagi."
#: ../Tomboy/Synchronization/SyncDialog.cs:291
msgid "Synchronization Complete"
@@ -1955,8 +2308,12 @@ msgstr "Pertentangan catatan terdeteksi"
#: ../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 "Versi server dari \"{0}\" bertentangan dengan catatan lokal Anda. Apa yang ingin Anda lakukan dengan catatan lokal Anda?"
+msgid ""
+"The server version of \"{0}\" conflicts with your local note. What do you "
+"want to do with your local note?"
+msgstr ""
+"Versi server dari \"{0}\" bertentangan dengan catatan lokal Anda. Apa yang "
+"ingin Anda lakukan dengan catatan lokal Anda?"
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
@@ -1965,8 +2322,12 @@ msgstr "Tidak dapat mengaktifkan 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 "Modul FUSE tidak dapat dimuat. Silakan periksa bahwa dia telah terpasang dengan benar dan coba lagi."
+msgid ""
+"The FUSE module could not be loaded. Please check that it is installed "
+"properly and try again."
+msgstr ""
+"Modul FUSE tidak dapat dimuat. Silakan periksa bahwa dia telah terpasang "
+"dengan benar dan coba lagi."
#: ../Tomboy/Synchronization/SyncUtils.cs:135
msgid "Enable FUSE?"
@@ -1978,31 +2339,35 @@ msgstr "Aktifkan 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 ""
"Penyelarasan yang telah Anda pilih memerlukan modul FUSE untuk dimuat.\n"
"\n"
-"Untuk menghindari mendapat pertanyaan ini di masa mendatang, Anda mesti memuat FUSE saat startup. Tambahkan \"modprobe fuse\" ke /etc/init.d/boot.local atau \"fuse\" ke /etc/modules."
+"Untuk menghindari mendapat pertanyaan ini di masa mendatang, Anda mesti "
+"memuat FUSE saat startup. Tambahkan \"modprobe fuse\" ke /etc/init.d/boot."
+"local atau \"fuse\" ke /etc/modules."
-#: ../Tomboy/Tomboy.cs:251
+#: ../Tomboy/Tomboy.cs:253
msgid "Cannot create new note"
msgstr "Tidak dapat membuat catatan baru"
-#: ../Tomboy/Tomboy.cs:317
+#: ../Tomboy/Tomboy.cs:319
msgid "Primary Development:"
msgstr "Pengembangan Primer:"
-#: ../Tomboy/Tomboy.cs:330
+#: ../Tomboy/Tomboy.cs:332
msgid "Contributors:"
msgstr "Penyumbang:"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:420
msgid "translator-credits"
msgstr ""
-"Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011.\n"
+"Andika Triwidada <andika at gmail.com>, 2009, 2010, 2011, 2012.\n"
"Dirgita <dirgitadevina at yahoo.co.id>, 2010."
-#: ../Tomboy/Tomboy.cs:424
+#: ../Tomboy/Tomboy.cs:429
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2010,15 +2375,15 @@ msgstr ""
"Hak Cipta © 2004-2007 Alex Graveley\n"
"Hak Cipta © 2004-2011 Lainnya\n"
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:431
msgid "A simple and easy to use desktop note-taking application."
msgstr "Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai."
-#: ../Tomboy/Tomboy.cs:436
+#: ../Tomboy/Tomboy.cs:441
msgid "Homepage"
msgstr "Laman Web"
-#: ../Tomboy/Tomboy.cs:554
+#: ../Tomboy/Tomboy.cs:577
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2026,13 +2391,14 @@ msgid ""
"\n"
"Copyright © 2004-2011 Others\n"
msgstr ""
-"Tomboy: Aplikasi penyimpan catatan desktop yang sederhana dan mudah dipakai.\n"
+"Tomboy: Aplikasi penyimpan catatan desktop yang sederhana dan mudah "
+"dipakai.\n"
"Hak Cipta © 2004-2007 Alex Graveley\n"
"<alex at beatniksoftware.com>\n"
"\n"
"Hak Cipta © 2004-2011 Lainnya\n"
-#: ../Tomboy/Tomboy.cs:568
+#: ../Tomboy/Tomboy.cs:591
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -2044,9 +2410,10 @@ msgstr ""
" --version\t\t\tCetak informasi versi.\n"
" --help\t\t\tCetak pesan cara pakai ini.\n"
" --note-path [lokasi]\t\tMuat/simpan data catatan dalam direktori ini.\n"
-" --search [teks]\t\tBuka jendela cari di semua catatan dengan teks pencarian.\n"
+" --search [teks]\t\tBuka jendela cari di semua catatan dengan teks "
+"pencarian.\n"
-#: ../Tomboy/Tomboy.cs:578
+#: ../Tomboy/Tomboy.cs:601
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"
@@ -2055,12 +2422,26 @@ msgid ""
" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
msgstr ""
" --new-note\t\t\tBuat dan tampilkan sebuah catatan baru.\n"
-" --new-note [title]\t\tBuat dan tampilkan sebuah catatan baru, dengan sebuah judul.\n"
-" --open-note [title/url]\tTampilkan catatan yang telah ada dengan judul cocok.\n"
+" --new-note [title]\t\tBuat dan tampilkan sebuah catatan baru, dengan "
+"sebuah judul.\n"
+" --open-note [title/url]\tTampilkan catatan yang telah ada dengan judul "
+"cocok.\n"
" --start-here\t\t\tTampilkan catatan 'Mulai Di Sini'.\n"
" --highlight-search [teks]\tCari dan tandai teks di catatan yang dibuka.\n"
-#: ../Tomboy/Tomboy.cs:592
+#: ../Tomboy/Tomboy.cs:611
+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 ""
+" --addin:html-export-all [path]\tMengekspor semua catatan ke HTML pada "
+"lokasi yang diberikan.\n"
+" --addin:html-export-all-quit [path]\tMengekspor semua catatan ke HTML pada "
+"lokasi yang diberikan lalu keluar.\n"
+
+#: ../Tomboy/Tomboy.cs:621
#, csharp-format
msgid "Version {0}"
msgstr "Versi {0}"
@@ -2074,8 +2455,12 @@ msgid "_About Tomboy"
msgstr "Tent_ang Tomboy"
#: ../Tomboy/Utils.cs:189
-msgid "The \"Tomboy Notes Manual\" could not be found. Please verify that your installation has been completed successfully."
-msgstr "\"Manual Catatan Tomboy\" tak ditemukan. Silahkan periksa bahwa instalasi Anda telah lengkap dan sukses."
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"\"Manual Catatan Tomboy\" tak ditemukan. Silahkan periksa bahwa instalasi "
+"Anda telah lengkap dan sukses."
#: ../Tomboy/Utils.cs:198
msgid "Help not found"
@@ -2163,17 +2548,21 @@ msgstr "(Nirjudul {0})"
#: ../Tomboy/Watchers.cs:189
#, csharp-format
-msgid "A note with the title <b>{0}</b> already exists. Please choose another name for this note before continuing."
-msgstr "Catatan dengan judul <b>{0}</b> telah ada. Silakan pilih nama lain bagi catatan ini sebelum melanjutkan."
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Catatan dengan judul <b>{0}</b> telah ada. Silakan pilih nama lain bagi "
+"catatan ini sebelum melanjutkan."
#: ../Tomboy/Watchers.cs:204
msgid "Note title taken"
msgstr "Judul catatan telah terpakai"
-#: ../Tomboy/Watchers.cs:587
+#: ../Tomboy/Watchers.cs:601
msgid "_Copy Link Address"
msgstr "_Salin Alamat Taut"
-#: ../Tomboy/Watchers.cs:592
+#: ../Tomboy/Watchers.cs:606
msgid "_Open Link"
msgstr "_Buka Taut"
diff --git a/po/it.po b/po/it.po
index 06e8495..5a6c9b6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,211 +1,246 @@
# Italian translation of Tomboy.
# Copyright (C) 2004-2010, 2011 The Free Software Foundation, Inc.
+# Copyright (C) 2012 the tomboy copyright holder.
# This file is distributed under the same license as the tomboy package.
# Amos Brocco <amos.brocco at mriyasoftware.com>, 2005.
# Daniele Cocca <daniele.cocca at gmail.com>, 2005.
# Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione at ubuntu-it.org>, 2008
-# Milo Casagrande <milo at ubuntu.com>, 2008-2010, 2011.
+# Milo Casagrande <milo at ubuntu.com>, 2008-2010, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-14 22:26+0200\n"
-"PO-Revision-Date: 2011-09-14 22:24+0200\n"
+"POT-Creation-Date: 2012-09-03 08:25+0200\n"
+"PO-Revision-Date: 2012-09-03 08:23+0200\n"
"Last-Translator: Milo Casagrande <milo at ubuntu.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Launchpad-Export-Date: 2011-09-18 12:00+0000\n"
+"X-Generator: Launchpad (build 13955)\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "Accessori"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "Un programma per prendere note semplice e facile da usare"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
msgid "Tomboy Applet Factory"
msgstr "Fabbrica applet 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 "Note Tomboy"
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Simple and easy to use note-taking"
+msgstr "Un programma per prendere note semplice e facile da usare"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+msgid "Accessories"
+msgstr "Accessori"
+
#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "Sincroni_zza note"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "I_nformazioni"
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "Preferen_ze"
#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "A_iuto"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "Preferen_ze"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "Prendi note"
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "I_nformazioni"
#: ../data/tomboy.desktop.in.h:2
msgid "Take notes, link ideas, and stay organized"
msgstr "Prende note, collega le idee e aiuta a restare organizzati"
+#: ../data/tomboy.desktop.in.h:3
+msgid "Note-taker"
+msgstr "Prendi note"
+
#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "Accetta certificati SSL"
+msgid "Enable spellchecking"
+msgstr "Abilita la correzione ortografica"
-# (ndt) potevano anche scriverla meglio...
#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "Timeout per la sincronizzazione automatica in background"
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
+msgstr ""
+"Se impostato a VERO, gli errori di ortografia saranno sottolineati in rosso "
+"e dei suggerimenti per la corretta ortografia saranno mostrati nel menù "
+"accessibile con un clic del tasto destro."
#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "Crea una nuova nota"
+msgid "Enable WikiWord highlighting"
+msgstr "Abilita l'evidenziazione di ParoleWiki"
#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "Carattere personalizzato"
-
-#: ../data/tomboy.schemas.in.h:5
msgid ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
msgstr ""
-"Determina la coordinata X della finestra di ricerca. Salvata all'uscita del "
-"programma."
+"Abilitare questa opzione per evidenziare le parole ScritteComeQuesta. "
+"Facendo clic sulla parola si creerà una nota con quel nome."
+
+#: ../data/tomboy.schemas.in.h:5
+msgid "Enable automatic bulleted lists."
+msgstr "Abilita gli elenchi puntati automatici."
#: ../data/tomboy.schemas.in.h:6
msgid ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
+"Enable this option if you want bulleted lists to be automatic when you place "
+"- or * at the beginning of a line."
msgstr ""
-"Determina la coordinata Y della finestra di ricerca. Salvata all'uscita del "
-"programma."
+"Abilitare questa opzione per fare in modo che l'elenco puntato sia attivato "
+"automaticamente quando si inserisce - o * all'inizio di una riga."
#: ../data/tomboy.schemas.in.h:7
-msgid ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina l'altezza in pixel della finestra di ricerca. Salvata all'uscita "
-"del programma."
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Abilita incolla con il tasto centrale sull'icona."
#: ../data/tomboy.schemas.in.h:8
msgid ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+"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 ""
-"Determina la larghezza in pixel della finestra di ricerca. Salvata "
-"all'uscita del programma."
+"Abilitare questa opzione per fare in modo che un clic col tasto centrale "
+"sull'icona di Tomboy incolli il contenuto marcato con l'orario nella nota "
+"\"Inizia qui\"."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Abilita incolla con il tasto centrale sull'icona."
+msgid "Enable custom font"
+msgstr "Abilita il carattere personalizzato"
-# (ndt) dovrebbe essere roba di windows
#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "Abilita l'icona sulla barra delle applicazioni"
+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 ""
+"Se impostato a VERO, il carattere specificato in custom_font_face verrà "
+"utilizzato nel visualizzare le note. Altrimenti verrà utilizzato il "
+"carattere predefinito del desktop."
#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "Abilita l'evidenziazione di ParoleWiki"
+msgid "Custom Font Face"
+msgstr "Carattere personalizzato"
#: ../data/tomboy.schemas.in.h:12
-msgid "Enable automatic bulleted lists."
-msgstr "Abilita gli elenchi puntati automatici."
+msgid ""
+"If enable_custom_font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr ""
+"Se enable_custom_font è impostato a VERO, il carattere qui specificato sarà "
+"utilizzato nel visualizzare le note."
#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Abilita la chiusura delle note con il tasto Esc."
+msgid "Enable global keybindings"
+msgstr "Abilita le associazioni di tasti globali"
#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "Abilita il carattere personalizzato"
+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 ""
+"Se impostato a VERO, le associazioni globali di tasti specificate in /apps/"
+"tomboy/global_keybindings saranno abilitate, consentendo a utili "
+"funzionalità di Tomboy di essere disponibili da ogni applicazione."
#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "Abilita le associazioni di tasti globali"
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Abilita il dialogo di conferma per l'eliminazione delle note"
#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "Abilita la correzione ortografica"
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"Se disabilitato, il dialogo di conferma per l'eliminazione delle note non "
+"verrà mostrato."
+# (ndt) dovrebbe essere roba di windows
#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "Abilita le note all'avvio"
+msgid "Enable Tray Icon"
+msgstr "Abilita l'icona sulla barra delle applicazioni"
#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Abilita il dialogo di conferma per l'eliminazione delle note"
-
-#: ../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."
+"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 ""
-"Abilitare questa opzione per fare in modo che l'elenco puntato sia attivato "
-"automaticamente quando si inserisce - o * all'inizio di una riga."
+"Se impostato a VERO, l'icona di Tomboy della barra delle applicazioni verrà "
+"visualizzata nell'area di notifica. Potrebbe essere utile disabilitare "
+"quest'opzione quando un'altra applicazione fornisce le funzionalità della "
+"barra delle applicazioni."
+
+#: ../data/tomboy.schemas.in.h:19
+msgid "Start Here Note"
+msgstr "Nota \"Inizia qui\""
#: ../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."
+"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 ""
-"Abilitare questa opzione per fare in modo che un clic col tasto centrale "
-"sull'icona di Tomboy incolli il contenuto marcato con l'orario nella nota "
-"\"Inizia qui\"."
+"L'URI della nota da considerare come la nota \"Inizia qui\", sempre "
+"posizionata sul fondo del menù di Tomboy e accessibile attraverso un tasto "
+"di scelta rapida."
#: ../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 ""
-"Abilitare questa opzione per evidenziare le parole ScritteComeQuesta. "
-"Facendo clic sulla parola si creerà una nota con quel nome."
+msgid "Minimum number of notes to show in menu"
+msgstr "Numero minimo di note da mostrare nel menù"
#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "Tempo massimo per il mount FUSE (ms)"
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Intero per determinare il numero minimo di note da mostrare nel menù di "
+"Tomboy."
+# (ndt) qui si gioca sul fatto delle note
+# 'punzate', appese con uno spillo...
#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "Esporta in HTML tutte le note collegate"
+msgid "List of pinned notes."
+msgstr "Elenco di note in evidenza."
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "Esporta in HTML le note collegate"
-
-#: ../data/tomboy.schemas.in.h:25
msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
msgstr ""
-"Se disabilitato, il dialogo di conferma per l'eliminazione delle note non "
-"verrà mostrato."
+"Elenco, separato da spazi, di URI di note che dovrebbero apparire sempre nel "
+"menù delle note di Tomboy."
+
+#: ../data/tomboy.schemas.in.h:25
+msgid "Maximum note title length to show in tray menu."
+msgstr "Lunghezza massima del titolo della nota da mostrare nel menù."
+# (ndt) non ho idea del perché differenzino tra tray e icona dell'applet...
#: ../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."
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
msgstr ""
-"Se enable_custom_font è impostato a VERO, il carattere qui specificato sarà "
-"utilizzato nel visualizzare le note."
+"Numero massimo di caratteri del titolo della nota da mostrare nel menù "
+"dell'applet nell'area di notifica."
#: ../data/tomboy.schemas.in.h:27
+msgid "Enable startup notes"
+msgstr "Abilita le note all'avvio"
+
+#: ../data/tomboy.schemas.in.h:28
msgid ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
@@ -213,238 +248,52 @@ msgstr ""
"Se abilitato, tutte le note aperte all'uscita di Tomboy saranno riaperte "
"automaticamente all'avvio."
-#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "Se abilitato, una nota aperta può essere chiusa premendo il tasto Esc."
-
#: ../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 ""
-"Se impostato a VERO, l'icona di Tomboy della barra delle applicazioni verrà "
-"visualizzata nell'area di notifica. Potrebbe essere utile disabilitare "
-"quest'opzione quando un'altra applicazione fornisce le funzionalità della "
-"barra delle applicazioni."
+msgid "Show applet menu"
+msgstr "Mostra il menù dell'applet"
#: ../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."
+"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 ""
-"Se impostato a VERO, gli errori di ortografia saranno sottolineati in rosso "
-"e dei suggerimenti per la corretta ortografia saranno mostrati nel menù "
-"accessibile con un clic del tasto destro."
+"La scorciatoia globale per aprire il menù dell'applet di Tomboy. Il formato "
+"è simile a \"<Control>a\" o \"<Shift><Alt>F1\". "
+"L'analizzatore è abbastanza permissivo e accetta minuscole o maiuscole e "
+"anche abbreviazioni come \"<Ctl>\" e \"<Ctrl>\". Se l'opzione "
+"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
+"tasti abbinata a questa azione."
#: ../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 ""
-"Se impostato a VERO, le associazioni globali di tasti specificate in /apps/"
-"tomboy/global_keybindings saranno abilitate, consentendo a utili "
-"funzionalità di Tomboy di essere disponibili da ogni applicazione."
-
-#: ../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 ""
-"Se impostato a VERO, il carattere specificato in custom_font_face verrà "
-"utilizzato nel visualizzare le note. Altrimenti verrà utilizzato il "
-"carattere predefinito del desktop."
-
-#: ../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 ""
-"Indica che il plugin per l'importazione delle note non è stato avviato, così "
-"da venir avviato automaticamente al prossimo avvio di Tomboy."
-
-#: ../data/tomboy.schemas.in.h:34
-msgid ""
-"Integer determining the minimum number of notes to show in the Tomboy note "
-"menu."
-msgstr ""
-"Intero per determinare il numero minimo di note da mostrare nel menù di "
-"Tomboy."
-
-#: ../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 ""
-"Valore intero che indica ogni quanto tempo eseguire una sincronizzazione in "
-"background delle note (quando configurata). Qualsiasi valore minore di 1 "
-"indica che la sincronizzazione è disabilitata. Il più piccolo valore "
-"accettabile è 5. I valori sono in minuti."
-
-#: ../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 ""
-"Valore intero che indica se è presente una preferenza per eseguire sempre "
-"una specifica azione quando viene rilevato un conflitto, invece di chiedere "
-"all'utente. I valori sono mappati con un'enumerazione interna. \"0\" indica "
-"la richiesta all'utente quando si verifica un conflitto, così da gestirli "
-"caso per caso."
-
-#: ../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 ""
-"Valore intero che indica se è presente una preferenza per eseguire sempre un "
-"aggiornamento specifico dei collegamenti quando una nota è rinominata. Il "
-"valore è mappata su un enumerazione interna. \"0\" indica che è necessario "
-"avvisare l'utente quando un'azione di rinomina potrebbe coinvolgere dei "
-"collegamenti esistenti. \"1\" indica che i collegamenti possono essere "
-"rimossi automaticamente. \"2\" indica che i collegamenti possono essere "
-"aggiornati con il nuovo nome della nota."
-
-#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "L'ultima directory usata nell'esportazione HTML"
-
-# (ndt) sarebbe da accorciare...
-#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr ""
-"Comportamento dell'aggiornamento dei collegamenti con la rinomina di una nota"
-
-# (ndt) qui si gioca sul fatto delle note
-# 'punzate', appese con uno spillo...
-#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "Elenco di note in evidenza."
-
-# (ndt) non ho idea del perché differenzino tra tray e icona dell'applet...
-#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr ""
-"Numero massimo di caratteri del titolo della nota da mostrare nel menù "
-"dell'applet nell'area di notifica."
-
-#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr "Lunghezza massima del titolo della nota da mostrare nel menù."
-
-#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "Numero minimo di note da mostrare nel menù"
-
-#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "Comportamento salvato per i conflitti di sincronizzazione"
-
-#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "Apre le modifiche recenti"
-
-#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "Apre la finestra di ricerca"
-
-#: ../data/tomboy.schemas.in.h:47
msgid "Open Start Here"
msgstr "Apre \"Inizia qui\""
-# (ndt) tolto Tomboy volutamente
-#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr ""
-"Percorso sul server SSH alla directory di sincronizzazione (opzionale)."
-
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:32
msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
+"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 ""
-"Percorso al server di sincronizzazione per il servizio add-in di "
-"sincronizzazione del file system."
-
-#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "Cartella SSHFS di sincronizzazione remota"
-
-#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "Nome utente SSHFS per la sincronizzazione remota"
-
-#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "Porta del server SSHFS di sincronizzazione"
-
-#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "URL del server SSHFS di sincronizzazione"
-
-#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr "Altezza salvata della finestra di ricerca"
-
-#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Posizione orizzontale salvata della finestra di ricerca"
-
-#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Posizione verticale salvata della finestra di ricerca"
-
-#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "Larghezza salvata della finestra di ricerca"
-
-#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "Add-in del servizio di sincronizzazione selezionato"
-
-#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "Impostare a \"TRUE\" per attivare"
-
-#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "Mostra il menù dell'applet"
-
-#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "Nota \"Inizia qui\""
-
-#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "Prima esecuzione dell'importazione delle note"
-
-#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "ID client di sincronizzazione"
-
-#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "Percorso al server locale di sincronizzazione"
+"La scorciatoia globale per aprire la nota \"Inizia qui\". Il formato è "
+"simile a \"<Control>a\" o \"<Shift><Alt>F1\". "
+"L'analizzatore è abbastanza permissivo e accetta minuscole o maiuscole e "
+"anche abbreviazioni come \"<Ctl>\" e \"<Ctrl>\". Se l'opzione "
+"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
+"tasti abbinata a questa azione."
-#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "Il formato della data che è usato per la marcatura temporale."
+#: ../data/tomboy.schemas.in.h:33
+msgid "Create a new Note"
+msgstr "Crea una nuova nota"
# (ndT) bisogna lasciare Shift
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:34
msgid ""
"The global keybinding for creating and displaying a new Note. The format "
"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -460,23 +309,11 @@ msgstr ""
"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
"tasti abbinata a quest'azione."
-#: ../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 ""
-"La scorciatoia globale per aprire la nota \"Inizia qui\". Il formato è "
-"simile a \"<Control>a\" o \"<Shift><Alt>F1\". "
-"L'analizzatore è abbastanza permissivo e accetta minuscole o maiuscole e "
-"anche abbreviazioni come \"<Ctl>\" e \"<Ctrl>\". Se l'opzione "
-"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
-"tasti abbinata a questa azione."
+#: ../data/tomboy.schemas.in.h:35
+msgid "Open Search Dialog"
+msgstr "Apre la finestra di ricerca"
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:36
msgid ""
"The global keybinding for opening the Note Search dialog. The format looks "
"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -492,7 +329,11 @@ msgstr ""
"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
"tasti abbinata a questa azione."
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:37
+msgid "Open Recent Changes"
+msgstr "Apre le modifiche recenti"
+
+#: ../data/tomboy.schemas.in.h:38
msgid ""
"The global keybinding for opening the Recent Changes dialog. The format "
"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -508,34 +349,69 @@ msgstr ""
"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
"tasti abbinata a questa azione."
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:39
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Altezza salvata della finestra di ricerca"
+
+#: ../data/tomboy.schemas.in.h:40
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."
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
msgstr ""
-"La scorciatoia globale per aprire il menù dell'applet di Tomboy. Il formato "
-"è simile a \"<Control>a\" o \"<Shift><Alt>F1\". "
-"L'analizzatore è abbastanza permissivo e accetta minuscole o maiuscole e "
-"anche abbreviazioni come \"<Ctl>\" e \"<Ctrl>\". Se l'opzione "
-"sarà impostata su \"disabled\", allora non ci sarà alcuna associazione di "
-"tasti abbinata a questa azione."
+"Determina l'altezza in pixel della finestra di ricerca. Salvata all'uscita "
+"del programma."
+
+#: ../data/tomboy.schemas.in.h:41
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Larghezza salvata della finestra di ricerca"
+
+#: ../data/tomboy.schemas.in.h:42
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Determina la larghezza in pixel della finestra di ricerca. Salvata "
+"all'uscita del programma."
+
+#: ../data/tomboy.schemas.in.h:43
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posizione orizzontale salvata della finestra di ricerca"
+
+#: ../data/tomboy.schemas.in.h:44
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la coordinata X della finestra di ricerca. Salvata all'uscita del "
+"programma."
+
+#: ../data/tomboy.schemas.in.h:45
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posizione verticale salvata della finestra di ricerca"
+
+#: ../data/tomboy.schemas.in.h:46
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la coordinata Y della finestra di ricerca. Salvata all'uscita del "
+"programma."
-#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "Il gestore per gli URL \"note://\""
+#: ../data/tomboy.schemas.in.h:47
+msgid "Last Directory used in HTML Export"
+msgstr "L'ultima directory usata nell'esportazione HTML"
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:48
msgid ""
"The last directory a note was exported to using the Export To HTML plugin."
msgstr ""
"L'ultima directory in cui è stata esportata una nota attraverso il plugin "
"«Esporta in HTML»."
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:49
+msgid "HTML Export Linked Notes"
+msgstr "Esporta in HTML le note collegate"
+
+#: ../data/tomboy.schemas.in.h:50
msgid ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
@@ -543,7 +419,11 @@ msgstr ""
"L'ultima impostazione della casella di selezione \"Esportare note collegate"
"\" nel plugin \"Esporta in HTML\"."
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:51
+msgid "HTML Export All Linked Notes"
+msgstr "Esporta in HTML tutte le note collegate"
+
+#: ../data/tomboy.schemas.in.h:52
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 "
@@ -556,25 +436,59 @@ msgstr ""
"le note (trovate ricorsivamente) devono essere comprese nell'esportazione in "
"HTML."
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:53
+msgid "Sticky Note Importer First Run"
+msgstr "Prima esecuzione dell'importazione delle note"
+
+#: ../data/tomboy.schemas.in.h:54
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."
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
msgstr ""
-"L'URI della nota da considerare come la nota \"Inizia qui\", sempre "
-"posizionata sul fondo del menù di Tomboy e accessibile attraverso un tasto "
-"di scelta rapida."
+"Indica che il plugin per l'importazione delle note non è stato avviato, così "
+"da venir avviato automaticamente al prossimo avvio di Tomboy."
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:55
+msgid "Synchronization Client ID"
+msgstr "ID client di sincronizzazione"
+
+#: ../data/tomboy.schemas.in.h:56
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."
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
msgstr ""
-"La porta da usare durante la connessione SSH al server di sincronizzazione. "
-"Impostare a -1 o a un numero minore per usare la porta SSH predefinita."
+"Identificatore univoco per questo client Tomboy, utilizzato durante le "
+"comunicazioni con un server di sincronizzazione."
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:57
+msgid "Synchronization Local Server Path"
+msgstr "Percorso al server locale di sincronizzazione"
+
+#: ../data/tomboy.schemas.in.h:58
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Percorso al server di sincronizzazione per il servizio add-in di "
+"sincronizzazione del file system."
+
+#: ../data/tomboy.schemas.in.h:59
+msgid "Selected Synchronization Service Addin"
+msgstr "Add-in del servizio di sincronizzazione selezionato"
+
+#: ../data/tomboy.schemas.in.h:60
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Identificatore univoco per l'add-in del servizio di sincronizzazione "
+"attualmente configurato."
+
+#: ../data/tomboy.schemas.in.h:61
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "Tempo massimo per il mount FUSE (ms)"
+
+#: ../data/tomboy.schemas.in.h:62
msgid ""
"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
"mount a sync share."
@@ -582,31 +496,51 @@ msgstr ""
"Tempo (in millisecondi) da aspettare per una risposta usando FUSE per "
"montare una condivisione di sincronizzazione."
-#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "Formato della marcatura temporale"
+#: ../data/tomboy.schemas.in.h:63
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "Cartella SSHFS di sincronizzazione remota"
-#: ../data/tomboy.schemas.in.h:79
+# (ndt) tolto Tomboy volutamente
+#: ../data/tomboy.schemas.in.h:64
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr ""
+"Percorso sul server SSH alla directory di sincronizzazione (opzionale)."
+
+#: ../data/tomboy.schemas.in.h:65
+msgid "SSHFS Synchronization Server URL"
+msgstr "URL del server SSHFS di sincronizzazione"
+
+#: ../data/tomboy.schemas.in.h:66
msgid "URL of SSH server containing Tomboy synchronization directory."
msgstr "L'URL del server SSH che contiene la directory di sincronizzazione."
-#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
+#: ../data/tomboy.schemas.in.h:67
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "Nome utente SSHFS per la sincronizzazione remota"
+
+#: ../data/tomboy.schemas.in.h:68
+msgid "User name to use when connecting to the synchronization server via SSH."
msgstr ""
-"Identificatore univoco per l'add-in del servizio di sincronizzazione "
-"attualmente configurato."
+"Nome utente da usare durante la connessione SSH al server di "
+"sincronizzazione."
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:69
+msgid "SSHFS Synchronization Server Port"
+msgstr "Porta del server SSHFS di sincronizzazione"
+
+#: ../data/tomboy.schemas.in.h:70
msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
+"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 ""
-"Identificatore univoco per questo client Tomboy, utilizzato durante le "
-"comunicazioni con un server di sincronizzazione."
+"La porta da usare durante la connessione SSH al server di sincronizzazione. "
+"Impostare a -1 o a un numero minore per usare la porta SSH predefinita."
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:71
+msgid "Accept SSL Certificates"
+msgstr "Accetta certificati SSL"
+
+#: ../data/tomboy.schemas.in.h:72
msgid ""
"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
"user."
@@ -614,19 +548,88 @@ msgstr ""
"Usa l'opzione \"-ac\" di wdfs per accettare certificati SSL senza chiedere "
"alcuna conferma."
-#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
+#: ../data/tomboy.schemas.in.h:73
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "Comportamento salvato per i conflitti di sincronizzazione"
+
+#: ../data/tomboy.schemas.in.h:74
+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 ""
-"Nome utente da usare durante la connessione SSH al server di "
-"sincronizzazione."
+"Valore intero che indica se è presente una preferenza per eseguire sempre "
+"una specifica azione quando viene rilevato un conflitto, invece di chiedere "
+"all'utente. I valori sono mappati con un'enumerazione interna. \"0\" indica "
+"la richiesta all'utente quando si verifica un conflitto, così da gestirli "
+"caso per caso."
-#: ../data/tomboy.schemas.in.h:84
+# (ndt) potevano anche scriverla meglio...
+#: ../data/tomboy.schemas.in.h:75
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Timeout per la sincronizzazione automatica in background"
+
+#: ../data/tomboy.schemas.in.h:76
msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
+"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 ""
-"Elenco, separato da spazi, di URI di note che dovrebbero apparire sempre nel "
-"menù delle note di Tomboy."
+"Valore intero che indica ogni quanto tempo eseguire una sincronizzazione in "
+"background delle note (quando configurata). Qualsiasi valore minore di 1 "
+"indica che la sincronizzazione è disabilitata. Il più piccolo valore "
+"accettabile è 5. I valori sono in minuti."
+
+# (ndt) sarebbe da accorciare...
+#: ../data/tomboy.schemas.in.h:77
+msgid "Link Updating Behavior on Note Rename"
+msgstr ""
+"Comportamento dell'aggiornamento dei collegamenti con la rinomina di una nota"
+
+#: ../data/tomboy.schemas.in.h:78
+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 ""
+"Valore intero che indica se è presente una preferenza per eseguire sempre un "
+"aggiornamento specifico dei collegamenti quando una nota è rinominata. Il "
+"valore è mappata su un enumerazione interna. \"0\" indica che è necessario "
+"avvisare l'utente quando un'azione di rinomina potrebbe coinvolgere dei "
+"collegamenti esistenti. \"1\" indica che i collegamenti possono essere "
+"rimossi automaticamente. \"2\" indica che i collegamenti possono essere "
+"aggiornati con il nuovo nome della nota."
+
+#: ../data/tomboy.schemas.in.h:79
+msgid "Timestamp format"
+msgstr "Formato della marcatura temporale"
+
+#: ../data/tomboy.schemas.in.h:80
+msgid "The date format that is used for the timestamp."
+msgstr "Il formato della data che è usato per la marcatura temporale."
+
+#: ../data/tomboy.schemas.in.h:81
+msgid "Enable closing notes with escape."
+msgstr "Abilita la chiusura delle note con il tasto Esc."
+
+#: ../data/tomboy.schemas.in.h:82
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr "Se abilitato, una nota aperta può essere chiusa premendo il tasto Esc."
+
+#: ../data/tomboy.schemas.in.h:83
+msgid "The handler for \"note://\" URLs"
+msgstr "Il gestore per gli URL \"note://\""
+
+#: ../data/tomboy.schemas.in.h:84
+msgid "Set to TRUE to activate"
+msgstr "Impostare a \"TRUE\" per attivare"
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -821,14 +824,14 @@ msgid "Note exported successfully"
msgstr "Nota esportata con successo"
#: ../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 "Accesso negato."
#: ../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 "La cartella non esiste."
@@ -882,7 +885,7 @@ msgstr "Inserisci marcatura temporale"
#. 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 "dddd d MMMM, H.mm"
@@ -953,10 +956,20 @@ msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd dd/MM/yyyy, H.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 "Rimuovi collegamenti interrotti"
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:42
+#: ../Tomboy/ExportAllApplicationAddin.cs:70
+#: ../Tomboy/Synchronization/SyncManager.cs:162
+msgid "_Tools"
+msgstr "_Strumenti"
+
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:44
+msgid "_Remove broken links"
+msgstr "_Rimuovi collegamenti interrotti"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Aggiungi una bozza"
@@ -1146,98 +1159,102 @@ msgstr "Impostare il browser predefinito e provare ancora"
msgid "Tomboy Web"
msgstr "Tomboy Web"
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
#, csharp-format
msgid "Export All Notes to {0}"
msgstr "Esporta tutte le note in {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
#, csharp-format
msgid "Start exporting notes to {0}"
msgstr "Avvio esportazione note in {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#: ../Tomboy/ExportAllApplicationAddin.cs:63
#, csharp-format
msgid "Export selected notebook to {0}"
msgstr "Esportazione blocco note in {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#: ../Tomboy/ExportAllApplicationAddin.cs:64
#, csharp-format
msgid "Start exporting notebook to {0}"
msgstr "Inizio esportazione blocco note in {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Strumenti"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#: ../Tomboy/ExportAllApplicationAddin.cs:73
msgid "Export"
msgstr "Esporta"
# (ndt) suggerimento, punto finale volutamente tolto
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#: ../Tomboy/ExportAllApplicationAddin.cs:74
msgid "Export your notes."
msgstr "Esporta le proprie note"
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
#, csharp-format
msgid "Export All Notes To {0}"
msgstr "Esporta tutte le note in {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#: ../Tomboy/ExportAllApplicationAddin.cs:82
#, csharp-format
msgid "Export Selected Notebook To {0}"
msgstr "Esporta blocco note in {0}"
-# (ndt) questa cosa qui dovrebbe essere un titolo di un dialogo e in teoria è per l'esportazione di tutte le note in un determinato formato
-#: ../Tomboy/ExportAllApplicationAddin.cs:153
-#, csharp-format
-msgid "All Notes {0} Export"
-msgstr "Esportazione {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 "Impossibile esportare, accesso non consentito."
-#: ../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 "Impossibile esportare, la cartella non esiste."
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#: ../Tomboy/ExportAllApplicationAddin.cs:175
+msgid "Could not export, error with the path. (No ending \"?)"
+msgstr ""
+"Impossibile esportare, possibile errore nel percorso (forse non termina con "
+"\")"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:177
+#: ../Tomboy/ExportAllApplicationAddin.cs:258
+#: ../Tomboy/ExportAllApplicationAddin.cs:336
#, csharp-format
msgid "Could not export: {0}"
msgstr "Impossibile esportare: {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
+# (ndt) questa cosa qui dovrebbe essere un titolo di un dialogo e in teoria è per l'esportazione di tutte le note in un determinato formato
+#: ../Tomboy/ExportAllApplicationAddin.cs:231
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Esportazione {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:260
+#: ../Tomboy/ExportAllApplicationAddin.cs:338
msgid "Unknown error."
msgstr "Errore sconosciuto."
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:237
+#: ../Tomboy/ExportAllApplicationAddin.cs:291
+#: ../Tomboy/Notebooks/Notebook.cs:243
msgid "Unfiled Notes"
msgstr "Note non archiviate"
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#: ../Tomboy/ExportAllApplicationAddin.cs:445
#, csharp-format
msgid "Your notes were exported to \"{0}\"."
msgstr "Le note sono state esportate in «{0}»."
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#: ../Tomboy/ExportAllApplicationAddin.cs:454
msgid "Notes exported successfully"
msgstr "Note esportate con successo"
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#: ../Tomboy/ExportAllApplicationAddin.cs:477
#, csharp-format
msgid "Could not save the files in \"{0}\""
msgstr "Impossibile salvare i file in «{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 "Creazione cartella di destinazione per l'esportazione in {0}"
@@ -1350,11 +1367,11 @@ msgstr "Blocchi note"
msgid "{0} Notebook Template"
msgstr "Modello blocco note {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:153
+#: ../Tomboy/Notebooks/Notebook.cs:159
msgid "New Note"
msgstr "Nuova nota"
-#: ../Tomboy/Notebooks/Notebook.cs:205
+#: ../Tomboy/Notebooks/Notebook.cs:211
msgid "All Notes"
msgstr "Tutte le note"
@@ -1396,7 +1413,7 @@ msgstr "Blocco note"
msgid "_New notebook..."
msgstr "Nuovo _blocco note..."
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
#, csharp-format
msgid "New Note {0}"
msgstr "Nuova nota {0}"
@@ -1441,12 +1458,12 @@ msgstr "Nuovo modello nota"
# (ndt) è il titolo di una nota
#. 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 "Le note sono state spostate!"
#. 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 "
@@ -1494,7 +1511,7 @@ msgstr ""
"\n"
"Ciao!"
-#: ../Tomboy/NoteManager.cs:265
+#: ../Tomboy/NoteManager.cs:269
msgid ""
"<note-content>Start Here\n"
"\n"
@@ -1532,7 +1549,7 @@ msgstr ""
"collegamenti con Tomboy</link:internal> viene sottolineato automaticamente. "
"Fare clic sul collegamento per aprire la nota.</note-content>"
-#: ../Tomboy/NoteManager.cs:284
+#: ../Tomboy/NoteManager.cs:288
msgid ""
"<note-content>Using Links in Tomboy\n"
"\n"
@@ -1563,17 +1580,17 @@ msgstr ""
"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 "Inizia qui"
-#: ../Tomboy/NoteManager.cs:304
+#: ../Tomboy/NoteManager.cs:308
msgid "Using Links in Tomboy"
msgstr "Usare i collegamenti con 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 "Scrivere qui la nuova nota."
@@ -1697,7 +1714,7 @@ msgid "Delete this note"
msgstr "Elimina questa nota"
# (ndt) voce di menù
-#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:164
msgid "Synchronize Notes"
msgstr "Sincronizza note"
@@ -1744,65 +1761,71 @@ msgstr "Trova _precedente"
msgid "Cannot create note"
msgstr "Impossibile creare la nota"
-#: ../Tomboy/NoteWindow.cs:832
+#: ../Tomboy/NoteWindow.cs:833
msgid "_Find:"
msgstr "_Trova:"
-#: ../Tomboy/NoteWindow.cs:843
+#: ../Tomboy/NoteWindow.cs:847
msgid "_Previous"
msgstr "Pr_ecedente"
-#: ../Tomboy/NoteWindow.cs:852
+#: ../Tomboy/NoteWindow.cs:856
msgid "_Next"
msgstr "S_uccessivo"
-#: ../Tomboy/NoteWindow.cs:1335
+#. x of x - specifically Number of Matches and what location is the cursor in the list of matches
+#: ../Tomboy/NoteWindow.cs:885
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} di {1}"
+
+#: ../Tomboy/NoteWindow.cs:1368
msgid "_Bold"
msgstr "_Grassetto"
-#: ../Tomboy/NoteWindow.cs:1347
+#: ../Tomboy/NoteWindow.cs:1380
msgid "_Italic"
msgstr "_Corsivo"
-#: ../Tomboy/NoteWindow.cs:1359
+#: ../Tomboy/NoteWindow.cs:1392
msgid "_Strikeout"
msgstr "_Barrato"
-#: ../Tomboy/NoteWindow.cs:1371
+#: ../Tomboy/NoteWindow.cs:1404
msgid "_Highlight"
msgstr "_Evidenziato"
-#: ../Tomboy/NoteWindow.cs:1384
+#: ../Tomboy/NoteWindow.cs:1417
msgid "Font Size"
msgstr "Dimensione del carattere"
-#: ../Tomboy/NoteWindow.cs:1387
+#: ../Tomboy/NoteWindow.cs:1420
msgid "_Normal"
msgstr "_Normale"
-#: ../Tomboy/NoteWindow.cs:1404
+#: ../Tomboy/NoteWindow.cs:1437
msgid "Hu_ge"
msgstr "_Enorme"
-#: ../Tomboy/NoteWindow.cs:1412
+#: ../Tomboy/NoteWindow.cs:1445
msgid "_Large"
msgstr "_Grande"
-#: ../Tomboy/NoteWindow.cs:1420
+#: ../Tomboy/NoteWindow.cs:1453
msgid "S_mall"
msgstr "_Piccolo"
# (ndt) vode di menù
-#: ../Tomboy/NoteWindow.cs:1429
+#: ../Tomboy/NoteWindow.cs:1462
msgid "Increase Font Size"
msgstr "Aumenta dimensione carattere"
# (ndt) voce di meù
-#: ../Tomboy/NoteWindow.cs:1447
+#: ../Tomboy/NoteWindow.cs:1480
msgid "Decrease Font Size"
msgstr "Diminuisci dimensione carattere"
-#: ../Tomboy/NoteWindow.cs:1467
+#: ../Tomboy/NoteWindow.cs:1500
msgid "Bullets"
msgstr "Elenco puntato"
@@ -2130,7 +2153,7 @@ msgstr ""
msgid "Click here to search across all notebooks"
msgstr "Fare clic qui per cercare in tutti i blocchi note"
-#: ../Tomboy/RecentChanges.cs:775
+#: ../Tomboy/RecentChanges.cs:780
msgid "Notes"
msgstr "Note"
@@ -2406,25 +2429,25 @@ msgstr ""
"Aggiungere «modprobe fuse» al file «/etc/init.d/boot.local» oppure «fuse» al "
"file «/etc/modules»."
-#: ../Tomboy/Tomboy.cs:251
+#: ../Tomboy/Tomboy.cs:253
msgid "Cannot create new note"
msgstr "Impossibile creare una nuova nota"
-#: ../Tomboy/Tomboy.cs:317
+#: ../Tomboy/Tomboy.cs:319
msgid "Primary Development:"
msgstr "Sviluppo principale:"
-#: ../Tomboy/Tomboy.cs:330
+#: ../Tomboy/Tomboy.cs:332
msgid "Contributors:"
msgstr "Collaboratori:"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:420
msgid "translator-credits"
msgstr ""
"Milo Casagrande <milo at ubuntu.com>\n"
"Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione at ubuntu-it.org>"
-#: ../Tomboy/Tomboy.cs:424
+#: ../Tomboy/Tomboy.cs:429
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2432,15 +2455,15 @@ msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Altri\n"
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:431
msgid "A simple and easy to use desktop note-taking application."
msgstr "Un programma per prendere note semplice e facile da usare."
-#: ../Tomboy/Tomboy.cs:436
+#: ../Tomboy/Tomboy.cs:441
msgid "Homepage"
msgstr "Sito web"
-#: ../Tomboy/Tomboy.cs:554
+#: ../Tomboy/Tomboy.cs:577
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2454,7 +2477,7 @@ msgstr ""
"\n"
"Copyright © 2004-2011 Altri\n"
-#: ../Tomboy/Tomboy.cs:568
+#: ../Tomboy/Tomboy.cs:591
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -2469,7 +2492,7 @@ msgstr ""
" --search [testo]\t\tApre la finestra per cercare in tutte le note il testo "
"inserito.\n"
-#: ../Tomboy/Tomboy.cs:578
+#: ../Tomboy/Tomboy.cs:601
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"
@@ -2485,7 +2508,19 @@ msgstr ""
" --highlight-search [testo]\tCerca ed evidenzia \"testo\" nella nota "
"aperta\n"
-#: ../Tomboy/Tomboy.cs:592
+#: ../Tomboy/Tomboy.cs:611
+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 ""
+" --addin:html-export-all [percorso]\tEsporta tutte le note in HTML alla "
+"posizione data\n"
+" --addin:html-export-all-quit [percorso]\tEsporta tutte le note in HTML "
+"alla posizione data ed esce\n"
+
+#: ../Tomboy/Tomboy.cs:621
#, csharp-format
msgid "Version {0}"
msgstr "Versione {0}"
@@ -2607,10 +2642,10 @@ msgstr ""
msgid "Note title taken"
msgstr "Nome già in uso"
-#: ../Tomboy/Watchers.cs:587
+#: ../Tomboy/Watchers.cs:601
msgid "_Copy Link Address"
msgstr "_Copia indirizzo collegamento"
-#: ../Tomboy/Watchers.cs:592
+#: ../Tomboy/Watchers.cs:606
msgid "_Open Link"
msgstr "_Apri collegamento"
diff --git a/po/ko.po b/po/ko.po
index 81a4741..73dce06 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@
# This file is distributed under the same license as the tomboy package.
#
# Young-Ho Cha <ganadist at gmail.com>, 2006, 2007.
-# Changwoo Ryu <cwryu at debian.org>, 2007, 2008, 2009, 2010, 2011.
+# Changwoo Ryu <cwryu at debian.org>, 2007-2012.
#
# 새로 번역하신 분은 아래 "translator-credits"에 추가하세요.
#
@@ -14,8 +14,8 @@ msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-30 20:22+0000\n"
-"PO-Revision-Date: 2011-09-23 04:15+0900\n"
+"POT-Creation-Date: 2012-05-01 16:57+0000\n"
+"PO-Revision-Date: 2012-09-09 07:03+0900\n"
"Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
"Language-Team: GNOME Korea <gnome-kr at googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -25,176 +25,202 @@ msgstr ""
"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 "톰보이 애플릿 팩토리"
-#: ../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 "톰보이 쪽지"
+#: ../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 ""
+"참이면 맞춤법이 틀릴 때 빨간색으로 보이고, 오른쪽 마우스 단추를 누르면 올바"
+"른 맞춤법으로 된 단어가 보입니다."
#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "새 쪽지 만들기"
+msgid "Enable WikiWord highlighting"
+msgstr "위키문법 강조 사용"
#: ../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 좌표, 톰보이가 끝날 때 저장합니다."
+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 좌표, 톰보이가 끝날 때 저장합니다."
+"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 "\"모든 쪽지 검색\" 창의 픽셀 높이, 톰보이가 끝날 때 저장합니다."
+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 "\"모든 쪽지 검색\" 창의 픽셀 너비, 톰보이가 끝날 때 저장합니다."
+"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 ""
+"이 옵션을 사용하면 톰보이 아이콘에 가운데 단추를 누르면 복사한 내용을 현재 시"
+"각과 같이 \"여기서 시작\" 쪽지에 붙여넣습니다."
#: ../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 ""
+"참이면 custom_font_face에 설정된 글꼴이름이 쪽지를 보이는 기본 글꼴로 됩니"
+"다. 그렇지 않으면 데스크톱 기본 글꼴로 쪽지를 보여줍니다."
#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "위키문법 강조 사용"
+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이 참이면 여기에 설정된 글꼴로 쪽지를 나타냅니다."
#: ../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 ""
+"참이면 /apps/tomboy/global_keybindings이 데스크톱 전체 바로가기 키로 설정되"
+"며 모든 응용프로그램에서 톰보이를 사용할 수 있게됩니다."
#: ../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 "쪽지 삭제 확인 창 사용"
-
-#: ../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."
+"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 ""
-"이 옵션을 사용하면 줄을 시작할 때 - 혹은 * 문자를 쓰면 자동으로 목록으로 바뀝"
-"니다."
+"참이면 알림 영역에 톰보이 트레이 아이콘을 표시합니다. 다른 프로그램이 트레이 "
+"아이콘의 기능을 대싱 하는 경우 거짓으로 설정하는 편이 좋을 수도 있습니다."
+
+#: ../data/tomboy.schemas.in.h:19
+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."
+"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. 이 쪽지는 항상 톰보이 쪽지 메뉴의 "
+"맨 아래에 있고 단축 키로도 접근할 수 있습니다."
#: ../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 마운트 시간 제한 (밀리초)"
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr "톰보이 쪽지 메뉴에 표시할 쪽지의 최소 개수를 결정하는 숫자."
#: ../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 목록, 공백으로 구분."
#: ../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이 참이면 여기에 설정된 글꼴로 쪽지를 나타냅니다."
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr "트레이 혹은 패널 애플릿 메뉴에서 표시할 쪽지 제목의 최대 글자 수."
#: ../data/tomboy.schemas.in.h:27
+msgid "Enable startup notes"
+msgstr "시작 쪽지 사용"
+
+#: ../data/tomboy.schemas.in.h:28
msgid ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
@@ -202,368 +228,338 @@ msgstr ""
"참이면 톰보이가 끝날때 열려있던 모든 쪽지가 다음에 시작할 때 자동으로 모두 열"
"립니다."
-#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr "참이면 Esc 키를 눌렀을 때 열려 있는 쪽지를 닫습니다."
-
#: ../data/tomboy.schemas.in.h: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 ""
-"참이면 알림 영역에 톰보이 트레이 아이콘을 표시합니다. 다른 프로그램이 트레이 "
-"아이콘의 기능을 대싱 하는 경우 거짓으로 설정하는 편이 좋을 수도 있습니다."
+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."
+"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 ""
-"참이면 맞춤법이 틀릴 때 빨간색으로 보이고, 오른쪽 마우스 단추를 누르면 올바"
-"른 맞춤법으로 된 단어가 보입니다."
+"톰보이 애플릿 메뉴를 볼 때 쓸 바로가기 키. \"<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 ""
-"참이면 /apps/tomboy/global_keybindings이 데스크톱 전체 바로가기 키로 설정되"
-"며 모든 응용프로그램에서 톰보이를 사용할 수 있게됩니다."
+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."
+"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 ""
-"참이면 custom_font_face에 설정된 글꼴이름이 쪽지를 보이는 기본 글꼴로 됩니"
-"다. 그렇지 않으면 데스크톱 기본 글꼴로 쪽지를 보여줍니다."
+"\"여기서 시작\"에 쓸 바로가기 키. \"<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 ""
-"쪽지 가져오기 플러그인을 아직 실행하지 않았다는 뜻입니다. 즉 톰보이가 다음 번"
-"에 시작할 때 가져오기 플러그인을 실행해야 한다는 뜻입니다."
+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 "톰보이 쪽지 메뉴에 표시할 쪽지의 최소 개수를 결정하는 숫자."
+"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."
+"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 ""
-"충돌이 발생했을 때 사용자에게 확인하지 않고 지정한 방식대로 수행하는 지 여부"
-"를 나타내는 정수 값. 이 값은 내부의 열거형을 나타냅니다. 값이 0이면 충돌이 발"
-"생했을 때 사용자에게 확인해서 충돌 상황에 따라 개별적으로 처리할 수 있습니다."
+"쪽지 검색 창을 열 때 쓸 바로가기 키. \"<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 "\"모든 쪽지 검색\" 창의 픽셀 높이, 톰보이가 끝날 때 저장합니다."
#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr "트레이 혹은 패널 애플릿 메뉴에서 표시할 쪽지 제목의 최대 글자 수."
+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 "\"모든 쪽지 검색\" 창의 픽셀 너비, 톰보이가 끝날 때 저장합니다."
#: ../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 좌표, 톰보이가 끝날 때 저장합니다."
#: ../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 좌표, 톰보이가 끝날 때 저장합니다."
#: ../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 "SSH 서버에서 톰보이 동기화 디렉터리의 경로 (옵션)."
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr "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 ""
+"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 동기화 서버 포트"
+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 "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 ""
+"쪽지 가져오기 플러그인을 아직 실행하지 않았다는 뜻입니다. 즉 톰보이가 다음 번"
+"에 시작할 때 가져오기 플러그인을 실행해야 한다는 뜻입니다."
#: ../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 "동기화 서버와 통신할 때 사용되는 톰보이 클라이언트의 유일한 인식자."
#: ../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 "선택한 동기화 서비스 추가기능"
+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 "활성시키려면 참으로 설정"
+msgid "Selected Synchronization Service Addin"
+msgstr "선택한 동기화 서비스 추가기능"
#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "애플릿 메뉴 보이기"
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr "동기화 서비스 추가기능에 설정된 유일한 인식자."
#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "여기서 시작 쪽지"
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "FUSE 마운트 시간 제한(밀리초)"
#: ../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로 동기화할 위치를 연결할 때 응답을 기다리는 시간 제한(밀리초 단위)."
#: ../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 "SSH 서버에서 톰보이 동기화 디렉터리의 경로(옵션)."
#: ../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 "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 "SSH를 통한 동기화 서버에 연결할 때 사용할 사용자 이름."
#: ../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 동기화 서버 포트"
#: ../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."
+"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 ""
-"톰보이 애플릿 메뉴를 볼 때 쓸 바로가기 키. \"<Control>a\" 또는 \"<"
-"Shift><Alt>F1\" 같은 형식을 씁니다. 또한 대소문자를 가리지 않으며 "
-"\"<Ctl>\"와 \"<Ctrl>\"같은 약어를 쓸 수도 있습니다.\"disabled\"라"
-"고 설정하면 바로가기 키를 쓰지 않습니다."
+"SSH를 통한 동기화 서버에 연결할 때 사용할 포트. 0보다 작은 값이면 기본 SSH 포"
+"트 설정을 사용합니다."
#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "\"note://\" URL의 처리 프로그램"
+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 "HTML 내보내기 플러그인으로 쪽지를 내보낸 마지막 디렉터리."
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
+"user."
+msgstr "wdfs에 \"-ac\" 옵션을 사용해 물어보지 않고 SSL 인증서를 허용합니다."
#: ../data/tomboy.schemas.in.h:73
-msgid ""
-"The last setting for the 'Export linked notes' checkbox in the Export to "
-"HTML plugin."
-msgstr ""
-"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."
+"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 ""
-"HTML 내보내기 플러그인에서 '기타 연결된 쪽지 모두 포함' 체크박스의 마지막 설"
-"정. 이 설정은 'HTML 내보내기 - 연결된 쪽지' 설정과 함께 사용해서 (재귀적으로 "
-"발견되는) 모든 쪽지를 HTML로 내보낼 때 포함할 지 여부를 지정합니다."
+"충돌이 발생했을 때 사용자에게 확인하지 않고 지정한 방식대로 수행하는 지 여부"
+"를 나타내는 정수 값. 이 값은 내부의 열거형을 나타냅니다. 값이 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. 이 쪽지는 항상 톰보이 쪽지 메뉴의 "
-"맨 아래에 있고 단축 키로도 접근할 수 있습니다."
+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."
+"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 ""
-"SSH를 통한 동기화 서버에 연결할 때 사용할 포트. 0보다 작은 값이면 기본 SSH 포"
-"트 설정을 사용합니다."
+"쪽지의 백그라운드 동기화를 얼마나 자주 수행할지 나타내는 정수 값. (동기화를 "
+"설정한 경우.) 값이 1보다 작으면 동기화를 하지 않는다는 뜻입니다. 사용할 수 있"
+"는 최소값은 5입니다. 이 값은 분 단위입니다."
#: ../data/tomboy.schemas.in.h:77
+msgid "Link Updating Behavior on Note Rename"
+msgstr "쪽지 이름을 바꿨을 때 링크 업데이트 방식"
+
+#: ../data/tomboy.schemas.in.h:78
msgid ""
-"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
-"mount a sync share."
+"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 ""
-"FUSE로 동기화할 위치를 연결할 때 응답을 기다리는 시간 제한 (밀리초 단위)."
+"쪽지 이름을 바꿨을 때 어떤 링크 업데이트 동작을 할지 나타내는 정수 값. 이 값"
+"은 내부의 열거형을 나타냅니다. 값이 0이면 이름을 바꿀 때 연관된 다른 쪽지를 "
+"어떻게 할지 물어봅니다. 값이 1이면 링크를 자동으로 제거합니다. 값이 2이면 링"
+"크 텍스트도 새 이름에 맞게 업데이트해서 이름 바뀐 쪽지로 연결되게 합니다."
-#: ../data/tomboy.schemas.in.h:78
+#: ../data/tomboy.schemas.in.h:79
msgid "Timestamp format"
msgstr "시각 형식"
-#: ../data/tomboy.schemas.in.h:79
-msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr "SSH 서버에서 톰보이 동기화 디렉터리의 URL."
-
#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
-msgstr "동기화 서비스 추가기능에 설정된 유일한 인식자."
+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 "동기화 서버와 통신할 때 사용되는 톰보이 클라이언트의 유일한 인식자."
+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 "wdfs에 \"-ac\" 옵션을 사용해 물어보지 않고 SSL 인증서를 허용합니다."
+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 "SSH를 통한 동기화 서버에 연결할 때 사용할 사용자 이름."
+msgid "The handler for \"note://\" URLs"
+msgstr "\"note://\" URL의 처리 프로그램"
#: ../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 목록, 공백으로 구분."
+msgid "Set to TRUE to activate"
+msgstr "활성시키려면 참으로 설정"
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -657,7 +653,7 @@ msgstr "고급"
#. Menu Note Count option
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
msgid "Minimum number of notes to show in Recent list (maximum 18)"
-msgstr "최근 목록에서 표시할 쪽지 최소 개수 (최대 18개)"
+msgstr "최근 목록에서 표시할 쪽지 최소 개수(최대 18개)"
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
@@ -751,14 +747,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 "폴더가 없습니다."
@@ -808,7 +804,7 @@ 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 "MMMM d일 dddd, tt h:mm"
@@ -849,7 +845,9 @@ msgstr "약속"
msgid ""
"Change the <b>Today: Template</b> note to customize the text that new Today "
"notes have."
-msgstr "새로 만든 오늘의 쪽지에 있는 내용을 바꾸려면 <b>오늘: 서식</b>쪽지를 바꾸십시오."
+msgstr ""
+"새로 만든 오늘의 쪽지에 있는 내용을 바꾸려면 <b>오늘: 서식</b>쪽지를 바꾸십시"
+"오."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -875,10 +873,20 @@ 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
+msgid "_Remove broken links"
+msgstr "깨진 링크 제거(_R)"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "스케치 추가"
@@ -1047,7 +1055,7 @@ msgstr "연결. 동기화를 시작하려면 저장을 누르십시오."
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
-msgstr "브라우저에서 인증 (연결을 초기화하려면 누르십시오)"
+msgstr "브라우저에서 인증(연결을 초기화하려면 누르십시오)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
@@ -1058,96 +1066,98 @@ msgstr "기본 브라우저를 설정하고 다시 시도하십시오"
msgid "Tomboy Web"
msgstr "톰보이 웹"
-#: ../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} 내보내기 대상 폴더 만들기"
@@ -1260,11 +1270,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 "모든 쪽지"
@@ -1305,7 +1315,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}"
@@ -1347,12 +1357,12 @@ 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 "
@@ -1395,7 +1405,7 @@ msgstr ""
"\n"
"감사합니다!"
-#: ../Tomboy/NoteManager.cs:265
+#: ../Tomboy/NoteManager.cs:269
msgid ""
"<note-content>Start Here\n"
"\n"
@@ -1433,7 +1443,7 @@ msgstr ""
"밑줄이 만들어지는 것을 보셨나요? 이 쪽지를 열려면 해당 연결을 누르십시오.</"
"note-content>"
-#: ../Tomboy/NoteManager.cs:284
+#: ../Tomboy/NoteManager.cs:288
msgid ""
"<note-content>Using Links in Tomboy\n"
"\n"
@@ -1461,17 +1471,17 @@ msgstr ""
"</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 "톰보이에서 연결 사용하기"
#. 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 "새 쪽지를 적으십시오."
@@ -1592,7 +1602,7 @@ 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 "쪽지 동기화"
@@ -1600,7 +1610,9 @@ 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 "이 쪽지는 서식 쪽지입니다. 서식 쪽지는 일반 쪽지 내용의 기본값을 지정하는 쪽지이고, 쪽지 메뉴나 검색 창에 나타나지 않습니다."
+msgstr ""
+"이 쪽지는 서식 쪽지입니다. 서식 쪽지는 일반 쪽지 내용의 기본값을 지정하는 쪽"
+"지이고, 쪽지 메뉴나 검색 창에 나타나지 않습니다."
#: ../Tomboy/NoteWindow.cs:571
msgid "Convert to regular note"
@@ -1918,7 +1930,9 @@ msgstr "쪽지를 동기화할 준비가 되었습니다. 지금 동기화하시
msgid ""
"Please check your information and try again. The log file {0} may contain "
"more information about the error."
-msgstr "정보가 올바른지 확인하고 다시 시도하십시오. {0} 로그 파일에 오류 관련 정보가 들어 있을 수도 있습니다."
+msgstr ""
+"정보가 올바른지 확인하고 다시 시도하십시오. {0} 로그 파일에 오류 관련 정보가 "
+"들어 있을 수도 있습니다."
#: ../Tomboy/PreferencesDialog.cs:1274
msgid "Error connecting"
@@ -2259,25 +2273,25 @@ msgstr ""
"init.d/boot.local에 \"modprobe fuse\"를 추가하거나, /etc/modules에 \"fuse"
"\"를 추가하십시오."
-#: ../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 ""
"차영호 <ganadist at gmail.com>, 2005-2007\n"
"류창우 <cwryu at debian.org>, 2007-2011"
-#: ../Tomboy/Tomboy.cs:424
+#: ../Tomboy/Tomboy.cs:427
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2285,15 +2299,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"
@@ -2307,7 +2321,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"
@@ -2321,7 +2335,7 @@ msgstr ""
" --note-path [경로]\t\t이 디렉터리에 쪽지 데이터를 읽고 저장합니다.\n"
" --search [텍스트]\t\t해당 텍스트에 대한 모든 쪽지 검색 창을 엽니다.\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"
@@ -2337,7 +2351,17 @@ msgstr ""
" --highlight-search [텍스트]\t열린 쪽지에서 해당 텍스트를 찾아서 강조합니"
"다.\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 ""
+" --addin:html-export-all [경로]\t모든 쪽지를 HTML로 지정한 경로에 내보냅니다.\n"
+" --addin:html-export-all-quit [경로]\t모든 쪽지를 HTML로 지정한 경로에 내보내고 끝납니다.\n"
+
+#: ../Tomboy/Tomboy.cs:619
#, csharp-format
msgid "Version {0}"
msgstr "버전 {0}"
diff --git a/po/lt.po b/po/lt.po
index f8a2a4b..65513cb 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -12,10 +12,11 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy.HEAD\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-05 17:37+0300\n"
+"POT-Creation-Date: 2012-08-05 14:48+0000\n"
+"PO-Revision-Date: 2012-09-14 23:21+0300\n"
"Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
"Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -727,7 +728,6 @@ msgid "_Tools"
msgstr "Į_rankiai"
#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:44
-#| msgid "Remove broken links"
msgid "_Remove broken links"
msgstr "Pa_šalinti neveikiančius saitus"
@@ -1435,63 +1435,70 @@ msgstr "Ieškoti _ankstesnio"
msgid "Cannot create note"
msgstr "Nepavyko sukurti raštelio"
-#: ../Tomboy/NoteWindow.cs:832
+#: ../Tomboy/NoteWindow.cs:833
msgid "_Find:"
msgstr "_Ieškoti:"
-#: ../Tomboy/NoteWindow.cs:843
+#: ../Tomboy/NoteWindow.cs:847
msgid "_Previous"
msgstr "_Ankstesnis"
-#: ../Tomboy/NoteWindow.cs:852
+#: ../Tomboy/NoteWindow.cs:856
msgid "_Next"
msgstr "_Kitas"
-#: ../Tomboy/NoteWindow.cs:1335
+#. x of x - specifically Number of Matches and what location is the cursor in the list of matches
+#: ../Tomboy/NoteWindow.cs:885
+#, csharp-format
+#| msgid "Page {0} of {1}"
+msgid "{0} of {1}"
+msgstr "{0} iš {1}"
+
+#: ../Tomboy/NoteWindow.cs:1368
msgid "_Bold"
msgstr "P_usjuodis"
-#: ../Tomboy/NoteWindow.cs:1347
+#: ../Tomboy/NoteWindow.cs:1380
msgid "_Italic"
msgstr "_Kursyvas"
-#: ../Tomboy/NoteWindow.cs:1359
+#: ../Tomboy/NoteWindow.cs:1392
msgid "_Strikeout"
msgstr "_Perbrauktas"
-#: ../Tomboy/NoteWindow.cs:1371
+#: ../Tomboy/NoteWindow.cs:1404
msgid "_Highlight"
msgstr "Pa_ryškintas"
-#: ../Tomboy/NoteWindow.cs:1384
+#: ../Tomboy/NoteWindow.cs:1417
msgid "Font Size"
msgstr "Šrifto dydis"
-#: ../Tomboy/NoteWindow.cs:1387
+#: ../Tomboy/NoteWindow.cs:1420
msgid "_Normal"
msgstr "_Normalus"
-#: ../Tomboy/NoteWindow.cs:1404
+#: ../Tomboy/NoteWindow.cs:1437
msgid "Hu_ge"
msgstr "Milžiniš_kas"
-#: ../Tomboy/NoteWindow.cs:1412
+#: ../Tomboy/NoteWindow.cs:1445
msgid "_Large"
msgstr "_Didelis"
-#: ../Tomboy/NoteWindow.cs:1420
+#: ../Tomboy/NoteWindow.cs:1453
msgid "S_mall"
msgstr "_Mažas"
-#: ../Tomboy/NoteWindow.cs:1429
+#: ../Tomboy/NoteWindow.cs:1462
msgid "Increase Font Size"
msgstr "Didinti šriftą"
-#: ../Tomboy/NoteWindow.cs:1447
+#: ../Tomboy/NoteWindow.cs:1480
msgid "Decrease Font Size"
msgstr "Mažinti šriftą"
-#: ../Tomboy/NoteWindow.cs:1467
+#: ../Tomboy/NoteWindow.cs:1500
msgid "Bullets"
msgstr "Punktai"
@@ -1768,7 +1775,7 @@ msgstr ""
msgid "Click here to search across all notebooks"
msgstr "Spauskite čia, jei norite ieškoti visuose rašteliuose"
-#: ../Tomboy/RecentChanges.cs:775
+#: ../Tomboy/RecentChanges.cs:780
msgid "Notes"
msgstr "Rašteliai"
@@ -2031,11 +2038,11 @@ msgstr "Pagrindinis vystymas:"
msgid "Contributors:"
msgstr "Pagalbininkai:"
-#: ../Tomboy/Tomboy.cs:418
+#: ../Tomboy/Tomboy.cs:420
msgid "translator-credits"
msgstr "Žygimantas Beručka <zygis at gnome.org>"
-#: ../Tomboy/Tomboy.cs:427
+#: ../Tomboy/Tomboy.cs:429
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2043,15 +2050,15 @@ msgstr ""
"Autorinės teisės priklauso © 2004-2007 Alex Graveley\n"
"Autorinės teisės priklauso © 2004-2011 kitiems\n"
-#: ../Tomboy/Tomboy.cs:429
+#: ../Tomboy/Tomboy.cs:431
msgid "A simple and easy to use desktop note-taking application."
msgstr "Paprasta ir lengva naudoti aplinkos užrašinė."
-#: ../Tomboy/Tomboy.cs:439
+#: ../Tomboy/Tomboy.cs:441
msgid "Homepage"
msgstr "Tinklalapis"
-#: ../Tomboy/Tomboy.cs:575
+#: ../Tomboy/Tomboy.cs:577
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2065,7 +2072,7 @@ msgstr ""
"\n"
"Autorinės teisės priklauso © 2004-2011 kitiems\n"
-#: ../Tomboy/Tomboy.cs:589
+#: ../Tomboy/Tomboy.cs:591
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -2079,7 +2086,7 @@ msgstr ""
" --note-path [kelias]\t\tĮkelti/išsaugoti raštelio duomenis šiame aplanke.\n"
" --search [tekstas]\t\tAtverti paieškos visuose rašteliuose langą su paieškos tekstu.\n"
-#: ../Tomboy/Tomboy.cs:599
+#: ../Tomboy/Tomboy.cs:601
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"
@@ -2094,7 +2101,7 @@ msgstr ""
" --start-here\t\t\tParodyti raštelį„Pradėti čia“.\n"
" --highlight-search [tekstas]\tAtvertame raštelyje surasti ir paryškinti tekstą.\n"
-#: ../Tomboy/Tomboy.cs:609
+#: ../Tomboy/Tomboy.cs:611
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"
@@ -2102,7 +2109,7 @@ msgstr ""
" --addin:html-export-all [kelias]\tEksportuoja visus raštelius į HTML nurodytoje vietoje.\n"
" --addin:html-export-all-quit [kelias]\tEksportuoja visus raštelius į HTML nurodytoje vietoje ir baigia darbą.\n"
-#: ../Tomboy/Tomboy.cs:619
+#: ../Tomboy/Tomboy.cs:621
#, csharp-format
msgid "Version {0}"
msgstr "Versija {0}"
@@ -2220,46 +2227,11 @@ msgstr "Raštelis pavadinimu <b>{0}</b> jau egzistuoja. Norėdami tęsti, turite
msgid "Note title taken"
msgstr "Raštelio pavadinimas užimtas"
-#: ../Tomboy/Watchers.cs:587
+#: ../Tomboy/Watchers.cs:601
msgid "_Copy Link Address"
msgstr "_Kopijuoti saito adresą"
-#: ../Tomboy/Watchers.cs:592
+#: ../Tomboy/Watchers.cs:606
msgid "_Open Link"
msgstr "_Atverti saitą"
-#~ msgid "HTML Export Last Directory"
-#~ msgstr "Paskutinis eksportavimo į HTML aplankas"
-
-#~ msgid "SSH (sshfs FUSE)"
-#~ msgstr "SSH (sshfs FUSE)"
-
-#~ msgid "WebDAV (wdfs FUSE)"
-#~ msgstr "WebDAV (wdfs FUSE)"
-
-#~ msgid "Really delete this note?"
-#~ msgstr "Tikrai ištrinti šį raštelį?"
-
-#~ msgid "Search your notes (Ctrl-Shift-F)"
-#~ msgstr "Ieškoti raštelių (Ctrl-Shift-F)"
-
-#~ msgid "Success! You're connected!"
-#~ msgstr "Jūs sėkmingai prisijungėte!"
-
-#~ msgid "_Browse..."
-#~ msgstr "_Naršyti..."
-
-#~ msgid "D-BUS remote control disabled.\n"
-#~ msgstr "D-BUS nutolęs valdymas išjungtas.\n"
-
-#~ msgid ""
-#~ "Tomboy: unsupported option '{0}'\n"
-#~ "Try 'tomboy --help' for more information.\n"
-#~ "D-BUS remote control disabled."
-#~ msgstr ""
-#~ "Tomboy: nepalaikoma parinktis „{0}“\n"
-#~ "Norėdami gauti daugiau informacijos bandykite „tomboy --help“.\n"
-#~ "D-BUS nuotolinis valdymas atjungtas."
-
-#~ msgid "C_ase Sensitive"
-#~ msgstr "Skirti _raidžių dydį"
diff --git a/po/pl.po b/po/pl.po
index 478fc00..55674be 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,206 +4,244 @@
# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
# gnomepl at aviary.pl
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Marek Habersack <grendel at caudium.net>, 2004.
+# Artur Flinta <aflinta at at.kernel.pl>, 2006.
+# Stanisław Małolepszy <smalolepszy at aviary.pl>, 2007.
+# Wadim Dziedzic <wdziedzic at aviary.pl>, 2007-2008.
+# Tomasz Dominikowski <dominikowski at gmail.com>, 2007-2009.
+# Piotr Drąg <piotrdrag at gmail.com>, 2009-2012.
+# Aviary.pl <gnomepl at aviary.pl>, 2007-2012.
msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 21:39+0200\n"
-"PO-Revision-Date: 2011-09-08 21:40+0200\n"
+"POT-Creation-Date: 2012-09-04 00:48+0200\n"
+"PO-Revision-Date: 2012-09-04 00:54+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <gnomepl at aviary.pl>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "Akcesoria"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "Prosty i łatwy w użyciu program do sporządzania notatek"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
msgid "Tomboy Applet Factory"
msgstr "Generator apletów programu 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 "Notatnik Tomboy"
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Simple and easy to use note-taking"
+msgstr "Prosty i łatwy w użyciu program do sporządzania notatek"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+msgid "Accessories"
+msgstr "Akcesoria"
+
#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "Z_synchronizuj notatki"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "_O programie"
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "_Preferencje"
#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "Pomo_c"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "_Preferencje"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "Notatnik"
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "_O programie"
#: ../data/tomboy.desktop.in.h:2
msgid "Take notes, link ideas, and stay organized"
msgstr "Robienie notatek, łączenie pomysłów, organizacja"
+#: ../data/tomboy.desktop.in.h:3
+msgid "Note-taker"
+msgstr "Notatnik"
+
#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "Akceptowanie certyfikatów SSL"
+msgid "Enable spellchecking"
+msgstr "Sprawdzanie pisowni"
#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "Automatyczna ograniczenie czasu połączenia w tle"
+msgid ""
+"If true, misspellings will be underlined in red, and correct spelling "
+"suggestions shown in the right-click menu."
+msgstr ""
+"Jeśli opcja ta jest zaznaczona, błędnie napisane słowa będą podkreślane na "
+"czerwono, a podpowiedzi prawidłowej pisowni będą dostępne w menu pod prawym "
+"przyciskiem myszy."
#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "Utwórz nową notatkę"
+msgid "Enable WikiWord highlighting"
+msgstr "Wyróżnianie WikiSłów"
#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "Własna czcionka"
-
-#: ../data/tomboy.schemas.in.h:5
msgid ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
msgstr ""
-"Określa pionową współrzędną okna \"Przeszukaj wszystkie notatki\"; "
-"zachowywane po zakończeniu programu Tomboy."
+"Włączenie tej opcji spowoduje wyróżnianie słów, które wyglądają tak, "
+"JakToSłowo. Kliknięcie tak zapisanego słowa utworzy notatkę o takim tytule."
+
+#: ../data/tomboy.schemas.in.h:5
+msgid "Enable automatic bulleted lists."
+msgstr "Włączenie automatycznych list wypunktowanych."
#: ../data/tomboy.schemas.in.h:6
msgid ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
+"Enable this option if you want bulleted lists to be automatic when you place "
+"- or * at the beginning of a line."
msgstr ""
-"Określa poziomą współrzędną okna \"Przeszukaj wszystkie notatki\"; "
-"zachowywane po zakończeniu programu Tomboy."
+"Włączenie opcji spowoduje automatyczne wypunktowanie list. Znak - lub * na "
+"początku wiersza."
#: ../data/tomboy.schemas.in.h:7
-msgid ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Określa wysokość okna \"Przeszukaj wszystkie notatki\" w pikselach; "
-"zachowywane po zakończeniu programu Tomboy."
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Włączenie wklejania środkowym przyciskiem myszy na ikonie."
#: ../data/tomboy.schemas.in.h:8
msgid ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+"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 ""
-"Określa szerokość okna \"Przeszukaj wszystkie notatki\" w pikselach; "
-"zachowywane po zakończeniu programu Tomboy."
+"Włączenie tej opcji umożliwia wklejanie do notatki Start zawartości schowka "
+"wraz ze znacznikiem czasu za pomocą kliknięcia ikony programu Tomboy "
+"środkowym przyciskiem myszy."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Włączenie wklejania środkowym przyciskiem myszy na ikonie."
+msgid "Enable custom font"
+msgstr "Własna czcionka"
#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "Ikona powiadamiania"
+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 ""
+"Jeżeli ustawione, czcionka ustawiona w custom_font_face zostanie użyta do "
+"wyświetlania notatek. W przeciwnym wypadku zostanie użyta domyślna czcionka "
+"środowiska."
#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "Wyróżnianie WikiSłów"
+msgid "Custom Font Face"
+msgstr "Własna czcionka"
#: ../data/tomboy.schemas.in.h:12
-msgid "Enable automatic bulleted lists."
-msgstr "Włączenie automatycznych list wypunktowanych."
+msgid ""
+"If enable_custom_font is true, the font name set here will be used as the "
+"font when displaying notes."
+msgstr ""
+"Jeśli włączone jest enable_custom_font, czcionka ustawiona w tym polu będzie "
+"używana do wyświetlania notatek."
#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Włączenie zamykania notatek klawiszem Escape."
+msgid "Enable global keybindings"
+msgstr "Globalne skróty klawiszowe"
#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "Własna czcionka"
+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 ""
+"Jeżeli ustawione, zostaną włączone systemowe skróty klawiszowe ustawione w /"
+"apps/tomboy/global_keybindings, pozwalając na dostęp do funkcji programu "
+"Tomboy z poziomu dowolnego programu."
#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "Globalne skróty klawiszowe"
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Włączenie okna potwierdzenia usunięcia notatki"
#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "Sprawdzanie pisowni"
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"Jeśli wyłączone, okno potwierdzenia \"Usunięcie notatki\" zostanie pominięte."
#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "Włączenie notatek startowych"
+msgid "Enable Tray Icon"
+msgstr "Ikona powiadamiania"
#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Włączenie okna potwierdzenia usunięcia notatki"
-
-#: ../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."
+"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 ""
-"Włączenie opcji spowoduje automatyczne wypunktowanie list. Znak - lub * na "
-"początku wiersza."
+"Jeśli opcja ta jest zaznaczona, ikona powiadamiania programu Tomboy będzie "
+"wyświetlana w obszarze powiadamiania. Wyłączenie jej może być przydatne, "
+"kiedy inny program dostarcza funkcjonalność ikony powiadamiania."
+
+#: ../data/tomboy.schemas.in.h:19
+msgid "Start Here Note"
+msgstr "Notatka \"Start\""
#: ../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."
+"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 ""
-"Włączenie tej opcji umożliwia wklejanie do notatki Start zawartości schowka "
-"wraz ze znacznikiem czasu za pomocą kliknięcia ikony programu Tomboy "
-"środkowym przyciskiem myszy."
+"Adres URI notatki, która ma być traktowana jako notatka \"Start\", która "
+"zawsze wyświetlana jest u dołu menu programu Tomboy oraz dostępna jest "
+"poprzez skrót klawiszowy."
#: ../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 ""
-"Włączenie tej opcji spowoduje wyróżnianie słów, które wyglądają tak, "
-"JakToSłowo. Kliknięcie tak zapisanego słowa utworzy notatkę o takim tytule."
+msgid "Minimum number of notes to show in menu"
+msgstr "Minimalna liczba notatek wyświetlana w menu"
#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "Ograniczenie czasu montowania FUSE (w milisekundach)"
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Liczba całkowita określająca minimalną liczbę notatek wyświetlanych w menu "
+"programu Tomboy."
#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "Eksport HTML wszystkich dowiązanych notatek"
+msgid "List of pinned notes."
+msgstr "Lista przypiętych notatek."
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "Eksport HTML dowiązanych notatek"
+msgid ""
+"Whitespace-separated list of note URIs for notes that should always appear "
+"in the Tomboy note menu."
+msgstr ""
+"Rozdzielana odstępami lista adresów URI notatek, które zawsze mają "
+"wyświetlane w menu programu Tomboy."
#: ../data/tomboy.schemas.in.h:25
-msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgid "Maximum note title length to show in tray menu."
msgstr ""
-"Jeśli wyłączone, okno potwierdzenia \"Usunięcie notatki\" zostanie pominięte."
+"Minimalna długość tytułu notatki wyświetlana w menu ikony obszaru "
+"powiadamiania."
#: ../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."
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
msgstr ""
-"Jeśli włączone jest enable_custom_font, czcionka ustawiona w tym polu będzie "
-"używana do wyświetlania notatek."
+"Maksymalna liczba znaków tytułu notatki do wyświetlenia w ikonie obszaru "
+"powiadamiania programu Tomboy lub menu notatek apletu panelu."
#: ../data/tomboy.schemas.in.h:27
+msgid "Enable startup notes"
+msgstr "Włączenie notatek startowych"
+
+#: ../data/tomboy.schemas.in.h:28
msgid ""
"If enabled, all notes that were open when Tomboy quit will automatically be "
"reopened at startup."
@@ -211,236 +249,52 @@ msgstr ""
"Jeśli włączone, to wszystkie otwarte przy zamykaniu notatki zostaną przy "
"następnym uruchomieniu ponownie otwarte."
-#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr ""
-"Jeśli włączone, otwarta notatka może zostać zamknięta naciskając klawisz "
-"Escape."
-
#: ../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 ""
-"Jeśli opcja ta jest zaznaczona, ikona powiadamiania programu Tomboy będzie "
-"wyświetlana w obszarze powiadamiania. Wyłączenie jej może być przydatne, "
-"kiedy inny program dostarcza funkcjonalność ikony powiadamiania."
+msgid "Show applet menu"
+msgstr "Wyświetlanie menu apletu"
#: ../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."
+"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 ""
-"Jeśli opcja ta jest zaznaczona, błędnie napisane słowa będą podkreślane na "
-"czerwono, a podpowiedzi prawidłowej pisowni będą dostępne w menu pod prawym "
-"przyciskiem myszy."
+"Globalne przypisanie klawisza dla wyświetlenia menu apletu Tomboy. Format "
+"jest w postaci \"<Control>a\" lub \"<Shift><Alt>F1\". "
+"Analizator jest całkiem tolerancyjny i zezwala na małe i duże litery, jak "
+"również skróty takie jak \"<Ctl>\" oraz \"<Ctrl>\". Jeżeli opcja "
+"zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy nie "
+"będzie przypisanego klawisza do tego działania."
#: ../data/tomboy.schemas.in.h:31
+msgid "Open Start Here"
+msgstr "Otwarcie notatki \"Start\""
+
+#: ../data/tomboy.schemas.in.h:32
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 ""
-"Jeżeli ustawione, zostaną włączone systemowe skróty klawiszowe ustawione w /"
-"apps/tomboy/global_keybindings, pozwalając na dostęp do funkcji programu "
-"Tomboy z poziomu dowolnego programu."
-
-#: ../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."
+"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 ""
-"Jeżeli ustawione, czcionka ustawiona w custom_font_face zostanie użyta do "
-"wyświetlania notatek. W przeciwnym wypadku zostanie użyta domyślna czcionka "
-"środowiska."
+"Globalne przypisanie klawisza dla otwarcia notatki \"Start\". Format jest w "
+"postaci \"<Control>a\" lub \"<Shift><Alt>F1\". Analizator "
+"jest całkiem tolerancyjny i zezwala na małe i duże litery, jak również "
+"skróty takie jak \"<Ctl>\" oraz \"<Ctrl>\". Jeżeli opcja "
+"zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy nie "
+"będzie przypisanego klawisza do tego działania."
#: ../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 ""
-"Wskazuje, że wtyczka Importera notatek nie była jeszcze uruchamiana, w "
-"związku z czym powinna zostać uruchomiona automatycznie podczas następnego "
-"uruchomienia programu Tomboy."
+msgid "Create a new Note"
+msgstr "Utwórz nową notatkę"
#: ../data/tomboy.schemas.in.h:34
msgid ""
-"Integer determining the minimum number of notes to show in the Tomboy note "
-"menu."
-msgstr ""
-"Liczba całkowita określająca minimalną liczbę notatek wyświetlanych w menu "
-"programu Tomboy."
-
-#: ../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 ""
-"Wartość liczbowa określająca, jak często wykonywać synchronizację notatek w "
-"tle (kiedy synchronizowanie jest skonfigurowane). Wartości inne niż 1 "
-"wskazują, że automatyczne synchronizowanie jest wyłączone. Najniższą "
-"akceptowaną dodatnią wartością jest 5. Wartość podawana w minutach."
-
-#: ../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 ""
-"Wartość liczbowa określająca, czy zawsze wykonywać określone działanie po "
-"wykryciu konfliktu (zamiast pytania użytkownika). Wartość 0 oznacza "
-"proszenie użytkownika o decyzję przy każdym konflikcie."
-
-#: ../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 ""
-"Wartość liczbowa określająca, czy zawsze wykonywać określone działanie "
-"aktualizowania odnośników podczas zmiany nazwy notatki, zamiast pytania "
-"użytkownika. Wartości odnoszą się do wewnętrznej numeracji. Wartość 0 "
-"wskazuje, że użytkownik ma być pytany podczas zmieniania nazwy notatki, do "
-"której prowadzą odnośniki w innych notatkach. Wartość 1 oznacza, że "
-"odnośniki powinny zostać automatycznie usunięte. Wartość 2 oznacza, że "
-"odnośniki powinny być aktualizowane do nowej nazwy notatki, co spowoduje "
-"dalsze działanie odnośników do zmienionej notatki."
-
-#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "Ostatnio użyty katalog w eksporcie HTML"
-
-#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr "Działanie aktualizowania notatek podczas zmiany nazwy notatki"
-
-#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "Lista przypiętych notatek."
-
-#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr ""
-"Maksymalna liczba znaków tytułu notatki do wyświetlenia w ikonie obszaru "
-"powiadamiania programu Tomboy lub menu notatek apletu panelu."
-
-#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr ""
-"Minimalna długość tytułu notatki wyświetlana w menu ikony obszaru "
-"powiadamiania."
-
-#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "Minimalna liczba notatek wyświetlana w menu"
-
-#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr "Zachowanie po wykryciu konfliktu synchronizacji notatki"
-
-#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "Otwarcie ostatnich zmian"
-
-#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "Otwarcie okna wyszukiwania"
-
-#: ../data/tomboy.schemas.in.h:47
-msgid "Open Start Here"
-msgstr "Otwarcie notatki \"Start\""
-
-#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr ""
-"Ścieżka na serwerze SSH do katalogu synchronizacji programu Tomboy "
-"(opcjonalna)."
-
-#: ../data/tomboy.schemas.in.h:49
-msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr ""
-"Ścieżka do serwera synchronizacji w przypadku korzystania z dodatku "
-"synchronizacji systemu plików."
-
-#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "Katalog synchronizacji zdalnej SSHFS"
-
-#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "Nazwa użytkownika synchronizacji zdalnej SSHFS"
-
-#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "Port serwera synchronizacji SSHFS"
-
-#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "Adres URL serwera synchronizacji SSHFS"
-
-#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr "Zapisana wysokość okna \"Przeszukaj wszystkie notatki\""
-
-#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Zapisane poziome położenie okna \"Przeszukaj wszystkie notatki\""
-
-#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Zapisane pionowe położenie okna \"Przeszukaj wszystkie notatki\""
-
-#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "Zapisana szerokość okna \"Przeszukaj wszystkie notatki\""
-
-#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "Wybrany dodatek usługi synchronizacji"
-
-#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "Ustawienie na \"true\" włączy opcję"
-
-#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "Wyświetlanie menu apletu"
-
-#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "Notatka \"Start\""
-
-#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "Pierwsze uruchomienie Importera notatek"
-
-#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "Identyfikator klienta synchronizacji"
-
-#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "Ścieżka lokalnego serwera synchronizacji"
-
-#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "Format daty używany do automatycznego wstawiania."
-
-#: ../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 "
@@ -455,23 +309,11 @@ msgstr ""
"opcja zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy "
"nie będzie przypisanego klawisza do tego działania."
-#: ../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 ""
-"Globalne przypisanie klawisza dla otwarcia notatki \"Start\". Format jest w "
-"postaci \"<Control>a\" lub \"<Shift><Alt>F1\". Analizator "
-"jest całkiem tolerancyjny i zezwala na małe i duże litery, jak również "
-"skróty takie jak \"<Ctl>\" oraz \"<Ctrl>\". Jeżeli opcja "
-"zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy nie "
-"będzie przypisanego klawisza do tego działania."
+#: ../data/tomboy.schemas.in.h:35
+msgid "Open Search Dialog"
+msgstr "Otwarcie okna wyszukiwania"
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:36
msgid ""
"The global keybinding for opening the Note Search dialog. The format looks "
"like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -487,7 +329,11 @@ msgstr ""
"zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy nie "
"będzie przypisanego klawisza do tego działania."
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:37
+msgid "Open Recent Changes"
+msgstr "Otwarcie ostatnich zmian"
+
+#: ../data/tomboy.schemas.in.h:38
msgid ""
"The global keybinding for opening the Recent Changes dialog. The format "
"looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -503,34 +349,69 @@ msgstr ""
"zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy nie "
"będzie przypisanego klawisza do tego działania."
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:39
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Zapisana wysokość okna \"Przeszukaj wszystkie notatki\""
+
+#: ../data/tomboy.schemas.in.h:40
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."
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
msgstr ""
-"Globalne przypisanie klawisza dla wyświetlenia menu apletu Tomboy. Format "
-"jest w postaci \"<Control>a\" lub \"<Shift><Alt>F1\". "
-"Analizator jest całkiem tolerancyjny i zezwala na małe i duże litery, jak "
-"również skróty takie jak \"<Ctl>\" oraz \"<Ctrl>\". Jeżeli opcja "
-"zostanie ustawiona na specjalny ciąg \"disabled\" (wyłączone), wtedy nie "
-"będzie przypisanego klawisza do tego działania."
+"Określa wysokość okna \"Przeszukaj wszystkie notatki\" w pikselach; "
+"zachowywane po zakończeniu programu Tomboy."
+
+#: ../data/tomboy.schemas.in.h:41
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Zapisana szerokość okna \"Przeszukaj wszystkie notatki\""
+
+#: ../data/tomboy.schemas.in.h:42
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Określa szerokość okna \"Przeszukaj wszystkie notatki\" w pikselach; "
+"zachowywane po zakończeniu programu Tomboy."
+
+#: ../data/tomboy.schemas.in.h:43
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Zapisane poziome położenie okna \"Przeszukaj wszystkie notatki\""
+
+#: ../data/tomboy.schemas.in.h:44
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Określa pionową współrzędną okna \"Przeszukaj wszystkie notatki\"; "
+"zachowywane po zakończeniu programu Tomboy."
+
+#: ../data/tomboy.schemas.in.h:45
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Zapisane pionowe położenie okna \"Przeszukaj wszystkie notatki\""
+
+#: ../data/tomboy.schemas.in.h:46
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Określa poziomą współrzędną okna \"Przeszukaj wszystkie notatki\"; "
+"zachowywane po zakończeniu programu Tomboy."
-#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "Obsługa adresu URL \"note://\""
+#: ../data/tomboy.schemas.in.h:47
+msgid "Last Directory used in HTML Export"
+msgstr "Ostatnio użyty katalog w eksporcie HTML"
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:48
msgid ""
"The last directory a note was exported to using the Export To HTML plugin."
msgstr ""
"Ostatni katalog do którego notatka została wyeksportowana przy użyciu "
"wtyczki Eksport do HTML."
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:49
+msgid "HTML Export Linked Notes"
+msgstr "Eksport HTML dowiązanych notatek"
+
+#: ../data/tomboy.schemas.in.h:50
msgid ""
"The last setting for the 'Export linked notes' checkbox in the Export to "
"HTML plugin."
@@ -538,7 +419,11 @@ msgstr ""
"Ostatnie ustawienie dla opcji \"Eksport powiązanych notatek\" we wtyczce "
"Eksport do HTML."
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:51
+msgid "HTML Export All Linked Notes"
+msgstr "Eksport HTML wszystkich dowiązanych notatek"
+
+#: ../data/tomboy.schemas.in.h:52
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 "
@@ -550,26 +435,59 @@ msgstr ""
"HTML dowiązanych notatek\" aby określić, czy podczas eksportu do HTML mają "
"być eksportowane wszystkie rekursywnie powiązane ze sobą notatki."
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:53
+msgid "Sticky Note Importer First Run"
+msgstr "Pierwsze uruchomienie Importera notatek"
+
+#: ../data/tomboy.schemas.in.h:54
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."
+"Indicates that the Sticky Note Importer plugin has not been run, so it "
+"should run automatically the next time Tomboy starts."
msgstr ""
-"Adres URI notatki, która ma być traktowana jako notatka \"Start\", która "
-"zawsze wyświetlana jest u dołu menu programu Tomboy oraz dostępna jest "
-"poprzez skrót klawiszowy."
+"Wskazuje, że wtyczka Importera notatek nie była jeszcze uruchamiana, w "
+"związku z czym powinna zostać uruchomiona automatycznie podczas następnego "
+"uruchomienia programu Tomboy."
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:55
+msgid "Synchronization Client ID"
+msgstr "Identyfikator klienta synchronizacji"
+
+#: ../data/tomboy.schemas.in.h:56
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."
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
msgstr ""
-"Port używany do łączenia z serwerem synchronizacji przez SSH. Należy ustawić "
-"na -1 lub niższą wartość, jeśli powinny być użyte domyślne ustawienia portu "
-"SSH."
+"Niepowtarzalny identyfikator tego klienta Tomboy używany podczas kontaktów z "
+"serwerem synchronizacji."
-#: ../data/tomboy.schemas.in.h:77
+#: ../data/tomboy.schemas.in.h:57
+msgid "Synchronization Local Server Path"
+msgstr "Ścieżka lokalnego serwera synchronizacji"
+
+#: ../data/tomboy.schemas.in.h:58
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Ścieżka do serwera synchronizacji w przypadku korzystania z dodatku "
+"synchronizacji systemu plików."
+
+#: ../data/tomboy.schemas.in.h:59
+msgid "Selected Synchronization Service Addin"
+msgstr "Wybrany dodatek usługi synchronizacji"
+
+#: ../data/tomboy.schemas.in.h:60
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Niepowtarzalny identyfikator bieżącego dodatku usługi synchronizacji notatek."
+
+#: ../data/tomboy.schemas.in.h:61
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "Ograniczenie czasu montowania FUSE (w milisekundach)"
+
+#: ../data/tomboy.schemas.in.h:62
msgid ""
"Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
"mount a sync share."
@@ -577,31 +495,53 @@ msgstr ""
"Czas oczekiwania (w milisekundach) programu Tomboy na odpowiedź podczas "
"używania FUSE do montowania zasobu synchronizacji."
-#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "Format znacznika czasu"
+#: ../data/tomboy.schemas.in.h:63
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "Katalog synchronizacji zdalnej SSHFS"
-#: ../data/tomboy.schemas.in.h:79
+#: ../data/tomboy.schemas.in.h:64
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr ""
+"Ścieżka na serwerze SSH do katalogu synchronizacji programu Tomboy "
+"(opcjonalna)."
+
+#: ../data/tomboy.schemas.in.h:65
+msgid "SSHFS Synchronization Server URL"
+msgstr "Adres URL serwera synchronizacji SSHFS"
+
+#: ../data/tomboy.schemas.in.h:66
msgid "URL of SSH server containing Tomboy synchronization directory."
msgstr ""
"Adres URL serwera SSH zawierającego katalog synchronizacji programu Tomboy."
-#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
+#: ../data/tomboy.schemas.in.h:67
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "Nazwa użytkownika synchronizacji zdalnej SSHFS"
+
+#: ../data/tomboy.schemas.in.h:68
+msgid "User name to use when connecting to the synchronization server via SSH."
msgstr ""
-"Niepowtarzalny identyfikator bieżącego dodatku usługi synchronizacji notatek."
+"Nazwa użytkownika używana podczas łączenia z serwerem synchronizacji poprzez "
+"SSH."
-#: ../data/tomboy.schemas.in.h:81
+#: ../data/tomboy.schemas.in.h:69
+msgid "SSHFS Synchronization Server Port"
+msgstr "Port serwera synchronizacji SSHFS"
+
+#: ../data/tomboy.schemas.in.h:70
msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
+"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 ""
-"Niepowtarzalny identyfikator tego klienta Tomboy używany podczas kontaktów z "
-"serwerem synchronizacji."
+"Port używany do łączenia z serwerem synchronizacji przez SSH. Należy ustawić "
+"na -1 lub niższą wartość, jeśli powinny być użyte domyślne ustawienia portu "
+"SSH."
-#: ../data/tomboy.schemas.in.h:82
+#: ../data/tomboy.schemas.in.h:71
+msgid "Accept SSL Certificates"
+msgstr "Akceptowanie certyfikatów SSL"
+
+#: ../data/tomboy.schemas.in.h:72
msgid ""
"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
"user."
@@ -609,19 +549,86 @@ msgstr ""
"Proszę użyć opcji wdfs \"-ac\", aby akceptować certyfikaty SSL, bez pytania "
"użytkownika."
-#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
+#: ../data/tomboy.schemas.in.h:73
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr "Zachowanie po wykryciu konfliktu synchronizacji notatki"
+
+#: ../data/tomboy.schemas.in.h:74
+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 ""
-"Nazwa użytkownika używana podczas łączenia z serwerem synchronizacji poprzez "
-"SSH."
+"Wartość liczbowa określająca, czy zawsze wykonywać określone działanie po "
+"wykryciu konfliktu (zamiast pytania użytkownika). Wartość 0 oznacza "
+"proszenie użytkownika o decyzję przy każdym konflikcie."
-#: ../data/tomboy.schemas.in.h:84
+#: ../data/tomboy.schemas.in.h:75
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Automatyczna ograniczenie czasu połączenia w tle"
+
+#: ../data/tomboy.schemas.in.h:76
msgid ""
-"Whitespace-separated list of note URIs for notes that should always appear "
-"in the Tomboy note menu."
+"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 ""
-"Rozdzielana odstępami lista adresów URI notatek, które zawsze mają "
-"wyświetlane w menu programu Tomboy."
+"Wartość liczbowa określająca, jak często wykonywać synchronizację notatek w "
+"tle (kiedy synchronizowanie jest skonfigurowane). Wartości inne niż 1 "
+"wskazują, że automatyczne synchronizowanie jest wyłączone. Najniższą "
+"akceptowaną dodatnią wartością jest 5. Wartość podawana w minutach."
+
+#: ../data/tomboy.schemas.in.h:77
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Działanie aktualizowania notatek podczas zmiany nazwy notatki"
+
+#: ../data/tomboy.schemas.in.h:78
+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 ""
+"Wartość liczbowa określająca, czy zawsze wykonywać określone działanie "
+"aktualizowania odnośników podczas zmiany nazwy notatki, zamiast pytania "
+"użytkownika. Wartości odnoszą się do wewnętrznej numeracji. Wartość 0 "
+"wskazuje, że użytkownik ma być pytany podczas zmieniania nazwy notatki, do "
+"której prowadzą odnośniki w innych notatkach. Wartość 1 oznacza, że "
+"odnośniki powinny zostać automatycznie usunięte. Wartość 2 oznacza, że "
+"odnośniki powinny być aktualizowane do nowej nazwy notatki, co spowoduje "
+"dalsze działanie odnośników do zmienionej notatki."
+
+#: ../data/tomboy.schemas.in.h:79
+msgid "Timestamp format"
+msgstr "Format znacznika czasu"
+
+#: ../data/tomboy.schemas.in.h:80
+msgid "The date format that is used for the timestamp."
+msgstr "Format daty używany do automatycznego wstawiania."
+
+#: ../data/tomboy.schemas.in.h:81
+msgid "Enable closing notes with escape."
+msgstr "Włączenie zamykania notatek klawiszem Escape."
+
+#: ../data/tomboy.schemas.in.h:82
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr ""
+"Jeśli włączone, otwarta notatka może zostać zamknięta naciskając klawisz "
+"Escape."
+
+#: ../data/tomboy.schemas.in.h:83
+msgid "The handler for \"note://\" URLs"
+msgstr "Obsługa adresu URL \"note://\""
+
+#: ../data/tomboy.schemas.in.h:84
+msgid "Set to TRUE to activate"
+msgstr "Ustawienie na \"true\" włączy opcję"
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -811,14 +818,14 @@ msgid "Note exported successfully"
msgstr "Notatka została pomyślnie wyeksportowana"
#: ../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 "Brak dostępu."
#: ../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 "Katalog nie istnieje."
@@ -868,7 +875,7 @@ msgstr "Wstawienie znacznika czasu"
#. 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 "dddd, d MMMM, H:mm"
@@ -910,7 +917,7 @@ msgid ""
"Change the <b>Today: Template</b> note to customize the text that new Today "
"notes have."
msgstr ""
-"Aby zmienić tekst w nowych notatkach Dzisiaj, wystarczy zmienić wzorzec "
+"Aby zmienić tekst w nowych notatkach Dzisiaj, wystarczy zmienić wzór "
"<b>Dzisiaj: Szablon</b>."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
@@ -937,10 +944,20 @@ msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd, d MMMM, H:mm"
#. 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 "Usuwanie błędnych odnośników"
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:42
+#: ../Tomboy/ExportAllApplicationAddin.cs:70
+#: ../Tomboy/Synchronization/SyncManager.cs:162
+msgid "_Tools"
+msgstr "_Narzędzia"
+
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksApplicationAddin.cs:44
+msgid "_Remove broken links"
+msgstr "_Usuń błędne odnośniki"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Dodaj szkic"
@@ -1131,96 +1148,98 @@ msgstr "Proszę ustawić domyślną przeglądarkę i spróbować ponownie"
msgid "Tomboy Web"
msgstr "Witryna programu Tomboy"
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
#, csharp-format
msgid "Export All Notes to {0}"
msgstr "Eksport wszystkich notatek do {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
#, csharp-format
msgid "Start exporting notes to {0}"
msgstr "Rozpocznij eksportowanie notatek do {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#: ../Tomboy/ExportAllApplicationAddin.cs:63
#, csharp-format
msgid "Export selected notebook to {0}"
msgstr "Eksport zaznaczonego notatnika do {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#: ../Tomboy/ExportAllApplicationAddin.cs:64
#, csharp-format
msgid "Start exporting notebook to {0}"
msgstr "Rozpocznij eksportowanie notatnika do {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Narzędzia"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
+#: ../Tomboy/ExportAllApplicationAddin.cs:73
msgid "Export"
msgstr "Wyeksportuj"
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
+#: ../Tomboy/ExportAllApplicationAddin.cs:74
msgid "Export your notes."
msgstr "Eksportuje notatki."
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
#, csharp-format
msgid "Export All Notes To {0}"
msgstr "Eksport wszystkich notatek do {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#: ../Tomboy/ExportAllApplicationAddin.cs:82
#, csharp-format
msgid "Export Selected Notebook To {0}"
msgstr "Eksport zaznaczonego notatnika do {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:153
-#, csharp-format
-msgid "All Notes {0} Export"
-msgstr "Eksport wszystkich notatek {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 "Nie można wyeksportować, brak dostępu."
+msgstr "Nie można wyeksportować. Brak dostępu."
-#: ../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 "Nie można wyeksportować, katalog nie istnieje."
+msgstr "Nie można wyeksportować. Katalog nie istnieje."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:175
+msgid "Could not export, error with the path. (No ending \"?)"
+msgstr "Nie można wyeksportować. Błąd ścieżki (brak kończącego znaku \"?)."
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#: ../Tomboy/ExportAllApplicationAddin.cs:177
+#: ../Tomboy/ExportAllApplicationAddin.cs:258
+#: ../Tomboy/ExportAllApplicationAddin.cs:336
#, csharp-format
msgid "Could not export: {0}"
msgstr "Nie można wyeksportować: {0}"
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
+#: ../Tomboy/ExportAllApplicationAddin.cs:231
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Eksport wszystkich notatek {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:260
+#: ../Tomboy/ExportAllApplicationAddin.cs:338
msgid "Unknown error."
msgstr "Nieznany błąd."
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:237
+#: ../Tomboy/ExportAllApplicationAddin.cs:291
+#: ../Tomboy/Notebooks/Notebook.cs:243
msgid "Unfiled Notes"
msgstr "Notatki bez kategorii"
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#: ../Tomboy/ExportAllApplicationAddin.cs:445
#, csharp-format
msgid "Your notes were exported to \"{0}\"."
msgstr "Notatki zostały wyeksportowane do \"{0}\"."
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
+#: ../Tomboy/ExportAllApplicationAddin.cs:454
msgid "Notes exported successfully"
msgstr "Pomyślnie wyeksportowano notatki"
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#: ../Tomboy/ExportAllApplicationAddin.cs:477
#, csharp-format
msgid "Could not save the files in \"{0}\""
msgstr "Nie można zapisać plików w \"{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 "Utwórz katalog docelowy do eksportu {0}"
@@ -1333,11 +1352,11 @@ msgstr "Notatniki"
msgid "{0} Notebook Template"
msgstr "Szablon notatki {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:153
+#: ../Tomboy/Notebooks/Notebook.cs:159
msgid "New Note"
msgstr "Nowa notatka"
-#: ../Tomboy/Notebooks/Notebook.cs:205
+#: ../Tomboy/Notebooks/Notebook.cs:211
msgid "All Notes"
msgstr "Wszystkie notatki"
@@ -1378,7 +1397,7 @@ msgstr "Notatnik"
msgid "_New notebook..."
msgstr "Nowy _notatnik..."
-#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:480
#, csharp-format
msgid "New Note {0}"
msgstr "Nowa notatka {0}"
@@ -1419,16 +1438,16 @@ msgstr "Wystąpił błąd podczas zapisywania danych notatki."
#. Translators: This is 'New Note' Template, not New 'Note Template'
#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
-msgstr "Wzorzec nowej notatki"
+msgstr "Wzór nowej notatki"
#. 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 "Notatki zostały przeniesione"
#. 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 "
@@ -1476,7 +1495,7 @@ msgstr ""
"\n"
"Ciao!"
-#: ../Tomboy/NoteManager.cs:265
+#: ../Tomboy/NoteManager.cs:269
msgid ""
"<note-content>Start Here\n"
"\n"
@@ -1514,7 +1533,7 @@ msgstr ""
"automatycznie podkreślona, a kliknięcie odnośnika natychmiast otwiera tą "
"notatkę.</note-content>"
-#: ../Tomboy/NoteManager.cs:284
+#: ../Tomboy/NoteManager.cs:288
msgid ""
"<note-content>Using Links in Tomboy\n"
"\n"
@@ -1545,17 +1564,17 @@ msgstr ""
"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 "Start"
-#: ../Tomboy/NoteManager.cs:304
+#: ../Tomboy/NoteManager.cs:308
msgid "Using Links in Tomboy"
msgstr "Używanie odnośników"
#. 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 "Treść nowej notatki..."
@@ -1676,7 +1695,7 @@ msgstr "Narzędzia notatki"
msgid "Delete this note"
msgstr "Usuwa tę notatkę"
-#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:164
msgid "Synchronize Notes"
msgstr "Synchronizacja notatek"
@@ -1720,63 +1739,69 @@ msgstr "Znajdź p_oprzednie"
msgid "Cannot create note"
msgstr "Nie można utworzyć notatki"
-#: ../Tomboy/NoteWindow.cs:832
+#: ../Tomboy/NoteWindow.cs:833
msgid "_Find:"
msgstr "_Znajdź:"
-#: ../Tomboy/NoteWindow.cs:843
+#: ../Tomboy/NoteWindow.cs:847
msgid "_Previous"
msgstr "_Poprzednie"
-#: ../Tomboy/NoteWindow.cs:852
+#: ../Tomboy/NoteWindow.cs:856
msgid "_Next"
msgstr "_Następne"
-#: ../Tomboy/NoteWindow.cs:1335
+#. x of x - specifically Number of Matches and what location is the cursor in the list of matches
+#: ../Tomboy/NoteWindow.cs:885
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} z {1}"
+
+#: ../Tomboy/NoteWindow.cs:1368
msgid "_Bold"
msgstr "_Pogrubienie"
-#: ../Tomboy/NoteWindow.cs:1347
+#: ../Tomboy/NoteWindow.cs:1380
msgid "_Italic"
msgstr "Kursy_wa"
-#: ../Tomboy/NoteWindow.cs:1359
+#: ../Tomboy/NoteWindow.cs:1392
msgid "_Strikeout"
msgstr "P_rzekreślenie"
-#: ../Tomboy/NoteWindow.cs:1371
+#: ../Tomboy/NoteWindow.cs:1404
msgid "_Highlight"
msgstr "Wyróżn_ienie"
-#: ../Tomboy/NoteWindow.cs:1384
+#: ../Tomboy/NoteWindow.cs:1417
msgid "Font Size"
msgstr "Rozmiar czcionki"
-#: ../Tomboy/NoteWindow.cs:1387
+#: ../Tomboy/NoteWindow.cs:1420
msgid "_Normal"
msgstr "_Zwykły"
-#: ../Tomboy/NoteWindow.cs:1404
+#: ../Tomboy/NoteWindow.cs:1437
msgid "Hu_ge"
msgstr "_Ogromny"
-#: ../Tomboy/NoteWindow.cs:1412
+#: ../Tomboy/NoteWindow.cs:1445
msgid "_Large"
msgstr "_Duży"
-#: ../Tomboy/NoteWindow.cs:1420
+#: ../Tomboy/NoteWindow.cs:1453
msgid "S_mall"
msgstr "_Mały"
-#: ../Tomboy/NoteWindow.cs:1429
+#: ../Tomboy/NoteWindow.cs:1462
msgid "Increase Font Size"
msgstr "Zwiększenie rozmiaru czcionki"
-#: ../Tomboy/NoteWindow.cs:1447
+#: ../Tomboy/NoteWindow.cs:1480
msgid "Decrease Font Size"
msgstr "Zmniejszenie rozmiaru czcionki"
-#: ../Tomboy/NoteWindow.cs:1467
+#: ../Tomboy/NoteWindow.cs:1500
msgid "Bullets"
msgstr "Wypunktowanie"
@@ -1852,12 +1877,12 @@ msgid ""
"Use the new note template to specify the text that should be used when "
"creating a new note."
msgstr ""
-"Wzorzec nowej notatki pozwala określić domyślną treść dla nowo utworzonych "
+"Wzór nowej notatki pozwala określić domyślną treść dla nowo utworzonych "
"notatek."
#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
-msgstr "Otwórz wzorzec nowej notatki"
+msgstr "Otwórz wzór nowej notatki"
#. Hotkeys...
#: ../Tomboy/PreferencesDialog.cs:327
@@ -2093,7 +2118,7 @@ msgstr ""
msgid "Click here to search across all notebooks"
msgstr "Naciśnięcie tutaj przeszuka wszystkie notatniki"
-#: ../Tomboy/RecentChanges.cs:775
+#: ../Tomboy/RecentChanges.cs:780
msgid "Notes"
msgstr "Notatki"
@@ -2367,23 +2392,30 @@ msgstr ""
"systemu. Należy dopisać \"modprobe fuse\" do pliku /etc/init.d/boot.local "
"lub \"fuse\" do pliku /etc/modules."
-#: ../Tomboy/Tomboy.cs:251
+#: ../Tomboy/Tomboy.cs:253
msgid "Cannot create new note"
msgstr "Nie można utworzyć nowej notatki"
-#: ../Tomboy/Tomboy.cs:317
+#: ../Tomboy/Tomboy.cs:319
msgid "Primary Development:"
msgstr "Główni programiści:"
-#: ../Tomboy/Tomboy.cs:330
+#: ../Tomboy/Tomboy.cs:332
msgid "Contributors:"
msgstr "Współtwórcy:"
-#: ../Tomboy/Tomboy.cs:415
+#: ../Tomboy/Tomboy.cs:420
msgid "translator-credits"
-msgstr "Aviary.pl <gnomepl at aviary.pl>, 2008, 2009, 2010, 2011"
+msgstr ""
+"Marek Habersack <grendel at caudium.net>, 2004\n"
+"Artur Flinta <aflinta at at.kernel.pl>, 2006\n"
+"Stanisław Małolepszy <smalolepszy at aviary.pl>, 2007\n"
+"Wadim Dziedzic <wdziedzic at aviary.pl>, 2007-2008\n"
+"Tomasz Dominikowski <dominikowski at gmail.com>, 2007-2009\n"
+"Piotr Drąg <piotrdrag at gmail.com>, 2009-2012\n"
+"Aviary.pl <gnomepl at aviary.pl>, 2007-2012"
-#: ../Tomboy/Tomboy.cs:424
+#: ../Tomboy/Tomboy.cs:429
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2391,15 +2423,15 @@ msgstr ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Inni\n"
-#: ../Tomboy/Tomboy.cs:426
+#: ../Tomboy/Tomboy.cs:431
msgid "A simple and easy to use desktop note-taking application."
msgstr "Prosty i łatwy w użyciu program do sporządzania notatek."
-#: ../Tomboy/Tomboy.cs:436
+#: ../Tomboy/Tomboy.cs:441
msgid "Homepage"
msgstr "Strona domowa"
-#: ../Tomboy/Tomboy.cs:554
+#: ../Tomboy/Tomboy.cs:577
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2412,7 +2444,7 @@ msgstr ""
"\n"
"Copyright © 2004-2011 Inni\n"
-#: ../Tomboy/Tomboy.cs:568
+#: ../Tomboy/Tomboy.cs:591
msgid ""
"Usage:\n"
" --version\t\t\tPrint version information.\n"
@@ -2428,7 +2460,7 @@ msgstr ""
" --search [tekst]\t\tOtwiera okno wyszukiwania we wszystkich notatkach z "
"podaną frazą.\n"
-#: ../Tomboy/Tomboy.cs:578
+#: ../Tomboy/Tomboy.cs:601
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"
@@ -2443,7 +2475,19 @@ msgstr ""
" --highlight-search [tekst]\tWyszukuje i wyróżnia podany tekst w otwartej "
"notatce.\n"
-#: ../Tomboy/Tomboy.cs:592
+#: ../Tomboy/Tomboy.cs:611
+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 ""
+" --addin:html-export-all [ścieżka]\tEksportuje wszystkie notatki do pliku "
+"HTML w podanym położeniu.\n"
+" --addin:html-export-all-quit [ścieżka]\tEksportuje wszystkie notatki do "
+"pliku HTML w podanym położeniu, a następnie kończy działanie.\n"
+
+#: ../Tomboy/Tomboy.cs:621
#, csharp-format
msgid "Version {0}"
msgstr "Wersja {0}"
@@ -2567,10 +2611,10 @@ msgstr "Notatka o tytule <b>{0}</b> już istnieje. Proszę wybrać inną nazwę.
msgid "Note title taken"
msgstr "Zapisano tytuł notatki"
-#: ../Tomboy/Watchers.cs:587
+#: ../Tomboy/Watchers.cs:601
msgid "_Copy Link Address"
msgstr "Skopiuj _adres odnośnika"
-#: ../Tomboy/Watchers.cs:592
+#: ../Tomboy/Watchers.cs:606
msgid "_Open Link"
msgstr "_Otwórz odnośnik"
diff --git a/test/Makefile.in b/test/Makefile.in
index 6ca7e1a..a14491c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -45,6 +62,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -354,10 +376,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/tomboy.spec b/tomboy.spec
index 3e4d58c..9cd2c5e 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.11.6
+Version: 1.12.0
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