- sync with 0.5.5pre1 release

diff --git a/ChangeLog b/ChangeLog
index 8056f30b9c5cbec3eb7df94ce82c1949ee18cb2a..5c8113d2828335c04a4044da6c9223bd5c3e28e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
  - Swedish translation (Susanna Björverud)
  - palmcsv import filter (Marc Tardif)
  - use better common code for csv filters (Marc Tardif)
- - translation HOWTO
+ - translation HOWTO (Cedric Duval)
  - wanderlust export filter (Josef Schugt)
 
 0.5.4

diff --git a/config.h.in b/config.h.in
index d209986dc69f4334e58a1cea5b3daef281ded384..942ee35a00a6ac9da48c8c7e66ceab5de21b4e01 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -94,6 +94,9 @@
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
+/* Define to 1 if you have the <iconv.h> header file. */
+#undef HAVE_ICONV_H
+
 /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
 #undef HAVE_INTMAX_T
 

diff --git a/configure b/configure
index 2e1f1232791dc1c1680e0cb2f089c113b407c0ee..b5bc7ce48554b1cb0ab2226ddc23dc8fd127d9e9 100755 (executable)
--- a/configure
+++ b/configure
@@ -11684,7 +11684,8 @@ fi
 
 
 
-for ac_header in unistd.h locale.h sys/ioctl.h
+
+for ac_header in unistd.h locale.h sys/ioctl.h iconv.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then

