From: Gerfried Fuchs <alfie@debian.org>
Date: Wed, 2 Aug 2006 14:15:46 +0000 (-0500)
Subject: Imported Debian patch 0.5.6-1
X-Git-Tag: debian/0.5.6-1^0
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=ec21e25ffd8fe61704ae3588bcad4570de2946ac;hp=c6f9aac99da7e21fb3d717fe82f80382361a5dff;p=pkg%2Fabook.git

Imported Debian patch 0.5.6-1
---

diff --git a/BUGS b/BUGS
index 8899c06..b1164c6 100644
--- a/BUGS
+++ b/BUGS
@@ -17,6 +17,20 @@ known bugs in abook
 
 * file format is not tolerant for character set changes
 
+--
+[25]
+name=Lastname, Firstname
+email="Lastname, Firstname" <firstname.lastname@example.com>
+
+but the command "abook --mutt-query lastname" returns two email addresses
+
+"Lastname       Lastname, Firstname
+Firstname" <firstname.lastname@example.com>     Lastname, Firstname
+
+In other words, the mutt-query doesn't treat the comma as protected by the
+quotes, although the conversion from pine format did.
+--
+
 Filters:
 * mutt / elm / pine export filters allow to create a file with duplicate
   aliases
@@ -25,4 +39,4 @@ Filters:
 
 * fseek in ldif import filter should be eliminated
 
-$Id: BUGS,v 1.16 2005/08/29 10:02:50 jheinonen Exp $
+$Id: BUGS,v 1.16.2.1 2006/02/23 13:39:13 jheinonen Exp $
diff --git a/ChangeLog b/ChangeLog
index 22771a6..2f96df3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.5.6
+ - translation fixes
+ - fixed gcrd export format (\r\n line endings according to RFC, Marc Tardif)
+ - fix localized keybindings with --disable-nls
+
 0.5.5
  - i18n support (Cedric Duval)
  - French translation (Cedric Duval)
diff --git a/abook.spec b/abook.spec
index e12060b..48ce4b4 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,6 +1,6 @@
 Summary:	Text-based addressbook program
 Name:		abook
-Version:	0.5.5
+Version:	0.5.6
 Release:	1
 License:	GPL
 Group:		Utilities
diff --git a/config.guess b/config.guess
old mode 100755
new mode 100644
index ad5281e..c38553d
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-08-03'
+timestamp='2006-02-23'
 
 # 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
@@ -106,7 +106,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,6 +206,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@@ -764,7 +767,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -772,6 +780,9 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS_NT-*:*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
     i*:windows32*:*)
     	# uname -m includes "-pc" on this system.
     	echo ${UNAME_MACHINE}-mingw32
