[almanah/almanah-0-6: 5/5] Bump to version 0.6.1.

[Philip Withnall <pwithnall src gnome org>]

commit 6f634eafb53dc7b913e80a34aae545f2a0127394
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jun 1 10:23:03 2009 +0100

    Bump to version 0.6.1.
---
 ChangeLog         |    9 +++++++++
 INSTALL           |    2 +-
 NEWS              |    3 +++
 configure.ac      |    2 +-
 po/Makefile.in.in |    4 ++--
 po/de.po          |    1 +
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15702d4..c73fd52 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+============ Version 0.6.1
+
+2009-06-01  Philip Withnall  <philip tecnocode co uk>
+
+	* INSTALL:
+	* po/Makefile.in.in:
+	* NEWS:
+	* configure.ac: Bump to version 0.6.1.
+
 2009-04-23  Philip Withnall  <philip tecnocode co uk>
 
 	* src/storage-manager.c (database_idle_cb): Add more debugging on
diff --git a/INSTALL b/INSTALL
index 81fa6ff..c437c5a 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.9/INSTALL
\ No newline at end of file
+/opt/gnome2/build/share/automake-1.9/INSTALL
\ No newline at end of file
diff --git a/NEWS b/NEWS
index ed78681..fcb16d5 100755
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Major new features in version...
 
+0.6.1:
+* Backport some fixes for data loss and crasher bugs from master
+
 0.6:
 Note that 0.6 removes the old concept of "links", and all stored links will no longer be accessible. They will,
 however, remain in the database, and can be accessed using the following commands while Almanah's running:
diff --git a/configure.ac b/configure.ac
index 5067548..aa8b02f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(almanah, 0.6.0)
+AC_INIT(almanah, 0.6.1)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 57ef267..c7e8302 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
diff --git a/po/de.po b/po/de.po
index 1b86e38..8b5d258 100644
--- a/po/de.po
+++ b/po/de.po
@@ -272,6 +272,7 @@ msgstr ""
 
 #: ../src/main-window.c:757
 #, c-format
+#, fuzzy
 msgid "A helpful diary keeper, storing %u entries and %u links."
 msgstr ""
 "Ein hilfreicher Tagebuchführer, der %u Einträge mit %u Links und insgesamt %u "