From 9f8d08201f21610b73690e373bd60716472327b8 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Mon, 22 Jan 2007 22:02:22 +0100 Subject: [PATCH] Imported Debian patch 0.5.6-2 --- debian/changelog | 13 +++++++++++++ debian/po/ca.po | 38 ++++++++++++++++++++++++++++++++++++++ debian/po/cs.po | 6 +++--- debian/po/de.po | 6 +++--- debian/po/fr.po | 36 ++++++++++++++++++++++++++++++++++++ debian/po/hu.po | 6 +++--- debian/po/pt_BR.po | 6 +++--- debian/po/ro.po | 6 +++--- debian/po/sv.po | 36 ++++++++++++++++++++++++++++++++++++ debian/po/templates.pot | 8 ++++---- debian/po/vi.po | 6 +++--- debian/postinst | 7 ++++++- debian/templates | 2 +- 13 files changed, 152 insertions(+), 24 deletions(-) create mode 100644 debian/po/ca.po create mode 100644 debian/po/fr.po create mode 100644 debian/po/sv.po diff --git a/debian/changelog b/debian/changelog index 41ea460..ce93bcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +abook (0.5.6-2) unstable; urgency=low + + * The "l10n R us" release. + * New debconf translations: Swedish by Daniel Nylander (closes: #387518), + Catalan by Jordà Polo (closes: #381362), French by Pierre Machard + (closes: #384681) + * Fixed typo in templates file and unfuzzied all translations that were + uptodate before (closes: #383473) + * Fixed quoting in mutt config snippet noticed by Georg Neis, thanks + (closes: #394532) + + -- Gerfried Fuchs Mon, 22 Jan 2007 22:02:22 +0100 + abook (0.5.6-1) unstable; urgency=low * New upstream release. diff --git a/debian/po/ca.po b/debian/po/ca.po new file mode 100644 index 0000000..eab8f41 --- /dev/null +++ b/debian/po/ca.po @@ -0,0 +1,38 @@ +# +# Catalan translation for abook package. +# Copyright (C) 2006 Gerfried Fuchs. +# This file is distributed under the same license as the abook package. +# +# Jordà Polo , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.1.1\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:00+0100\n" +"Last-Translator: Jordà Polo \n" +"Language-Team: Català \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable abook system wide for mutt?" +msgstr "Voleu habilitar abook per a mutt a tot el sistema?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"abook offers the possibility 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 ofereix la possibilitat de ser utilitzat des de mutt a l'hora de " +"realitzar consultes. Si accepteu, el paquet crearà un fitxer /etc/Muttrc.d/" +"abook.rc que permetrà fer consultes sobre la base de dades de abook i " +"afegir noves adreces de correu prement \"A\" des del mode paginador." diff --git a/debian/po/cs.po b/debian/po/cs.po index 9825e31..2c03099 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -7,8 +7,8 @@ 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:24-0500\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:00+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "Chcete celosystémově povolit v muttu podporu abooku?" #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/po/de.po b/debian/po/de.po index 8c23eca..a15a247 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: abook 0.5.0\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" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:00+0100\n" "Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "Wollen Sie abook Systemweit in mutt aktivieren?" #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 0000000..29f83ae --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,36 @@ +# abook debconf translation +# This file is distributed under the same license as the abook package. +# Pierre Machard 2003-2006 +# +msgid "" +msgstr "" +"Project-Id-Version: abook\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:00+0100\n" +"Last-Translator: Pierre Machard \n" +"Language-Team: Debian l10n French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable abook system wide for mutt?" +msgstr "Faut-il activer abook pour l'ensemble des utilisateurs de mutt ?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"abook offers the possibility 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 peut être employé comme agent de recherche depuis mutt. Si vous " +"choisissez cette option, le paquet créera un fichier /etc/Muttrc.d/abook.rc " +"qui activera les consultations de la base de données et complétera l'adresse " +"électronique dans abook en pressant la touche « A » dans le mode pagination " +"(« pager mode »)." diff --git a/debian/po/hu.po b/debian/po/hu.po index 9998bfb..2893d1a 100644 --- a/debian/po/hu.po +++ b/debian/po/hu.po @@ -2,8 +2,8 @@ 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" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:01+0100\n" "Last-Translator: SZERVÑC Attila \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "Engedélyezed az abook rendszer-szintű elérését a mutt számára?" #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/po/pt_BR.po b/debian/po/pt_BR.po index 3b55e9e..a4c73b2 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -7,8 +7,8 @@ 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:24-0500\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:01+0100\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Você gostaria de ativar o abook para o mutt em todo o sistema?" #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/po/ro.po b/debian/po/ro.po index a10123b..017ee35 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -6,8 +6,8 @@ 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" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:01+0100\n" "Last-Translator: Eddy Petrişor \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "DoriÅ£i să activaÅ£i abook pentru mutt pe întregul sistem?" #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..6bcd070 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,36 @@ +# 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 , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: abook 0.5.6-1\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:01+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable abook system wide for mutt?" +msgstr "Vill du aktivera abook systembrett för mutt?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"abook offers the possibility 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 erbjuder möjligheten att användas som en frågebakände innefrån mutt. " +"Om du bekräftar denna fråga kommer paketet att skapa en fil kallad /etc/" +"Muttrc.d/abook.rc som tillåter frågor mot abook-databasen och att lägga till " +"e-postadresser till abook genom att trycka på \"A\" från visningsläget." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 7f4a6b8..cb19edc 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the abook package. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: abook VERSION\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: abook@packages.debian.org\n" -"POT-Creation-Date: 2006-07-30 06:46-0500\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "" #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/po/vi.po b/debian/po/vi.po index e5bd15b..f88d8e5 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,8 +6,8 @@ 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" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-01-22 23:01+0100\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Bạn có muốn bật chạy abook cho mutt trên toàn bộ hệ thố #. Description #: ../templates:1001 msgid "" -"abook offers the posibility to be used as query backend from within mutt. " +"abook offers the possibility 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/debian/postinst b/debian/postinst index fc02555..408f6dc 100644 --- a/debian/postinst +++ b/debian/postinst @@ -18,6 +18,11 @@ if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/abook.rc.removed ] && [ ! - mv /etc/Muttrc.d/abook.rc.removed /etc/Muttrc.d/abook.rc || true fi +# fix for #394532 breakage +if grep "abook --mutt-query '%s'" /etc/Muttrc.d/abook.rc >/dev/null 2>/dev/null ; then + sed -i "s/abook --mutt-query '%s'/abook --mutt-query %s/" /etc/Muttrc.d/abook.rc +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 @@ -31,7 +36,7 @@ if dpkg --compare-versions "$version" lt "0.5.6" || [ "$action" = "reconfigure" 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'" +set query_command="abook --mutt-query %s" macro pager A |'abook --add-email'\n EOF fi diff --git a/debian/templates b/debian/templates index 8493ba5..60e3b11 100644 --- a/debian/templates +++ b/debian/templates @@ -2,7 +2,7 @@ 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 + abook offers the possibility 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. -- 2.39.2