@@ -779,8 +790,11 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -851,7 +865,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +888,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,6 +941,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -964,7 +989,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -974,7 +999,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1185,7 +1214,6 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1292,9 @@ EOF
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
old mode 100755
new mode 100644
index 1c366df..ad9f395
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-02-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +119,9 @@ 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-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +172,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +192,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -239,7 +248,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,8 +266,9 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
@@ -286,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -336,8 +349,9 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -696,6 +710,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +820,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +882,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1174,21 +1201,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -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* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/configure b/configure
index cd6b85a..0dc4124 100755
--- a/configure
+++ b/configure
@@ -1622,7 +1622,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=abook
- VERSION=0.5.5
+ VERSION=0.5.6
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index f5f18b9..e6cc922 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.5)
+AM_INIT_AUTOMAKE(abook, 0.5.6)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------
diff --git a/debian/changelog b/debian/changelog
index dfdb5b8..41ea460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+abook (0.5.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated config.{guess,sub}.
+  * Bumped Standards-Version to 3.7.2, no changes needed.
+  * Used debconf for mutt query inclusion instead of outdated upgrade note
+    that would only affect upgrades from oldstable (woody) (closes: #377633).
+  * new debconf translations: Romanian by Eddy Petrişor (closes: #380505),
+    Czech by Miroslav Kure, Brazilian Portuguese by Felipe Augusto van de
+    Wiel, Vietnamese by Clytie Siddall, Hungarian by Attila Szervñc, German by
+    myself.
+
+ -- Gerfried Fuchs <alfie@debian.org>  Wed, 02 Aug 2006 09:15:46 -0500
+
 abook (0.5.5-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/config b/debian/config
index 05bb732..5a2484f 100644
--- a/debian/config
+++ b/debian/config
@@ -7,11 +7,10 @@ version=$2
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-if [ "$action" = "configure" ] && [ -n "$version" ]; then
-	if dpkg --compare-versions "$version" lt "0.5.0"; then
-		db_input medium abook/files_moved || true
-		db_go
-	fi
-fi
+db_unregister abook/files_moved || true
+
+# create the /etc/Muttrc.d/ snippet?
+db_input medium abook/muttrc.d || true
+db_go
 
 exit 0
diff --git a/debian/control b/debian/control
index aa525a9..27d24ca 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: abook
 Section: mail
 Priority: optional
 Maintainer: Gerfried Fuchs <alfie@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf
 
 Package: abook
diff --git a/debian/po/ca.po b/debian/po/ca.po
deleted file mode 100644
index 08386d1..0000000
--- a/debian/po/ca.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Catalan translation of abook debconf template
-# Copyright (c) 2004 Software in the Public Interest, Inc.
-# This file is distributed under the same license as the abook package.
-# Josep Monés i Teixidor <jmones@puntbarra.com>, 2004.
-# 
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: abook 0.5.1-2\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2004-04-04 23:43+0200\n"
-"Last-Translator: Josep Monés i Teixidor <jmones@puntbarra.com>\n"
-"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"S'ha canviat la ubicació del llibre d'adreces, és necessari importar-ne "
-"l'antic."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"A partir de la versió 0.5.0 abook utilitza un directory ocult (amb un punt "
-"com a primer caràcter) en el vostre directori personal per desar-hi el "
-"llibre d'adreces i el fitxer abookrc. A més s'ha canviat el format del "
-"llibre d'adreces, per això és necessari importar-ne el fitxer antic en "
-"iniciar abook després de l'actualització."
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 0f6ae31..9825e31 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -1,43 +1,36 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
-# Kepi <kepi@orthank.net>, 2004.
-# 
-# 
+# Czech translation of abook debconf templates.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the abook package.
+# Miroslav Kure <kurem@debian.cz>, 2006.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: abook 0.5.2-1\n"
+"Project-Id-Version: abook\n"
 "Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2004-07-21 14:02+0200\n"
-"Last-Translator: Ondra Kudlik <kepi@orthank.net>\n"
-"Language-Team: Czech <provoz@debian.cz>\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
+"PO-Revision-Date: 2006-08-02 07:24-0500\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr "Místo uložení adresáře se změnilo, je potřeba importovat starý."
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
+msgstr "Chcete celosystémově povolit v muttu podporu abooku?"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
+#: ../templates:1001
 msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
 msgstr ""
-"Od verze 0.5.0 používá abook k uložení seznamu adres a konfiguračního "
-"souboru adresář začínající tečkou ve vašem domovském adresáři. Předchozí "
-"seznam adres také změnil formát, takže je potřeba po aktualizaci v programu "
-"importovat váš starý soubor."
+"abook je možné používat rovnou z muttu jako úložiště kontaktů. Odpovíte-li "
+"kladně, balík vytvoří soubor /etc/Muttrc.d/abook.rc, ve kterém se povolí "
+"dotazování do databáze abooku a také možnost přidávání nových adres klávesou "
+"\"A\" z prohlížecího režimu."
diff --git a/debian/po/da.po b/debian/po/da.po
deleted file mode 100644
index 059c2a1..0000000
--- a/debian/po/da.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook 0.5.1\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2004-01-15 00:03+0200\n"
-"Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"Placeringen på adressebogsfilen er ændret, du skal importere den gamle."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Fra version 0.5.0 af abook, bruges ~/.abook/ mappen i din hjemmemappe til at "
-"gemme adressenbogen og abookrc-filen. Adressebogen har enda også ændret "
-"format, så du skal importere din gamle fil når du starter abook efter "
-"opgraderingen."
diff --git a/debian/po/de.po b/debian/po/de.po
index 3e621fc..8c23eca 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,31 +15,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook 0.5.0\n"
 "Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-08-07 21:50+0200\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
+"PO-Revision-Date: 2006-08-02 07:24-0500\n"
 "Last-Translator: Gerfried Fuchs <alfie@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"Der Ort der addressbook-Datei hat sich geändert, die alte muss importiert "
-"werden."
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
+msgstr "Wollen Sie abook Systemweit in mutt aktivieren?"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
+#: ../templates:1001
 msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
 msgstr ""
-"Seit Version 0.5.0 verwendet abook ein Punkt-Verzeichnis in Ihrem Heimat-"
-"Verzeichnis, um seine addressbook und abookrc Dateien zu speichern. Es hat "
-"sich auch das Format der ersten Datei geändert, daher müssen Sie Ihre alte "
-"Datei importieren, wenn Sie abook nach der Aktualisierung starten."
+"abook bietet die Möglichkeit, als externe Adressenabfrage in mutt verwendet "
+"zu werden. Falls Sie dieser Frage zustimmen, wird das Paket eine /etc/Muttrc."
+"d/abook.rc-Datei erstellen, die die Abfrage der abook-Datenbank und das "
+"Hinzufügen von Adressen in abook durch Drücken von »A« im Pager-Modus "
+"aktiviert."
diff --git a/debian/po/es.po b/debian/po/es.po
deleted file mode 100644
index 25fcc4a..0000000
--- a/debian/po/es.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# abook po-debconf translation to Spanish
-# Copyright (C) 2005 Software in the Public Interest
-# This file is distributed under the same license as the abook package.
-#
-# Changes:
-#  - Initial translation
-#         César Gómez Martín <cesar.gomez@gmail.com>
-#
-#
-#   Traductores, si no conoce el formato PO, merece la pena leer la
-#   documentación de gettext, especialmente las secciones dedicadas a este
-#   formato, por ejemplo ejecutando:
-#          info -n '(gettext)PO Files'
-#          info -n '(gettext)Header Entry'
-# Equipo de traducción al español, por favor, lean antes de traducir
-# los siguientes documentos:
-#
-#  - El proyecto de traducción de Debian al español
-#    http://www.debian.org/intl/spanish/
-#    especialmente las notas de traducción en
-#    http://www.debian.org/intl/spanish/notas
-#
-#  - La guía de traducción de po's de debconf:
-#    /usr/share/doc/po-debconf/README-trans
-#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2005-10-03 18:20+0100\n"
-"Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
-"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"Se ha cambiado la ubicación del fichero que contiene la libreta de "
-"direcciones y es necesario importar el antiguo."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"A partir de la versión 0.5.0 abook utiliza un directorio precedido de un "
-"punto en su directorio personal y un fichero abookrc para almacenar su "
-"libreta de direcciones. Además, el directorio precedido de un punto ha "
-"cambiado su formato, por lo que despues de la actualización es necesario "
-"importar su fichero antiguo nada más arrancar abook."
diff --git a/debian/po/fi.po b/debian/po/fi.po
deleted file mode 100644
index 830b18c..0000000
--- a/debian/po/fi.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2005-04-09 02:06+0300\n"
-"Last-Translator: Matti Pöllä <mpo@iki.fi>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"Osoitekirjatiedoston sijainti muuttunut, vanha tiedosto täytyy siirtää."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Versiosta 0.5.0 lähtien abook käyttää \"piste-hakemistoa\"\n"
-"kotihakemistossasi osoitekirjan ja abookrc-tiedoston\n"
-"varastoimiseen. Lisäksi osoitekirjan muoto on muuttunut, joten vanha\n"
-"tiedosto täytyy muuntaa päivityksen jälkeen ennen abook:in\n"
-"käyttämistä."
diff --git a/debian/po/fr.po b/debian/po/fr.po
deleted file mode 100644
index d056f42..0000000
--- a/debian/po/fr.po
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook 0.5.0\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-08-12 16:41+0200\n"
-"Last-Translator: Pierre Machard <pmachard@debian.org>\n"
-"Language-Team: Debian l10n French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"L'emplacement du carnet d'adresses a changé, il est nécessaire d'importer "
-"l'ancien."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Depuis la version 0.5.0, abook utilise un répertoire caché dans votre "
-"répertoire personnel pour stocker le carnet d'adresses ainsi que le fichier "
-"abookrc. Le format du fichier abookrc a également changé, vous devrez donc "
-"importer votre ancien fichier lorsque vous utiliserez abook, après la mise à "
-"jour."
diff --git a/debian/po/hu.po b/debian/po/hu.po
new file mode 100644
index 0000000..9998bfb
--- /dev/null
+++ b/debian/po/hu.po
@@ -0,0 +1,34 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
+"PO-Revision-Date: 2006-08-02 07:24-0500\n"
+"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
+"Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Hungarian\n"
+"X-Poedit-Country: HUNGARY\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
+msgstr "Engedélyezed az abook rendszer-szintű elérését a mutt számára?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
+msgstr ""
+"Az abook lehetővé teszi, hogy a mutt lekérdező motornak használja. Ha "
+"jóváhagyod e kérdést, a csomag létrehoz egy /etc/Muttrc.d/abook.rc fájlt, "
+"mely lehetővé teszi az abook adatbázis lekérdezését és email-címek "
+"hozzáadását az \"A\" gomb leütésével a lapozó módban."
diff --git a/debian/po/it.po b/debian/po/it.po
deleted file mode 100644
index 543767b..0000000
--- a/debian/po/it.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# translation of abook-it.po to 
-# translation of abook_0.5.3-3_templates.po to italian
-# Copyright Luca Bruno <luca.br@uno.it>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook-it\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2005-07-04 19:51+0200\n"
-"Last-Translator: \n"
-"Language-Team:  <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"La locazione del file della rubrica è cambiata, è necessario importare la "
-"precedente."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Dalla versione 0.5.0 abook usa una directory nascosta nella propria home "
-"directory per salvare la rubrica e il file abookrc. Il formato di "
-"quest'ultimo è cambiato, per cui è necessario importare il precedente dopo "
-"l'aggiornamento di abook."
diff --git a/debian/po/ja.po b/debian/po/ja.po
deleted file mode 100644
index 8795957..0000000
--- a/debian/po/ja.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook 0.5.1\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-12-31 02:08+0900\n"
-"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"addressbook ¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£¸Å¤¤¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëɬÍ×"
-"¤¬¤¢¤ê¤Þ¤¹¡£"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"abook ¤Ï¥Ð¡¼¥¸¥ç¥ó 0.5.0 ¤«¤é addressbook ¤È abookrc ¥Õ¥¡¥¤¥ë¤òÊݸ¤¹¤ë¤¿¤á¡¢"
-"¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë .abook ¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£¤µ¤é¤ËÀßÄê¥Õ¥¡¥¤¥ë¤Ï"
-"¥Õ¥©¡¼¥Þ¥Ã¥È¤òÊѹ¹¤·¤Æ¤¤¤Þ¤¹¡£¥¢¥Ã¥×¥°¥ì¡¼¥É¸å¡¢abook ¤òµ¯Æ°¤¹¤ëºÝ¤Ë¸Å¤¤¥Õ¥¡"
-"¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
diff --git a/debian/po/nl.po b/debian/po/nl.po
deleted file mode 100644
index 2984795..0000000
--- a/debian/po/nl.po
+++ /dev/null
@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: abook\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-09-30 18:36+0100\n"
-"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n"
-"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"De plaats van het adresboek-bestand is gewijzigd, het is nodig om de oude te "
-"importeren."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Vanaf versie 0.5.0 gebruikt abook de map .abook in uw persoonlijke map om "
-"het adresboek en het abookrc bestand op te slaan. Het formaat is zelfs "
-"veranderd dus u zult uw oude bestand moeten importeren bij het opstarten na "
-"de bijwerking."
diff --git a/debian/po/pl.po b/debian/po/pl.po
deleted file mode 100644
index 997ec20..0000000
--- a/debian/po/pl.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2004-06-09 18:47+0200\n"
-"Last-Translator: Bartosz Zapa³owski <zapal@debian.linux.org.pl>\n"
-"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org."
-"pl>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"Po³o¿enie pliku addressbook zosta³o zmienione, nale¿y zaimportowaæ stary plik"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Pocz±wszy od wersji 0.5.0, abook u¿ywa katalogu z kropk± w Twoim "
-"katalogudomowym do przechowywania plików addressbook i abookrc. Ten pierwszy "
-"zmieni³równie¿ swój format, dlatego musisz zaimportowaæ stary plik przy "
-"starcieprogramu abook po aktualizacji."
diff --git a/debian/po/pt.po b/debian/po/pt.po
deleted file mode 100644
index 59b08ae..0000000
--- a/debian/po/pt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# translation of abook_0.5.0-3_pt.po to Portuguese
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
-# Bruno Rodrigues <bruno.rodrigues@litux.org>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook_0.5.0-3_pt\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-10-17 16:10+0100\n"
-"Last-Translator: Bruno Rodrigues <bruno.rodrigues@litux.org>\n"
-"Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"A directoria do ficheiro de contactos foi alterada. É necessário importar o "
-"ficheiro antigo."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"A partir da versão 0.5.0, o abook usa uma directoria de configuração "
-"começada por ponto na àrea do utilizador para armazenar a lista de contactos "
-"e o ficheiro de configuração \"abookrc\". O formato deste ficheiro alterou, "
-"portando deverá importar os dados dele ao iniciar o abook depois deste "
-"upgrade."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 6706661..3b55e9e 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -1,45 +1,37 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# abook Brazilian Portuguese translation 
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the abook package.
+# Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: abook_0.5.0-1\n"
+"Project-Id-Version: abook\n"
 "Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-08-16 21:12-0300\n"
-"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
+"PO-Revision-Date: 2006-08-02 07:24-0500\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
+"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"pt_BR UTF-8\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"A localização do livro de endereços mudou, necessário importar o livro antigo"
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
+msgstr "Você gostaria de ativar o abook para o mutt em todo o sistema?"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
+#: ../templates:1001
 msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
 msgstr ""
-"A partir da versão 0.5.0 o abook começou a utilizar um diretório iniciado "
-"por um ponto no diretório pessoal dos usuários para armazenar seu livro de "
-"endereço e o arquivo abookrc. O livro de endereços mudou seu formato, "
-"portanto é preciso importar seu arquivo antigo quando você iniciar o abook "
-"após a atualização."
+"abook oferece a possibilidade de ser usado como catálogo de consulta a "
+"partir do mutt. Se você aceitar esta opção, o pacote criará um arquivo /etc/"
+"Muttrc.d/abook.rc que ativará a consulta à base de dados abook e permitirá a "
+"adição de endereços de e-mail ao abook pressionando \"A\" no modo \"pager\"."
diff --git a/debian/po/ro.po b/debian/po/ro.po
new file mode 100644
index 0000000..a10123b
--- /dev/null
+++ b/debian/po/ro.po
@@ -0,0 +1,37 @@
+# Romanian translation
+# This file is distributed under the same license as the abook package.
+#
+# Eddy Petrisor <eddy_petrisor@yahoo.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: abook\n"
+"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
+"PO-Revision-Date: 2006-08-02 07:25-0500\n"
+"Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
+msgstr "Doriţi să activaţi abook pentru mutt pe întregul sistem?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
+msgstr ""
+"abook oferă posibilitatea să fie folosit ca suport pentru interogări din "
+"mutt. Dacă răspundeţi afirmativ la această întrebare, pachetul va crea un "
+"fişier /etc/Muttrc.d/abook.rc care activează interogările asupra bazei de "
+"date abook şi care adaugă adresele de poştă electronică în abook la apăsarea "
+"tastei „A” din modul de paginaţie."
diff --git a/debian/po/ru.po b/debian/po/ru.po
deleted file mode 100644
index 563fae3..0000000
--- a/debian/po/ru.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# translation of abook_0.5.0-2.po to russian
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: abook_0.5.0-2\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2003-10-05 18:54+0600\n"
-"Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
-"Language-Team: russian <debian-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr ""
-"íÅÓÔÏÒÁÓÐÏÌÏÖÅÎÉÅ ÁÄÒÅÓÎÏÊ ËÎÉÇÉ ÉÚÍÅÎÉÌÏÓØ, ÎÕÖÎÏ ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÓÔÁÒÕÀ "
-"ËÎÉÇÕ."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"îÁÞÉÎÁÑ Ó ×ÅÒÓÉÉ 0.5.0 abook ÉÓÐÏÌØÚÕÅÔ ÓËÒÙÔÙÊ ËÁÔÁÌÏÇ × ÷ÁÛÅÍ ÄÏÍÁÛÎÅÍ "
-"ËÁÔÁÌÏÇÅ ÄÌÑ ÈÒÁÎÅÎÉÑ Ó×ÏÉÈ ÆÁÊÌÏ× ÁÄÒÅÓÎÏÊ ËÎÉÇÉ É ÆÁÊÌÁ abookrc. á×ÔÏÒ "
-"ÄÁÖÅ ÉÚÍÅÎÉÌ ÆÏÒÍÁÔ ÆÁÊÌÏ×, ÔÁË ÞÔÏ ÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÷ÁÛ ÓÔÁÒÙÊ "
-"ÆÁÊÌ ÐÒÉ ÚÁÐÕÓËÅ abook ÐÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ."
diff --git a/debian/po/sv.po b/debian/po/sv.po
deleted file mode 100644
index 8d096db..0000000
--- a/debian/po/sv.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
-# 
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: abook 0.5.4-1\n"
-"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2005-10-03 23:03+0200\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr "Sökvägen till addressboken är ändrad, behöver att importera den gamla."
-
-#. Type: note
-#. Description
-#: ../templates:3
-msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
-msgstr ""
-"Från version 0.5.0 av abook använder en punkt-mapp \".\" i din hemmapp för "
-"att spara sin addressbok och abookrc-fil. Den tidigare ändrade även sitt "
-"format så du behöver importera din gamla fil när du startar abook efter "
-"uppgraderingen."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index fbfff2d..7f4a6b8 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the abook package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: abook 0.5.4-1\n"
+"Project-Id-Version: abook VERSION\n"
 "Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,17 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
 msgstr ""
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
+#: ../templates:1001
 msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index d43ff92..e5bd15b 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,35 +1,37 @@
-# Vietnamese Translation for abook.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Vietnamese translation for abook (debconf).
+# Copyright © 2006 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: abook 0.5.3-2\n"
+"Project-Id-Version: abook\n"
 "Report-Msgid-Bugs-To: abook@packages.debian.org\n"
-"POT-Creation-Date: 2004-06-09 18:46+0200\n"
-"PO-Revision-Date: 2005-05-04 14:27+0930\n"
+"POT-Creation-Date: 2006-07-30 06:46-0500\n"
+"PO-Revision-Date: 2006-08-02 07:25-0500\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.6b36\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
-msgid "Place of addressbook file changed, need to import the old one."
-msgstr "Đã thay đổi vị trí tập tin sổ địa chỉ nên cần phải nạp sổ cũ."
+#: ../templates:1001
+msgid "Do you want to enable abook system wide for mutt?"
+msgstr "Bạn có muốn bật chạy abook cho mutt trên toàn bộ hệ thống không?"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../templates:3
+#: ../templates:1001
 msgid ""
-"From version 0.5.0 on abook uses a dot directory in your home directory to "
-"store its addressbook and abookrc file. The former even changed its format "
-"so you need to import your old file when you start abook after the upgrade."
+"abook offers the posibility to be used as query backend from within mutt.  "
+"If you acknowledge this question the package will create an /etc/Muttrc.d/"
+"abook.rc file that enables querying the abook database and adding mail "
+"addresses to abook with pressing \"A\" from pager mode."
 msgstr ""
-"Trong phiên bản 0.5.0 và sau, trình abook sử dụng một thư mục «chấm» trong "
-"thư mục chính của bạn, để cất giữ sổ địa chỉ và tập tin abookrc (tài nguyên) "
-"của nó. Đã thay đổi dạng sổ địa chỉ nên bạn cần phải nạp tập tin cũ khi khởi "
-"chạy abook sau khi nâng cấp."
+"Trình abook cung cấp khả năng chạy nó như là hậu phương truy vấn từ bên "
+"trong « mutt ». Nếu bạn đồng ý, gói này sẽ tạo tập tin tài nguyên </etc/"
+"Muttrc.d/abook.rc> sẽ cho bạn có khả năng truy vấn co sở dữ liệu abook, cũng "
+"thêm địa chỉ thư vào abook bằng cách bấm « A » trong chế độ máy nhắn tin."
diff --git a/debian/postinst b/debian/postinst
index 0d8063c..fc02555 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,10 +6,45 @@ if [ -e /usr/share/debconf/confmodule ]; then
 	. /usr/share/debconf/confmodule
 fi
 
-if [ "$1" != configure ]; then
-	exit 0
+action=$1
+if [ "${DEBCONF_RECONFIGURE}" = "1" ]; then
+	# workaround until reconfigure is really available
+	action=reconfigure
 fi
+version=$2
 
-if [ -x /usr/bin/update-menus ]; then
+# if we got reinstalled after a remove, enable the config snippet again
+if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/abook.rc.removed ] && [ ! -e /etc/Muttrc.d/abook.rc ]; then
+	mv /etc/Muttrc.d/abook.rc.removed /etc/Muttrc.d/abook.rc || true
+fi
+
+# only on new install, upgrade from < 0.5.6 or reconfigure
+if dpkg --compare-versions "$version" lt "0.5.6" || [ "$action" = "reconfigure" ]; then
+	mutt=true
+	if [ -e /usr/share/debconf/confmodule ]; then
+		db_get abook/muttrc.d
+		mutt="$RET"
+	fi
+
+	case "$mutt" in
+	    true)
+		if [ ! -e /etc/Muttrc.d/abook.rc ] ; then
+			mkdir /etc/Muttrc.d 2> /dev/null || true
+			cat > /etc/Muttrc.d/abook.rc << EOF
+set query_command="abook --mutt-query '%s'"
+macro pager A |'abook --add-email'\n
+EOF
+		fi
+		;;
+	    false)
+		rm /etc/Muttrc.d/abook.rc 2> /dev/null || true
+		rmdir /etc/Muttrc.d 2> /dev/null || true
+		;;
+	esac
+fi
+
+
+# menu entry
+if [ "$action" = 'configure' ] && [ -x /usr/bin/update-menus ]; then
 	update-menus
 fi
diff --git a/debian/postrm b/debian/postrm
index e6df067..76b3870 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -5,7 +5,23 @@ if [ -x "`which update-menus 2>/dev/null`" ]; then
 	update-menus
 fi
 
-if [ "$1" = 'purge' ] && [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-	db_purge
-fi
+action=$1
+
+case "$action" in
+    remove)
+	if [ ! -e /etc/Muttrc.d/abook.rc.removed ]; then
+		# only disable the config snippet
+		mv /etc/Muttrc.d/abook.rc /etc/Muttrc.d/abook.rc.removed || true
+	fi
+	;;
+    purge)
+	rm /etc/Muttrc.d/abook.rc.removed 2> /dev/null || true
+	rm /etc/Muttrc.d/abook.rc 2> /dev/null || true
+	rmdir /etc/Muttrc.d 2> /dev/null || true
+	# remove debconf data on purge
+	if [ -e /usr/share/debconf/confmodule ]; then
+		. /usr/share/debconf/confmodule
+		db_purge
+	fi
+	;;
+esac
diff --git a/debian/templates b/debian/templates
index eed02dd..8493ba5 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,6 +1,8 @@
-Template: abook/files_moved
-Type: note
-_Description: Place of addressbook file changed, need to import the old one.
- From version 0.5.0 on abook uses a dot directory in your home directory to
- store its addressbook and abookrc file. The former even changed its format so
- you need to import your old file when you start abook after the upgrade.
+Template: abook/muttrc.d
+Type: boolean
+Default: true
+_Description: Do you want to enable abook system wide for mutt?
+ abook offers the posibility to be used as query backend from within mutt.  If
+ you acknowledge this question the package will create an
+ /etc/Muttrc.d/abook.rc file that enables querying the abook database and
+ adding mail addresses to abook with pressing "A" from pager mode.
diff --git a/filter.c b/filter.c
index 6749490..8d0faa9 100644
--- a/filter.c
+++ b/filter.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: filter.c,v 1.48.2.1 2005/10/26 19:45:23 jheinonen Exp $
+ * $Id: filter.c,v 1.48.2.1.2.2 2006/04/10 16:02:10 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -908,7 +908,7 @@ pine_fixbuf(char *buf)
 {
 	int i,j;
 
-	for(i=0,j=0; j < (int)strlen(buf); i++, j++)
+	for(i = 0,j = 0; j < (int)strlen(buf); i++, j++)
 		buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -921,18 +921,17 @@ pine_convert_emails(char *s)
 	if(s == NULL || *s != '(')
 		return;
 
-	for(i=0; s[i]; i++ )
-		s[i] = s[i+1];
+	for(i = 0; s[i]; i++)
+		s[i] = s[i + 1];
 
 	if( ( tmp = strchr(s,')')) )
-		*tmp=0;
+		*tmp = '\0';
 
 	for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1)
 		if(i > MAX_EMAILS - 1) {
-			*tmp = 0;
+			*tmp = '\0';
 			break;
 		}
