[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, experimental, updated. debian/1.7.4-1-3-gfe6332f
Iain Lane
laney at debian.org
Tue Sep 6 16:47:59 UTC 2011
The following commit has been merged in the experimental branch:
commit e29c8c146ce9a7cbce8d3cb1923c10ed9829cce7
Author: Iain Lane <laney at debian.org>
Date: Tue Sep 6 17:04:20 2011 +0100
Imported Upstream version 1.7.6
diff --git a/ChangeLog b/ChangeLog
index c01b1b8..c36d18c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,258 @@
# Generated by Makefile. Do not edit.
+commit e3ebbbe5e5a37253d7a9decafcc52bdd7ccabf88
+Author: Alexandre Franke <alexandre.franke at gmail.com>
+Date: Mon Sep 5 11:34:40 2011 +0200
+
+ Update French translation
+
+ help/fr/fr.po | 9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+commit f420ec26104c2ef1b39039c8e277b6c4727d85d5
+Author: Alexandre Franke <alexandre.franke at gmail.com>
+Date: Mon Sep 5 11:31:30 2011 +0200
+
+ Update French translation
+
+ help/fr/fr.po | 51 ++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 30 insertions(+), 21 deletions(-)
+
+commit 1ab71c8f9ada1aead8f92c003ac8fae80a17d361
+Author: Fran Dieguez <fran at openhost.es>
+Date: Mon Sep 5 00:43:06 2011 +0200
+
+ Restore galician translations due unknown error
+
+ po/gl.po | 3478 +++++++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 2299 insertions(+), 1179 deletions(-)
+
+commit d29a81ae7da3ecf404d12647335078f7834d7f13
+Author: Fran Dieguez <fran at openhost.es>
+Date: Mon Sep 5 00:22:08 2011 +0200
+
+ Updated galician translations
+
+ po/gl.po | 3478 +++++++++++++++++++++-----------------------------------------
+ 1 files changed, 1179 insertions(+), 2299 deletions(-)
+
+commit b11c44aa6fe610cc8c2c22ebb1f7536a180c6412
+Author: Fran Dieguez <fran at openhost.es>
+Date: Sun Sep 4 20:04:32 2011 +0200
+
+ Updated galician translations
+
+ po/gl.po | 49 ++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 30 insertions(+), 19 deletions(-)
+
+commit 7092c3ea55235d8c487d1d3e6cfa508f3f9d0504
+Author: A S Alam <aalam at users.sf.net>
+Date: Sun Sep 4 19:52:51 2011 +0530
+
+ update PunjabiTranslation
+
+ po/pa.po | 336 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 174 insertions(+), 162 deletions(-)
+
+commit 92ca3353ab80d9186875f354323039fe422c67cb
+Author: Marek Černocký <marek at manet.cz>
+Date: Fri Sep 2 22:32:11 2011 +0200
+
+ Updated Czech translation
+
+ po/cs.po | 24 +++++++++++-------------
+ 1 files changed, 11 insertions(+), 13 deletions(-)
+
+commit f8bc2963e9f731f0ca1715e8a9b38e2d507b436e
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date: Fri Sep 2 23:22:05 2011 +0300
+
+ Updated Lithuanian translation
+
+ po/lt.po | 105 ++++++++++++++++++++------------------------------------------
+ 1 files changed, 34 insertions(+), 71 deletions(-)
+
+commit 3a9ce3e27c6f1ad31e3e1d68c66fc43eda68e554
+Author: Marek Černocký <marek at manet.cz>
+Date: Fri Sep 2 22:09:44 2011 +0200
+
+ Updated Czech translation
+
+ po/cs.po | 279 +++++++++++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 168 insertions(+), 111 deletions(-)
+
+commit 8aa1eb8bc217d993c6ba843630c0e0c3eda0a497
+Author: Yuri Myasoedov <omerta13 at yandex.ru>
+Date: Fri Sep 2 00:17:32 2011 +0400
+
+ Updated Russian translation
+
+ po/ru.po | 295 ++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 145 insertions(+), 150 deletions(-)
+
+commit 8d513fcf5bf7c03e5d308abb4d3d381ea6e3a034
+Author: Daniel Nylander <po at danielnylander.se>
+Date: Thu Sep 1 13:06:14 2011 +0200
+
+ Updated Swedish translation
+
+ po/sv.po | 42 +++++++++++++++++++++++++++---------------
+ 1 files changed, 27 insertions(+), 15 deletions(-)
+
+commit f4695c227ab6c5c9753f825418f9e7cae0a05ce2
+Author: Kjartan Maraas <kmaraas at gnome.org>
+Date: Thu Sep 1 08:18:15 2011 +0200
+
+ Added Norwegian bokmål translation
+
+ po/nb.po | 45 +++++++++++++++++++++++++++++----------------
+ 1 files changed, 29 insertions(+), 16 deletions(-)
+
+commit 8738ff2831d3c6fcd071efc962437e3782e588d7
+Author: Jorge González <jorgegonz at svn.gnome.org>
+Date: Wed Aug 31 19:12:02 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 5459 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 2737 insertions(+), 2722 deletions(-)
+
+commit 5b70ac8139658b8e0c3bd6eee7a61393e31a50d9
+Author: Tommi Vainikainen <thv at iki.fi>
+Date: Tue Aug 30 23:22:22 2011 +0300
+
+ Updated Finnish translation
+
+ po/fi.po | 118 ++++++++++++++++----------------------------------------------
+ 1 files changed, 30 insertions(+), 88 deletions(-)
+
+commit 6fe31d2ffd0eb2b62b202a1178d49c1500caa84d
+Author: Tommi Vainikainen <thv at iki.fi>
+Date: Tue Aug 30 23:14:52 2011 +0300
+
+ Replace string concat with variable substitution to make translations possible.
+
+ http://bugzilla.gnome.org/show_bug.cgi?id=654883
+
+ Tomboy/ExportAllApplicationAddin.cs | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 5320d5ba9c8d2c06f1edc28b821b72198c22a7bc
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Mon Aug 29 17:00:26 2011 -0400
+
+ Bumped version to 1.7.6
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit dd8a66898aeb74e806ad361d1ba7a9a7fcf2af90
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Mon Aug 29 16:56:18 2011 -0400
+
+ Update NEWS for 1.7.5
+
+ NEWS | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit e8243552638e0bafc2b04e8d60eb7c12c18cf2d9
+Author: Mario Blättermann <mariobl at gnome.org>
+Date: Sun Aug 28 14:12:46 2011 +0200
+
+ [l10n] Updated German translation
+
+ po/de.po | 746 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 394 insertions(+), 352 deletions(-)
+
+commit 05c5f9761ae84ba08b3d8b1c358dcf842e8dd504
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date: Sat Aug 27 14:50:21 2011 +0300
+
+ Updated Lithuanian translation
+
+ po/lt.po | 1759 +++++++++++++++++++++++++++++---------------------------------
+ 1 files changed, 826 insertions(+), 933 deletions(-)
+
+commit fb01a10334895c1abec270b29d810fbb91a51eb6
+Author: Kjartan Maraas <kmaraas at gnome.org>
+Date: Wed Aug 24 22:38:24 2011 +0200
+
+ Updated Norwegian bokmål translation
+
+ po/nb.po | 229 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 130 insertions(+), 99 deletions(-)
+
+commit 7f7e240ef84324cdba9601f073480180791fc1b1
+Author: Jorge González <jorgegonz at svn.gnome.org>
+Date: Wed Aug 24 21:10:20 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 204 +++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 117 insertions(+), 87 deletions(-)
+
+commit 236501cc4227e52504034d99c75af8a937415d95
+Author: Fran Dieguez <fran at openhost.es>
+Date: Wed Aug 24 21:09:19 2011 +0200
+
+ Updated Galician translations
+
+ po/gl.po | 212 ++++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 123 insertions(+), 89 deletions(-)
+
+commit abf1817e63a16996dd683746013b7b111bcc85fa
+Author: Aaron Borden <adborden at live.com>
+Date: Wed Aug 24 08:24:23 2011 -0700
+
+ Add note for translators
+
+ Clarify variable in translation string. Also fix some spacing -> tabs
+ and add the source file to mdp.
+
+ Tomboy.mdp | 3 ++-
+ Tomboy/ExportAllApplicationAddin.cs | 5 +++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 4bc383b9e4caca84042a29902cb0a80d1f2e71b7
+Author: Yaron Shahrabani <sh.yaron at gmail.com>
+Date: Wed Aug 24 12:15:50 2011 +0300
+
+ Updated Hebrew translation.
+
+ po/he.po | 227 +++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 130 insertions(+), 97 deletions(-)
+
+commit 930710010b38ab0335fdf35f17efb6c7f91597df
+Author: Daniel Nylander <po at danielnylander.se>
+Date: Wed Aug 24 09:07:37 2011 +0200
+
+ Updated Swedish translation
+
+ po/sv.po | 403 ++++++++++++++++++--------------------------------------------
+ 1 files changed, 118 insertions(+), 285 deletions(-)
+
+commit 1ee828455e8686773b2a35d7fdd0abf7989e447c
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 22 15:24:17 2011 -0700
+
+ Bumping version to 1.7.5
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit ecb89889b1be1e71ccc9d921ae71c2ae0023be8a
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Aug 22 15:21:00 2011 -0700
+
+ Update NEWS for 1.7.4
+
+ NEWS | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
commit 1741f40299943f8f50cd916cdc5ffd17ca4af057
Author: Aaron Borden <adborden at live.com>
Date: Mon Aug 22 12:46:23 2011 -0700
diff --git a/Makefile.in b/Makefile.in
index 175b37c..1c41a81 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --disable-update-mimedb
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -178,7 +177,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -234,7 +232,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -267,6 +264,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/NEWS b/NEWS
index ab19a1d..f90f52e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,17 +9,20 @@ Please send questions and suggestions to
Please report bugs using http://bugzilla.gnome.org/
(http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
+Version 1.7.5
+* Translation Updates: DE, LT, NB, ES, GL, HE, SV
+
Version 1.7.4
* Name note being deleted in confirmation dialog (#627034)
-* Autolinking notes should not update modification time (#634035)
+* Auto-linking notes should not update modification time (#634035)
* Fix translation string in Export All Notes Addin (#654865)
-* Don't create nested links (#627060)
+* Do not create nested links (#627060)
* Save button in Sync Preferences should be insensitive until fields are
filled (#473332)
* Tune down autosync frequency (#473332)
* Keep selection after Notebook rename (#625679)
-* Allow renaming of template notes (#509147)
-* Improve template note functionality (#653062)
+* Allow renaming of template notes (#509147, 629699)
+* Improve template note functionality (#653062, 629324)
* Translation Updates: es, gl, id, ru
Version 1.7.3
diff --git a/Tomboy/Addins/AdvancedPreferences/Makefile.in b/Tomboy/Addins/AdvancedPreferences/Makefile.in
index e938d3a..c0b1974 100644
--- a/Tomboy/Addins/AdvancedPreferences/Makefile.in
+++ b/Tomboy/Addins/AdvancedPreferences/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Backlinks/Makefile.in b/Tomboy/Addins/Backlinks/Makefile.in
index c2bbaaa..8e187c8 100644
--- a/Tomboy/Addins/Backlinks/Makefile.in
+++ b/Tomboy/Addins/Backlinks/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Bugzilla/Makefile.in b/Tomboy/Addins/Bugzilla/Makefile.in
index e7f812e..7f9d597 100644
--- a/Tomboy/Addins/Bugzilla/Makefile.in
+++ b/Tomboy/Addins/Bugzilla/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Evolution/Makefile.in b/Tomboy/Addins/Evolution/Makefile.in
index 20e20a7..861993a 100644
--- a/Tomboy/Addins/Evolution/Makefile.in
+++ b/Tomboy/Addins/Evolution/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/ExportToHtml/Makefile.in b/Tomboy/Addins/ExportToHtml/Makefile.in
index 5893473..2c80056 100644
--- a/Tomboy/Addins/ExportToHtml/Makefile.in
+++ b/Tomboy/Addins/ExportToHtml/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/FileSystemSyncService/Makefile.in b/Tomboy/Addins/FileSystemSyncService/Makefile.in
index 435e726..c758fb6 100644
--- a/Tomboy/Addins/FileSystemSyncService/Makefile.in
+++ b/Tomboy/Addins/FileSystemSyncService/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/FixedWidth/Makefile.in b/Tomboy/Addins/FixedWidth/Makefile.in
index 78f293e..2455517 100644
--- a/Tomboy/Addins/FixedWidth/Makefile.in
+++ b/Tomboy/Addins/FixedWidth/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/GalagoPresence/Makefile.in b/Tomboy/Addins/GalagoPresence/Makefile.in
index 8c52d63..b9a013d 100644
--- a/Tomboy/Addins/GalagoPresence/Makefile.in
+++ b/Tomboy/Addins/GalagoPresence/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/InsertTimestamp/Makefile.in b/Tomboy/Addins/InsertTimestamp/Makefile.in
index 2219509..f9789ae 100644
--- a/Tomboy/Addins/InsertTimestamp/Makefile.in
+++ b/Tomboy/Addins/InsertTimestamp/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Makefile.in b/Tomboy/Addins/Makefile.in
index 4284797..f5764d0 100644
--- a/Tomboy/Addins/Makefile.in
+++ b/Tomboy/Addins/Makefile.in
@@ -110,7 +110,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -163,7 +162,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -219,7 +217,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -252,6 +249,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
index 1cd2d34..38d867f 100644
--- a/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
+++ b/Tomboy/Addins/NoteDirectoryWatcher/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/NoteOfTheDay/Makefile.in b/Tomboy/Addins/NoteOfTheDay/Makefile.in
index 29f970f..498a5a2 100644
--- a/Tomboy/Addins/NoteOfTheDay/Makefile.in
+++ b/Tomboy/Addins/NoteOfTheDay/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/PrintNotes/Makefile.in b/Tomboy/Addins/PrintNotes/Makefile.in
index dd5e138..fb95d69 100644
--- a/Tomboy/Addins/PrintNotes/Makefile.in
+++ b/Tomboy/Addins/PrintNotes/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
index 7409851..52d40f6 100644
--- a/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
+++ b/Tomboy/Addins/RemoveBrokenLinks/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Sketching/Makefile.in b/Tomboy/Addins/Sketching/Makefile.in
index 37bd4ea..16e8219 100644
--- a/Tomboy/Addins/Sketching/Makefile.in
+++ b/Tomboy/Addins/Sketching/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/SshSyncService/Makefile.in b/Tomboy/Addins/SshSyncService/Makefile.in
index 5f4d20a..fa13b5b 100644
--- a/Tomboy/Addins/SshSyncService/Makefile.in
+++ b/Tomboy/Addins/SshSyncService/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/StickyNoteImport/Makefile.in b/Tomboy/Addins/StickyNoteImport/Makefile.in
index c7a401c..1396957 100644
--- a/Tomboy/Addins/StickyNoteImport/Makefile.in
+++ b/Tomboy/Addins/StickyNoteImport/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Tasque/Makefile.in b/Tomboy/Addins/Tasque/Makefile.in
index 3bcbe25..81e87e7 100644
--- a/Tomboy/Addins/Tasque/Makefile.in
+++ b/Tomboy/Addins/Tasque/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/Underline/Makefile.in b/Tomboy/Addins/Underline/Makefile.in
index 1e3ec21..b9b0e52 100644
--- a/Tomboy/Addins/Underline/Makefile.in
+++ b/Tomboy/Addins/Underline/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/WebDavSyncService/Makefile.in b/Tomboy/Addins/WebDavSyncService/Makefile.in
index f35476b..c669927 100644
--- a/Tomboy/Addins/WebDavSyncService/Makefile.in
+++ b/Tomboy/Addins/WebDavSyncService/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/Addins/WebSyncService/Makefile.in b/Tomboy/Addins/WebSyncService/Makefile.in
index e097e13..65e995a 100644
--- a/Tomboy/Addins/WebSyncService/Makefile.in
+++ b/Tomboy/Addins/WebSyncService/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Tomboy/ExportAllApplicationAddin.cs b/Tomboy/ExportAllApplicationAddin.cs
index 8838d94..00623b9 100644
--- a/Tomboy/ExportAllApplicationAddin.cs
+++ b/Tomboy/ExportAllApplicationAddin.cs
@@ -50,13 +50,13 @@ namespace Tomboy
am.MainWindowActions.Add (new Gtk.ActionEntry [] {
new Gtk.ActionEntry ("NoteExportAll"+export_file_suffix+"Action", null,
- Catalog.GetString ("Export All Notes to "+export_type_pretty_name), null,
- Catalog.GetString ("Start exporting notes to "+export_type_pretty_name), null)
+ String.Format (Catalog.GetString ("Export All Notes to {0}"), export_type_pretty_name), null,
+ String.Format (Catalog.GetString ("Start exporting notes to {0}"), export_type_pretty_name), null)
});
am.MainWindowActions.Add (new Gtk.ActionEntry [] {
new Gtk.ActionEntry ("NoteExportNotebook"+export_file_suffix+"Action", null,
- Catalog.GetString ("Export selected notebook to "+export_type_pretty_name), null,
- Catalog.GetString ("Start exporting notebook to "+export_type_pretty_name), null)
+ String.Format (Catalog.GetString ("Export selected notebook to {0}"), export_type_pretty_name), null,
+ String.Format (Catalog.GetString ("Start exporting notebook to {0}"), export_type_pretty_name), null)
});
action_group = new Gtk.ActionGroup ("Export");
@@ -69,12 +69,12 @@ namespace Tomboy
Catalog.GetString ("Export your notes."), null),
new Gtk.ActionEntry ("ExportAllNotes"+export_file_suffix+"Action", null,
- Catalog.GetString ("Export All Notes To "+export_type_pretty_name), null, null,
+ String.Format (Catalog.GetString ("Export All Notes To {0}"), export_type_pretty_name), null, null,
delegate {
am ["NoteExportAll"+export_file_suffix+"Action"].Activate ();
}),
new Gtk.ActionEntry ("ExportNotebook"+export_file_suffix+"Action", null,
- Catalog.GetString ("Export Selected Notebook To "+export_type_pretty_name), null, null,
+ String.Format (Catalog.GetString ("Export Selected Notebook To {0}"), export_type_pretty_name), null, null,
delegate {
am ["NoteExportNotebook"+export_file_suffix+"Action"].Activate ();
})
@@ -150,7 +150,7 @@ namespace Tomboy
//Opens the folder selection dialog
ExportMultipleDialog dialog =
- new ExportMultipleDialog ("All Notes " + export_type_pretty_name +" Export", export_type_pretty_name);
+ new ExportMultipleDialog (String.Format (Catalog.GetString ("All Notes {0} Export"), export_type_pretty_name), export_type_pretty_name);
int response = dialog.Run ();
if (response != (int) Gtk.ResponseType.Ok) {
Logger.Debug("User clicked cancel.");
@@ -503,8 +503,9 @@ namespace Tomboy
{
public ExportMultipleDialog (string default_folder, string export_type_name) :
- base (String.Format (Catalog.GetString ("Create destination folder for {0} export"), export_type_name),
- null, Gtk.FileChooserAction.Save, new object[] {})
+ // Translators: {0} is the export type, e.g. HTML
+ base (String.Format (Catalog.GetString ("Create destination folder for {0} export"), export_type_name),
+ null, Gtk.FileChooserAction.Save, new object[] {})
//Using action Save insted of CreateFolder because of Win32 issue
{
AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
diff --git a/Tomboy/Makefile.in b/Tomboy/Makefile.in
index fb3c53d..a3ef87a 100644
--- a/Tomboy/Makefile.in
+++ b/Tomboy/Makefile.in
@@ -138,7 +138,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -191,7 +190,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -247,7 +245,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -280,6 +277,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/aclocal.m4 b/aclocal.m4
index f8d69a6..d79acdc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -498,13 +498,11 @@ fi])
# gnome-common.m4
-#
-# serial 3
#
dnl GNOME_COMMON_INIT
-AU_DEFUN([GNOME_COMMON_INIT],
+AC_DEFUN([GNOME_COMMON_INIT],
[
dnl this macro should come after AC_CONFIG_MACRO_DIR
AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
@@ -517,10 +515,7 @@ AU_DEFUN([GNOME_COMMON_INIT],
fi
AC_SUBST([ACLOCAL_AMFLAGS])
-],
-[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
-in your top-level Makefile.am, instead, where "m4" is the macro directory set
-with AC_CONFIG_MACRO_DIR() in your configure.ac]])
+])
AC_DEFUN([GNOME_DEBUG_CHECK],
[
@@ -807,8 +802,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -817,8 +811,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -845,7 +838,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 57 LT_INIT
+# serial 56 LT_INIT
# LT_PREREQ(VERSION)
@@ -874,7 +867,6 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -891,8 +883,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
@@ -929,7 +919,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
])
@@ -949,9 +939,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -974,13 +961,10 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
@@ -996,6 +980,7 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -1009,6 +994,23 @@ aix3*)
;;
esac
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -1049,28 +1051,6 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
@@ -1223,7 +1203,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -1233,7 +1213,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -1332,20 +1312,12 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
# Quote evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1356,9 +1328,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1366,38 +1338,16 @@ for var in lt_decl_all_varnames([[ \
esac
done
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+ ;;
+esac
+
_LT_OUTPUT_LIBTOOL_INIT
])
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
# ---------
@@ -1407,11 +1357,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
-cat >>"$CONFIG_LT" <<\_LTEOF
lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -1437,7 +1396,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -1482,13 +1441,15 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
+if test "$no_create" != yes; then
+ lt_cl_success=:
+ test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+ exec AS_MESSAGE_LOG_FD>>config.log
+ $lt_cl_success || AS_EXIT(1)
+fi
])# LT_OUTPUT
@@ -1518,7 +1479,6 @@ _LT_CONFIG_SAVE_COMMANDS([
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
_LT_COPYING
@@ -1551,12 +1511,15 @@ _LT_EOF
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
+ _LT_PROG_XSI_SHELLFNS
- mv -f "$cfgfile" "$ofile" ||
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
@@ -1662,13 +1625,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# _LT_TAG_COMPILER
@@ -1773,31 +1734,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
- [lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
- ])
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1825,7 +1761,7 @@ _LT_EOF
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test "$DSYMUTIL" != ":"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1845,11 +1781,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- fi
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -1857,7 +1789,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
+ output_verbose_link_cmd=echo
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1873,141 +1805,202 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
# Links a minimal program and checks the executable
# for the system default hardcoded library path. In most cases,
# this is /usr/lib:/lib, but when the MPI compilers are used
# the location of the communication and MPI libs are included too.
# If we don't find anything, use the default library path according
# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
- lt_aix_libpath_sed='[
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }]'
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi],[])
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
- fi
- ])
- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
+AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_SYS_MODULE_PATH_AIX
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
+[ifdef([AC_DIVERSION_NOTICE],
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+ ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X[$]1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
+ :
else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
+ # Restart under the correct shell.
+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
fi
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
+if test "X[$]1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<_LT_EOF
+[$]*
+_LT_EOF
+ exit 0
+fi
-case "$ECHO" in
- printf*) AC_MSG_RESULT([printf]) ;;
- print*) AC_MSG_RESULT([print -r]) ;;
- *) AC_MSG_RESULT([cat]) ;;
-esac
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test "X`printf %s $ECHO`" = "X$ECHO" \
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ else
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted. We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- AC_MSG_RESULT([${with_sysroot}])
- AC_MSG_ERROR([The sysroot must be an absolute path.])
- ;;
-esac
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "[$]0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+ [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -2037,7 +2030,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -2155,47 +2148,14 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- [lt_cv_ar_at_file=no
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
- [echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
- ])
- ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
- [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
# _LT_CMD_OLD_ARCHIVE
# -------------------
m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
@@ -2222,19 +2182,10 @@ if test -n "$RANLIB"; then
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
-
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
_LT_DECL([], [old_postinstall_cmds], [2])
_LT_DECL([], [old_postuninstall_cmds], [2])
_LT_TAGDECL([], [old_archive_cmds], [2],
[Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
- [Whether to use a lock for old archive extraction])
])# _LT_CMD_OLD_ARCHIVE
@@ -2259,15 +2210,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -2307,7 +2258,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -2370,11 +2321,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -2439,8 +2385,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -2491,7 +2437,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
+[#line __oline__ "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -2532,13 +2478,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2547,11 +2487,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
@@ -2727,16 +2663,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2895,7 +2831,6 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
@@ -2904,23 +2839,16 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -2933,7 +2861,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -2953,13 +2881,7 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -3047,7 +2969,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -3078,9 +3000,8 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$cc_basename in
- yes,*)
- # gcc
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -3101,83 +3022,36 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH.
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
;;
esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
;;
*)
- # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
;;
esac
+ dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -3221,14 +3095,7 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -3239,12 +3106,6 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -3277,19 +3138,6 @@ gnu*)
hardcode_into_libs=yes
;;
-haiku*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -3332,10 +3180,8 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
postinstall_cmds='chmod 555 $lib'
- # or fails outright, so override atomically:
- install_override_mode=555
;;
interix[[3-9]]*)
@@ -3393,7 +3239,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -3402,21 +3248,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
-
# Some binutils ld are patched to set DT_RUNPATH
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
- [lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [lt_cv_shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
- ])
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -3425,7 +3266,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -3658,8 +3499,6 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
- [Permission mode override for installation of shared libraries])
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
@@ -3772,7 +3611,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
@@ -3894,11 +3732,6 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -3907,8 +3740,8 @@ case $host_os in
fi
;;
esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -3960,18 +3793,16 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc*)
+cegcc)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -4001,10 +3832,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -4013,11 +3840,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -4039,7 +3866,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4117,21 +3944,6 @@ tpf*)
;;
esac
])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- fi
- ;;
- esac
-fi
-
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -4139,11 +3951,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
- [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
- [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+ [Command to use when deplibs_check_method == "file_magic"])
])# _LT_CHECK_MAGIC_METHOD
@@ -4200,19 +4008,7 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -4225,13 +4021,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4246,67 +4042,6 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
- [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
- [lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&AS_MESSAGE_LOG_FD
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
# LT_LIB_M
# --------
@@ -4315,7 +4050,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -4343,12 +4078,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
- esac
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -4365,7 +4095,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -4433,8 +4162,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -4470,7 +4199,6 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -4492,7 +4220,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4504,18 +4232,6 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT@&t at _DLSYM_CONST
-#else
-# define LT@&t at _DLSYM_CONST const
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -4527,7 +4243,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-LT@&t at _DLSYM_CONST struct {
+const struct {
const char *name;
void *address;
}
@@ -4553,15 +4269,15 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_globsym_save_LIBS=$LIBS
- lt_globsym_save_CFLAGS=$CFLAGS
+ lt_save_LIBS="$LIBS"
+ lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS=$lt_globsym_save_LIBS
- CFLAGS=$lt_globsym_save_CFLAGS
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
@@ -4594,13 +4310,6 @@ else
AC_MSG_RESULT(ok)
fi
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -4611,8 +4320,6 @@ _LT_DECL([global_symbol_to_c_name_address],
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
- [Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -4624,6 +4331,7 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
+AC_MSG_CHECKING([for $compiler option to produce PIC])
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -4674,11 +4382,6 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -4728,12 +4431,6 @@ m4_if([$1], [CXX], [
;;
esac
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
dgux*)
case $cc_basename in
ec++*)
@@ -4790,7 +4487,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4823,8 +4520,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
- # IBM XL 8.0, 9.0 on PPC and BlueGene
+ xlc* | xlC*)
+ # IBM XL 8.0 on PPC
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4886,7 +4583,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC* | sunCC*)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4990,12 +4687,6 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
-
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -5038,13 +4729,6 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
- ;;
- esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -5087,7 +4771,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -5108,13 +4792,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- nagfor*)
- # NAG Fortran compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5126,26 +4804,26 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
- ;;
*Sun\ C*)
# Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
esac
;;
esac
@@ -5176,7 +4854,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ f77* | f90* | f95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -5233,11 +4911,9 @@ case $host_os in
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+ [How to pass a linker flag through the compiler])
#
# Check to make sure the PIC flag actually works.
@@ -5256,8 +4932,6 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
#
# Check to make sure the static flag actually works.
#
@@ -5278,7 +4952,6 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -5287,35 +4960,27 @@ m4_require([_LT_TAG_COMPILER])dnl
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- case $cc_basename in
- cl*) ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- ;;
- esac
- ;;
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -5378,33 +5043,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5422,7 +5061,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -5438,12 +5076,11 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
_LT_EOF
fi
@@ -5479,12 +5116,10 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5502,11 +5137,6 @@ _LT_EOF
fi
;;
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5522,7 +5152,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -5532,16 +5162,15 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=' $pic_flag'
+ tmp_addflag=
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -5552,17 +5181,13 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -5578,17 +5203,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf* | bgf* | bgxlf* | mpixlf*)
+ xlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -5602,8 +5227,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -5621,8 +5246,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -5668,8 +5293,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -5709,10 +5334,8 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5799,9 +5422,9 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5810,19 +5433,14 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5854,63 +5472,20 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- case $cc_basename in
- cl*)
- # Native MSVC
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # Assume MSVC wrapper
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
- esac
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
darwin* | rhapsody*)
@@ -5948,7 +5523,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5956,7 +5531,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -5971,8 +5546,8 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5990,16 +5565,16 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
@@ -6011,14 +5586,7 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- m4_if($1, [], [
- # Older versions of the 11.00 compiler do not understand -b yet
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
- _LT_LINKER_OPTION([if $CC understands -b],
- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
@@ -6046,34 +5614,28 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- # This should be the same for all languages, so no per-tag cache variable.
- AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
- [lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(
- [AC_LANG_SOURCE(
- [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
- [C++], [[int foo (void) { return 0; }]],
- [Fortran 77], [[
- subroutine foo
- end]],
- [Fortran], [[
- subroutine foo
- end]])])],
- [lt_cv_irix_exported_symbol=yes],
- [lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- fi
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ end]])])], [
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ ])
+ LDFLAGS="$save_LDFLAGS"
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -6135,17 +5697,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -6155,13 +5717,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6174,9 +5736,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -6352,38 +5914,36 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
- [$RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- ])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
;;
esac
fi
@@ -6448,6 +6008,8 @@ _LT_TAGDECL([], [inherit_rpath], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+ [Fix the shell variable $srcfile for the compiler])
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -6458,8 +6020,6 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
- [Commands necessary for finishing linking programs])
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
@@ -6549,15 +6109,14 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
@@ -6565,6 +6124,22 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
else
_lt_caught_CXX_error=yes
fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined. These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -6586,8 +6161,6 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6619,7 +6192,6 @@ if test "$_lt_caught_CXX_error" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
- lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
@@ -6637,7 +6209,6 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
- CFLAGS=$CXXFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -6659,8 +6230,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6692,7 +6263,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
else
GXX=no
@@ -6801,10 +6372,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6813,19 +6384,14 @@ if test "$_lt_caught_CXX_error" != yes; then
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -6855,75 +6421,28 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
cygwin* | mingw* | pw32* | cegcc*)
- case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # g++
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
@@ -6965,11 +6484,6 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6994,11 +6508,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
*)
if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -7059,7 +6573,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
*)
if test "$GXX" = yes; then
@@ -7069,10 +6583,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -7102,7 +6616,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -7113,9 +6627,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7126,7 +6640,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -7144,7 +6658,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -7181,26 +6695,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
$RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 and above use weak symbols
+ *) # Version 6 will use weak symbols
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
@@ -7208,7 +6722,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -7227,9 +6741,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
- xl* | mpixl* | bgxl*)
+ xl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -7249,13 +6763,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='func_echo_all'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -7324,7 +6838,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
- output_verbose_link_cmd=func_echo_all
+ output_verbose_link_cmd=echo
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -7359,15 +6873,15 @@ if test "$_lt_caught_CXX_error" != yes; then
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -7383,17 +6897,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -7403,7 +6917,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -7439,7 +6953,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
- CC* | sunCC*)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -7460,7 +6974,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='func_echo_all'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -7480,14 +6994,14 @@ if test "$_lt_caught_CXX_error" != yes; then
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7498,7 +7012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -7552,10 +7066,6 @@ if test "$_lt_caught_CXX_error" != yes; then
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -7611,7 +7121,6 @@ if test "$_lt_caught_CXX_error" != yes; then
fi # test -n "$compiler"
CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
@@ -7626,29 +7135,6 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -7657,7 +7143,6 @@ func_stripname_cnf ()
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
@@ -7708,13 +7193,6 @@ public class foo {
};
_LT_EOF
])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-esac
-
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
@@ -7726,7 +7204,7 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
@@ -7735,22 +7213,13 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
+ else
+ prev=
fi
- # Expand the sysroot to ease extracting the directories later.
- if test -z "$prev"; then
- case $p in
- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- esac
- fi
- case $p in
- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- esac
if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
- -L | -R)
+ case $p in
+ -L* | -R*)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
@@ -7770,10 +7239,8 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
- prev=
;;
- *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
@@ -7809,7 +7276,6 @@ else
fi
$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
@@ -7846,7 +7312,7 @@ linux*)
solaris*)
case $cc_basename in
- CC* | sunCC*)
+ CC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -7890,16 +7356,32 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
# _LT_LANG_F77_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7918,8 +7400,6 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7959,9 +7439,7 @@ if test "$_lt_disable_F77" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
- CFLAGS=$FFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -8015,24 +7493,38 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
fi # test "$_lt_disable_F77" != yes
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
# _LT_LANG_FC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -8051,8 +7543,6 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -8092,9 +7582,7 @@ if test "$_lt_disable_FC" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
- CFLAGS=$FCFLAGS
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
@@ -8150,8 +7638,7 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
+ CC="$lt_save_CC"
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
@@ -8188,12 +7675,10 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
+lt_save_CC="$CC"
lt_save_GCC=$GCC
GCC=yes
CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
@@ -8203,8 +7688,6 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
if test -n "$compiler"; then
_LT_COMPILER_NO_RTTI($1)
@@ -8220,8 +7703,7 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
])# _LT_LANG_GCJ_CONFIG
@@ -8256,11 +7738,9 @@ _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
CC=${RC-"windres"}
-CFLAGS=
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -8273,8 +7753,7 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
])# _LT_LANG_RC_CONFIG
@@ -8333,15 +7812,6 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
AC_SUBST([OBJDUMP])
])
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
# _LT_DECL_SED
# ------------
@@ -8433,8 +7903,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -8473,177 +7943,222 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $[*] ))
+}
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+}
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
- [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
+
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$[1]+=\$[2]"
+}
+_LT_EOF
;;
-esac
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+ ;;
+ esac
])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
- [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# 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 7 ltoptions.m4
+# serial 6 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -8758,7 +8273,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -8766,13 +8281,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [1], [Assembler program])dnl
+_LT_DECL([], [AS], [0], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -9130,31 +8645,31 @@ m4_define([lt_dict_filter],
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# @configure_input@
+# Generated from ltversion.in.
-# serial 3293 ltversion.m4
+# serial 3018 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3018])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.2.6b'
+macro_revision='1.3018'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# 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 5 lt~obsolete.m4
+# serial 4 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -9224,6 +8739,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -9236,13 +8752,6 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
@@ -9305,8 +8814,7 @@ AC_DEFUN([AM_NLS],
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -9352,8 +8860,7 @@ m4_define([_PKG_CONFIG],
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -9401,9 +8908,9 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff --git a/config.guess b/config.guess
index 8ca32db..666c5ad 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
-timestamp='2011-02-02'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,9 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -140,28 +139,15 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
-Linux|GNU/*)
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include <features.h>
- #ifdef __UCLIBC__
- # ifdef __UCLIBC_CONFIG_VERSION__
- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
- # else
- LIBC=uclibc
- # endif
- #else
- # ifdef __dietlibc__
- LIBC=dietlibc
- # else
- LIBC=gnu
- # endif
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+case "${UNAME_MACHINE}" in
+ i?86)
+ test -z "$VENDOR" && VENDOR=pc
+ ;;
+ *)
+ test -z "$VENDOR" && VENDOR=unknown
;;
esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
# Note: order is significant - the case branches are not exclusive.
@@ -204,7 +190,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -227,19 +213,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
@@ -247,7 +233,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -293,10 +279,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- exitcode=$?
- trap '' 0
- exit $exitcode ;;
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -307,13 +290,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
+ echo m68k-${VENDOR}-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo ${UNAME_MACHINE}-${VENDOR}-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo ${UNAME_MACHINE}-${VENDOR}-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -322,13 +305,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
+ echo arm-${VENDOR}-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
@@ -421,23 +404,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -507,8 +490,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -521,7 +504,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -578,7 +561,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[4567])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -621,52 +604,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -747,9 +730,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo ${UNAME_MACHINE}-${VENDOR}-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -757,22 +740,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -796,32 +779,32 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
case ${UNAME_MACHINE} in
pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -831,22 +814,22 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-${VENDOR}-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -865,21 +848,21 @@ EOF
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
+ echo x86_64-${VENDOR}-cygwin
exit ;;
p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
+ echo powerpcle-${VENDOR}-cygwin
exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
@@ -893,44 +876,52 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-${LIBC}
+ echo cris-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-${LIBC}
+ echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-${LIBC}
+ echo frv-${VENDOR}-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -949,54 +940,51 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-${LIBC}
+ echo or32-${VENDOR}-linux-gnu
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-${VENDOR}-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-${VENDOR}-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+ PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+ *) echo hppa-${VENDOR}-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-${VENDOR}-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-${VENDOR}-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-${LIBC}
+ echo x86_64-${VENDOR}-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1005,11 +993,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1018,16 +1006,16 @@ EOF
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo ${UNAME_MACHINE}-${VENDOR}-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo ${UNAME_MACHINE}-${VENDOR}-atheos
exit ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
@@ -1041,13 +1029,13 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
@@ -1069,13 +1057,13 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1086,7 +1074,7 @@ EOF
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1110,8 +1098,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
@@ -1123,19 +1111,19 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
@@ -1154,10 +1142,10 @@ EOF
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
@@ -1183,11 +1171,11 @@ EOF
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-${VENDOR}-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1252,9 +1240,6 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
- exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
@@ -1279,13 +1264,13 @@ EOF
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo ${UNAME_MACHINE}-${VENDOR}-plan9
exit ;;
*:TOPS-10:*:*)
- echo pdp10-unknown-tops10
+ echo pdp10-${VENDOR}-tops10
exit ;;
*:TENEX:*:*)
- echo pdp10-unknown-tenex
+ echo pdp10-${VENDOR}-tenex
exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
@@ -1294,19 +1279,19 @@ EOF
echo pdp10-xkl-tops20
exit ;;
*:TOPS-20:*:*)
- echo pdp10-unknown-tops20
+ echo pdp10-${VENDOR}-tops20
exit ;;
*:ITS:*:*)
- echo pdp10-unknown-its
+ echo pdp10-${VENDOR}-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1346,11 +1331,11 @@ main ()
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
diff --git a/config.sub b/config.sub
index eda465b..2a55a50 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
-timestamp='2011-02-02'
+timestamp='2009-11-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -75,9 +75,8 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -124,9 +123,8 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -158,8 +156,8 @@ case $os in
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ -bluegene*)
+ os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
@@ -175,10 +173,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -253,7 +251,7 @@ case $basic_machine in
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
- | d10v | d30v | dlx | dsp16xx | dvp \
+ | d10v | d30v | dlx | dsp16xx \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
@@ -283,7 +281,6 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
- | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
| or32 \
@@ -297,7 +294,7 @@ case $basic_machine in
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | tahoe | thumb | tic4x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
@@ -305,15 +302,6 @@ case $basic_machine in
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -345,7 +333,7 @@ case $basic_machine in
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
@@ -379,7 +367,6 @@ case $basic_machine in
| mmix-* \
| mt-* \
| msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
@@ -393,8 +380,7 @@ case $basic_machine in
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
@@ -424,7 +410,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -494,20 +480,11 @@ case $basic_machine in
basic_machine=powerpc-ibm
os=-cnk
;;
- c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
@@ -539,7 +516,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16 | cr16-*)
+ cr16)
basic_machine=cr16-unknown
os=-elf
;;
@@ -755,7 +732,7 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
@@ -773,24 +750,6 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
- mipsEE* | ee | ps2)
- basic_machine=mips64r5900el-scei
- case $os in
- -linux*)
- ;;
- *)
- os=-elf
- ;;
- esac
- ;;
- iop)
- basic_machine=mipsel-scei
- os=-irx
- ;;
- dvp)
- basic_machine=dvp-scei
- os=-elf
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -880,12 +839,6 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
- neo-tandem)
- basic_machine=neo-tandem
- ;;
- nse-tandem)
- basic_machine=nse-tandem
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -1120,10 +1073,17 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
;;
tile*)
basic_machine=tile-unknown
@@ -1293,11 +1253,11 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ -auroraux)
+ os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1334,12 +1294,11 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -1382,7 +1341,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1431,7 +1390,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1476,8 +1435,6 @@ case $os in
-dicos*)
os=-dicos
;;
- -nacl*)
- ;;
-none)
;;
*)
@@ -1500,10 +1457,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1515,17 +1472,8 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
- tic54x-*)
- os=-coff
- ;;
- tic55x-*)
- os=-coff
- ;;
- tic6x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1552,7 +1500,7 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1579,7 +1527,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
diff --git a/configure b/configure
index d6f38d3..b4313ca 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for tomboy 1.7.4.
+# Generated by GNU Autoconf 2.68 for tomboy 1.7.6.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -172,15 +172,7 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
- test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
else
@@ -541,8 +533,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
+case X$lt_ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+ ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell.
+ exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<_LT_EOF
+$*
+_LT_EOF
+ exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
+
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+ else
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
+
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
@@ -567,8 +706,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tomboy'
PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.7.4'
-PACKAGE_STRING='tomboy 1.7.4'
+PACKAGE_VERSION='1.7.6'
+PACKAGE_STRING='tomboy 1.7.6'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -696,11 +835,9 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
-MANIFEST_TOOL
+lt_ECHO
RANLIB
-ac_ct_AR
AR
-DLLTOOL
OBJDUMP
NM
ac_ct_DUMPBIN
@@ -858,7 +995,6 @@ enable_shared
with_pic
enable_fast_install
with_gnu_ld
-with_sysroot
enable_libtool_lock
with_gconf_source
with_gconf_schema_file_dir
@@ -1451,7 +1587,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tomboy 1.7.4 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.7.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1525,7 +1661,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 1.7.4:";;
+ short | recursive ) echo "Configuration of tomboy 1.7.6:";;
esac
cat <<\_ACEOF
@@ -1568,8 +1704,6 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
--with-gconf-source=sourceaddress
Config database for installing schema files.
--with-gconf-schema-file-dir=dir
@@ -1692,7 +1826,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 1.7.4
+tomboy configure 1.7.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2057,7 +2191,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tomboy $as_me 1.7.4, which was
+It was created by tomboy $as_me 1.7.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2873,7 +3007,7 @@ fi
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='1.7.4'
+ VERSION='1.7.6'
cat >>confdefs.h <<_ACEOF
@@ -3045,7 +3179,6 @@ fi
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -5934,8 +6067,8 @@ esac
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.2.6b'
+macro_revision='1.3018'
@@ -6022,75 +6155,6 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO ""
-}
-
-case "$ECHO" in
- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if ${ac_cv_path_SED+:} false; then :
@@ -6426,11 +6490,8 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in dumpbin "link -dump"
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6474,7 +6535,7 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in dumpbin "link -dump"
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6529,15 +6590,6 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -6557,13 +6609,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6612: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6615: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+ (eval echo "\"\$as_me:6618: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6609,11 +6661,6 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -6678,8 +6725,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -6721,8 +6768,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -6771,80 +6818,6 @@ esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
- ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
if ${lt_cv_ld_reload_flag+:} false; then :
@@ -6861,11 +6834,6 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -7029,18 +6997,16 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc*)
+cegcc)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -7070,10 +7036,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -7082,11 +7044,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -7108,7 +7070,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7189,21 +7151,6 @@ esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- fi
- ;;
- esac
-fi
-
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -7219,26 +7166,16 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7247,7 +7184,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7257,10 +7194,10 @@ IFS=$as_save_IFS
fi
fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7268,17 +7205,17 @@ fi
fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7287,7 +7224,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7297,17 +7234,17 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_DLLTOOL" = x; then
- DLLTOOL="false"
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7315,54 +7252,18 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- DLLTOOL=$ac_ct_DLLTOOL
+ AR=$ac_ct_AR
fi
else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
+ AR="$ac_cv_prog_AR"
fi
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
@@ -7371,17 +7272,15 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
if test -n "$ac_tool_prefix"; then
- for ac_prog in ar
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7390,7 +7289,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7400,32 +7299,28 @@ IFS=$as_save_IFS
fi
fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$AR" && break
- done
fi
-if test -z "$AR"; then
- ac_ct_AR=$AR
- for ac_prog in ar
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7434,7 +7329,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="$ac_prog"
+ ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -7444,175 +7339,10 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_AR" && break
-done
-
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- AR=$ac_ct_AR
- fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ar_at_file=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- (eval $lt_ar_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- (eval $lt_ar_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7756,18 +7486,6 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
@@ -7875,8 +7593,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -7912,7 +7630,6 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -7938,8 +7655,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@ -7954,18 +7671,6 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -7977,7 +7682,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-LT_DLSYM_CONST struct {
+const struct {
const char *name;
void *address;
}
@@ -8003,8 +7708,8 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_globsym_save_LIBS=$LIBS
- lt_globsym_save_CFLAGS=$CFLAGS
+ lt_save_LIBS="$LIBS"
+ lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -8014,8 +7719,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS=$lt_globsym_save_LIBS
- CFLAGS=$lt_globsym_save_CFLAGS
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
else
echo "cannot find nm_test_func in $nlist" >&5
fi
@@ -8052,20 +7757,6 @@ else
$as_echo "ok" >&6; }
fi
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
@@ -8085,41 +7776,6 @@ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
- withval=$with_sysroot;
-else
- with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
- as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
# Check whether --enable-libtool-lock was given.
@@ -8153,7 +7809,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ echo '#line 7812 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8315,123 +7971,6 @@ esac
need_locks="$enable_libtool_lock"
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MANIFEST_TOOL"; then
- ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_MANIFEST_TOOL"; then
- ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_MANIFEST_TOOL" = x; then
- MANIFEST_TOOL=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- fi
-else
- MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&5
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-
-
-
-
-
case $host_os in
rhapsody* | darwin*)
@@ -8982,38 +8521,6 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- echo "$RANLIB libconftest.a" >&5
- $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&5
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -9041,7 +8548,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test "$DSYMUTIL" != ":"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -9081,8 +8588,6 @@ done
-
-
# Set options
@@ -9205,7 +8710,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
test -z "$LN_S" && LN_S="ln -s"
@@ -9255,6 +8759,19 @@ _ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -9267,6 +8784,23 @@ aix3*)
;;
esac
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -9295,7 +8829,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -9500,12 +9034,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
- *)
- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
- esac
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@ -9525,15 +9054,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9057: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:9061: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -9562,6 +9091,8 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -9609,12 +9140,6 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-fno-common'
;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- lt_prog_compiler_static=
- ;;
-
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -9657,13 +9182,6 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-fPIC'
;;
esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
- ;;
- esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -9705,7 +9223,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -9726,13 +9244,7 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- nagfor*)
- # NAG Fortran compiler
- lt_prog_compiler_wl='-Wl,-Wl,,'
- lt_prog_compiler_pic='-PIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -9744,26 +9256,26 @@ lt_prog_compiler_static=
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
- ;;
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl='-Wl,'
;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl=''
+ ;;
esac
;;
esac
@@ -9794,7 +9306,7 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ f77* | f90* | f95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -9851,17 +9363,13 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
#
# Check to make sure the PIC flag actually works.
@@ -9885,15 +9393,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9396: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:9400: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -9922,11 +9430,6 @@ fi
-
-
-
-
-
#
# Check to make sure the static flag actually works.
#
@@ -9946,7 +9449,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -9995,16 +9498,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9501: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:9505: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -10050,16 +9553,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:9560: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -10172,33 +9675,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
ld_shlibs=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
- *\ \(GNU\ Binutils\)\ [3-9]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -10216,7 +9693,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -10232,12 +9708,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
_LT_EOF
fi
@@ -10273,12 +9748,10 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
- exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -10296,11 +9769,6 @@ _LT_EOF
fi
;;
- haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- link_all_deplibs=yes
- ;;
-
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -10316,7 +9784,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -10326,16 +9794,15 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=' $pic_flag'
+ tmp_addflag=
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -10346,17 +9813,13 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- compiler_needs_object=yes
- ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -10372,17 +9835,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf* | bgf* | bgxlf* | mpixlf*)
+ xlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -10396,8 +9859,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -10415,8 +9878,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -10462,8 +9925,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -10503,10 +9966,8 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -10593,13 +10054,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- if ${lt_cv_aix_libpath_+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -10612,32 +10067,25 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }'
- lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
- fi
-
-fi
-
- aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -10646,13 +10094,7 @@ fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- if ${lt_cv_aix_libpath_+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -10665,42 +10107,30 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }'
- lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
- fi
-
-fi
-
- aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
- fi
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -10732,63 +10162,20 @@ fi
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- case $cc_basename in
- cl*)
- # Native MSVC
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- always_export_symbols=yes
- file_list_spec='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- # Don't use ranlib
- old_postinstall_cmds='chmod 644 $oldlib'
- postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # Assume MSVC wrapper
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- enable_shared_with_static_runtimes=yes
- ;;
- esac
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
;;
darwin* | rhapsody*)
@@ -10798,11 +10185,7 @@ fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- else
- whole_archive_flag_spec=''
- fi
+ whole_archive_flag_spec=''
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -10810,7 +10193,7 @@ fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
+ output_verbose_link_cmd=echo
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -10853,7 +10236,7 @@ fi
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -10861,7 +10244,7 @@ fi
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -10876,8 +10259,8 @@ fi
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -10895,16 +10278,16 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
@@ -10916,46 +10299,7 @@ fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
-
- # Older versions of the 11.00 compiler do not understand -b yet
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -b"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler__b=yes
- fi
- else
- lt_cv_prog_compiler__b=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
@@ -10983,39 +10327,27 @@ fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- # This should be the same for all languages, so no per-tag cache variable.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- lt_cv_irix_exported_symbol=yes
-else
- lt_cv_irix_exported_symbol=no
+
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- fi
+ LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -11077,17 +10409,17 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -11097,13 +10429,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -11116,9 +10448,9 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -11306,50 +10638,44 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- lt_cv_archive_cmds_need_lc=no
- else
- lt_cv_archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+ then
+ archive_cmds_need_lc=no
+ else
+ archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
fi
@@ -11520,23 +10846,16 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -11549,7 +10868,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -11569,13 +10888,7 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -11663,7 +10976,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -11694,9 +11007,8 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$cc_basename in
- yes,*)
- # gcc
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -11717,83 +11029,36 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH.
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
;;
*)
- # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
;;
esac
+ dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -11837,14 +11102,7 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -11855,12 +11113,6 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -11893,19 +11145,6 @@ gnu*)
hardcode_into_libs=yes
;;
-haiku*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -11948,10 +11187,8 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
postinstall_cmds='chmod 555 $lib'
- # or fails outright, so override atomically:
- install_override_mode=555
;;
interix[3-9]*)
@@ -12009,7 +11246,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12018,17 +11255,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
-
# Some binutils ld are patched to set DT_RUNPATH
- if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -12041,17 +11273,13 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- lt_cv_shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
-
-fi
-
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -12060,7 +11288,7 @@ fi
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -12363,11 +11591,6 @@ fi
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@ -12698,7 +11921,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 11924 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12739,13 +11962,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12754,11 +11971,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
@@ -12804,7 +12017,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 12020 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12845,13 +12058,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -12860,11 +12067,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
@@ -13918,7 +13121,6 @@ if test -n "$MONO_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_MONO_CFLAGS=`$PKG_CONFIG --cflags "mono >= $MONO_MINIMUM_VERSION" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13935,7 +13137,6 @@ if test -n "$MONO_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_MONO_LIBS=`$PKG_CONFIG --libs "mono >= $MONO_MINIMUM_VERSION" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -13955,9 +13156,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MONO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono >= $MONO_MINIMUM_VERSION" 2>&1`
+ MONO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono >= $MONO_MINIMUM_VERSION" 2>&1`
else
- MONO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono >= $MONO_MINIMUM_VERSION" 2>&1`
+ MONO_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono >= $MONO_MINIMUM_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$MONO_PKG_ERRORS" >&5
@@ -14023,7 +13224,6 @@ if test -n "$LIBTOMBOY_CFLAGS"; then
pkg_cv_LIBTOMBOY_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
atk >= $ATK_MINIMUM_VERSION" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14046,7 +13246,6 @@ if test -n "$LIBTOMBOY_LIBS"; then
pkg_cv_LIBTOMBOY_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
atk >= $ATK_MINIMUM_VERSION" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14066,11 +13265,11 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBTOMBOY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-2.0 >= $GDK20_MINIMUM_VERSION
+ LIBTOMBOY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
atk >= $ATK_MINIMUM_VERSION" 2>&1`
else
- LIBTOMBOY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-2.0 >= $GDK20_MINIMUM_VERSION
+ LIBTOMBOY_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
atk >= $ATK_MINIMUM_VERSION" 2>&1`
fi
@@ -14198,7 +13397,6 @@ if test -n "$GTKSPELL_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell-2.0 >= 2.0.9" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14215,7 +13413,6 @@ if test -n "$GTKSPELL_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-2.0 >= 2.0.9" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14235,9 +13432,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkspell-2.0 >= 2.0.9" 2>&1`
+ GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkspell-2.0 >= 2.0.9" 2>&1`
else
- GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkspell-2.0 >= 2.0.9" 2>&1`
+ GTKSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkspell-2.0 >= 2.0.9" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKSPELL_PKG_ERRORS" >&5
@@ -14446,7 +13643,6 @@ if test -n "$DBUS_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14463,7 +13659,6 @@ if test -n "$DBUS_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14483,9 +13678,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
@@ -14548,7 +13743,6 @@ if test -n "$MONO_ADDINS_CFLAGS"; then
pkg_cv_MONO_ADDINS_CFLAGS=`$PKG_CONFIG --cflags "mono-addins >= 0.3 \
mono-addins-gui >= 0.3 \
mono-addins-setup >= 0.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14571,7 +13765,6 @@ if test -n "$MONO_ADDINS_LIBS"; then
pkg_cv_MONO_ADDINS_LIBS=`$PKG_CONFIG --libs "mono-addins >= 0.3 \
mono-addins-gui >= 0.3 \
mono-addins-setup >= 0.3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14591,11 +13784,11 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MONO_ADDINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono-addins >= 0.3 \
+ MONO_ADDINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono-addins >= 0.3 \
mono-addins-gui >= 0.3 \
mono-addins-setup >= 0.3" 2>&1`
else
- MONO_ADDINS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono-addins >= 0.3 \
+ MONO_ADDINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono-addins >= 0.3 \
mono-addins-gui >= 0.3 \
mono-addins-setup >= 0.3" 2>&1`
fi
@@ -14665,7 +13858,6 @@ if test -n "$GNOME_CFLAGS"; then
pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
gnome-panel-sharp-2.24" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14688,7 +13880,6 @@ if test -n "$GNOME_LIBS"; then
pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
gnome-panel-sharp-2.24" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14708,11 +13899,11 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
gnome-panel-sharp-2.24" 2>&1`
else
- GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
gconf-sharp-2.0
gnome-panel-sharp-2.24" 2>&1`
fi
@@ -14769,7 +13960,6 @@ if test -n "$GNOME_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gconf-sharp-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14786,7 +13976,6 @@ if test -n "$GNOME_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gconf-sharp-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14806,9 +13995,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-sharp-2.0" 2>&1`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-sharp-2.0" 2>&1`
else
- GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-sharp-2.0" 2>&1`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-sharp-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_PKG_ERRORS" >&5
@@ -14864,7 +14053,6 @@ if test -n "$GTKSHARP_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKSHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14881,7 +14069,6 @@ if test -n "$GTKSHARP_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTKSHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14901,9 +14088,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION" 2>&1`
+ GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION" 2>&1`
else
- GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION" 2>&1`
+ GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKSHARP_PKG_ERRORS" >&5
@@ -14989,7 +14176,6 @@ if test -n "$EVOLUTION_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_EVOLUTION_CFLAGS=`$PKG_CONFIG --cflags "gmime-sharp-2.4" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15006,7 +14192,6 @@ if test -n "$EVOLUTION_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_EVOLUTION_LIBS=`$PKG_CONFIG --libs "gmime-sharp-2.4" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15026,9 +14211,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmime-sharp-2.4" 2>&1`
+ EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmime-sharp-2.4" 2>&1`
else
- EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmime-sharp-2.4" 2>&1`
+ EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmime-sharp-2.4" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PKG_ERRORS" >&5
@@ -15061,7 +14246,6 @@ if test -n "$EVOLUTION_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_EVOLUTION_CFLAGS=`$PKG_CONFIG --cflags "gmime-sharp >= 2.2.7" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15078,7 +14262,6 @@ if test -n "$EVOLUTION_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_EVOLUTION_LIBS=`$PKG_CONFIG --libs "gmime-sharp >= 2.2.7" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15098,9 +14281,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmime-sharp >= 2.2.7" 2>&1`
+ EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmime-sharp >= 2.2.7" 2>&1`
else
- EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmime-sharp >= 2.2.7" 2>&1`
+ EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmime-sharp >= 2.2.7" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PKG_ERRORS" >&5
@@ -15173,7 +14356,6 @@ if test -n "$GALAGO_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GALAGO_CFLAGS=`$PKG_CONFIG --cflags "galago-sharp >= 0.5.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15190,7 +14372,6 @@ if test -n "$GALAGO_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GALAGO_LIBS=`$PKG_CONFIG --libs "galago-sharp >= 0.5.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15210,9 +14391,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "galago-sharp >= 0.5.0" 2>&1`
+ GALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "galago-sharp >= 0.5.0" 2>&1`
else
- GALAGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "galago-sharp >= 0.5.0" 2>&1`
+ GALAGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "galago-sharp >= 0.5.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GALAGO_PKG_ERRORS" >&5
@@ -15279,7 +14460,6 @@ if test -n "$NUNIT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15296,7 +14476,6 @@ if test -n "$NUNIT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15316,9 +14495,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono-nunit" 2>&1`
+ NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono-nunit" 2>&1`
else
- NUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono-nunit" 2>&1`
+ NUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono-nunit" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NUNIT_PKG_ERRORS" >&5
@@ -16742,7 +15921,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tomboy $as_me 1.7.4, which was
+This file was extended by tomboy $as_me 1.7.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16808,7 +15987,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-tomboy config.status 1.7.4
+tomboy config.status 1.7.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -16937,153 +16116,131 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
# Quote evaled strings.
-for var in SHELL \
-ECHO \
-SED \
+for var in SED \
GREP \
EGREP \
FGREP \
@@ -17096,13 +16253,8 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
-archiver_list_spec \
STRIP \
RANLIB \
CC \
@@ -17112,14 +16264,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
+SHELL \
+ECHO \
lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
lt_prog_compiler_wl \
+lt_prog_compiler_pic \
lt_prog_compiler_static \
lt_cv_prog_compiler_c_o \
need_locks \
-MANIFEST_TOOL \
DSYMUTIL \
NMEDIT \
LIPO \
@@ -17135,6 +16287,7 @@ no_undefined_flag \
hardcode_libdir_flag_spec \
hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
+fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
@@ -17142,13 +16295,12 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
-install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -17170,15 +16322,14 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
-postlink_cmds \
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -17186,6 +16337,12 @@ sys_lib_dlsearch_path_spec; do
esac
done
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+ ;;
+esac
+
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -17959,12 +17116,10 @@ $as_echo X"$file" |
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -18012,12 +17167,6 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
# The host system.
host_alias=$host_alias
host=$host
@@ -18067,11 +17216,9 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -18079,30 +17226,13 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method = "file_magic".
+# Command to use when deplibs_check_method == "file_magic".
file_magic_cmd=$lt_file_magic_cmd
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
# The archiver.
AR=$lt_AR
-
-# Flags to create an archive.
AR_FLAGS=$lt_AR_FLAGS
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
# A symbol stripping program.
STRIP=$lt_STRIP
@@ -18111,9 +17241,6 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
# A C compiler.
LTCC=$lt_CC
@@ -18132,24 +17259,21 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
# The name of the directory that contains temporary libtool files.
objdir=$objdir
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
@@ -18206,9 +17330,6 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -18248,10 +17369,6 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -18264,12 +17381,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
# How to pass a linker flag through the compiler.
wl=$lt_lt_prog_compiler_wl
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
@@ -18356,6 +17473,9 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -18371,9 +17491,6 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
@@ -18406,169 +17523,212 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
- mv -f "$cfgfile" "$ofile" ||
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
+
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1+=\$2"
+}
+_LT_EOF
+ ;;
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+ ;;
+ esac
+
+
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
diff --git a/configure.in b/configure.in
index 3b39ef4..72c9cbe 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.7.4)
+AC_INIT(tomboy, 1.7.6)
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 8c33d4d..f932a25 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -142,7 +142,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -195,7 +194,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -251,7 +249,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -284,6 +281,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 1d85c7a..b86019e 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -72,7 +72,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -125,7 +124,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -181,7 +179,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -214,6 +211,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/help/Makefile.in b/help/Makefile.in
index 2527429..59e53de 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -95,7 +95,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -237,6 +234,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 2fcbb1a..5e08af9 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tomboy documentation\n"
-"POT-Creation-Date: 2011-02-27 19:45+0000\n"
+"POT-Creation-Date: 2011-07-07 14:19+0000\n"
"PO-Revision-Date: 2011-03-17 18:18+0100\n"
"Last-Translator: Laurent Coudeur <laurentc at iol.ie>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -197,8 +197,8 @@ msgid ""
msgstr ""
"Remplacer la note automatiquement est définitif. Votre note locale est "
"remplacée par une copie de celle présente sur l'ordinateur distant et vous "
-"perdez toutes les informations qui étaient stockées dans cette note avant "
-"la synchronisation."
+"perdez toutes les informations qui étaient stockées dans cette note avant la "
+"synchronisation."
#: C/sync-setup.page:91(title)
msgid "Configure Sync using WebDav"
@@ -213,8 +213,8 @@ msgid ""
msgstr ""
"Pour synchroniser vos notes avec un serveur WebDAV, vous devez installer le "
"système de fichiers FUSE wdfs. Référez-vous à la documentation de votre "
-"système d'exploitation pour paramétrer FUSE pour votre compte. Vous "
-"avez également besoin du gestionnaire de trousseaux GNOME."
+"système d'exploitation pour paramétrer FUSE pour votre compte. Vous avez "
+"également besoin du gestionnaire de trousseaux GNOME."
#: C/sync-setup.page:99(p)
msgid ""
@@ -223,9 +223,9 @@ msgid ""
"gui> button. You are now ready to synchronize your notes."
msgstr ""
"Choisissez <gui>WebDAV</gui> dans la liste déroulante <gui>Service</gui>. "
-"Remplissez les informations de connexion à votre serveur et cliquez "
-"ensuite sur le bouton <gui>Enregistrer</gui>. Vous pouvez désormais "
-"synchroniser vos notes."
+"Remplissez les informations de connexion à votre serveur et cliquez ensuite "
+"sur le bouton <gui>Enregistrer</gui>. Vous pouvez désormais synchroniser vos "
+"notes."
#: C/sync-setup.page:108(title)
msgid "Configure Sync using SSH"
@@ -241,8 +241,8 @@ msgid ""
"<app>Passwords and Encryption Keys</app>."
msgstr ""
"Pour synchroniser vos notes avec un serveur SSH, vous devez avoir installé "
-"le système de fichiers FUSE, aussi appelé <app>sshfs</app>. Référez-vous à la "
-"documentation de votre système d'exploitation pour paramétrer FUSE pour "
+"le système de fichiers FUSE, aussi appelé <app>sshfs</app>. Référez-vous à "
+"la documentation de votre système d'exploitation pour paramétrer FUSE pour "
"votre compte utilisateur. Vous avez également besoin d'une clé SSH pour "
"votre compte serveur SSH, qui peut être fournie par l'application <app>GNOME "
"Seahorse</app>, aussi connue sous le nom de <app>Mots de passe et clés de "
@@ -275,8 +275,8 @@ msgstr ""
"<guiseq><gui>Distant</gui><gui>Configurer la clé pour un shell sécurisé</"
"gui></guiseq> dans le menu, puis saisissez le nom de domaine ou l'adresse IP "
"de l'ordinateur avec lequel vous souhaitez synchroniser vos notes dans "
-"<gui>Nom de l'ordinateur</gui>. Saisissez le nom d'utilisateur de l'ordinateur "
-"distant dans <gui>Identifiant de connexion</gui> et cliquez sur "
+"<gui>Nom de l'ordinateur</gui>. Saisissez le nom d'utilisateur de "
+"l'ordinateur distant dans <gui>Identifiant de connexion</gui> et cliquez sur "
"<gui>Configurer</gui>. Quand on vous le demande, saisissez le mot de passe "
"et la configuration de votre clé sera terminée."
@@ -288,10 +288,10 @@ msgid ""
"point at an empty folder. You are now ready to synchronize your notes."
msgstr ""
"Dans Tomboy, choisissez <gui>SSH</gui> dans la liste déroulante "
-"<gui>Service</gui>. Remplissez les informations de connexion à votre "
-"serveur et cliquez ensuite sur le bouton <gui>Enregistrer</gui>. Le "
-"<gui>Chemin du dossier</gui>, même s'il est facultatif, devrait indiquer un "
-"dossier vide. Vous pouvez désormais synchroniser vos notes."
+"<gui>Service</gui>. Remplissez les informations de connexion à votre serveur "
+"et cliquez ensuite sur le bouton <gui>Enregistrer</gui>. Le <gui>Chemin du "
+"dossier</gui>, même s'il est facultatif, devrait indiquer un dossier vide. "
+"Vous pouvez désormais synchroniser vos notes."
#: C/sync-setup.page:144(title)
msgid "Configure Sync to a local folder"
@@ -313,10 +313,10 @@ msgid ""
"desired synchronization <gui>Folder Path</gui> and then click the <gui>Save</"
"gui> button. You are now ready to synchronize your notes."
msgstr ""
-"Choisissez <gui>Dossier local</gui> dans la liste déroulante <gui>Service</gui>. "
-"Choisissez le <gui>Chemin du dossier</gui> souhaité pour la synchronisation, "
-"puis cliquez sur le bouton <gui>Enregistrer</gui>. Vous pouvez désormais "
-"synchroniser vos notes."
+"Choisissez <gui>Dossier local</gui> dans la liste déroulante <gui>Service</"
+"gui>. Choisissez le <gui>Chemin du dossier</gui> souhaité pour la "
+"synchronisation, puis cliquez sur le bouton <gui>Enregistrer</gui>. Vous "
+"pouvez désormais synchroniser vos notes."
#: C/sync.page:8(desc)
msgid "Sync your Tomboy notes with other computers."
@@ -484,7 +484,7 @@ msgid ""
"You can change the default settings when typing notes in Tomboy. To change "
"your note settings, open <gui>Tomboy Preferences</gui> by using your mouse "
"to right click on the Tomboy icon in your panel, taskbar or dock, and choose "
-"<gui>Preferences</gui> and select the <gui>Hotkeys</gui> tab. You can also "
+"<gui>Preferences</gui> and select the <gui>Editing</gui> tab. You can also "
"open <gui> Tomboy Preferences</gui> from the <gui>Search All Notes</gui> "
"dialog. From the menu, choose <guiseq><gui>Edit</gui><gui>Preferences</gui></"
"guiseq>."
diff --git a/help/fr/note-edit-prefs.page b/help/fr/note-edit-prefs.page
index f1e3fd6..6c2d4e7 100644
--- a/help/fr/note-edit-prefs.page
+++ b/help/fr/note-edit-prefs.page
@@ -20,16 +20,7 @@
<title>Préférences des notes</title>
- <p>You can change the default settings when typing notes
- in Tomboy. To change your note settings, open
- <gui>Tomboy Preferences</gui> by
- using your mouse to right click on the Tomboy icon in your panel,
- taskbar or dock, and choose <gui>Preferences</gui> and select
- the <gui>Editing</gui> tab. You can also open <gui> Tomboy
- Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
- the menu, choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
- </guiseq>.
- </p>
+ <p>Vous pouvez modifier les paramètres par défaut utilisés lors de la saisie de notes dans Tomboy. Pour modifier les paramètres de votre note, ouvrez les <gui>Préférences de Tomboy</gui> à l'aide de la souris en faisant un clic droit sur l'icône de Tomboy dans votre tableau de bord, barre des tâches ou dock et choisissez <gui>Préférences</gui> et sélectionnez l'onglet <gui>Édition</gui>. Vous pouvez aussi ouvrir les <gui>Préférences de Tomboy</gui> depuis la boîte de dialogue <gui>Rechercher dans toutes les notes</gui>. Choisissez <guiseq><gui>Édition</gui><gui>Préférences</gui></guiseq> dans le menu.</p>
<section id="spellcheck">
<title>Vérification orthographique</title>
diff --git a/libtomboy/Makefile.in b/libtomboy/Makefile.in
index bdf08f8..e2d5792 100644
--- a/libtomboy/Makefile.in
+++ b/libtomboy/Makefile.in
@@ -118,7 +118,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -171,7 +170,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -227,7 +225,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -260,6 +257,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/ltmain.sh b/ltmain.sh
index 3061e3c..950feee 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
+# Generated from ltmain.m4sh.
-# libtool (GNU libtool) 2.4
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -32,56 +32,50 @@
#
# Provide generalized library-building support services.
#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print informational messages (default)
+# --version print version information
+# -h, --help print short or long help message
#
# MODE must be one of the following:
#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# MODE-ARGS vary depending on the MODE.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.6b
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-PROGRAM=libtool
+PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.4
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3018
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -97,15 +91,10 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -118,33 +107,24 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
$lt_unset CDPATH
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="sed"}
+: ${SED="/usr/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -164,27 +144,6 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
@@ -199,183 +158,33 @@ func_basename ()
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
}
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
-
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# Generated shell functions inserted here.
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
+case $progname in
+ -*) progname=./$progname ;;
+esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -406,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
@@ -443,7 +243,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+ $ECHO "$progname${mode+: }$mode: $*"
}
# func_verbose arg...
@@ -458,25 +258,18 @@ func_verbose ()
:
}
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
# bash bug again:
:
@@ -533,9 +326,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -585,7 +378,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "$my_tmpdir"
+ $ECHO "X$my_tmpdir" | $Xsed
}
@@ -599,7 +392,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -626,7 +419,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
+ my_arg=`$ECHO "X$1" | $Xsed \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -695,39 +488,15 @@ func_show_eval_locale ()
fi
}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
-}
+
+
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $opt_debug
-
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -740,28 +509,22 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/^# *.*--help/ {
+ $SED -n '/^# Usage:/,/# -h/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- echo
+ $ECHO
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+# func_help
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
$SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
@@ -774,15 +537,8 @@ func_help ()
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ }' < "$progpath"
+ exit $?
}
# func_missing_arg argname
@@ -790,106 +546,63 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
-
- func_error "missing argument for $1."
+ func_error "missing argument for $1"
exit_cmd=exit
}
+exit_cmd=:
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
-
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-exit_cmd=:
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell, and then maybe $ECHO will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
# Global variables.
+# $mode is unset
nonopt=
+execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
@@ -923,16 +636,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
- echo "host: $host"
+ $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
- echo "enable shared libraries"
+ $ECHO "enable shared libraries"
else
- echo "disable shared libraries"
+ $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- echo "enable static libraries"
+ $ECHO "enable static libraries"
else
- echo "disable static libraries"
+ $ECHO "disable static libraries"
fi
exit $?
@@ -979,204 +692,117 @@ func_enable_tag ()
esac
}
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
- fi
-
- exit $EXIT_MISMATCH
- fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
- # this just eases exit handling
- while test $# -gt 0; do
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
opt="$1"
shift
+
case $opt in
- --debug|-x) opt_debug='set -x'
+ --config) func_config ;;
+
+ --debug) preserve_args="$preserve_args $opt"
func_echo "enabling shell trace mode"
+ opt_debug='set -x'
$opt_debug
;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
+
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
shift
;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
+
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
shift
;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
shift
;;
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
# Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
shift
;;
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
esac
done
- # Validate options:
-
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
-
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -1184,44 +810,82 @@ func_enable_tag "$optarg"
opt_duplicate_compiler_generated_deps=:
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
+}
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ exit $EXIT_MISMATCH
+ fi
+}
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+## ----------- ##
+## Main. ##
+## ----------- ##
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
-}
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
+ fi
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
-## ----------- ##
-## Main. ##
-## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1286,9 +950,12 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
- func_dirname_and_basename "$1" "" "."
- func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
}
# func_ltwrapper_p file
@@ -1334,37 +1001,6 @@ func_source ()
}
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot. Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
- func_resolve_sysroot_result=$1
- case $func_resolve_sysroot_result in
- =*)
- func_stripname '=' '' "$func_resolve_sysroot_result"
- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
- ;;
- esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
- case "$lt_sysroot:$1" in
- ?*:"$lt_sysroot"*)
- func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
- ;;
- *)
- # Including no sysroot.
- func_replace_sysroot_result=$1
- ;;
- esac
-}
-
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
@@ -1377,15 +1013,13 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- func_append_quoted CC_quoted "$arg"
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1396,13 +1030,11 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
- func_append_quoted CC_quoted "$arg"
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1465,486 +1097,6 @@ EOF
}
}
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
- if test -n "$1"; then
- # Unfortunately, winepath does not exit with a non-zero error code, so we
- # are forced to check the contents of stdout. On the other hand, if the
- # command is not found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both error code of
- # zero AND non-empty stdout, which explains the odd construction:
- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
- else
- func_convert_core_file_wine_to_w32_result=
- fi
- fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
- $opt_debug
- # unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
- if test -n "$1"; then
- oldIFS=$IFS
- IFS=:
- for func_convert_core_path_wine_to_w32_f in $1; do
- IFS=$oldIFS
- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
- if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
- else
- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
- fi
- fi
- done
- IFS=$oldIFS
- fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
- $opt_debug
- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
- if test "$?" -ne 0; then
- # on failure, ensure result is empty
- func_cygpath_result=
- fi
- else
- func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
- fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format. Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
- $opt_debug
- # awkward: cmd appends spaces to result
- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
- func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_file_result="$1"
- fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
- $opt_debug
- if test -z "$4" && test -n "$3"; then
- func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This is a deliberately simplistic "conversion" and
- # should not be "improved". See libtool.info.
- if test "x$1" != "x$2"; then
- lt_replace_pathsep_chars="s|$1|$2|g"
- func_to_host_path_result=`echo "$3" |
- $SED -e "$lt_replace_pathsep_chars"`
- else
- func_to_host_path_result="$3"
- fi
- fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
- $opt_debug
- case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
- ;;
- esac
- case $4 in
- $2 ) func_append func_to_host_path_result "$3"
- ;;
- esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
- $opt_debug
- $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result. If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
- $opt_debug
- case ,$2, in
- *,"$to_tool_file_cmd",*)
- func_to_tool_file_result=$1
- ;;
- *)
- $to_tool_file_cmd "$1"
- func_to_tool_file_result=$func_to_host_file_result
- ;;
- esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
- func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper. Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format. Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
- # LT_CYGPATH in this case.
- func_to_host_file_result=`cygpath -m "$1"`
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format. Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_msys_to_w32 "$1"
- func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
- func_convert_core_file_wine_to_w32 "$1"
- func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format. If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-# file name conversion function : func_convert_file_X_to_Y ()
-# path conversion function : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same. If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
- $opt_debug
- if test -z "$to_host_path_cmd"; then
- func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
- fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
- $opt_debug
- func_init_to_host_path_cmd
- $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
- func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper. Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # Remove leading and trailing path separator characters from ARG. MSYS
- # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
- # and winepath ignores them completely.
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format. Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format. Requires a wine environment and
-# a working winepath. Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
- func_convert_path_check : : \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
- func_convert_path_check : : \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
# func_mode_compile arg...
func_mode_compile ()
{
@@ -1985,12 +1137,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
- func_append pie_flag " $arg"
+ pie_flag="$pie_flag $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- func_append later " $arg"
+ later="$later $arg"
continue
;;
@@ -2011,14 +1163,15 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
- func_append_quoted lastarg "$arg"
+ func_quote_for_eval "$arg"
+ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- func_append base_compile " $lastarg"
+ base_compile="$base_compile $lastarg"
continue
;;
@@ -2034,7 +1187,8 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
- func_append_quoted base_compile "$lastarg"
+ func_quote_for_eval "$lastarg"
+ base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
@@ -2059,7 +1213,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -2134,7 +1288,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -2165,16 +1319,17 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- func_append removelist " $output_obj"
+ removelist="$removelist $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- func_append removelist " $lockfile"
+ removelist="$removelist $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
- srcfile=$func_to_tool_file_result
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
@@ -2194,7 +1349,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- func_append command " -o $lobj"
+ command="$command -o $lobj"
fi
func_show_eval_locale "$command" \
@@ -2241,11 +1396,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- func_append command " -o $obj"
+ command="$command -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- func_append command "$suppress_output"
+ command="$command$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@ -2290,13 +1445,13 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
- case $opt_mode in
+ case $mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
@@ -2327,11 +1482,10 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to build PIC objects only
- -prefer-non-pic try to build non-PIC objects only
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
- -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -2384,7 +1538,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -2404,8 +1558,6 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
- -bindir BINDIR specify path to binaries directory (for systems where
- libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -2434,11 +1586,6 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
- -Wc,FLAG
- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
- -Wl,FLAG
- -Xlinker FLAG pass linker-specific FLAG directly to the linker
- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@ -2472,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode \`$mode'"
;;
esac
- echo
+ $ECHO
$ECHO "Try \`$progname --help' for more information about other modes."
+
+ exit $?
}
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
- if test "$opt_help" = :; then
- func_mode_help
- else
- {
- func_help noexit
- for opt_mode in compile link execute install finish uninstall clean; do
- func_mode_help
- done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
- {
- func_help noexit
- for opt_mode in compile link execute install finish uninstall clean; do
- echo
- func_mode_help
- done
- } |
- sed '1d
- /^When reporting/,/^Report/{
- H
- d
- }
- $x
- /information about other modes/d
- /more detailed .*MODE/d
- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
- fi
- exit $?
-fi
+ # Now that we've collected a possible --mode arg, show help if necessary
+ $opt_help && func_mode_help
# func_mode_execute arg...
@@ -2522,16 +1643,13 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
- for file in $opt_dlopen; do
+ for file in $execute_dlfiles; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
- func_resolve_sysroot "$file"
- file=$func_resolve_sysroot_result
-
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -2553,7 +1671,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- func_append dir "/$objdir"
+ dir="$dir/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -2594,7 +1712,7 @@ func_mode_execute ()
for file
do
case $file in
- -* | *.la | *.lo ) ;;
+ -*) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -2610,7 +1728,8 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
- func_append_quoted args "$file"
+ func_quote_for_eval "$file"
+ args="$args $func_quote_for_eval_result"
done
if test "X$opt_dry_run" = Xfalse; then
@@ -2633,68 +1752,31 @@ func_mode_execute ()
exec_cmd="\$cmd$args"
else
# Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
- fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
- $opt_debug
- libs=
- libdirs=
- admincmds=
-
- for opt in "$nonopt" ${1+"$@"}
- do
- if test -d "$opt"; then
- func_append libdirs " $opt"
-
- elif test -f "$opt"; then
- if func_lalib_unsafe_p "$opt"; then
- func_append libs " $opt"
- else
- func_warning "\`$opt' is not a valid libtool archive"
- fi
-
- else
- func_fatal_error "invalid argument \`$opt'"
- fi
- done
-
- if test -n "$libs"; then
- if test -n "$lt_sysroot"; then
- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
- else
- sysroot_cmd=
- fi
-
- # Remove sysroot references
- if $opt_dry_run; then
- for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
- done
- else
- tmpdir=`func_mktempdir`
- for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
- > $tmpdir/tmp-la
- mv -f $tmpdir/tmp-la $lib
- done
- ${RM}r "$tmpdir"
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ $ECHO "export $shlibpath_var"
fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
fi
+}
+
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libdirs="$nonopt"
+ admincmds=
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -2704,7 +1786,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || func_append admincmds "
+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
$cmds"
fi
done
@@ -2713,55 +1795,53 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $ECHO " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ $ECHO "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ $ECHO
+ $ECHO "If you ever happen to want to link against installed libraries"
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $ECHO "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $ECHO " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
+ $ECHO " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
- echo "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- echo "pages."
- ;;
- *)
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
- echo "----------------------------------------------------------------------"
+ $ECHO " - use the \`$flag' linker flag"
fi
+ if test -n "$admincmds"; then
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ $ECHO
+
+ $ECHO "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ $ECHO "pages."
+ ;;
+ *)
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test "$mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@ -2772,7 +1852,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2786,12 +1866,7 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- func_append install_prog "$func_quote_for_eval_result"
- install_shared_prog=$install_prog
- case " $install_prog " in
- *[\\\ /]cp\ *) install_cp=: ;;
- *) install_cp=false ;;
- esac
+ install_prog="$install_prog$func_quote_for_eval_result"
# We need to accept at least all the BSD install flags.
dest=
@@ -2801,12 +1876,10 @@ func_mode_install ()
install_type=
isdir=no
stripme=
- no_mode=:
for arg
do
- arg2=
if test -n "$dest"; then
- func_append files " $dest"
+ files="$files $dest"
dest=$arg
continue
fi
@@ -2814,9 +1887,10 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- if $install_cp; then :; else
- prev=$arg
- fi
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
;;
-g | -m | -o)
prev=$arg
@@ -2830,10 +1904,6 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
- arg2=$install_override_mode
- no_mode=false
- fi
prev=
else
dest=$arg
@@ -2844,11 +1914,7 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- func_append install_prog " $func_quote_for_eval_result"
- if test -n "$arg2"; then
- func_quote_for_eval "$arg2"
- fi
- func_append install_shared_prog " $func_quote_for_eval_result"
+ install_prog="$install_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -2857,13 +1923,6 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
- if test -n "$install_override_mode" && $no_mode; then
- if $install_cp; then :; else
- func_quote_for_eval "$install_override_mode"
- func_append install_shared_prog " -m $func_quote_for_eval_result"
- fi
- fi
-
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@ -2918,13 +1977,10 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
- func_append staticlibs " $file"
+ staticlibs="$staticlibs $file"
;;
*.la)
- func_resolve_sysroot "$file"
- file=$func_resolve_sysroot_result
-
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2938,23 +1994,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) func_append current_libdirs " $libdir" ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) func_append future_libdirs " $libdir" ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- func_append dir "$objdir"
+ dir="$dir$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2967,9 +2023,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2987,7 +2043,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -3027,7 +2083,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
;;
*.lo)
@@ -3127,7 +2183,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@ -3146,7 +2202,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -3165,7 +2221,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -3224,7 +2280,7 @@ func_mode_install ()
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test "$mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3267,22 +2323,6 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
/* External symbol declarations for the compiler. */\
"
@@ -3292,11 +2332,10 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+ func_verbose "extracting global C symbols from \`$progfile'"
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
@@ -3332,7 +2371,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -3345,52 +2384,10 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- # if an import library, we need to obtain dlname
- if func_win32_import_lib_p "$dlprefile"; then
- func_tr_sh "$dlprefile"
- eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
- # Use subshell, to avoid clobbering current variable values
- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
- func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
- else
- # no lafile. user explicitly requested -dlpreopen <import library>.
- $sharedlib_from_linklib_cmd "$dlprefile"
- dlprefile_dlbasename=$sharedlib_from_linklib_result
- fi
- fi
- $opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
- else
- func_warning "Could not compute DLL name from $name"
- eval '$ECHO ": $name " >> "$nlist"'
- fi
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
- }
- else # not an import lib
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
- fi
- ;;
- *)
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
- ;;
- esac
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
done
$opt_dry_run || {
@@ -3418,19 +2415,36 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- echo >> "$output_objdir/$my_dlsyms" "\
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
const char *name;
void *address;
} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
+"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+ runtime relocations are performed -- see ld's documentation
+ on pseudo-relocs. */"
+ lt_dlsym_const= ;;
+ *osf5*)
+ echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+ lt_dlsym_const= ;;
+ *)
+ lt_dlsym_const=const ;;
+ esac
+
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
+$lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@ -3443,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- echo >> "$output_objdir/$my_dlsyms" "\
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@ -3486,7 +2500,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) func_append symtab_cflags " $arg" ;;
+ *) symtab_cflags="$symtab_cflags $arg" ;;
esac
done
@@ -3501,16 +2515,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -3524,8 +2538,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
}
@@ -3535,7 +2549,6 @@ static const void *lt_preloaded_setup() {
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@ -3546,11 +2559,9 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
/ I /{
@@ -3579,131 +2590,6 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-# $sharedlib_from_linklib_cmd
-# Result is available in the variable
-# $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
- $opt_debug
- sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
- $opt_debug
- match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
- $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
- $SED '/^Contents of section '"$match_literal"':/{
- # Place marker at beginning of archive member dllname section
- s/.*/====MARK====/
- p
- d
- }
- # These lines can sometimes be longer than 43 characters, but
- # are always uninteresting
- /:[ ]*file format pe[i]\{,1\}-/d
- /^In archive [^:]*:/d
- # Ensure marker is printed
- /^====MARK====/p
- # Remove all lines with less than 43 characters
- /^.\{43\}/!d
- # From remaining lines, remove first 43 characters
- s/^.\{43\}//' |
- $SED -n '
- # Join marker and all lines until next marker into a single line
- /^====MARK====/ b para
- H
- $ b para
- b
- :para
- x
- s/\n//g
- # Remove the marker
- s/^====MARK====//
- # Remove trailing dots and whitespace
- s/[\. \t]*$//
- # Print
- /./p' |
- # we now have a list, one entry per line, of the stringified
- # contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
- # a '.' (that is, objdump's representation of an unprintable
- # character.) This should work for all archives with less than
- # 0x302f exports -- but will fail for DLLs whose name actually
- # begins with a literal '.' or a single character followed by
- # a '.'.
- #
- # Of those that remain, print the first one.
- $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-# $sharedlib_from_linklib_cmd
-# Result is available in the variable
-# $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
- # binutils import library
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
- # ms-generated import library
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
- else
- # unknown
- sharedlib_from_linklib_result=""
- fi
-}
# func_extract_an_archive dir oldlib
@@ -3712,18 +2598,7 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
- lockfile=$f_ex_an_ar_oldlib.lock
- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
- func_echo "Waiting for $lockfile to be removed"
- sleep 2
- done
- fi
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
- 'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
- $opt_dry_run || rm -f "$lockfile"
- fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -3794,7 +2669,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -3809,30 +2684,25 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
+
+# func_emit_wrapper_part1 [arg=no]
#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
{
- func_emit_wrapper_arg1=${1-no}
+ func_emit_wrapper_part1_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part1_arg1=$1
+ fi
$ECHO "\
#! $SHELL
@@ -3848,6 +2718,7 @@ func_emit_wrapper ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
@@ -3878,132 +2749,31 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- file=\"\$0\""
-
- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
- $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
- ECHO=\"$qECHO\"
- fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
- lt_script_arg0=\$0
- shift
- for lt_opt
- do
- case \"\$lt_opt\" in
- --lt-debug) lt_option_debug=1 ;;
- --lt-dump-script)
- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
- cat \"\$lt_dump_D/\$lt_dump_F\"
- exit 0
- ;;
- --lt-*)
- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
- exit 1
- ;;
- esac
- done
-
- # Print the debug banner immediately:
- if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
- fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
- lt_dump_args_N=1;
- for lt_arg
- do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
- done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
- func_lt_dump_args \${1+\"\$@\"} 1>&2
- fi
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
-
- *)
- $ECHO "\
- if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
- func_lt_dump_args \${1+\"\$@\"} 1>&2
- fi
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ ECHO=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$ECHO works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$ECHO will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
"
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
- func_exec_program_core \${1+\"\$@\"}
-}
-
- # Parse options
- func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+ $ECHO "\
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -4013,13 +2783,30 @@ func_exec_program ()
esac
fi
- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+ func_emit_wrapper_part2_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part2_arg1=$1
+ fi
+
+ $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -4027,7 +2814,7 @@ func_exec_program ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -4082,18 +2869,6 @@ func_exec_program ()
if test -f \"\$progdir/\$program\"; then"
- # fixup the dll searchpath if we need to.
- #
- # Fix the DLL searchpath if we need to. Do this before prepending
- # to shlibpath, because on Windows, both are PATH and uninstalled
- # libraries must come first.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
@@ -4102,28 +2877,253 @@ func_exec_program ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
export $shlibpath_var
"
fi
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
- func_exec_program \${1+\"\$@\"}
+"
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
fi
fi\
"
}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+ func_emit_wrapper_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_arg1=$1
+ fi
+
+ # split this up so that func_emit_cwrapperexe_src
+ # can call each part independently.
+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin. Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+ func_to_host_path_result="$1"
+ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ case $build in
+ *mingw* ) # actually, msys
+ # awkward: cmd appends spaces to result
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # Unfortunately, winepath does not exit with a non-zero
+ # error code, so we are forced to check the contents of
+ # stdout. On the other hand, if the command is not
+ # found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both
+ # error code of zero AND non-empty stdout, which explains
+ # the odd construction:
+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ # Allow warning below.
+ func_to_host_path_result=""
+ fi
+ ;;
+ esac
+ if test -z "$func_to_host_path_result" ; then
+ func_error "Could not determine host path corresponding to"
+ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_path_result="$1"
+ fi
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_path
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+ func_to_host_pathlist_result="$1"
+ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+ func_to_host_pathlist_tmp2="$1"
+ # Once set for this call, this variable should not be
+ # reassigned. It is used in tha fallback case.
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e 's|^:*||' -e 's|:*$||'`
+ case $build in
+ *mingw* ) # Actually, msys.
+ # Awkward: cmd appends spaces to result.
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # unfortunately, winepath doesn't convert pathlists
+ func_to_host_pathlist_result=""
+ func_to_host_pathlist_oldIFS=$IFS
+ IFS=:
+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+ IFS=$func_to_host_pathlist_oldIFS
+ if test -n "$func_to_host_pathlist_f" ; then
+ func_to_host_path "$func_to_host_pathlist_f"
+ if test -n "$func_to_host_path_result" ; then
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_to_host_pathlist_result="$func_to_host_path_result"
+ else
+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ fi
+ fi
+ fi
+ IFS=:
+ done
+ IFS=$func_to_host_pathlist_oldIFS
+ ;;
+ esac
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_error "Could not determine the host path(s) corresponding to"
+ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This may break if $1 contains DOS-style drive
+ # specifications. The fix is not to complicate the expression
+ # below, but for the user to provide a working wine installation
+ # with winepath so that path translation in the cross-to-mingw
+ # case works properly.
+ lt_replace_pathsep_nix_to_dos="s|:|;|g"
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_replace_pathsep_nix_to_dos"`
+ fi
+ # Now, add the leading and trailing path separators back
+ case "$1" in
+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+ ;;
+ esac
+ case "$1" in
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_pathlist
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
@@ -4141,23 +3141,31 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
+
+ Currently, it simply execs the wrapper *script* "$SHELL $output",
+ but could eventually absorb all of the scripts functionality and
+ exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
+# define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
+# define HAVE_SETENV
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
# endif
#endif
#include <malloc.h>
@@ -4169,44 +3177,6 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat _stat
-# define chmod _chmod
-# define getcwd _getcwd
-# define putenv _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat _stat
-# define chmod _chmod
-# define getcwd _getcwd
-# define putenv _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@ -4222,7 +3192,14 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-/* path handling portability macros */
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#endif
+
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -4253,6 +3230,10 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@ -4265,13 +3246,22 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+ va_list args;
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+}
#else
-static int lt_debug = 0;
+# define LTWRAPPER_DEBUGPRINTF(args)
#endif
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+const char *program_name = NULL;
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -4281,27 +3271,41 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
+void lt_fatal (const char *message, ...);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
+
+static const char *script_text_part1 =
+EOF
+
+ func_emit_wrapper_part1 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
+ cat <<EOF
+
+static const char *script_text_part2 =
EOF
+ func_emit_wrapper_part2 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_path "$temp_rpath"
+ func_to_host_pathlist "$temp_rpath"
cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_path_result";
+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
EOF
else
cat <<"EOF"
@@ -4310,10 +3314,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
- func_to_host_path "$dllsearchpath:"
+ func_to_host_pathlist "$dllsearchpath:"
cat <<EOF
const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_path_result";
+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
EOF
else
cat <<"EOF"
@@ -4336,10 +3340,24 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
+
+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
+ /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
int
main (int argc, char *argv[])
@@ -4356,13 +3374,10 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- /* very simple arg parsing; don't want to rely on getopt
- * also, copy all non cwrapper options to newargz, except
- * argz[0], which is handled differently
- */
- newargc=0;
+ /* very simple arg parsing; don't want to rely on getopt */
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -4376,57 +3391,25 @@ EOF
esac
cat <<"EOF"
- lt_dump_script (stdout);
+ printf ("%s", script_text_part1);
+ printf ("%s", script_text_part2);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
- {
- lt_debug = 1;
- continue;
- }
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal (__FILE__, __LINE__,
- "unrecognized %s option: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
}
- newargz[++newargc] = NULL;
-
-EOF
- cat <<EOF
- /* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
- cat <<"EOF"
- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+ newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
- lt_debugprintf (__FILE__, __LINE__,
- "(main) found exe (before symlink chase) at: %s\n",
- tmp_pathspec);
+ lt_fatal ("Couldn't find %s", argv[0]);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+ tmp_pathspec));
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- lt_debugprintf (__FILE__, __LINE__,
- "(main) found exe (after symlink chase) at: %s\n",
- actual_cwrapper_path);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+ actual_cwrapper_path));
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@ -4444,9 +3427,8 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- lt_debugprintf (__FILE__, __LINE__,
- "(main) libtool target name: %s\n",
- target_name);
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+ target_name));
EOF
cat <<EOF
@@ -4496,19 +3478,80 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
- be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
- because on Windows, both *_VARNAMEs are PATH but uninstalled
- libraries must come first. */
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+ {
+ if (argv[i][env_set_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_set_opt_len + 1;
+ lt_opt_process_env_set (p);
+ }
+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_set (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_set_opt);
+ continue;
+ }
+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+ {
+ if (argv[i][env_prepend_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_prepend_opt_len + 1;
+ lt_opt_process_env_prepend (p);
+ }
+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_prepend_opt);
+ continue;
+ }
+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+ {
+ if (argv[i][env_append_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_append_opt_len + 1;
+ lt_opt_process_env_append (p);
+ }
+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_append (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_append_opt);
+ continue;
+ }
+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal ("Unrecognized option in %s namespace: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
+ }
+ newargz[++newargc] = NULL;
- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
- nonnull (lt_argv_zero));
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
for (i = 0; i < newargc; i++)
{
- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
- i, nonnull (newargz[i]));
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
}
EOF
@@ -4517,14 +3560,11 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
- newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- lt_debugprintf (__FILE__, __LINE__,
- "(main) failed to launch target \"%s\": %s\n",
- lt_argv_zero, nonnull (strerror (errno)));
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
return 127;
}
return rval;
@@ -4546,7 +3586,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal (__FILE__, __LINE__, "memory exhausted");
+ lt_fatal ("Memory exhausted");
return p;
}
@@ -4580,8 +3620,8 @@ check_executable (const char *path)
{
struct stat st;
- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
- nonempty (path));
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
@@ -4598,8 +3638,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
- nonempty (path));
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
@@ -4625,8 +3665,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
- nonempty (wrapper));
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -4679,8 +3719,7 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- nonnull (strerror (errno)));
+ lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -4705,8 +3744,7 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- nonnull (strerror (errno)));
+ lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -4732,9 +3770,8 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- lt_debugprintf (__FILE__, __LINE__,
- "checking path component for symlinks: %s\n",
- tmp_pathspec);
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+ tmp_pathspec));
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -4756,9 +3793,8 @@ chase_symlinks (const char *pathspec)
}
else
{
- lt_fatal (__FILE__, __LINE__,
- "error accessing file \"%s\": %s",
- tmp_pathspec, nonnull (strerror (errno)));
+ char *errstr = strerror (errno);
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
}
}
XFREE (tmp_pathspec);
@@ -4771,8 +3807,7 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal (__FILE__, __LINE__,
- "could not follow symlinks for %s", pathspec);
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -4798,25 +3833,11 @@ strendzap (char *str, const char *pat)
return str;
}
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
- va_list args;
- if (lt_debug)
- {
- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
- }
-}
-
static void
-lt_error_core (int exit_status, const char *file,
- int line, const char *mode,
+lt_error_core (int exit_status, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+ fprintf (stderr, "%s: %s: ", program_name, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -4825,32 +3846,20 @@ lt_error_core (int exit_status, const char *file,
}
void
-lt_fatal (const char *file, int line, const char *message, ...)
+lt_fatal (const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
va_end (ap);
}
-static const char *
-nonnull (const char *s)
-{
- return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
- return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
void
lt_setenv (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_setenv) setting '%s' to '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -4895,12 +3904,95 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+ const char *p;
+ int len;
+ if (!arg || !*arg)
+ return 1;
+
+ p = strchr (arg, (int)'=');
+
+ if (!p)
+ return 1;
+
+ *value = xstrdup (++p);
+
+ len = strlen (arg) - strlen (*value);
+ *name = XMALLOC (char, len);
+ strncpy (*name, arg, len-1);
+ (*name)[len - 1] = '\0';
+
+ return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+ }
+
+ lt_setenv (name, value);
+ XFREE (name);
+ XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+ char *new_value = NULL;
+
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+ }
+
+ new_value = lt_extend_str (getenv (name), value, 0);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ XFREE (name);
+ XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+ char *new_value = NULL;
+
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+ }
+
+ new_value = lt_extend_str (getenv (name), value, 1);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ XFREE (name);
+ XFREE (value);
+}
+
void
lt_update_exe_path (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
if (name && *name && value && *value)
{
@@ -4919,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
if (name && *name && value && *value)
{
@@ -4931,152 +4023,11 @@ lt_update_lib_path (const char *name, const char *value)
}
}
-EOF
- case $host_os in
- mingw*)
- cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
- Note that spawn() does not by itself call the command interpreter
- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&v);
- v.dwPlatformId == VER_PLATFORM_WIN32_NT;
- }) ? "cmd.exe" : "command.com").
- Instead it simply concatenates the arguments, separated by ' ', and calls
- CreateProcess(). We must quote the arguments since Win32 CreateProcess()
- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
- special way:
- - Space and tab are interpreted as delimiters. They are not treated as
- delimiters if they are surrounded by double quotes: "...".
- - Unescaped double quotes are removed from the input. Their only effect is
- that within double quotes, space and tab are treated like normal
- characters.
- - Backslashes not followed by double quotes are not special.
- - But 2*n+1 backslashes followed by a double quote become
- n backslashes followed by a double quote (n >= 0):
- \" -> "
- \\\" -> \"
- \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
- size_t argc;
- char **new_argv;
- size_t i;
-
- /* Count number of arguments. */
- for (argc = 0; argv[argc] != NULL; argc++)
- ;
-
- /* Allocate new argument vector. */
- new_argv = XMALLOC (char *, argc + 1);
-
- /* Put quoted arguments into the new argument vector. */
- for (i = 0; i < argc; i++)
- {
- const char *string = argv[i];
-
- if (string[0] == '\0')
- new_argv[i] = xstrdup ("\"\"");
- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
- {
- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
- size_t length;
- unsigned int backslashes;
- const char *s;
- char *quoted_string;
- char *p;
-
- length = 0;
- backslashes = 0;
- if (quote_around)
- length++;
- for (s = string; *s != '\0'; s++)
- {
- char c = *s;
- if (c == '"')
- length += backslashes + 1;
- length++;
- if (c == '\\')
- backslashes++;
- else
- backslashes = 0;
- }
- if (quote_around)
- length += backslashes + 1;
-
- quoted_string = XMALLOC (char, length + 1);
-
- p = quoted_string;
- backslashes = 0;
- if (quote_around)
- *p++ = '"';
- for (s = string; *s != '\0'; s++)
- {
- char c = *s;
- if (c == '"')
- {
- unsigned int j;
- for (j = backslashes + 1; j > 0; j--)
- *p++ = '\\';
- }
- *p++ = c;
- if (c == '\\')
- backslashes++;
- else
- backslashes = 0;
- }
- if (quote_around)
- {
- unsigned int j;
- for (j = backslashes; j > 0; j--)
- *p++ = '\\';
- *p++ = '"';
- }
- *p = '\0';
-
- new_argv[i] = quoted_string;
- }
- else
- new_argv[i] = (char *) string;
- }
- new_argv[argc] = NULL;
-
- return new_argv;
-}
-EOF
- ;;
- esac
-
- cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
- func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
- cat <<"EOF"
-}
EOF
}
# end: func_emit_cwrapperexe_src
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
- $opt_debug
- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
- *import*) : ;;
- *) false ;;
- esac
-}
-
# func_mode_link arg...
func_mode_link ()
{
@@ -5121,7 +4072,6 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
- bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -5214,11 +4164,6 @@ func_mode_link ()
esac
case $prev in
- bindir)
- bindir="$arg"
- prev=
- continue
- ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@ -5250,9 +4195,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
- func_append dlfiles " $arg"
+ dlfiles="$dlfiles $arg"
else
- func_append dlprefiles " $arg"
+ dlprefiles="$dlprefiles $arg"
fi
prev=
continue
@@ -5276,7 +4221,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) func_append deplibs " $qarg.ltframework" # this is fixed later
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
;;
esac
;;
@@ -5295,7 +4240,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
-# func_append moreargs " $fil"
+# moreargs="$moreargs $fil"
arg=$fil
# A libtool-controlled object.
@@ -5324,7 +4269,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- func_append dlfiles " $pic_object"
+ dlfiles="$dlfiles $pic_object"
prev=
continue
else
@@ -5336,7 +4281,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- func_append dlprefiles " $pic_object"
+ dlprefiles="$dlprefiles $pic_object"
prev=
fi
@@ -5406,12 +4351,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) func_append rpath " $arg" ;;
+ *) rpath="$rpath $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) func_append xrpath " $arg" ;;
+ *) xrpath="$xrpath $arg" ;;
esac
fi
prev=
@@ -5423,28 +4368,28 @@ func_mode_link ()
continue
;;
weak)
- func_append weak_libs " $arg"
+ weak_libs="$weak_libs $arg"
prev=
continue
;;
xcclinker)
- func_append linker_flags " $qarg"
- func_append compiler_flags " $qarg"
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
- func_append compiler_flags " $qarg"
+ compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
- func_append linker_flags " $qarg"
- func_append compiler_flags " $wl$qarg"
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
@@ -5480,11 +4425,6 @@ func_mode_link ()
continue
;;
- -bindir)
- prev=bindir
- continue
- ;;
-
-dlopen)
prev=dlfiles
continue
@@ -5535,16 +4475,15 @@ func_mode_link ()
;;
-L*)
- func_stripname "-L" '' "$arg"
- if test -z "$func_stripname_result"; then
+ func_stripname '-L' '' "$arg"
+ dir=$func_stripname_result
+ if test -z "$dir"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
- func_resolve_sysroot "$func_stripname_result"
- dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -5556,30 +4495,24 @@ func_mode_link ()
;;
esac
case "$deplibs " in
- *" -L$dir "* | *" $arg "*)
- # Will only happen for absolute or sysroot arguments
- ;;
+ *" -L$dir "*) ;;
*)
- # Preserve sysroot, but never include relative directories
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
- *) func_append deplibs " -L$dir" ;;
- esac
- func_append lib_search_path " $dir"
+ deplibs="$deplibs -L$dir"
+ lib_search_path="$lib_search_path $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) func_append dllsearchpath ":$dir";;
+ *) dllsearchpath="$dllsearchpath:$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) func_append dllsearchpath ":$testbindir";;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
@@ -5589,7 +4522,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5603,7 +4536,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- func_append deplibs " System.ltframework"
+ deplibs="$deplibs System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -5623,7 +4556,7 @@ func_mode_link ()
;;
esac
fi
- func_append deplibs " $arg"
+ deplibs="$deplibs $arg"
continue
;;
@@ -5635,8 +4568,8 @@ func_mode_link ()
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot|--sysroot)
- func_append compiler_flags " $arg"
+ -model|-arch|-isysroot)
+ compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
@@ -5644,12 +4577,12 @@ func_mode_link ()
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- func_append compiler_flags " $arg"
+ compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) func_append new_inherited_linker_flags " $arg" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
esac
continue
;;
@@ -5716,17 +4649,13 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
- =*)
- func_stripname '=' '' "$dir"
- dir=$lt_sysroot$func_stripname_result
- ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
- *) func_append xrpath " $dir" ;;
+ *) xrpath="$xrpath $dir" ;;
esac
continue
;;
@@ -5779,8 +4708,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- func_append arg " $func_quote_for_eval_result"
- func_append compiler_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -5795,9 +4724,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- func_append arg " $wl$func_quote_for_eval_result"
- func_append compiler_flags " $wl$func_quote_for_eval_result"
- func_append linker_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+ linker_flags="$linker_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -5825,27 +4754,23 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # Flags to be passed through unchanged, with rationale:
- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
- # -r[0-9][0-9]* specify processor for the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
- # +DA*, +DD* enable 64-bit mode for the HP compiler
- # -q* compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
- # -F/path path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
- # @file GCC response files
- # -tp=* Portland pgcc target processor selection
- # --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
+ # -q* pass through compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
- func_append compiler_flags " $arg"
+ compiler_flags="$compiler_flags $arg"
continue
;;
@@ -5857,7 +4782,7 @@ func_mode_link ()
*.$objext)
# A standard object.
- func_append objs " $arg"
+ objs="$objs $arg"
;;
*.lo)
@@ -5888,7 +4813,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- func_append dlfiles " $pic_object"
+ dlfiles="$dlfiles $pic_object"
prev=
continue
else
@@ -5900,7 +4825,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- func_append dlprefiles " $pic_object"
+ dlprefiles="$dlprefiles $pic_object"
prev=
fi
@@ -5945,25 +4870,24 @@ func_mode_link ()
*.$libext)
# An archive.
- func_append deplibs " $arg"
- func_append old_deplibs " $arg"
+ deplibs="$deplibs $arg"
+ old_deplibs="$old_deplibs $arg"
continue
;;
*.la)
# A libtool-controlled library.
- func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- func_append dlfiles " $func_resolve_sysroot_result"
+ dlfiles="$dlfiles $arg"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- func_append dlprefiles " $func_resolve_sysroot_result"
+ dlprefiles="$dlprefiles $arg"
prev=
else
- func_append deplibs " $func_resolve_sysroot_result"
+ deplibs="$deplibs $arg"
fi
continue
;;
@@ -6001,7 +4925,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -6010,8 +4934,6 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
- func_to_tool_file "$output_objdir/"
- tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
@@ -6032,12 +4954,12 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append libs " $deplib"
+ libs="$libs $deplib"
done
if test "$linkmode" = lib; then
@@ -6050,9 +4972,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
esac
- func_append pre_post_deps " $pre_post_dep"
+ pre_post_deps="$pre_post_deps $pre_post_dep"
done
fi
pre_post_deps=
@@ -6119,19 +5041,17 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
- func_resolve_sysroot "$lib"
case $lib in
- *.la) func_source "$func_resolve_sysroot_result" ;;
+ *.la) func_source "$lib" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- func_basename "$deplib"
- deplib_base=$func_basename_result
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) func_append deplibs " $deplib" ;;
+ *) deplibs="$deplibs $deplib" ;;
esac
done
done
@@ -6152,11 +5072,11 @@ func_mode_link ()
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- func_append compiler_flags " $deplib"
+ compiler_flags="$compiler_flags $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) func_append new_inherited_linker_flags " $deplib" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
@@ -6241,7 +5161,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) func_append new_inherited_linker_flags " $deplib" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
@@ -6254,8 +5174,7 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
prog)
if test "$pass" = conv; then
@@ -6269,8 +5188,7 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
@@ -6281,21 +5199,17 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- dir=$func_resolve_sysroot_result
+ dir=$func_stripname_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) func_append xrpath " $dir" ;;
+ *) xrpath="$xrpath $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
- *.la)
- func_resolve_sysroot "$deplib"
- lib=$func_resolve_sysroot_result
- ;;
+ *.la) lib="$deplib" ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
@@ -6313,7 +5227,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -6323,15 +5237,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
- echo
+ $ECHO
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because the file extensions .$libext of this argument makes me believe"
- echo "*** that it is just a static archive that I should not use here."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
+ $ECHO "*** that it is just a static archive that I should not use here."
else
- echo
+ $ECHO
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@ -6358,11 +5272,11 @@ func_mode_link ()
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- func_append newdlprefiles " $deplib"
+ newdlprefiles="$newdlprefiles $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- func_append newdlfiles " $deplib"
+ newdlfiles="$newdlfiles $deplib"
fi
fi
continue
@@ -6404,20 +5318,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
- *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
esac
done
fi
- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && func_append dlfiles " $dlopen"
- test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi
if test "$pass" = conv; then
@@ -6428,20 +5342,20 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- func_append convenience " $ladir/$objdir/$old_library"
- func_append old_convenience " $ladir/$objdir/$old_library"
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $deplib"
+ tmp_libs="$tmp_libs $deplib"
done
continue
fi # $pass = conv
@@ -6449,15 +5363,9 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
- if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
- linklib=$old_library
- else
- for l in $old_library $library_names; do
- linklib="$l"
- done
- fi
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
@@ -6474,9 +5382,9 @@ func_mode_link ()
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- func_append dlprefiles " $lib $dependency_libs"
+ dlprefiles="$dlprefiles $lib $dependency_libs"
else
- func_append newdlfiles " $lib"
+ newdlfiles="$newdlfiles $lib"
fi
continue
fi # $pass = dlopen
@@ -6498,14 +5406,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir="$libdir"
+ absdir="$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
@@ -6513,12 +5421,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- func_append notinst_path " $abs_ladir"
+ notinst_path="$notinst_path $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- func_append notinst_path " $abs_ladir"
+ notinst_path="$notinst_path $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
@@ -6529,46 +5437,20 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
- case "$host" in
- # special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *cegcc* )
- # Linker will automatically link against shared library if both
- # static and shared are present. Therefore, ensure we extract
- # symbols from the import library if a shared library is present
- # (otherwise, the dlopen module name will be incorrect). We do
- # this by putting the import library name into $newdlprefiles.
- # We recover the dlopen module name by 'saving' the la file
- # name in a special purpose variable, and (later) extracting the
- # dlname from the la file.
- if test -n "$dlname"; then
- func_tr_sh "$dir/$linklib"
- eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
- func_append newdlprefiles " $dir/$linklib"
- else
- func_append newdlprefiles " $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- func_append dlpreconveniencelibs " $dir/$old_library"
- fi
- ;;
- * )
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- func_append newdlprefiles " $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- func_append dlpreconveniencelibs " $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- func_append newdlprefiles " $dir/$dlname"
- else
- func_append newdlprefiles " $dir/$linklib"
- fi
- ;;
- esac
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ newdlprefiles="$newdlprefiles $dir/$dlname"
+ else
+ newdlprefiles="$newdlprefiles $dir/$linklib"
+ fi
fi # $pass = dlpreopen
if test -z "$libdir"; then
@@ -6586,7 +5468,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
- func_append newlib_search_path " $ladir"
+ newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
@@ -6599,8 +5481,7 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
esac
# Need to link against all dependency_libs?
@@ -6611,12 +5492,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $deplib"
+ tmp_libs="$tmp_libs $deplib"
done # for deplib
continue
fi # $linkmode = prog...
@@ -6631,7 +5512,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) func_append temp_rpath "$absdir:" ;;
+ *) temp_rpath="$temp_rpath$absdir:" ;;
esac
fi
@@ -6643,7 +5524,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
+ *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
@@ -6652,7 +5533,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
@@ -6677,12 +5558,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- func_append notinst_deplibs " $lib"
+ notinst_deplibs="$notinst_deplibs $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- func_append notinst_deplibs " $lib"
+ notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
fi
;;
@@ -6699,7 +5580,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- echo
+ $ECHO
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@ -6717,7 +5598,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
+ *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
@@ -6726,7 +5607,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
@@ -6780,7 +5661,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test "$linkmode" = prog || test "$mode" != relink; then
add_shlibpath=
add_dir=
add=
@@ -6802,9 +5683,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
- echo
- echo "*** And there doesn't seem to be a static archive available"
- echo "*** The link will probably fail, sorry"
+ $ECHO
+ $ECHO "*** And there doesn't seem to be a static archive available"
+ $ECHO "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
@@ -6836,7 +5717,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- func_append add_dir " -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -6858,7 +5739,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) func_append compile_shlibpath "$add_shlibpath:" ;;
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
@@ -6872,13 +5753,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) func_append finalize_shlibpath "$libdir:" ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
fi
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test "$linkmode" = prog || test "$mode" = relink; then
add_shlibpath=
add_dir=
add=
@@ -6892,7 +5773,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) func_append finalize_shlibpath "$libdir:" ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6909,7 +5790,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- func_append add_dir " -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -6944,21 +5825,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- echo
+ $ECHO
$ECHO "*** Warning: This system can not link to static lib archive $lib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- echo "*** But as you try to build a module library, libtool will still create "
- echo "*** a static module, that should work as long as the dlopening application"
- echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ $ECHO "*** But as you try to build a module library, libtool will still create "
+ $ECHO "*** a static module, that should work as long as the dlopening application"
+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- echo
- echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -6986,46 +5867,37 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) func_append xrpath " $temp_xrpath";;
+ *) xrpath="$xrpath $temp_xrpath";;
esac;;
- *) func_append temp_deplibs " $libdir";;
+ *) temp_deplibs="$temp_deplibs $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- func_append newlib_search_path " $absdir"
+ newlib_search_path="$newlib_search_path $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- case $deplib in
- -L*) func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result";;
- *) func_resolve_sysroot "$deplib" ;;
- esac
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $func_resolve_sysroot_result "*)
- func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $func_resolve_sysroot_result"
+ tmp_libs="$tmp_libs $deplib"
done
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
- path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
- func_resolve_sysroot "$deplib"
- deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
- dir=$func_dirname_result
+ dir="$func_dirname_result"
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -7052,8 +5924,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
@@ -7086,7 +5958,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -7103,7 +5975,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) func_append lib_search_path " $dir" ;;
+ *) lib_search_path="$lib_search_path $dir" ;;
esac
done
newlib_search_path=
@@ -7161,10 +6033,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) func_append tmp_libs " $deplib" ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
esac
;;
- *) func_append tmp_libs " $deplib" ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
@@ -7180,7 +6052,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
- func_append tmp_libs " $i"
+ tmp_libs="$tmp_libs $i"
fi
done
dependency_libs=$tmp_libs
@@ -7221,7 +6093,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- func_append objs "$old_deplibs"
+ objs="$objs$old_deplibs"
;;
lib)
@@ -7254,10 +6126,10 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- echo
+ $ECHO
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- func_append libobjs " $objs"
+ libobjs="$libobjs $objs"
fi
fi
@@ -7322,7 +6194,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
+ freebsd-aout|freebsd-elf|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -7455,7 +6327,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ verstring="$verstring:${current}.0"
;;
qnx)
@@ -7523,10 +6395,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- func_append libobjs " $symfileobj"
+ libobjs="$libobjs $symfileobj"
test "X$libobjs" = "X " && libobjs=
- if test "$opt_mode" != relink; then
+ if test "$mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7542,7 +6414,7 @@ func_mode_link ()
continue
fi
fi
- func_append removelist " $p"
+ removelist="$removelist $p"
;;
*) ;;
esac
@@ -7553,28 +6425,27 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- func_append oldlibs " $output_objdir/$libname.$libext"
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
- func_replace_sysroot "$libdir"
- func_append temp_xrpath " -R$func_replace_sysroot_result"
+ temp_xrpath="$temp_xrpath -R$libdir"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -7588,7 +6459,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) func_append dlfiles " $lib" ;;
+ *) dlfiles="$dlfiles $lib" ;;
esac
done
@@ -7598,19 +6469,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) func_append dlprefiles " $lib" ;;
+ *) dlprefiles="$dlprefiles $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- func_append deplibs " System.ltframework"
+ deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -7627,7 +6498,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- func_append deplibs " -lc"
+ deplibs="$deplibs -lc"
fi
;;
esac
@@ -7676,7 +6547,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
i=""
;;
esac
@@ -7687,21 +6558,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which I believe you do not have"
- echo "*** because a test_compile did reveal that the linker did not use it for"
- echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which I believe you do not have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
;;
esac
done
@@ -7719,7 +6590,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
i=""
;;
esac
@@ -7730,29 +6601,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because a test_compile did reveal that the linker did not use this one"
- echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- echo "*** make it link in! You will probably need to install it or some"
- echo "*** library that it depends on before this library will be fully"
- echo "*** functional. Installing it before continuing would be even better."
+ $ECHO "*** make it link in! You will probably need to install it or some"
+ $ECHO "*** library that it depends on before this library will be fully"
+ $ECHO "*** functional. Installing it before continuing would be even better."
fi
;;
*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
;;
esac
done
@@ -7769,27 +6640,15 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
- if test -n "$file_magic_glob"; then
- libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
- else
- libnameglob=$libname
- fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
- shopt -s nocaseglob
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- $nocaseglob
- else
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- fi
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7806,13 +6665,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
@@ -7821,12 +6680,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because I did check the linker path looking for a file starting"
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@ -7837,7 +6696,7 @@ EOF
;;
*)
# Add a -L argument.
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -7853,7 +6712,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
@@ -7864,9 +6723,9 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
@@ -7875,12 +6734,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because I did check the linker path looking for a file starting"
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@ -7891,32 +6750,32 @@ EOF
;;
*)
# Add a -L argument.
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
done
fi
- case $tmp_deplibs in
- *[!\ \ ]*)
- echo
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
+ $GREP . >/dev/null; then
+ $ECHO
if test "X$deplibs_check_method" = "Xnone"; then
- echo "*** Warning: inter-library dependencies are not supported in this platform."
+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
else
- echo "*** Warning: inter-library dependencies are not known to be supported."
+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
fi
- echo "*** All declared inter-library dependencies are being dropped."
+ $ECHO "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- ;;
- esac
+ fi
;;
esac
versuffix=$versuffix_save
@@ -7928,23 +6787,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- echo
- echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO
+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- echo "*** a static module, that should work as long as the dlopening"
- echo "*** application is linked with the -dlopen flag."
+ $ECHO "*** a static module, that should work as long as the dlopening"
+ $ECHO "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- echo
- echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -7954,16 +6813,16 @@ EOF
build_libtool_libs=no
fi
else
- echo "*** The inter-library dependencies that have been dropped here will be"
- echo "*** automatically added whenever a program is linked with this library"
- echo "*** or is declared to -dlopen it."
+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
+ $ECHO "*** automatically added whenever a program is linked with this library"
+ $ECHO "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- echo
- echo "*** Since this library must not contain undefined symbols,"
- echo "*** because either the platform does not support them or"
- echo "*** it was explicitly requested with -no-undefined,"
- echo "*** libtool will only create a static version of it."
+ $ECHO
+ $ECHO "*** Since this library must not contain undefined symbols,"
+ $ECHO "*** because either the platform does not support them or"
+ $ECHO "*** it was explicitly requested with -no-undefined,"
+ $ECHO "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@ -7980,9 +6839,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7995,7 +6854,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- func_append new_libs " -L$path/$objdir" ;;
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
@@ -8005,10 +6864,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
done
deplibs="$new_libs"
@@ -8025,12 +6884,10 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
- func_replace_sysroot "$libdir"
- libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
@@ -8039,18 +6896,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append dep_rpath " $flag"
+ dep_rpath="$dep_rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
done
@@ -8068,7 +6925,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
@@ -8076,7 +6933,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,18 +6959,18 @@ EOF
linknames=
for link
do
- func_append linknames " $link"
+ linknames="$linknames $link"
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
- func_append delfiles " $export_symbols"
+ delfiles="$delfiles $export_symbols"
fi
orig_export_symbols=
@@ -8144,45 +7001,13 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
- for cmd1 in $cmds; do
+ for cmd in $cmds; do
IFS="$save_ifs"
- # Take the normal branch if the nm_file_list_spec branch
- # doesn't work or if tool conversion is not needed.
- case $nm_file_list_spec~$to_tool_file_cmd in
- *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
- try_normal_branch=yes
- eval cmd=\"$cmd1\"
- func_len " $cmd"
- len=$func_len_result
- ;;
- *)
- try_normal_branch=no
- ;;
- esac
- if test "$try_normal_branch" = yes \
- && { test "$len" -lt "$max_cmd_len" \
- || test "$max_cmd_len" -le -1; }
- then
- func_show_eval "$cmd" 'exit $?'
- skipped_export=false
- elif test -n "$nm_file_list_spec"; then
- func_basename "$output"
- output_la=$func_basename_result
- save_libobjs=$libobjs
- save_output=$output
- output=${output_objdir}/${output_la}.nm
- func_to_tool_file "$output"
- libobjs=$nm_file_list_spec$func_to_tool_file_result
- func_append delfiles " $output"
- func_verbose "creating $NM input file list: $output"
- for obj in $save_libobjs; do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result"
- done > "$output"
- eval cmd=\"$cmd1\"
+ eval cmd=\"$cmd\"
+ func_len " $cmd"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
func_show_eval "$cmd" 'exit $?'
- output=$save_output
- libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
@@ -8204,7 +7029,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -8216,7 +7041,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8226,7 +7051,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
- func_append tmp_deplibs " $test_deplib"
+ tmp_deplibs="$tmp_deplibs $test_deplib"
;;
esac
done
@@ -8246,21 +7071,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $convenience
- func_append libobjs " $func_extract_archives_result"
+ libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- func_append linker_flags " $flag"
+ linker_flags="$linker_flags $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
@@ -8305,8 +7130,7 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- func_basename "$output"
- output_la=$func_basename_result
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -8319,16 +7143,13 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- echo 'INPUT (' > $output
+ $ECHO 'INPUT (' > $output
for obj in $save_libobjs
do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result" >> $output
+ $ECHO "$obj" >> $output
done
- echo ')' >> $output
- func_append delfiles " $output"
- func_to_tool_file "$output"
- output=$func_to_tool_file_result
+ $ECHO ')' >> $output
+ delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
@@ -8342,12 +7163,10 @@ EOF
fi
for obj
do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result" >> $output
+ $ECHO "$obj" >> $output
done
- func_append delfiles " $output"
- func_to_tool_file "$output"
- output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+ delfiles="$delfiles $output"
+ output=$firstobj\"$file_list_spec$output\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
@@ -8371,19 +7190,17 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- reload_objs=$objlist
- eval concat_cmds=\"$reload_cmds\"
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
else
# All subsequent reloadable object files will link in
# the last one created.
- reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=" $obj"
+ objlist=$obj
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@ -8393,12 +7210,11 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- func_append delfiles " $output"
+ delfiles="$delfiles $output"
else
output=
@@ -8432,7 +7248,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8453,7 +7269,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -8465,7 +7281,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8506,10 +7322,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
- func_append libobjs " $func_extract_archives_result"
+ libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
@@ -8525,7 +7341,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8537,7 +7353,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8618,21 +7434,18 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
- # If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -8692,8 +7505,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
@@ -8704,14 +7517,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -8725,7 +7538,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- func_append new_libs " -L$path/$objdir" ;;
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
@@ -8735,17 +7548,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- func_append compile_command " $compile_deplibs"
- func_append finalize_command " $finalize_deplibs"
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -8753,7 +7566,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
fi
@@ -8772,18 +7585,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append rpath " $flag"
+ rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_append perm_rpath " $libdir" ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
case $host in
@@ -8792,12 +7605,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) func_append dllsearchpath ":$libdir";;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) func_append dllsearchpath ":$testbindir";;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
@@ -8823,18 +7636,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append rpath " $flag"
+ rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_perm_rpath " $libdir" ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
esac
fi
done
@@ -8848,8 +7661,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -8861,15 +7674,15 @@ EOF
wrappers_required=yes
case $host in
- *cegcc* | *mingw32ce*)
- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
- ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
+ *cegcc)
+ # Disable wrappers for cegcc, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@ -8878,19 +7691,13 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8913,7 +7720,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -8921,7 +7728,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -8931,18 +7738,11 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
-
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
exit $EXIT_SUCCESS
fi
@@ -8957,7 +7757,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -8969,19 +7769,13 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output_objdir/$outputname"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
# Now create the wrapper script.
func_verbose "creating $output"
@@ -8999,7 +7793,18 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Quote $ECHO for shipping.
+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+ case $progpath in
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -9079,7 +7884,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
+ oldobjs="$oldobjs $symfileobj"
fi
fi
addlibs="$old_convenience"
@@ -9087,10 +7892,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $addlibs
- func_append oldobjs " $func_extract_archives_result"
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# Do each command in the archive commands.
@@ -9101,10 +7906,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
- func_append oldobjs " $func_extract_archives_result"
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
@@ -9120,9 +7925,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- echo "copying selected object files to avoid basename conflicts..."
+ $ECHO "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
@@ -9146,9 +7951,9 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- func_append oldobjs " $gentop/$newobj"
+ oldobjs="$oldobjs $gentop/$newobj"
;;
- *) func_append oldobjs " $obj" ;;
+ *) oldobjs="$oldobjs $obj" ;;
esac
done
fi
@@ -9158,16 +7963,6 @@ EOF
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
- elif test -n "$archiver_list_spec"; then
- func_verbose "using command file archive linking..."
- for obj in $oldobjs
- do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result"
- done > $output_objdir/$libname.libcmd
- func_to_tool_file "$output_objdir/$libname.libcmd"
- oldobjs=" $archiver_list_spec$func_to_tool_file_result"
- cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
@@ -9241,7 +8036,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -9264,19 +8059,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
- ;;
- -L*)
- func_stripname -L '' "$deplib"
- func_replace_sysroot "$func_stripname_result"
- func_append newdependency_libs " -L$func_replace_sysroot_result"
+ newdependency_libs="$newdependency_libs $libdir/$name"
;;
- -R*)
- func_stripname -R '' "$deplib"
- func_replace_sysroot "$func_stripname_result"
- func_append newdependency_libs " -R$func_replace_sysroot_result"
- ;;
- *) func_append newdependency_libs " $deplib" ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -9290,9 +8075,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+ newdlfiles="$newdlfiles $libdir/$name"
;;
- *) func_append newdlfiles " $lib" ;;
+ *) newdlfiles="$newdlfiles $lib" ;;
esac
done
dlfiles="$newdlfiles"
@@ -9309,7 +8094,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+ newdlprefiles="$newdlprefiles $libdir/$name"
;;
esac
done
@@ -9321,7 +8106,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- func_append newdlfiles " $abs"
+ newdlfiles="$newdlfiles $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
@@ -9330,33 +8115,15 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- func_append newdlprefiles " $abs"
+ newdlprefiles="$newdlprefiles $abs"
done
dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
- # In fact, it would be nice if we could use this code for all target
- # systems that can't hard-code library paths into their executables
- # and that have no shared library path variable independent of PATH,
- # but it turns out we can't easily determine that from inspecting
- # libtool variables, so we have to hard-code the OSs to which it
- # applies here; at the moment, that means platforms that use the PE
- # object format with DLL files. See the long comment at the top of
- # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
- # If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
- func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
- else
- # Otherwise fall back on heuristic.
- tdlname=../bin/$dlname
- fi
- ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
@@ -9415,7 +8182,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+{ test "$mode" = link || test "$mode" = relink; } &&
func_mode_link ${1+"$@"}
@@ -9435,9 +8202,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
- -*) func_append RM " $arg" ;;
- *) func_append files " $arg" ;;
+ -f) RM="$RM $arg"; rmforce=yes ;;
+ -*) RM="$RM $arg" ;;
+ *) files="$files $arg" ;;
esac
done
@@ -9446,23 +8213,24 @@ func_mode_uninstall ()
rmdirs=
+ origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
- odir="$objdir"
+ objdir="$origobjdir"
else
- odir="$dir/$objdir"
+ objdir="$dir/$origobjdir"
fi
func_basename "$file"
name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ test "$mode" = uninstall && objdir="$dir"
- # Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ # Remember objdir for removal later, being careful to avoid duplicates
+ if test "$mode" = clean; then
case " $rmdirs " in
- *" $odir "*) ;;
- *) func_append rmdirs " $odir" ;;
+ *" $objdir "*) ;;
+ *) rmdirs="$rmdirs $objdir" ;;
esac
fi
@@ -9488,17 +8256,18 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- func_append rmfiles " $odir/$n"
+ rmfiles="$rmfiles $objdir/$n"
done
- test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- case "$opt_mode" in
+ case "$mode" in
clean)
- case " $library_names " in
+ case " $library_names " in
+ # " " in the beginning catches empty $dlname
*" $dlname "*) ;;
- *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
esac
- test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
@@ -9526,19 +8295,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- func_append rmfiles " $dir/$pic_object"
+ rmfiles="$rmfiles $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
- func_append rmfiles " $dir/$non_pic_object"
+ rmfiles="$rmfiles $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test "$mode" = clean ; then
noexename=$name
case $file in
*.exe)
@@ -9548,7 +8317,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- func_append rmfiles " $file"
+ rmfiles="$rmfiles $file"
;;
esac
# Do a test to see if this is a libtool program.
@@ -9557,7 +8326,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- func_append rmfiles " $func_ltwrapper_scriptname_result"
+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
@@ -9565,12 +8334,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- func_append rmfiles " $odir/lt-$name"
+ rmfiles="$rmfiles $objdir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
fi
fi
fi
@@ -9578,6 +8347,7 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
+ objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
@@ -9589,16 +8359,16 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
-test -z "$opt_mode" && {
+test -z "$mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode \`$mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff --git a/po/cs.po b/po/cs.po
index af7f11b..b1abcf8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -16,8 +16,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-07-10 12:21+0000\n"
-"PO-Revision-Date: 2011-07-18 20:31+0200\n"
+"POT-Creation-Date: 2011-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-09-02 22:31+0200\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -637,7 +637,7 @@ msgstr "_Smazat"
msgid "Delete the selected note"
msgstr "Smazat vybranou poznámku"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "_Zavřít"
@@ -681,7 +681,7 @@ msgstr "Ikona v panelu"
msgid "Create _New Note"
msgstr "Vytvořit _novou poznámku"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Hledat ve všech poznámkách"
@@ -820,16 +820,16 @@ msgstr "_Umístění složky:"
msgid "Select Synchronization Folder..."
msgstr "Vyberte synchronizační složku..."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "Nezadali jste umístění složky."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "Zadané umístění složky neexistuje a Tomboy ho nemohl vytvořit."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Místní složka"
@@ -930,22 +930,22 @@ msgstr "Odstranit nefunkční odkazy"
msgid "Add a sketch"
msgstr "Kreslit"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Se_rver:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "Uživatelské jmé_no:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "U_místění složky (volitelné):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../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."
@@ -953,15 +953,15 @@ msgstr ""
"Synchronizace pomocí SSH vyžaduje existující klíče SSH tohoto serveru a "
"uživatele přidané do běžícího démona SSH."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "Není zadán server nebo uživatelské jméno."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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."
@@ -1023,23 +1023,23 @@ msgstr "--- Aplikace Tasque neběží ---"
msgid "_Underline"
msgstr "_Podtrhnout"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_URL:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_Heslo:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "Položky URL, přihlašovací jméno nebo heslo nejsou vyplněny!"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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."
@@ -1052,13 +1052,13 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr "Nepodařilo se uložit nastavení do klíčenky GNOME:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Připojit se k serveru"
@@ -1067,23 +1067,23 @@ msgid "Connected"
msgstr "Připojeno"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "Nepodařilo se připojit k serveru. Zkuste to později."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Synchronizace se nepodařila, zkuste to znovu"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Autorizace aplikace Tomboy skrze WWW byla úspěšná"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
@@ -1091,20 +1091,20 @@ msgstr ""
"Vraťte se prosím do okna s předvolbami aplikace Tomboy a stiskněte tlačítko "
"Uložit pro zahájení synchronizace."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr ""
"Připojeno k serveru. Chcete-li zahájit synchronizaci, stiskněte tlačítko "
"Uložit"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Ověřování v prohlížeči (Stiskněte pro obnovení spojení)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Nastavte si výchozí prohlížeč WWW a zkuste to znovu"
@@ -1113,20 +1113,28 @@ msgid "Tomboy Web"
msgstr "Webové stránky Tomboy"
#: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Exportovat všechny poznámky do "
+#, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "Exportovat všechny poznámky do {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Začít exportovat poznámky do "
+#, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "Spustit export poznámek do formátu {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Exportovat vybraný sešit do "
+#, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "Exportovat vybraný sešit do {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Začít exportovat sešit do "
+#, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "Spustit export sešitu do formátu {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1142,12 +1150,22 @@ msgid "Export your notes."
msgstr "Exportovat vaše poznámky."
#: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Exportovat všechny poznámky do "
+#, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "Exportovat všechny poznámky do {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Exportovat vybraný sešit do "
+#, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "Exportovat vybraný sešit do {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "Export všech poznámek do formátu {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:193
#: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1171,7 +1189,7 @@ msgid "Unknown error."
msgstr "Neznámá chyba."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "Nezařazené poznámky"
@@ -1189,9 +1207,12 @@ msgstr "Poznámka byla úspěšně exportována"
msgid "Could not save the files in \"{0}\""
msgstr "Nelze uložit soubor ve složce „{0}“"
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Vytvoření cílové složky pro "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+#| msgid "Create destination folder for "
+msgid "Create destination folder for {0} export"
+msgstr "Vytvoření cílové složky pro export do {0}"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1301,15 +1322,20 @@ msgstr "Sešity"
msgid "{0} Notebook Template"
msgstr "Šablona sešitu {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+#| msgid "_New Note"
+msgid "New Note"
+msgstr "Nová poznámka"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "Všechny poznámky"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Opravdu odstranit tento sešit?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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."
@@ -1330,28 +1356,31 @@ msgstr "Žádný sešit"
msgid "New \"{0}\" Note"
msgstr "Nová poznámka „{0}“"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Umístit tuto poznámku do sešitu"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Sešit"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "Nový _sešit..."
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Nová poznámka {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Opravdu odstranit tuto poznámku?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "Opravdu odstranit „{0}“?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
@@ -1359,11 +1388,11 @@ msgstr[0] "Opravdu odstranit tuto poznámku?"
msgstr[1] "Opravdu odstranit tyto {0} poznámky?"
msgstr[2] "Opravdu odstranit těchto {0} poznámek?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Pokud odstraníte poznámku, bude navždy ztracena."
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1374,7 +1403,7 @@ msgstr ""
"volného místa a můžete zapisovat do složky {0}. Chybové hlášení naleznete v "
"{1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Nepodařilo se uložit poznámku."
@@ -1515,7 +1544,7 @@ msgstr "Používání odkazů v poznámkách Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Sem napište svou novou poznámku."
@@ -1579,140 +1608,167 @@ msgstr "Nikdy nepřejmenovat _odkazy"
msgid "Alwa_ys rename links"
msgstr "Vžd_y přejmenovat odkazy"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "Najít v této poznámce"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_Odkaz na novou poznámku"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "_Text"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_Najít v této poznámce"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "Z_avřít všechny poznámky"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Hledat"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "Hledat ve vašich poznámkách"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Odkaz"
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "Propojit vybraný text s novou poznámkou"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Text"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Nastavit vlastnosti textu"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "_Nástroje"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Použít na tuto poznámku nástroje"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Odstranit tuto poznámku"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Synchronizovat poznámky"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 ""
+"Tato poznámka slouží jako šablona. Je výchozím vzorem obsahu běžné poznámky "
+"a nezobrazuje se v nabídce poznámek a vyhledávacím okně."
+
+#: ../Tomboy/NoteWindow.cs:571
+#| msgid "Connect to Server"
+msgid "Convert to regular note"
+msgstr "Převést na běžnou poznámku"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Uložit veliko_st"
+
+#: ../Tomboy/NoteWindow.cs:585
+#| msgid "Select None"
+msgid "Save Se_lection"
+msgstr "U_ložit výběr"
+
+#: ../Tomboy/NoteWindow.cs:594
+#| msgid "Note Title"
+msgid "Save _Title"
+msgstr "Uloži_t název"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Najít..."
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "Hledat _následující"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "Hledat _předchozí"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Nelze vytvořit poznámku"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Hledat:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Předchozí"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Další"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_Tučné"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Kurzíva"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Přeškrtnuté"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "_Zvýraznění"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Velikost písma"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Normální"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "_Obrovské"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Velké"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Malé"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Zvětšit písmo"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Zmenšit písmo"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Odrážky"
@@ -1954,19 +2010,19 @@ msgstr ""
msgid "Error connecting"
msgstr "Chyba připojování"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Verze:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Autor:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Copyright:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Závislosti rozšíření:"
@@ -1978,19 +2034,19 @@ msgstr "_Hledat:"
msgid "Note"
msgstr "Poznámka"
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Naposledy změněno"
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Odpovídá"
-#: ../Tomboy/RecentChanges.cs:562
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "Název odpovídá"
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
@@ -1998,7 +2054,7 @@ msgstr[0] "{0} odpovídá"
msgstr[1] "{0} odpovídají"
msgstr[2] "{0} odpovídá"
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
@@ -2006,7 +2062,7 @@ msgstr[0] "Celkem: {0} poznámka"
msgstr[1] "Celkem: {0} poznámky"
msgstr[2] "Celkem: {0} poznámek"
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
@@ -2014,7 +2070,7 @@ msgstr[0] "Celkem: {0} poznámka"
msgstr[1] "Celkem: {0} poznámky"
msgstr[2] "Celkem: {0} poznámek"
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -2022,11 +2078,11 @@ msgstr ""
"Ve vybraném sešitě nebyl nalezen žádný výsledek.\n"
"Kliknutím zde prohledáte všechny sešity."
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "Kliknutím zde prohledáte všechny sešity"
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Poznámky"
@@ -2517,4 +2573,3 @@ msgstr "_Kopírovat adresu odkazu"
#: ../Tomboy/Watchers.cs:592
msgid "_Open Link"
msgstr "_Otevřít odkaz"
-
diff --git a/po/de.po b/po/de.po
index ae25461..c6aaf2f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,8 +15,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-06-26 04:42+0000\n"
-"PO-Revision-Date: 2011-07-07 15:58+0100\n"
+"POT-Creation-Date: 2011-08-22 21:48+0000\n"
+"PO-Revision-Date: 2011-08-28 14:11+0100\n"
"Last-Translator: Mario Blättermann <mariobl at freenet.de>\n"
"Language-Team: Deutsch <gnome-de at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -651,7 +651,7 @@ msgstr "_Löschen"
msgid "Delete the selected note"
msgstr "Ausgewählte Notiz löschen"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "S_chließen"
@@ -695,7 +695,7 @@ msgstr "Benachrichtigungsfeld"
msgid "Create _New Note"
msgstr "_Neue Notiz anlegen"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Alle Notizen durchsuchen"
@@ -707,6 +707,16 @@ msgstr "Fenster zum Durchsuchen aller Notizen öffnen"
msgid "Start synchronizing notes"
msgstr "Abgleich der Notizen starten"
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Erweitert"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Mindestanzahl der in der Notizliste anzuzeigenden Notizen (maximal 18)"
+
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
msgstr "Was zeigt hier hin?"
@@ -768,10 +778,26 @@ msgstr "Dieses Symbol wirklich entfernen?"
msgid "If you remove an icon it is permanently lost."
msgstr "Wenn Sie dieses Symbol entfernen, geht es unwiderruflich verloren."
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "E-Mail kann nicht geöffnet werden"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
msgid "HTML"
msgstr "HTML"
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Ziel für die HTML-Exportierung"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Verknüpfte Notizen exportieren"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Alle anderen verknüpften Notizen einschließen"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "In HTML exportieren"
@@ -802,22 +828,6 @@ msgstr "Ordner existiert nicht."
msgid "Could not save the file \"{0}\""
msgstr "Die Datei {0} konnte nicht gespeichert werden."
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Ziel für die HTML-Exportierung"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Verknüpfte Notizen exportieren"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Alle anderen verknüpften Notizen einschließen"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "E-Mail kann nicht geöffnet werden"
-
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
msgid "_Folder Path:"
msgstr "_Ordnerpfad:"
@@ -826,18 +836,18 @@ msgstr "_Ordnerpfad:"
msgid "Select Synchronization Folder..."
msgstr "Ordner für den Abgleich auswählen …"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "Feld für Ordnerpfad ist leer."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr ""
"Der angegebene Ordnerpfad existiert nicht und konnte von Tomboy nicht erzeugt "
"werden."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Lokaler Ordner"
@@ -939,22 +949,22 @@ msgstr "Ungültige Verknüpfungen entfernen"
msgid "Add a sketch"
msgstr "Entwurf hinzufügen"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Se_rver:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "Benutzer_name:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "_Ordnerpfad (optional):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../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."
@@ -962,15 +972,15 @@ msgstr ""
"Der SSH-Abgleich erfordert es, dass ein bestehender SSH-Schlüssel für diesen "
"Server und Benutzer zu einem laufenden SSH-Daemon hinzugefügt wird."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "Feld für Server oder Benutzername ist leer."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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."
@@ -1034,23 +1044,23 @@ msgstr "--- Tasque wurde nicht gestartet ---"
msgid "_Underline"
msgstr "_Unterstreichen"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_Adresse:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_Passwort:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "Feld für Adresse, Benutzername oder Passwort ist leer."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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."
@@ -1064,19 +1074,15 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr ""
"Das Speichern der Konfiguration in den GNOME-Schlüsselbund ist mit folgender "
"Meldung gescheitert:"
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy im Internet"
-
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Mit Server verbinden"
@@ -1085,23 +1091,23 @@ msgid "Connected"
msgstr "Verbunden"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "Server antwortet nicht. Bitte später versuchen."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Legitimierung gescheitert, bitte erneut versuchen"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Tomboy-Web-Legitimierung erfolgreich"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
@@ -1109,31 +1115,34 @@ msgstr ""
"Drücken Sie im Einstellungsfenster von Tomboy die Eingabetaste und klicken "
"Sie auf »Speichern«, um mit dem Abgleich zu beginnen."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr ""
"Verbindung hergestellt. Klicken Sie auf »Speichern«, um mit dem Abgleich zu "
"beginnen."
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Legitimierung im Browser (Klicken, um die Verbindung zurückzusetzen)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Legen Sie Ihren Vorgabe-Browser fest und versuchen Sie es erneut."
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy im Internet"
+
#: ../Tomboy/ExportAllApplicationAddin.cs:53
msgid "Export All Notes to "
msgstr "Alle Notizen exportieren nach"
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-#, fuzzy
msgid "Start exporting notes to "
-msgstr "Abgleich der Notizen starten"
+msgstr "Notizexport beginnen nach"
#: ../Tomboy/ExportAllApplicationAddin.cs:58
msgid "Export selected notebook to "
@@ -1141,7 +1150,7 @@ msgstr "Ausgewähltes Notizbuch exportieren nach"
#: ../Tomboy/ExportAllApplicationAddin.cs:59
msgid "Start exporting notebook to "
-msgstr ""
+msgstr "Notizbuchexport beginnen nach"
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1186,7 +1195,7 @@ msgid "Unknown error."
msgstr "Unbekannter Fehler."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "Nicht zugeordnete Notizen"
@@ -1205,8 +1214,9 @@ msgid "Could not save the files in \"{0}\""
msgstr "Die Dateien konnten nicht in »{0}« gespeichert werden"
#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Zielordner anlegen für"
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Zielordner anlegen für {0}-Export"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1261,22 +1271,6 @@ msgstr "Name bereits vergeben"
msgid "C_reate"
msgstr "_Anlegen"
-#. The templateNoteTite should show the name of the
-#. notebook. For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template". Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Notizbuchvorlage für {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Alle Notizen"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "Notiz_bücher"
@@ -1316,15 +1310,35 @@ msgid "Delete the selected notebook"
msgstr "Das ausgewählte Notizbuch löschen"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:285
+#: ../Tomboy/RecentChanges.cs:276
msgid "Notebooks"
msgstr "Notizbücher"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#. The templateNoteTite should show the name of the
+#. notebook. For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template". Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Notizbuchvorlage für {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Neue Notiz"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Alle Notizen"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Dieses Notizbuch wirklich löschen?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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."
@@ -1346,39 +1360,40 @@ msgstr "Kein Notizbuch"
msgid "New \"{0}\" Note"
msgstr "Neue »{0}«-Notiz"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Diese Notiz in einem Notizbuch ablegen"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Notizbuch"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "Neues Notiz_buch …"
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Neue Notiz {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Diese Notiz wirklich löschen?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Soll »{0}« wirklich gelöscht werden?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Diese {0} Notiz wirklich löschen?"
msgstr[1] "Diese {0} Notizen wirklich löschen?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Ein gelöschte Notiz ist für immer verloren."
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1389,7 +1404,7 @@ msgstr ""
"Ihnen ausreichend Speicherplatz und die notwendigen Zugriffsrechte auf {0} "
"zur Verfügung stehen. Details zu dem Fehler finden sich in {1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Fehler beim Speichern der Notizdaten."
@@ -1534,7 +1549,7 @@ msgstr "Verknüpfungen in Tomboy nutzen"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Beschreiben Sie Ihre neue Notiz hier."
@@ -1598,140 +1613,165 @@ msgstr "Verknüpfungen _nie umbenennen"
msgid "Alwa_ys rename links"
msgstr "Verknüpfungen _immer umbenennen"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "In dieser Notiz suchen"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_Verknüpfung zu neuer Notiz"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "Te_xt"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "In dieser Notiz _suchen"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "Alle Notizen schli_eßen"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Suchen"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "Notizen durchsuchen"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Verknüpfung"
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "Gewählten Text mit einer neuen Notiz verknüpfen"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Text"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Text-Einstellungen"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "W_erkzeuge"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Werkzeuge auf diese Notiz anwenden"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Diese Notiz löschen"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Notizen abgleichen"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 ""
+"Diese Notiz ist eine Vorlage. Sie legt lediglich den vorgegebenen Inhalt "
+"regulärer Notizen fest und wird nicht im Notizmenü oder im Suchfenster "
+"angezeigt."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "In reguläre Notiz umwandeln"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "_Größe speichern"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Auswah_l speichern"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "_Titel speichern"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Suchen …"
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "_Nächster Treffer"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "_Vorheriger Treffer"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Notiz konnte nicht angelegt werden"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Suchen:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Vorheriger"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Nächste"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_Fett"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Kursiv"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Durchgestrichen"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "_Hervorheben"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Schriftgröße"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "_Riesig"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Groß"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Klein"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Schrift vergrößern"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Schrift verkleinern"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Aufzählungspunkte"
@@ -1976,19 +2016,19 @@ msgstr ""
msgid "Error connecting"
msgstr "Verbindungsfehler"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Version:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Autor:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Copyright:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Add-In Abhängigkeiten:"
@@ -1996,45 +2036,44 @@ msgstr "Add-In Abhängigkeiten:"
msgid "_Search:"
msgstr "_Suchen:"
-#: ../Tomboy/RecentChanges.cs:359
+#: ../Tomboy/RecentChanges.cs:350
msgid "Note"
msgstr "Notiz"
-#: ../Tomboy/RecentChanges.cs:381
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Zuletzt geändert"
-#: ../Tomboy/RecentChanges.cs:520
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Stimmt überein"
-#: ../Tomboy/RecentChanges.cs:571
-#, fuzzy
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
-msgstr "({0} Treffer)"
+msgstr "Titel-Übereinstimmung"
-#: ../Tomboy/RecentChanges.cs:574
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "({0} Treffer)"
msgstr[1] "({0} Treffer)"
-#: ../Tomboy/RecentChanges.cs:588
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Insgesamt: {0} Notiz"
msgstr[1] "Insgesamt: {0} Notizen"
-#: ../Tomboy/RecentChanges.cs:599
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Treffer: {0} Notiz"
msgstr[1] "Treffer: {0} Notizen"
-#: ../Tomboy/RecentChanges.cs:611
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -2042,227 +2081,14 @@ msgstr ""
"Keine Ergebnisse im ausgewählten Notizbuch.\n"
"Hier klicken, um alle Notizen zu durchsuchen."
-#: ../Tomboy/RecentChanges.cs:617
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "Hier klicken, um alle Notizbücher zu durchsuchen"
-#: ../Tomboy/RecentChanges.cs:783
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Notizen"
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Neue Notiz konnte nicht angelegt werden"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Hauptentwickler:"
-
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Mitwirkende:"
-
-#: ../Tomboy/Tomboy.cs:412
-msgid "translator-credits"
-msgstr ""
-"Philipp Meier <meier at fnogol.de>\n"
-"Frank Arnold <frank at scirocco-5v-turbo.de>\n"
-"Jochen Skulj <jochen at jochenskulj.de>\n"
-"Hendrik Richter <hendrikr at gnome.org>\n"
-"Andre Klapper <ak-47 at gmx.net>\n"
-"Mario Blättermann <mariobl at freenet.de>\n"
-"Christian Kirbach <Christian.Kirbach at googlemail.com>"
-
-#: ../Tomboy/Tomboy.cs:421
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Andere\n"
-
-#: ../Tomboy/Tomboy.cs:423
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Eine einfache und leicht bedienbare Anwendung für Notizen."
-
-#: ../Tomboy/Tomboy.cs:433
-msgid "Homepage"
-msgstr "Homepage"
-
-#: ../Tomboy/Tomboy.cs:551
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Tomboy: Eine einfache und leicht bedienbare Anwendung für Notizen.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Andere\n"
-
-#: ../Tomboy/Tomboy.cs:565
-msgid ""
-"Usage:\n"
-" --version\t\t\tPrint version information.\n"
-" --help\t\t\tPrint this usage message.\n"
-" --note-path [path]\t\tLoad/store note data in this directory.\n"
-" --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Optionen:\n"
-" --version\t\t\tAusgabe der Versionsinformationen.\n"
-" --help\t\t\tAusgabe dieser Hilfe.\n"
-" --note-path [Ordner]\t\tLaden/Speichern von Notizdaten aus diesem Ordner\n"
-" --search [text]\t\tÖffnen eines Fensters zum Durchsuchen aller Notizen nach "
-"dem angegebenen Suchtext.\n"
-
-#: ../Tomboy/Tomboy.cs:575
-msgid ""
-" --new-note\t\t\tCreate and display a new note.\n"
-" --new-note [title]\t\tCreate and display a new note, with a title.\n"
-" --open-note [title/url]\tDisplay the existing note matching title.\n"
-" --start-here\t\t\tDisplay the 'Start Here' note.\n"
-" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-" --new-note\t\t\tNeue Notiz erstellen und anzeigen.\n"
-" --new-note [Titel]\t\tBenannte neue Notiz erstellen und anzeigen.\n"
-" --open-note [Titel/Adresse]\tVorhandene Notiz mit angegebenem Titel "
-"anzeigen.\n"
-" --start-here\t\t\tDie »Hier starten«-Notiz anzeigen.\n"
-" --highlight-search [Text]\tText in geöffneter Notiz suchen und markieren.\n"
-
-#: ../Tomboy/Tomboy.cs:589
-#, csharp-format
-msgid "Version {0}"
-msgstr "Version {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (neu)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Info zu Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"Das »Tomboy Notizenhandbuch« konnte nicht gefunden werden. Bitte stellen Sie "
-"sicher, dass Ihre Installation erfolgreich abgeschlossen wurde."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Hilfe wurde nicht gefunden"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Ort kann nicht geöffnet werden"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Heute, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Heute"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Gestern, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Gestern"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Vor {0} Tag, {1}"
-msgstr[1] "Vor {0} Tagen, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Vor {0} Tag"
-msgstr[1] "Vor {0} Tagen"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Morgen, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Morgen"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "In {0} Tag, {1}"
-msgstr[1] "In {0} Tagen, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "In {0} Tag"
-msgstr[1] "In {0} Tagen"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d. MMMM HH:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d. MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Kein Datum"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d. MMMM yyyy HH:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d. MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Unbenannt {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 ""
-"Es gibt bereits eine Notiz mit dem Titel <b>{0}</b>. Bitte wählen Sie einen "
-"anderen Namen für diese Notiz."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Titel der Notiz übernommen"
-
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "Link-Adresse _kopieren"
-
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "Link ö_ffnen"
-
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
#, csharp-format
msgid ""
@@ -2532,6 +2358,222 @@ msgstr ""
"Fügen Sie »modprobe fuse« in /etc/init.d/boot.local oder »fuse« in /etc/"
"modules hinzu."
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Neue Notiz konnte nicht angelegt werden"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Hauptentwickler:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Mitwirkende:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Philipp Meier <meier at fnogol.de>\n"
+"Frank Arnold <frank at scirocco-5v-turbo.de>\n"
+"Jochen Skulj <jochen at jochenskulj.de>\n"
+"Hendrik Richter <hendrikr at gnome.org>\n"
+"Andre Klapper <ak-47 at gmx.net>\n"
+"Mario Blättermann <mariobl at freenet.de>\n"
+"Christian Kirbach <Christian.Kirbach at googlemail.com>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Andere\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Eine einfache und leicht bedienbare Anwendung für Notizen."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Homepage"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Eine einfache und leicht bedienbare Anwendung für Notizen.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Andere\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+" --version\t\t\tPrint version information.\n"
+" --help\t\t\tPrint this usage message.\n"
+" --note-path [path]\t\tLoad/store note data in this directory.\n"
+" --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Optionen:\n"
+" --version\t\t\tAusgabe der Versionsinformationen.\n"
+" --help\t\t\tAusgabe dieser Hilfe.\n"
+" --note-path [Ordner]\t\tLaden/Speichern von Notizdaten aus diesem Ordner\n"
+" --search [text]\t\tÖffnen eines Fensters zum Durchsuchen aller Notizen nach "
+"dem angegebenen Suchtext.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+" --new-note\t\t\tCreate and display a new note.\n"
+" --new-note [title]\t\tCreate and display a new note, with a title.\n"
+" --open-note [title/url]\tDisplay the existing note matching title.\n"
+" --start-here\t\t\tDisplay the 'Start Here' note.\n"
+" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+" --new-note\t\t\tNeue Notiz erstellen und anzeigen.\n"
+" --new-note [Titel]\t\tBenannte neue Notiz erstellen und anzeigen.\n"
+" --open-note [Titel/Adresse]\tVorhandene Notiz mit angegebenem Titel "
+"anzeigen.\n"
+" --start-here\t\t\tDie »Hier starten«-Notiz anzeigen.\n"
+" --highlight-search [Text]\tText in geöffneter Notiz suchen und markieren.\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Version {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (neu)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Info zu Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"Das »Tomboy Notizenhandbuch« konnte nicht gefunden werden. Bitte stellen Sie "
+"sicher, dass Ihre Installation erfolgreich abgeschlossen wurde."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Hilfe wurde nicht gefunden"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Ort kann nicht geöffnet werden"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Heute, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Heute"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Gestern, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Gestern"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Vor {0} Tag, {1}"
+msgstr[1] "Vor {0} Tagen, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Vor {0} Tag"
+msgstr[1] "Vor {0} Tagen"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Morgen, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Morgen"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "In {0} Tag, {1}"
+msgstr[1] "In {0} Tagen, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "In {0} Tag"
+msgstr[1] "In {0} Tagen"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d. MMMM HH:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d. MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Kein Datum"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d. MMMM yyyy HH:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d. MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Unbenannt {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 ""
+"Es gibt bereits eine Notiz mit dem Titel <b>{0}</b>. Bitte wählen Sie einen "
+"anderen Namen für diese Notiz."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Titel der Notiz übernommen"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "Link-Adresse _kopieren"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "Link ö_ffnen"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "Diese Notiz wirklich löschen?"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "HTML-Export: Letzter Ordner"
diff --git a/po/es.po b/po/es.po
index eea205b..7db2a47 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,2692 +1,2737 @@
-# translation of tomboy.master.po to Español
-# Francisco Javier F. Serrador <serrador at cvs.gnome.org>, 2004, 2006.
-# Traducción al español de tomboy
-# Spanish translation for tomboy
-# Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
-# This file is distributed under the same licence as the Tomboy package.
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2009, 2010, 2011.
-# Jorge González <jorgegonz at svn.gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-#
-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-08-20 21:18+0000\n"
-"PO-Revision-Date: 2011-08-21 14:43+0200\n"
-"Last-Translator: Jorge González <jorgegonz at svn.gnome.org>\n"
-"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:1
-msgid "Accessories"
-msgstr "Accesorios"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:2
-msgid "Simple and easy to use note-taking"
-msgstr "Toma de notas simple y fácil de usar"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:3
-msgid "Tomboy Applet Factory"
-msgstr "Fábrica de la miniaplicación Tomboy"
-
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:579
-msgid "Tomboy Notes"
-msgstr "Notas Tomboy"
-
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
-#: ../Tomboy/Tray.cs:274
-msgid "S_ynchronize Notes"
-msgstr "S_incronizar las notas"
-
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
-msgid "_About"
-msgstr "Acerca _de"
-
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:288
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:283
-msgid "_Preferences"
-msgstr "Prefere_ncias"
-
-#: ../data/tomboy.desktop.in.h:1
-msgid "Note-taker"
-msgstr "Anotador"
-
-#: ../data/tomboy.desktop.in.h:2
-msgid "Take notes, link ideas, and stay organized"
-msgstr "Tome notas, enlace ideas y manténgase organizado"
-
-#: ../data/tomboy.schemas.in.h:1
-msgid "Accept SSL Certificates"
-msgstr "Aceptar certificados SSL"
-
-#: ../data/tomboy.schemas.in.h:2
-msgid "Automatic Background Synchronization Timeout"
-msgstr "El tiempo de la sincronización automática en segundo plano ha expirado"
-
-#: ../data/tomboy.schemas.in.h:3
-msgid "Create a new Note"
-msgstr "Crear una nota nueva"
-
-#: ../data/tomboy.schemas.in.h:4
-msgid "Custom Font Face"
-msgstr "Personalizar tipografía"
-
-#: ../data/tomboy.schemas.in.h:5
-msgid ""
-"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina la coordenada X de la ventana «Buscar todas las notas»; almacenado "
-"en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:6
-msgid ""
-"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina la coordenada Y de la ventana «Buscar todas las notas»; almacenado "
-"en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:7
-msgid ""
-"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
-"exit."
-msgstr ""
-"Determina la altura en píxeles de la ventana «Buscar todas las notas»; "
-"almacenado en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:8
-msgid ""
-"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
-msgstr ""
-"Determina la anchura en píxeles de la ventana «Buscar todas las notas»; "
-"almacenado en Tomboy al salir."
-
-#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Middle-Click Paste On Icon."
-msgstr "Activar pegar con el botón del medio del ratón."
-
-#: ../data/tomboy.schemas.in.h:10
-msgid "Enable Tray Icon"
-msgstr "Activar icono de la bandeja de notificación"
-
-#: ../data/tomboy.schemas.in.h:11
-msgid "Enable WikiWord highlighting"
-msgstr "Activar resaltado de Wikipalabras"
-
-#: ../data/tomboy.schemas.in.h:12
-msgid "Enable automatic bulleted lists."
-msgstr "Activar listas de topos automáticas."
-
-#: ../data/tomboy.schemas.in.h:13
-msgid "Enable closing notes with escape."
-msgstr "Activar cerrar las notas con escape."
-
-#: ../data/tomboy.schemas.in.h:14
-msgid "Enable custom font"
-msgstr "Activar tipografía personalizada"
-
-#: ../data/tomboy.schemas.in.h:15
-msgid "Enable global keybindings"
-msgstr "Activar combinaciones de teclas globales"
-
-#: ../data/tomboy.schemas.in.h:16
-msgid "Enable spellchecking"
-msgstr "Activar el corrector ortográfico"
-
-#: ../data/tomboy.schemas.in.h:17
-msgid "Enable startup notes"
-msgstr "Activar notas al inicio"
-
-#: ../data/tomboy.schemas.in.h:18
-msgid "Enable the Delete Note confirmation dialog"
-msgstr "Activar o desactivar el diálogo de confirmación de Eliminar nota"
-
-#: ../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 ""
-"Active esta opción si quiere que las listas de topos sean automáticas cuando "
-"introduce un - o un *^al principio de una línea."
-
-#: ../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 ""
-"Active esta opción si quiere poder pegar contenido con marca de tiempo en la "
-"nota Comenzar aquí, pulsando con el botón del medio en el icono de Tomboy."
-
-#: ../data/tomboy.schemas.in.h:21
-msgid ""
-"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
-"will create a note with that name."
-msgstr ""
-"Active esta opción para resaltar palabras QueSeVenAsí. Al pulsar en la "
-"palabra se creará una nota con ese nombre."
-
-#: ../data/tomboy.schemas.in.h:22
-msgid "FUSE Mounting Timeout (ms)"
-msgstr "Tiempo de expiración FUSE (ms)"
-
-#: ../data/tomboy.schemas.in.h:23
-msgid "HTML Export All Linked Notes"
-msgstr "Exportar todas las notas enlazadas a HTML"
-
-#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Linked Notes"
-msgstr "Exportar las notas enlazadas a HTML"
-
-#: ../data/tomboy.schemas.in.h:25
-msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
-msgstr ""
-"Si está desactivado, se eliminará el diálogo de confirmación de «Eliminar "
-"nota»."
-
-#: ../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 ""
-"Si enable_custom_font está activado, la tipografía aquí seleccionada se "
-"usará al mostrar las notas."
-
-#: ../data/tomboy.schemas.in.h:27
-msgid ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
-msgstr ""
-"Si está activado, todas las notas que estaban abiertas cuando se cerró "
-"Tomboy, se abrirán automáticamente al inicio."
-
-#: ../data/tomboy.schemas.in.h:28
-msgid "If enabled, an opened note can be closed by hitting the escape key."
-msgstr ""
-"Si está activado, una nota abierta se puede cerrar pulsando la tecla 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 ""
-"Si es verdadero, se mostrará el icono de la bandeja de Tomboy en el área de "
-"notificación. Puede ser útil desactivarlo cuando otra aplicación proporcione "
-"la funcionalidad del icono de la bandeja."
-
-#: ../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 ""
-"Si está activado, las faltas de ortografía se subrayarán en rojo, y pulsando "
-"con el botón derecho del ratón se mostrarán sugerencias."
-
-#: ../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 ""
-"Si está activado, las combinaciones globales de teclas del escritorio "
-"fijadas en /apps/tomboy/global_keybindings también se activará, permitiendo "
-"al resto de aplicaciones usar las opciones útiles de Tomboy."
-
-#: ../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 ""
-"Si está activado, el nombre del conjunto de tipo en custom_font_face se "
-"usará como tipografía para mostrar las notas. De otra manera se usará la "
-"tipografía predeterminada del escritorio."
-
-#: ../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 que el complemento de importador de notas adhesivas no ha sido "
-"ejecutado, así que debería ejecutarse automáticamente la próxima vez que "
-"arranque Tomboy."
-
-#: ../data/tomboy.schemas.in.h:34
-msgid ""
-"Integer determining the minimum number of notes to show in the Tomboy note "
-"menu."
-msgstr ""
-"Entero determinando el número mínimo de notas que mostrar en el menú de "
-"notas de 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 ""
-"Valor entero que indica con qué frecuencia realizar una sincronización en "
-"segundo plano de sus notas (cuando la sincronización está configurada). "
-"Cualquier valor menor que 1 indica que la autosincronización está "
-"desactivada. El valor mínimo es 5. Este valor se expresa en minutos."
-
-#: ../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 ""
-"Valor entero que indica si existe una preferencia para realizar siempre una "
-"acción específica cuando se detecta un conflicto, en lugar de preguntar al "
-"usuario. Los valores denotan una enumeración interna. 0 indica que el "
-"usuario desea ser preguntado cuando suceda un conflicto, de tal forma que el "
-"usuario manejará cada situación de conflicto caso por 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 ""
-"Valor entero que indica si existe una preferencia para actualizar "
-"específicamente un enlace cuando se renombra una nota, en lugar de preguntar "
-"al usuario. Los valores denotan una enumeración interna. 0 indica que el "
-"usuario desea que le pregunten cuando al renombrar una nota puede afectar a "
-"los enlaces existentes en otras notas. 1 indica que los enlaces se deben "
-"eliminar automáticamente. 2 indica que se debe actualizar el texto del "
-"enlace con el nuevo nombre de la nota para que siga apuntando a la nota "
-"renombrada."
-
-#: ../data/tomboy.schemas.in.h:38
-msgid "Last Directory used in HTML Export"
-msgstr "Última carpeta usada al exportar en HTML"
-
-#: ../data/tomboy.schemas.in.h:39
-msgid "Link Updating Behavior on Note Rename"
-msgstr "Comportamiento al actualizar un enlace al renombrar una nota"
-
-#: ../data/tomboy.schemas.in.h:40
-msgid "List of pinned notes."
-msgstr "Lista de notas pinchadas."
-
-#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr ""
-"Número máximo de caracteres del título de la nota que mostrar en la bandeja "
-"de Tomboy o en el menú de la miniaplicación de notas del panel."
-
-#: ../data/tomboy.schemas.in.h:42
-msgid "Maximum note title length to show in tray menu."
-msgstr ""
-"Longitud máxima del título de la nota que mostrar en el menú de la bandeja."
-
-#: ../data/tomboy.schemas.in.h:43
-msgid "Minimum number of notes to show in menu"
-msgstr "Número mínimo de notas que mostrar en el menú"
-
-#: ../data/tomboy.schemas.in.h:44
-msgid "Note Synchronization Conflict Saved Behavior"
-msgstr ""
-"Comportamiento predeterminado para conflictos de sincronización de notas"
-
-#: ../data/tomboy.schemas.in.h:45
-msgid "Open Recent Changes"
-msgstr "Abrir cambios recientes"
-
-#: ../data/tomboy.schemas.in.h:46
-msgid "Open Search Dialog"
-msgstr "Abrir el cuadro de diálogo de buscar"
-
-#: ../data/tomboy.schemas.in.h:47
-msgid "Open Start Here"
-msgstr "Abrir comenzar aquí"
-
-#: ../data/tomboy.schemas.in.h:48
-msgid "Path on SSH server to Tomboy synchronization directory (optional)."
-msgstr ""
-"Ruta en el servidor SSH al directorio de sincronización de Tomboy (opcional)."
-
-#: ../data/tomboy.schemas.in.h:49
-msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr ""
-"Ruta al servidor de sincronización cuando se use el complemento del servicio "
-"de sincronización de sistema de archivos."
-
-#: ../data/tomboy.schemas.in.h:50
-msgid "SSHFS Remote Synchronization Folder"
-msgstr "Carpeta de sincronización remota SSHFS"
-
-#: ../data/tomboy.schemas.in.h:51
-msgid "SSHFS Remote Synchronization User Name"
-msgstr "Nombre de usuario de la sincronización remota SSHFS"
-
-#: ../data/tomboy.schemas.in.h:52
-msgid "SSHFS Synchronization Server Port"
-msgstr "Puerto del servidor de sincronización remoto SSHFS"
-
-#: ../data/tomboy.schemas.in.h:53
-msgid "SSHFS Synchronization Server URL"
-msgstr "URL del servidor de sincronización remota SSHFS"
-
-#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of \"Search All Notes\" window"
-msgstr "Altura guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of \"Search All Notes\" window"
-msgstr "Posición horizontal guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of \"Search All Notes\" window"
-msgstr "Posición vertical guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of \"Search All Notes\" window"
-msgstr "Anchura guardada de la ventana «Buscar todas las notas»"
-
-#: ../data/tomboy.schemas.in.h:58
-msgid "Selected Synchronization Service Addin"
-msgstr "Seleccione el complemento del servicio de sincronización"
-
-#: ../data/tomboy.schemas.in.h:59
-msgid "Set to TRUE to activate"
-msgstr "Establecer a «TRUE» para activar"
-
-#: ../data/tomboy.schemas.in.h:60
-msgid "Show applet menu"
-msgstr "Mostrar el menú de miniaplicaciones"
-
-#: ../data/tomboy.schemas.in.h:61
-msgid "Start Here Note"
-msgstr "Nota «Comenzar aquí»"
-
-#: ../data/tomboy.schemas.in.h:62
-msgid "Sticky Note Importer First Run"
-msgstr "Primera ejecución del importador de notas adhesivas"
-
-#: ../data/tomboy.schemas.in.h:63
-msgid "Synchronization Client ID"
-msgstr "ID del cliente de sincronización"
-
-#: ../data/tomboy.schemas.in.h:64
-msgid "Synchronization Local Server Path"
-msgstr "Ruta al servidor local de sincronización"
-
-#: ../data/tomboy.schemas.in.h:65
-msgid "The date format that is used for the timestamp."
-msgstr "El formato de la fecha que se usa para la marca de tiempo."
-
-#: ../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 ""
-"Combinación de teclas global para crear y mostrar una nota nueva. El formato "
-"sería \"<Control>a\" o \"<Shift><Alt>F1\". El analizador "
-"léxico es bastante tolerante y permite letras mayúsculas o minúsculas, y "
-"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
-"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
-"teclas para esta acción."
-
-#: ../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 ""
-"Combinación de teclas global para abrir «Comenzar aquí». El formato sería "
-"\"<Control>a\" o \"<Shift><Alt>F1\". El analizador léxico "
-"es bastante tolerante y permite letras mayúsculas o minúsculas, y "
-"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
-"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
-"teclas para esta acción."
-
-#: ../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 ""
-"Combinación de teclas global para abrir el diálogo de buscar notas. El "
-"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
-"analizador léxico es bastante tolerante y permite letras mayúsculas o "
-"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
-"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
-"combinación de teclas para esta acción."
-
-#: ../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 ""
-"Combinación de teclas global para abrir el diálogo de cambios recientes. El "
-"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
-"analizador léxico es bastante tolerante y permite letras mayúsculas o "
-"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
-"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
-"combinación de teclas para esta acción."
-
-#: ../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 ""
-"Combinación de teclas global para mostrar el menú de miniaplicaciones de "
-"Tomboy. El formato sería \"<Control>a\" o \"<Shift><Alt>"
-"F1\". El analizador léxico es bastante tolerante y permite letras mayúsculas "
-"o minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
-"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
-"combinación de teclas para esta acción."
-
-#: ../data/tomboy.schemas.in.h:71
-msgid "The handler for \"note://\" URLs"
-msgstr "El manejador para las URL «note://»"
-
-#: ../data/tomboy.schemas.in.h:72
-msgid ""
-"The last directory a note was exported to using the Export To HTML plugin."
-msgstr ""
-"El último directorio donde se exportó una nota usando el complemento "
-"Exportar a HTML."
-
-#: ../data/tomboy.schemas.in.h:73
-msgid ""
-"The last setting for the 'Export linked notes' checkbox in the Export to "
-"HTML plugin."
-msgstr ""
-"Las última casilla de preferencias para «Exportar las notas enlazadas a "
-"HTML» en el complemento Exportar a HTML."
-
-#: ../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 ""
-"El último ajuste para la casilla de «Incluir todas las notas enlazadas» en "
-"el complemento de exportar a HTML. Esta opción se usa junto con los ajustes "
-"de «Exportar las notas enlazadas a HTML» y se usa para especificar si todas "
-"las notas (encontradas recursivamente) deberían ser incluídas durante la "
-"exportación a HTML."
-
-#: ../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 ""
-"La URI de la nota que debería ser considerada como la nota «Comenzar aquí», "
-"que siempre estará al final del menú de notas de Tomboy y que también es "
-"accesible por una tecla rápida."
-
-#: ../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 ""
-"El puerto que usar al conectar con el servidor de sincronización a través de "
-"SSH. Establecido a -1 o menos si se debe usar el puerto predeterminado de "
-"SSH en su lugar."
-
-#: ../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 ""
-"Tiempo (en milisegundos) que Tomboy debe esperar una respuesta al usar FUSE "
-"para montar una compartición sincronizada."
-
-#: ../data/tomboy.schemas.in.h:78
-msgid "Timestamp format"
-msgstr "Formato de la marca de tiempo"
-
-#: ../data/tomboy.schemas.in.h:79
-msgid "URL of SSH server containing Tomboy synchronization directory."
-msgstr ""
-"URL del servidor SSH que contiene el directorio de sincronización de Tomboy."
-
-#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
-msgstr ""
-"Identificador único para el complemento configurado del servicio de "
-"sincronización de notas."
-
-#: ../data/tomboy.schemas.in.h:81
-msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
-msgstr ""
-"Identificador único para este cliente Tomboy, usado al comunicar con un "
-"servidor de sincronización."
-
-#: ../data/tomboy.schemas.in.h:82
-msgid ""
-"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
-"user."
-msgstr ""
-"Usar la opción wdfs «-ac» para aceptar certificados SSL sin preguntar al "
-"usuario."
-
-#: ../data/tomboy.schemas.in.h:83
-msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr ""
-"Nombre de usuario que usar al conectar con el servidor de sincronización a "
-"través de SSH."
-
-#: ../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 ""
-"Lista separada por espacios en blanco de URI de notas para las notas que "
-"deberían aparecer en el menú de notas de Tomboy."
-
-#: ../Tomboy/ActionManager.cs:127
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../Tomboy/ActionManager.cs:130
-msgid "_New"
-msgstr "_Nueva"
-
-#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
-msgid "Create a new note"
-msgstr "Crear una nota nueva"
-
-#: ../Tomboy/ActionManager.cs:134
-msgid "_Open..."
-msgstr "_Abrir…"
-
-#: ../Tomboy/ActionManager.cs:135
-msgid "Open the selected note"
-msgstr "Abrir la nota seleccionada"
-
-#: ../Tomboy/ActionManager.cs:138
-msgid "_Delete"
-msgstr "_Eliminar"
-
-#: ../Tomboy/ActionManager.cs:139
-msgid "Delete the selected note"
-msgstr "Eliminar la nota seleccionada"
-
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: ../Tomboy/ActionManager.cs:143
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../Tomboy/ActionManager.cs:147
-msgid "Quit Tomboy"
-msgstr "Salir de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:150
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
-msgid "Tomboy Preferences"
-msgstr "Preferencias de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:160
-msgid "_Contents"
-msgstr "Índ_ice"
-
-#: ../Tomboy/ActionManager.cs:161
-msgid "Tomboy Help"
-msgstr "Ayuda de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
-msgid "About Tomboy"
-msgstr "Acerca de Tomboy"
-
-#: ../Tomboy/ActionManager.cs:168
-msgid "TrayIcon"
-msgstr "Icono del área de notificación"
-
-#: ../Tomboy/ActionManager.cs:171
-msgid "Create _New Note"
-msgstr "Crear una nota _nueva"
-
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
-msgid "_Search All Notes"
-msgstr "_Buscar en todas las notas"
-
-#: ../Tomboy/ActionManager.cs:176
-msgid "Open the Search All Notes window"
-msgstr "Abrir la ventana de Búsqueda en todas las notas"
-
-#: ../Tomboy/ActionManager.cs:180
-msgid "Start synchronizing notes"
-msgstr "Comenzar a sincronizar las notas"
-
-#. Addin's tab caption
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
-msgid "Advanced"
-msgstr "Avanzadas"
-
-#. Menu Note Count option
-#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-msgid "Minimum number of notes to show in Recent list (maximum 18)"
-msgstr ""
-"Número mínimo de notas que mostrar en la lista de recientes (máximo 18)"
-
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
-msgid "What links here?"
-msgstr "¿Qué enlaza aquí?"
-
-#. This is a disabled placeholder item for an empty menu
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
-msgid "(none)"
-msgstr "(ninguna)"
-
-#: ../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 ""
-"Puede usar cualquier bugzilla simplemente arrastrando los enlaces en las "
-"notas. Si quiere un icono especial para algunos servidores, añádalos aquí."
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
-msgid "Host Name"
-msgstr "Nombre del servidor"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
-msgid "Icon"
-msgstr "Icono"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
-msgid "Select an icon..."
-msgstr "Seleccione un icono…"
-
-#. Extra Widget
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
-msgid "_Host name:"
-msgstr "Nombre del _equipo:"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
-msgid "No host name specified"
-msgstr "No se especificó ningún nombre para el equipo"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
-msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr ""
-"Debe especificar el nombre del equipo de Bugzilla para usar con este icono."
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
-msgid "Error saving icon"
-msgstr "Error al guardar el icono"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
-msgid "Could not save the icon file."
-msgstr "No se pudo guardar el icono de archivo."
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
-msgid "Really remove this icon?"
-msgstr "¿Desea quitar este icono?"
-
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
-msgid "If you remove an icon it is permanently lost."
-msgstr "Si borra un icono se perderá permanentemente."
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "No se puede abrir el correo-e"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
-msgid "HTML"
-msgstr "HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "Destino para la exportación a HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Exportar las notas enlazadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Incluir todas las notas enlazadas"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
-msgid "Export to HTML"
-msgstr "Exportar a HTML"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
-#, csharp-format
-msgid "Your note was exported to \"{0}\"."
-msgstr "Su nota se exportó a «{0}»."
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
-msgid "Note exported successfully"
-msgstr "Nota exportada con éxito"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
-#: ../Tomboy/ExportAllApplicationAddin.cs:195
-#: ../Tomboy/ExportAllApplicationAddin.cs:273
-msgid "Access denied."
-msgstr "Acceso denegado."
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
-#: ../Tomboy/ExportAllApplicationAddin.cs:200
-#: ../Tomboy/ExportAllApplicationAddin.cs:278
-msgid "Folder does not exist."
-msgstr "La carpeta no existe."
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
-#, csharp-format
-msgid "Could not save the file \"{0}\""
-msgstr "No se pudo guardar el archivo «{0}»"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
-msgid "_Folder Path:"
-msgstr "Ruta de la ca_rpeta:"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
-msgid "Select Synchronization Folder..."
-msgstr "Seleccione la carpeta para sincronizar…"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
-msgid "Folder path field is empty."
-msgstr "El campo de la ruta de la carpeta está vacío."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
-msgid ""
-"Specified folder path does not exist, and Tomboy was unable to create it."
-msgstr "La ruta de la carpeta especificada no existe y Tomboy no pudo crearla."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
-msgid "Local Folder"
-msgstr "Carpeta local"
-
-#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
-msgid "Fixed Wid_th"
-msgstr "Anchura _fija"
-
-#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
-#, csharp-format
-msgid "Cannot contact '{0}'"
-msgstr "No se puede contactar con «{0}»"
-
-#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
-#, csharp-format
-msgid "Error running gaim-remote: {0}"
-msgstr "Error al ejecutar gaim-remote: {0}"
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
-msgid "Insert Timestamp"
-msgstr "Insertar marca de tiempo"
-
-#. initial newline
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
-msgid "dddd, MMMM d, h:mm tt"
-msgstr "dddd, d MMMM, HH:mm"
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
-msgid "Choose one of the predefined formats or use your own."
-msgstr "Elija uno de los formatos predefinidos o use uno propio."
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
-msgid "Use _Selected Format"
-msgstr "Usar el formato _seleccionado"
-
-#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
-msgid "_Use Custom Format"
-msgstr "_Usar tipografía personalizada"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:10
-msgid "Today: Template"
-msgstr "Hoy: Plantilla"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
-msgid "Today: "
-msgstr "Hoy: "
-
-#. Format: "Today: Friday, July 01 2005"
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
-msgid "dddd, MMMM d yyyy"
-msgstr "dddd, d MMMM yyyy"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
-msgid "Tasks"
-msgstr "Tareas"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:44
-msgid "Appointments"
-msgstr "Citas"
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid ""
-"Change the <b>Today: Template</b> note to customize the text that new Today "
-"notes have."
-msgstr ""
-"Cambiar la nota <b>Hoy: plantilla</b> para personalizar el texto que las "
-"nuevas notas «Hoy» tendrán."
-
-#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
-msgid "_Open Today: Template"
-msgstr "_Abrir hoy: Plantilla"
-
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
-msgid "Print"
-msgstr "Imprimir"
-
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
-msgid "Error printing note"
-msgstr "Error al imprimir la nota"
-
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
-#, csharp-format
-msgid "Page {0} of {1}"
-msgstr "Página {0} de {1}"
-
-#. Translators: Explanation of the date and time format specifications can be found here:
-#. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
-msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd dd/MM/yyyy, hh:mm:ss"
-
-#. Adding menu item when note is opened and window created
-#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
-msgid "Remove broken links"
-msgstr "Quitar enlaces rotos"
-
-#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
-msgid "Add a sketch"
-msgstr "Añadir un dibujo"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
-msgid "Se_rver:"
-msgstr "Se_rvidor:"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
-msgid "User_name:"
-msgstr "_Usuario:"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
-msgid "_Folder Path (optional):"
-msgstr "Ruta de la ca_rpeta (opcional):"
-
-#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
-msgid ""
-"SSH synchronization requires an existing SSH key for this server and user, "
-"added to a running SSH daemon."
-msgstr ""
-"La sincronización SSH requiere una clave SSH existente para este servidor y "
-"usuario que esté añadida al demonio SSH en ejecución."
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
-msgid "Server or username field is empty."
-msgstr "El campo del usuario o del servidor está vacío."
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH"
-msgstr "SSH"
-
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
-msgid ""
-"Timeout connecting to server. Please ensure that your SSH key has been added "
-"to a running SSH daemon."
-msgstr ""
-"Se superó el tiempo de espera máximo al conectar con el servidor. Asegúrese "
-"de que su clave SSH se ha añadido al demonio SSH en ejecución."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
-msgid "Import from Sticky Notes"
-msgstr "Importar de notas adhesivas"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
-msgid "No Sticky Notes found"
-msgstr "No se encontraron notas adhesivas"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
-#, csharp-format
-msgid "No suitable Sticky Notes file was found at \"{0}\"."
-msgstr "No se ha encontrado ningún archivo de Notas Adhesivas en «{0}»."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
-msgid "Sticky Notes import completed"
-msgstr "Importación de notas adhesivas completada"
-
-#: ../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."
-msgstr[0] "Se importó con éxito <b>{0}</b> de <b>{1}</b> nota adhesiva."
-msgstr[1] "Se importaron con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
-msgid "Untitled"
-msgstr "Sin título"
-
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
-msgid "Sticky Note: "
-msgstr "Nota adhesiva: "
-
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
-msgid "Tasque"
-msgstr "Tasque"
-
-#. Note to translators: "All" here must match up with the "All"
-#. category translation in Tasque for this to work properly. "All"
-#. is used here to allow Tasque to decide which default category
-#. will be used to create the new task.
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
-msgid "All"
-msgstr "Todo"
-
-#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
-msgid "--- Tasque is not running ---"
-msgstr "--- Tasque no se está ejecutando ---"
-
-#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
-msgid "_Underline"
-msgstr "_Subrayado"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
-msgid "_Password:"
-msgstr "Contrase_ña:"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
-msgid "URL, username, or password field is empty."
-msgstr "El campo URL, usuario o contraseña está vacío."
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
-msgid ""
-"There was an error connecting to the server. This may be caused by using an "
-"incorrect user name and/or password."
-msgstr ""
-"Ocurrió un error al conectar con el servidor. Esto pudo ocurrir por usar un "
-"nombre de usuario y/o contraseña incorrectos."
-
-#. TODO: If the above fails (no keyring daemon), save all but password
-#. to GConf, and notify user.
-#. Save configuration into GConf
-#. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
-#. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:254
-msgid ""
-"Saving configuration to the GNOME keyring failed with the following message:"
-msgstr ""
-"Falló al guardar la configuración al depósito de claves con el siguiente "
-"mensaje:"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
-msgid "Connect to Server"
-msgstr "Conectar al servidor"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
-msgid "Connected"
-msgstr "Conectado"
-
-#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
-msgid "Server not responding. Try again later."
-msgstr "El servidor no está respondiendo. Inténtelo de nuevo más tarde."
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
-msgid "Authorization Failed, Try Again"
-msgstr "Falló la autorización. Inténtelo de nuevo."
-
-#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
-msgid "Tomboy Web Authorization Successful"
-msgstr "Autorización web de Tomboy satisfactoria"
-
-#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
-msgid ""
-"Please return to the Tomboy Preferences window and press Save to start "
-"synchronizing."
-msgstr ""
-"Regrese a la ventana de preferencias de Tomboy y pulse guardar para iniciar "
-"la sincronización."
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
-msgid "Connected. Press Save to start synchronizing"
-msgstr "Conectado. Pulse Guardar para iniciar la sincronización."
-
-#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
-msgid "Authorizing in browser (Press to reset connection)"
-msgstr "Autorizar en el navegador (pulse para reiniciar la conexión)"
-
-#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
-msgid "Set the default browser and try again"
-msgstr "Establecer el navegador predeterminado e intentarlo de nuevo"
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Web de Tomboy"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Exportar todas las notas a "
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Comenzar a exportar las notas a"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Exportar el cuaderno de notas seleccionado a"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Comenzar a exportar el cuaderno a"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:65
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "_Herramientas"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:68
-msgid "Export"
-msgstr "Exportar"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:69
-msgid "Export your notes."
-msgstr "Exportar sus notas."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Exportar todas las notas a "
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Exportar el cuaderno de notas seleccionado a "
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:193
-#: ../Tomboy/ExportAllApplicationAddin.cs:271
-msgid "Could not export, access denied."
-msgstr "No se pudo exportar, acceso denegado."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:198
-#: ../Tomboy/ExportAllApplicationAddin.cs:276
-msgid "Could not export, folder does not exist."
-msgstr "No se pudo exportar, la carpeta no existe."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:203
-#: ../Tomboy/ExportAllApplicationAddin.cs:281
-#, csharp-format
-msgid "Could not export: {0}"
-msgstr "No se pudo exportar: {0}"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:205
-#: ../Tomboy/ExportAllApplicationAddin.cs:283
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Notas sin archivar"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:389
-#, csharp-format
-msgid "Your notes were exported to \"{0}\"."
-msgstr "Sus notas se exportaron a «{0}»."
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:398
-msgid "Notes exported successfully"
-msgstr "Notas exportadas correctamente"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:421
-#, csharp-format
-msgid "Could not save the files in \"{0}\""
-msgstr "No se pudieron guardar los archivos «{0}»"
-
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-#, csharp-format
-#| msgid "Create destination folder for "
-msgid "Create destination folder for {0} export"
-msgstr "Crear carpeta de destino para exportar {0}"
-
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
-msgid "Search All Notes"
-msgstr "Buscar en todas las notas"
-
-#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
-#. icons_path, (int)TomboyIcons.NewNotebook);
-#. if (new_notebook != null)
-#. object_collection.AddObject(new_notebook);
-#: ../Tomboy/JumpListManager.cs:106
-msgid "Create New Note"
-msgstr "Crear una nota nueva"
-
-#: ../Tomboy/JumpListManager.cs:136
-#, csharp-format
-msgid "{0} (new)"
-msgstr "{0} (nueva)"
-
-#: ../Tomboy/JumpListManager.cs:158
-msgid "Recent Notes"
-msgstr "Notas recientes"
-
-#. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:215
-msgid "_Window"
-msgstr "_Ventana"
-
-#: ../Tomboy/MacApplication.cs:234
-msgid "Preferences..."
-msgstr "Preferencias…"
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
-msgid "Create a new notebook"
-msgstr "Crear un cuaderno de notas nuevo"
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
-msgid "Type the name of the notebook you'd like to create."
-msgstr "Escriba el nombre del cuaderno de notas que desea crear."
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
-msgid "N_otebook name:"
-msgstr "Nombre del cuaderno de n_otas:"
-
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
-msgid "Name already taken"
-msgstr "El nombre ya existe"
-
-#. Translation note: This is the Create button in the Create
-#. New Note Dialog.
-#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:59
-msgid "C_reate"
-msgstr "C_rear"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
-msgid "Note_books"
-msgstr "Cua_dernos de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
-msgid "Create a new note in a notebook"
-msgstr "Crear una nota nueva en un cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
-msgid "New Note_book..."
-msgstr "Cua_derno de notas nuevo…"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
-msgid "_New Note"
-msgstr "Nota _nueva"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
-msgid "Create a new note in this notebook"
-msgstr "Crear una nota nueva en éste portátil"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
-msgid "_Open Template Note"
-msgstr "_Abrir la nota de plantilla"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
-msgid "Open this notebook's template note"
-msgstr "Abrir la nota de plantilla de este cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
-msgid "Delete Note_book"
-msgstr "Eliminar cua_derno de notas"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
-msgid "Delete the selected notebook"
-msgstr "Eliminar el cuaderno de notas seleccionado"
-
-#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:276
-msgid "Notebooks"
-msgstr "Cuadernos de notas"
-
-#. The templateNoteTite should show the name of the
-#. notebook. For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template". Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "Plantilla del cuaderno de notas de {0}"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Todas las notas"
-
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
-msgid "Really delete this notebook?"
-msgstr "¿Desea eliminar este cuaderno de notas?"
-
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
-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 ""
-"Las notas que pertenecen a este cuaderno de notas no se eliminarán, pero ya "
-"no estarán asociadas a este cuaderno de notas. Esta acción no se puede "
-"deshacer."
-
-#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
-msgid "No notebook"
-msgstr "Sin cuadernos de notas"
-
-#. Translators should preserve the "{0}" in the following
-#. string. After being formatted for a notebook named,
-#. "Meetings", for example, the resultant string would be:
-#. New "Meetings" Note
-#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
-#, csharp-format
-msgid "New \"{0}\" Note"
-msgstr "Nota nueva de «{0}»"
-
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
-msgid "Place this note into a notebook"
-msgstr "Meter esta nota en un cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
-msgid "Notebook"
-msgstr "Cuaderno de notas"
-
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
-msgid "_New notebook..."
-msgstr "Cuaderno de _notas nuevo…"
-
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Nota nueva {0}"
-
-#: ../Tomboy/Note.cs:1579
-#, csharp-format
-#| msgid "Really delete this {0} note?"
-#| msgid_plural "Really delete these {0} notes?"
-msgid "Really delete \"{0}\"?"
-msgstr "¿Quiere eliminar «{0}»?"
-
-#: ../Tomboy/Note.cs:1582
-#, csharp-format
-msgid "Really delete this {0} note?"
-msgid_plural "Really delete these {0} notes?"
-msgstr[0] "¿Desea eliminar esta nota?"
-msgstr[1] "¿Desea eliminar estas {0} notas?"
-
-#: ../Tomboy/Note.cs:1593
-msgid "If you delete a note it is permanently lost."
-msgstr "Si borra esta nota se perderá permanentemente."
-
-#: ../Tomboy/Note.cs:1627
-#, csharp-format
-msgid ""
-"An error occurred while saving your notes. Please check that you have "
-"sufficient disk space, and that you have appropriate rights on {0}. Error "
-"details can be found in {1}."
-msgstr ""
-"Ocurrió un error al guardar sus notas. Compruebe que tiene suficiente "
-"espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
-"detalles sobre el error en {1}."
-
-#: ../Tomboy/Note.cs:1643
-msgid "Error saving note data."
-msgstr "Error al guardar los datos de la nota"
-
-#. New Note Template
-#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
-msgid "New Note Template"
-msgstr "Plantilla de Nota nueva"
-
-#. Create migration notification note
-#. Translators: The title of the data migration note
-#: ../Tomboy/NoteManager.cs:147
-msgid "Your Notes Have Moved!"
-msgstr "Sus notas se han movido"
-
-#. 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
-#, 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"
-"\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"
-"\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 ""
-"En la última versión de Tomboy se han movido sus archivos de notas. "
-"Probablemente nunca le ha importado dónde se guardan sus notas y, si todavía "
-"no le importa, siga adelante y <bold>borre esta nota</bold>.\n"
-"\n"
-"Su antigua carpeta de notas está sana y salva en <link:url>{0}</link:url>. "
-"Si vuelve a una versión anterior de Tomboy, éste buscará las notas ahí.\n"
-"\n"
-"Pero se han copiado sus notas y su configuración en las carpetas nuevas que "
-"serán las que se usen a partir de ahora, en:\n"
-"\n"
-"<list><list-item dir=\"ltr\">Las notas las puede encontrar en <link:url>{1}</"
-"link:url>\n"
-"</list-item><list-item dir=\"ltr\">La configuración está en <link:url>{2}</"
-"link:url>\n"
-"</list-item><list-item dir=\"ltr\">Puede instalar complementos en <link:url>"
-"{3}</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Los archivos de registro se pueden "
-"encontrar en <link:url>{4}</link:url></list-item></list>\n"
-"\n"
-"Hasta luego."
-
-#: ../Tomboy/NoteManager.cs:265
-msgid ""
-"<note-content>Start Here\n"
-"\n"
-"<bold>Welcome to Tomboy!</bold>\n"
-"\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"
-"\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>"
-msgstr ""
-"<note-content>Comenzar aquí\n"
-"\n"
-"<bold>Bienvenido a Tomboy</bold>\n"
-"\n"
-"Use esta nota «Comenzar aquí» para empezar a organizar sus ideas y "
-"pensamientos.\n"
-"\n"
-"Puede crear nuevas notas para mantener sus ideas seleccionando el elemento "
-"«Crear nota nueva» del menú de Tomboy en el panel de GNOME. Su nota se "
-"guardará automáticamente.\n"
-"\n"
-"Después organice las notas que cree enlazando las notas relacionadas y sus "
-"ideas de una forma conjunta.\n"
-"\n"
-"Hemos creado una nota llamada <link:internal>Usando enlaces en Tomboy</link:"
-"internal>. ¿Se ha dado cuenta de que cada vez que escribimos <link:"
-"internal>Usando enlaces en Tomboy</link:internal> automáticamente aparece "
-"subrayado? Pulse en el enlace para abrir la nota.</note-content>"
-
-#: ../Tomboy/NoteManager.cs:284
-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"
-"\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>"
-msgstr ""
-"<note-content>Usando enlaces en Tomboy\n"
-"\n"
-"Las notas en Tomboy se pueden enlazar subrayando el texto en la nota actual "
-"y pulsando el botón <bold>Enlazar</bold> en la barra de herramientas. Al "
-"hacerlo se creará una nueva nota así como subrayar el título de la nueva "
-"nota en la nota actual.\n"
-"\n"
-"Cambiar el título de una nota hará que se actualicen los enlaces presentes "
-"en otras notas. Esto previene que aparezcan enlaces rotos cuando se renombra "
-"una nota.\n"
-"\n"
-"Además, si escribe el nombre de otra nota en su nota actual, se enlazará "
-"automáticamente.</note-content>"
-
-#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
-msgid "Start Here"
-msgstr "Comenzar aquí"
-
-#: ../Tomboy/NoteManager.cs:304
-msgid "Using Links in Tomboy"
-msgstr "Usando los enlaces en Tomboy"
-
-#. Use a simple "Describe..." body and highlight
-#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
-msgid "Describe your new note here."
-msgstr "Describa aquí su nota nueva."
-
-#: ../Tomboy/NoteRenameDialog.cs:50
-msgid "Rename Note Links?"
-msgstr "¿Renombrar los enlaces de la nota?"
-
-#: ../Tomboy/NoteRenameDialog.cs:56
-msgid "_Rename Links"
-msgstr "Renom_brar enlaces"
-
-#: ../Tomboy/NoteRenameDialog.cs:59
-msgid "_Don't Rename Links"
-msgstr "_No renombrar enlaces"
-
-#: ../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"
-"\n"
-"If you do not rename the links, they will no longer link to anything."
-msgstr ""
-"Renombrar enlaces en otras notas de «<span underline=\"single\">{0}</span>» "
-"a «<span underline=\"single\">{1}</span>»?\n"
-"\n"
-"Si no renombra los enlaces, no apuntarán a nada."
-
-#: ../Tomboy/NoteRenameDialog.cs:83
-msgid "Rename Links"
-msgstr "Renombrar enlaces"
-
-#: ../Tomboy/NoteRenameDialog.cs:95
-#: ../Tomboy/Synchronization/SyncDialog.cs:119
-msgid "Note Title"
-msgstr "Título de la nota"
-
-#. Translators: This button causes all notes in the list to be selected
-#: ../Tomboy/NoteRenameDialog.cs:118
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#. Translators: This button causes all notes in the list to be unselected
-#: ../Tomboy/NoteRenameDialog.cs:127
-msgid "Select None"
-msgstr "No seleccionar nada"
-
-#: ../Tomboy/NoteRenameDialog.cs:144
-msgid "Ad_vanced"
-msgstr "A_vanzado"
-
-#: ../Tomboy/NoteRenameDialog.cs:147
-msgid "Always show this _window"
-msgstr "Mostrar siempre esta _ventana"
-
-#: ../Tomboy/NoteRenameDialog.cs:155
-msgid "Never rename _links"
-msgstr "No renombrar nunca _enlaces"
-
-#: ../Tomboy/NoteRenameDialog.cs:163
-msgid "Alwa_ys rename links"
-msgstr "Siempre renombrar en_laces"
-
-#: ../Tomboy/NoteWindow.cs:58
-msgid "Find in This Note"
-msgstr "Buscar en esta nota"
-
-#: ../Tomboy/NoteWindow.cs:361
-msgid "_Link to New Note"
-msgstr "_Enlazar a una nota nueva"
-
-#: ../Tomboy/NoteWindow.cs:373
-msgid "Te_xt"
-msgstr "_Texto"
-
-#: ../Tomboy/NoteWindow.cs:381
-msgid "_Find in This Note"
-msgstr "_Buscar en esta nota"
-
-#: ../Tomboy/NoteWindow.cs:396
-msgid "Clos_e All Notes"
-msgstr "C_errar todas las notas"
-
-#: ../Tomboy/NoteWindow.cs:436
-msgid "Search"
-msgstr "Buscar"
-
-#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
-msgid "Search your notes"
-msgstr "Buscar sus notas"
-
-#: ../Tomboy/NoteWindow.cs:452
-msgid "Link"
-msgstr "Enlazar"
-
-#: ../Tomboy/NoteWindow.cs:459
-msgid "Link selected text to a new note"
-msgstr "Enlazar el texto seleccionado a una nota nueva"
-
-#: ../Tomboy/NoteWindow.cs:472
-msgid "_Text"
-msgstr "_Texto"
-
-#: ../Tomboy/NoteWindow.cs:477
-msgid "Set properties of text"
-msgstr "Establecer las propiedades del texto"
-
-#: ../Tomboy/NoteWindow.cs:482
-msgid "T_ools"
-msgstr "_Herramientas"
-
-#: ../Tomboy/NoteWindow.cs:486
-msgid "Use tools on this note"
-msgstr "Usar las herramientas en esta nota"
-
-#: ../Tomboy/NoteWindow.cs:494
-msgid "Delete this note"
-msgstr "Eliminar esta nota"
-
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
-msgid "Synchronize Notes"
-msgstr "Sincronizar las notas"
-
-#: ../Tomboy/NoteWindow.cs:564
-msgid "_Find..."
-msgstr "_Buscar…"
-
-#: ../Tomboy/NoteWindow.cs:575
-msgid "Find _Next"
-msgstr "Buscar _siguiente"
-
-#: ../Tomboy/NoteWindow.cs:588
-msgid "Find _Previous"
-msgstr "Buscar _anterior"
-
-#: ../Tomboy/NoteWindow.cs:676
-msgid "Cannot create note"
-msgstr "No se puede crear la nota"
-
-#: ../Tomboy/NoteWindow.cs:757
-msgid "_Find:"
-msgstr "_Buscar:"
-
-#: ../Tomboy/NoteWindow.cs:768
-msgid "_Previous"
-msgstr "_Anterior"
-
-#: ../Tomboy/NoteWindow.cs:777
-msgid "_Next"
-msgstr "_Siguiente"
-
-#: ../Tomboy/NoteWindow.cs:1260
-msgid "_Bold"
-msgstr "_Negrita"
-
-#: ../Tomboy/NoteWindow.cs:1272
-msgid "_Italic"
-msgstr "_Cursiva"
-
-#: ../Tomboy/NoteWindow.cs:1284
-msgid "_Strikeout"
-msgstr "_Tachado"
-
-#: ../Tomboy/NoteWindow.cs:1296
-msgid "_Highlight"
-msgstr "_Resaltado"
-
-#: ../Tomboy/NoteWindow.cs:1309
-msgid "Font Size"
-msgstr "Tamaño de la tipografía"
-
-#: ../Tomboy/NoteWindow.cs:1312
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../Tomboy/NoteWindow.cs:1329
-msgid "Hu_ge"
-msgstr "_Enorme"
-
-#: ../Tomboy/NoteWindow.cs:1337
-msgid "_Large"
-msgstr "_Grande"
-
-#: ../Tomboy/NoteWindow.cs:1345
-msgid "S_mall"
-msgstr "_Pequeña"
-
-#: ../Tomboy/NoteWindow.cs:1354
-msgid "Increase Font Size"
-msgstr "Aumentar el tamaño de la tipografía"
-
-#: ../Tomboy/NoteWindow.cs:1372
-msgid "Decrease Font Size"
-msgstr "Reducir el tamaño de la tipografía"
-
-#: ../Tomboy/NoteWindow.cs:1392
-msgid "Bullets"
-msgstr "Topos"
-
-#: ../Tomboy/PreferencesDialog.cs:81
-msgid "Editing"
-msgstr "Edición"
-
-#: ../Tomboy/PreferencesDialog.cs:84
-msgid "Hotkeys"
-msgstr "Teclas rápidas"
-
-#: ../Tomboy/PreferencesDialog.cs:86
-msgid "Synchronization"
-msgstr "Sincronización"
-
-#: ../Tomboy/PreferencesDialog.cs:88
-msgid "Add-ins"
-msgstr "Complementos"
-
-#: ../Tomboy/PreferencesDialog.cs:174
-msgid "_Spell check while typing"
-msgstr "Corrección _ortográfica al escribir"
-
-#: ../Tomboy/PreferencesDialog.cs:183
-msgid ""
-"Misspellings will be underlined in red, with correct spelling suggestions "
-"shown in the context menu."
-msgstr ""
-"Si está activado, las faltas de ortografía se subrayarán en rojo, mostrando "
-"las sugerencias de corrección en el menú contextual."
-
-#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:194
-msgid "Highlight _WikiWords"
-msgstr "Resaltar _wikipalabras"
-
-#: ../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 ""
-"Activar esta opción para resaltar palabras <b>QueSeVenAsí</b>. Al pulsar en "
-"la palabra se creará una nota con ese nombre."
-
-#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:209
-msgid "Enable auto-_bulleted lists"
-msgstr "Activar listas de _topos automáticos"
-
-#: ../Tomboy/PreferencesDialog.cs:218
-msgid "Use custom _font"
-msgstr "Usar tipogra_fía personalizada"
-
-#: ../Tomboy/PreferencesDialog.cs:236
-msgid "When renaming a linked note: "
-msgstr "Al renombrar una nota enlazada: "
-
-#: ../Tomboy/PreferencesDialog.cs:239
-msgid "Ask me what to do"
-msgstr "Preguntarme qué hacer"
-
-#: ../Tomboy/PreferencesDialog.cs:240
-msgid "Never rename links"
-msgstr "No renombrar nunca los enlaces"
-
-#: ../Tomboy/PreferencesDialog.cs:241
-msgid "Always rename links"
-msgstr "Siempre renombrar los enlaces"
-
-#: ../Tomboy/PreferencesDialog.cs:261
-msgid ""
-"Use the new note template to specify the text that should be used when "
-"creating a new note."
-msgstr ""
-"Use la plantilla de la nota nueva para especificar el texto que se debe usar "
-"al crear una nota nueva."
-
-#: ../Tomboy/PreferencesDialog.cs:270
-msgid "Open New Note Template"
-msgstr "Abrir la plantilla Nota nueva"
-
-#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:327
-msgid "Listen for _Hotkeys"
-msgstr "_Escuchar las teclas rápidas"
-
-#: ../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 ""
-"Las teclas rápidas le permiten acceder rápidamente a sus notas desde "
-"cualquier parte con una pulsación de tecla. Ejemplo de teclas rápidas: "
-"<b><Control><Mayús>F11</b>, <b><Alt>N</b>"
-
-#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:356
-msgid "Show notes _menu"
-msgstr "Mostrar el _menú de notas"
-
-#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:373
-msgid "Open \"_Start Here\""
-msgstr "Abrir «Comen_zar aquí»"
-
-#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:390
-msgid "Create _new note"
-msgstr "Crear una nota _nueva"
-
-#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:407
-msgid "Open \"Search _All Notes\""
-msgstr "Abrir «Buscar en _todas las notas»"
-
-#: ../Tomboy/PreferencesDialog.cs:434
-msgid "Ser_vice:"
-msgstr "_Servicio:"
-
-#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
-msgid "Not configurable"
-msgstr "No configurable"
-
-#: ../Tomboy/PreferencesDialog.cs:513
-msgid "Automaticall_y Sync in Background Every"
-msgstr "Sin_cronizar automáticamente en segundo plano cada"
-
-#. Translators: See above comment for details on
-#. this string.
-#: ../Tomboy/PreferencesDialog.cs:519
-msgid "Minutes"
-msgstr "Minutos"
-
-#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:541
-msgid "_Advanced..."
-msgstr "_Avanzado…"
-
-#: ../Tomboy/PreferencesDialog.cs:602
-msgid "The following add-ins are installed"
-msgstr "Los siguientes complementos están instalados actualmente"
-
-#: ../Tomboy/PreferencesDialog.cs:623
-msgid "Get More Add-Ins..."
-msgstr "Obtener más complementos…"
-
-#: ../Tomboy/PreferencesDialog.cs:641
-msgid "_Enable"
-msgstr "_Activar"
-
-#: ../Tomboy/PreferencesDialog.cs:647
-msgid "_Disable"
-msgstr "_Desactivar"
-
-#: ../Tomboy/PreferencesDialog.cs:778
-msgid "Not Implemented"
-msgstr "No implementado"
-
-#: ../Tomboy/PreferencesDialog.cs:792
-#, csharp-format
-msgid "{0} Preferences"
-msgstr "{0} Preferencias"
-
-#: ../Tomboy/PreferencesDialog.cs:931
-msgid "Choose Note Font"
-msgstr "Elegir la tipografía de la nota"
-
-#: ../Tomboy/PreferencesDialog.cs:975
-msgid "Other Synchronization Options"
-msgstr "Otras opciones de sincronización"
-
-#: ../Tomboy/PreferencesDialog.cs:981
-msgid ""
-"When a conflict is detected between a local note and a note on the "
-"configured synchronization server:"
-msgstr ""
-"Cuando se detecta un conflicto entre una nota local y una nota en el "
-"servidor de sincronización configurado:"
-
-#: ../Tomboy/PreferencesDialog.cs:988
-msgid "Always ask me what to do."
-msgstr "Preguntarme siempre qué hacer."
-
-#: ../Tomboy/PreferencesDialog.cs:992
-msgid "Rename my local note."
-msgstr "Renombrar mi nota local."
-
-#: ../Tomboy/PreferencesDialog.cs:996
-msgid "Replace my local note with the server's update."
-msgstr "Reemplazar mi nota local con la actualización del servidor."
-
-#: ../Tomboy/PreferencesDialog.cs:1142
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
-
-#: ../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 ""
-"No se recomienda limpiar sus ajustes de sincronización. Quizá se vea forzado "
-"a sincronizar todas sus notas de nuevo cuando guarde los nuevos ajustes."
-
-#: ../Tomboy/PreferencesDialog.cs:1157
-msgid "Resetting Synchronization Settings"
-msgstr "Reiniciando los ajustes de sincronización"
-
-#: ../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 ""
-"Ha desactivado el servicio de sincronización configurado. Sus ajustes de "
-"sincronización se limpiarán. Quizá se vea forzado a sincronizar todas sus "
-"notas de nuevo cuando guarde los ajustes nuevos."
-
-#: ../Tomboy/PreferencesDialog.cs:1237
-msgid "Connection successful"
-msgstr "Conectado correctamente"
-
-#: ../Tomboy/PreferencesDialog.cs:1239
-msgid ""
-"Tomboy is ready to synchronize your notes. Would you like to synchronize "
-"them now?"
-msgstr ""
-"Tomboy está preparado para sincronizar sus notas. ¿Quiere sincronizarlas "
-"ahora?"
-
-#: ../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 ""
-"Compruebe su información e inténtelo de nuevo. El archivo {0} puede contener "
-"información útil sobre el error."
-
-#: ../Tomboy/PreferencesDialog.cs:1274
-msgid "Error connecting"
-msgstr "Error al conectar"
-
-#: ../Tomboy/PreferencesDialog.cs:1350
-msgid "Version:"
-msgstr "Versión:"
-
-#: ../Tomboy/PreferencesDialog.cs:1357
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../Tomboy/PreferencesDialog.cs:1364
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../Tomboy/PreferencesDialog.cs:1370
-msgid "Add-in Dependencies:"
-msgstr "Dependencias de los complementos:"
-
-#: ../Tomboy/RecentChanges.cs:100
-msgid "_Search:"
-msgstr "_Buscar:"
-
-#: ../Tomboy/RecentChanges.cs:350
-msgid "Note"
-msgstr "Nota"
-
-#: ../Tomboy/RecentChanges.cs:373
-msgid "Last Changed"
-msgstr "Último cambio"
-
-#: ../Tomboy/RecentChanges.cs:512
-msgid "Matches"
-msgstr "Coincidencias"
-
-#: ../Tomboy/RecentChanges.cs:563
-msgid "Title match"
-msgstr "Coincidir con el título"
-
-#: ../Tomboy/RecentChanges.cs:566
-#, csharp-format
-msgid "{0} match"
-msgid_plural "{0} matches"
-msgstr[0] "{0} coincidencia"
-msgstr[1] "{0} coincidencias"
-
-#: ../Tomboy/RecentChanges.cs:580
-#, csharp-format
-msgid "Total: {0} note"
-msgid_plural "Total: {0} notes"
-msgstr[0] "Total: {0} nota"
-msgstr[1] "Total: {0} notas"
-
-#: ../Tomboy/RecentChanges.cs:591
-#, csharp-format
-msgid "Matches: {0} note"
-msgid_plural "Matches: {0} notes"
-msgstr[0] "Coincide con: {0} nota"
-msgstr[1] "Coincide con: {0} notas"
-
-#: ../Tomboy/RecentChanges.cs:603
-msgid ""
-"No results found in the selected notebook.\n"
-"Click here to search across all notes."
-msgstr ""
-"No se han encontrado resultados en el cuaderno de notas seleccionado.\n"
-"Pulse aquí para buscar en todas las notas."
-
-#: ../Tomboy/RecentChanges.cs:609
-msgid "Click here to search across all notebooks"
-msgstr "Pulse aquí para buscar en todos los cuadernos de notas"
-
-#: ../Tomboy/RecentChanges.cs:775
-msgid "Notes"
-msgstr "Notas"
-
-#: ../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 ""
-"Su equipo no soporta este complemento de sincronización. Asegúrese de que "
-"tiene FUSE instalado y {0} correctamente instalado y configurado."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
-msgid "Could not read testfile."
-msgstr "No se pudo leer el archivo de prueba."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
-msgid "Write test failed."
-msgstr "Falló la prueba de escritura."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
-msgid "Timeout connecting to server."
-msgstr "Expiró el tiempo de conexión con el servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
-msgid "Error connecting to server."
-msgstr "Error al conectar con el servidor."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
-msgid "FUSE could not be enabled."
-msgstr "No se pudo activar FUSE."
-
-#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
-msgid "An error ocurred while connecting to the specified server:"
-msgstr "Ocurrió un error al conectar con el servidor especificado:"
-
-#. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:89
-msgid "Details"
-msgstr "Detalles"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:126
-msgid "Status"
-msgstr "Estado"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:236
-msgid "Acquiring sync lock..."
-msgstr "Adquiriendo bloqueo de sincronización…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:239
-msgid "Committing changes..."
-msgstr "Efectuando los cambios…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:242
-msgid "Synchronizing Notes"
-msgstr "Sincronizar las notas"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
-msgid "Synchronizing your notes..."
-msgstr "Sincronizando sus notas…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:244
-msgid "This may take a while, kick back and enjoy!"
-msgstr ""
-"Esto puede llevar un rato así que puede hacer otras cosas mientras tanto."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
-msgid "Connecting to the server..."
-msgstr "Conectando al servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:252
-msgid "Deleting notes off of the server..."
-msgstr "Borrando notas del servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
-msgid "Downloading new/updated notes..."
-msgstr "Descargando notas nuevas/actualizadas…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:268
-msgid "Server Locked"
-msgstr "Servidor bloqueado"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:269
-msgid "Server is locked"
-msgstr "El servidor está bloqueado"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:270
-msgid ""
-"One of your other computers is currently synchronizing. Please wait 2 "
-"minutes and try again."
-msgstr ""
-"Uno de sus equipos está actualmente sincronizando. Espere 2 minutos e "
-"inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
-msgid "Preparing to download updates from server..."
-msgstr "Preparándose para descargar las actualizaciones del servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:277
-msgid "Preparing to upload updates to server..."
-msgstr "Preparándose para subir las actualizaciones al servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:280
-msgid "Uploading notes to server..."
-msgstr "Subiendo notas al servidor…"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:283
-msgid "Synchronization Failed"
-msgstr "Falló la sincronización"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
-msgid "Failed to synchronize"
-msgstr "Falló al sincronizar"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:285
-msgid "Could not synchronize notes. Check the details below and try again."
-msgstr ""
-"No se pudieron sincronizar las notas. Compruebe los detalles de abajo e "
-"inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:291
-msgid "Synchronization Complete"
-msgstr "Sincronización completada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:292
-msgid "Synchronization is complete"
-msgstr "Sincronización completada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:294
-#, csharp-format
-msgid "{0} note updated."
-msgid_plural "{0} notes updated."
-msgstr[0] "{0} nota actualizada."
-msgstr[1] "{0} notas actualizadas."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:299
-msgid "Your notes are now up to date."
-msgstr "Ahora sus notas están actualizadas."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
-msgid "Synchronization Canceled"
-msgstr "Se canceló la sincronización"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:304
-msgid "Synchronization was canceled"
-msgstr "Se canceló la sincronización"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:305
-msgid "You canceled the synchronization. You may close the window now."
-msgstr "Canceló la sincronización. Debería cerrar la ventana ahora."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
-msgid "Synchronization Not Configured"
-msgstr "La sincronización no está configurada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:310
-msgid "Synchronization is not configured"
-msgstr "La sincronización no está configurada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:311
-msgid "Please configure synchronization in the preferences dialog."
-msgstr "Configure la sincronización en el diálogo de preferencias."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
-msgid "Synchronization Service Error"
-msgstr "Error de sincronización en el servicio"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:316
-msgid "Service error"
-msgstr "Error del servicio"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:317
-msgid "Error connecting to the synchronization service. Please try again."
-msgstr ""
-"Error al conectar con el servicio de sincronización. Inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:334
-msgid "Deleted locally"
-msgstr "Se borró la copia local"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:337
-msgid "Deleted from server"
-msgstr "Borradas del servidor"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:340
-msgid "Updated"
-msgstr "Actualizada"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:343
-msgid "Added"
-msgstr "Añadida"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:346
-msgid "Uploaded changes to server"
-msgstr "Se subieron al servidor los cambios"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:349
-msgid "Uploaded new note to server"
-msgstr "Se subió la nota nueva al servidor"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:496
-msgid "Note Conflict"
-msgstr "Conflicto entre notas"
-
-#. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:502
-msgid " (old)"
-msgstr "(vieja)"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:541
-msgid "Rename local note:"
-msgstr "Renombrar la nota local:"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:547
-msgid "Update links in referencing notes"
-msgstr "Actualizar los enlaces en las notas referenciadas"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:554
-msgid "Overwrite local note"
-msgstr "Sobreescribir la nota local"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:558
-msgid "Always perform this action"
-msgstr "Siempre realizar esta acción"
-
-#. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:564
-msgid "Note conflict detected"
-msgstr "Se detectó un conflicto en las notas"
-
-#: ../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 ""
-"La versión del servidor «{0}» está en conflicto con su nota local. ¿Qué "
-"quiere hacer con su nota local?"
-
-#: ../Tomboy/Synchronization/SyncUtils.cs:119
-#: ../Tomboy/Synchronization/SyncUtils.cs:163
-msgid "Could not enable FUSE"
-msgstr "No se pudo activar 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 ""
-"No se pudo cargar el módulo FUSE. Compruebe que está instalado correctamete "
-"e inténtelo de nuevo."
-
-#: ../Tomboy/Synchronization/SyncUtils.cs:135
-msgid "Enable FUSE?"
-msgstr "¿Activar FUSE?"
-
-#. TODO: This message isn't entirely accurate.
-#. We should fix it.
-#: ../Tomboy/Synchronization/SyncUtils.cs:139
-msgid ""
-"The synchronization you've chosen requires the FUSE module to be loaded.\n"
-"\n"
-"To avoid getting this prompt in the future, you should load FUSE at "
-"startup. Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
-"etc/modules."
-msgstr ""
-"La sincronización que ha elegido requiere cargar el módulo FUSE.\n"
-"\n"
-"Para evitar que se le muestre este mensaje en el futuro, debería cargar FUSE "
-"al inicio. Añada \"modprobe fuse\" a /etc/init.d/boot.local o \"fuse\" a /"
-"etc/modules."
-
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "No se puede crear una nota nueva"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Desarrollo inicial:"
-
-#: ../Tomboy/Tomboy.cs:330
-msgid "Contributors:"
-msgstr "Colaboradores:"
-
-#: ../Tomboy/Tomboy.cs:415
-msgid "translator-credits"
-msgstr ""
-"Daniel Mustieles <daniel.mustieles at gmail.com>, 2009\n"
-"Jorge González <jorgegonz at svn.gnome.org>, 2004-2009"
-
-#: ../Tomboy/Tomboy.cs:424
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2011 Otros\n"
-
-#: ../Tomboy/Tomboy.cs:426
-msgid "A simple and easy to use desktop note-taking application."
-msgstr ""
-"Una aplicación simple y fácil de usar para tomar notas en el escritorio."
-
-#: ../Tomboy/Tomboy.cs:436
-msgid "Homepage"
-msgstr "Página web"
-
-#: ../Tomboy/Tomboy.cs:554
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Others\n"
-msgstr ""
-"Tomboy: Una aplicación simple y fácil de usar para tomar notas en el "
-"escritorio.\n"
-"Copyright © 2004-2007 Alex Graveley\n"
-"<alex at beatniksoftware.com>\n"
-"\n"
-"Copyright © 2004-2011 Otros\n"
-
-#: ../Tomboy/Tomboy.cs:568
-msgid ""
-"Usage:\n"
-" --version\t\t\tPrint version information.\n"
-" --help\t\t\tPrint this usage message.\n"
-" --note-path [path]\t\tLoad/store note data in this directory.\n"
-" --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Uso:\n"
-" --version\t\t\tMuestra información de la versión.\n"
-" --help\t\t\tMuestra este mensaje de uso.\n"
-" --note-path [ruta]\t\tCargar/almacenar los datos de las notas en esta "
-"carpeta.\n"
-" --search [texto]\t\tAbre la ventana de búsqueda de todas las notas con el "
-"texto buscado.\n"
-
-#: ../Tomboy/Tomboy.cs:578
-msgid ""
-" --new-note\t\t\tCreate and display a new note.\n"
-" --new-note [title]\t\tCreate and display a new note, with a title.\n"
-" --open-note [title/url]\tDisplay the existing note matching title.\n"
-" --start-here\t\t\tDisplay the 'Start Here' note.\n"
-" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-" --new-note\t\t\tCrea y muestra una nota\n"
-" --new-note [título]\t\tCrea y muestra una nota, con un título\n"
-" --open-note [título/url]\tMuestra la nota existente que coincida con el "
-"título\n"
-" --start-here\t\t\tMuestra la nota «Comenzar aquí»\n"
-" --highlight-search [texto]\tBuscar y resaltar texto coincidente en la nota "
-"abierta\n"
-
-#: ../Tomboy/Tomboy.cs:592
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versión {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (nueva)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "Acerca _de Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"No se pudo encontrar el «Manual de Tomboy Notas». Compruebe que su "
-"instalación terminó con éxito."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "No se encontró la ayuda"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "No se puede abrir la dirección"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Hoy, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Hoy"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Ayer, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "Hace {0} día, {1}"
-msgstr[1] "Hace {0} días, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "Hace {0} día"
-msgstr[1] "Hace {0} días"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Mañana, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Mañana"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Dentro de {0} día, {1}"
-msgstr[1] "Dentro de {0} días, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Dentro de {0} día"
-msgstr[1] "Dentro de {0} días"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, HH:mm"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "d MMMM"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Sin fecha"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "d MMMM yyyy, HH:mm"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "d MMMM yyyy"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Sin título {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
-msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
-msgstr ""
-"Ya existe una nota con el título <b>{0}</b>. Por favor, escoja otro nombre "
-"para esta nota antes de continuar."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "El título de la nota ya existe"
-
-#: ../Tomboy/Watchers.cs:587
-msgid "_Copy Link Address"
-msgstr "_Copiar la dirección del enlace"
-
-#: ../Tomboy/Watchers.cs:592
-msgid "_Open Link"
-msgstr "_Abrir enlace"
-
-#~ msgid "Really delete this note?"
-#~ msgstr "¿Desea eliminar esta nota?"
-
-#~ msgid "HTML Export Last Directory"
-#~ msgstr "Exportar al último directorio usado en formato HTML"
-
-#~ msgid "Search your notes (Ctrl-Shift-F)"
-#~ msgstr "Buscar en sus notas (Ctrl-Mayús-F)"
-
-#~ msgid "SSH (sshfs FUSE)"
-#~ msgstr "SSH (sshfs FUSE)"
-
-#~ msgid "WebDAV (wdfs FUSE)"
-#~ msgstr "WebDAV (wdfs FUSE)"
-
-#~ msgid "Success! You're connected!"
-#~ msgstr "Está conectado."
-
-#~ msgid "_Browse..."
-#~ msgstr "_Examinar…"
-
-#~ msgid "D-BUS remote control disabled.\n"
-#~ msgstr "Control remoto de D-BUS desactivado.\n"
-
-#~ msgid ""
-#~ "Tomboy: unsupported option '{0}'\n"
-#~ "Try 'tomboy --help' for more information.\n"
-#~ "D-BUS remote control disabled."
-#~ msgstr ""
-#~ "Tomboy: opción no válida «{0}»\n"
-#~ "Pruebe 'tomboy --help' para más información.\n"
-#~ "Control remoto de D-BUS desactivado."
-
-#~ msgid "Click Here After Authorizing"
-#~ msgstr "Pulse aquí después de autorizar"
-
-#~ msgid "Processing..."
-#~ msgstr "Procesando…"
-
-#~ msgid "_Connect to Server"
-#~ msgstr "_Conectar con el servidor"
-
-#~ msgid "C_ase Sensitive"
-#~ msgstr "Sensible a _mayúsculas"
-
-#~ msgid "Really delete these notes?"
-#~ msgstr "¿Desea borrar estas notas?"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "Preparando las páginas…"
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "Renderizando página %d de %d…"
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "Imprimiendo página %d de %d…"
-
-#~ msgid "Print preview"
-#~ msgstr "Vista previa de impresión"
-
-#~ msgid "%A %x, %X"
-#~ msgstr "%A %x, %X"
-
-#~ msgid "Configuration"
-#~ msgstr "Configuración"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "Opciones de configuración para el trabajo de impresión"
-
-#~ msgid "Source Buffer"
-#~ msgstr "Búfer del fuente"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "Objeto GtkTextBuffer que imprimir"
-
-#~ msgid "Tabs Width"
-#~ msgstr "Ancho de tabulación"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "Anchura en espacios equivalentes para los tabuladores"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "Modo de ajuste"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "Modo de ajuste de palabras"
-
-#~ msgid "Highlight"
-#~ msgstr "Resaltado"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "Indica si se imprime el documento con resaltado de sintaxis"
-
-#~ msgid "Font"
-#~ msgstr "Tipografía"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr "Nombre GnomeFont para usar en el texto del documento (obsoleto)"
-
-#~ msgid "Font Description"
-#~ msgstr "Descripción de la tipografía"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Tipografía que se va a usar en el texto del documento (Ej: «Monospace 10»)"
-
-#~ msgid "Numbers Font"
-#~ msgstr "Tipografía para los números"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr "Nombre GnomeFont para usar en los números de línea (obsoleto)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "Descripción de la tipografía a usar en los números de línea"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "Imprimir números de línea"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr ""
-#~ "Intervalo de impresión de números de líneas (0 significa sin números)"
-
-#~ msgid "Print Header"
-#~ msgstr "Imprimir cabecera"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "Indica si se imprimirá una cabecera en cada página"
-
-#~ msgid "Print Footer"
-#~ msgstr "Imprimir pie de página"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "Indica si se imprimirá un pie de página en cada página"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "Tipografía de cabecera y pie de página"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr ""
-#~ "Nombre GnomeFont a usar para la cabecera y el pie de página (obsoleto)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "Descripción de la tipografía de cabecera y pie de página"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Tipografía que se va a usar para las cabeceras y el pie de página (Ej: "
-#~ "«Monospace 10»)"
-
-#~ msgid "Add-in"
-#~ msgstr "Complemento"
-
-#~ msgid "Version"
-#~ msgstr "Versión"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
+# translation of tomboy.master.po to Español
+# Francisco Javier F. Serrador <serrador at cvs.gnome.org>, 2004, 2006.
+# Traducción al español de tomboy
+# Spanish translation for tomboy
+# Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
+# This file is distributed under the same licence as the Tomboy package.
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2009, 2010, 2011.
+# Jorge González <jorgegonz at svn.gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
+#
+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-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-08-31 15:42Centra\n"
+"Last-Translator: Jorge González <jorgegonz at svn.gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:1
+msgid "Accessories"
+msgstr "Accesorios"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:2
+msgid "Simple and easy to use note-taking"
+msgstr "Toma de notas simple y fácil de usar"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:3
+msgid "Tomboy Applet Factory"
+msgstr "Fábrica de la miniaplicación Tomboy"
+
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../Tomboy/Tray.cs:579
+msgid "Tomboy Notes"
+msgstr "Notas Tomboy"
+
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:274
+msgid "S_ynchronize Notes"
+msgstr "S_incronizar las notas"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
+msgid "_About"
+msgstr "Acerca _de"
+
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:288
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:283
+msgid "_Preferences"
+msgstr "Prefere_ncias"
+
+#: ../data/tomboy.desktop.in.h:1
+msgid "Note-taker"
+msgstr "Anotador"
+
+#: ../data/tomboy.desktop.in.h:2
+msgid "Take notes, link ideas, and stay organized"
+msgstr "Tome notas, enlace ideas y manténgase organizado"
+
+#: ../data/tomboy.schemas.in.h:1
+msgid "Accept SSL Certificates"
+msgstr "Aceptar certificados SSL"
+
+#: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "El tiempo de la sincronización automática en segundo plano ha expirado"
+
+#: ../data/tomboy.schemas.in.h:3
+msgid "Create a new Note"
+msgstr "Crear una nota nueva"
+
+#: ../data/tomboy.schemas.in.h:4
+msgid "Custom Font Face"
+msgstr "Personalizar tipografía"
+
+#: ../data/tomboy.schemas.in.h:5
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la coordenada X de la ventana «Buscar todas las notas»; almacenado "
+"en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:6
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la coordenada Y de la ventana «Buscar todas las notas»; almacenado "
+"en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:7
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr ""
+"Determina la altura en píxeles de la ventana «Buscar todas las notas»; "
+"almacenado en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:8
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr ""
+"Determina la anchura en píxeles de la ventana «Buscar todas las notas»; "
+"almacenado en Tomboy al salir."
+
+#: ../data/tomboy.schemas.in.h:9
+msgid "Enable Middle-Click Paste On Icon."
+msgstr "Activar pegar con el botón del medio del ratón."
+
+#: ../data/tomboy.schemas.in.h:10
+msgid "Enable Tray Icon"
+msgstr "Activar icono de la bandeja de notificación"
+
+#: ../data/tomboy.schemas.in.h:11
+msgid "Enable WikiWord highlighting"
+msgstr "Activar resaltado de Wikipalabras"
+
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Activar listas de topos automáticas."
+
+#: ../data/tomboy.schemas.in.h:13
+msgid "Enable closing notes with escape."
+msgstr "Activar cerrar las notas con escape."
+
+#: ../data/tomboy.schemas.in.h:14
+msgid "Enable custom font"
+msgstr "Activar tipografía personalizada"
+
+#: ../data/tomboy.schemas.in.h:15
+msgid "Enable global keybindings"
+msgstr "Activar combinaciones de teclas globales"
+
+#: ../data/tomboy.schemas.in.h:16
+msgid "Enable spellchecking"
+msgstr "Activar el corrector ortográfico"
+
+#: ../data/tomboy.schemas.in.h:17
+msgid "Enable startup notes"
+msgstr "Activar notas al inicio"
+
+#: ../data/tomboy.schemas.in.h:18
+msgid "Enable the Delete Note confirmation dialog"
+msgstr "Activar o desactivar el diálogo de confirmación de Eliminar nota"
+
+#: ../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 ""
+"Active esta opción si quiere que las listas de topos sean automáticas cuando "
+"introduce un - o un *^al principio de una línea."
+
+#: ../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 ""
+"Active esta opción si quiere poder pegar contenido con marca de tiempo en la "
+"nota Comenzar aquí, pulsando con el botón del medio en el icono de Tomboy."
+
+#: ../data/tomboy.schemas.in.h:21
+msgid ""
+"Enable this option to highlight words ThatLookLikeThis. Clicking the word "
+"will create a note with that name."
+msgstr ""
+"Active esta opción para resaltar palabras QueSeVenAsí. Al pulsar en la "
+"palabra se creará una nota con ese nombre."
+
+#: ../data/tomboy.schemas.in.h:22
+msgid "FUSE Mounting Timeout (ms)"
+msgstr "Tiempo de expiración FUSE (ms)"
+
+#: ../data/tomboy.schemas.in.h:23
+msgid "HTML Export All Linked Notes"
+msgstr "Exportar todas las notas enlazadas a HTML"
+
+#: ../data/tomboy.schemas.in.h:24
+msgid "HTML Export Linked Notes"
+msgstr "Exportar las notas enlazadas a HTML"
+
+#: ../data/tomboy.schemas.in.h:25
+msgid ""
+"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+msgstr ""
+"Si está desactivado, se eliminará el diálogo de confirmación de «Eliminar "
+"nota»."
+
+#: ../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 ""
+"Si enable_custom_font está activado, la tipografía aquí seleccionada se "
+"usará al mostrar las notas."
+
+#: ../data/tomboy.schemas.in.h:27
+msgid ""
+"If enabled, all notes that were open when Tomboy quit will automatically be "
+"reopened at startup."
+msgstr ""
+"Si está activado, todas las notas que estaban abiertas cuando se cerró "
+"Tomboy, se abrirán automáticamente al inicio."
+
+#: ../data/tomboy.schemas.in.h:28
+msgid "If enabled, an opened note can be closed by hitting the escape key."
+msgstr ""
+"Si está activado, una nota abierta se puede cerrar pulsando la tecla 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 ""
+"Si es verdadero, se mostrará el icono de la bandeja de Tomboy en el área de "
+"notificación. Puede ser útil desactivarlo cuando otra aplicación proporcione "
+"la funcionalidad del icono de la bandeja."
+
+#: ../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 ""
+"Si está activado, las faltas de ortografía se subrayarán en rojo, y pulsando "
+"con el botón derecho del ratón se mostrarán sugerencias."
+
+#: ../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 ""
+"Si está activado, las combinaciones globales de teclas del escritorio "
+"fijadas en /apps/tomboy/global_keybindings también se activará, permitiendo "
+"al resto de aplicaciones usar las opciones útiles de Tomboy."
+
+#: ../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 ""
+"Si está activado, el nombre del conjunto de tipo en custom_font_face se "
+"usará como tipografía para mostrar las notas. De otra manera se usará la "
+"tipografía predeterminada del escritorio."
+
+#: ../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 que el complemento de importador de notas adhesivas no ha sido "
+"ejecutado, así que debería ejecutarse automáticamente la próxima vez que "
+"arranque Tomboy."
+
+#: ../data/tomboy.schemas.in.h:34
+msgid ""
+"Integer determining the minimum number of notes to show in the Tomboy note "
+"menu."
+msgstr ""
+"Entero determinando el número mínimo de notas que mostrar en el menú de "
+"notas de 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 ""
+"Valor entero que indica con qué frecuencia realizar una sincronización en "
+"segundo plano de sus notas (cuando la sincronización está configurada). "
+"Cualquier valor menor que 1 indica que la autosincronización está "
+"desactivada. El valor mínimo es 5. Este valor se expresa en minutos."
+
+#: ../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 ""
+"Valor entero que indica si existe una preferencia para realizar siempre una "
+"acción específica cuando se detecta un conflicto, en lugar de preguntar al "
+"usuario. Los valores denotan una enumeración interna. 0 indica que el "
+"usuario desea ser preguntado cuando suceda un conflicto, de tal forma que el "
+"usuario manejará cada situación de conflicto caso por 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 ""
+"Valor entero que indica si existe una preferencia para actualizar "
+"específicamente un enlace cuando se renombra una nota, en lugar de preguntar "
+"al usuario. Los valores denotan una enumeración interna. 0 indica que el "
+"usuario desea que le pregunten cuando al renombrar una nota puede afectar a "
+"los enlaces existentes en otras notas. 1 indica que los enlaces se deben "
+"eliminar automáticamente. 2 indica que se debe actualizar el texto del "
+"enlace con el nuevo nombre de la nota para que siga apuntando a la nota "
+"renombrada."
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "Última carpeta usada al exportar en HTML"
+
+#: ../data/tomboy.schemas.in.h:39
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Comportamiento al actualizar un enlace al renombrar una nota"
+
+#: ../data/tomboy.schemas.in.h:40
+msgid "List of pinned notes."
+msgstr "Lista de notas pinchadas."
+
+#: ../data/tomboy.schemas.in.h:41
+msgid ""
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr ""
+"Número máximo de caracteres del título de la nota que mostrar en la bandeja "
+"de Tomboy o en el menú de la miniaplicación de notas del panel."
+
+#: ../data/tomboy.schemas.in.h:42
+msgid "Maximum note title length to show in tray menu."
+msgstr ""
+"Longitud máxima del título de la nota que mostrar en el menú de la bandeja."
+
+#: ../data/tomboy.schemas.in.h:43
+msgid "Minimum number of notes to show in menu"
+msgstr "Número mínimo de notas que mostrar en el menú"
+
+#: ../data/tomboy.schemas.in.h:44
+msgid "Note Synchronization Conflict Saved Behavior"
+msgstr ""
+"Comportamiento predeterminado para conflictos de sincronización de notas"
+
+#: ../data/tomboy.schemas.in.h:45
+msgid "Open Recent Changes"
+msgstr "Abrir cambios recientes"
+
+#: ../data/tomboy.schemas.in.h:46
+msgid "Open Search Dialog"
+msgstr "Abrir el cuadro de diálogo de buscar"
+
+#: ../data/tomboy.schemas.in.h:47
+msgid "Open Start Here"
+msgstr "Abrir comenzar aquí"
+
+#: ../data/tomboy.schemas.in.h:48
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr ""
+"Ruta en el servidor SSH al directorio de sincronización de Tomboy (opcional)."
+
+#: ../data/tomboy.schemas.in.h:49
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"Ruta al servidor de sincronización cuando se use el complemento del servicio "
+"de sincronización de sistema de archivos."
+
+#: ../data/tomboy.schemas.in.h:50
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "Carpeta de sincronización remota SSHFS"
+
+#: ../data/tomboy.schemas.in.h:51
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "Nombre de usuario de la sincronización remota SSHFS"
+
+#: ../data/tomboy.schemas.in.h:52
+msgid "SSHFS Synchronization Server Port"
+msgstr "Puerto del servidor de sincronización remoto SSHFS"
+
+#: ../data/tomboy.schemas.in.h:53
+msgid "SSHFS Synchronization Server URL"
+msgstr "URL del servidor de sincronización remota SSHFS"
+
+#: ../data/tomboy.schemas.in.h:54
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Altura guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:55
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Posición horizontal guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:56
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Posición vertical guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:57
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Anchura guardada de la ventana «Buscar todas las notas»"
+
+#: ../data/tomboy.schemas.in.h:58
+msgid "Selected Synchronization Service Addin"
+msgstr "Seleccione el complemento del servicio de sincronización"
+
+#: ../data/tomboy.schemas.in.h:59
+msgid "Set to TRUE to activate"
+msgstr "Establecer a «TRUE» para activar"
+
+#: ../data/tomboy.schemas.in.h:60
+msgid "Show applet menu"
+msgstr "Mostrar el menú de miniaplicaciones"
+
+#: ../data/tomboy.schemas.in.h:61
+msgid "Start Here Note"
+msgstr "Nota «Comenzar aquí»"
+
+#: ../data/tomboy.schemas.in.h:62
+msgid "Sticky Note Importer First Run"
+msgstr "Primera ejecución del importador de notas adhesivas"
+
+#: ../data/tomboy.schemas.in.h:63
+msgid "Synchronization Client ID"
+msgstr "ID del cliente de sincronización"
+
+#: ../data/tomboy.schemas.in.h:64
+msgid "Synchronization Local Server Path"
+msgstr "Ruta al servidor local de sincronización"
+
+#: ../data/tomboy.schemas.in.h:65
+msgid "The date format that is used for the timestamp."
+msgstr "El formato de la fecha que se usa para la marca de tiempo."
+
+#: ../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 ""
+"Combinación de teclas global para crear y mostrar una nota nueva. El formato "
+"sería \"<Control>a\" o \"<Shift><Alt>F1\". El analizador "
+"léxico es bastante tolerante y permite letras mayúsculas o minúsculas, y "
+"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
+"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
+"teclas para esta acción."
+
+#: ../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 ""
+"Combinación de teclas global para abrir «Comenzar aquí». El formato sería "
+"\"<Control>a\" o \"<Shift><Alt>F1\". El analizador léxico "
+"es bastante tolerante y permite letras mayúsculas o minúsculas, y "
+"abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". Si activa la "
+"opción de cadena especial \"disabled\" (desactivada) no habrá combinación de "
+"teclas para esta acción."
+
+#: ../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 ""
+"Combinación de teclas global para abrir el diálogo de buscar notas. El "
+"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
+"analizador léxico es bastante tolerante y permite letras mayúsculas o "
+"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
+"combinación de teclas para esta acción."
+
+#: ../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 ""
+"Combinación de teclas global para abrir el diálogo de cambios recientes. El "
+"formato sería \"<Control>a\" o \"<Shift><Alt>F1\". El "
+"analizador léxico es bastante tolerante y permite letras mayúsculas o "
+"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
+"combinación de teclas para esta acción."
+
+#: ../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 ""
+"Combinación de teclas global para mostrar el menú de miniaplicaciones de "
+"Tomboy. El formato sería \"<Control>a\" o \"<Shift><Alt>F1"
+"\". El analizador léxico es bastante tolerante y permite letras mayúsculas o "
+"minúsculas, y abreviaciones tales como \"<Ctl>\" y \"<Ctrl>\". "
+"Si activa la opción de cadena especial \"disabled\" (desactivada) no habrá "
+"combinación de teclas para esta acción."
+
+#: ../data/tomboy.schemas.in.h:71
+msgid "The handler for \"note://\" URLs"
+msgstr "El manejador para las URL «note://»"
+
+#: ../data/tomboy.schemas.in.h:72
+msgid ""
+"The last directory a note was exported to using the Export To HTML plugin."
+msgstr ""
+"El último directorio donde se exportó una nota usando el complemento "
+"Exportar a HTML."
+
+#: ../data/tomboy.schemas.in.h:73
+msgid ""
+"The last setting for the 'Export linked notes' checkbox in the Export to "
+"HTML plugin."
+msgstr ""
+"Las última casilla de preferencias para «Exportar las notas enlazadas a HTML» "
+"en el complemento Exportar a HTML."
+
+#: ../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 ""
+"El último ajuste para la casilla de «Incluir todas las notas enlazadas» en el "
+"complemento de exportar a HTML. Esta opción se usa junto con los ajustes de "
+"«Exportar las notas enlazadas a HTML» y se usa para especificar si todas las "
+"notas (encontradas recursivamente) deberían ser incluídas durante la "
+"exportación a HTML."
+
+#: ../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 ""
+"La URI de la nota que debería ser considerada como la nota «Comenzar aquí», "
+"que siempre estará al final del menú de notas de Tomboy y que también es "
+"accesible por una tecla rápida."
+
+#: ../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 ""
+"El puerto que usar al conectar con el servidor de sincronización a través de "
+"SSH. Establecido a -1 o menos si se debe usar el puerto predeterminado de "
+"SSH en su lugar."
+
+#: ../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 ""
+"Tiempo (en milisegundos) que Tomboy debe esperar una respuesta al usar FUSE "
+"para montar una compartición sincronizada."
+
+#: ../data/tomboy.schemas.in.h:78
+msgid "Timestamp format"
+msgstr "Formato de la marca de tiempo"
+
+#: ../data/tomboy.schemas.in.h:79
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr ""
+"URL del servidor SSH que contiene el directorio de sincronización de Tomboy."
+
+#: ../data/tomboy.schemas.in.h:80
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr ""
+"Identificador único para el complemento configurado del servicio de "
+"sincronización de notas."
+
+#: ../data/tomboy.schemas.in.h:81
+msgid ""
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
+msgstr ""
+"Identificador único para este cliente Tomboy, usado al comunicar con un "
+"servidor de sincronización."
+
+#: ../data/tomboy.schemas.in.h:82
+msgid ""
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
+"user."
+msgstr ""
+"Usar la opción wdfs «-ac» para aceptar certificados SSL sin preguntar al "
+"usuario."
+
+#: ../data/tomboy.schemas.in.h:83
+msgid "User name to use when connecting to the synchronization server via SSH."
+msgstr ""
+"Nombre de usuario que usar al conectar con el servidor de sincronización a "
+"través de SSH."
+
+#: ../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 ""
+"Lista separada por espacios en blanco de URI de notas para las notas que "
+"deberían aparecer en el menú de notas de Tomboy."
+
+#: ../Tomboy/ActionManager.cs:127
+msgid "_File"
+msgstr "_Archivo"
+
+#: ../Tomboy/ActionManager.cs:130
+msgid "_New"
+msgstr "_Nueva"
+
+#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
+msgid "Create a new note"
+msgstr "Crear una nota nueva"
+
+#: ../Tomboy/ActionManager.cs:134
+msgid "_Open..."
+msgstr "_Abrir…"
+
+#: ../Tomboy/ActionManager.cs:135
+msgid "Open the selected note"
+msgstr "Abrir la nota seleccionada"
+
+#: ../Tomboy/ActionManager.cs:138
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: ../Tomboy/ActionManager.cs:139
+msgid "Delete the selected note"
+msgstr "Eliminar la nota seleccionada"
+
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ../Tomboy/ActionManager.cs:143
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
+msgid "_Quit"
+msgstr "_Salir"
+
+#: ../Tomboy/ActionManager.cs:147
+msgid "Quit Tomboy"
+msgstr "Salir de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:150
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+msgid "Tomboy Preferences"
+msgstr "Preferencias de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:160
+msgid "_Contents"
+msgstr "Índ_ice"
+
+#: ../Tomboy/ActionManager.cs:161
+msgid "Tomboy Help"
+msgstr "Ayuda de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
+msgid "About Tomboy"
+msgstr "Acerca de Tomboy"
+
+#: ../Tomboy/ActionManager.cs:168
+msgid "TrayIcon"
+msgstr "Icono del área de notificación"
+
+#: ../Tomboy/ActionManager.cs:171
+msgid "Create _New Note"
+msgstr "Crear una nota _nueva"
+
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
+msgid "_Search All Notes"
+msgstr "_Buscar en todas las notas"
+
+#: ../Tomboy/ActionManager.cs:176
+msgid "Open the Search All Notes window"
+msgstr "Abrir la ventana de Búsqueda en todas las notas"
+
+#: ../Tomboy/ActionManager.cs:180
+msgid "Start synchronizing notes"
+msgstr "Comenzar a sincronizar las notas"
+
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Avanzadas"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr ""
+"Número mínimo de notas que mostrar en la lista de recientes (máximo 18)"
+
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
+msgid "What links here?"
+msgstr "¿Qué enlaza aquí?"
+
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
+msgid "(none)"
+msgstr "(ninguna)"
+
+#: ../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 ""
+"Puede usar cualquier bugzilla simplemente arrastrando los enlaces en las "
+"notas. Si quiere un icono especial para algunos servidores, añádalos aquí."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
+msgid "Host Name"
+msgstr "Nombre del servidor"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
+msgid "Icon"
+msgstr "Icono"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
+msgid "Select an icon..."
+msgstr "Seleccione un icono…"
+
+#. Extra Widget
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
+msgid "_Host name:"
+msgstr "Nombre del _equipo:"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
+msgid "No host name specified"
+msgstr "No se especificó ningún nombre para el equipo"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
+msgid "You must specify the Bugzilla host name to use with this icon."
+msgstr ""
+"Debe especificar el nombre del equipo de Bugzilla para usar con este icono."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
+msgid "Error saving icon"
+msgstr "Error al guardar el icono"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
+msgid "Could not save the icon file."
+msgstr "No se pudo guardar el icono de archivo."
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
+msgid "Really remove this icon?"
+msgstr "¿Desea quitar este icono?"
+
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
+msgid "If you remove an icon it is permanently lost."
+msgstr "Si borra un icono se perderá permanentemente."
+
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "No se puede abrir el correo-e"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "Destino para la exportación a HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Exportar las notas enlazadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Incluir todas las notas enlazadas"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
+msgid "Export to HTML"
+msgstr "Exportar a HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:115
+#, csharp-format
+msgid "Your note was exported to \"{0}\"."
+msgstr "Su nota se exportó a «{0}»."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:126
+msgid "Note exported successfully"
+msgstr "Nota exportada con éxito"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
+msgid "Access denied."
+msgstr "Acceso denegado."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
+msgid "Folder does not exist."
+msgstr "La carpeta no existe."
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:149
+#, csharp-format
+msgid "Could not save the file \"{0}\""
+msgstr "No se pudo guardar el archivo «{0}»"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
+msgid "_Folder Path:"
+msgstr "Ruta de la ca_rpeta:"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
+msgid "Select Synchronization Folder..."
+msgstr "Seleccione la carpeta para sincronizar…"
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
+msgid "Folder path field is empty."
+msgstr "El campo de la ruta de la carpeta está vacío."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid ""
+"Specified folder path does not exist, and Tomboy was unable to create it."
+msgstr "La ruta de la carpeta especificada no existe y Tomboy no pudo crearla."
+
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
+msgid "Local Folder"
+msgstr "Carpeta local"
+
+#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
+msgid "Fixed Wid_th"
+msgstr "Anchura _fija"
+
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
+#, csharp-format
+msgid "Cannot contact '{0}'"
+msgstr "No se puede contactar con «{0}»"
+
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
+#, csharp-format
+msgid "Error running gaim-remote: {0}"
+msgstr "Error al ejecutar gaim-remote: {0}"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
+msgid "Insert Timestamp"
+msgstr "Insertar marca de tiempo"
+
+#. initial newline
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
+#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+msgid "dddd, MMMM d, h:mm tt"
+msgstr "dddd, d MMMM, HH:mm"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
+msgid "Choose one of the predefined formats or use your own."
+msgstr "Elija uno de los formatos predefinidos o use uno propio."
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
+msgid "Use _Selected Format"
+msgstr "Usar el formato _seleccionado"
+
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:87
+msgid "_Use Custom Format"
+msgstr "_Usar tipografía personalizada"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:10
+msgid "Today: Template"
+msgstr "Hoy: Plantilla"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:12
+msgid "Today: "
+msgstr "Hoy: "
+
+#. Format: "Today: Friday, July 01 2005"
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
+msgid "dddd, MMMM d yyyy"
+msgstr "dddd, d MMMM yyyy"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:44
+msgid "Appointments"
+msgstr "Citas"
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
+msgid ""
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
+msgstr ""
+"Cambiar la nota <b>Hoy: plantilla</b> para personalizar el texto que las "
+"nuevas notas «Hoy» tendrán."
+
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
+msgid "_Open Today: Template"
+msgstr "_Abrir hoy: Plantilla"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
+msgid "Print"
+msgstr "Imprimir"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
+msgid "Error printing note"
+msgstr "Error al imprimir la nota"
+
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
+#, csharp-format
+msgid "Page {0} of {1}"
+msgstr "Página {0} de {1}"
+
+#. Translators: Explanation of the date and time format specifications can be found here:
+#. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
+msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
+msgstr "dddd dd/MM/yyyy, hh:mm:ss"
+
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Quitar enlaces rotos"
+
+#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
+msgid "Add a sketch"
+msgstr "Añadir un dibujo"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
+msgid "Se_rver:"
+msgstr "Se_rvidor:"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
+msgid "User_name:"
+msgstr "_Usuario:"
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
+msgid "_Folder Path (optional):"
+msgstr "Ruta de la ca_rpeta (opcional):"
+
+#. 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 ""
+"La sincronización SSH requiere una clave SSH existente para este servidor y "
+"usuario que esté añadida al demonio SSH en ejecución."
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
+msgid "Server or username field is empty."
+msgstr "El campo del usuario o del servidor está vacío."
+
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+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 ""
+"Se superó el tiempo de espera máximo al conectar con el servidor. Asegúrese "
+"de que su clave SSH se ha añadido al demonio SSH en ejecución."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
+msgid "Import from Sticky Notes"
+msgstr "Importar de notas adhesivas"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:133
+msgid "No Sticky Notes found"
+msgstr "No se encontraron notas adhesivas"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
+#, csharp-format
+msgid "No suitable Sticky Notes file was found at \"{0}\"."
+msgstr "No se ha encontrado ningún archivo de Notas Adhesivas en «{0}»."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:143
+msgid "Sticky Notes import completed"
+msgstr "Importación de notas adhesivas completada"
+
+#: ../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."
+msgstr[0] "Se importó con éxito <b>{0}</b> de <b>{1}</b> nota adhesiva."
+msgstr[1] "Se importaron con éxito <b>{0}</b> de <b>{1}</b> notas adhesivas."
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
+msgid "Untitled"
+msgstr "Sin título"
+
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
+msgid "Sticky Note: "
+msgstr "Nota adhesiva: "
+
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
+msgid "Tasque"
+msgstr "Tasque"
+
+#. Note to translators: "All" here must match up with the "All"
+#. category translation in Tasque for this to work properly. "All"
+#. is used here to allow Tasque to decide which default category
+#. will be used to create the new task.
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
+msgid "All"
+msgstr "Todo"
+
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
+msgid "--- Tasque is not running ---"
+msgstr "--- Tasque no se está ejecutando ---"
+
+#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
+msgid "_Underline"
+msgstr "_Subrayado"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
+msgid "_Password:"
+msgstr "Contrase_ña:"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
+msgid "URL, username, or password field is empty."
+msgstr "El campo URL, usuario o contraseña está vacío."
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+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 ""
+"Ocurrió un error al conectar con el servidor. Esto pudo ocurrir por usar un "
+"nombre de usuario y/o contraseña incorrectos."
+
+#. TODO: If the above fails (no keyring daemon), save all but password
+#. to GConf, and notify user.
+#. Save configuration into GConf
+#. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
+#. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
+msgid ""
+"Saving configuration to the GNOME keyring failed with the following message:"
+msgstr ""
+"Falló al guardar la configuración al depósito de claves con el siguiente "
+"mensaje:"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
+msgid "Connect to Server"
+msgstr "Conectar al servidor"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
+msgid "Connected"
+msgstr "Conectado"
+
+#. Translators: The web service supporting Tomboy WebSync is not responding as expected
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
+msgid "Server not responding. Try again later."
+msgstr "El servidor no está respondiendo. Inténtelo de nuevo más tarde."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
+msgid "Authorization Failed, Try Again"
+msgstr "Falló la autorización. Inténtelo de nuevo."
+
+#. Translators: Title of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
+msgid "Tomboy Web Authorization Successful"
+msgstr "Autorización web de Tomboy satisfactoria"
+
+#. 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 ""
+"Regrese a la ventana de preferencias de Tomboy y pulse guardar para iniciar "
+"la sincronización."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
+msgid "Connected. Press Save to start synchronizing"
+msgstr "Conectado. Pulse Guardar para iniciar la sincronización."
+
+#. Translators: The user must take action in their web browser to continue the authorization process
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
+msgid "Authorizing in browser (Press to reset connection)"
+msgstr "Autorizar en el navegador (pulse para reiniciar la conexión)"
+
+#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
+msgid "Set the default browser and try again"
+msgstr "Establecer el navegador predeterminado e intentarlo de nuevo"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Web de Tomboy"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "Exportar todas las notas en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "Comenzar a exportar las notas en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "Exportar el cuaderno de notas seleccionado en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "Comenzar a exportar el cuaderno en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Exportar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Exportar sus notas."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "Exportar todas las notas en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "Exportar el cuaderno de notas seleccionado en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "Exportado en {0} de todas las notas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "No se pudo exportar, acceso denegado."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "No se pudo exportar, la carpeta no existe."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "No se pudo exportar: {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Notas sin archivar"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Sus notas se exportaron a «{0}»."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Notas exportadas correctamente"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "No se pudieron guardar los archivos «{0}»"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Crear carpeta de destino para exportar {0}"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
+msgid "Search All Notes"
+msgstr "Buscar en todas las notas"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#: ../Tomboy/JumpListManager.cs:106
+msgid "Create New Note"
+msgstr "Crear una nota nueva"
+
+#: ../Tomboy/JumpListManager.cs:136
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (nueva)"
+
+#: ../Tomboy/JumpListManager.cs:158
+msgid "Recent Notes"
+msgstr "Notas recientes"
+
+#. Translators: This is the name of "Window" menu in the Mac menubar
+#: ../Tomboy/MacApplication.cs:215
+msgid "_Window"
+msgstr "_Ventana"
+
+#: ../Tomboy/MacApplication.cs:234
+msgid "Preferences..."
+msgstr "Preferencias…"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
+msgid "Create a new notebook"
+msgstr "Crear un cuaderno de notas nuevo"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:25
+msgid "Type the name of the notebook you'd like to create."
+msgstr "Escriba el nombre del cuaderno de notas que desea crear."
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
+msgid "N_otebook name:"
+msgstr "Nombre del cuaderno de n_otas:"
+
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
+msgid "Name already taken"
+msgstr "El nombre ya existe"
+
+#. Translation note: This is the Create button in the Create
+#. New Note Dialog.
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:59
+msgid "C_reate"
+msgstr "C_rear"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
+msgid "Note_books"
+msgstr "Cua_dernos de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
+msgid "Create a new note in a notebook"
+msgstr "Crear una nota nueva en un cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
+msgid "New Note_book..."
+msgstr "Cua_derno de notas nuevo…"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
+msgid "_New Note"
+msgstr "Nota _nueva"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:57
+msgid "Create a new note in this notebook"
+msgstr "Crear una nota nueva en éste portátil"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:60
+msgid "_Open Template Note"
+msgstr "_Abrir la nota de plantilla"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:61
+msgid "Open this notebook's template note"
+msgstr "Abrir la nota de plantilla de este cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
+msgid "Delete Note_book"
+msgstr "Eliminar cua_derno de notas"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
+msgid "Delete the selected notebook"
+msgstr "Eliminar el cuaderno de notas seleccionado"
+
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
+#: ../Tomboy/RecentChanges.cs:276
+msgid "Notebooks"
+msgstr "Cuadernos de notas"
+
+#. The templateNoteTite should show the name of the
+#. notebook. For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template". Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "Plantilla del cuaderno de notas de {0}"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nota nueva"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Todas las notas"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
+msgid "Really delete this notebook?"
+msgstr "¿Desea eliminar este cuaderno de notas?"
+
+#: ../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 ""
+"Las notas que pertenecen a este cuaderno de notas no se eliminarán, pero ya "
+"no estarán asociadas a este cuaderno de notas. Esta acción no se puede "
+"deshacer."
+
+#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
+msgid "No notebook"
+msgstr "Sin cuadernos de notas"
+
+#. Translators should preserve the "{0}" in the following
+#. string. After being formatted for a notebook named,
+#. "Meetings", for example, the resultant string would be:
+#. New "Meetings" Note
+#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
+#, csharp-format
+msgid "New \"{0}\" Note"
+msgstr "Nota nueva de «{0}»"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
+msgid "Place this note into a notebook"
+msgstr "Meter esta nota en un cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
+msgid "Notebook"
+msgstr "Cuaderno de notas"
+
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
+msgid "_New notebook..."
+msgstr "Cuaderno de _notas nuevo…"
+
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Nota nueva {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "¿Quiere eliminar «{0}»?"
+
+#: ../Tomboy/Note.cs:1610
+#, csharp-format
+msgid "Really delete this {0} note?"
+msgid_plural "Really delete these {0} notes?"
+msgstr[0] "¿Desea eliminar esta nota?"
+msgstr[1] "¿Desea eliminar estas {0} notas?"
+
+#: ../Tomboy/Note.cs:1621
+msgid "If you delete a note it is permanently lost."
+msgstr "Si borra esta nota se perderá permanentemente."
+
+#: ../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 ""
+"Ocurrió un error al guardar sus notas. Compruebe que tiene suficiente "
+"espacio en disco y que tiene los permisos apropiados en {0}. Puede encontrar "
+"detalles sobre el error en {1}."
+
+#: ../Tomboy/Note.cs:1671
+msgid "Error saving note data."
+msgstr "Error al guardar los datos de la nota"
+
+#. New Note Template
+#. Translators: This is 'New Note' Template, not New 'Note Template'
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
+msgid "New Note Template"
+msgstr "Plantilla de Nota nueva"
+
+#. Create migration notification note
+#. Translators: The title of the data migration note
+#: ../Tomboy/NoteManager.cs:147
+msgid "Your Notes Have Moved!"
+msgstr "Sus notas se han movido"
+
+#. 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
+#, 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"
+"\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"
+"\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 ""
+"En la última versión de Tomboy se han movido sus archivos de notas. "
+"Probablemente nunca le ha importado dónde se guardan sus notas y, si todavía "
+"no le importa, siga adelante y <bold>borre esta nota</bold>.\n"
+"\n"
+"Su antigua carpeta de notas está sana y salva en <link:url>{0}</link:url>. "
+"Si vuelve a una versión anterior de Tomboy, éste buscará las notas ahí.\n"
+"\n"
+"Pero se han copiado sus notas y su configuración en las carpetas nuevas que "
+"serán las que se usen a partir de ahora, en:\n"
+"\n"
+"<list><list-item dir=\"ltr\">Las notas las puede encontrar en <link:url>{1}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">La configuración está en <link:url>{2}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">Puede instalar complementos en <link:url>"
+"{3}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Los archivos de registro se pueden "
+"encontrar en <link:url>{4}</link:url></list-item></list>\n"
+"\n"
+"Hasta luego."
+
+#: ../Tomboy/NoteManager.cs:265
+msgid ""
+"<note-content>Start Here\n"
+"\n"
+"<bold>Welcome to Tomboy!</bold>\n"
+"\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"
+"\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>"
+msgstr ""
+"<note-content>Comenzar aquí\n"
+"\n"
+"<bold>Bienvenido a Tomboy</bold>\n"
+"\n"
+"Use esta nota «Comenzar aquí» para empezar a organizar sus ideas y "
+"pensamientos.\n"
+"\n"
+"Puede crear nuevas notas para mantener sus ideas seleccionando el elemento "
+"«Crear nota nueva» del menú de Tomboy en el panel de GNOME. Su nota se "
+"guardará automáticamente.\n"
+"\n"
+"Después organice las notas que cree enlazando las notas relacionadas y sus "
+"ideas de una forma conjunta.\n"
+"\n"
+"Hemos creado una nota llamada <link:internal>Usando enlaces en Tomboy</link:"
+"internal>. ¿Se ha dado cuenta de que cada vez que escribimos <link:"
+"internal>Usando enlaces en Tomboy</link:internal> automáticamente aparece "
+"subrayado? Pulse en el enlace para abrir la nota.</note-content>"
+
+#: ../Tomboy/NoteManager.cs:284
+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"
+"\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>"
+msgstr ""
+"<note-content>Usando enlaces en Tomboy\n"
+"\n"
+"Las notas en Tomboy se pueden enlazar subrayando el texto en la nota actual "
+"y pulsando el botón <bold>Enlazar</bold> en la barra de herramientas. Al "
+"hacerlo se creará una nueva nota así como subrayar el título de la nueva "
+"nota en la nota actual.\n"
+"\n"
+"Cambiar el título de una nota hará que se actualicen los enlaces presentes "
+"en otras notas. Esto previene que aparezcan enlaces rotos cuando se renombra "
+"una nota.\n"
+"\n"
+"Además, si escribe el nombre de otra nota en su nota actual, se enlazará "
+"automáticamente.</note-content>"
+
+#. Attempt to find an existing Start Here note
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
+msgid "Start Here"
+msgstr "Comenzar aquí"
+
+#: ../Tomboy/NoteManager.cs:304
+msgid "Using Links in Tomboy"
+msgstr "Usando los enlaces en Tomboy"
+
+#. Use a simple "Describe..." body and highlight
+#. it so it can be easily overwritten
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
+msgid "Describe your new note here."
+msgstr "Describa aquí su nota nueva."
+
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "¿Renombrar los enlaces de la nota?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "Renom_brar enlaces"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "_No renombrar enlaces"
+
+#: ../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"
+"\n"
+"If you do not rename the links, they will no longer link to anything."
+msgstr ""
+"Renombrar enlaces en otras notas de «<span underline=\"single\">{0}</span>» a "
+"«<span underline=\"single\">{1}</span>»?\n"
+"\n"
+"Si no renombra los enlaces, no apuntarán a nada."
+
+#: ../Tomboy/NoteRenameDialog.cs:83
+msgid "Rename Links"
+msgstr "Renombrar enlaces"
+
+#: ../Tomboy/NoteRenameDialog.cs:95
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "Título de la nota"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:118
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:127
+msgid "Select None"
+msgstr "No seleccionar nada"
+
+#: ../Tomboy/NoteRenameDialog.cs:144
+msgid "Ad_vanced"
+msgstr "A_vanzado"
+
+#: ../Tomboy/NoteRenameDialog.cs:147
+msgid "Always show this _window"
+msgstr "Mostrar siempre esta _ventana"
+
+#: ../Tomboy/NoteRenameDialog.cs:155
+msgid "Never rename _links"
+msgstr "No renombrar nunca _enlaces"
+
+#: ../Tomboy/NoteRenameDialog.cs:163
+msgid "Alwa_ys rename links"
+msgstr "Siempre renombrar en_laces"
+
+#: ../Tomboy/NoteWindow.cs:59
+msgid "Find in This Note"
+msgstr "Buscar en esta nota"
+
+#: ../Tomboy/NoteWindow.cs:366
+msgid "_Link to New Note"
+msgstr "_Enlazar a una nota nueva"
+
+#: ../Tomboy/NoteWindow.cs:378
+msgid "Te_xt"
+msgstr "_Texto"
+
+#: ../Tomboy/NoteWindow.cs:386
+msgid "_Find in This Note"
+msgstr "_Buscar en esta nota"
+
+#: ../Tomboy/NoteWindow.cs:401
+msgid "Clos_e All Notes"
+msgstr "C_errar todas las notas"
+
+#: ../Tomboy/NoteWindow.cs:441
+msgid "Search"
+msgstr "Buscar"
+
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Buscar sus notas"
+
+#: ../Tomboy/NoteWindow.cs:457
+msgid "Link"
+msgstr "Enlazar"
+
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Enlazar el texto seleccionado a una nota nueva"
+
+#: ../Tomboy/NoteWindow.cs:477
+msgid "_Text"
+msgstr "_Texto"
+
+#: ../Tomboy/NoteWindow.cs:482
+msgid "Set properties of text"
+msgstr "Establecer las propiedades del texto"
+
+#: ../Tomboy/NoteWindow.cs:487
+msgid "T_ools"
+msgstr "_Herramientas"
+
+#: ../Tomboy/NoteWindow.cs:491
+msgid "Use tools on this note"
+msgstr "Usar las herramientas en esta nota"
+
+#: ../Tomboy/NoteWindow.cs:499
+msgid "Delete this note"
+msgstr "Eliminar esta nota"
+
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
+msgid "Synchronize Notes"
+msgstr "Sincronizar las notas"
+
+#: ../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 ""
+"Esta nota es una plantilla de nota. Determina el contenido predeterminado de "
+"las notas normales y no se mostrará en el menú de notas o la ventana de "
+"búsqueda."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Convertir en una nota normal"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Guardar tama_ño"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Guardar se_lección"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Guardar _título"
+
+#: ../Tomboy/NoteWindow.cs:639
+msgid "_Find..."
+msgstr "_Buscar…"
+
+#: ../Tomboy/NoteWindow.cs:650
+msgid "Find _Next"
+msgstr "Buscar _siguiente"
+
+#: ../Tomboy/NoteWindow.cs:663
+msgid "Find _Previous"
+msgstr "Buscar _anterior"
+
+#: ../Tomboy/NoteWindow.cs:751
+msgid "Cannot create note"
+msgstr "No se puede crear la nota"
+
+#: ../Tomboy/NoteWindow.cs:832
+msgid "_Find:"
+msgstr "_Buscar:"
+
+#: ../Tomboy/NoteWindow.cs:843
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../Tomboy/NoteWindow.cs:852
+msgid "_Next"
+msgstr "_Siguiente"
+
+#: ../Tomboy/NoteWindow.cs:1335
+msgid "_Bold"
+msgstr "_Negrita"
+
+#: ../Tomboy/NoteWindow.cs:1347
+msgid "_Italic"
+msgstr "_Cursiva"
+
+#: ../Tomboy/NoteWindow.cs:1359
+msgid "_Strikeout"
+msgstr "_Tachado"
+
+#: ../Tomboy/NoteWindow.cs:1371
+msgid "_Highlight"
+msgstr "_Resaltado"
+
+#: ../Tomboy/NoteWindow.cs:1384
+msgid "Font Size"
+msgstr "Tamaño de la tipografía"
+
+#: ../Tomboy/NoteWindow.cs:1387
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../Tomboy/NoteWindow.cs:1404
+msgid "Hu_ge"
+msgstr "_Enorme"
+
+#: ../Tomboy/NoteWindow.cs:1412
+msgid "_Large"
+msgstr "_Grande"
+
+#: ../Tomboy/NoteWindow.cs:1420
+msgid "S_mall"
+msgstr "_Pequeña"
+
+#: ../Tomboy/NoteWindow.cs:1429
+msgid "Increase Font Size"
+msgstr "Aumentar el tamaño de la tipografía"
+
+#: ../Tomboy/NoteWindow.cs:1447
+msgid "Decrease Font Size"
+msgstr "Reducir el tamaño de la tipografía"
+
+#: ../Tomboy/NoteWindow.cs:1467
+msgid "Bullets"
+msgstr "Topos"
+
+#: ../Tomboy/PreferencesDialog.cs:81
+msgid "Editing"
+msgstr "Edición"
+
+#: ../Tomboy/PreferencesDialog.cs:84
+msgid "Hotkeys"
+msgstr "Teclas rápidas"
+
+#: ../Tomboy/PreferencesDialog.cs:86
+msgid "Synchronization"
+msgstr "Sincronización"
+
+#: ../Tomboy/PreferencesDialog.cs:88
+msgid "Add-ins"
+msgstr "Complementos"
+
+#: ../Tomboy/PreferencesDialog.cs:174
+msgid "_Spell check while typing"
+msgstr "Corrección _ortográfica al escribir"
+
+#: ../Tomboy/PreferencesDialog.cs:183
+msgid ""
+"Misspellings will be underlined in red, with correct spelling suggestions "
+"shown in the context menu."
+msgstr ""
+"Si está activado, las faltas de ortografía se subrayarán en rojo, mostrando "
+"las sugerencias de corrección en el menú contextual."
+
+#. WikiWords...
+#: ../Tomboy/PreferencesDialog.cs:194
+msgid "Highlight _WikiWords"
+msgstr "Resaltar _wikipalabras"
+
+#: ../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 ""
+"Activar esta opción para resaltar palabras <b>QueSeVenAsí</b>. Al pulsar en "
+"la palabra se creará una nota con ese nombre."
+
+#. Auto bulleted list
+#: ../Tomboy/PreferencesDialog.cs:209
+msgid "Enable auto-_bulleted lists"
+msgstr "Activar listas de _topos automáticos"
+
+#: ../Tomboy/PreferencesDialog.cs:218
+msgid "Use custom _font"
+msgstr "Usar tipogra_fía personalizada"
+
+#: ../Tomboy/PreferencesDialog.cs:236
+msgid "When renaming a linked note: "
+msgstr "Al renombrar una nota enlazada: "
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Ask me what to do"
+msgstr "Preguntarme qué hacer"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Never rename links"
+msgstr "No renombrar nunca los enlaces"
+
+#: ../Tomboy/PreferencesDialog.cs:241
+msgid "Always rename links"
+msgstr "Siempre renombrar los enlaces"
+
+#: ../Tomboy/PreferencesDialog.cs:261
+msgid ""
+"Use the new note template to specify the text that should be used when "
+"creating a new note."
+msgstr ""
+"Use la plantilla de la nota nueva para especificar el texto que se debe usar "
+"al crear una nota nueva."
+
+#: ../Tomboy/PreferencesDialog.cs:270
+msgid "Open New Note Template"
+msgstr "Abrir la plantilla Nota nueva"
+
+#. Hotkeys...
+#: ../Tomboy/PreferencesDialog.cs:327
+msgid "Listen for _Hotkeys"
+msgstr "_Escuchar las teclas rápidas"
+
+#: ../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 ""
+"Las teclas rápidas le permiten acceder rápidamente a sus notas desde "
+"cualquier parte con una pulsación de tecla. Ejemplo de teclas rápidas: "
+"<b><Control><Mayús>F11</b>, <b><Alt>N</b>"
+
+#. Show notes menu keybinding...
+#: ../Tomboy/PreferencesDialog.cs:356
+msgid "Show notes _menu"
+msgstr "Mostrar el _menú de notas"
+
+#. Open Start Here keybinding...
+#: ../Tomboy/PreferencesDialog.cs:373
+msgid "Open \"_Start Here\""
+msgstr "Abrir «Comen_zar aquí»"
+
+#. Create new note keybinding...
+#: ../Tomboy/PreferencesDialog.cs:390
+msgid "Create _new note"
+msgstr "Crear una nota _nueva"
+
+#. Open Search All Notes window keybinding...
+#: ../Tomboy/PreferencesDialog.cs:407
+msgid "Open \"Search _All Notes\""
+msgstr "Abrir «Buscar en _todas las notas»"
+
+#: ../Tomboy/PreferencesDialog.cs:434
+msgid "Ser_vice:"
+msgstr "_Servicio:"
+
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
+msgid "Not configurable"
+msgstr "No configurable"
+
+#: ../Tomboy/PreferencesDialog.cs:513
+msgid "Automaticall_y Sync in Background Every"
+msgstr "Sin_cronizar automáticamente en segundo plano cada"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:519
+msgid "Minutes"
+msgstr "Minutos"
+
+#. "Advanced..." button to bring up extra sync config dialog
+#: ../Tomboy/PreferencesDialog.cs:541
+msgid "_Advanced..."
+msgstr "_Avanzado…"
+
+#: ../Tomboy/PreferencesDialog.cs:602
+msgid "The following add-ins are installed"
+msgstr "Los siguientes complementos están instalados actualmente"
+
+#: ../Tomboy/PreferencesDialog.cs:623
+msgid "Get More Add-Ins..."
+msgstr "Obtener más complementos…"
+
+#: ../Tomboy/PreferencesDialog.cs:641
+msgid "_Enable"
+msgstr "_Activar"
+
+#: ../Tomboy/PreferencesDialog.cs:647
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../Tomboy/PreferencesDialog.cs:778
+msgid "Not Implemented"
+msgstr "No implementado"
+
+#: ../Tomboy/PreferencesDialog.cs:792
+#, csharp-format
+msgid "{0} Preferences"
+msgstr "{0} Preferencias"
+
+#: ../Tomboy/PreferencesDialog.cs:931
+msgid "Choose Note Font"
+msgstr "Elegir la tipografía de la nota"
+
+#: ../Tomboy/PreferencesDialog.cs:975
+msgid "Other Synchronization Options"
+msgstr "Otras opciones de sincronización"
+
+#: ../Tomboy/PreferencesDialog.cs:981
+msgid ""
+"When a conflict is detected between a local note and a note on the "
+"configured synchronization server:"
+msgstr ""
+"Cuando se detecta un conflicto entre una nota local y una nota en el "
+"servidor de sincronización configurado:"
+
+#: ../Tomboy/PreferencesDialog.cs:988
+msgid "Always ask me what to do."
+msgstr "Preguntarme siempre qué hacer."
+
+#: ../Tomboy/PreferencesDialog.cs:992
+msgid "Rename my local note."
+msgstr "Renombrar mi nota local."
+
+#: ../Tomboy/PreferencesDialog.cs:996
+msgid "Replace my local note with the server's update."
+msgstr "Reemplazar mi nota local con la actualización del servidor."
+
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
+
+#: ../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 ""
+"No se recomienda limpiar sus ajustes de sincronización. Quizá se vea forzado "
+"a sincronizar todas sus notas de nuevo cuando guarde los nuevos ajustes."
+
+#: ../Tomboy/PreferencesDialog.cs:1157
+msgid "Resetting Synchronization Settings"
+msgstr "Reiniciando los ajustes de sincronización"
+
+#: ../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 ""
+"Ha desactivado el servicio de sincronización configurado. Sus ajustes de "
+"sincronización se limpiarán. Quizá se vea forzado a sincronizar todas sus "
+"notas de nuevo cuando guarde los ajustes nuevos."
+
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Conectado correctamente"
+
+#: ../Tomboy/PreferencesDialog.cs:1239
+msgid ""
+"Tomboy is ready to synchronize your notes. Would you like to synchronize "
+"them now?"
+msgstr ""
+"Tomboy está preparado para sincronizar sus notas. ¿Quiere sincronizarlas "
+"ahora?"
+
+#: ../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 ""
+"Compruebe su información e inténtelo de nuevo. El archivo {0} puede contener "
+"información útil sobre el error."
+
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Error al conectar"
+
+#: ../Tomboy/PreferencesDialog.cs:1357
+msgid "Version:"
+msgstr "Versión:"
+
+#: ../Tomboy/PreferencesDialog.cs:1364
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../Tomboy/PreferencesDialog.cs:1371
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: ../Tomboy/PreferencesDialog.cs:1377
+msgid "Add-in Dependencies:"
+msgstr "Dependencias de los complementos:"
+
+#: ../Tomboy/RecentChanges.cs:100
+msgid "_Search:"
+msgstr "_Buscar:"
+
+#: ../Tomboy/RecentChanges.cs:350
+msgid "Note"
+msgstr "Nota"
+
+#: ../Tomboy/RecentChanges.cs:373
+msgid "Last Changed"
+msgstr "Último cambio"
+
+#: ../Tomboy/RecentChanges.cs:512
+msgid "Matches"
+msgstr "Coincidencias"
+
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Coincidir con el título"
+
+#: ../Tomboy/RecentChanges.cs:566
+#, csharp-format
+msgid "{0} match"
+msgid_plural "{0} matches"
+msgstr[0] "{0} coincidencia"
+msgstr[1] "{0} coincidencias"
+
+#: ../Tomboy/RecentChanges.cs:580
+#, csharp-format
+msgid "Total: {0} note"
+msgid_plural "Total: {0} notes"
+msgstr[0] "Total: {0} nota"
+msgstr[1] "Total: {0} notas"
+
+#: ../Tomboy/RecentChanges.cs:591
+#, csharp-format
+msgid "Matches: {0} note"
+msgid_plural "Matches: {0} notes"
+msgstr[0] "Coincide con: {0} nota"
+msgstr[1] "Coincide con: {0} notas"
+
+#: ../Tomboy/RecentChanges.cs:603
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"No se han encontrado resultados en el cuaderno de notas seleccionado.\n"
+"Pulse aquí para buscar en todas las notas."
+
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Pulse aquí para buscar en todos los cuadernos de notas"
+
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "Notas"
+
+#: ../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 ""
+"Su equipo no soporta este complemento de sincronización. Asegúrese de que "
+"tiene FUSE instalado y {0} correctamente instalado y configurado."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "No se pudo leer el archivo de prueba."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
+msgid "Write test failed."
+msgstr "Falló la prueba de escritura."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:176
+msgid "Timeout connecting to server."
+msgstr "Expiró el tiempo de conexión con el servidor."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:184
+msgid "Error connecting to server."
+msgstr "Error al conectar con el servidor."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:198
+msgid "FUSE could not be enabled."
+msgstr "No se pudo activar FUSE."
+
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "Ocurrió un error al conectar con el servidor especificado:"
+
+#. Expander containing TreeView
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
+msgid "Details"
+msgstr "Detalles"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
+msgid "Status"
+msgstr "Estado"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
+msgid "Acquiring sync lock..."
+msgstr "Adquiriendo bloqueo de sincronización…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
+msgid "Committing changes..."
+msgstr "Efectuando los cambios…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
+msgid "Synchronizing Notes"
+msgstr "Sincronizar las notas"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
+msgid "Synchronizing your notes..."
+msgstr "Sincronizando sus notas…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
+msgid "This may take a while, kick back and enjoy!"
+msgstr ""
+"Esto puede llevar un rato así que puede hacer otras cosas mientras tanto."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
+msgid "Connecting to the server..."
+msgstr "Conectando al servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
+msgid "Deleting notes off of the server..."
+msgstr "Borrando notas del servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
+msgid "Downloading new/updated notes..."
+msgstr "Descargando notas nuevas/actualizadas…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
+msgid "Server Locked"
+msgstr "Servidor bloqueado"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
+msgid "Server is locked"
+msgstr "El servidor está bloqueado"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:270
+msgid ""
+"One of your other computers is currently synchronizing. Please wait 2 "
+"minutes and try again."
+msgstr ""
+"Uno de sus equipos está actualmente sincronizando. Espere 2 minutos e "
+"inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
+msgid "Preparing to download updates from server..."
+msgstr "Preparándose para descargar las actualizaciones del servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
+msgid "Preparing to upload updates to server..."
+msgstr "Preparándose para subir las actualizaciones al servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
+msgid "Uploading notes to server..."
+msgstr "Subiendo notas al servidor…"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
+msgid "Synchronization Failed"
+msgstr "Falló la sincronización"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
+msgid "Failed to synchronize"
+msgstr "Falló al sincronizar"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
+msgid "Could not synchronize notes. Check the details below and try again."
+msgstr ""
+"No se pudieron sincronizar las notas. Compruebe los detalles de abajo e "
+"inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
+msgid "Synchronization Complete"
+msgstr "Sincronización completada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
+msgid "Synchronization is complete"
+msgstr "Sincronización completada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
+#, csharp-format
+msgid "{0} note updated."
+msgid_plural "{0} notes updated."
+msgstr[0] "{0} nota actualizada."
+msgstr[1] "{0} notas actualizadas."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
+msgid "Your notes are now up to date."
+msgstr "Ahora sus notas están actualizadas."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
+msgid "Synchronization Canceled"
+msgstr "Se canceló la sincronización"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
+msgid "Synchronization was canceled"
+msgstr "Se canceló la sincronización"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
+msgid "You canceled the synchronization. You may close the window now."
+msgstr "Canceló la sincronización. Debería cerrar la ventana ahora."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
+msgid "Synchronization Not Configured"
+msgstr "La sincronización no está configurada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
+msgid "Synchronization is not configured"
+msgstr "La sincronización no está configurada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
+msgid "Please configure synchronization in the preferences dialog."
+msgstr "Configure la sincronización en el diálogo de preferencias."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
+msgid "Synchronization Service Error"
+msgstr "Error de sincronización en el servicio"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
+msgid "Service error"
+msgstr "Error del servicio"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
+msgid "Error connecting to the synchronization service. Please try again."
+msgstr ""
+"Error al conectar con el servicio de sincronización. Inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
+msgid "Deleted locally"
+msgstr "Se borró la copia local"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
+msgid "Deleted from server"
+msgstr "Borradas del servidor"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
+msgid "Updated"
+msgstr "Actualizada"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
+msgid "Added"
+msgstr "Añadida"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
+msgid "Uploaded changes to server"
+msgstr "Se subieron al servidor los cambios"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
+msgid "Uploaded new note to server"
+msgstr "Se subió la nota nueva al servidor"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
+msgid "Note Conflict"
+msgstr "Conflicto entre notas"
+
+#. Suggest renaming note by appending " (old)" to the existing title
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
+msgid " (old)"
+msgstr "(vieja)"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
+msgid "Rename local note:"
+msgstr "Renombrar la nota local:"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
+msgid "Update links in referencing notes"
+msgstr "Actualizar los enlaces en las notas referenciadas"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
+msgid "Overwrite local note"
+msgstr "Sobreescribir la nota local"
+
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
+msgid "Always perform this action"
+msgstr "Siempre realizar esta acción"
+
+#. Set initial dialog text
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
+msgid "Note conflict detected"
+msgstr "Se detectó un conflicto en las notas"
+
+#: ../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 ""
+"La versión del servidor «{0}» está en conflicto con su nota local. ¿Qué "
+"quiere hacer con su nota local?"
+
+#: ../Tomboy/Synchronization/SyncUtils.cs:119
+#: ../Tomboy/Synchronization/SyncUtils.cs:163
+msgid "Could not enable FUSE"
+msgstr "No se pudo activar 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 ""
+"No se pudo cargar el módulo FUSE. Compruebe que está instalado correctamete "
+"e inténtelo de nuevo."
+
+#: ../Tomboy/Synchronization/SyncUtils.cs:135
+msgid "Enable FUSE?"
+msgstr "¿Activar FUSE?"
+
+#. TODO: This message isn't entirely accurate.
+#. We should fix it.
+#: ../Tomboy/Synchronization/SyncUtils.cs:139
+msgid ""
+"The synchronization you've chosen requires the FUSE module to be loaded.\n"
+"\n"
+"To avoid getting this prompt in the future, you should load FUSE at "
+"startup. Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to /"
+"etc/modules."
+msgstr ""
+"La sincronización que ha elegido requiere cargar el módulo FUSE.\n"
+"\n"
+"Para evitar que se le muestre este mensaje en el futuro, debería cargar FUSE "
+"al inicio. Añada \"modprobe fuse\" a /etc/init.d/boot.local o \"fuse\" a /"
+"etc/modules."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "No se puede crear una nota nueva"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Desarrollo inicial:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Colaboradores:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr ""
+"Daniel Mustieles <daniel.mustieles at gmail.com>, 2009\n"
+"Jorge González <jorgegonz at svn.gnome.org>, 2004-2009"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Otros\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr ""
+"Una aplicación simple y fácil de usar para tomar notas en el escritorio."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Página web"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Una aplicación simple y fácil de usar para tomar notas en el "
+"escritorio.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Otros\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+" --version\t\t\tPrint version information.\n"
+" --help\t\t\tPrint this usage message.\n"
+" --note-path [path]\t\tLoad/store note data in this directory.\n"
+" --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Uso:\n"
+" --version\t\t\tMuestra información de la versión.\n"
+" --help\t\t\tMuestra este mensaje de uso.\n"
+" --note-path [ruta]\t\tCargar/almacenar los datos de las notas en esta "
+"carpeta.\n"
+" --search [texto]\t\tAbre la ventana de búsqueda de todas las notas con el "
+"texto buscado.\n"
+
+#: ../Tomboy/Tomboy.cs:578
+msgid ""
+" --new-note\t\t\tCreate and display a new note.\n"
+" --new-note [title]\t\tCreate and display a new note, with a title.\n"
+" --open-note [title/url]\tDisplay the existing note matching title.\n"
+" --start-here\t\t\tDisplay the 'Start Here' note.\n"
+" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+" --new-note\t\t\tCrea y muestra una nota\n"
+" --new-note [título]\t\tCrea y muestra una nota, con un título\n"
+" --open-note [título/url]\tMuestra la nota existente que coincida con el "
+"título\n"
+" --start-here\t\t\tMuestra la nota «Comenzar aquí»\n"
+" --highlight-search [texto]\tBuscar y resaltar texto coincidente en la nota "
+"abierta\n"
+
+#: ../Tomboy/Tomboy.cs:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versión {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (nueva)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "Acerca _de Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid ""
+"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
+"installation has been completed successfully."
+msgstr ""
+"No se pudo encontrar el «Manual de Tomboy Notas». Compruebe que su "
+"instalación terminó con éxito."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "No se encontró la ayuda"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "No se puede abrir la dirección"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Hoy, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Hoy"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Ayer, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Ayer"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "Hace {0} día, {1}"
+msgstr[1] "Hace {0} días, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "Hace {0} día"
+msgstr[1] "Hace {0} días"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Mañana, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Dentro de {0} día, {1}"
+msgstr[1] "Dentro de {0} días, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Dentro de {0} día"
+msgstr[1] "Dentro de {0} días"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "d MMMM, HH:mm"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "d MMMM"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Sin fecha"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "d MMMM yyyy, HH:mm"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "d MMMM yyyy"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Sin título {0})"
+
+#: ../Tomboy/Watchers.cs:189
+#, csharp-format
+msgid ""
+"A note with the title <b>{0}</b> already exists. Please choose another name "
+"for this note before continuing."
+msgstr ""
+"Ya existe una nota con el título <b>{0}</b>. Por favor, escoja otro nombre "
+"para esta nota antes de continuar."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "El título de la nota ya existe"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Copiar la dirección del enlace"
+
+#: ../Tomboy/Watchers.cs:592
+msgid "_Open Link"
+msgstr "_Abrir enlace"
+
+#~ msgid "Really delete this note?"
+#~ msgstr "¿Desea eliminar esta nota?"
+
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "Exportar al último directorio usado en formato HTML"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "Buscar en sus notas (Ctrl-Mayús-F)"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "Está conectado."
+
+#~ msgid "_Browse..."
+#~ msgstr "_Examinar…"
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "Control remoto de D-BUS desactivado.\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: opción no válida «{0}»\n"
+#~ "Pruebe 'tomboy --help' para más información.\n"
+#~ "Control remoto de D-BUS desactivado."
+
+#~ msgid "Click Here After Authorizing"
+#~ msgstr "Pulse aquí después de autorizar"
+
+#~ msgid "Processing..."
+#~ msgstr "Procesando…"
+
+#~ msgid "_Connect to Server"
+#~ msgstr "_Conectar con el servidor"
+
+#~ msgid "C_ase Sensitive"
+#~ msgstr "Sensible a _mayúsculas"
+
+#~ msgid "Really delete these notes?"
+#~ msgstr "¿Desea borrar estas notas?"
+
+#~ msgid "Preparing pages..."
+#~ msgstr "Preparando las páginas…"
+
+#~ msgid "Rendering page %d of %d..."
+#~ msgstr "Renderizando página %d de %d…"
+
+#~ msgid "Printing page %d of %d..."
+#~ msgstr "Imprimiendo página %d de %d…"
+
+#~ msgid "Print preview"
+#~ msgstr "Vista previa de impresión"
+
+#~ msgid "%A %x, %X"
+#~ msgstr "%A %x, %X"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Configuration options for the print job"
+#~ msgstr "Opciones de configuración para el trabajo de impresión"
+
+#~ msgid "Source Buffer"
+#~ msgstr "Búfer del fuente"
+
+#~ msgid "GtkTextBuffer object to print"
+#~ msgstr "Objeto GtkTextBuffer que imprimir"
+
+#~ msgid "Tabs Width"
+#~ msgstr "Ancho de tabulación"
+
+#~ msgid "Width in equivalent space characters of tabs"
+#~ msgstr "Anchura en espacios equivalentes para los tabuladores"
+
+#~ msgid "Wrap Mode"
+#~ msgstr "Modo de ajuste"
+
+#~ msgid "Word wrapping mode"
+#~ msgstr "Modo de ajuste de palabras"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltado"
+
+#~ msgid "Whether to print the document with highlighted syntax"
+#~ msgstr "Indica si se imprime el documento con resaltado de sintaxis"
+
+#~ msgid "Font"
+#~ msgstr "Tipografía"
+
+#~ msgid "GnomeFont name to use for the document text (deprecated)"
+#~ msgstr "Nombre GnomeFont para usar en el texto del documento (obsoleto)"
+
+#~ msgid "Font Description"
+#~ msgstr "Descripción de la tipografía"
+
+#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+#~ msgstr ""
+#~ "Tipografía que se va a usar en el texto del documento (Ej: «Monospace 10»)"
+
+#~ msgid "Numbers Font"
+#~ msgstr "Tipografía para los números"
+
+#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
+#~ msgstr "Nombre GnomeFont para usar en los números de línea (obsoleto)"
+
+#~ msgid "Font description to use for the line numbers"
+#~ msgstr "Descripción de la tipografía a usar en los números de línea"
+
+#~ msgid "Print Line Numbers"
+#~ msgstr "Imprimir números de línea"
+
+#~ msgid "Interval of printed line numbers (0 means no numbers)"
+#~ msgstr ""
+#~ "Intervalo de impresión de números de líneas (0 significa sin números)"
+
+#~ msgid "Print Header"
+#~ msgstr "Imprimir cabecera"
+
+#~ msgid "Whether to print a header in each page"
+#~ msgstr "Indica si se imprimirá una cabecera en cada página"
+
+#~ msgid "Print Footer"
+#~ msgstr "Imprimir pie de página"
+
+#~ msgid "Whether to print a footer in each page"
+#~ msgstr "Indica si se imprimirá un pie de página en cada página"
+
+#~ msgid "Header and Footer Font"
+#~ msgstr "Tipografía de cabecera y pie de página"
+
+#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
+#~ msgstr ""
+#~ "Nombre GnomeFont a usar para la cabecera y el pie de página (obsoleto)"
+
+#~ msgid "Header and Footer Font Description"
+#~ msgstr "Descripción de la tipografía de cabecera y pie de página"
+
+#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
+#~ msgstr ""
+#~ "Tipografía que se va a usar para las cabeceras y el pie de página (Ej: "
+#~ "«Monospace 10»)"
+
+#~ msgid "Add-in"
+#~ msgstr "Complemento"
+
+#~ msgid "Version"
+#~ msgstr "Versión"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
diff --git a/po/fi.po b/po/fi.po
index 86ad979..1a5837e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-20 08:37+0300\n"
-"PO-Revision-Date: 2011-07-19 23:57+0300\n"
+"POT-Creation-Date: 2011-08-30 23:18+0300\n"
+"PO-Revision-Date: 2011-08-30 23:20+0300\n"
"Last-Translator: Tommi Vainikainen <thv at iki.fi>\n"
"Language-Team: Finnish <gnome-fi-laatu at lists.sourceforge.net>\n"
"Language: fi\n"
@@ -639,7 +639,6 @@ msgstr "_Poista"
msgid "Delete the selected note"
msgstr "Poista valittu muistilappu"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
msgid "_Close"
msgstr "_Sulje"
@@ -683,7 +682,6 @@ msgstr "Ilmoitusalueen kuvake"
msgid "Create _New Note"
msgstr "Luo _uusi muistilappu"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
msgid "_Search All Notes"
msgstr "Et_si kaikista muistilapuista"
@@ -821,16 +819,13 @@ msgstr "_Kansion polku:"
msgid "Select Synchronization Folder..."
msgstr "Valitse synkronisointikansio…"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
msgid "Folder path field is empty."
msgstr "Kansion polku -kenttä on tyhjä."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "Annettua kansion polkua ei löydy ja tomboy ei voinut luoda sitä."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
msgid "Local Folder"
msgstr "Paikallinen kansio"
@@ -931,22 +926,17 @@ msgstr "Poista rikkinäiset linkit"
msgid "Add a sketch"
msgstr "Lisää luonnos"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "_Palvelin:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
msgid "User_name:"
msgstr "_Käyttäjätunnus:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
msgid "_Folder Path (optional):"
msgstr "_Kansion polku (valinnainen):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
msgid ""
"SSH synchronization requires an existing SSH key for this server and user, "
"added to a running SSH daemon."
@@ -954,15 +944,12 @@ msgstr ""
"SSH-synkronointi vaatii olemassa olevan SSH-avaimen palvelimelle ja "
"käyttäjälle ja että avain on lisätty avainrenkaaseen."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
msgid "Server or username field is empty."
msgstr "Palvelin tai käyttäjätunnus on tyhjä."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
msgid ""
"Timeout connecting to server. Please ensure that your SSH key has been added "
"to a running SSH daemon."
@@ -1023,23 +1010,18 @@ msgstr "--- Tasque ei ole käynnissä ---"
msgid "_Underline"
msgstr "_Alleviivaus"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
msgid "_URL:"
msgstr "_URL:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
msgid "_Password:"
msgstr "_Salasana:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
msgid "URL, username, or password field is empty."
msgstr "URL, käyttäjätunnus tai salasana on tyhjä."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
msgid ""
"There was an error connecting to the server. This may be caused by using an "
"incorrect user name and/or password."
@@ -1052,7 +1034,6 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr ""
@@ -1060,7 +1041,6 @@ msgstr ""
"virheviestin kera:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
msgid "Connect to Server"
msgstr "Yhdistä palvelimeen"
@@ -1069,23 +1049,17 @@ msgid "Connected"
msgstr "Yhdistetty"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
msgid "Server not responding. Try again later."
msgstr "Palvelin ei vastaa. Yritä myöhemmin uudelleen."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
msgid "Authorization Failed, Try Again"
msgstr "Valtuutus epäonnistu, yritä uudelleen"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
msgid "Tomboy Web Authorization Successful"
msgstr "Tomboy-www-todennus onnistui"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
@@ -1093,18 +1067,14 @@ msgstr ""
"Palaa nyt Tomboyn asetusikkunaan ja napsauta Tallenna aloittaaksesi "
"synkronoinnin"
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
msgid "Connected. Press Save to start synchronizing"
msgstr "Yhdistetty. Napsauta Tallenna aloittaaksesi synkronoinnin"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Todennetaan selaimessa (Paina resetoidaksesi yhteyden)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
msgid "Set the default browser and try again"
msgstr "Aseta oletusselain ja yritä uudelleen"
@@ -1182,7 +1152,6 @@ msgid "Unknown error."
msgstr "Tuntematon virhe."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
msgid "Unfiled Notes"
msgstr "Järjestämättömät muistilaput"
@@ -1200,9 +1169,9 @@ msgstr "Muistilaput vietiin onnistuneesti"
msgid "Could not save the files in \"{0}\""
msgstr "Tiedostoja ei voitu tallentaa kansioon ”{0}”"
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
+#. Translators: {0} is the export type, e.g. HTML
#, csharp-format
-msgid "Create destination folder for {0} Export"
+msgid "Create destination folder for {0} export"
msgstr "Luo kohdekansio {0}-vientiä varten"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
@@ -1313,15 +1282,15 @@ msgstr "Muistiot"
msgid "{0} Notebook Template"
msgstr "{0}-muistion malli"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+msgid "New Note"
+msgstr "Uusi muistilappu"
+
msgid "All Notes"
msgstr "Kaikki muistilaput"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
msgid "Really delete this notebook?"
msgstr "Poistetaanko tämä muistio?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
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."
@@ -1342,39 +1311,32 @@ msgstr "Ei muistiota"
msgid "New \"{0}\" Note"
msgstr "Uusi ”{0}”-muistilappu"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
msgid "Place this note into a notebook"
msgstr "Siirrä tämä muistilappu muistioon"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
msgid "Notebook"
msgstr "Muistio"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
msgid "_New notebook..."
msgstr "Uusi mu_istio…"
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Uusi muistilappu {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Poistetaanko tämä muistilappu?"
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Poistetaanko muistilappu ”{0}”?"
-#: ../Tomboy/Note.cs:1581
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Poistetaanko tämä {0}-muistilappu?"
msgstr[1] "Poistetaanko nämä {0}-muistilaput?"
-#: ../Tomboy/Note.cs:1592
msgid "If you delete a note it is permanently lost."
msgstr "Jos poistat, hukataan muistilappu pysyvästi."
-#: ../Tomboy/Note.cs:1626
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1385,7 +1347,6 @@ msgstr ""
"riittävästi ja että kohteeseen {0} on riittävät oikeudet. Virheen "
"yksityiskohdat löytyvät tiedostosta {1}."
-#: ../Tomboy/Note.cs:1642
msgid "Error saving note data."
msgstr "Virhe tallennettaessa muistilapun tietoja."
@@ -1529,7 +1490,6 @@ msgstr "Linkkien käyttö Tomboyssa"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
msgid "Describe your new note here."
msgstr "Kirjoita tähän uuden muistilapun kuvaus."
@@ -1593,140 +1553,123 @@ msgstr "Älä koskaan uudelleennimeä _linkkejä"
msgid "Alwa_ys rename links"
msgstr "Uudelleennimeä linkit _aina"
-#: ../Tomboy/NoteWindow.cs:58
msgid "Find in This Note"
msgstr "Etsi tästä muistilapusta"
-#: ../Tomboy/NoteWindow.cs:361
msgid "_Link to New Note"
msgstr "_Linkki uuteen muistilappuun"
-#: ../Tomboy/NoteWindow.cs:373
msgid "Te_xt"
msgstr "Te_ksti"
-#: ../Tomboy/NoteWindow.cs:381
msgid "_Find in This Note"
msgstr "_Etsi tästä muistilapusta"
-#: ../Tomboy/NoteWindow.cs:396
msgid "Clos_e All Notes"
msgstr "Sulj_e kaikki muistilaput"
-#: ../Tomboy/NoteWindow.cs:436
msgid "Search"
msgstr "Etsi"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
msgid "Search your notes"
msgstr "Etsi muistilapuistasi"
-#: ../Tomboy/NoteWindow.cs:452
msgid "Link"
msgstr "Linkki"
-#: ../Tomboy/NoteWindow.cs:459
msgid "Link selected text to a new note"
msgstr "Linkitä valittu teksti uuteen muistilappuun"
-#: ../Tomboy/NoteWindow.cs:472
msgid "_Text"
msgstr "_Teksti"
-#: ../Tomboy/NoteWindow.cs:477
msgid "Set properties of text"
msgstr "Aseta tekstin ominaisuudet"
-#: ../Tomboy/NoteWindow.cs:482
msgid "T_ools"
msgstr "_Työkalut"
-#: ../Tomboy/NoteWindow.cs:486
msgid "Use tools on this note"
msgstr "Käytä työkaluja tähän muistilappuun"
-#: ../Tomboy/NoteWindow.cs:494
msgid "Delete this note"
msgstr "Poista tämä muistilappu"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Synkronoi muistilaput"
-#: ../Tomboy/NoteWindow.cs:564
+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 "Tämä muistilappu on malline. Se määrittää tavallisten muistilappujen oletussisällön eikä näy muistilappuvalikossa tai hakuikkunassa."
+
+msgid "Convert to regular note"
+msgstr "Muunna tavalliseksi muistilapuksi"
+
+msgid "Save Si_ze"
+msgstr "Tallenna _koko"
+
+msgid "Save Se_lection"
+msgstr "Tallenna _valinta"
+
+msgid "Save _Title"
+msgstr "Tallenna _otsikko"
+
msgid "_Find..."
msgstr "Et_si…"
-#: ../Tomboy/NoteWindow.cs:575
msgid "Find _Next"
msgstr "Etsi _seuraava"
-#: ../Tomboy/NoteWindow.cs:588
msgid "Find _Previous"
msgstr "Etsi _edellinen"
-#: ../Tomboy/NoteWindow.cs:676
msgid "Cannot create note"
msgstr "Muistilappua ei voi luoda"
-#: ../Tomboy/NoteWindow.cs:757
msgid "_Find:"
msgstr "_Etsi:"
-#: ../Tomboy/NoteWindow.cs:768
msgid "_Previous"
msgstr "_Edellinen"
-#: ../Tomboy/NoteWindow.cs:777
msgid "_Next"
msgstr "_Seuraava"
-#: ../Tomboy/NoteWindow.cs:1260
msgid "_Bold"
msgstr "_Voimakas"
-#: ../Tomboy/NoteWindow.cs:1272
msgid "_Italic"
msgstr "_Kursiivi"
-#: ../Tomboy/NoteWindow.cs:1284
msgid "_Strikeout"
msgstr "_Yliviivattu"
-#: ../Tomboy/NoteWindow.cs:1296
msgid "_Highlight"
msgstr "_Korostus"
-#: ../Tomboy/NoteWindow.cs:1309
msgid "Font Size"
msgstr "Kirjasimen koko"
-#: ../Tomboy/NoteWindow.cs:1312
msgid "_Normal"
msgstr "_Tavallinen"
-#: ../Tomboy/NoteWindow.cs:1329
msgid "Hu_ge"
msgstr "_Valtava"
-#: ../Tomboy/NoteWindow.cs:1337
msgid "_Large"
msgstr "_Suuri"
-#: ../Tomboy/NoteWindow.cs:1345
msgid "S_mall"
msgstr "_Pieni"
-#: ../Tomboy/NoteWindow.cs:1354
msgid "Increase Font Size"
msgstr "Kasvata kirjasimen kokoa"
-#: ../Tomboy/NoteWindow.cs:1372
msgid "Decrease Font Size"
msgstr "Pienennä kirjasimen kokoa"
-#: ../Tomboy/NoteWindow.cs:1392
msgid "Bullets"
msgstr "Luodit"
@@ -1970,19 +1913,15 @@ msgstr ""
msgid "Error connecting"
msgstr "Virhe otettaessa yhteyttä"
-#: ../Tomboy/PreferencesDialog.cs:1350
msgid "Version:"
msgstr "Versio:"
-#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Author:"
msgstr "Tekijä:"
-#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Copyright:"
msgstr "Tekijänoikeudet:"
-#: ../Tomboy/PreferencesDialog.cs:1370
msgid "Add-in Dependencies:"
msgstr "Lisäosan riippuvuudet:"
@@ -2521,6 +2460,9 @@ msgstr "Kopioi linkin osoite"
msgid "_Open Link"
msgstr "_Avaa linkki"
+#~ msgid "Really delete this note?"
+#~ msgstr "Poistetaanko tämä muistilappu?"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "Vie HTML-muodossa viimeisin hakemisto"
diff --git a/po/gl.po b/po/gl.po
index 087c75f..a24e8e0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,24 +5,24 @@
# Ignacio Casal Quinteiro <nacho.resa at gmail.com>, 2006.
# Ignacio Casal Quinteiro <icq at cvs.gnome.org>, 2007.
# Ignacio Casal Quinteiro <nacho.resa at gmail.com>, 2008.
-# Fran Dieguez <fran.dieguez at glug.es>, 2009.
# Antón Méixome <meixome at mancomun.org>, 2009.
# Francisco Diéguez <frandieguez at ubuntu.com>, 2010.
# Fran Diéguez <frandieguez at gnome.org>, 2010, 2011.
+# Fran Dieguez <frandieguez at gnome.org>, 2009, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: tomboy-master-po-gl-54142\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-16 19:24+0200\n"
-"PO-Revision-Date: 2011-08-16 19:24+0200\n"
-"Last-Translator: Fran Diéguez <frandieguez at gnome.org>\n"
-"Language-Team: Galician <gnome-l10n-gl at gnome.org>\n"
+"POT-Creation-Date: 2011-09-05 00:42+0200\n"
+"PO-Revision-Date: 2011-09-04 20:03+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez at gnome.org>\n"
+"Language-Team: Galego <gnome-l10n-gl at gnome.org>\n"
"Language: gl\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"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: KBabel 1.11.4\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -651,7 +651,7 @@ msgstr "_Eliminar"
msgid "Delete the selected note"
msgstr "Eliminar a nota seleccionada"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "_Pechar"
@@ -695,7 +695,7 @@ msgstr "Icona da área de notificación"
msgid "Create _New Note"
msgstr "Crear unha nota _nova"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Buscar en todas as notas"
@@ -833,16 +833,16 @@ msgstr "Ruta do _cartafol:"
msgid "Select Synchronization Folder..."
msgstr "Seleccionar cartafol de sincronización…"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "O campo do ruta do cartafol está baleiro."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "O ruta do cartafol especificado non existe, e Tomboy non puido crealo."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Cartafol local"
@@ -943,22 +943,22 @@ msgstr "Quitar ligazóns rotas"
msgid "Add a sketch"
msgstr "Engadir un debuxo"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Se_rvidor:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "_Nome de usuario:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "Ruta do _cartafol (opcional):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../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."
@@ -966,15 +966,15 @@ msgstr ""
"A sincronización SSH require unha chave SSH existente para este servidor e "
"usuario que estea engadida ao daemon SSH en execución."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "O campo de servidor ou nome de usuario está baleiro."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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."
@@ -1035,23 +1035,23 @@ msgstr "--- Tasque non se está executando ---"
msgid "_Underline"
msgstr "_Subliñado"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_URL:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_Contrasinal:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "O URL, nome de usuario ou contrasinal está baleiro."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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."
@@ -1064,7 +1064,7 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr ""
@@ -1072,7 +1072,7 @@ msgstr ""
"mensaxe:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Conectar co servidor"
@@ -1081,23 +1081,23 @@ msgid "Connected"
msgstr "Conectado"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "O servidor non responde. Probe outra vez."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Produciuse un fallo na sincronización, ténteo de novo"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Logrouse a autorización web Tomboy"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
@@ -1105,18 +1105,18 @@ msgstr ""
"Por favor, volva á xanela de preferencias de Tomboy e prema Gardar para "
"iniciar a sincronización."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "Conectado. Prema Gardar para comezar a sincronización"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Autorizando no navegador (prema para reiniciar a conexión)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Configure o navegador predeterminado e probe outra vez"
@@ -1125,20 +1125,24 @@ msgid "Tomboy Web"
msgstr "Sitio web do Tomboy"
#: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Exportar tódalas notas a"
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exportar tódalas notas en {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Comezar a exportar as notas a "
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Comezar a exportar as notas en {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Eliminar o caderno de notas seleccionado a "
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Eliminar o caderno de notas seleccionado en {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Comezar a exportar o caderno a "
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Comezar a exportar o caderno en {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1154,12 +1158,19 @@ msgid "Export your notes."
msgstr "Exportar as súas notas."
#: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Exportar todas as notas a "
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exportar tódalas notas en {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Eliminar o caderno de notas seleccionado a "
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Eliminar o caderno de notas seleccionado en {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Exportado en {0} de tódalas notas"
#: ../Tomboy/ExportAllApplicationAddin.cs:193
#: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1183,7 +1194,7 @@ msgid "Unknown error."
msgstr "Erro descoñecido."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "Notas sen arquivar"
@@ -1201,9 +1212,11 @@ msgstr "Nota exportada con éxito"
msgid "Could not save the files in \"{0}\""
msgstr "Non foi posíbel gardar os ficheiros «{0}»"
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Crear cartafol de destino para "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Crear cartafol de destino para exportar {0}"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1313,15 +1326,19 @@ msgstr "Cadernos"
msgid "{0} Notebook Template"
msgstr "Modelo de caderno de {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nota nova"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "Todas as notas"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Está seguro de que quere eliminar este caderno?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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."
@@ -1343,39 +1360,40 @@ msgstr "Sen caderno"
msgid "New \"{0}\" Note"
msgstr "Nota nova de «{0}»"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Ubicar esta nota nun caderno"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Caderno"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "_Novo caderno…"
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Nota nova {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Está seguro de que quere eliminar esta nota?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Ten certeza que quere eliminar esta «{0}»?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Está seguro de que quere eliminar esta {0} nota?"
msgstr[1] "Está seguro de que quere eliminar estas {0} notas?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Se elimina unha nota perderase permanentemente."
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1386,7 +1404,7 @@ msgstr ""
"espazo no disco e que ten os permisos axeitados en {0}. Os detalles do erro "
"pódeos atopar en {1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Produciuse un erro ao gardar os datos da nota."
@@ -1527,7 +1545,7 @@ msgstr "Usando ligazóns en Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Describa aquí a súa nova nota."
@@ -1591,140 +1609,164 @@ msgstr "Non renomear as _ligazóns nunca"
msgid "Alwa_ys rename links"
msgstr "Renomear as ligazóns _sempre"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "Buscar nesta nota"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_Ligazón a unha nota nova"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "Te_xto"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_Buscar nesta nota"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "P_echar todas as notas"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Buscar"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "Buscar nas súas notas"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Ligazón"
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "Ligar o texto seleccionado a unha nota nova"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Texto"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Estabelecer as propiedades do texto"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "_Ferramentas"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Usar as ferramentas nesta nota"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Eliminar esta nota"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Sincronizar notas"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 ""
+"Esta nota é unha nota de plantilla. Determina o contido predeterminado para "
+"as notas normais, non se mostrará no menú de notas ou a xanela de busca"
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Converter a nota normal"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Gardar _tamaño"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Gardar se_lección"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Gardar _título"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Buscar…"
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "Buscar _seguinte"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "Buscar _anterior"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Non foi posíbel crear a nota"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Buscar:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Anterior"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Seguinte"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_Negra"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Cursiva"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Riscada"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "_Realce"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Tamaño do tipo de letra"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "_Enorme"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Grande"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Pequena"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Incrementar o tamaño do tipo de letra"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Diminuír o tamaño do tipo de letra"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Viñetas"
@@ -1969,19 +2011,19 @@ msgstr ""
msgid "Error connecting"
msgstr "Produciuse un erro ao conectar"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Versión:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Autor:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Dereitos de autor:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Dependencias dos engadidos:"
@@ -2523,6 +2565,9 @@ msgstr "_Copiar a ligazón do enderezo"
msgid "_Open Link"
msgstr "_Abrir a ligazón"
+#~ msgid "Really delete this note?"
+#~ msgstr "Está seguro de que quere eliminar esta nota?"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "Último directorio de exportación en HTML"
diff --git a/po/he.po b/po/he.po
index f708521..d1fd5fd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-15 10:16+0300\n"
-"PO-Revision-Date: 2011-07-15 10:16+0200\n"
+"POT-Creation-Date: 2011-08-24 12:13+0300\n"
+"PO-Revision-Date: 2011-08-24 12:15+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew (he at li.org)\n"
"Language: he\n"
@@ -634,7 +634,7 @@ msgstr "_מחיקה"
msgid "Delete the selected note"
msgstr "מחיקת פתקית זאת"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "_סגירה"
@@ -678,7 +678,7 @@ msgstr "סמל באזור הדיווחים"
msgid "Create _New Note"
msgstr "יצירת _פתקית חדשה"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_חיפוש בכל הפתקיות"
@@ -816,16 +816,16 @@ msgstr "נתיב ה_תיקייה:"
msgid "Select Synchronization Folder..."
msgstr "בחירת תיקיית סנכרון..."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "שדה נתיב התיקייה ריק."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "נתיב התיקייה המצויין אינו קיים, ולא ניתן היה ליצור אותו."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "תיקייה מקומית"
@@ -926,37 +926,37 @@ msgstr "הסרת קישורים שבורים"
msgid "Add a sketch"
msgstr "הוספת סקיצה"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "שרת:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "שם _משתמש:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "נתיב _תיקייה (לא חובה):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
msgid ""
"SSH synchronization requires an existing SSH key for this server and user, "
"added to a running SSH daemon."
msgstr ""
"סנכרון SSH מחייב הוספת מפתח SSH קיים עבור השרת והמשתמש לתהליך ה־SSH הפעיל."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "שדה השרת או השם ריק."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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."
@@ -1015,23 +1015,23 @@ msgstr "--- Tasque לא פועל ---"
msgid "_Underline"
msgstr "_קו תחתי"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_כתובת:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_ססמה:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "שדה הכתובת, שם משתמש או הססמה ריקים."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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."
@@ -1044,13 +1044,13 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr "שמירת ההגדרות לקבוצת המפתחות של GNOME נכשלה עם ההודעה הבאה:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "התחברות לשרת"
@@ -1059,40 +1059,40 @@ msgid "Connected"
msgstr "חיבור פעיל"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "השרת לא מגיב. יש לנסות מאוחר יותר."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "האימות נכשל, נא לנסות שוב"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "האימות המקוון של Tomboy הצליח"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
msgstr "יש לחזור אל חלון ההעדפות של Tomboy וללחוץ על שמירה כדי להתחיל בסנכרון."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "החיבור פעיל. נא ללחוץ על שמירה כדי להתחיל בסנכרון"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "מתבצע אימות בדפדפן (יש ללחוץ לאיפוס ההתחברות)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "הגדרת דפדפן בררת המחדל ולנסות שוב."
@@ -1159,7 +1159,7 @@ msgid "Unknown error."
msgstr "שגיאה בלתי ידועה."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "פתקיות ריקות"
@@ -1178,8 +1178,9 @@ msgid "Could not save the files in \"{0}\""
msgstr "לא ניתן לשמור את הקבצים תחת \"{0}\""
#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "יצירת תיקיית יעד עבור"
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "יצירת תיקיית יעד לצורך יצוא {0}"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1289,15 +1290,19 @@ msgstr "פנקסים"
msgid "{0} Notebook Template"
msgstr "תבנית פתקית {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "פתקית חדשה"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "כל הפתקיות"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "האם למחוק פנקס זה?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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."
@@ -1318,39 +1323,40 @@ msgstr "אין פנקס"
msgid "New \"{0}\" Note"
msgstr "פתקית \"{0}\" חדשה"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "מיקום פתקית זו בפנקס"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "פנקס"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "פנ_קס חדש..."
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "פתקית חדשה {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "האם למחוק את פתקית זו?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "האם אכן למחוק את \"{0}\"?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "האם אכן למחוק פתקית זו?"
msgstr[1] "האם אכן למחוק {0} פתקיות אלו?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "אם הפתקית תימחק היא תאבד לעד."
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1360,7 +1366,7 @@ msgstr ""
"אירעה שגיאה במהלך שמירת הפתקיות שלך. נא לבדוק שיש מספיק מקום בכונן ושיש לך "
"הרשאות מספיקות לגשת אל {0}. ניתן למצוא את פרטי השגיאה ב־{1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "שגיאה בשמירת נתוני הפתקית."
@@ -1499,7 +1505,7 @@ msgstr "שימוש בקישורים ב־Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "ניתן לתאר את הפתקית החדשה כאן."
@@ -1563,140 +1569,164 @@ msgstr "ל_עולם לא לשנות את שמות הקישורים"
msgid "Alwa_ys rename links"
msgstr "_תמיד לשנות את שמות הקישורים"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "חיפוש בפתקית זאת"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_קישור לפתקית חדשה"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "_טקסט"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_חיפוש בפתקית זאת"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "_סגירת כל הפתקיות"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "חיפוש"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "חיפוש בפתקיות שלך"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "קישור"
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "קישור הטקסט הנבחר לפתקית חדשה"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_טקסט"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "הגדרת מאפייני הטקסט"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "_כלים"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "שימוש בכלים על פתקית זאת"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "מחיקת הפתקית"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "סנכרון פתקיות"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 ""
+"פתקית זו הנה פתקית תבניתית. היא מגדירה את תוכן בררת המחדל עבור פתקיות רגילות "
+"והיא לא תופיע בתפריט הפתקיות או בחלון החיפוש."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "המרה לפתקית רגילה"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "שמירת ה_גודל"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "שמירת ה_בחירה"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "שמירת ה_כותרת"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_חיפוש..."
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "חיפוש ה_בא"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "חיפוש ה_קודם"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "לא ניתן ליצור פתקית"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_חיפוש:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "ה_קודם"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "ה_בא"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_מודגש"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_נטוי"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_קו חוצה"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "ה_דגשה"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "גודל גופן"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_רגיל"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "ע_נק"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_גדול"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "ק_טן"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "הגדלת הגופן"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "הקטנת הגופן"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "תבליטים"
@@ -1930,19 +1960,19 @@ msgstr ""
msgid "Error connecting"
msgstr "שגיאת התחברות"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "גרסה:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "יוצר:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "זכויות יוצרים:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "תלויות התוסף:"
@@ -1954,40 +1984,40 @@ msgstr "_חיפוש:"
msgid "Note"
msgstr "פתקית"
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "שונה לאחרונה"
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "התאמות"
-#: ../Tomboy/RecentChanges.cs:562
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "התאמת כותרת"
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "התאמה אחת"
msgstr[1] "{0} התאמות"
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "סך הכול: פתקית אחת"
msgstr[1] "סך הכל: {0} פתקיות"
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "התאמות: פתקית אחת"
msgstr[1] "התאמות: {0} פתקיות"
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -1995,11 +2025,11 @@ msgstr ""
"לא נמצאו תוצאות בפנקס הנבחר.\n"
"יש ללחוץ כאן כדי לחפש בין כל הפתקיות."
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "יש ללחוץ כאן כדי לחפש בין כל הפנקסים"
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "פתקיות"
@@ -2469,6 +2499,9 @@ msgstr "ה_עתקת מיקום הקישור"
msgid "_Open Link"
msgstr "_פתיחת הקישור"
+#~ msgid "Really delete this note?"
+#~ msgstr "האם למחוק את פתקית זו?"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "HTML Export Last Directory"
diff --git a/po/lt.po b/po/lt.po
index b2a9ebe..08b19e7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,16 +11,15 @@
msgid ""
msgstr ""
"Project-Id-Version: tomboy.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 23:31+0300\n"
-"PO-Revision-Date: 2010-09-12 15:21+0300\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-02 23:20+0300\n"
"Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
"Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../data/GNOME_TomboyApplet.server.in.in.h:1
msgid "Accessories"
@@ -34,26 +33,31 @@ msgstr "Paprasta ir lengvai naudojama užrašinė"
msgid "Tomboy Applet Factory"
msgstr "Tomboy įtaiso gamykla"
-#: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
+#: ../data/GNOME_TomboyApplet.server.in.in.h:4
+#: ../data/tomboy.desktop.in.h:3
#: ../Tomboy/Tray.cs:579
msgid "Tomboy Notes"
msgstr "Tomboy užrašai"
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../data/GNOME_TomboyApplet.xml.h:1
+#: ../Tomboy/ActionManager.cs:179
#: ../Tomboy/Tray.cs:274
msgid "S_ynchronize Notes"
msgstr "S_inchronizuoti raštelius"
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:2
+#: ../Tomboy/ActionManager.cs:164
msgid "_About"
msgstr "_Apie"
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../data/GNOME_TomboyApplet.xml.h:3
+#: ../Tomboy/ActionManager.cs:157
#: ../Tomboy/Tray.cs:288
msgid "_Help"
msgstr "_Žinynas"
-#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../data/GNOME_TomboyApplet.xml.h:4
+#: ../Tomboy/ActionManager.cs:153
#: ../Tomboy/Tray.cs:283
msgid "_Preferences"
msgstr "_Nustatymai"
@@ -83,37 +87,37 @@ msgid "Custom Font Face"
msgstr "Kitas šriftas"
#: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "Nustato paieškos lango X koordinatę; įrašoma uždarant Tomboy"
+msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Nustato lango „Ieškoti visuose rašteliuose“ X koordinatę; įrašoma uždarant Tomboy."
#: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "Nustato paieškos lango Y koordinatę; įrašoma uždarant Tomboy"
+msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Nustato lango „Ieškoti visuose rašteliuose“ Y koordinatę; įrašoma uždarant Tomboy."
#: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "Nustato paieškos lango aukštį; įrašoma uždarant Tomboy"
+msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Nustato lango „Ieškoti visuose rašteliuose“ aukštį pikseliais; įrašoma uždarant Tomboy."
#: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "Nustato paieškos lango plotį; įrašoma uždarant Tomboy"
+msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "Nustato lango „Ieškoti visuose rašteliuose“ protį pikseliais; įrašoma uždarant Tomboy."
#: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "Įjungti automatinį sąrašų formatavimą."
-
-#: ../data/tomboy.schemas.in.h:10
msgid "Enable Middle-Click Paste On Icon."
msgstr "Įjungti įkėlimą, paspaudus vidurinį pelės mygtuką ant piktogramos."
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
msgid "Enable Tray Icon"
msgstr "Įjungti pranešimų skydelio piktogramą"
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
msgid "Enable WikiWord highlighting"
msgstr "Įjungti WikiWord paryškinimą"
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "Įjungti automatinius sąrašus."
+
#: ../data/tomboy.schemas.in.h:13
msgid "Enable closing notes with escape."
msgstr "Įjungti raštelių uždarymą klavišu „Escape“"
@@ -139,28 +143,16 @@ msgid "Enable the Delete Note confirmation dialog"
msgstr "Įjungti raštelio trynimo patvirtinimo dialogą"
#: ../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 ""
-"Pasirinkite, jei norite automatiškai suformuoti nenumeruojamus sąrašus, kai "
-"eilutės pradžioje yra - arba *."
+msgid "Enable this option if you want bulleted lists to be automatic when you place - or * at the beginning of a line."
+msgstr "Pasirinkite, jei norite automatiškai suformuoti nenumeruojamus sąrašus, kai eilutės pradžioje yra - arba *."
#: ../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 ""
-"Įjunkite, jei norite įkelti turinį į „Pradėti čia“ raštelį iš atmintinės "
-"paspaudę viduriniuoju pelės mygtuku Tomboy piktogramą."
+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 "Įjunkite, jei norite įkelti turinį į „Pradėti čia“ raštelį iš atmintinės paspaudę viduriniuoju pelės mygtuku Tomboy piktogramą."
#: ../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 ""
-"Įjunkite šį nustatymą norėdami paryškinti žodžius KurieAtrodoŠtaiTaip. "
-"Paspaudus šį žodį bus sukurtas naujas raštelis su tokiu pavadinimu."
+msgid "Enable this option to highlight words ThatLookLikeThis. Clicking the word will create a note with that name."
+msgstr "Įjunkite šį nustatymą norėdami paryškinti žodžius KurieAtrodoŠtaiTaip. Paspaudus šį žodį bus sukurtas naujas raštelis su tokiu pavadinimu."
#: ../data/tomboy.schemas.in.h:22
msgid "FUSE Mounting Timeout (ms)"
@@ -171,132 +163,64 @@ msgid "HTML Export All Linked Notes"
msgstr "Eksportuoti į HTML visus susietus raštelius"
#: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "Paskutinis eksportavimo į HTML aplankas"
-
-#: ../data/tomboy.schemas.in.h:25
msgid "HTML Export Linked Notes"
msgstr "Eksportuoti į HTML susietus raštelius"
-#: ../data/tomboy.schemas.in.h:26
-msgid ""
-"If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
+#: ../data/tomboy.schemas.in.h:25
+msgid "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
msgstr "Jei išjungta, patvirtinimo dialogas \"Trinti raštelį\" bus praleistas."
+#: ../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 "Jeigu enable_custom_font reikšmė yra teigiama, rašteliuose bus naudojamas čia nurodytas šriftas."
+
#: ../data/tomboy.schemas.in.h:27
-msgid ""
-"If enable_custom_font is true, the font name set here will be used as the "
-"font when displaying notes."
-msgstr ""
-"Jeigu enable_custom_font reikšmė yra teigiama, rašteliuose bus naudojamas "
-"čia nurodytas šriftas."
+msgid "If enabled, all notes that were open when Tomboy quit will automatically be reopened at startup."
+msgstr "Jeigu įjungta, visi rašteliai, kurie buvo atverti uždarant Tomboy, paleidimo metu bus automatiškai atidaryti."
#: ../data/tomboy.schemas.in.h:28
-msgid ""
-"If enabled, all notes that were open when Tomboy quit will automatically be "
-"reopened at startup."
-msgstr ""
-"Jeigu įjungta, visi rašteliai, kurie buvo atverti uždarant Tomboy, paleidimo "
-"metu bus automatiškai atidaryti."
-
-#: ../data/tomboy.schemas.in.h:29
msgid "If enabled, an opened note can be closed by hitting the escape key."
msgstr "Jei įjungta, atvertas raštelis gali būti uždarytas Escape klavišu."
+#: ../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 "Jei teigiama, Tomboy dėklo piktograma bus rodoma pranešimų vietoje. Šios funkcijos išjungimas gali būti naudingas, kai kita programa pateikia dėklo piktogramos funkcionalumą."
+
#: ../data/tomboy.schemas.in.h:30
-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 ""
-"Jei teigiama, Tomboy dėklo piktograma bus rodoma pranešimų vietoje. Šios "
-"funkcijos išjungimas gali būti naudingas, kai kita programa pateikia dėklo "
-"piktogramos funkcionalumą."
+msgid "If true, misspellings will be underlined in red, and correct spelling suggestions shown in the right-click menu."
+msgstr "Jei teigiama, rašybos klaidos bus pabrauktos raudonai, ir paspaudus dešinįjį pelės mygtuką bus rodomi teisingos rašybos pasiūlymai."
#: ../data/tomboy.schemas.in.h:31
-msgid ""
-"If true, misspellings will be underlined in red, and correct spelling "
-"suggestions shown in the right-click menu."
-msgstr ""
-"Jei teigiama, rašybos klaidos bus pabrauktos raudonai, ir paspaudus dešinįjį "
-"pelės mygtuką bus rodomi teisingos rašybos pasiūlymai."
+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 "Jei teigiama, bus įjungti visoje aplinkoje veikiantys klavišų susiejimai, nurodyti /apps/tomboy/global_keybindings rakte."
#: ../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 ""
-"Jei teigiama, bus įjungti visoje aplinkoje veikiantys klavišų susiejimai, "
-"nurodyti /apps/tomboy/global_keybindings rakte."
+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 "Jei teigiama, rašteliuose bus naudojamas šriftas nurodytas custom_font_face rakte. Kitu atveju bus naudojamas numatytasis aplinkos šriftas."
#: ../data/tomboy.schemas.in.h:33
-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 ""
-"Jei teigiama, rašteliuose bus naudojamas šriftas nurodytas custom_font_face "
-"rakte. Kitu atveju bus naudojamas numatytasis aplinkos šriftas."
+msgid "Indicates that the Sticky Note Importer plugin has not been run, so it should run automatically the next time Tomboy starts."
+msgstr "Rodo, kad lipnių raštelių įskiepis nebuvo paleistas, todėl jis turėtų būti paleistas kitą kartą paleidus Tomboy."
#: ../data/tomboy.schemas.in.h:34
-msgid ""
-"Indicates that the Sticky Note Importer plugin has not been run, so it "
-"should run automatically the next time Tomboy starts."
-msgstr ""
-"Rodo, kad lipnių raštelių įskiepis nebuvo paleistas, todėl jis turėtų būti "
-"paleistas kitą kartą paleidus Tomboy."
+msgid "Integer determining the minimum number of notes to show in the Tomboy note menu."
+msgstr "Sveikasis skaičius, nurodantis mažiausią leistiną raštelių, rodomų Tomboy raštelių meniu, skaičių."
#: ../data/tomboy.schemas.in.h:35
-msgid ""
-"Integer determining the minimum number of notes to show in the Tomboy note "
-"menu."
-msgstr ""
-"Sveikasis skaičius, nurodantis mažiausią leistiną raštelių, rodomų Tomboy "
-"raštelių meniu, skaičių."
+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 "Sveikasis skaičius, nurodantis, kiek dažnai atlikti raštelių sinchronizavimą fone (kai jis sukonfigūruotas). Reikšmė, mažesnė už 1, reiškia, kad automatinis sinchronizavimas išjungtas. Mažiausia leistina reikšmė yra 5. Reikšmė reiškia minučių skaičių."
#: ../data/tomboy.schemas.in.h:36
-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 ""
-"Sveikasis skaičius, nurodantis, kiek dažnai atlikti raštelių sinchronizavimą "
-"fone (kai jis sukonfigūruotas). Reikšmė, mažesnė už 1, reiškia, kad "
-"automatinis sinchronizavimas išjungtas. Mažiausia leistina reikšmė yra 5. "
-"Reikšmė reiškia minučių skaičių."
+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 "Sveikojo skaičiaus reikšmė nurodanti, ar yra pageidavimas visada atlikti tam tikrus veiksmus aptikus konfliktą, užuot klausus naudotojo. Reikšmės priskirto vidiniam sąrašui. 0 nurodo, kad naudotojas pageidauja būti paklaustas, kai atsitinka konfliktas, kad jis galėtų susidoroti su kiekvienu konfliktu atsižvelgdamas į konkrečią situaciją."
#: ../data/tomboy.schemas.in.h:37
-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 ""
-"Sveikojo skaičiaus reikšmė nurodanti, ar yra pageidavimas visada atlikti tam "
-"tikrus veiksmus aptikus konfliktą, užuot klausus naudotojo. Reikšmės "
-"priskirto vidiniam sąrašui. 0 nurodo, kad naudotojas pageidauja būti "
-"paklaustas, kai atsitinka konfliktas, kad jis galėtų susidoroti su kiekvienu "
-"konfliktu atsižvelgdamas į konkrečią situaciją."
+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 "Sveikojo skaičiaus reikšmė nurodanti, ar yra pageidavimas visada atlikti tam tikrus saitų atnaujinimo veiksmus pervadinus raštelį, užuot klausus naudotojo. Reikšmės priskirtos vidiniam sąrašui. 0 nurodo, kad naudotojas pageidauja būti paklaustas, kai raštelio pervadinimas gali paveikti saitus kituose rašteliuose. 1 – saitai automatiškai šalinami, 2 – nurodo, kad saito tekstas turi būti atnaujintas į naują raštelio pavadinimą, kad.jis toliau sietų su pervadintu rašteliu."
#: ../data/tomboy.schemas.in.h:38
-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 ""
-"Sveikojo skaičiaus reikšmė nurodanti, ar yra pageidavimas visada atlikti tam "
-"tikrus saitų atnaujinimo veiksmus pervadinus raštelį, užuot klausus "
-"naudotojo. Reikšmės priskirtos vidiniam sąrašui. 0 nurodo, kad naudotojas "
-"pageidauja būti paklaustas, kai raštelio pervadinimas gali paveikti saitus "
-"kituose rašteliuose. 1 – saitai automatiškai šalinami, 2 – nurodo, kad saito "
-"tekstas turi būti atnaujintas į naują raštelio pavadinimą, kad.jis toliau "
-"sietų su pervadintu rašteliu."
+msgid "Last Directory used in HTML Export"
+msgstr "Paskutinis katalogas, naudotas HTML eksportavime"
#: ../data/tomboy.schemas.in.h:39
msgid "Link Updating Behavior on Note Rename"
@@ -307,12 +231,8 @@ msgid "List of pinned notes."
msgstr "Prismeigtų raštelių sąrašas."
#: ../data/tomboy.schemas.in.h:41
-msgid ""
-"Maximum characters of note title to show in the Tomboy tray or panel applet "
-"note menu."
-msgstr ""
-"Maksimalus simbolių skaičius užrašo antraštėje, rodomas Tomboy dėklės ar "
-"įtaiso užrašo meniu."
+msgid "Maximum characters of note title to show in the Tomboy tray or panel applet note menu."
+msgstr "Maksimalus simbolių skaičius užrašo antraštėje, rodomas Tomboy dėklės ar įtaiso užrašo meniu."
#: ../data/tomboy.schemas.in.h:42
msgid "Maximum note title length to show in tray menu."
@@ -343,12 +263,8 @@ msgid "Path on SSH server to Tomboy synchronization directory (optional)."
msgstr "Kelias SSH serveryje į Tomboy sinchronizavimo katalogą (nebūtinas)."
#: ../data/tomboy.schemas.in.h:49
-msgid ""
-"Path to the synchronization server when using the filesystem synchronization "
-"service addin."
-msgstr ""
-"Kelias iki sinchronizavimo serverio, kai naudojamas failų sistemos "
-"sinchronizavimo tarnybos priedas."
+msgid "Path to the synchronization server when using the filesystem synchronization service addin."
+msgstr "Kelias iki sinchronizavimo serverio, kai naudojamas failų sistemos sinchronizavimo tarnybos priedas."
#: ../data/tomboy.schemas.in.h:50
msgid "SSHFS Remote Synchronization Folder"
@@ -367,20 +283,20 @@ msgid "SSHFS Synchronization Server URL"
msgstr "SSHFS sinchronizavimo serverio URL"
#: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "Įrašytas paieškos lango aukštis"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "Įrašytas lango „Ieškoti visuose rašteliuose“ aukštis"
#: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "Įrašyta paieškos lango horizontali padėtis"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "Įrašyta lango „Ieškoti visuose rašteliuose“ horizontali padėtis"
#: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "Įrašyta paieškos lango vertikali padėtis"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "Įrašyta lango „Ieškoti visuose rašteliuose“ vertikali padėtis"
#: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "Įrašytas paieškos lango plotis"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "Įrašytas lango „Ieškoti visuose rašteliuose“ plotis"
#: ../data/tomboy.schemas.in.h:58
msgid "Selected Synchronization Service Addin"
@@ -415,143 +331,52 @@ msgid "The date format that is used for the timestamp."
msgstr "Datos ir laiko formatas."
#: ../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 ""
-"Globalus susiejimas kurti ir parodyti naujam rašteliui. Formatas atrodo kaip "
-"„<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra "
-"pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat "
-"tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite "
-"parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks "
-"klavišų susiejimas."
+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 "Globalus susiejimas kurti ir parodyti naujam rašteliui. Formatas atrodo kaip „<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks klavišų susiejimas."
#: ../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 ""
-"Globalus susiejimas atverti „Pradėti čia“ rašteliui. Formatas atrodo kaip "
-"„<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra "
-"pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat "
-"tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite "
-"parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks "
-"klavišų susiejimas."
+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 "Globalus susiejimas atverti „Pradėti čia“ rašteliui. Formatas atrodo kaip „<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks klavišų susiejimas."
#: ../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 ""
-"Globalus susiejimas atverti raštelių paieškos langui. Formatas atrodo kaip "
-"„<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra "
-"pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat "
-"tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite "
-"parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks "
-"klavišų susiejimas."
+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 "Globalus susiejimas atverti raštelių paieškos langui. Formatas atrodo kaip „<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks klavišų susiejimas."
#: ../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 ""
-"Globalus susiejimas atverti paskutinių pakeitimų langui. Formatas atrodo "
-"kaip „<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra "
-"pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat "
-"tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite "
-"parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks "
-"klavišų susiejimas."
+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 "Globalus susiejimas atverti paskutinių pakeitimų langui. Formatas atrodo kaip „<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks klavišų susiejimas."
#: ../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 ""
-"Globalus susiejimas Tomboy įtaiso meniu parodymui. Formatas atrodo kaip „<"
-"Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra pakankamai "
-"liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat tokius "
-"sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite "
-"parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks "
-"klavišų susiejimas."
+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 "Globalus susiejimas Tomboy įtaiso meniu parodymui. Formatas atrodo kaip „<Control>a“ arba „<Shift><Alt>F1“. Apdoroklis yra pakankamai liberalus ir leidžia didžiąsias ir mažąsias raides, taip pat tokius sutrumpinimus kaip „<Ctl>“ and „<Ctrl>“. Jeigu nurodysite parametrą į specialų užrašą „disabled“, šiam veiksmui nebus priskirtas joks klavišų susiejimas."
#: ../data/tomboy.schemas.in.h:71
msgid "The handler for \"note://\" URLs"
msgstr "„note://“ URL apdorojimo programa"
#: ../data/tomboy.schemas.in.h:72
-msgid ""
-"The last directory a note was exported to using the Export To HTML plugin."
-msgstr ""
-"Paskutinis aplankas, į kurį buvo eksportuotas raštelis naudojant "
-"„Eksportuoti į HTML“ įskiepį."
+msgid "The last directory a note was exported to using the Export To HTML plugin."
+msgstr "Paskutinis aplankas, į kurį buvo eksportuotas raštelis naudojant „Eksportuoti į HTML“ įskiepį."
#: ../data/tomboy.schemas.in.h:73
-msgid ""
-"The last setting for the 'Export linked notes' checkbox in the Export to "
-"HTML plugin."
-msgstr ""
-"Paskutinis „Eksportuoti susietus raštelius“ žymimosios akutės pažymėjimas "
-"„Eksportuoti į HTML“ įskiepyje."
+msgid "The last setting for the 'Export linked notes' checkbox in the Export to HTML plugin."
+msgstr "Paskutinis „Eksportuoti susietus raštelius“ žymimosios akutės pažymėjimas „Eksportuoti į HTML“ įskiepyje."
#: ../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 ""
-"Paskutinis parametras žymės langeliui „Įtraukti visus kitus susietus "
-"raštelius“ įskiepyje Eksportuoti į HTML. Šis parametras yra naudojamas kartu "
-"su parametru „Eksportuoti į HTML susietus raštelius“ ir yra naudojamas "
-"nurodyti, ar visi rašteliai (rasti rekursyviai) turėtų būti įtraukti "
-"eksportuojant į HTML."
+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 "Paskutinis parametras žymės langeliui „Įtraukti visus kitus susietus raštelius“ įskiepyje Eksportuoti į HTML. Šis parametras yra naudojamas kartu su parametru „Eksportuoti į HTML susietus raštelius“ ir yra naudojamas nurodyti, ar visi rašteliai (rasti rekursyviai) turėtų būti įtraukti eksportuojant į HTML."
#: ../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 ""
-"Raštelio, kuris turėtų būti laikomas rašteliu „Pradėti čia“, URI. Šis "
-"raštelis visada rodomas Tomboy raštelių meniu viršuje ir pasiekiamas "
-"karštaisiais klavišais."
+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 "Raštelio, kuris turėtų būti laikomas rašteliu „Pradėti čia“, URI. Šis raštelis visada rodomas Tomboy raštelių meniu viršuje ir pasiekiamas karštaisiais klavišais."
#: ../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 ""
-"Prievadas, naudojamas jungiantis prie sinchronizavimo serverio per SSH. "
-"Nustatyti į -1, jei turėtų būti naudojami numatytieji SSH prievadų "
-"nustatymai."
+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 "Prievadas, naudojamas jungiantis prie sinchronizavimo serverio per SSH. Nustatyti į -1, jei turėtų būti naudojami numatytieji SSH prievadų nustatymai."
#: ../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 ""
-"Laikas (milisekundėmis), kiek Tomboy turėtų laukti atsakymo naudojant FUSE "
-"sinchronizuoto viešinio prijungimui."
+msgid "Time (in milliseconds) Tomboy should wait for a response when using FUSE to mount a sync share."
+msgstr "Laikas (milisekundėmis), kiek Tomboy turėtų laukti atsakymo naudojant FUSE sinchronizuoto viešinio prijungimui."
#: ../data/tomboy.schemas.in.h:78
msgid "Timestamp format"
@@ -562,42 +387,24 @@ msgid "URL of SSH server containing Tomboy synchronization directory."
msgstr "SSH serverio URL su Tomboy sinchronizavimo aplanku."
#: ../data/tomboy.schemas.in.h:80
-msgid ""
-"Unique identifier for the currently configured note synchronization service "
-"addin."
-msgstr ""
-"Unikalus dabar sukonfigūruoto raštelių sinchronizavimo tarnybos priedo "
-"identifikatorius."
+msgid "Unique identifier for the currently configured note synchronization service addin."
+msgstr "Unikalus dabar sukonfigūruoto raštelių sinchronizavimo tarnybos priedo identifikatorius."
#: ../data/tomboy.schemas.in.h:81
-msgid ""
-"Unique identifier for this Tomboy client, used when communicating with a "
-"sychronization server."
-msgstr ""
-"Unikalus šio Tomboy kliento identifikatorius, naudojamas bendraujant su "
-"sinchronizavimo serveriu."
+msgid "Unique identifier for this Tomboy client, used when communicating with a sychronization server."
+msgstr "Unikalus šio Tomboy kliento identifikatorius, naudojamas bendraujant su sinchronizavimo serveriu."
#: ../data/tomboy.schemas.in.h:82
-msgid ""
-"Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
-"user."
-msgstr ""
-"Naudokite wdfs parinktį „-ac“, jei norite priimti SSL sertifikatus be "
-"neklausiant naudotojo."
+msgid "Use wdfs option \"-ac\" to accept SSL certificates without prompting the user."
+msgstr "Naudokite wdfs parinktį „-ac“, jei norite priimti SSL sertifikatus be neklausiant naudotojo."
#: ../data/tomboy.schemas.in.h:83
msgid "User name to use when connecting to the synchronization server via SSH."
-msgstr ""
-"Naudotojo vardas, naudojamas jungiantis prie sinchronizavimo serverio per "
-"SSH."
+msgstr "Naudotojo vardas, naudojamas jungiantis prie sinchronizavimo serverio per SSH."
#: ../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 ""
-"Tarpais atskirtų raštelių, kurie turėtų būti visada rodomi Tomboy raštelių "
-"meniu, URI sąrašas."
+msgid "Whitespace-separated list of note URIs for notes that should always appear in the Tomboy note menu."
+msgstr "Tarpais atskirtų raštelių, kurie turėtų būti visada rodomi Tomboy raštelių meniu, URI sąrašas."
#: ../Tomboy/ActionManager.cs:127
msgid "_File"
@@ -607,7 +414,8 @@ msgstr "_Failas"
msgid "_New"
msgstr "_Naujas"
-#: ../Tomboy/ActionManager.cs:131 ../Tomboy/ActionManager.cs:172
+#: ../Tomboy/ActionManager.cs:131
+#: ../Tomboy/ActionManager.cs:172
msgid "Create a new note"
msgstr "Sukurti naują raštelį"
@@ -627,7 +435,8 @@ msgstr "_Ištrinti"
msgid "Delete the selected note"
msgstr "Ištrinti pasirinktą raštelį"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142
+#: ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "_Užverti"
@@ -635,7 +444,8 @@ msgstr "_Užverti"
msgid "Close this window"
msgstr "Užverti šį langą"
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:300
+#: ../Tomboy/ActionManager.cs:146
+#: ../Tomboy/Tray.cs:300
msgid "_Quit"
msgstr "Iš_eiti"
@@ -647,7 +457,8 @@ msgstr "Išeiti iš Tomboy"
msgid "_Edit"
msgstr "K_eisti"
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
+#: ../Tomboy/ActionManager.cs:154
+#: ../Tomboy/PreferencesDialog.cs:65
msgid "Tomboy Preferences"
msgstr "Tomboy nustatymai"
@@ -659,7 +470,8 @@ msgstr "_Turinys"
msgid "Tomboy Help"
msgstr "Tomboy žinynas"
-#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
+#: ../Tomboy/ActionManager.cs:165
+#: ../Tomboy/MacApplication.cs:233
msgid "About Tomboy"
msgstr "Apie Tomboy"
@@ -671,7 +483,8 @@ msgstr "Pranešimų skydelio piktograma"
msgid "Create _New Note"
msgstr "Sukurti _naują raštelį"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175
+#: ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Ieškoti visuose rašteliuose"
@@ -683,21 +496,28 @@ msgstr "Atverti langą Ieškoti visuose rašteliuose"
msgid "Start synchronizing notes"
msgstr "Pradėti raštelių sinchronizavimą"
+#. Addin's tab caption
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
+msgid "Advanced"
+msgstr "Sudėtingesni"
+
+#. Menu Note Count option
+#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
+msgid "Minimum number of notes to show in Recent list (maximum 18)"
+msgstr "Mažiausias rodomų raštelių skaičius nesenų sąraše (daugiausiai 18)"
+
#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:38
msgid "What links here?"
msgstr "Kur yra saitai į čia?"
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
msgid "(none)"
msgstr "(nėra)"
#: ../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 ""
-"Galite naudoti bugzillą tiesiog nuvilkdami saitus į raštelius. Jeigu tam "
-"tikriems serveriams norite specialių piktogramų, galite jas čia pridėti."
+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 "Galite naudoti bugzillą tiesiog nuvilkdami saitus į raštelius. Jeigu tam tikriems serveriams norite specialių piktogramų, galite jas čia pridėti."
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
msgid "Host Name"
@@ -722,8 +542,7 @@ msgstr "Kompiuterio vardas nenurodytas"
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
msgid "You must specify the Bugzilla host name to use with this icon."
-msgstr ""
-"Turite nurodyti Bugzilla kompiuterio vardą, naudotiną su šia piktograma."
+msgstr "Turite nurodyti Bugzilla kompiuterio vardą, naudotiną su šia piktograma."
#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
msgid "Error saving icon"
@@ -741,6 +560,26 @@ msgstr "Tikrai pašalinti šią piktogramą?"
msgid "If you remove an icon it is permanently lost."
msgstr "Jeigu pašalinti šią piktogramą, ji bus prarasta visam laikui."
+#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
+msgid "Cannot open email"
+msgstr "Nepavyko atverti el.pašto"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
+msgid "Destination for HTML Export"
+msgstr "HTML eksportavimo paskirties vieta"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
+msgid "Export linked notes"
+msgstr "Eksportuoti susietus raštelius"
+
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
+msgid "Include all other linked notes"
+msgstr "Įtraukti visus kitus susietus raštelius"
+
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
msgid "Export to HTML"
msgstr "Eksportuoti į HTML"
@@ -755,10 +594,14 @@ msgid "Note exported successfully"
msgstr "Raštelis eksportuotas sėkmingai"
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
msgid "Access denied."
msgstr "Prieiga uždrausta."
#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
msgid "Folder does not exist."
msgstr "Aplankas neegzistuoja."
@@ -767,22 +610,6 @@ msgstr "Aplankas neegzistuoja."
msgid "Could not save the file \"{0}\""
msgstr "Nepavyko išsaugoti failo „{0}“"
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:13
-msgid "Destination for HTML Export"
-msgstr "HTML eksportavimo paskirties vieta"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:23
-msgid "Export linked notes"
-msgstr "Eksportuoti susietus raštelius"
-
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlDialog.cs:28
-msgid "Include all other linked notes"
-msgstr "Įtraukti visus kitus susietus raštelius"
-
-#: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
-msgid "Cannot open email"
-msgstr "Nepavyko atverti el.pašto"
-
#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
msgid "_Folder Path:"
msgstr "_Aplanko kelias:"
@@ -791,16 +618,15 @@ msgstr "_Aplanko kelias:"
msgid "Select Synchronization Folder..."
msgstr "Pasirinkite sinchronizavimo aplanką..."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "Aplanko kelio laukas tuščias."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
-msgid ""
-"Specified folder path does not exist, and Tomboy was unable to create it."
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
+msgid "Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "Nurodytas aplanko kelias neegzistuoja, ir Tomboy nepavyko jo sukurti."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Vietinis aplankas"
@@ -824,7 +650,8 @@ msgstr "Įterpti laiko žymę"
#. initial newline
#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:223 ../Tomboy/Preferences.cs:154
+#: ../Tomboy/Applet.cs:223
+#: ../Tomboy/Preferences.cs:154
msgid "dddd, MMMM d, h:mm tt"
msgstr "dddd, MMMM d, h:mm tt"
@@ -862,12 +689,8 @@ msgid "Appointments"
msgstr "Paskyrimai"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
-msgstr ""
-"Norėdami tinkinti Šiandienos raštelių rodomą tekstą, pakeiskite raštelį "
-"<span weight=\"bold\">Šiandien: šablonas</span>."
+msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
+msgstr "Norėdami tinkinti šiandienos raštelių tekstą, pakeiskite raštelį <b>Šiandien: šablonas<b>."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -892,48 +715,45 @@ msgstr "Puslapis {0} iš {1}"
msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
msgstr "dddd, MMMM d, h:mm tt"
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "Pašalinti neveikiančius saitus"
+
#: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
msgid "Add a sketch"
msgstr "Pridėti eskizą"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Se_rveris:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "_Naudotojo vardas:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "_Aplanko kelias (nebūtina):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
-msgid ""
-"SSH synchronization requires an existing SSH key for this server and user, "
-"added to a running SSH daemon."
-msgstr ""
-"SSH sinchronizavimui reikalingas egzistuojantis šio serverio ir naudotojo "
-"SSH raktas, nurodytas SSH tarnybai."
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
+msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
+msgstr "SSH sinchronizavimui reikalingas egzistuojantis šio serverio ir naudotojo SSH raktas, nurodytas SSH tarnybai."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "Serverio ar naudotojo vardo laukas tuščias."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+msgid "SSH"
+msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
-msgid ""
-"Timeout connecting to server. Please ensure that your SSH key has been added "
-"to a running SSH daemon."
-msgstr ""
-"Jungiantis prie serverio viršytas laiko limitas. Įsitikinkite, kad Jūsų SSH "
-"raktas pridėtas veikiančioje SSH tarnyboje."
+#: ../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 "Jungiantis prie serverio viršytas laiko limitas. Įsitikinkite, kad Jūsų SSH raktas pridėtas veikiančioje SSH tarnyboje."
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
msgid "Import from Sticky Notes"
@@ -954,14 +774,17 @@ msgstr "Lipnūs rašteliai importuoti"
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "<b>{0}</b> iš <b>{1}</b> lipnių raštelių sėkmingai importuota."
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "<b>{0}</b> iš <b>{1}</b> lipnus raštelis sėkmingai importuotas."
+msgstr[1] "<b>{0}</b> iš <b>{1}</b> lipnūs rašteliai sėkmingai importuoti."
+msgstr[2] "<b>{0}</b> iš <b>{1}</b> lipnių raštelių sėkmingai importuota."
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
msgid "Untitled"
msgstr "Nepavadinta"
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
msgid "Sticky Note: "
msgstr "Lipnus raštelis: "
@@ -985,46 +808,37 @@ msgstr "--- Tasque nepaleistas ---"
msgid "_Underline"
msgstr "_Pabraukimas"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_URL:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_Slaptažodis:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "URL, naudotojo vardo arba slaptažodžio laukas tuščias."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
+msgid "WebDAV"
+msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
-msgid ""
-"There was an error connecting to the server. This may be caused by using an "
-"incorrect user name and/or password."
-msgstr ""
-"Jungiantis prie serverio įvyko klaida. Tai galėjo atsitikti dėl neteisingo "
-"naudotojo vardo ir / arba slaptažodžio."
+#: ../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 "Jungiantis prie serverio įvyko klaida. Tai galėjo atsitikti dėl neteisingo naudotojo vardo ir / arba slaptažodžio."
#. TODO: If the above fails (no keyring daemon), save all but password
#. to GConf, and notify user.
#. Save configuration into GConf
#. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
#. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:254
-msgid ""
-"Saving configuration to the GNOME keyring failed with the following message:"
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
+msgid "Saving configuration to the GNOME keyring failed with the following message:"
msgstr "Išsaugoti konfigūracijos GNOME raktinėje nepavyko. Klaidos pranešimas:"
-#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-msgid "Tomboy Web"
-msgstr "Tomboy tinkle"
-
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Prisijungti prie serverio"
@@ -1033,46 +847,148 @@ msgid "Connected"
msgstr "Prisijungta"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "Serveris neatsako. Pabandykite vėliau."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Autorizacija nesėkminga, bandykite dar kartą"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Tomboy autorizacija sėkminga"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
-msgid ""
-"Please return to the Tomboy Preferences window and press Save to start "
-"synchronizing."
-msgstr ""
-"Grįžkite į Tomboy nustatymų langą ir spauskite „Įrašyti“, jei norite pradėti "
-"sinchronizuoti."
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
+msgid "Please return to the Tomboy Preferences window and press Save to start synchronizing."
+msgstr "Grįžkite į Tomboy nustatymų langą ir spauskite „Įrašyti“, jei norite pradėti sinchronizuoti."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "Prisijungta. Paspauskite „Įrašyti“, jei norite pradėti sinchronizuoti"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Autorizuojama naršyklėje (spauskite, jei norite nutraukti ryšį)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Nustatykite numatytąją naršyklę ir bandykite dar kartą"
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy tinkle"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+#, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "Eksportuoti visus susietus raštelius į {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+#, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "Pradėti raštelių eksportavimą į {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+#, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "Ištrinti pasirinktą užrašinę į {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+#, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "Pradėti eksportuoti užrašinę į {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "Į_rankiai"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "Eksportuoti"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "Eksportuoti raštelius."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+#, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "Eksportuoti visus raštelius į {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+#, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "Eksportuoti pasirinktą užrašinę į {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "Visų {0} raštelių eksportavimas"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "Nepavyko eksportuoti, nėra leidimo."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "Nepavyko eksportuoti, aplankas neegzistuoja."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "Nepavyko eksportuoti: {0}."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "Nežinoma klaida."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:237
+msgid "Unfiled Notes"
+msgstr "Neįkelti rašteliai"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "Jūsų rašteliai buvo eksportuoti į „{0}“."
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "Rašteliai sėkmingai eksportuoti"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "Nepavyko išsaugoti failų „{0}“"
+
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Sukurti paskirties vietą {0} eksportavimui"
+
+#: ../Tomboy/JumpListManager.cs:96
+#: ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
msgstr "Ieškoti visuose rašteliuose"
@@ -1125,26 +1041,6 @@ msgstr "Pavadinimas jau užimtas"
msgid "C_reate"
msgstr "_Sukurti"
-#. The templateNoteTite should show the name of the
-#. notebook. For example, if the name of the notebooks
-#. "Meetings", the templateNoteTitle should be "Meetings
-#. Notebook Template". Translators should place the
-#. name of the notebook accordingly using "{0}".
-#. TODO: Figure out how to make this note for
-#. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
-#, csharp-format
-msgid "{0} Notebook Template"
-msgstr "{0} užrašinės šablonas"
-
-#: ../Tomboy/Notebooks/Notebook.cs:183
-msgid "All Notes"
-msgstr "Visi rašteliai"
-
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "Neįkelti rašteliai"
-
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
msgid "Note_books"
msgstr "_Užrašinės"
@@ -1184,21 +1080,37 @@ msgid "Delete the selected notebook"
msgstr "Ištrinti pasirinktą užrašinę"
#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:276
msgid "Notebooks"
msgstr "Užrašinės"
-#: ../Tomboy/Notebooks/NotebookManager.cs:356
+#. The templateNoteTite should show the name of the
+#. notebook. For example, if the name of the notebooks
+#. "Meetings", the templateNoteTitle should be "Meetings
+#. Notebook Template". Translators should place the
+#. name of the notebook accordingly using "{0}".
+#. TODO: Figure out how to make this note for
+#. translators appear properly.
+#: ../Tomboy/Notebooks/Notebook.cs:79
+#, csharp-format
+msgid "{0} Notebook Template"
+msgstr "{0} užrašinės šablonas"
+
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Naujas raštelis"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
+msgid "All Notes"
+msgstr "Visi rašteliai"
+
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Tikrai ištrinti šią užrašinę?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:358
-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 ""
-"Rašteliai, priklausantys šiai užrašinei, nebus ištrinti, bet jie nebebus "
-"susieti su šia užrašine. Veiksmas nebegalės būti atšauktas."
+#: ../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 "Rašteliai, priklausantys šiai užrašinei, nebus ištrinti, bet jie nebebus susieti su šia užrašine. Veiksmas nebegalės būti atšauktas."
#: ../Tomboy/Notebooks/NotebookMenuItem.cs:14
msgid "No notebook"
@@ -1213,23 +1125,30 @@ msgstr "Jokios užrašinės"
msgid "New \"{0}\" Note"
msgstr "Naujas \"{0}\" raštelis"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Įkelkite šį raštelį į užrašinę"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Užrašinė"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "Nauja _užrašinė..."
-#: ../Tomboy/Note.cs:1568
-msgid "Really delete this note?"
-msgstr "Tikrai ištrinti šį raštelį?"
+#: ../Tomboy/Note.cs:515
+#: ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "Naujas raštelis {0}"
+
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Tikrai ištrinti „{0}“?"
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
@@ -1237,28 +1156,23 @@ msgstr[0] "Tikrai ištrinti šį {0} raštelį?"
msgstr[1] "Tikrai ištrinti šiuos {0} raštelius?"
msgstr[2] "Tikrai ištrinti šiuos {0} raštelių?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Jeigu ištrinsite raštelį, jis bus prarastas visam laikui."
-#: ../Tomboy/Note.cs:1616
+#: ../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 ""
-"Įrašant raštelius įvyko klaida. Patikrinkite, ar yra pakankamai laisvos "
-"vietos diske ir ar turite teises keisti aplanką {0}. Smulkesnę informaciją "
-"galima rasti faile {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 "Įrašant raštelius įvyko klaida. Patikrinkite, ar yra pakankamai laisvos vietos diske ir ar turite teises keisti aplanką {0}. Smulkesnę informaciją galima rasti faile {1}."
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Klaida įrašant raštelio duomenis."
#. New Note Template
#. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21
+#: ../Tomboy/PreferencesDialog.cs:257
msgid "New Note Template"
msgstr "Naujas raštelio šablonas"
@@ -1272,42 +1186,29 @@ msgstr "Jūsų pranešimai buvo perkelti!"
#: ../Tomboy/NoteManager.cs:160
#, 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 ""
-"Vėliausioje Tomboy versijoje Jūsų užrašai buvo perkelti. Turbūt Jums niekada "
-"nerūpėjo, kur saugomi užrašai, ir jei vis dar nerūpi, galite <bold>trinti šį "
-"pranešimą</bold>. :-)\n"
+"Vėliausioje Tomboy versijoje Jūsų užrašai buvo perkelti. Turbūt Jums niekada nerūpėjo, kur saugomi užrašai, ir jei vis dar nerūpi, galite <bold>trinti šį pranešimą</bold>. :-)\n"
"\n"
-"Senas užrašų aplankas liko <link:url>{0}</link:url> . Jei grįšite prie "
-"ankstesnės Tomboy versijos, ji ieškos užrašų ten.\n"
+"Senas užrašų aplankas liko <link:url>{0}</link:url> . Jei grįšite prie ankstesnės Tomboy versijos, ji ieškos užrašų ten.\n"
"\n"
"Užrašai ir nustatymai buvo perkelti į naujus aplankus:\n"
"\n"
"<list><list-item dir=\"ltr\">Užrašai: <link:url>{1}</link:url>\n"
"</list-item><list-item dir=\"ltr\">Nustatymai: <link:url>{2}</link:url>\n"
"</list-item><list-item dir=\"ltr\">Priedai: <link:url>{3}</link:url>\n"
-"</list-item><list-item dir=\"ltr\">Žurnalas: <link:url>{4}</link:url></list-"
-"item></list>\n"
+"</list-item><list-item dir=\"ltr\">Žurnalas: <link:url>{4}</link:url></list-item></list>\n"
"\n"
"Iki!"
@@ -1319,17 +1220,11 @@ 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>Pradėti čia\n"
"\n"
@@ -1337,48 +1232,33 @@ msgstr ""
"\n"
"Pradėkite šiame raštelyje „Pradėti čia“ tvarkyti savo mintis ir idėjas.\n"
"\n"
-"Savo idėjas galite saugoti naujuose rašteliuose, GNOME skydelyje esančiame "
-"Tomboy užrašų meniu pasirinkę elementą „Sukurti naują raštelį“. Jūsų "
-"raštelis bus išsaugotas automatiškai.\n"
+"Savo idėjas galite saugoti naujuose rašteliuose, GNOME skydelyje esančiame Tomboy užrašų meniu pasirinkę elementą „Sukurti naują raštelį“. Jūsų raštelis bus išsaugotas automatiškai.\n"
"\n"
-"Tada tvarkykite kuriamus raštelius susiedami susijusius raštelius ir idėjas "
-"kartu!\n"
+"Tada tvarkykite kuriamus raštelius susiedami susijusius raštelius ir idėjas kartu!\n"
"\n"
-"Sukurtas raštelis <link:internal>Nuorodų naudojimas Tomboy</link:internal>. "
-"Pastebite, kad kiekvieną kartą parašius <link:internal>Nuorodų naudojimas "
-"Tomboy</link:internal>, jis automatiškai pabraukiamas? Norėdami atverti "
-"raštelį, spustelėkite nuorodą.</note-content>"
+"Sukurtas raštelis <link:internal>Nuorodų naudojimas Tomboy</link:internal>. Pastebite, kad kiekvieną kartą parašius <link:internal>Nuorodų naudojimas Tomboy</link:internal>, jis automatiškai pabraukiamas? Norėdami atverti raštelį, spustelėkite nuorodą.</note-content>"
#: ../Tomboy/NoteManager.cs:284
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>Saitų naudojimas Tomboy\n"
"\n"
-"Programoje Tomboy raštelius galima susieti kartu, pažymėjus raštelyje esantį "
-"tekstą ir spustelėjus virš įrankinės esantį mygtuką <bold>Susieti</bold> "
-"Taip bus sukurtas naujas raštelis bei šiame raštelyje pabrėžtas raštelio "
-"pavadinimas.\n"
+"Programoje Tomboy raštelius galima susieti kartu, pažymėjus raštelyje esantį tekstą ir spustelėjus virš įrankinės esantį mygtuką <bold>Susieti</bold> Taip bus sukurtas naujas raštelis bei šiame raštelyje pabrėžtas raštelio pavadinimas.\n"
"\n"
-"Pakeitus raštelio pavadinimą, saitai, esantys kituose rašteliuose, taip pat "
-"bus atnaujinti. Taip pervadinus raštelį nesugadinami saitai į jį.\n"
+"Pakeitus raštelio pavadinimą, saitai, esantys kituose rašteliuose, taip pat bus atnaujinti. Taip pervadinus raštelį nesugadinami saitai į jį.\n"
"\n"
-"Taip pat, jeigu įvesite kito raštelio pavadinimą dabartiniame raštelyje, "
-"automatiškai bus sukurtas saitas į jį.</note-content>"
+"Taip pat, jeigu įvesite kito raštelio pavadinimą dabartiniame raštelyje, automatiškai bus sukurtas saitas į jį.</note-content>"
#. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
+#: ../Tomboy/NoteManager.cs:299
+#: ../Tomboy/NoteManager.cs:395
msgid "Start Here"
msgstr "Pradėkite čia"
@@ -1386,14 +1266,10 @@ msgstr "Pradėkite čia"
msgid "Using Links in Tomboy"
msgstr "Saitų naudojimas Tomboy"
-#: ../Tomboy/NoteManager.cs:445
-#, csharp-format
-msgid "New Note {0}"
-msgstr "Naujas raštelis {0}"
-
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
+#: ../Tomboy/NoteManager.cs:543
+#: ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Čia aprašykite naują raštelį"
@@ -1412,13 +1288,11 @@ msgstr "_Nepervadinti saitų"
#: ../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 ""
-"Pervadinti \"<span underline=\"single\">{0}</span>\" į \"<span underline="
-"\"single\">{1}</span>\"?\n"
+"Pervadinti \"<span underline=\"single\">{0}</span>\" į \"<span underline=\"single\">{1}</span>\"?\n"
"\n"
"Jei nepervadinsite saitų, jos į nieką neberodys."
@@ -1457,139 +1331,161 @@ msgstr "_Niekada nepervadinti saitų"
msgid "Alwa_ys rename links"
msgstr "_Visada pervadinti saitus"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "Ieškoti šiame raštelyje"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "Sukurti saitą į naują _raštelį"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "Te_kstas"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_Ieškoti šiame raštelyje"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "Už_verti visus raštelius"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Ieškoti"
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "Ieškoti raštelių (Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:445
+msgid "Search your notes"
+msgstr "Ieškoti rašteliuose"
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Susieti"
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "Susieti pažymėtą tekstą su nauju rašteliu (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
+msgid "Link selected text to a new note"
+msgstr "Susieti pažymėtą tekstą su nauju rašteliu"
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Tekstas"
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Nurodyti teksto savybes"
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "Į_rankiai"
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Naudoti įrankius šiame raštelyje"
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Ištrinti šį raštelį"
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507
+#: ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Sinchronizoti raštelius"
-#: ../Tomboy/NoteWindow.cs:562
+#: ../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 "Tai yra šablono raštelis. Jis nusako numatytąjį įprastinių raštelių turinį ir nebus rodomas raštelių meniu arba paieškos lange."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Paversti įprastiniu rašteliu"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Išsaugoti _dydį"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Įrašyti pažymėjimą"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Įrašyti _pavadinimą"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Ieškoti..."
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "Ieškoti _kito"
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "Ieškoti _ankstesnio"
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Nepavyko sukurti raštelio"
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Ieškoti:"
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Ankstesnis"
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Kitas"
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "P_usjuodis"
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Kursyvas"
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Perbrauktas"
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "Pa_ryškintas"
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Šrifto dydis"
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Normalus"
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "Milžiniš_kas"
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Didelis"
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Mažas"
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Didinti šriftą"
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Mažinti šriftą"
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Punktai"
@@ -1609,264 +1505,228 @@ msgstr "Sinchronizavimas"
msgid "Add-ins"
msgstr "Priedai"
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
msgid "_Spell check while typing"
msgstr "_Rašant tekstą tikrinti rašybą"
-#: ../Tomboy/PreferencesDialog.cs:182
-msgid ""
-"Misspellings will be underlined in red, with correct spelling suggestions "
-"shown in the context menu."
-msgstr ""
-"Neteisingai parašyti žodžiai bus pabraukti raudonai, kontekstiniame meniu "
-"rodant teisingos rašybos pasiūlymus."
+#: ../Tomboy/PreferencesDialog.cs:183
+msgid "Misspellings will be underlined in red, with correct spelling suggestions shown in the context menu."
+msgstr "Neteisingai parašyti žodžiai bus pabraukti raudonai, kontekstiniame meniu rodant teisingos rašybos pasiūlymus."
#. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
msgid "Highlight _WikiWords"
msgstr "Paryškinti _WikiŽodžius"
-#: ../Tomboy/PreferencesDialog.cs:201
-msgid ""
-"Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
-"word will create a note with that name."
-msgstr ""
-"Įjunkite šį nustatymą norėdami paryškinti žodžius <b>AtrodančiusŠtaiTaip</"
-"b>. Paspaudus tokį žodį bus sukurtas raštelis su tokiu pavadinimu."
+#: ../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 "Įjunkite šį nustatymą norėdami paryškinti žodžius <b>AtrodančiusŠtaiTaip</b>. Paspaudus tokį žodį bus sukurtas raštelis su tokiu pavadinimu."
#. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
msgid "Enable auto-_bulleted lists"
msgstr "Įjungti automatinį _sąrašų formatą"
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
msgid "Use custom _font"
msgstr "Naudoti pasirinktinį šri_ftą"
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
msgid "When renaming a linked note: "
msgstr "Pervadinant susijusį raštelį: "
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
msgid "Ask me what to do"
msgstr "Paklausti, ką daryti"
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
msgid "Never rename links"
msgstr "Niekada nepervadinti saitų"
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
msgid "Always rename links"
msgstr "Visada pervadinti saitus"
-#: ../Tomboy/PreferencesDialog.cs:260
-msgid ""
-"Use the new note template to specify the text that should be used when "
-"creating a new note."
-msgstr ""
-"Nurodykite naujo raštelio šablone tekstą, kuris turėtų būti naudojamas "
-"kuriant naujus raštelius."
+#: ../Tomboy/PreferencesDialog.cs:261
+msgid "Use the new note template to specify the text that should be used when creating a new note."
+msgstr "Nurodykite naujo raštelio šablone tekstą, kuris turėtų būti naudojamas kuriant naujus raštelius."
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
msgid "Open New Note Template"
msgstr "Atverti naujo raštelio šabloną"
#. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
msgid "Listen for _Hotkeys"
msgstr "Klausytis _karštųjų klavišų"
-#: ../Tomboy/PreferencesDialog.cs:335
-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 ""
-"Karštieji klavišai leidžia Jums pasiekti raštelius iš bet kur klavišų "
-"paspaudimu. Pavyzdiniai karštieji klavišai: <b><Control><Shift>"
-"F11</b>, <b><Alt>N</b>"
+#: ../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 "Karštieji klavišai leidžia Jums pasiekti raštelius iš bet kur klavišų paspaudimu. Pavyzdiniai karštieji klavišai: <b><Control><Shift>F11</b>, <b><Alt>N</b>"
#. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
msgid "Show notes _menu"
msgstr "Rodyti raštelių _meniu"
#. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
msgid "Open \"_Start Here\""
msgstr "Atverti „Pradėti čia“"
#. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
msgid "Create _new note"
msgstr "Sukurti _naują raštelį"
#. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
msgid "Open \"Search _All Notes\""
msgstr "Atverti „Ieškoti _visuose rašteliuose“"
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
msgid "Ser_vice:"
msgstr "Tar_nyba:"
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487
+#: ../Tomboy/PreferencesDialog.cs:1106
msgid "Not configurable"
msgstr "Nekonfigūruojama"
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
msgid "Automaticall_y Sync in Background Every"
msgstr "_Automatiškai sinchronizuoti fone kas"
#. Translators: See above comment for details on
#. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
msgid "Minutes"
msgstr "minučių"
#. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
msgid "_Advanced..."
msgstr "_Sudėtingesni..."
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
msgid "The following add-ins are installed"
msgstr "Įdiegti šie priedai"
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
msgid "Get More Add-Ins..."
msgstr "Parsiųsti daugiau įskiepių..."
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
msgid "_Enable"
msgstr "Įj_ungti"
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
msgid "_Disable"
msgstr "_Išjungti"
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
msgid "Not Implemented"
msgstr "Neįgyvendinta"
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
#, csharp-format
msgid "{0} Preferences"
msgstr "{0} nustatymai"
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
msgid "Choose Note Font"
msgstr "Pasirinkite raštelio šriftą"
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
msgid "Other Synchronization Options"
msgstr "Kitos sinchronizavimo parinktys"
-#: ../Tomboy/PreferencesDialog.cs:988
-msgid ""
-"When a conflict is detected between a local note and a note on the "
-"configured synchronization server:"
-msgstr ""
-"Kai randamas konfliktas tarp vietinio raštelio ir raštelio sukonfigūruotame "
-"sinchronizavimo serveryje:"
+#: ../Tomboy/PreferencesDialog.cs:981
+msgid "When a conflict is detected between a local note and a note on the configured synchronization server:"
+msgstr "Kai randamas konfliktas tarp vietinio raštelio ir raštelio sukonfigūruotame sinchronizavimo serveryje:"
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
msgid "Always ask me what to do."
msgstr "Visada paklausti manęs ką daryti."
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
msgid "Rename my local note."
msgstr "Pervadinti mano vietinį raštelį."
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
msgid "Replace my local note with the server's update."
msgstr "Pakeisti mano vietinį raštelį naujesniu iš serverio."
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "DĖMESIO: Ar tikrai?"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "Ar tikrai?"
-#: ../Tomboy/PreferencesDialog.cs:1151
-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 ""
-"Išvalyti sinchronizavimo parametrų nerekomenduojama. Išsaugojus naujus "
-"parametrus galite būti priversti sinchronizuoti visus savo raštelius dar "
-"kartą."
+#: ../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 "Išvalyti sinchronizavimo parametrų nerekomenduojama. Išsaugojus naujus parametrus galite būti priversti sinchronizuoti visus savo raštelius dar kartą."
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
msgid "Resetting Synchronization Settings"
msgstr "Atstatomi sinchronizavimo parametrai"
-#: ../Tomboy/PreferencesDialog.cs:1166
-msgid ""
-"You have disabled the configured synchronization service. Your "
-"synchronization settings will now be cleared. You may be forced to "
-"synchronize all of your notes again when you save new settings"
-msgstr ""
-"Jūs išjungėte sukonfigūruotą sinchronizavimo tarnybą. Jūsų sinchronizavimo "
-"parametrai dabar bus išvalyti. Išsaugoję naujus parametrus galite būti "
-"priversti sinchronizuoti visus savo raštelius dar kartą."
+#: ../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 "Jūs išjungėte sukonfigūruotą sinchronizavimo tarnybą. Jūsų sinchronizavimo parametrai dabar bus išvalyti. Išsaugoję naujus parametrus galite būti priversti sinchronizuoti visus savo raštelius dar kartą."
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "Jūs sėkmingai prisijungėte!"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "Prisijungimas sėkmingas"
-#: ../Tomboy/PreferencesDialog.cs:1246
-msgid ""
-"Tomboy is ready to synchronize your notes. Would you like to synchronize "
-"them now?"
-msgstr ""
-"Tomboy paruošta jūsų raštelių sinchronizavimui. Ar norėtumėte sinchronizuoti "
-"juos dabar?"
+#: ../Tomboy/PreferencesDialog.cs:1239
+msgid "Tomboy is ready to synchronize your notes. Would you like to synchronize them now?"
+msgstr "Tomboy paruošta jūsų raštelių sinchronizavimui. Ar norėtumėte sinchronizuoti juos dabar?"
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-msgid ""
-"Sorry, but something went wrong. Please check your information and try "
-"again. The {0} might be useful too."
-msgstr ""
-"Atsiprašome, tačiau kažkas negerai. Patikrinkite savo informaciją ir "
-"bandykite dar kartą. Taip pat gali būti naudingas failas {0}."
+msgid "Please check your information and try again. The log file {0} may contain more information about the error."
+msgstr "Patikrinkite savo informaciją ir bandykite dar kartą. Žurnalo failas {0} gali turėti daugiau informacijos apie klaidą."
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "Klaida jungiantis :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "Klaida jungiantis"
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Versija:"
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Autorius:"
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Autorinės teisės:"
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Priedo priklausomybės:"
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
msgid "_Search:"
msgstr "_Ieškoti:"
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:350
msgid "Note"
msgstr "Raštelis"
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Paskutinis pakeitimas"
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Atitikmenys"
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:563
+msgid "Title match"
+msgstr "Atitikmuo pavadinime"
+
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
@@ -1874,7 +1734,7 @@ msgstr[0] "{0} atitikmuo"
msgstr[1] "{0} atitikmenys"
msgstr[2] "{0} atitkmenų"
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
@@ -1882,7 +1742,7 @@ msgstr[0] "Iš viso: {0} raštelis"
msgstr[1] "Iš viso: {0} rašteliai"
msgstr[2] "Iš viso: {0} raštelių"
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
@@ -1890,227 +1750,26 @@ msgstr[0] "Atitinka: {0} raštelį"
msgstr[1] "Atitinka: {0} raštelius"
msgstr[2] "Atitinka: {0} raštelių"
-#: ../Tomboy/RecentChanges.cs:696
-msgid "Notes"
-msgstr "Rašteliai"
-
-#: ../Tomboy/Tomboy.cs:251
-msgid "Cannot create new note"
-msgstr "Nepavyko sukurti naujo raštelio"
-
-#: ../Tomboy/Tomboy.cs:317
-msgid "Primary Development:"
-msgstr "Pagrindinis vystymas:"
-
-#: ../Tomboy/Tomboy.cs:323
-msgid "Contributors:"
-msgstr "Pagalbininkai:"
-
-#: ../Tomboy/Tomboy.cs:388
-msgid "translator-credits"
-msgstr "Žygimantas Beručka <zygis at gnome.org>"
-
-#: ../Tomboy/Tomboy.cs:397
-msgid ""
-"Copyright © 2004-2007 Alex Graveley\n"
-"Copyright © 2004-2009 Others\n"
-msgstr ""
-"Autorinės teisės priklauso © 2004-2007 Alex Graveley\n"
-"Autorinės teisės priklauso © 2004-2009 kitiems\n"
-
-#: ../Tomboy/Tomboy.cs:399
-msgid "A simple and easy to use desktop note-taking application."
-msgstr "Paprasta ir lengva naudoti aplinkos užrašinė."
-
-#: ../Tomboy/Tomboy.cs:409
-msgid "Homepage"
-msgstr "Tinklalapis"
-
-#: ../Tomboy/Tomboy.cs:527
-msgid ""
-"Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-msgstr ""
-"Tomboy: Paprasta, lengva naudoti darbastalio užrašinė.\n"
-"Autorinės teisės (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-"\n"
-
-#: ../Tomboy/Tomboy.cs:539
-msgid ""
-"Usage:\n"
-" --version\t\t\tPrint version information.\n"
-" --help\t\t\tPrint this usage message.\n"
-" --note-path [path]\t\tLoad/store note data in this directory.\n"
-" --search [text]\t\tOpen the search all notes window with the search text.\n"
-msgstr ""
-"Naudojimas:\n"
-" --version\t\t\tParodyti versijos informaciją.\n"
-" --help\t\t\tParodyti šią naudojimosi žinutę.\n"
-" --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:549
-msgid ""
-" --new-note\t\t\tCreate and display a new note.\n"
-" --new-note [title]\t\tCreate and display a new note, with a title.\n"
-" --open-note [title/url]\tDisplay the existing note matching title.\n"
-" --start-here\t\t\tDisplay the 'Start Here' note.\n"
-" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
-msgstr ""
-"Naudojimas:\n"
-" --new-note\t\t\tSukurti ir parodyti naują raštelį.\n"
-" --new-note [pavadinimas]\t\tSukurti ir parodyti naują raštelį su "
-"pavadinimu.\n"
-" --open-note [pavadinimas/url]\tParodyti egzistuojantį raštelį atitinkamu "
-"pavadinimu.\n"
-" --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:563
-#, csharp-format
-msgid "Version {0}"
-msgstr "Versija {0}"
-
-#: ../Tomboy/Tray.cs:68
-msgid " (new)"
-msgstr " (naujas)"
-
-#: ../Tomboy/Tray.cs:293
-msgid "_About Tomboy"
-msgstr "_Apie Tomboy"
-
-#: ../Tomboy/Utils.cs:189
-msgid ""
-"The \"Tomboy Notes Manual\" could not be found. Please verify that your "
-"installation has been completed successfully."
-msgstr ""
-"„Tomboy raštelių žinynas“ nerastas. Patikrinkite, ar programa buvo įdiegta "
-"sėkmingai."
-
-#: ../Tomboy/Utils.cs:198
-msgid "Help not found"
-msgstr "Žinynas nerastas"
-
-#: ../Tomboy/Utils.cs:214
-msgid "Cannot open location"
-msgstr "Nepavyko atverti vietos"
-
-#: ../Tomboy/Utils.cs:236
-#, csharp-format
-msgid "Today, {0}"
-msgstr "Šiandien, {0}"
-
-#: ../Tomboy/Utils.cs:238
-msgid "Today"
-msgstr "Šiandien"
-
-#: ../Tomboy/Utils.cs:242
-#, csharp-format
-msgid "Yesterday, {0}"
-msgstr "Vakar, {0}"
-
-#: ../Tomboy/Utils.cs:244
-msgid "Yesterday"
-msgstr "Vakar"
-
-#: ../Tomboy/Utils.cs:249
-#, csharp-format
-msgid "{0} day ago, {1}"
-msgid_plural "{0} days ago, {1}"
-msgstr[0] "prieš {0} dieną, {1}"
-msgstr[1] "prieš {0} dienas, {1}"
-msgstr[2] "prieš {0} dienų, {1}"
-
-#: ../Tomboy/Utils.cs:253
-#, csharp-format
-msgid "{0} day ago"
-msgid_plural "{0} days ago"
-msgstr[0] "prieš {0} dieną"
-msgstr[1] "prieš {0} dienas"
-msgstr[2] "prieš {0} dienų"
-
-#: ../Tomboy/Utils.cs:259
-#, csharp-format
-msgid "Tomorrow, {0}"
-msgstr "Rytoj, {0}"
-
-#: ../Tomboy/Utils.cs:261
-msgid "Tomorrow"
-msgstr "Rytoj"
-
-#: ../Tomboy/Utils.cs:266
-#, csharp-format
-msgid "In {0} day, {1}"
-msgid_plural "In {0} days, {1}"
-msgstr[0] "Po {0} dienos, {1}"
-msgstr[1] "Po {0} dienų, {1}"
-msgstr[2] "Po {0} dienų, {1}"
-
-#: ../Tomboy/Utils.cs:270
-#, csharp-format
-msgid "In {0} day"
-msgid_plural "In {0} days"
-msgstr[0] "Po {0} dienos"
-msgstr[1] "Po {0} dienų"
-msgstr[2] "Po {0} dienų"
-
-#: ../Tomboy/Utils.cs:275
-msgid "MMMM d, h:mm tt"
-msgstr "MMMM d, h:mm tt"
-
-#: ../Tomboy/Utils.cs:276
-msgid "MMMM d"
-msgstr "MMMM d"
-
-#: ../Tomboy/Utils.cs:278
-msgid "No Date"
-msgstr "Nėra datos"
-
-#: ../Tomboy/Utils.cs:281
-msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyy MMMM d, hh:mm tt"
-
-#: ../Tomboy/Utils.cs:282
-msgid "MMMM d yyyy"
-msgstr "yyyy MMMM d"
-
-#: ../Tomboy/Watchers.cs:155
-#, csharp-format
-msgid "(Untitled {0})"
-msgstr "(Nepavadinta {0})"
-
-#: ../Tomboy/Watchers.cs:189
-#, csharp-format
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
-"A note with the title <b>{0}</b> already exists. Please choose another name "
-"for this note before continuing."
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
msgstr ""
-"Raštelis pavadinimu <b>{0}</b> jau egzistuoja. Norėdami tęsti, turite "
-"pasirinkti kitą šio raštelio pavadinimą."
-
-#: ../Tomboy/Watchers.cs:204
-msgid "Note title taken"
-msgstr "Raštelio pavadinimas užimtas"
+"Nerasta rezultatų pasirinktoje užrašinėje.\n"
+"Spauskite čia, jei norite ieškoti visuose rašteliuose."
-#: ../Tomboy/Watchers.cs:549
-msgid "_Copy Link Address"
-msgstr "_Kopijuoti saito adresą"
+#: ../Tomboy/RecentChanges.cs:609
+msgid "Click here to search across all notebooks"
+msgstr "Spauskite čia, jei norite ieškoti visuose rašteliuose"
-#: ../Tomboy/Watchers.cs:554
-msgid "_Open Link"
-msgstr "_Atverti saitą"
+#: ../Tomboy/RecentChanges.cs:775
+msgid "Notes"
+msgstr "Rašteliai"
#: ../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 ""
-"Šis sinchronizacijos įskiepis jūsų kompiuteryje nepalaikomas. Įsitikinkite, "
-"kad FUSE ir {0} įdiegti ir sukonfigūruoti"
+msgid "This synchronization addin is not supported on your computer. Please make sure you have FUSE and {0} correctly installed and configured"
+msgstr "Šis sinchronizacijos įskiepis jūsų kompiuteryje nepalaikomas. Įsitikinkite, kad FUSE ir {0} įdiegti ir sukonfigūruoti"
#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
msgid "Could not read testfile."
@@ -2186,12 +1845,8 @@ msgid "Server is locked"
msgstr "Serveris užrakintas"
#: ../Tomboy/Synchronization/SyncDialog.cs:270
-msgid ""
-"One of your other computers is currently synchronizing. Please wait 2 "
-"minutes and try again."
-msgstr ""
-"Vienas iš kitų Jūsų kompiuterių dabar vykdo sinchronizavimą. Palaukite porą "
-"minučių ir bandykite dar kartą."
+msgid "One of your other computers is currently synchronizing. Please wait 2 minutes and try again."
+msgstr "Vienas iš kitų Jūsų kompiuterių dabar vykdo sinchronizavimą. Palaukite porą minučių ir bandykite dar kartą."
#: ../Tomboy/Synchronization/SyncDialog.cs:274
msgid "Preparing to download updates from server..."
@@ -2215,9 +1870,7 @@ msgstr "Sinchronizuoti nepavyko"
#: ../Tomboy/Synchronization/SyncDialog.cs:285
msgid "Could not synchronize notes. Check the details below and try again."
-msgstr ""
-"Nepavyko sinchronizuoti raštelių. Žiūrėkite žemiau esančią informaciją ir "
-"bandykite dar kartą."
+msgstr "Nepavyko sinchronizuoti raštelių. Žiūrėkite žemiau esančią informaciją ir bandykite dar kartą."
#: ../Tomboy/Synchronization/SyncDialog.cs:291
msgid "Synchronization Complete"
@@ -2331,16 +1984,8 @@ msgstr "Aptiktas raštelių konfliktas"
#: ../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 ""
-"Serveryje esanti „{0}“ versija konfliktuoja su jūsų vietiniu rašteliu. Ką "
-"daryti su jūsų vietiniu rašteliu?"
-
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "Į_rankiai"
+msgid "The server version of \"{0}\" conflicts with your local note. What do you want to do with your local note?"
+msgstr "Serveryje esanti „{0}“ versija konfliktuoja su jūsų vietiniu rašteliu. Ką daryti su jūsų vietiniu rašteliu?"
#: ../Tomboy/Synchronization/SyncUtils.cs:119
#: ../Tomboy/Synchronization/SyncUtils.cs:163
@@ -2349,12 +1994,8 @@ msgstr "Nepavyko įjungti 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 ""
-"Nepavyko įkelti FUSE modulio. Patikrinkite, ar jis tinkamai įdiegtas ir "
-"bandykite dar kartą."
+msgid "The FUSE module could not be loaded. Please check that it is installed properly and try again."
+msgstr "Nepavyko įkelti FUSE modulio. Patikrinkite, ar jis tinkamai įdiegtas ir bandykite dar kartą."
#: ../Tomboy/Synchronization/SyncUtils.cs:135
msgid "Enable FUSE?"
@@ -2366,15 +2007,230 @@ msgstr "Įjungti 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 ""
"Jūsų pasirinktam sinchronizavimui reikia įkelti FUSE modulį.\n"
"\n"
-"Norėdami išvengti šio klausimo ateityje, turėtumėte įkelti FUSE paleidimo "
-"metu. Faile /etc/init.d/boot.local pridėkite „modprobe fuse“ arba faile /etc/"
-"modules – „fuse“."
+"Norėdami išvengti šio klausimo ateityje, turėtumėte įkelti FUSE paleidimo metu. Faile /etc/init.d/boot.local pridėkite „modprobe fuse“ arba faile /etc/modules – „fuse“."
+
+#: ../Tomboy/Tomboy.cs:251
+msgid "Cannot create new note"
+msgstr "Nepavyko sukurti naujo raštelio"
+
+#: ../Tomboy/Tomboy.cs:317
+msgid "Primary Development:"
+msgstr "Pagrindinis vystymas:"
+
+#: ../Tomboy/Tomboy.cs:330
+msgid "Contributors:"
+msgstr "Pagalbininkai:"
+
+#: ../Tomboy/Tomboy.cs:415
+msgid "translator-credits"
+msgstr "Žygimantas Beručka <zygis at gnome.org>"
+
+#: ../Tomboy/Tomboy.cs:424
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Autorinės teisės priklauso © 2004-2007 Alex Graveley\n"
+"Autorinės teisės priklauso © 2004-2011 kitiems\n"
+
+#: ../Tomboy/Tomboy.cs:426
+msgid "A simple and easy to use desktop note-taking application."
+msgstr "Paprasta ir lengva naudoti aplinkos užrašinė."
+
+#: ../Tomboy/Tomboy.cs:436
+msgid "Homepage"
+msgstr "Tinklalapis"
+
+#: ../Tomboy/Tomboy.cs:554
+msgid ""
+"Tomboy: A simple, easy to use desktop note-taking application.\n"
+"Copyright © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Copyright © 2004-2011 Others\n"
+msgstr ""
+"Tomboy: Paprasta, lengva naudoti darbastalio užrašinė.\n"
+"Autorinės teisės priklauso © 2004-2007 Alex Graveley\n"
+"<alex at beatniksoftware.com>\n"
+"\n"
+"Autorinės teisės priklauso © 2004-2011 kitiems\n"
+
+#: ../Tomboy/Tomboy.cs:568
+msgid ""
+"Usage:\n"
+" --version\t\t\tPrint version information.\n"
+" --help\t\t\tPrint this usage message.\n"
+" --note-path [path]\t\tLoad/store note data in this directory.\n"
+" --search [text]\t\tOpen the search all notes window with the search text.\n"
+msgstr ""
+"Naudojimas:\n"
+" --version\t\t\tParodyti versijos informaciją.\n"
+" --help\t\t\tParodyti šią naudojimosi žinutę.\n"
+" --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:578
+msgid ""
+" --new-note\t\t\tCreate and display a new note.\n"
+" --new-note [title]\t\tCreate and display a new note, with a title.\n"
+" --open-note [title/url]\tDisplay the existing note matching title.\n"
+" --start-here\t\t\tDisplay the 'Start Here' note.\n"
+" --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+msgstr ""
+"Naudojimas:\n"
+" --new-note\t\t\tSukurti ir parodyti naują raštelį.\n"
+" --new-note [pavadinimas]\t\tSukurti ir parodyti naują raštelį su pavadinimu.\n"
+" --open-note [pavadinimas/url]\tParodyti egzistuojantį raštelį atitinkamu pavadinimu.\n"
+" --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:592
+#, csharp-format
+msgid "Version {0}"
+msgstr "Versija {0}"
+
+#: ../Tomboy/Tray.cs:68
+msgid " (new)"
+msgstr " (naujas)"
+
+#: ../Tomboy/Tray.cs:293
+msgid "_About Tomboy"
+msgstr "_Apie Tomboy"
+
+#: ../Tomboy/Utils.cs:189
+msgid "The \"Tomboy Notes Manual\" could not be found. Please verify that your installation has been completed successfully."
+msgstr "„Tomboy raštelių žinynas“ nerastas. Patikrinkite, ar programa buvo įdiegta sėkmingai."
+
+#: ../Tomboy/Utils.cs:198
+msgid "Help not found"
+msgstr "Žinynas nerastas"
+
+#: ../Tomboy/Utils.cs:214
+msgid "Cannot open location"
+msgstr "Nepavyko atverti vietos"
+
+#: ../Tomboy/Utils.cs:236
+#, csharp-format
+msgid "Today, {0}"
+msgstr "Šiandien, {0}"
+
+#: ../Tomboy/Utils.cs:238
+msgid "Today"
+msgstr "Šiandien"
+
+#: ../Tomboy/Utils.cs:242
+#, csharp-format
+msgid "Yesterday, {0}"
+msgstr "Vakar, {0}"
+
+#: ../Tomboy/Utils.cs:244
+msgid "Yesterday"
+msgstr "Vakar"
+
+#: ../Tomboy/Utils.cs:249
+#, csharp-format
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "prieš {0} dieną, {1}"
+msgstr[1] "prieš {0} dienas, {1}"
+msgstr[2] "prieš {0} dienų, {1}"
+
+#: ../Tomboy/Utils.cs:253
+#, csharp-format
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "prieš {0} dieną"
+msgstr[1] "prieš {0} dienas"
+msgstr[2] "prieš {0} dienų"
+
+#: ../Tomboy/Utils.cs:259
+#, csharp-format
+msgid "Tomorrow, {0}"
+msgstr "Rytoj, {0}"
+
+#: ../Tomboy/Utils.cs:261
+msgid "Tomorrow"
+msgstr "Rytoj"
+
+#: ../Tomboy/Utils.cs:266
+#, csharp-format
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "Po {0} dienos, {1}"
+msgstr[1] "Po {0} dienų, {1}"
+msgstr[2] "Po {0} dienų, {1}"
+
+#: ../Tomboy/Utils.cs:270
+#, csharp-format
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "Po {0} dienos"
+msgstr[1] "Po {0} dienų"
+msgstr[2] "Po {0} dienų"
+
+#: ../Tomboy/Utils.cs:275
+msgid "MMMM d, h:mm tt"
+msgstr "MMMM d, h:mm tt"
+
+#: ../Tomboy/Utils.cs:276
+msgid "MMMM d"
+msgstr "MMMM d"
+
+#: ../Tomboy/Utils.cs:278
+msgid "No Date"
+msgstr "Nėra datos"
+
+#: ../Tomboy/Utils.cs:281
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "yyyy MMMM d, hh:mm tt"
+
+#: ../Tomboy/Utils.cs:282
+msgid "MMMM d yyyy"
+msgstr "yyyy MMMM d"
+
+#: ../Tomboy/Watchers.cs:155
+#, csharp-format
+msgid "(Untitled {0})"
+msgstr "(Nepavadinta {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 "Raštelis pavadinimu <b>{0}</b> jau egzistuoja. Norėdami tęsti, turite pasirinkti kitą šio raštelio pavadinimą."
+
+#: ../Tomboy/Watchers.cs:204
+msgid "Note title taken"
+msgstr "Raštelio pavadinimas užimtas"
+
+#: ../Tomboy/Watchers.cs:587
+msgid "_Copy Link Address"
+msgstr "_Kopijuoti saito adresą"
+
+#: ../Tomboy/Watchers.cs:592
+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..."
diff --git a/po/nb.po b/po/nb.po
index 07f7fac..3424223 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,10 +6,10 @@
# Kjartan Maraas <kmaraas at gnome.org>, 2006-2011.
msgid ""
msgstr ""
-"Project-Id-Version: Tomboy 1.5.3\n"
+"Project-Id-Version: Tomboy 1.7.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-13 11:49+0200\n"
-"PO-Revision-Date: 2011-07-13 11:55+0200\n"
+"POT-Creation-Date: 2011-09-01 08:17+0200\n"
+"PO-Revision-Date: 2011-09-01 08:18+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas at gnome.org>\n"
"Language-Team: Norwegian Bokmal <i18n-nb at lister.ping.uio.no>\n"
"Language: nb\n"
@@ -631,7 +631,7 @@ msgstr "_Slett"
msgid "Delete the selected note"
msgstr "Slett valgt notat"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "_Lukk"
@@ -675,7 +675,7 @@ msgstr "TrayIcon"
msgid "Create _New Note"
msgstr "Opprett _nytt notat"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Søk i alle notatene"
@@ -813,16 +813,16 @@ msgstr "Sti til _mappe:"
msgid "Select Synchronization Folder..."
msgstr "Velg synkroniseringsmappe …"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "Felt for sti til mappe er tomt."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "Oppgit mappesti eksisterer ikke og Tomboy kunne ikke opprette den."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Lokal mappe"
@@ -887,7 +887,9 @@ msgstr "Avtaler"
msgid ""
"Change the <b>Today: Template</b> note to customize the text that new Today "
"notes have."
-msgstr "Endre <b>I dag: Mal</b>-notatet for å tilpasse teksten som nye «I dag»-notater har."
+msgstr ""
+"Endre <b>I dag: Mal</b>-notatet for å tilpasse teksten som nye «I dag»-"
+"notater har."
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -921,22 +923,22 @@ msgstr "Fjern brutte lenker"
msgid "Add a sketch"
msgstr "Legg til en skisse"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Tjene_r:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "Bruker_navn:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "Stil til _mappe (valgfri):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../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."
@@ -944,15 +946,15 @@ msgstr ""
"SSH-synkronisering krever en eksisterende SSH-nøkkel for denne tjeneren og "
"brukeren i tillegg til en kjørende SSH-tjeneste."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "Felt for tjener eller brukernavn er tomt."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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."
@@ -1013,23 +1015,23 @@ msgstr "--- Tasque kjører ikke ---"
msgid "_Underline"
msgstr "_Understrek"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_URL:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_Passord:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "Felt for URL, brukernavn eller passord er tomt."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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."
@@ -1042,14 +1044,14 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr ""
"Lagring av konfigurasjon til GNOME-nøkkelring feilet med følgende melding:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Koble til tjener"
@@ -1058,23 +1060,23 @@ msgid "Connected"
msgstr "Tilkoblet"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "Tjener svarer ikke. Prøv igjen senere."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Autorisering feilet. Prøv igjen"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Web-autorisering for Tomboy fullført"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
@@ -1082,18 +1084,18 @@ msgstr ""
"Vennligst gå tilbake til brukervalg-vinduet i Tomboy og trykk Lagre for å "
"starte synkronisering."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "Tilkoblet. Klikk på Lagre for å starte synkronisering"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Autoriserer i nettleser (Trykk for å nullstille tilkoblingen)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Sett forvalgt nettleser og prøv igjen"
@@ -1102,20 +1104,24 @@ msgid "Tomboy Web"
msgstr "Tomboy nettside"
#: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Eksporter alle notater til "
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Eksporter alle notater til {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Start eksport av notater til "
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Start eksport av notater til {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Eksporter valgt notisblokk til "
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Eksporter valgt notisblokk til {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Start eksport av notisblokk til "
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Start eksport av notisblokk til {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1131,12 +1137,19 @@ msgid "Export your notes."
msgstr "Eksporter dine notater."
#: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Eksporter alle notater til "
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Eksporter alle notater til {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Eksporter valgt notisblokk til "
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Eksporter valgt notisblokk til {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Alle notater {0} eksport"
#: ../Tomboy/ExportAllApplicationAddin.cs:193
#: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -1160,7 +1173,7 @@ msgid "Unknown error."
msgstr "Ukjent feil."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "Notater som ikke er lagret"
@@ -1178,9 +1191,11 @@ msgstr "Eksport av notater fullført"
msgid "Could not save the files in \"{0}\""
msgstr "Kunne ikke lagre filen i «{0}»"
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Lag målmappe for "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Lag målmappe for eksport av {0}"
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1290,15 +1305,19 @@ msgstr "Notatblokker"
msgid "{0} Notebook Template"
msgstr "{0} notisblokkmal"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Nytt notat"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "Alle notater"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Vil du virkelig slette denne notisblokken?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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."
@@ -1320,39 +1339,40 @@ msgstr "Ingen notisblokk"
msgid "New \"{0}\" Note"
msgstr "Nytt {0}-notat"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Plasser dette notatet i en notisblokk"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Notisblokk"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "_Ny notisblokk …"
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Nytt notat {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Vil du slette dette notatet?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Vil du virkelig slette «{0}»?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Vil du virkelig slette dette {0} notatet?"
msgstr[1] "Vil du slette disse {0} notatene?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Hvis du sletter et notat blir det tapt for alltid."
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1362,7 +1382,7 @@ msgstr ""
"En feil oppsto under lagring av dine notater. Sjekk at du har nok diskplass "
"og at du har nok rettigheter på {0}. Detaljer om feilen kan finnes i {1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Feil ved lagring av notatdata."
@@ -1503,7 +1523,7 @@ msgstr "Bruk av lenker i Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Skriv innholdet her."
@@ -1567,140 +1587,164 @@ msgstr "Aldri endre navn på _lenker"
msgid "Alwa_ys rename links"
msgstr "All_tid endre navn på lenker"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "Finn i dette notatet"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_Lenke til nytt notat"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "_Tekst"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_Finn i dette notatet"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "_Lukk alle notater"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Søk"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "Søk i dine notater"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Lenke"
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "Lenk valgt tekst til et nytt notat"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Tekst"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Velg tekstegenskaper"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "_Verktøy"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Bruk verktøy på dette notatet"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Slett dette notatet"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Synkroniser notater"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 ""
+"Dette notatet er en mal. Det bestemmer forvalgt innhold av vanlige notater "
+"og vil ikke vises i notatmenyen eller søkevinduet."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Konverter til vanlig notat"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Lagre st_ørrelse"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Lagre utva_lg"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Lagre _tittel"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Finn …"
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "Finn _neste"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "Finn _forrige"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Kan ikke opprette notat"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Finn:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Forrige"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Neste"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_Fet"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Kursiv"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Streket ut"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "_Markér"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Skriftstørrelse"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "_Veldig stor"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Stor"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Liten"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Større skriftstørrelse"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Mindre skriftstørrelse"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Kulepunkter"
@@ -1944,19 +1988,19 @@ msgstr ""
msgid "Error connecting"
msgstr "Feil ved tilkobling"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Versjon:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Forfatter:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Opphavsrett:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Avhengigheter mellom tillegg:"
@@ -1968,40 +2012,40 @@ msgstr "_Søk:"
msgid "Note"
msgstr "Notat"
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "Sist endret"
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "Treff"
-#: ../Tomboy/RecentChanges.cs:562
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "Treff på tittel"
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "({0} treff)"
msgstr[1] "({0} treff)"
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "Totalt: {0} notat"
msgstr[1] "Totalt: {0} notater"
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "Treff: {0} notat"
msgstr[1] "Treff: {0} notater"
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -2009,11 +2053,11 @@ msgstr ""
"Ingen resultater funnet i valgt notisblokk.\n"
"Klikk her for å søke i alle notater."
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "Klikk her for å søke i alle notisblokker"
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "Notater"
diff --git a/po/pa.po b/po/pa.po
index cacb2ac..664e5b3 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,8 +10,8 @@ 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: 2011-07-10 12:21+0000\n"
-"PO-Revision-Date: 2011-07-18 08:45+0530\n"
+"POT-Creation-Date: 2011-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-09-04 19:51+0530\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-users at lists.sf.net>\n"
"MIME-Version: 1.0\n"
@@ -83,28 +83,24 @@ msgid "Custom Font Face"
msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਸ਼ਕਲ"
#: ../data/tomboy.schemas.in.h:5
-#| msgid "Determines X coordinate of Search window; stored on Tomboy exit."
msgid ""
"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
"exit."
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦਾ X ਧੁਰਾ ਜਾਣੋ; ਟੋਮਬਏ ਬੰਦ ਹੋਣ ਸਮੇਂ ਸੰਭਾਲੀ ਗਈ।"
#: ../data/tomboy.schemas.in.h:6
-#| msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
msgid ""
"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
"exit."
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦਾ Y ਧੁਰਾ ਜਾਣੋ; ਟੋਮਬਏ ਬੰਦ ਹੋਣ ਸਮੇਂ ਸੰਭਾਲੀ ਗਈ।"
#: ../data/tomboy.schemas.in.h:7
-#| msgid "Determines pixel height of Search window; stored on Tomboy exit."
msgid ""
"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
"exit."
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦੀ ਪਿਕਸਲ ਉਚਾਈ ਲਵੋ; ਟੋਮਬਏ ਬੰਦ ਹੋਣ ਸਮੇਂ ਸੰਭਾਲੀ ਗਈ।"
#: ../data/tomboy.schemas.in.h:8
-#| msgid "Determines pixel width of Search window; stored on Tomboy exit."
msgid ""
"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
msgstr ""
@@ -123,7 +119,6 @@ msgid "Enable WikiWord highlighting"
msgstr "ਵਿੱਕੀਵਰਲਡ ਉਭਾਰਨਾ ਯੋਗ"
#: ../data/tomboy.schemas.in.h:12
-#| msgid "Enable Auto bulleted lists."
msgid "Enable automatic bulleted lists."
msgstr "ਆਟੋਮੈਟਿਕ ਬਿੰਦੀ ਲਿਸਟ ਯੋਗ ਕਰੋ।"
@@ -396,22 +391,18 @@ msgid "SSHFS Synchronization Server URL"
msgstr "SSHFS ਸਿਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਸਰਵਰ URL"
#: ../data/tomboy.schemas.in.h:54
-#| msgid "Saved height of Search window"
msgid "Saved height of \"Search All Notes\" window"
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦੀ ਸੰਭਾਲੀ ਉਚਾਈ"
#: ../data/tomboy.schemas.in.h:55
-#| msgid "Saved horizontal position of Search window"
msgid "Saved horizontal position of \"Search All Notes\" window"
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦੀ ਸੰਭਾਲੀ ਹਰੀਜੱਟਲ ਸਥਿਤੀ"
#: ../data/tomboy.schemas.in.h:56
-#| msgid "Saved vertical position of Search window"
msgid "Saved vertical position of \"Search All Notes\" window"
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦੀ ਸੰਭਾਲੀ ਵਰਟੀਕਲ ਸਥਿਤੀ"
#: ../data/tomboy.schemas.in.h:57
-#| msgid "Saved width of Search window"
msgid "Saved width of \"Search All Notes\" window"
msgstr "\"ਸਭ ਨੋਟ ਲੱਭੋ\" ਵਿੰਡੋ ਦੀ ਸੰਭਾਲੀ ਚੌੜਾਈ"
@@ -662,7 +653,7 @@ msgstr "ਹਟਾਓ(_D)"
msgid "Delete the selected note"
msgstr "ਚੁਣਿਆ ਨੋਟ ਹਟਾਓ"
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "ਬੰਦ ਕਰੋ(_C)"
@@ -706,7 +697,7 @@ msgstr "ਟਰੇ-ਆਈਕਾਨ"
msgid "Create _New Note"
msgstr "ਨਵਾਂ ਨੋਟ ਬਣਾਓ(_N)"
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "ਸਭ ਨੋਟਿਸ ਖੋਜ(_S)"
@@ -720,13 +711,11 @@ msgstr "ਨੋਟਿਸ ਸਿਕਰੋਨਾਈਜ਼ ਸਟਾਰਟ"
#. Addin's tab caption
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
-#| msgid "Ad_vanced"
msgid "Advanced"
msgstr "ਤਕਨੀਕੀ"
#. Menu Note Count option
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-#| msgid "Minimum number of notes to show in menu"
msgid "Minimum number of notes to show in Recent list (maximum 18)"
msgstr ""
"ਤਾਜ਼ਾ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਘੱਟੋ-ਘੱਟ ਨੋਟਿਸਾਂ ਦੀ ਗਿਣਤੀ ਹੈ (ਵੱਧ ਤੋਂ ਵੱਧ 18)"
@@ -848,16 +837,16 @@ msgstr "ਫੋਲਡਰ ਪਾਥ(_F):"
msgid "Select Synchronization Folder..."
msgstr "ਸਿਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਫੋਲਡਰ ਚੁਣੋ..."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "ਫੋਲਡਰ ਮਾਰਗ ਖੇਤਰ ਖਾਲੀ ਹੈ।"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid ""
"Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "ਦਿੱਤਾ ਫੋਲਡਰ ਮਾਰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ, ਅਤੇ ਟੋਮਬਏ ਬਣਾਉਣ ਲਈ ਅਸਮੱਰਥ ਹੈ।"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "ਲੋਕਲ ਫੋਲਡਰ"
@@ -919,15 +908,12 @@ msgid "Appointments"
msgstr "ਮੁਲਾਕਾਤ"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-#| msgid ""
-#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
-#| "the text that new Today notes have."
msgid ""
"Change the <b>Today: Template</b> note to customize the text that new Today "
"notes have."
msgstr ""
-"<b>ਅੱਜ: ਟੈਪਲੇਟ</b> ਨੋਟ ਨੂੰ ਕਸਮਾਈਜ਼ ਕਰਨ ਲਈ ਬਦਲੋ, ਜੋ ਕਿ ਨਵਾਂ ਅੱਜ "
-"ਨੋਟਿਸ ਵਿੱਚ ਹੋਵੇ।"
+"<b>ਅੱਜ: ਟੈਪਲੇਟ</b> ਨੋਟ ਨੂੰ ਕਸਮਾਈਜ਼ ਕਰਨ ਲਈ ਬਦਲੋ, ਜੋ ਕਿ ਨਵਾਂ ਅੱਜ ਨੋਟਿਸ ਵਿੱਚ "
+"ਹੋਵੇ।"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
msgid "_Open Today: Template"
@@ -954,7 +940,6 @@ msgstr "dddd dd/MM/yyyy, hh:mm:ss tt"
#. Adding menu item when note is opened and window created
#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
-#| msgid "Never rename links"
msgid "Remove broken links"
msgstr "ਖਰਾਬ ਲਿੰਕ ਹਟਾਓ"
@@ -962,22 +947,22 @@ msgstr "ਖਰਾਬ ਲਿੰਕ ਹਟਾਓ"
msgid "Add a sketch"
msgstr "ਇੱਕ ਸਕੈਚ ਸ਼ਾਮਲ"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "ਸਰਵਰ(_r):"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "ਫੋਲਡਰ ਮਾਰਗ (ਚੋਣਵਾਂ)(_F):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../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."
@@ -986,15 +971,15 @@ msgstr ""
"ਵਿੱਚ ਜੋੜਨ ਦੀ ਲੋੜ "
"ਹੈ।"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "ਸਰਵਰ ਜਾਂ ਯੂਜ਼ਰ-ਨਾਂ ਖੇਤਰ ਖਾਲੀ ਹੈ।"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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."
@@ -1022,7 +1007,6 @@ msgstr "ਸਟਿੱਕੀ ਨੋਟਿਸ ਇੰਪੋਰਟ ਕੀਤੀ ਗ
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
msgid_plural ""
"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
@@ -1057,23 +1041,23 @@ msgstr "--- ਤਸਕਿਉ ਨਹੀਂ ਚੱਲ ਰਿਹਾ ਹੈ ---"
msgid "_Underline"
msgstr "ਹੇਠਾਂ ਲਾਈਨ(_U)"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_URL:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "ਪਾਸਵਰਡ(_P):"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "URL, ਯੂਜ਼ਰ ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਖੇਤਰ ਖਾਲੀ ਹੈ।"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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."
@@ -1087,13 +1071,13 @@ msgstr ""
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid ""
"Saving configuration to the GNOME keyring failed with the following message:"
msgstr "ਗਨੋਮ ਕੀ-ਰਿੰਗ ਵਿੱਚ ਸੰਰਚਨਾ ਸੰਭਾਲਣ ਲਈ ਅੱਗੇ ਦਿੱਤੇ ਸੁਨੇਹੇ ਕਰਕੇ ਫੇਲ੍ਹ ਹੈ:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
@@ -1102,23 +1086,23 @@ msgid "Connected"
msgstr "ਕੁਨੈਕਟ ਹੈ"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "ਸਰਵਰ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ ਹੈ। ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "ਸਿਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ, ਮੁੜ ਕੋਸ਼ਿਸ਼"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "ਟੋਮਬਏ ਵੈੱਬ ਪਰਮਾਣਕਿਤਾ ਸਫ਼ਲ ਰਹੀ"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid ""
"Please return to the Tomboy Preferences window and press Save to start "
"synchronizing."
@@ -1126,18 +1110,18 @@ msgstr ""
"ਟੋਮਬੋਏ ਪਸੰਦ ਵਿੰਡੋ ਉੱਤੇ ਵਾਪਸ ਜਾਓ ਅਤੇ ਸੈਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਵਾਸਤੇ ਸੰਭਾਲੋ ਨੂੰ "
"ਦੱਬੋ।"
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "ਕੁਨੈਕਟ ਹੈ। ਸੈਕਰੋਨਾਈਜੇਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸੰਭਾਲੋ ਦੱਬੋ"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "ਬਰਾਊਜ਼ਰ ਵਿੱਚ ਪਰਮਾਣਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਲਈ ਦੱਬੋ)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "ਡਿਫਾਲਟ ਬਰਾਊਜ਼ਰ ਸੈੱਟ ਕਰੋ ਅਤੇ ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ"
@@ -1146,23 +1130,28 @@ msgid "Tomboy Web"
msgstr "ਟੋਮਬਾਏ ਵੈੱਬ"
#: ../Tomboy/ExportAllApplicationAddin.cs:53
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes to "
-msgstr "ਸਭ ਨੋਟਿਸ ਐਕਸਪੋਰਟ ਕਰੋ "
+#, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "ਸਭ ਨੋਟਿਸ {0} ਲਈ ਐਕਸਪੋਰਟ ਕਰੋ "
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-#| msgid "Start synchronizing notes"
-msgid "Start exporting notes to "
-msgstr "ਨੋਟਿਸ ਐਕਸਪੋਰਟ ਕਰਨੇ ਸ਼ੁਰੂ ਕਰੋ "
+#, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "ਨੋਟਿਸ {0} ਉੱਤੇ ਐਕਸਪੋਰਟ ਕਰਨੇ ਸ਼ੁਰੂ ਕਰੋ "
#: ../Tomboy/ExportAllApplicationAddin.cs:58
-#| msgid "Delete the selected notebook"
-msgid "Export selected notebook to "
-msgstr "ਚੁਣੀ ਨੋਟਬੁੱਕ ਐਕਸਪੋਰਟ ਕਰੋ "
+#, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "ਚੁਣੀ ਨੋਟਬੁੱਕ {0} ਉੱਤੇ ਐਕਸਪੋਰਟ ਕਰੋ "
#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "ਨੋਟਬੁੱਕ ਐਕਸਪੋਰਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰੋ "
+#, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "ਨੋਟਬੁੱਕ {0} ਉੱਤੇ ਐਕਸਪੋਰਟ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰੋ "
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -1170,41 +1159,44 @@ msgid "_Tools"
msgstr "ਟੂਲ(_o)"
#: ../Tomboy/ExportAllApplicationAddin.cs:68
-#| msgid "Export to HTML"
msgid "Export"
msgstr "ਐਕਸਪੋਰਟ"
#: ../Tomboy/ExportAllApplicationAddin.cs:69
-#| msgid "Export linked notes"
msgid "Export your notes."
msgstr "ਐਪਣੇ ਨੋਟਿਸ ਐਕਸਪੋਰਟ ਕਰੋ।"
#: ../Tomboy/ExportAllApplicationAddin.cs:72
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes To "
-msgstr "ਸਭ ਨੋਟਿਸ ਐਕਸਪੋਰਟ ਕਰੋ "
+#, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "ਸਭ ਨੋਟਿਸ {0} ਉੱਤੇ ਐਕਸਪੋਰਟ ਕਰੋ "
#: ../Tomboy/ExportAllApplicationAddin.cs:77
-#| msgid "Delete Note_book"
-msgid "Export Selected Notebook To "
-msgstr "ਚੁਣੀ ਨੋਟਬੁੱਕ ਐਕਸਪੋਰਟ ਕਰੋ "
+#, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "ਚੁਣੀ ਨੋਟਬੁੱਕ {0} ਉੱਤੇ ਐਕਸਪੋਰਟ ਕਰੋ "
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "ਸਭ ਨੋਟਿਸ {0} ਐਕਸਪੋਰਟ ਕਰੋ"
#: ../Tomboy/ExportAllApplicationAddin.cs:193
#: ../Tomboy/ExportAllApplicationAddin.cs:271
-#| msgid "Could not read testfile."
msgid "Could not export, access denied."
msgstr "ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਵਰਤੋਂ ਪਾਬੰਦੀ ਹੈ।"
#: ../Tomboy/ExportAllApplicationAddin.cs:198
#: ../Tomboy/ExportAllApplicationAddin.cs:276
-#| msgid "Folder does not exist."
msgid "Could not export, folder does not exist."
msgstr "ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਫੋਲਡਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
#: ../Tomboy/ExportAllApplicationAddin.cs:203
#: ../Tomboy/ExportAllApplicationAddin.cs:281
#, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
msgid "Could not export: {0}"
msgstr "ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: {0}"
@@ -1214,30 +1206,30 @@ msgid "Unknown error."
msgstr "ਅਣਜਾਣ ਗਲਤੀ ਹੈ।"
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "ਗ਼ੈਰ-ਭਰੇ ਨੋਟਿਸ"
#: ../Tomboy/ExportAllApplicationAddin.cs:389
#, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
msgid "Your notes were exported to \"{0}\"."
msgstr "ਤੁਹਾਡਾ ਨੋਟ \"{0}\" ਲਈ ਐਕਸਪੋਰਟ ਕੀਤੇ ਗਏ।"
#: ../Tomboy/ExportAllApplicationAddin.cs:398
-#| msgid "Note exported successfully"
msgid "Notes exported successfully"
msgstr "ਨੋਟ ਠੀਕ ਤਰ੍ਹਾਂ ਐਕਸਪੋਰਟ ਕੀਤਾ ਗਿਆ"
#: ../Tomboy/ExportAllApplicationAddin.cs:421
#, csharp-format
-#| msgid "Could not save the file \"{0}\""
msgid "Could not save the files in \"{0}\""
msgstr "\"{0}\" ਵਿੱਚ ਫਾਇਲਾਂ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਜਾ ਸਕੀਆਂ"
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "ਇਸ ਲਈ ਟਿਕਾਣਾ ਫੋਲਡਰ ਬਣਾਓ "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+#| msgid "Create destination folder for "
+msgid "Create destination folder for {0} export"
+msgstr "{0} ਐਕਸਪੋਰਟ ਲਈ ਟਿਕਾਣਾ ਫੋਲਡਰ ਬਣਾਓ "
#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
msgid "Search All Notes"
@@ -1347,15 +1339,20 @@ msgstr "ਨੋਟਬੁੱਕ"
msgid "{0} Notebook Template"
msgstr "{0} ਨੋਟਬੁੱਕ ਟੈਪਲੇਟ"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+#| msgid "_New Note"
+msgid "New Note"
+msgstr "ਨਵਾਂ ਨੋਟ"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "ਸਭ ਨੋਟਿਸ"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਨੋਟਬੁੱਕ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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."
@@ -1377,39 +1374,42 @@ msgstr "ਕੋਈ ਨੋਟਬੁੱਕ ਨਹੀਂ"
msgid "New \"{0}\" Note"
msgstr "ਨਵਾਂ \"{0}\" ਨੋਟ"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "ਇਸ ਨੋਟ ਨੂੰ ਇੱਕ ਨੋਟਬੁੱਕ ਵਿੱਚ ਰੱਖੋ।"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "ਨੋਟ-ਬੁੱਕ"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "ਨਵੀਂ ਨੋਟਬੁੱਕ(_N)..."
-#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#: ../Tomboy/Note.cs:515 ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "ਨਵਾਂ ਨੋਟ {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਨੋਟ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+#| msgid "Really delete this {0} note?"
+#| msgid_plural "Really delete these {0} notes?"
+msgid "Really delete \"{0}\"?"
+msgstr "ਕੀ \"{0}\" ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "ਕੀ ਤੁਸੀਂ ਇਹ {0} ਨੋਟ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
msgstr[1] "ਕੀ ਤੁਸੀਂ ਇਹ {0} ਨੋਟ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "ਜੇਕਰ ਤੁਸੀਂ ਇੱਕ ਨੋਟ ਹਟਾ ਦਿੱਤਾ ਤਾਂ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ।"
-#: ../Tomboy/Note.cs:1626
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid ""
"An error occurred while saving your notes. Please check that you have "
@@ -1420,7 +1420,7 @@ msgstr ""
"ਖਾਲੀ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ "
"{0} ਲਈ ਢੁੱਕਵੇਂ ਅਧਿਕਾਰ ਹੈ। ਗਲਤੀ ਵੇਰਵੇ ਨੂੰ {1} ਵਿੱਚ ਵੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "ਨੋਟ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -1570,7 +1570,7 @@ msgstr "ਟੋਮਬਏ ਵਿੱਚ ਲਿੰਕ ਦੀ ਵਰਤੋਂ"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543 ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "ਆਪਣਾ ਨੋਟ ਇੱਥੇ ਦੇਣਾ ਸ਼ੁਰੂ ਕਰੋ।"
@@ -1634,142 +1634,168 @@ msgstr "ਲਿੰਕ ਨਾਂ ਕਦੇ ਨਾ ਬਦਲੋ(_l)"
msgid "Alwa_ys rename links"
msgstr "ਹਮੇਸ਼ਾ ਲਿੰਕ ਨਾਂ ਬਦਲੋ(_y)"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "ਇਹ ਨੋਟ 'ਚ ਲੱਭੋ"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "ਨਵੇਂ ਨੋਟ ਨਾਲ ਲਿੰਕ(_L)"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "ਟੈਕਸਟ(_x)"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "ਇਹ ਨੋਟ 'ਚ ਲੱਭੋ(_F)"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "ਸਭ ਨੋਟਿਸ ਬੰਦ ਕਰੋ(_e)"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "ਖੋਜ"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
-#| msgid "Search All Notes"
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "ਸਭ ਨੋਟਿਸ ਖੋਜ"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "ਲਿੰਕ"
-#: ../Tomboy/NoteWindow.cs:459
-#| msgid "Link selected text to a new note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "ਨਵਾਂ ਨੋਟ ਲਈ ਚੁਣੇ ਗਏ ਟੈਕਸਟ ਨੂੰ ਲਿੰਕ ਕਰੋ"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "ਟੈਕਸਟ(_T)"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "ਟੈਕਸਟ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਸੈੱਟ ਕਰੋ"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "ਟੂਲ(_o)"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "ਇਹ ਨੋਟ ਉੱਤੇ ਟੂਲ ਵਰਤੋਂ"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "ਇਸ ਨੋਟ ਹਟਾਓ"
-#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:507 ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "ਨੋਟਿਸ ਸਿਕਰੋਨਾਈਜ਼"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 ""
+"ਇਹ ਨੋਟ ਇੱਕ ਨਮੂਨਾ ਨੋਟ ਹੈ। ਇਹ ਨਿਯਮਤ ਨੋਟਿਸ ਦੀ ਡਿਫਾਲਟ ਸਮੱਗਰੀ ਦਿੰਦਾ ਹੈ ਅਤੇ ਨੋਟ "
+"ਮੇਨੂ ਜਾਂ ਖੋਜ "
+"ਵਿੰਡੋ ਵਿੱਚ ਨਹੀਂ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"
+
+#: ../Tomboy/NoteWindow.cs:571
+#| msgid "Connect to Server"
+msgid "Convert to regular note"
+msgstr "ਨਿਯਮਤ ਨੋਟ ਵਿੱਚ ਬਦਲੋ"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "ਆਕਾਰ ਸੰਭਾਲੋ(_z)"
+
+#: ../Tomboy/NoteWindow.cs:585
+#| msgid "Select None"
+msgid "Save Se_lection"
+msgstr "ਚੋਣ ਨੂੰ ਸੰਭਾਲੋ(_l)"
+
+#: ../Tomboy/NoteWindow.cs:594
+#| msgid "Note Title"
+msgid "Save _Title"
+msgstr "ਟਾਈਟਲ ਸੰਭਾਲੋ(_T)"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "ਖੋਜ(_F)..."
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "ਅੱਗੇ ਖੋਜ(_N)"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "ਪਿੱਛੇ ਖੋਜ(_P)"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "ਨਵਾਂ ਨੋਟ ਨਹੀਂ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "ਖੋਜ(_F):"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "ਪਿੱਛੇ(_P)"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "ਅੱਗੇ(_N)"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "ਗੂੜੇ(_B)"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "ਤਿਰਛੇ(_I)"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "ਵਿੰਨ੍ਹੋ(_S)"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "ਉਭਾਰੋ(_H)"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "ਫੋਂਟ ਆਕਾਰ"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "ਸਧਾਰਨ(_N)"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "ਵਿਸ਼ਾਲ(_g)"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "ਵੱਡਾ(_L)"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "ਛੋਟਾ(_m)"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "ਫੋਂਟ ਆਕਾਰ ਵਧਾਓ"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "ਫੋਂਟ ਆਕਾਰ ਘਟਾਓ"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "ਬਿੰਦੀਆਂ"
@@ -1964,7 +1990,6 @@ msgid "Replace my local note with the server's update."
msgstr "ਮੇਰੇ ਲੋਕਲ ਨੋਟ ਨੂੰ ਸਰਵਰ ਦੇ ਅੱਪਡੇਟ ਨਾਲ ਬਦਲ ਦਿਓ।"
#: ../Tomboy/PreferencesDialog.cs:1142
-#| msgid "WARNING: Are you sure?"
msgid "Are you sure?"
msgstr "ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ?"
@@ -1982,10 +2007,6 @@ msgid "Resetting Synchronization Settings"
msgstr "ਸਿਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
#: ../Tomboy/PreferencesDialog.cs:1159
-#| msgid ""
-#| "You have disabled the configured synchronization service. Your "
-#| "synchronization settings will now be cleared. You may be forced to "
-#| "synchronize all of your notes again when you save new settings"
msgid ""
"You have disabled the configured synchronization service. Your "
"synchronization settings will now be cleared. You may be forced to "
@@ -2011,34 +2032,31 @@ msgstr ""
#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-#| msgid ""
-#| "Sorry, but something went wrong. Please check your information and try "
-#| "again. The {0} might be useful too."
msgid ""
"Please check your information and try again. The log file {0} may contain "
"more information about the error."
msgstr ""
"ਆਪਣੀ ਜਾਣਕਾਰੀ ਚੈੱਕ ਕਰਕੇ ਮੁੜ ਟਰਾਈ ਮਾਰੋ ਜੀ। ਸ਼ਾਇਦ ਲਾਗ ਫਾਇਲ {0} ਇਸ ਗਲਤੀ ਬਾਰੇ ਕੋਈ "
-"ਮੱਦਦ ਕਰ ਸਕੇ।"
+"ਮੱਦਦ ਕਰ "
+"ਸਕੇ।"
#: ../Tomboy/PreferencesDialog.cs:1274
-#| msgid "Error connecting :("
msgid "Error connecting"
msgstr "ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "ਵਰਜਨ:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "ਲੇਖਕ:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "ਕਾਪੀਰਾਈਟ:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "ਐਡ-ਆਨ ਨਿਰਭਰਤਾ:"
@@ -2050,42 +2068,40 @@ msgstr "ਖੋਜ(_S):"
msgid "Note"
msgstr "ਨੋਟਿਸ"
-#: ../Tomboy/RecentChanges.cs:372
+#: ../Tomboy/RecentChanges.cs:373
msgid "Last Changed"
msgstr "ਆਖਰੀ ਬਦਲਾਅ"
-#: ../Tomboy/RecentChanges.cs:511
+#: ../Tomboy/RecentChanges.cs:512
msgid "Matches"
msgstr "ਮੇਲ"
-#: ../Tomboy/RecentChanges.cs:562
-#| msgid "{0} match"
-#| msgid_plural "{0} matches"
+#: ../Tomboy/RecentChanges.cs:563
msgid "Title match"
msgstr "ਟਾਈਟਲ ਮੇਲ"
-#: ../Tomboy/RecentChanges.cs:565
+#: ../Tomboy/RecentChanges.cs:566
#, csharp-format
msgid "{0} match"
msgid_plural "{0} matches"
msgstr[0] "{0} ਮੇਲ"
msgstr[1] "{0} ਮੇਲ"
-#: ../Tomboy/RecentChanges.cs:579
+#: ../Tomboy/RecentChanges.cs:580
#, csharp-format
msgid "Total: {0} note"
msgid_plural "Total: {0} notes"
msgstr[0] "ਕੁੱਲ: {0} ਨੋਟਿਸ"
msgstr[1] "ਕੁੱਲ: {0} ਨੋਟਿਸ"
-#: ../Tomboy/RecentChanges.cs:590
+#: ../Tomboy/RecentChanges.cs:591
#, csharp-format
msgid "Matches: {0} note"
msgid_plural "Matches: {0} notes"
msgstr[0] "ਮੇਲ: {0} ਨੋਟਿਸ"
msgstr[1] "ਮੇਲ: {0} ਨੋਟਿਸ"
-#: ../Tomboy/RecentChanges.cs:602
+#: ../Tomboy/RecentChanges.cs:603
msgid ""
"No results found in the selected notebook.\n"
"Click here to search across all notes."
@@ -2093,11 +2109,11 @@ msgstr ""
"ਚੁਣੀ ਨੋਟਬੁੱਕ ਵਿੱਚ ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।\n"
"ਸਭ ਨੋਟਿਸਾਂ ਵਿੱਚ ਲੱਭਣ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ।"
-#: ../Tomboy/RecentChanges.cs:608
+#: ../Tomboy/RecentChanges.cs:609
msgid "Click here to search across all notebooks"
msgstr "ਸਭ ਨੋਟਬੁੱਕ ਵਿੱਚ ਲੱਭਣ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
-#: ../Tomboy/RecentChanges.cs:774
+#: ../Tomboy/RecentChanges.cs:775
msgid "Notes"
msgstr "ਨੋਟਿਸ"
@@ -2391,9 +2407,6 @@ msgstr ""
"http://www.satluj.org"
#: ../Tomboy/Tomboy.cs:424
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2010 Others\n"
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2410,10 +2423,6 @@ msgid "Homepage"
msgstr "ਮੁੱਖ ਸਫ਼ਾ"
#: ../Tomboy/Tomboy.cs:554
-#| msgid ""
-#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
-#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-#| "\n"
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
@@ -2586,6 +2595,9 @@ msgstr "ਲਿੰਕ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
msgid "_Open Link"
msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
+#~ msgid "Really delete this note?"
+#~ msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਨੋਟ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
#~ msgid "HTML Export Last Directory"
#~ msgstr "HTML ਐਕਸਪੋਰਟ ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ"
diff --git a/po/ru.po b/po/ru.po
index b0f2233..a5685b2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-20 21:18+0000\n"
-"PO-Revision-Date: 2011-08-21 21:42+0300\n"
+"POT-Creation-Date: 2011-08-30 20:22+0000\n"
+"PO-Revision-Date: 2011-09-02 00:17+0300\n"
"Last-Translator: Yuri Myasoedov <omerta13 at yandex.ru>\n"
"Language-Team: Russian <gnome-cyr at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -88,22 +88,18 @@ msgid "Custom Font Face"
msgstr "Другой шрифт"
#: ../data/tomboy.schemas.in.h:5
-#| msgid "Determines X coordinate of Search window; stored on Tomboy exit."
msgid "Determines X coordinate of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Определяет координату X окна «Искать во всех заметках». Координата сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:6
-#| msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
msgid "Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Определяет координату Y окна «Искать во всех заметках». Координата сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:7
-#| msgid "Determines pixel height of Search window; stored on Tomboy exit."
msgid "Determines pixel height of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Определяет высоту окна «Искать во всех заметках» в пикселах. Высота сохраняется при выходе из Tomboy."
#: ../data/tomboy.schemas.in.h:8
-#| msgid "Determines pixel width of Search window; stored on Tomboy exit."
msgid "Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
msgstr "Определяет ширину окна «Искать во всех заметках» в пикселах. Ширина сохраняется при выходе из Tomboy."
@@ -120,7 +116,6 @@ msgid "Enable WikiWord highlighting"
msgstr "Включить выделение ВикиСлов"
#: ../data/tomboy.schemas.in.h:12
-#| msgid "Enable Auto bulleted lists."
msgid "Enable automatic bulleted lists."
msgstr "Включить автоматические маркированные списки."
@@ -289,22 +284,18 @@ msgid "SSHFS Synchronization Server URL"
msgstr "Адрес (URL) сервера синхронизации SSHFS"
#: ../data/tomboy.schemas.in.h:54
-#| msgid "Saved height of Search window"
msgid "Saved height of \"Search All Notes\" window"
msgstr "Сохранённое значение высоты окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:55
-#| msgid "Saved horizontal position of Search window"
msgid "Saved horizontal position of \"Search All Notes\" window"
msgstr "Сохранённое значение положения по горизонтали высоты окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:56
-#| msgid "Saved vertical position of Search window"
msgid "Saved vertical position of \"Search All Notes\" window"
msgstr "Сохранённое значение положения по вертикали высоты окна «Искать во всех заметках»"
#: ../data/tomboy.schemas.in.h:57
-#| msgid "Saved width of Search window"
msgid "Saved width of \"Search All Notes\" window"
msgstr "Сохранённое значение ширины окна «Искать во всех заметках»"
@@ -446,7 +437,7 @@ msgid "Delete the selected note"
msgstr "Удалить выделенную заметку"
#: ../Tomboy/ActionManager.cs:142
-#: ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "_Закрыть"
@@ -494,7 +485,7 @@ msgid "Create _New Note"
msgstr "Создать _новую заметку"
#: ../Tomboy/ActionManager.cs:175
-#: ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Искать во всех заметках"
@@ -508,13 +499,11 @@ msgstr "Запустить синхронизацию заметок"
#. Addin's tab caption
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:38
-#| msgid "Ad_vanced"
msgid "Advanced"
msgstr "Дополнительно"
#. Menu Note Count option
#: ../Tomboy/Addins/AdvancedPreferences/AdvancedPreferencesAddin.cs:56
-#| msgid "Minimum number of notes to show in menu"
msgid "Minimum number of notes to show in Recent list (maximum 18)"
msgstr "Минимальное количество заметок в списке недавних заметок (максимум — 18)"
@@ -630,15 +619,15 @@ msgstr "П_уть к папке:"
msgid "Select Synchronization Folder..."
msgstr "Выберите папку для синхронизации"
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "Расположение папки не указано."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid "Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "По указанному адресу папки нет, и программе Tomboy не удалось её создать."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Локальная папка"
@@ -701,9 +690,6 @@ msgid "Appointments"
msgstr "Встречи"
#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
-#| msgid ""
-#| "Change the <span weight=\"bold\">Today: Template</span> note to customize "
-#| "the text that new Today notes have."
msgid "Change the <b>Today: Template</b> note to customize the text that new Today notes have."
msgstr "Изменить заметку <b>Сегодня: Шаблон</b>, чтобы изменить текст для заметок дня."
@@ -732,7 +718,6 @@ msgstr "dddd dd.MM.yyyy, hh:mm:ss tt"
#. Adding menu item when note is opened and window created
#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
-#| msgid "Never rename links"
msgid "Remove broken links"
msgstr "Удалить битые ссылки"
@@ -740,34 +725,34 @@ msgstr "Удалить битые ссылки"
msgid "Add a sketch"
msgstr "Добавить набросок"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Се_рвер:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "_Имя пользователя:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "Пу_ть к папке (необязательно):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
msgstr "Для синхронизации через SSH нужен ключ SSH для указанного сервера и пользователя, и этот ключ должен быть добавлен в запущенный на сервере демон SSH."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "Сервер или имя пользователя не указаны."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:192
msgid "Timeout connecting to server. Please ensure that your SSH key has been added to a running SSH daemon."
msgstr "Время ожидания соединения с сервером истекло. Убедитесь, что ваш ключ SSH был добавлен в запущенный на сервере демон SSH."
@@ -790,7 +775,6 @@ msgstr "Импорт из апплета Липкие записки завер
#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
#, csharp-format
-#| msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
msgid_plural "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
msgstr[0] "<b>{0}</b> заметка из <b>{1}</b> успешно импортирована."
@@ -825,23 +809,23 @@ msgstr "--- Задачи не запущены ---"
msgid "_Underline"
msgstr "Под_чёркивание:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_Адрес (URL):"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "Пар_оль:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "URL, имя пользователя или пароль не указаны."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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 "При соединении с сервером произошла ошибка. Возможно, было указано неверное имя пользователя или пароль."
@@ -850,12 +834,12 @@ msgstr "При соединении с сервером произошла ош
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid "Saving configuration to the GNOME keyring failed with the following message:"
msgstr "Не удалось сохранить параметры в связке ключей GNOME:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Подключиться к серверу"
@@ -864,38 +848,38 @@ msgid "Connected"
msgstr "Подключено"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "Сервер не отвечает. Попробуйте позднее."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Не удалось выполнить авторизацию, попробуйте ещё раз"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Авторизация в Tomboy веб прошла успешно"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid "Please return to the Tomboy Preferences window and press Save to start synchronizing."
msgstr "Вернитесь в окно параметров Tomboy и нажмите «Сохранить» для начала синхронизации."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "Соединение установлено. Нажмите «Сохранить» для начала синхронизации"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Авторизация через браузер (Нажмите для сброса соединения)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Укажите браузер по умолчанию и попробуйте ещё раз"
@@ -904,23 +888,28 @@ msgid "Tomboy Web"
msgstr "Tomboy на веб"
#: ../Tomboy/ExportAllApplicationAddin.cs:53
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes to "
-msgstr "Экспортировать все заметки в"
+#, csharp-format
+#| msgid "Export All Notes to "
+msgid "Export All Notes to {0}"
+msgstr "Экспортировать все заметки в {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-#| msgid "Start synchronizing notes"
-msgid "Start exporting notes to "
-msgstr "Начать экспортирование заметок в"
+#, csharp-format
+#| msgid "Start exporting notes to "
+msgid "Start exporting notes to {0}"
+msgstr "Начать экспортирование заметок в {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:58
-#| msgid "Delete the selected notebook"
-msgid "Export selected notebook to "
-msgstr "Экспортировать выделенный блокнот в"
+#, csharp-format
+#| msgid "Export selected notebook to "
+msgid "Export selected notebook to {0}"
+msgstr "Экспортировать выбранный блокнот в {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Начать экспортирование блокнота"
+#, csharp-format
+#| msgid "Start exporting notebook to "
+msgid "Start exporting notebook to {0}"
+msgstr "Начать экспортирование блокнота {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -928,41 +917,44 @@ msgid "_Tools"
msgstr "С_ервис"
#: ../Tomboy/ExportAllApplicationAddin.cs:68
-#| msgid "Export to HTML"
msgid "Export"
msgstr "Экспортировать"
#: ../Tomboy/ExportAllApplicationAddin.cs:69
-#| msgid "Export linked notes"
msgid "Export your notes."
msgstr "Экспортировать заметки."
#: ../Tomboy/ExportAllApplicationAddin.cs:72
-#| msgid "HTML Export All Linked Notes"
-msgid "Export All Notes To "
-msgstr "Экспортировать все заметки в"
+#, csharp-format
+#| msgid "Export All Notes To "
+msgid "Export All Notes To {0}"
+msgstr "Экспортировать все заметки в {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:77
-#| msgid "Delete Note_book"
-msgid "Export Selected Notebook To "
-msgstr "Экспортировать выделенный блокнот в"
+#, csharp-format
+#| msgid "Export Selected Notebook To "
+msgid "Export Selected Notebook To {0}"
+msgstr "Экспортировать выбранный блокнот в {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+#| msgid "All Notes"
+msgid "All Notes {0} Export"
+msgstr "Экспортирование всех заметок {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:193
#: ../Tomboy/ExportAllApplicationAddin.cs:271
-#| msgid "Could not read testfile."
msgid "Could not export, access denied."
msgstr "Не удалось экспортировать, доступ запрещён."
#: ../Tomboy/ExportAllApplicationAddin.cs:198
#: ../Tomboy/ExportAllApplicationAddin.cs:276
-#| msgid "Folder does not exist."
msgid "Could not export, folder does not exist."
msgstr "Не удалось экспортировать, папка не существует."
#: ../Tomboy/ExportAllApplicationAddin.cs:203
#: ../Tomboy/ExportAllApplicationAddin.cs:281
#, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
msgid "Could not export: {0}"
msgstr "Не удалось экспортировать: {0}"
@@ -972,30 +964,27 @@ msgid "Unknown error."
msgstr "Неизвестная ошибка."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "Неупорядоченные заметки"
#: ../Tomboy/ExportAllApplicationAddin.cs:389
#, csharp-format
-#| msgid "Your note was exported to \"{0}\"."
msgid "Your notes were exported to \"{0}\"."
msgstr "Заметки были экспортированы в «{0}»."
#: ../Tomboy/ExportAllApplicationAddin.cs:398
-#| msgid "Note exported successfully"
msgid "Notes exported successfully"
msgstr "Заметки успешно экспортированы"
#: ../Tomboy/ExportAllApplicationAddin.cs:421
#, csharp-format
-#| msgid "Could not save the file \"{0}\""
msgid "Could not save the files in \"{0}\""
msgstr "Не удалось сохранить файлы в «{0}»"
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
#, csharp-format
-#| msgid "Destination for HTML Export"
msgid "Create destination folder for {0} export"
msgstr "Создать целевую папку для экспортирования {0}"
@@ -1108,15 +1097,20 @@ msgstr "Блокноты"
msgid "{0} Notebook Template"
msgstr "Шаблон для блокнота {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+#| msgid "_New Note"
+msgid "New Note"
+msgstr "Создать заметку"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "Все заметки"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Вы действительно хотите удалить этот блокнот?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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 "Заметки, принадлежащие к этому блокноту, не будут удалены, но они больше не будут связаны с этим блокнотом. Это действие нельзя отменить."
@@ -1133,32 +1127,30 @@ msgstr "Нет блокнотов"
msgid "New \"{0}\" Note"
msgstr "Новая заметка {0}"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Поместить эту заметку в блокнот"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Блокнот"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "_Новый блокнот..."
-#: ../Tomboy/Note.cs:497
+#: ../Tomboy/Note.cs:515
#: ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Новая заметка {0}"
-#: ../Tomboy/Note.cs:1579
+#: ../Tomboy/Note.cs:1607
#, csharp-format
-#| msgid "Really delete this {0} note?"
-#| msgid_plural "Really delete these {0} notes?"
msgid "Really delete \"{0}\"?"
msgstr "Действительно удалить «{0}»?"
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
@@ -1166,16 +1158,16 @@ msgstr[0] "Вы действительно хотите удалить {0} за
msgstr[1] "Вы действительно хотите удалить {0} заметки?"
msgstr[2] "Вы действительно хотите удалить {0} заметок?"
-#: ../Tomboy/Note.cs:1593
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Если вы удалите заметку, она будет утеряна навсегда."
-#: ../Tomboy/Note.cs:1627
+#: ../Tomboy/Note.cs:1655
#, csharp-format
msgid "An error occurred while saving your notes. Please check that you have sufficient disk space, and that you have appropriate rights on {0}. Error details can be found in {1}."
msgstr "Во время сохранения заметок возникла ошибка. Проверьте, что места на диске достаточно и права доступа к {0}. Подробности об ошибке находятся в {1}."
-#: ../Tomboy/Note.cs:1643
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Ошибка при сохранении данных заметки."
@@ -1278,8 +1270,8 @@ msgstr "Использование ссылок в Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548
-#: ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543
+#: ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Опишите здесь свою новую заметку."
@@ -1341,143 +1333,164 @@ msgstr "Никогда не переименовывать сс_ылки"
msgid "Alwa_ys rename links"
msgstr "Всег_да переименовывать ссылки"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "Найти в этой заметке"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_Связать с новой заметкой"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "Те_кст"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_Найти в этой заметке"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "Закрыть _все заметки"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Искать"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
-#| msgid "Search All Notes"
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "Поиск заметок"
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Связать"
-#: ../Tomboy/NoteWindow.cs:459
-#| msgid "Link selected text to a new note (Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "Связать выделенный текст с новой заметкой"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Текст"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Установить свойства текста"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "С_ервис"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Применить инструменты к этой заметке"
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Удалить эту заметку"
-#: ../Tomboy/NoteWindow.cs:502
+#: ../Tomboy/NoteWindow.cs:507
#: ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Синхронизировать заметки"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 "Это заметка является шаблоном. Она определяет содержимое по умолчанию для типовых заметок, она не будет показана в меню или в окне поиска."
+
+#: ../Tomboy/NoteWindow.cs:571
+#| msgid "Connect to Server"
+msgid "Convert to regular note"
+msgstr "Преобразовать в типовую заметку"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Сохранить _размер"
+
+#: ../Tomboy/NoteWindow.cs:585
+#| msgid "Select None"
+msgid "Save Se_lection"
+msgstr "Сохранить _выбор"
+
+#: ../Tomboy/NoteWindow.cs:594
+#| msgid "Note Title"
+msgid "Save _Title"
+msgstr "Сохранить _заголовок"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Найти..."
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "Найти _следующее"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "Найти _предыдущее"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Не удалось создать заметку"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Найти:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Предыдущее"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Далее"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_Жирный"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Наклонный"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Зачёркнутый"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "_Выделенный"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Размер шрифта"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Нормальный"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "_Огромный"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Большой"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Маленький"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Увеличить размер шрифта"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Уменьшить размер шрифта"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Маркёры"
@@ -1650,7 +1663,6 @@ msgid "Replace my local note with the server's update."
msgstr "Заменять локальную заметку заметкой с сервера."
#: ../Tomboy/PreferencesDialog.cs:1142
-#| msgid "WARNING: Are you sure?"
msgid "Are you sure?"
msgstr "Вы уверены?"
@@ -1663,10 +1675,6 @@ msgid "Resetting Synchronization Settings"
msgstr "Сброс параметров синхронизации"
#: ../Tomboy/PreferencesDialog.cs:1159
-#| msgid ""
-#| "You have disabled the configured synchronization service. Your "
-#| "synchronization settings will now be cleared. You may be forced to "
-#| "synchronize all of your notes again when you save new settings"
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 "Вы отключили настроенную службу синхронизации. Теперь параметры синхронизации будут обнулены. Возможно, вам потребуется заново синхронизировать все заметки при сохранении новых параметров."
@@ -1680,30 +1688,26 @@ msgstr "Tomboy готов синхронизировать ваши заметк
#: ../Tomboy/PreferencesDialog.cs:1262
#, csharp-format
-#| msgid ""
-#| "Sorry, but something went wrong. Please check your information and try "
-#| "again. The {0} might be useful too."
msgid "Please check your information and try again. The log file {0} may contain more information about the error."
msgstr "Проверьте информация и попробуйте ещё раз. Файл журнала {0} может содержать более подробные сведения об ошибке."
#: ../Tomboy/PreferencesDialog.cs:1274
-#| msgid "Error connecting :("
msgid "Error connecting"
msgstr "Ошибка подключения"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Версия:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Автор:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Авторские права:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Зависимости модуля:"
@@ -1724,8 +1728,6 @@ msgid "Matches"
msgstr "Совпадения"
#: ../Tomboy/RecentChanges.cs:563
-#| msgid "{0} match"
-#| msgid_plural "{0} matches"
msgid "Title match"
msgstr "Соответствие названия"
@@ -2036,9 +2038,6 @@ msgstr ""
"Василий Фаронов <qvvx at yandex.ru>"
#: ../Tomboy/Tomboy.cs:424
-#| msgid ""
-#| "Copyright © 2004-2007 Alex Graveley\n"
-#| "Copyright © 2004-2010 Others\n"
msgid ""
"Copyright © 2004-2007 Alex Graveley\n"
"Copyright © 2004-2011 Others\n"
@@ -2055,10 +2054,6 @@ msgid "Homepage"
msgstr "Домашняя страница"
#: ../Tomboy/Tomboy.cs:554
-#| msgid ""
-#| "Tomboy: A simple, easy to use desktop note-taking application.\n"
-#| "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
-#| "\n"
msgid ""
"Tomboy: A simple, easy to use desktop note-taking application.\n"
"Copyright © 2004-2007 Alex Graveley\n"
diff --git a/po/sv.po b/po/sv.po
index 0cfff7d..9ffb84f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tomboy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-02 00:27+0200\n"
-"PO-Revision-Date: 2011-08-02 00:33+0100\n"
+"POT-Creation-Date: 2011-09-01 13:05+0200\n"
+"PO-Revision-Date: 2011-09-01 13:06+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"Language: sv\n"
@@ -433,7 +433,7 @@ msgid "Delete the selected note"
msgstr "Ta bort den valda anteckningen"
#: ../Tomboy/ActionManager.cs:142
-#: ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/NoteWindow.cs:411
msgid "_Close"
msgstr "S_täng"
@@ -481,7 +481,7 @@ msgid "Create _New Note"
msgstr "Skapa _ny anteckning"
#: ../Tomboy/ActionManager.cs:175
-#: ../Tomboy/NoteWindow.cs:349
+#: ../Tomboy/NoteWindow.cs:354
msgid "_Search All Notes"
msgstr "_Sök i alla anteckningar"
@@ -615,15 +615,15 @@ msgstr "_Mappsökväg:"
msgid "Select Synchronization Folder..."
msgstr "Välj synkroniseringsmapp..."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:127
msgid "Folder path field is empty."
msgstr "Fältet för mappsökväg är tomt."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:136
msgid "Specified folder path does not exist, and Tomboy was unable to create it."
msgstr "Angiven mappsökväg finns inte och Tomboy kunde inte skapa den."
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:214
msgid "Local Folder"
msgstr "Lokal mapp"
@@ -721,34 +721,34 @@ msgstr "Ta bort trasiga länkar"
msgid "Add a sketch"
msgstr "Lägg till en skiss"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:48
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
msgid "Se_rver:"
msgstr "Se_rver:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:61
msgid "User_name:"
msgstr "Användar_namn:"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:56
msgid "_Folder Path (optional):"
msgstr "_Mappsökväg (valfritt):"
#. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:59
msgid "SSH synchronization requires an existing SSH key for this server and user, added to a running SSH daemon."
msgstr "SSH-synkronisering kräver en befintlig SSH-nyckel för den här servern samt en användare, tillagd till en körande SSH-demon."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:83
msgid "Server or username field is empty."
msgstr "Fältet för server eller användarnamn är tomt."
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
msgid "SSH"
msgstr "SSH"
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+#: ../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 "\"Tidsgränsen överstegs vid anslutning till server. Försäkra dig om att din SSH-nyckel har lagts till i en körande SSH-demon."
@@ -804,23 +804,23 @@ msgstr "--- Tasque är inte igång ---"
msgid "_Underline"
msgstr "_Understryk"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:56
msgid "_URL:"
msgstr "_Url:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:67
msgid "_Password:"
msgstr "_Lösenord:"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:80
msgid "URL, username, or password field is empty."
msgstr "Fältet för url, användarnamn eller lösenord är tomt."
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:133
msgid "WebDAV"
msgstr "WebDAV"
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
+#: ../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 "Det inträffade ett fel vid anslutning till servern. Det kan ha orsakats av ett felaktigt användarnamn och/eller lösenord."
@@ -829,12 +829,12 @@ msgstr "Det inträffade ett fel vid anslutning till servern. Det kan ha orsakat
#. Save configuration into GConf
#. 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:254
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:268
msgid "Saving configuration to the GNOME keyring failed with the following message:"
msgstr "Sparning av konfiguration till GNOME-nyckelringen misslyckades med följande meddelande:"
#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:97
msgid "Connect to Server"
msgstr "Anslut till server"
@@ -843,38 +843,38 @@ msgid "Connected"
msgstr "Ansluten"
#. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:126
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:171
msgid "Server not responding. Try again later."
msgstr "Servern svarar inte. Försök igen senare."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:202
msgid "Authorization Failed, Try Again"
msgstr "Auktorisering misslyckades. Försök igen"
#. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
msgid "Tomboy Web Authorization Successful"
msgstr "Tomboy - Webbauktorisering lyckades"
#. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:213
msgid "Please return to the Tomboy Preferences window and press Save to start synchronizing."
msgstr "Återgå till Tomboys inställningsfönster och tryck på Spara för att påbörja synkroniseringen."
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:222
msgid "Connected. Press Save to start synchronizing"
msgstr "Ansluten. Tryck på Spara för att påbörja synkroniseringen"
#. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:228
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
msgid "Authorizing in browser (Press to reset connection)"
msgstr "Auktorisering i webbläsare (Tryck för att nollställa anslutningen)"
#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:236
msgid "Set the default browser and try again"
msgstr "Ställ in standardwebbläsare och försök igen"
@@ -883,20 +883,24 @@ msgid "Tomboy Web"
msgstr "Tomboys webbsida"
#: ../Tomboy/ExportAllApplicationAddin.cs:53
-msgid "Export All Notes to "
-msgstr "Exportera alla anteckningar till "
+#, csharp-format
+msgid "Export All Notes to {0}"
+msgstr "Exportera alla anteckningar till {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:54
-msgid "Start exporting notes to "
-msgstr "Starta export av anteckningar till "
+#, csharp-format
+msgid "Start exporting notes to {0}"
+msgstr "Starta export av anteckningar till {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:58
-msgid "Export selected notebook to "
-msgstr "Exportera markerat anteckningsblock till "
+#, csharp-format
+msgid "Export selected notebook to {0}"
+msgstr "Exportera markerat anteckningsblock till {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:59
-msgid "Start exporting notebook to "
-msgstr "Starta export av anteckningsblock till "
+#, csharp-format
+msgid "Start exporting notebook to {0}"
+msgstr "Starta export av anteckningsblock till {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:65
#: ../Tomboy/Synchronization/SyncManager.cs:161
@@ -912,12 +916,19 @@ msgid "Export your notes."
msgstr "Exportera dina anteckningar."
#: ../Tomboy/ExportAllApplicationAddin.cs:72
-msgid "Export All Notes To "
-msgstr "Exportera alla anteckningar till "
+#, csharp-format
+msgid "Export All Notes To {0}"
+msgstr "Exportera alla anteckningar till {0}"
#: ../Tomboy/ExportAllApplicationAddin.cs:77
-msgid "Export Selected Notebook To "
-msgstr "Exportera markerat anteckningsblock till "
+#, csharp-format
+msgid "Export Selected Notebook To {0}"
+msgstr "Exportera markerat anteckningsblock till {0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:153
+#, csharp-format
+msgid "All Notes {0} Export"
+msgstr "Alla anteckningar {0} exportera"
#: ../Tomboy/ExportAllApplicationAddin.cs:193
#: ../Tomboy/ExportAllApplicationAddin.cs:271
@@ -941,7 +952,7 @@ msgid "Unknown error."
msgstr "Okänt fel."
#: ../Tomboy/ExportAllApplicationAddin.cs:236
-#: ../Tomboy/Notebooks/Notebook.cs:215
+#: ../Tomboy/Notebooks/Notebook.cs:237
msgid "Unfiled Notes"
msgstr "Ej arkiverade anteckningar"
@@ -959,9 +970,11 @@ msgstr "Anteckningarna exporterades"
msgid "Could not save the files in \"{0}\""
msgstr "Kunde inte spara filerna i \"{0}\""
-#: ../Tomboy/ExportAllApplicationAddin.cs:506
-msgid "Create destination folder for "
-msgstr "Skapa målmapp för "
+#. Translators: {0} is the export type, e.g. HTML
+#: ../Tomboy/ExportAllApplicationAddin.cs:507
+#, csharp-format
+msgid "Create destination folder for {0} export"
+msgstr "Skapa målmapp för {0}-export"
#: ../Tomboy/JumpListManager.cs:96
#: ../Tomboy/RecentChanges.cs:85
@@ -1072,15 +1085,19 @@ msgstr "Anteckningsblock"
msgid "{0} Notebook Template"
msgstr "Anteckningsmall för {0}"
-#: ../Tomboy/Notebooks/Notebook.cs:183
+#: ../Tomboy/Notebooks/Notebook.cs:153
+msgid "New Note"
+msgstr "Ny anteckning"
+
+#: ../Tomboy/Notebooks/Notebook.cs:205
msgid "All Notes"
msgstr "Alla anteckningar"
-#: ../Tomboy/Notebooks/NotebookManager.cs:361
+#: ../Tomboy/Notebooks/NotebookManager.cs:367
msgid "Really delete this notebook?"
msgstr "Verkligen ta bort detta anteckningsblock?"
-#: ../Tomboy/Notebooks/NotebookManager.cs:363
+#: ../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 "Anteckningarna som tillhör detta anteckningsblock kommer inte att tas bort men de kommer inte längre att vara associerade med detta anteckningsblock. Denna åtgärd kan inte ångras."
@@ -1097,45 +1114,46 @@ msgstr "Inget anteckningsblock"
msgid "New \"{0}\" Note"
msgstr "Ny anteckning för \"{0}\""
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:56
msgid "Place this note into a notebook"
msgstr "Placera denna anteckning i ett anteckningsblock"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:148
msgid "Notebook"
msgstr "Anteckningsblock"
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:177
msgid "_New notebook..."
msgstr "_Nytt anteckningsblock..."
-#: ../Tomboy/Note.cs:497
+#: ../Tomboy/Note.cs:515
#: ../Tomboy/NoteManager.cs:475
#, csharp-format
msgid "New Note {0}"
msgstr "Ny anteckning {0}"
-#: ../Tomboy/Note.cs:1578
-msgid "Really delete this note?"
-msgstr "Verkligen ta bort denna anteckning?"
+#: ../Tomboy/Note.cs:1607
+#, csharp-format
+msgid "Really delete \"{0}\"?"
+msgstr "Verkligen ta bort \"{0}\"?"
-#: ../Tomboy/Note.cs:1581
+#: ../Tomboy/Note.cs:1610
#, csharp-format
msgid "Really delete this {0} note?"
msgid_plural "Really delete these {0} notes?"
msgstr[0] "Verkligen ta bort {0} anteckning?"
msgstr[1] "Verkligen ta bort dessa {0} anteckningar?"
-#: ../Tomboy/Note.cs:1592
+#: ../Tomboy/Note.cs:1621
msgid "If you delete a note it is permanently lost."
msgstr "Om du tar bort en anteckning försvinner den för alltid."
-#: ../Tomboy/Note.cs:1626
+#: ../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 "Ett fel inträffade när dina anteckningar sparades. Kontrollera att du har tillräckligt mycket diskutrymme och att du har de lämpliga rättigheterna på {0}. Mer information kan hittas i {1}."
-#: ../Tomboy/Note.cs:1642
+#: ../Tomboy/Note.cs:1671
msgid "Error saving note data."
msgstr "Fel vid sparande av anteckningsdata."
@@ -1238,8 +1256,8 @@ msgstr "Användning av länkar i Tomboy"
#. Use a simple "Describe..." body and highlight
#. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:548
-#: ../Tomboy/NoteManager.cs:641
+#: ../Tomboy/NoteManager.cs:543
+#: ../Tomboy/NoteManager.cs:646
msgid "Describe your new note here."
msgstr "Beskriv din nya anteckning här."
@@ -1301,142 +1319,162 @@ msgstr "Byt al_drig namn på länkar"
msgid "Alwa_ys rename links"
msgstr "Byt a_lltid namn på länkar"
-#: ../Tomboy/NoteWindow.cs:58
+#: ../Tomboy/NoteWindow.cs:59
msgid "Find in This Note"
msgstr "Sök i den här anteckningen"
-#: ../Tomboy/NoteWindow.cs:361
+#: ../Tomboy/NoteWindow.cs:366
msgid "_Link to New Note"
msgstr "_Länka till ny anteckning"
-#: ../Tomboy/NoteWindow.cs:373
+#: ../Tomboy/NoteWindow.cs:378
msgid "Te_xt"
msgstr "Te_xt"
-#: ../Tomboy/NoteWindow.cs:381
+#: ../Tomboy/NoteWindow.cs:386
msgid "_Find in This Note"
msgstr "_Sök i den här anteckningen"
-#: ../Tomboy/NoteWindow.cs:396
+#: ../Tomboy/NoteWindow.cs:401
msgid "Clos_e All Notes"
msgstr "S_täng alla anteckningar"
-#: ../Tomboy/NoteWindow.cs:436
+#: ../Tomboy/NoteWindow.cs:441
msgid "Search"
msgstr "Sök"
#. TODO: If we ever add a way to customize internal keybindings, this will need to change
-#: ../Tomboy/NoteWindow.cs:440
+#: ../Tomboy/NoteWindow.cs:445
msgid "Search your notes"
msgstr "Sök i dina anteckningar"
# Hoppas detta är verbet...
-#: ../Tomboy/NoteWindow.cs:452
+#: ../Tomboy/NoteWindow.cs:457
msgid "Link"
msgstr "Länka"
-#: ../Tomboy/NoteWindow.cs:459
+#: ../Tomboy/NoteWindow.cs:464
msgid "Link selected text to a new note"
msgstr "Länka markerad text till en ny anteckning"
-#: ../Tomboy/NoteWindow.cs:472
+#: ../Tomboy/NoteWindow.cs:477
msgid "_Text"
msgstr "_Text"
-#: ../Tomboy/NoteWindow.cs:477
+#: ../Tomboy/NoteWindow.cs:482
msgid "Set properties of text"
msgstr "Ställ in textegenskaper"
-#: ../Tomboy/NoteWindow.cs:482
+#: ../Tomboy/NoteWindow.cs:487
msgid "T_ools"
msgstr "_Verktyg"
-#: ../Tomboy/NoteWindow.cs:486
+#: ../Tomboy/NoteWindow.cs:491
msgid "Use tools on this note"
msgstr "Använd verktyg på denna anteckning."
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:499
msgid "Delete this note"
msgstr "Ta bort denna anteckning"
-#: ../Tomboy/NoteWindow.cs:502
+#: ../Tomboy/NoteWindow.cs:507
#: ../Tomboy/Synchronization/SyncManager.cs:163
msgid "Synchronize Notes"
msgstr "Synkronisera anteckningar"
-#: ../Tomboy/NoteWindow.cs:564
+#: ../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 "Denna anteckning är en mallanteckning. Den bestämmer standardinnehållet för vanliga anteckningar och kommer inte att visas i anteckningsmenyn eller sökfönster."
+
+#: ../Tomboy/NoteWindow.cs:571
+msgid "Convert to regular note"
+msgstr "Konvertera till vanlig anteckning"
+
+#: ../Tomboy/NoteWindow.cs:576
+msgid "Save Si_ze"
+msgstr "Spara st_orlek"
+
+#: ../Tomboy/NoteWindow.cs:585
+msgid "Save Se_lection"
+msgstr "Spara ma_rkering"
+
+#: ../Tomboy/NoteWindow.cs:594
+msgid "Save _Title"
+msgstr "Spara _titel"
+
+#: ../Tomboy/NoteWindow.cs:639
msgid "_Find..."
msgstr "_Sök..."
-#: ../Tomboy/NoteWindow.cs:575
+#: ../Tomboy/NoteWindow.cs:650
msgid "Find _Next"
msgstr "Sök _nästa"
-#: ../Tomboy/NoteWindow.cs:588
+#: ../Tomboy/NoteWindow.cs:663
msgid "Find _Previous"
msgstr "Sök _föregående"
-#: ../Tomboy/NoteWindow.cs:676
+#: ../Tomboy/NoteWindow.cs:751
msgid "Cannot create note"
msgstr "Kan inte skapa anteckning"
-#: ../Tomboy/NoteWindow.cs:757
+#: ../Tomboy/NoteWindow.cs:832
msgid "_Find:"
msgstr "_Sök:"
-#: ../Tomboy/NoteWindow.cs:768
+#: ../Tomboy/NoteWindow.cs:843
msgid "_Previous"
msgstr "_Föregående"
-#: ../Tomboy/NoteWindow.cs:777
+#: ../Tomboy/NoteWindow.cs:852
msgid "_Next"
msgstr "_Nästa"
-#: ../Tomboy/NoteWindow.cs:1260
+#: ../Tomboy/NoteWindow.cs:1335
msgid "_Bold"
msgstr "_Fet"
-#: ../Tomboy/NoteWindow.cs:1272
+#: ../Tomboy/NoteWindow.cs:1347
msgid "_Italic"
msgstr "_Kursiv"
-#: ../Tomboy/NoteWindow.cs:1284
+#: ../Tomboy/NoteWindow.cs:1359
msgid "_Strikeout"
msgstr "_Genomstruken"
-#: ../Tomboy/NoteWindow.cs:1296
+#: ../Tomboy/NoteWindow.cs:1371
msgid "_Highlight"
msgstr "_Markera"
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1384
msgid "Font Size"
msgstr "Typsnittsstorlek"
-#: ../Tomboy/NoteWindow.cs:1312
+#: ../Tomboy/NoteWindow.cs:1387
msgid "_Normal"
msgstr "_Normal"
-#: ../Tomboy/NoteWindow.cs:1329
+#: ../Tomboy/NoteWindow.cs:1404
msgid "Hu_ge"
msgstr "_Enorm"
-#: ../Tomboy/NoteWindow.cs:1337
+#: ../Tomboy/NoteWindow.cs:1412
msgid "_Large"
msgstr "_Stor"
-#: ../Tomboy/NoteWindow.cs:1345
+#: ../Tomboy/NoteWindow.cs:1420
msgid "S_mall"
msgstr "_Liten"
-#: ../Tomboy/NoteWindow.cs:1354
+#: ../Tomboy/NoteWindow.cs:1429
msgid "Increase Font Size"
msgstr "Öka typsnittsstorlek"
-#: ../Tomboy/NoteWindow.cs:1372
+#: ../Tomboy/NoteWindow.cs:1447
msgid "Decrease Font Size"
msgstr "Minska typsnittsstorlek"
-#: ../Tomboy/NoteWindow.cs:1392
+#: ../Tomboy/NoteWindow.cs:1467
msgid "Bullets"
msgstr "Punkter"
@@ -1641,19 +1679,19 @@ msgstr "Kontrollera din information och försök igen. Loggfilen {0} kan inneh
msgid "Error connecting"
msgstr "Fel vid anslutning"
-#: ../Tomboy/PreferencesDialog.cs:1350
+#: ../Tomboy/PreferencesDialog.cs:1357
msgid "Version:"
msgstr "Version:"
-#: ../Tomboy/PreferencesDialog.cs:1357
+#: ../Tomboy/PreferencesDialog.cs:1364
msgid "Author:"
msgstr "Upphovsman:"
-#: ../Tomboy/PreferencesDialog.cs:1364
+#: ../Tomboy/PreferencesDialog.cs:1371
msgid "Copyright:"
msgstr "Copyright:"
-#: ../Tomboy/PreferencesDialog.cs:1370
+#: ../Tomboy/PreferencesDialog.cs:1377
msgid "Add-in Dependencies:"
msgstr "Tilläggsberoenden:"
@@ -2162,27 +2200,22 @@ msgstr "_Kopiera länkadress"
msgid "_Open Link"
msgstr "_Öppna länk"
+#~ msgid "Really delete this note?"
+#~ msgstr "Verkligen ta bort denna anteckning?"
#~ msgid "HTML Export Last Directory"
#~ msgstr "HTML-exportera senaste katalogen"
-
#~ msgid "SSH (sshfs FUSE)"
#~ msgstr "SSH (sshfs FUSE)"
-
#~ msgid "WebDAV (wdfs FUSE)"
#~ msgstr "WebDAV (wdfs FUSE)"
-
#~ msgid "Search your notes (Ctrl-Shift-F)"
#~ msgstr "Sök i dina anteckningar (Ctrl-Skift-F)"
-
#~ msgid "Success! You're connected!"
#~ msgstr "Lyckades! Du är nu ansluten!"
-
#~ msgid "_Browse..."
#~ msgstr "_Bläddra..."
-
#~ msgid "D-BUS remote control disabled.\n"
#~ msgstr "D-BUS-fjärrkontroll inaktiverad.\n"
-
#~ msgid ""
#~ "Tomboy: unsupported option '{0}'\n"
#~ "Try 'tomboy --help' for more information.\n"
@@ -2191,136 +2224,92 @@ msgstr "_Öppna länk"
#~ "Tomboy: ogiltig flagga \"{0}\"\n"
#~ "Prova \"tomboy --help\" för mer information.\n"
#~ "D-BUS-fjärrkontroll inaktiverad."
-
#~ msgid "Click Here After Authorizing"
#~ msgstr "Klicka här efter auktorisering"
-
#~ msgid "Processing..."
#~ msgstr "Behandlar..."
-
#~ msgid "_Connect to Server"
#~ msgstr "_Anslut till server"
-
#~ msgid "C_ase Sensitive"
#~ msgstr "Skiftlä_geskänslig"
-
#~ msgid "Really delete these notes?"
#~ msgstr "Verkligen ta bort dessa anteckningar?"
-
#~ msgid "Add-in"
#~ msgstr "Tillägg"
-
#~ msgid "Version"
#~ msgstr "Version"
-
#~ msgid "Other"
#~ msgstr "Annat"
-
#~ msgid "Preparing pages..."
#~ msgstr "Förbereder sidor..."
-
#~ msgid "Rendering page %d of %d..."
#~ msgstr "Renderar sida %d av %d..."
-
#~ msgid "Printing page %d of %d..."
#~ msgstr "Skriver ut sida %d av %d..."
-
#~ msgid "Print preview"
#~ msgstr "Förhandsgranska utskrift"
-
#~ msgid "%A %x, %X"
#~ msgstr "%A %x, %X"
-
#~ msgid "Configuration"
#~ msgstr "Konfiguration"
-
#~ msgid "Configuration options for the print job"
#~ msgstr "Konfigurationsalternativ för utskriftsjobbet"
-
#~ msgid "Source Buffer"
#~ msgstr "Källbuffert"
-
#~ msgid "GtkTextBuffer object to print"
#~ msgstr "GtkTextBuffer-objekt att skriv ut"
-
#~ msgid "Tabs Width"
#~ msgstr "Tabulatorbredd"
-
#~ msgid "Width in equivalent space characters of tabs"
#~ msgstr "Tabulatorbredd i motsvarande blankstegstecken"
-
#~ msgid "Wrap Mode"
#~ msgstr "Radbrytning"
-
#~ msgid "Word wrapping mode"
#~ msgstr "Radbrytningsläge"
-
#~ msgid "Highlight"
#~ msgstr "Färgmarkera"
-
#~ msgid "Whether to print the document with highlighted syntax"
#~ msgstr "Huruvida dokumentet ska skrivas ut med färgmarkerad syntax"
-
#~ msgid "Font"
#~ msgstr "Typsnitt"
-
#~ msgid "GnomeFont name to use for the document text (deprecated)"
#~ msgstr "GnomeFont-namn att använda för dokumenttexten (föråldrad)"
-
#~ msgid "Font Description"
#~ msgstr "Typsnittsbeskrivning"
-
#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
#~ msgstr "Typsnitt att använda för dokumenttexten (t.ex. \"Monospace 10\")"
-
#~ msgid "Numbers Font"
#~ msgstr "Typsnitt för nummer"
-
#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
#~ msgstr "GnomeFont-namn att använda för radnumren (föråldrad)"
-
#~ msgid "Font description to use for the line numbers"
#~ msgstr "Typsnittsbeskrivning att använda för radnumren"
-
#~ msgid "Print Line Numbers"
#~ msgstr "Skriv ut radnummer"
-
#~ msgid "Interval of printed line numbers (0 means no numbers)"
#~ msgstr "Intervall för utskrivna radnummer (0 betyder inga nummer)"
-
#~ msgid "Print Header"
#~ msgstr "Skriv ut sidhuvud"
-
#~ msgid "Whether to print a header in each page"
#~ msgstr "Huruvida ett sidhuvud ska skrivas ut på varje sida"
-
#~ msgid "Print Footer"
#~ msgstr "Skriv ut sidfot"
-
#~ msgid "Whether to print a footer in each page"
#~ msgstr "Huruvida en sidfot ska skrivas ut på varje sida"
-
#~ msgid "Header and Footer Font"
#~ msgstr "Typsnitt för sidhuvud och -fot"
-
#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
#~ msgstr "GnomeFont-namn att använda för sidhuvud och -fot (föråldrad)"
-
#~ msgid "Header and Footer Font Description"
#~ msgstr "Typsnittsbeskrivning för sidhuvud och -fot"
-
#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
#~ msgstr "Typsnitt att använda för sidhuvud och -fot (t.ex. \"Monospace 10\")"
-
#~ msgid "NoteOfTheDay"
#~ msgstr "Dagens anteckning"
-
#~ msgid "_Open New Note Template..."
#~ msgstr "_Öppna mall för ny anteckning..."
-
#~ msgid "Case _sensitive"
#~ msgstr "Skiftläges_känslig"
-
#~ msgid ""
#~ "<note-content>Tagging In Tomboy\n"
#~ "\n"
@@ -2334,106 +2323,73 @@ msgstr "_Öppna länk"
#~ "Tryck på <bold>Tab</bold> i taggraden för att automatiskt komplettera "
#~ "till passande tagg. Tryck på <bold>Enter</bold> för att bekräfta den "
#~ "visade taggen.</note-content>"
-
#~ msgid "Tags in Tomboy"
#~ msgstr "Taggar i Tomboy"
-
#~ msgid "Delete"
#~ msgstr "Ta bort"
-
#~ msgid "Add/Remove note tags"
#~ msgstr "Lägg till/ta bort anteckningstaggar"
-
#~ msgid "Tags:"
#~ msgstr "Taggar:"
-
#~ msgid "Path:"
#~ msgstr "Sökväg:"
-
#~ msgid "Local File System Path"
#~ msgstr "Lokal filsystemssökväg"
-
#~ msgid ""
#~ "Your notes are up to date. See the details below or close the window."
#~ msgstr ""
#~ "Dina anteckningar är uppdaterade. Se detaljerna nedan eller stäng "
#~ "fönstret."
-
#~ msgid "Downloading updates from server"
#~ msgstr "Hämtar uppdateringar från servern"
-
#~ msgid "Downloading new note from server"
#~ msgstr "Hämtar ny anteckning från servern"
-
#~ msgid "To Do List"
#~ msgstr "Att göra-lista"
-
#~ msgid "New _Task"
#~ msgstr "Ny _uppgift"
-
#~ msgid "Create a new task"
#~ msgstr "Skapa en ny uppgift"
-
#~ msgid "_Options..."
#~ msgstr "Al_ternativ..."
-
#~ msgid "Open the selected task"
#~ msgstr "Öppna den valda uppgiften"
-
#~ msgid "Delete the selected task"
#~ msgstr "Ta bort den valda uppgiften"
-
#~ msgid "Open Associated _Note"
#~ msgstr "Öppna associerad ant_eckning"
-
#~ msgid "Open the note containing the task"
#~ msgstr "Öppna anteckning som innehåller uppgiften"
-
#~ msgid "Tasks Help"
#~ msgstr "Uppgiftshjälp"
-
#~ msgid "Summary"
#~ msgstr "Sammanfattning"
-
#~ msgid "Due Date"
#~ msgstr "Slutdatum"
-
#~ msgid "Completion Date"
#~ msgstr "Färdig den"
-
#~ msgid "Priority"
#~ msgstr "Prioritet"
-
#~ msgid "None"
#~ msgstr "Inget"
-
#~ msgid "Low"
#~ msgstr "Låg"
-
#~ msgid "Normal"
#~ msgstr "Normal"
-
#~ msgid "High"
#~ msgstr "Hög"
-
#~ msgid "Total: {0} task"
-
#~ msgid_plural "Total: {0} tasks"
#~ msgstr[0] "Totalt: {0} uppgift"
#~ msgstr[1] "Totalt: {0} uppgifter"
-
#~ msgid "New Task {0}"
#~ msgstr "Ny uppgift {0}"
-
#~ msgid "Really delete this task?"
#~ msgstr "Verkligen ta bort denna uppgift?"
-
#~ msgid "If you delete a task it is permanently lost."
#~ msgstr "Om du tar bort en uppgift försvinner den för alltid."
-
#~ msgid "Learn About Tomboy"
#~ msgstr "Läs mer om Tomboy"
-
#~ msgid ""
#~ "Click on the Tomboy icon in your panel and select \"Start Here\". You'll "
#~ "see more instructions on how to use Tomboy inside the \"Start Here\" "
@@ -2448,212 +2404,146 @@ msgstr "_Öppna länk"
#~ "\n"
#~ "När du har öppnat anteckningen \"Börja här\" kan du markera den här "
#~ "uppgiften som färdig."
-
#~ msgid "Task Options"
#~ msgstr "Alternativ för uppgifter"
-
#~ msgid "_Summary:"
#~ msgstr "_Sammanfattning:"
-
#~ msgid "_Details:"
#~ msgstr "_Detaljer:"
-
#~ msgid "_Complete"
#~ msgstr "_Färdig"
-
#~ msgid "Due Date:"
#~ msgstr "Slutdatum:"
-
#~ msgid "Priority:"
#~ msgstr "Prioritet:"
-
#~ msgid "todo"
#~ msgstr "attgöra"
-
#~ msgid "Open To Do List"
#~ msgstr "Öppna Att göra-lista"
-
#~ msgid "To Do Options"
#~ msgstr "Alternativ för Att göra"
-
#~ msgid "Mark Undone"
#~ msgstr "Markera som ofärdig"
-
#~ msgid "Mark Complete"
#~ msgstr "Markera som färdig"
-
#~ msgid "All registered repositories"
#~ msgstr "Alla registrerade förråd"
-
#~ msgid "Are you sure you want to cancel the installation?"
#~ msgstr "Är du säker på att du vill avbryta installationen?"
-
#~ msgid "The following packages will be uninstalled:"
#~ msgstr "Följande paket kommer att avinstalleras:"
-
#~ msgid ""
#~ "There are other add-ins that depend on the previous ones which will also "
#~ "be uninstalled:"
#~ msgstr ""
#~ "Det finns andra tillägg som är beroende av de föregående tilläggen, vilka "
#~ "också kommer att avinstalleras:"
-
#~ msgid ""
#~ "The selected add-ins can't be installed because there are dependency "
#~ "conflicts."
#~ msgstr ""
#~ "De valda tilläggen kan inte installeras på grund av att det finns "
#~ "beroendekonflikter."
-
#~ msgid "The following packages will be installed:"
#~ msgstr "Följande paket kommer att installeras:"
-
#~ msgid " (in user directory)"
#~ msgstr " (i användarkatalogen)"
-
#~ msgid "The following packages need to be uninstalled:"
#~ msgstr "Följande paket behöver avinstalleras:"
-
#~ msgid "The following dependencies could not be resolved:"
#~ msgstr "Följande beroenden kunde inte lösas:"
-
#~ msgid "The installation has been successfully completed."
#~ msgstr "Installationen lyckades."
-
#~ msgid "The installation failed!"
#~ msgstr "Installationen misslyckades!"
-
#~ msgid "The uninstallation has been successfully completed."
#~ msgstr "Avinstallationen lyckades."
-
#~ msgid "The uninstallation failed!"
#~ msgstr "Avinstallationen misslyckades!"
-
#~ msgid "Repository"
#~ msgstr "Förråd"
-
#~ msgid "Some of the required add-ins were not found"
#~ msgstr "Några av de nödvändiga tilläggen kunde inte hittas"
-
#~ msgid "Installation failed"
#~ msgstr "Installationen misslyckades"
-
#~ msgid "Name"
#~ msgstr "Namn"
-
#~ msgid "Url"
#~ msgstr "Url"
-
#~ msgid "Exception occurred: {0}"
#~ msgstr "Undantag inträffade: {0}"
-
#~ msgid "MonoDevelop Package"
#~ msgstr "MonoDevelop-paket"
-
#~ msgid "Add-in Installation"
#~ msgstr "Tilläggsinstallation"
-
#~ msgid "<b>Select the add-ins to install and click on Next</b>"
#~ msgstr "<b>Välj tilläggen att installera och klicka på Nästa</b>"
-
#~ msgid "Install from:"
#~ msgstr "Installera från:"
-
#~ msgid "_Repositories..."
#~ msgstr "_Förråd..."
-
#~ msgid "Show all packages"
#~ msgstr "Visa alla paket"
-
#~ msgid "Show new versions only"
#~ msgstr "Visa endast nya versioner"
-
#~ msgid "Show updates only"
#~ msgstr "Visa endast uppdateringar"
-
#~ msgid "_Unselect All"
#~ msgstr "A_vmarkera allt"
-
#~ msgid "label124"
#~ msgstr "etikett124"
-
#~ msgid "Overall Progress:"
#~ msgstr "Totalt förlopp:"
-
#~ msgid "Add-in Manager"
#~ msgstr "Tilläggshanterare"
-
#~ msgid "Additional extensions are required to perform this operation."
#~ msgstr ""
#~ "Ytterligare tillägg är nödvändiga för att genomföra den här åtgärden."
-
#~ msgid "The following add-ins will be installed:"
#~ msgstr "Följande tillägg kommer att installeras:"
-
#~ msgid "MonoDevelop Add-in Manager"
#~ msgstr "Hanterare för MonoDevelop-tillägg"
-
#~ msgid "<big><b>MonoDevelop Add-in Manager</b></big>"
#~ msgstr "<big><b>Hanterare för MonoDevelop-tillägg</b></big>"
-
#~ msgid "The following add-ins are currently installed:"
#~ msgstr "Följande tillägg är för närvarande installerade:"
-
#~ msgid "_Install Add-ins..."
#~ msgstr "_Installera tillägg..."
-
#~ msgid "_Uninstall..."
#~ msgstr "_Avinstallera..."
-
#~ msgid "Disable"
#~ msgstr "Inaktivera"
-
#~ msgid "MonoDevelop"
#~ msgstr "MonoDevelop"
-
#~ msgid "Add-in Repository Management"
#~ msgstr "Hantering av tilläggsförråd"
-
#~ msgid "Add New Repository"
#~ msgstr "Lägg till nytt förråd"
-
#~ msgid "Select the location of the repository you want to register:"
#~ msgstr "Välj platsen för förrådet som du vill registrera:"
-
#~ msgid "Register an on-line repository"
#~ msgstr "Registrera ett förråd på nätet"
-
#~ msgid "Url:"
#~ msgstr "Url:"
-
#~ msgid "Register a local repository"
#~ msgstr "Registrera ett lokalt förråd"
-
#~ msgid "(provided by {0})"
#~ msgstr "(tillhandahålls av {0})"
-
#~ msgid "Disabled add-ins can't be loaded."
#~ msgstr "Inaktiverade tillägg kan inte läsas in."
-
#~ msgid "Loading {0} add-in"
#~ msgstr "Läser in tillägget {0}"
-
#~ msgid "The required addin '{0}' is disabled."
#~ msgstr "Det nödvändiga tillägget \"{0}\" är inaktiverat."
-
#~ msgid "The required addin '{0}' is not installed."
#~ msgstr "Det nödvändiga tillägget \"{0}\" är inte installerat."
-
#~ msgid "Currently enabled plugins."
#~ msgstr "För närvarande aktiverade insticksmoduler."
-
#~ msgid "List containing the names of currently enabled plugins."
#~ msgstr ""
#~ "Lista innehållande namnen på de för närvarande aktiverade insticksmoduler."
-
#~ msgid "Cannot fully disable {0}."
#~ msgstr "Kan inte fullständigt inaktivera {0}."
-
#~ msgid ""
#~ "Cannot fully disable {0} as there still are at least {1} reference to "
#~ "this addin. This indicates a programming error. Contact the addin's "
@@ -2672,13 +2562,10 @@ msgstr "_Öppna länk"
#~ "tilläggets Dispose-metod misslyckas att koppla från alla "
#~ "händelsehanterare. Minnesprofileraren heap-shot ({2}) kan hjälpa till att "
#~ "identifiera läckande referenser."
-
#~ msgid "<b><span foreground=\"red\">"
#~ msgstr "<b><span foreground=\"red\">"
-
#~ msgid "Tomboy Project"
#~ msgstr "Tomboy-projektet"
-
#~ msgid ""
#~ "Cannot fully disable {0} as there still are at least {1} reference to "
#~ "this plugin. This indicates a programming error. Contact the plugin's "
@@ -2697,150 +2584,108 @@ msgstr "_Öppna länk"
#~ "insticksmodulens Dispose-metod misslyckas att koppla från alla "
#~ "händelsehanterare. Minnesprofileraren heap-shot ({2}) kan hjälpa till att "
#~ "identifiera läckande referenser."
-
#~ msgid "Plugins"
#~ msgstr "Insticksmoduler"
-
#~ msgid "Written by:"
#~ msgstr "Skrivet av:"
-
#~ msgid "Web site:"
#~ msgstr "Webbsida:"
-
#~ msgid "Settings"
#~ msgstr "Inställningar"
-
#~ msgid "_Open Plugins Folder"
#~ msgstr "_Öppna insticksmodulmappen"
-
#~ msgid "{0} Settings"
#~ msgstr "Inställningar för {0}"
-
#~ msgid ""
#~ " --check-plugin-unloading\tCheck if plugins are unloaded properly.\n"
#~ msgstr ""
#~ " --check-plugin-unloading\tKontrollera om insticksmoduler är korrekt "
#~ "urlästa.\n"
-
#~ msgid "</span></b>\n"
#~ msgstr "</span></b>\n"
-
#~ msgid "Homepage & Donations"
#~ msgstr "Hemsida och donationer"
-
#~ msgid "Default Plugins"
#~ msgstr "Standardinsticksmoduler"
-
#~ msgid "Directory containing system-installed Plugins"
#~ msgstr ""
#~ "Katalog som innehåller de insticksmoduler som är installerade på systemet"
-
#~ msgid "Use the following:"
#~ msgstr "Använd följande:"
-
#~ msgid "NotD: "
#~ msgstr "Dagens anteckning:"
-
#~ msgid "Welcome to Tomboy!"
#~ msgstr "Välkommen till Tomboy!"
-
#~ msgid ""
#~ "Use this page as a Start Page for organizing your notes and keeping "
#~ "unorganized ideas around."
#~ msgstr ""
#~ "Använd denna sida som en startsida för att organisera dina anteckningar "
#~ "och hålla reda på oorganiserade idéer."
-
#~ msgid "Quick and handy note-taker"
#~ msgstr "Snabbt och praktiskt anteckningsverktyg"
-
#~ msgid "_Open Table of Contents"
#~ msgstr "_Öppna innehållsförteckning"
-
#~ msgid "Find"
#~ msgstr "Sök"
-
#~ msgid "ToC"
#~ msgstr "Innehåll"
-
#~ msgid "Open Table of Contents"
#~ msgstr "Öppna innehållsförteckning"
-
#~ msgid "Open \"_Table of Contents\""
#~ msgstr "Öppna \"_Innehållsförteckning\""
-
#~ msgid "Table of Contents"
#~ msgstr "Innehållsförteckning"
-
#~ msgid "_Table of Contents"
#~ msgstr "Innehålls_förteckning"
-
#~ msgid "_Search..."
#~ msgstr "_Sök..."
-
#~ msgid ""
#~ "<b>Table of Contents</b> lists all your notes.\n"
#~ "Double click to open a note."
#~ msgstr ""
#~ "<b>Innehållsförteckningen</b> är en lista på dina anteckningar.\n"
#~ "Dubbelklicka på en anteckning för att öppna den."
-
#~ msgid "Search Note"
#~ msgstr "Sök i anteckning"
-
#~ msgid "Search _Results"
#~ msgstr "Sök_resultat"
-
#~ msgid "No notes found"
#~ msgstr "Inga anteckningar hittade"
-
#~ msgid "_Search Notes..."
#~ msgstr "_Sök anteckningar..."
-
#~ msgid "%A %D, %I:%M %p"
#~ msgstr "%A·%D,·%I:%M·%p"
-
#~ msgid "_About Tomboy..."
#~ msgstr "_Om Tomboy..."
-
#~ msgid "Run Plugin actions"
#~ msgstr "Kör åtgärder i insticksmoduler"
-
#~ msgid "_Recent Changes"
#~ msgstr "_Senaste ändringar"
-
#~ msgid "Related to: "
#~ msgstr "Relaterad till: "
-
#~ msgid "<b>_Bold</b>"
#~ msgstr "<b>_Fet</b>"
-
#~ msgid "<i>_Italic</i>"
#~ msgstr "<i>_Kursiv</i>"
-
#~ msgid "<s>_Strikeout</s>"
#~ msgstr "<s>_Genomstruken</s>"
-
#~ msgid "Recent changes"
#~ msgstr "Senaste ändringar"
-
#~ msgid "Search Results"
#~ msgstr "Sökresultat"
-
#~ msgid "Related to:"
#~ msgstr "Relaterad till:"
#, fuzzy
#~ msgid "({0} matches)"
#~ msgstr "Inga träffar."
-
#~ msgid "Text"
#~ msgstr "Text"
-
#~ msgid "Previous"
#~ msgstr "Föregående"
-
#~ msgid "translator_credits"
#~ msgstr ""
#~ "Christian Rose\n"
#~ "Skicka synpunkter på översättningen till sv at li.org"
+
diff --git a/test/Makefile.in b/test/Makefile.in
index 07e6056..44d1996 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -70,7 +70,6 @@ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -123,7 +122,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
@@ -179,7 +177,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -212,6 +209,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/tomboy.spec b/tomboy.spec
index f5bcf11..173a97d 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.7.4
+Version: 1.7.6
Release: 1
Epoch: 0
Summary: Tomboy is a desktop note-taking application for Linux and Unix.
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list