diff --git a/configure.in b/configure.in
index d50663097a5441c78f1b0a871e3eec35631c22da..7c919f42b52b54323a3772401c86610541fb26e0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ fi
 AC_C_INLINE
 AC_PROG_INSTALL
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h)
+AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h iconv.h)
 AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H, 1, [Define if you have the <stdarg.h> header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
 AC_FUNC_STRCOLL
 AC_CHECK_FUNCS(setlocale)

diff --git a/po/abook.pot b/po/abook.pot
index 916215e53bd5747491c8c9f401705bc29c9d1954..9a247d303a164d3b3fd6ef74f82b4c94f6fefafa 100644 (file)
--- a/po/abook.pot
+++ b/po/abook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-03 00:16+0200\n"
+"POT-Creation-Date: 2005-10-17 13:34+0300\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"
@@ -353,103 +353,107 @@ msgstr ""
 msgid "?:help c:contact a:address p:phone o:other"
 msgstr ""
 
-#: filter.c:70 filter.c:81
+#: filter.c:71 filter.c:82
 msgid "abook native format"
 msgstr ""
 
-#: filter.c:71
+#: filter.c:72
 msgid "ldif / Netscape addressbook"
 msgstr ""
 
-#: filter.c:72 filter.c:83
+#: filter.c:73 filter.c:84
 msgid "mutt alias"
 msgstr ""
 
-#: filter.c:73 filter.c:85
+#: filter.c:74 filter.c:86
 msgid "pine addressbook"
 msgstr ""
 
-#: filter.c:74 filter.c:87
+#: filter.c:75 filter.c:88
 msgid "comma separated values"
 msgstr ""
 
-#: filter.c:75 filter.c:88
+#: filter.c:76 filter.c:89
 msgid "comma separated values (all fields)"
 msgstr ""
 
-#: filter.c:76 filter.c:89
+#: filter.c:77 filter.c:90
 msgid "Palm comma separated values"
 msgstr ""
 
-#: filter.c:82
+#: filter.c:83
 msgid "ldif / Netscape addressbook (.4ld)"
 msgstr ""
 
-#: filter.c:84
+#: filter.c:85
 msgid "html document"
 msgstr ""
 
-#: filter.c:86
+#: filter.c:87
 msgid "GnomeCard (VCard) addressbook"
 msgstr ""
 
-#: filter.c:90
+#: filter.c:91
 msgid "elm alias"
 msgstr ""
 
-#: filter.c:91
+#: filter.c:92
 msgid "plain text"
 msgstr ""
 
-#: filter.c:92
+#: filter.c:93
+msgid "Wanderlust address book"
+msgstr ""
+
+#: filter.c:94
 msgid "Spruce address book"
 msgstr ""
 
-#: filter.c:105
+#: filter.c:107
 msgid "input:"
 msgstr ""
 
-#: filter.c:112
+#: filter.c:114
 msgid "output:"
 msgstr ""
 
-#: filter.c:177
+#: filter.c:179
 msgid "import database"
 msgstr ""
 
-#: filter.c:179 filter.c:296
+#: filter.c:181 filter.c:298
 msgid "please select a filter"
 msgstr ""
 
-#: filter.c:187 filter.c:304
+#: filter.c:189 filter.c:306
 msgid "x -\tcancel"
 msgstr ""
 
-#: filter.c:208 filter.c:342
+#: filter.c:210 filter.c:344
 msgid "Filename: "
 msgstr ""
 
-#: filter.c:215
+#: filter.c:217
 msgid "Error occured while opening the file"
 msgstr ""
 
-#: filter.c:217
+#: filter.c:219
 msgid "File does not seem to be a valid addressbook"
 msgstr ""
 
-#: filter.c:294
+#: filter.c:296
 msgid "export database"
 msgstr ""
 
-#: filter.c:327
+#: filter.c:329
 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
 msgstr ""
 
-#: filter.c:328 ui.c:629
+#: filter.c:330 ui.c:629
 msgid "keybindings:all/selected/cancel|asc"
 msgstr ""
 
-#: filter.c:349
+#: filter.c:351
 msgid "Error occured while exporting"
 msgstr ""
 

diff --git a/po/de.po b/po/de.po
index 14523c236720bb2adcf9149c76ac9f6cf5ea1afe..b8f6fbd7dfa6ad1754d667f4d8a6d412a458d770 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook 0.5.5pre1\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-03 00:16+0200\n"
+"POT-Creation-Date: 2005-10-17 13:34+0300\n"
 "PO-Revision-Date: 2005-10-03 00:56+0200\n"
 "Last-Translator: Johannes Weißl <jargon@molb.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -371,104 +371,109 @@ msgstr "E-Mail-Adressen:"
 msgid "?:help c:contact a:address p:phone o:other"
 msgstr "?:Hilfe c:Kontakt a:Adresse p:Telefon o:Andere"
 
-#: filter.c:70 filter.c:81
+#: filter.c:71 filter.c:82
 msgid "abook native format"
 msgstr "abooks eigenes Format"
 
-#: filter.c:71
+#: filter.c:72
 msgid "ldif / Netscape addressbook"
 msgstr "ldif / Netscape Adressbuch"
 
-#: filter.c:72 filter.c:83
+#: filter.c:73 filter.c:84
 msgid "mutt alias"
 msgstr "mutt alias"
 
-#: filter.c:73 filter.c:85
+#: filter.c:74 filter.c:86
 msgid "pine addressbook"
 msgstr "pine Adressbuch"
 
-#: filter.c:74 filter.c:87
+#: filter.c:75 filter.c:88
 msgid "comma separated values"
 msgstr "komma-separierte Werte"
 
-#: filter.c:75 filter.c:88
+#: filter.c:76 filter.c:89
 msgid "comma separated values (all fields)"
 msgstr "komma-separierte Werte (alle Felder)"
 
-#: filter.c:76 filter.c:89
+#: filter.c:77 filter.c:90
 msgid "Palm comma separated values"
 msgstr "Palm komma-separierte Werte"
 
-#: filter.c:82
+#: filter.c:83
 msgid "ldif / Netscape addressbook (.4ld)"
 msgstr "ldif / Netscape Adressbuch (.4ld)"
 
-#: filter.c:84
+#: filter.c:85
 msgid "html document"
 msgstr "HTML Dokument"
 
-#: filter.c:86
+#: filter.c:87
 msgid "GnomeCard (VCard) addressbook"
 msgstr "GnomeCard (VCard) Adressbuch"
 
-#: filter.c:90
+#: filter.c:91
 msgid "elm alias"
 msgstr "elm alias"
 
-#: filter.c:91
+#: filter.c:92
 msgid "plain text"
 msgstr "Klartext"
 
-#: filter.c:92
+#: filter.c:93
+#, fuzzy
+msgid "Wanderlust address book"
+msgstr "pine Adressbuch"
+
+#: filter.c:94
 msgid "Spruce address book"
 msgstr "Spruce Adressbuch"
 
-#: filter.c:105
+#: filter.c:107
 msgid "input:"
 msgstr "Eingabe:"
 
-#: filter.c:112
+#: filter.c:114
 msgid "output:"
 msgstr "Ausgabe:"
 
-#: filter.c:177
+#: filter.c:179
 msgid "import database"
 msgstr "importiere Datenbank"
 
-#: filter.c:179 filter.c:296
+#: filter.c:181 filter.c:298
 msgid "please select a filter"
 msgstr "Bitte Filter auswählen"
 
-#: filter.c:187 filter.c:304
+#: filter.c:189 filter.c:306
 msgid "x -\tcancel"
 msgstr "x -\tabbrechen"
 
-#: filter.c:208 filter.c:342
+#: filter.c:210 filter.c:344
 msgid "Filename: "
 msgstr "Dateiname: "
 
-#: filter.c:215
+#: filter.c:217
 msgid "Error occured while opening the file"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: filter.c:217
+#: filter.c:219
 msgid "File does not seem to be a valid addressbook"
 msgstr "Die Datei scheint kein gültiges Adressbuch zu sein"
 
-#: filter.c:294
+#: filter.c:296
 msgid "export database"
 msgstr "exportiere Datenbank"
 
 # instead: Exportiere alle (a), exportiere ausgewählte (s), oder abbrechen (c)?
-#: filter.c:327
+#: filter.c:329
 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
 msgstr "Exportiere <a>lle, exportiere au<s>gewählte, oder bri<c>h ab?"
 
-#: filter.c:328 ui.c:629
+#: filter.c:330 ui.c:629
 msgid "keybindings:all/selected/cancel|asc"
 msgstr ""
 
-#: filter.c:349
+#: filter.c:351
 msgid "Error occured while exporting"
 msgstr "Fehler beim Exportieren aufgetreten"
 

diff --git a/po/fr.po b/po/fr.po
index dcfcba589036f675da598bc2b4368ade9e625ffb..b20be05abc22399c6ab66e0b0be3325f33e6c819 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-03 10:25+0200\n"
+"POT-Creation-Date: 2005-10-17 13:34+0300\n"
 "PO-Revision-Date: 2005-10-03 10:53+0200\n"
 "Last-Translator: Cedric Duval <cedricduval+abook@free.fr>\n"
 "Language-Team: french\n"

diff --git a/po/sv.po b/po/sv.po
index ac98b37f3741d32f47e70c042f06cc86d605eb13..d364a7c90ace40d36d27ebd0687dceb45392357a 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: abook 0.5.4\n"
 "Report-Msgid-Bugs-To: <cedricduval+abook@free.fr>\n"
-"POT-Creation-Date: 2005-10-03 00:16+0200\n"
+"POT-Creation-Date: 2005-10-17 13:34+0300\n"
 "PO-Revision-Date: 2005-09-23 22:13+0200\n"
 "Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\n"
 "Language-Team: none\n"
@@ -366,103 +366,108 @@ msgstr "Ebrevsadresser:"
 msgid "?:help c:contact a:address p:phone o:other"
 msgstr "?:hjälp c:kontact a:adress p:telefon o:annat"
 
-#: filter.c:70 filter.c:81
+#: filter.c:71 filter.c:82
 msgid "abook native format"
 msgstr "abooks eget format"
 
-#: filter.c:71
+#: filter.c:72
 msgid "ldif / Netscape addressbook"
 msgstr "ldif / adressbok fr Netscape"
 
-#: filter.c:72 filter.c:83
+#: filter.c:73 filter.c:84
 msgid "mutt alias"
 msgstr "mutt-alias"
 
-#: filter.c:73 filter.c:85
+#: filter.c:74 filter.c:86
 msgid "pine addressbook"
 msgstr "pine-adressbok"
 
-#: filter.c:74 filter.c:87
+#: filter.c:75 filter.c:88
 msgid "comma separated values"
 msgstr "kommaseparerade värden"
 
-#: filter.c:75 filter.c:88
+#: filter.c:76 filter.c:89
 msgid "comma separated values (all fields)"
 msgstr "kommaseparerade värden (alla fält)"
 
-#: filter.c:76 filter.c:89
+#: filter.c:77 filter.c:90
 msgid "Palm comma separated values"
 msgstr "kommaseparerade värden från Palm"
 
-#: filter.c:82
+#: filter.c:83
 msgid "ldif / Netscape addressbook (.4ld)"
 msgstr "ldif / adressbok fr Netscape (.4ld)"
 
-#: filter.c:84
+#: filter.c:85
 msgid "html document"
 msgstr "html-dokument"
 
-#: filter.c:86
+#: filter.c:87
 msgid "GnomeCard (VCard) addressbook"
 msgstr "GnomeCard-adressbok (VCard)"
 
-#: filter.c:90
+#: filter.c:91
 msgid "elm alias"
 msgstr "elm-alias"
 
-#: filter.c:91
+#: filter.c:92
 msgid "plain text"
 msgstr "ren text"
 
-#: filter.c:92
+#: filter.c:93
+#, fuzzy
+msgid "Wanderlust address book"
+msgstr "pine-adressbok"
+
+#: filter.c:94
 msgid "Spruce address book"
 msgstr "Spruce-adressbok"
 
-#: filter.c:105
+#: filter.c:107
 msgid "input:"
 msgstr "input:"
 
-#: filter.c:112
+#: filter.c:114
 msgid "output:"
 msgstr "output:"
 
-#: filter.c:177
+#: filter.c:179
 msgid "import database"
 msgstr "importera databaser"
 
-#: filter.c:179 filter.c:296
+#: filter.c:181 filter.c:298
 msgid "please select a filter"
 msgstr "var god och välj filter"
 
-#: filter.c:187 filter.c:304
+#: filter.c:189 filter.c:306
 msgid "x -\tcancel"
 msgstr "x -\tavbryt"
 
-#: filter.c:208 filter.c:342
+#: filter.c:210 filter.c:344
 msgid "Filename: "
 msgstr "Filnamn:"
 
-#: filter.c:215
+#: filter.c:217
 msgid "Error occured while opening the file"
 msgstr "Fel vid öppnandet av filen"
 
-#: filter.c:217
+#: filter.c:219
 msgid "File does not seem to be a valid addressbook"
 msgstr "Den angivna filen verkar inte vara en giltig adressbok"
 
-#: filter.c:294
+#: filter.c:296
 msgid "export database"
 msgstr "exportera databasen"
 
-#: filter.c:327
+#: filter.c:329
 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
 msgstr ""
 
-#: filter.c:328 ui.c:629
+#: filter.c:330 ui.c:629
 msgid "keybindings:all/selected/cancel|asc"
 msgstr ""
 
-#: filter.c:349
+#: filter.c:351
 msgid "Error occured while exporting"
 msgstr "Fel vid export"
 

diff --git a/xmalloc.h b/xmalloc.h
index 7351f123a54baa7f5b5af60f8afc82a3092a0658..c94e14608eb2f6ea8f06f1b43eb891576e141fd8 100644 (file)
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -14,6 +14,7 @@ void          xmalloc_set_error_handler(void (*)(int));
 void *         xmalloc(size_t);
 void *         xmalloc0(size_t);
 void *         xmalloc_inc(size_t, size_t);
+void *         xmalloc0_inc(size_t, size_t);
 void *         xrealloc(void *, size_t);
 void *         xrealloc_inc(void *, size_t, size_t);
 char *         xstrdup(const char *s);