-
 }
 
 static void
@@ -943,11 +942,11 @@ pine_parse_buf(char *buf)
 	char *end;
 	char tmp[PINE_BUF_SIZE];
 	int i, len, last;
-	int pine_conv_table[]= {NICK, NAME, EMAIL, -1, NOTES};
+	int pine_conv_table[] = {NICK, NAME, EMAIL, -1, NOTES};
 
 	memset(&item, 0, sizeof(item));
 
-	for(i=0, last=0; !last ; i++) {
+	for(i = 0, last=0; !last ; i++) {
 		if( !(end = strchr(start, '\t')) )
 			last=1;
 
@@ -1510,7 +1509,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 	char *name;
 
 	db_enumerate_items(e) {
-		fprintf(out, "BEGIN:VCARD\nFN:%s\n",
+		fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
 				safe_str(database[e.item][NAME]));
 
 		name = get_surname(database[e.item][NAME]);
@@ -1518,7 +1517,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 	                if(database[e.item][NAME][j] == ' ')
 	                        break;
 	        }
-		fprintf(out, "N:%s;%.*s\n",
+		fprintf(out, "N:%s;%.*s\r\n",
 			safe_str(name),
 			j,
 			safe_str(database[e.item][NAME])
@@ -1527,7 +1526,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 		free(name);
 
 		if ( database[e.item][ADDRESS] )
-			fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
+			fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
 				safe_str(database[e.item][ADDRESS]),
 				safe_str(database[e.item][ADDRESS2]),
 				safe_str(database[e.item][CITY]),
@@ -1537,29 +1536,32 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 				);
 
 		if (database[e.item][PHONE])
-			fprintf(out, "TEL;HOME:%s\n", database[e.item][PHONE]);
+			fprintf(out, "TEL;HOME:%s\r\n",
+				database[e.item][PHONE]);
 		if (database[e.item][WORKPHONE])
-			fprintf(out, "TEL;WORK:%s\n", database[e.item][WORKPHONE]);
+			fprintf(out, "TEL;WORK:%s\r\n",
+				database[e.item][WORKPHONE]);
+
 		if (database[e.item][FAX])
-			fprintf(out, "TEL;FAX:%s\n", database[e.item][FAX]);
+			fprintf(out, "TEL;FAX:%s\r\n", database[e.item][FAX]);
 		if (database[e.item][MOBILEPHONE])
-			fprintf(out, "TEL;CELL:%s\n", database[e.item][MOBILEPHONE]);
+			fprintf(out, "TEL;CELL:%s\r\n", database[e.item][MOBILEPHONE]);
 
 		if ( database[e.item][EMAIL] ) {
 			split_emailstr(e.item, emails);
 			for(j=0; j < MAX_EMAILS ; j++) {
 				if ( *emails[j] )
-					fprintf(out, "EMAIL;INTERNET:%s\n",
+					fprintf(out, "EMAIL;INTERNET:%s\r\n",
 						emails[j]);
 			}
 		}
 
 		if ( database[e.item][NOTES] )
-			fprintf(out, "NOTE:%s\n", database[e.item][NOTES]);
+			fprintf(out, "NOTE:%s\r\n", database[e.item][NOTES]);
 		if (database[e.item][URL])
-			fprintf(out, "URL:%s\n",  database[e.item][URL]);
+			fprintf(out, "URL:%s\r\n",  database[e.item][URL]);
 
-		fprintf(out, "END:VCARD\n\n");
+		fprintf(out, "END:VCARD\r\n\r\n");
 
 	}
 
diff --git a/gettext.c b/gettext.c
index 949e843..0dd9dbf 100644
--- a/gettext.c
+++ b/gettext.c
@@ -2,18 +2,17 @@
 #	include "config.h"
 #endif
 
-#ifdef ENABLE_NLS
 #include <string.h>
 #include "gettext.h"
 
-char *
+const char *
 sgettext(const char *msgid)
 {
-	char *msgval = gettext(msgid);
+	const char *msgval = gettext(msgid);
 
 	if(msgval == msgid)
 		msgval = strrchr(msgid, '|') + 1;
 
 	return msgval;
 }
-#endif
+
diff --git a/gettext.h b/gettext.h
index 332a7f6..6e2973c 100644
--- a/gettext.h
+++ b/gettext.h
@@ -1,15 +1,14 @@
 #ifndef _GETTEXT_H
 #define _GETTEXT_H
 
+const char *sgettext(const char *msgid); /* Strip context prefix */
+
 # if ENABLE_NLS
 #  include <libintl.h>
-char *sgettext(const char *msgid); /* Strip context prefix */
 # else
 #  define gettext(Msgid) ((const char *) (Msgid))
-#  define sgettext(Msgid) ((const char *) (Msgid))
-
-#  define textdomain(Domainname) ((const char *) (Domainname))
-#  define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+#  define textdomain(Domainname) do {} while(0)
+#  define bindtextdomain(Domainname, Dirname) do {} while(0)
 # endif /* ENABLE_NLS */
 
 # define _(String) gettext (String)
diff --git a/options.c b/options.c
index 235da40..3b8c338 100644
--- a/options.c
+++ b/options.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: options.c,v 1.27 2005/09/21 16:50:31 jheinonen Exp $
+ * $Id: options.c,v 1.27.4.1 2006/04/09 18:57:34 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -226,7 +226,7 @@ find_token_end(buffer *b)
 	}
 }
 
-static char *
+static const char *
 opt_set_set_option(char *var, char *p, struct option *opt)
 {
 	int len;
@@ -265,7 +265,7 @@ opt_set_set_option(char *var, char *p, struct option *opt)
 	return NULL;
 }
 
-static char *
+static const char *
 opt_parse_set(buffer *b)
 {
 	int i;
@@ -288,7 +288,7 @@ opt_parse_set(buffer *b)
 
 #include "database.h" /* needed for change_custom_field_name */
 
-static char *
+static const char *
 opt_parse_customfield(buffer *b)
 {
 	char *p, num[5];
@@ -315,7 +315,7 @@ opt_parse_customfield(buffer *b)
 
 static struct {
 	char *token;
-	char * (*func) (buffer *line);
+	const char * (*func) (buffer *line);
 } opt_parsers[] = {
 	{ "set", opt_parse_set },
 	{ "customfield", opt_parse_customfield },
@@ -326,7 +326,7 @@ static bool
 opt_parse_line(char *line, int n, char *fn)
 {
 	int i;
-	char *err = NULL;
+	const char *err = NULL;
 	char *token;
 	buffer b;
 
diff --git a/po/de.gmo b/po/de.gmo
index bfc0405..3fe1872 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/fr.gmo b/po/fr.gmo
index f4fd9cf..a9790e9 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/ja.gmo b/po/ja.gmo
index c365b42..3acef28 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/sv.gmo b/po/sv.gmo
index 3aa41ee..72cc124 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/ui.c b/ui.c
index 0fc8273..d42f26e 100644
--- a/ui.c
+++ b/ui.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ui.c,v 1.54 2005/10/05 11:03:36 jheinonen Exp $
+ * $Id: ui.c,v 1.54.4.1 2006/04/09 18:57:34 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -306,7 +306,7 @@ statusline_askchoice(const char *msg, const char *choices, short dflt)
 }
 
 char *
-ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
+ui_readline(const char *prompt, char *s, size_t limit, bool use_completion)
 {
 	int y, x;
 	char *ret;
@@ -327,7 +327,7 @@ ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 }
 
 int
-statusline_ask_boolean(char *msg, int def)
+statusline_ask_boolean(const char *msg, int def)
 {
 	int ret;
 	char *msg2 = strconcat(msg,  def ? _(" (Y/n)?") : _(" (y/N)?"), NULL);
@@ -363,7 +363,7 @@ refresh_statusline()
 }
 
 char *
-ask_filename(char *prompt)
+ask_filename(const char *prompt)
 {
 	char *buf = NULL;
 
diff --git a/ui.h b/ui.h
index 7e1b8a8..e811431 100644
--- a/ui.h
+++ b/ui.h
@@ -15,13 +15,15 @@ void		close_ui();
 void		headerline(const char *str);
 void            refresh_screen();
 int		statusline_msg(const char *msg);
-int 		statusline_askchoice(const char *msg, const char *choices, short dflt);
-char		*ask_filename(char *prompt);
-int		statusline_ask_boolean(char *msg, int def);
+int 		statusline_askchoice(const char *msg, const char *choices,
+			short dflt);
+char		*ask_filename(const char *prompt);
+int		statusline_ask_boolean(const char *msg, int def);
 void            clear_statusline();
 void		display_help(int help);
 void		statusline_addstr(const char *str);
-char *		ui_readline(char *prompt, char *s, size_t limit, bool use_completion);
+char *		ui_readline(const char *prompt, char *s, size_t limit,
+			bool use_completion);
 void		refresh_statusline();
 void		get_commands();
 void		ui_remove_items();