2005-12-20 [colin] 1.9.100cvs97
authorColin Leroy <colin@colino.net>
Tue, 20 Dec 2005 17:43:40 +0000 (17:43 +0000)
committerColin Leroy <colin@colino.net>
Tue, 20 Dec 2005 17:43:40 +0000 (17:43 +0000)
* ABOUT-NLS
* Makefile.am
* autogen.sh
* configure.ac
* config/config.rpath
* config/mkinstalldirs
* m4/Makefile.am
* m4/glibc2.m4
* m4/gnupg.m4
* m4/gpgme.m4
* m4/intmax.m4
* m4/longdouble.m4
* m4/longlong.m4
* m4/printf-posix.m4
* m4/signed.m4
* m4/size_max.m4
* m4/ulonglong.m4
* m4/wchar_t.m4
* m4/wint_t.m4
* m4/xsize.m4
* po/Makefile.in.in
* po/Makevars
* po/bg.po
* po/ca.po
* po/cs.po
* po/de.po
* po/el.po
* po/en_GB.po
* po/es.po
* po/fi.po
* po/fr.po
* po/hr.po
* po/hu.po
* po/it.po
* po/ja.po
* po/ko.po
* po/nb.po
* po/nl.po
* po/pl.po
* po/pt_BR.po
* po/ru.po
* po/sk.po
* po/sr.po
* po/stamp-po
* po/sv.po
* po/zh_CN.po
* po/zh_TW.po
* src/Makefile.am
* src/codeconv.c
* src/compose.c
* src/exporthtml.c
* src/exportldif.c
* src/folder.c
* src/main.c
* src/manual.c
* src/mh.c
* src/mimeview.c
* src/send_message.c
* src/common/Makefile.am
* src/common/fnmatch.c
* src/common/fnmatch.h
* src/common/fnmatch_loop.c
* src/common/nntp.c
* src/common/plugin.c
* src/common/smtp.c
* src/common/socket.c
* src/common/string_match.c
* src/common/sylpheed.c
* src/common/utils.c
* src/common/utils.h
* src/common/w32_dirent.c
* src/common/w32_reg.c
* src/common/w32_signal.c
* src/common/w32_stat.c
* src/common/w32_stdio.c
* src/common/w32_stdlib.c
* src/common/w32_string.c
* src/common/w32_time.c
* src/common/w32_unistd.c
* src/common/w32_wait.c
* src/common/w32lib.h
* src/etpan/Makefile.am
* src/gtk/Makefile.am
* src/plugins/clamav/Makefile.am
* src/plugins/demo/Makefile.am
* src/plugins/dillo_viewer/Makefile.am
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpcore/passphrase.c
* src/plugins/pgpcore/plugin.def
* src/plugins/pgpcore/sgpgme.c
* src/plugins/pgpcore/sylpheed.def
* src/plugins/pgpcore/version.rc
* src/plugins/pgpinline/Makefile.am
* src/plugins/pgpinline/plugin.def
* src/plugins/pgpinline/sylpheed.def
* src/plugins/pgpinline/version.rc
* src/plugins/pgpmime/Makefile.am
* src/plugins/pgpmime/mypgpcore.def
* src/plugins/pgpmime/plugin.def
* src/plugins/pgpmime/sylpheed.def
* src/plugins/pgpmime/version.rc
* src/plugins/spamassassin/Makefile.am
Very little ;-) patch from Werner Koch, providing
infrastructure for cross-compiling to Win32

104 files changed:
ABOUT-NLS
ChangeLog
Makefile.am
PATCHSETS
autogen.sh
config/config.rpath
config/mkinstalldirs
configure.ac
m4/Makefile.am
m4/glibc2.m4 [new file with mode: 0644]
m4/gnupg.m4 [new file with mode: 0644]
m4/gpgme.m4 [new file with mode: 0644]
m4/intmax.m4 [new file with mode: 0644]
m4/longdouble.m4 [new file with mode: 0644]
m4/longlong.m4 [new file with mode: 0644]
m4/printf-posix.m4 [new file with mode: 0644]
m4/signed.m4 [new file with mode: 0644]
m4/size_max.m4 [new file with mode: 0644]
m4/ulonglong.m4 [new file with mode: 0644]
m4/wchar_t.m4 [new file with mode: 0644]
m4/wint_t.m4 [new file with mode: 0644]
m4/xsize.m4 [new file with mode: 0644]
po/Makefile.in.in
po/Makevars
po/bg.po
po/ca.po
po/cs.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/fi.po
po/fr.po
po/hr.po
po/hu.po
po/it.po
po/ja.po
po/ko.po
po/nb.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sk.po
po/sr.po
po/stamp-po [new file with mode: 0644]
po/sv.po
po/zh_CN.po
po/zh_TW.po
src/Makefile.am
src/codeconv.c
src/common/Makefile.am
src/common/fnmatch.c [new file with mode: 0644]
src/common/fnmatch.h [new file with mode: 0644]
src/common/fnmatch_loop.c [new file with mode: 0644]
src/common/nntp.c
src/common/plugin.c
src/common/smtp.c
src/common/socket.c
src/common/string_match.c
src/common/sylpheed.c
src/common/utils.c
src/common/utils.h
src/common/w32_dirent.c [new file with mode: 0644]
src/common/w32_reg.c [new file with mode: 0644]
src/common/w32_signal.c [new file with mode: 0644]
src/common/w32_stat.c [new file with mode: 0644]
src/common/w32_stdio.c [new file with mode: 0644]
src/common/w32_stdlib.c [new file with mode: 0644]
src/common/w32_string.c [new file with mode: 0644]
src/common/w32_time.c [new file with mode: 0644]
src/common/w32_unistd.c [new file with mode: 0644]
src/common/w32_wait.c [new file with mode: 0644]
src/common/w32lib.h [new file with mode: 0644]
src/compose.c
src/etpan/Makefile.am
src/exporthtml.c
src/exportldif.c
src/folder.c
src/gtk/Makefile.am
src/main.c
src/manual.c
src/mh.c
src/mimeview.c
src/plugins/clamav/Makefile.am
src/plugins/demo/Makefile.am
src/plugins/dillo_viewer/Makefile.am
src/plugins/pgpcore/Makefile.am
src/plugins/pgpcore/passphrase.c
src/plugins/pgpcore/plugin.def [new file with mode: 0644]
src/plugins/pgpcore/sgpgme.c
src/plugins/pgpcore/sylpheed.def [new file with mode: 0644]
src/plugins/pgpcore/version.rc [new file with mode: 0644]
src/plugins/pgpinline/Makefile.am
src/plugins/pgpinline/plugin.def [new file with mode: 0644]
src/plugins/pgpinline/sylpheed.def [new file with mode: 0644]
src/plugins/pgpinline/version.rc [new file with mode: 0644]
src/plugins/pgpmime/Makefile.am
src/plugins/pgpmime/mypgpcore.def [new file with mode: 0644]
src/plugins/pgpmime/plugin.def [new file with mode: 0644]
src/plugins/pgpmime/sylpheed.def [new file with mode: 0644]
src/plugins/pgpmime/version.rc [new file with mode: 0644]
src/plugins/spamassassin/Makefile.am
src/send_message.c

index 47d5e39..e32d52d 100644 (file)
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -1,10 +1,11 @@
-Notes on the Free Translation Project
-*************************************
+Notes on the Free Translation Project
+***************************************
 
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
 
    If you found this `ABOUT-NLS' file inside a distribution, you may
 assume that the distributed package does use GNU `gettext' internally,
@@ -15,17 +16,17 @@ this package with messages translated.
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
+work on translations can contact the appropriate team.
 
    When reporting bugs in the `intl/' directory or bugs which may be
 related to internationalization, you should tell about the version of
 `gettext' which is used.  The information can be found in the
 `intl/VERSION' file, in internationalized packages.
 
-Quick configuration advice
-==========================
+1.1 Quick configuration advice
+==============================
 
-   If you want to exploit the full power of internationalization, you
+If you want to exploit the full power of internationalization, you
 should configure it using
 
      ./configure --with-included-gettext
@@ -45,37 +46,37 @@ to change to GNU `gettext' as soon as possible.
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 
-INSTALL Matters
-===============
+1.2 INSTALL Matters
+===================
 
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
 
      ./configure --with-included-gettext
      ./configure --disable-nls
 
-will respectively bypass any pre-existing `gettext' to use the
+will, respectively, bypass any pre-existing `gettext' to use the
 internationalizing routines provided within this package, or else,
 _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
 probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
 
      ./configure --with-included-gettext
 
@@ -86,7 +87,7 @@ and therefore it will not be used.  The reason is that even an
 emulation of `gettext' on top of `catgets' could not provide all the
 extensions of the GNU `gettext' library.
 
-   Internationalized packages have usually many `po/LL.po' files, where
+   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
 translations have been forbidden at `configure' time by using the
 `--disable-nls' switch, all available translations are installed
@@ -95,10 +96,10 @@ may be set, prior to configuration, to limit the installed set.
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-Using This Package
-==================
+1.3 Using This Package
+======================
 
-   As a user, if your language has been installed for this package, you
+As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
 `LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
 and `CC' is an ISO 3166 two-letter country code.  For example, let's
@@ -131,16 +132,23 @@ system libraries.  For example, some Swedish users who would rather
 read translations in German than English for when Swedish is not
 available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
 
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
    In the `LANGUAGE' environment variable, but not in the `LANG'
 environment variable, `LL_CC' combinations can be abbreviated as `LL'
 to denote the language's main dialect.  For example, `de' is equivalent
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-Translating Teams
-=================
+1.4 Translating Teams
+=====================
 
-   For the Free Translation Project to be a success, we need interested
+For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
@@ -167,426 +175,789 @@ coordinator for all translator teams.
 the terminology in use.  Proven linguistic skill are praised more than
 programming skill, here.
 
-Available Packages
-==================
+1.5 Available Packages
+======================
 
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of May 2003.
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of May 2005.
 The matrix shows, in regard of each package, for which languages PO
 files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       am az be bg ca cs da de el en en_GB eo es
-                        +-------------------------------------------+
-     a2ps               |       []          [] [] []                |
-     aegis              |                      ()                   |
-     anubis             |                                           |
-     ap-utils           |                                           |
-     bash               |                      []             [] [] |
-     batchelor          |                                           |
-     bfd                |                   []                   [] |
-     binutils           |                   []                   [] |
-     bison              |                   [] []                [] |
-     bluez-pin          |                []                   []    |
-     clisp              |                                           |
-     clisp              |                      []    []          [] |
-     coreutils          |             []    [] []                [] |
-     cpio               |                   [] []                [] |
-     darkstat           |                   ()                   [] |
-     diffutils          |             [] [] [] [] []          [] [] |
-     e2fsprogs          |                []    []                   |
-     enscript           |             []    [] []        []         |
-     error              |             []    [] []        []      [] |
-     fetchmail          |             [] () [] [] []             [] |
-     fileutils          |                   [] []                [] |
-     findutils          |             []    [] [] []          [] [] |
-     flex               |             []    [] []                [] |
-     gas                |                                        [] |
-     gawk               |             []    [] []                [] |
-     gcal               |             []                            |
-     gcc                |                   []                   [] |
-     gettext            |       []    []    [] []                [] |
-     gettext-runtime    |       []    []    [] []                [] |
-     gettext-tools      |                      []                [] |
-     gimp-print         |                [] [] []        []      [] |
-     gliv               |                                           |
-     glunarclock        |    []             [] []                   |
-     gnucash            |                      ()        []         |
-     gnucash-glossary   |                   [] ()                [] |
-     gnupg              |             [] ()    [] []          [] [] |
-     gpe-calendar       |                      []                   |
-     gpe-conf           |                      []                   |
-     gpe-contacts       |                      []                   |
-     gpe-edit           |                                           |
-     gpe-login          |                      []                   |
-     gpe-ownerinfo      |                      []                   |
-     gpe-sketchbook     |                      []                   |
-     gpe-timesheet      |                                           |
-     gpe-today          |                      []                   |
-     gpe-todo           |                      []                   |
-     gphoto2            |                [] [] []                [] |
-     gprof              |                   []                   [] |
-     gpsdrive           |                      ()    ()          () |
-     grep               |          [] []       [] []             [] |
-     gretl              |                                        [] |
-     hello              |             []    [] [] []          [] [] |
-     id-utils           |                   [] []                   |
-     indent             |             []       []             [] [] |
-     jpilot             |                [] [] []                [] |
-     jwhois             |                                        [] |
-     kbd                |                [] [] [] []             [] |
-     ld                 |                   []                   [] |
-     libc               |             [] [] [] [] []             [] |
-     libgpewidget       |                      []                   |
-     libiconv           |             []    [] []             [] [] |
-     lifelines          |                   [] ()                   |
-     lilypond           |                   []                      |
-     lingoteach         |                                           |
-     lingoteach_lessons |                      ()                () |
-     lynx               |             [] [] [] []                   |
-     m4                 |                [] [] [] []                |
-     mailutils          |             []                         [] |
-     make               |                   [] []                [] |
-     man-db             |             [] () [] []                () |
-     mysecretdiary      |                   [] []                [] |
-     nano               |             [] () [] []                [] |
-     nano_1_0           |             [] () [] []                [] |
-     opcodes            |                   []                   [] |
-     parted             |             [] [] [] []                [] |
-     ptx                |             []    [] []             [] [] |
-     python             |                                           |
-     radius             |                                           |
-     recode             |       []          [] [] []          [] [] |
-     screem             |                                           |
-     sed                |             []    [] []             [] [] |
-     sh-utils           |                   [] []                [] |
-     sharutils          |             [] [] [] [] []             [] |
-     sketch             |                   [] ()                [] |
-     soundtracker       |                   [] []                [] |
-     sp                 |                      []                   |
-     tar                |                [] [] []                [] |
-     texinfo            |                [] [] []             []    |
-     textutils          |             []    [] []                [] |
-     tin                |                      ()        ()         |
-     util-linux         |             [] [] [] []                [] |
-     vorbis-tools       |                [] []                   [] |
-     wastesedge         |                      ()                   |
-     wdiff              |             []    [] []                [] |
-     wget               |          [] [] [] [] [] []             [] |
-     xchat              |             []          []             [] |
-     xpad               |                                           |
-                        +-------------------------------------------+
-                          am az be bg ca cs da de el en en_GB eo es
-                           0  1  4  2 31 17 54 60 14  1   4   12 56
-     
-                          et fa fi fr ga gl he hr hu id it ja ko
-                        +----------------------------------------+
-     a2ps               | []    [] []                   ()    () |
-     aegis              |                                        |
-     anubis             |          []                            |
-     ap-utils           |          []                            |
-     bash               |          []             []             |
-     batchelor          |             []                         |
-     bfd                |          []                      []    |
-     binutils           |          []                      []    |
-     bison              | []       []                [] []       |
-     bluez-pin          |          [] []          [] []          |
-     clisp              |                                        |
-     clisp              |          []                            |
-     coreutils          | []       []                   [] []    |
-     cpio               |          []    []       []          [] |
-     darkstat           |          () []          [] []          |
-     diffutils          |       [] []    [] []    [] []    []    |
-     e2fsprogs          |                                        |
-     enscript           |          []          []                |
-     error              |       [] [] []          []             |
-     fetchmail          |                                  []    |
-     fileutils          | []       []             []    [] []    |
-     findutils          | []    [] [] [] []    [] [] [] [] [] [] |
-     flex               |          []                         [] |
-     gas                |          []                            |
-     gawk               |          []       []                   |
-     gcal               |          []                            |
-     gcc                |          []                            |
-     gettext            |          []                      [] [] |
-     gettext-runtime    |          []                []    [] [] |
-     gettext-tools      |                                  []    |
-     gimp-print         |          []                      []    |
-     gliv               |          ()                            |
-     glunarclock        |             [] []       []       []    |
-     gnucash            |                               []       |
-     gnucash-glossary   |                               []       |
-     gnupg              | []    [] []    []          [] [] []    |
-     gpe-calendar       |                            []          |
-     gpe-conf           |                                        |
-     gpe-contacts       |          []                            |
-     gpe-edit           |          []                []          |
-     gpe-login          |          []                            |
-     gpe-ownerinfo      |          []             [] []          |
-     gpe-sketchbook     |          []                            |
-     gpe-timesheet      |          [] []             []          |
-     gpe-today          |          [] []                         |
-     gpe-todo           |          []                []          |
-     gphoto2            |          []             []       []    |
-     gprof              |          []                []          |
-     gpsdrive           |          ()             []    () ()    |
-     grep               | []    [] [] [] [] [] [] [] [] [] []    |
-     gretl              |          []                            |
-     hello              | [] [] [] [] [] [] [] [] [] [] [] [] [] |
-     id-utils           |          []             [] []          |
-     indent             | []    [] []    []       [] [] [] []    |
-     jpilot             |          []                      ()    |
-     jwhois             |          []             [] [] []       |
-     kbd                |          []                            |
-     ld                 |          []                            |
-     libc               |       [] []    []       []       [] [] |
-     libgpewidget       |          [] []             []          |
-     libiconv           |       [] [] [] []    [] [] [] []       |
-     lifelines          |          ()                            |
-     lilypond           |          []                            |
-     lingoteach         |          []                []          |
-     lingoteach_lessons |                                        |
-     lynx               | []                      []    [] []    |
-     m4                 |          []    []          []    []    |
-     mailutils          |                                        |
-     make               |          []    [] [] []          [] [] |
-     man-db             |          []                   () ()    |
-     mysecretdiary      |          []                []          |
-     nano               |          []    []          [] []       |
-     nano_1_0           |          []    []          [] []       |
-     opcodes            |          []                []          |
-     parted             |          []    []                []    |
-     ptx                | []    [] [] [] []       [] []          |
-     python             |                                        |
-     radius             |                                        |
-     recode             |          []    [] []    [] [] []       |
-     screem             |                                        |
-     sed                | []       [] [] []       [] [] [] []    |
-     sh-utils           | []    [] []             []    [] []    |
-     sharutils          | []       []    []       []       []    |
-     sketch             |          []                            |
-     soundtracker       |          []    []    []                |
-     sp                 |          []                      ()    |
-     tar                | []    [] []    []    [] [] [] [] []    |
-     texinfo            |          []       [] []          []    |
-     textutils          |          []    []       []       [] [] |
-     tin                | []       ()                            |
-     util-linux         | []    [] []             []    () []    |
-     vorbis-tools       |          []                            |
-     wastesedge         |          ()                            |
-     wdiff              | []       []    []       [] []          |
-     wget               | []    [] []    [] [] [] []       []    |
-     xchat              | []       []                      []    |
-     xpad               |                                        |
-                        +----------------------------------------+
-                          et fa fi fr ga gl he hr hu id it ja ko
-                          20  1 15 73 14 24  8 10 30 31 19 31  9
-     
-                          lg lt lv ms nb nl nn no pl pt pt_BR ro
-                        +----------------------------------------+
-     a2ps               |          []    []    () () ()  []   [] |
-     aegis              |                ()                      |
-     anubis             |          []                         [] |
-     ap-utils           |                         ()             |
-     bash               |                                []      |
-     batchelor          |                                        |
-     bfd                |                                        |
-     binutils           |                                        |
-     bison              |          []    []              []   [] |
-     bluez-pin          |                                     [] |
-     clisp              |                                        |
-     clisp              |                []                      |
-     coreutils          |                         []             |
-     cpio               |                []       []     []      |
-     darkstat           |          []    []              []   [] |
-     diffutils          |          []             []     []      |
-     e2fsprogs          |                                        |
-     enscript           |                []              []      |
-     error              |                []              []      |
-     fetchmail          |                         ()     ()      |
-     fileutils          |                         []             |
-     findutils          |                []       []     []   [] |
-     flex               |                                []      |
-     gas                |                                        |
-     gawk               |                                []      |
-     gcal               |                                        |
-     gcc                |                                        |
-     gettext            |                         []             |
-     gettext-runtime    |                         []             |
-     gettext-tools      |                                        |
-     gimp-print         |                []                      |
-     gliv               |                                []      |
-     glunarclock        |          []                            |
-     gnucash            |                                        |
-     gnucash-glossary   |                []          []          |
-     gnupg              |                                        |
-     gpe-calendar       |                            []       [] |
-     gpe-conf           |                            []       [] |
-     gpe-contacts       |                            []          |
-     gpe-edit           |                            []       [] |
-     gpe-login          |                            []       [] |
-     gpe-ownerinfo      |                            []       [] |
-     gpe-sketchbook     |                            []       [] |
-     gpe-timesheet      |                            []       [] |
-     gpe-today          |                            []       [] |
-     gpe-todo           |                            []       [] |
-     gphoto2            |                                        |
-     gprof              |                                []      |
-     gpsdrive           |                ()    ()        ()      |
-     grep               |                         [] []  []   [] |
-     gretl              |                                        |
-     hello              |       [] [] [] [] [] [] []     []   [] |
-     id-utils           |                []              []   [] |
-     indent             |                []              []   [] |
-     jpilot             |                ()    ()                |
-     jwhois             |                []              []   [] |
-     kbd                |                                        |
-     ld                 |                                        |
-     libc               |             []       [] []     []      |
-     libgpewidget       |                            []       [] |
-     libiconv           |                                []   [] |
-     lifelines          |                                        |
-     lilypond           |                []                      |
-     lingoteach         |                                        |
-     lingoteach_lessons |                                        |
-     lynx               |                []              []      |
-     m4                 |                []       []     []   [] |
-     mailutils          |                                        |
-     make               |                []              []      |
-     man-db             |                                []      |
-     mysecretdiary      |                                []      |
-     nano               |          []    []       []          [] |
-     nano_1_0           |          [] []    []    []             |
-     opcodes            |                []              []   [] |
-     parted             |                   []       []  []      |
-     ptx                |             [] []    [] [] []  []   [] |
-     python             |                                        |
-     radius             |                                        |
-     recode             |                         []     []   [] |
-     screem             |                                        |
-     sed                |                                []   [] |
-     sh-utils           |             []                         |
-     sharutils          |                []                      |
-     sketch             |                                []      |
-     soundtracker       |                                        |
-     sp                 |                                        |
-     tar                |          [] []       [] []     []   [] |
-     texinfo            |                                     [] |
-     textutils          |             []                         |
-     tin                |                                        |
-     util-linux         |                []              []      |
-     vorbis-tools       |                []                   [] |
-     wastesedge         |                                        |
-     wdiff              |          []             []     []   [] |
-     wget               |                []       []          [] |
-     xchat              |       []       []                      |
-     xpad               |                                     [] |
-                        +----------------------------------------+
-                          lg lt lv ms nb nl nn no pl pt pt_BR ro
-                           0  0  2 11  7 26  3  4 18 15  34   34
-     
-                          ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
-                        +-------------------------------------------+
-     a2ps               | []    []    []    [] []                   | 16
-     aegis              | ()                                        |  0
-     anubis             |                   [] []                   |  5
-     ap-utils           |                      ()                   |  1
-     bash               | []                                        |  7
-     batchelor          |                                           |  1
-     bfd                |             []    []           []         |  7
-     binutils           |             []    []           []         |  7
-     bison              | []          []                            | 13
-     bluez-pin          |                                           |  7
-     clisp              |                                           |  0
-     clisp              |                                           |  5
-     coreutils          | []    []    []    []                 []   | 14
-     cpio               | []          []                 []         | 13
-     darkstat           |             []                 ()    ()   |  9
-     diffutils          | []          []    []                 []   | 21
-     e2fsprogs          |                   []                      |  3
-     enscript           | []          []    []                      | 11
-     error              |    []             []                 []   | 14
-     fetchmail          |                   []                      |  7
-     fileutils          | []    []    []    []           []    []   | 15
-     findutils          | [] [] []    []    []           []         | 27
-     flex               | []          []    []                      | 10
-     gas                |                   []                      |  3
-     gawk               |             []    []                      |  9
-     gcal               |             []    []                      |  4
-     gcc                |                   []                      |  4
-     gettext            | [] [] []    []    []                 []   | 15
-     gettext-runtime    | [] [] []    []    []                 []   | 16
-     gettext-tools      |    [] []                                  |  5
-     gimp-print         |    []       []                            | 10
-     gliv               |                                           |  1
-     glunarclock        | []          []             []             | 11
-     gnucash            |    []                                []   |  4
-     gnucash-glossary   |    []       []                       []   |  8
-     gnupg              |    []       []    []                 []   | 16
-     gpe-calendar       |                                      []   |  5
-     gpe-conf           |                                           |  3
-     gpe-contacts       |                                      []   |  4
-     gpe-edit           |                                      []   |  5
-     gpe-login          |                                      []   |  5
-     gpe-ownerinfo      |                                      []   |  7
-     gpe-sketchbook     |                                      []   |  5
-     gpe-timesheet      |                                      []   |  6
-     gpe-today          |                                      []   |  6
-     gpe-todo           |                                      []   |  6
-     gphoto2            |             []                 []         |  9
-     gprof              |             []    []                      |  7
-     gpsdrive           |    []       []                            |  3
-     grep               | []    []          [] []                   | 24
-     gretl              |                                           |  2
-     hello              | [] []       []    [] []                   | 33
-     id-utils           | []          []    []                      | 11
-     indent             | [] []       []    []                      | 19
-     jpilot             |             []    []    []     []    []   | 10
-     jwhois             | ()          ()    []                 []   | 10
-     kbd                |             []    []                      |  8
-     ld                 |             []    []                      |  5
-     libc               |    []       []    []           []         | 20
-     libgpewidget       |                                           |  6
-     libiconv           | [] [] []    []    [] []                   | 21
-     lifelines          |             []                            |  2
-     lilypond           |             []                            |  4
-     lingoteach         |                                           |  2
-     lingoteach_lessons |                                ()         |  0
-     lynx               | []          []    [] []                   | 14
-     m4                 | []          []                 []         | 15
-     mailutils          |                                           |  2
-     make               | []          []    []           []         | 15
-     man-db             |             []                            |  6
-     mysecretdiary      |             []    []                      |  8
-     nano               | []          []       []                   | 15
-     nano_1_0           | []          []       []                   | 15
-     opcodes            |             []    []                      |  9
-     parted             |             []    []                      | 13
-     ptx                | []          []    []                      | 22
-     python             |                                           |  0
-     radius             |                                           |  0
-     recode             | []    []    []    []                      | 19
-     screem             |             []                            |  1
-     sed                |    [] []    []    [] []                   | 20
-     sh-utils           | []    []          []                      | 13
-     sharutils          | []          []    []                 []   | 16
-     sketch             |             []                            |  5
-     soundtracker       |             []                            |  7
-     sp                 |                   []                      |  3
-     tar                |    [] []    []    []           []         | 24
-     texinfo            | []          []    []           []         | 13
-     textutils          | []    []    []    []                 []   | 15
-     tin                |                                           |  1
-     util-linux         |             []    []                      | 14
-     vorbis-tools       | []                                        |  7
-     wastesedge         |                                           |  0
-     wdiff              | [] []       []    []                      | 17
-     wget               | [] [] []    []    [] []              []   | 25
-     xchat              |    [] []    []                            | 11
-     xpad               |                                           |  1
-                        +-------------------------------------------+
-       50 teams           ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
-       97 domains         32 19 16  0 56  0 48 10  1  1  12    23    913
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB
+                        +-------------------------------------------------+
+     GNUnet             |                                                 |
+     a2ps               |             []                [] [] []     []   |
+     aegis              |                                  ()             |
+     ant-phone          |                                  ()             |
+     anubis             |                                  []             |
+     ap-utils           |                                                 |
+     aspell             |                         []    [] []        []   |
+     bash               |                      []          []             |
+     batchelor          |                                  []             |
+     bfd                |                                                 |
+     bibshelf           |                                  []             |
+     binutils           |                               []                |
+     bison              |                               [] []             |
+     bluez-pin          | []                      []       [] []          |
+     clisp              |                                  []    []       |
+     console-tools      |                         []       []             |
+     coreutils          |                []    []       [] []             |
+     cpio               |                                                 |
+     cpplib             |                      []       [] []             |
+     darkstat           |                []             () []             |
+     dialog             |                      [] [] [] [] [] []          |
+     diffutils          |                      [] []    [] [] []          |
+     doodle             |                                  []             |
+     e2fsprogs          |                         []       []             |
+     enscript           |                      []       [] []        []   |
+     error              |                      []       [] []        []   |
+     fetchmail          |                      []       [] () []          |
+     fileutils          |                               [] []             |
+     findutils          |                      []       []    []          |
+     flex               |                      []       [] []             |
+     fslint             |                                  []             |
+     gas                |                                                 |
+     gawk               |                      []       [] []             |
+     gbiff              |                                  []             |
+     gcal               |                      []                         |
+     gcc                |                                  []             |
+     gettext-examples   | []                   []          [] []          |
+     gettext-runtime    |             []       []       [] []             |
+     gettext-tools      |                      []          []             |
+     gimp-print         |                         []    [] []        []   |
+     gip                |                                                 |
+     gliv               |                                  []             |
+     glunarclock        |                                                 |
+     gmult              | []                               []             |
+     gnubiff            |                                  ()             |
+     gnucash            |                         []       () ()     []   |
+     gnucash-glossary   |                               [] ()             |
+     gpe-aerial         |                         []       []             |
+     gpe-beam           |                         []       []             |
+     gpe-calendar       |                         []       []             |
+     gpe-clock          |                         []       []             |
+     gpe-conf           |                         []       []             |
+     gpe-contacts       |                                                 |
+     gpe-edit           |                         []                      |
+     gpe-go             |                         []                      |
+     gpe-login          |                         []       []             |
+     gpe-ownerinfo      |                         []       []             |
+     gpe-sketchbook     |                         []       []             |
+     gpe-su             |                         []       []             |
+     gpe-taskmanager    |                         []       []             |
+     gpe-timesheet      |                         []                      |
+     gpe-today          |                         []       []             |
+     gpe-todo           |                         []       []             |
+     gphoto2            |                         []    [] []        []   |
+     gprof              |                               [] []             |
+     gpsdrive           |                                  ()    ()       |
+     gramadoir          | []                               []             |
+     grep               | []          [] []    []          [] []          |
+     gretl              |                                                 |
+     gsasl              |                                  []             |
+     gss                |                                                 |
+     gst-plugins        | []       []          [] []       []        []   |
+     gstreamer          | []                   [] []       []        []   |
+     gtick              | []                               ()             |
+     gtkspell           |             []                   [] []          |
+     hello              |                      []       [] [] []          |
+     id-utils           |                               [] []             |
+     impost             |                                                 |
+     indent             |                      []          []             |
+     iso_3166           |                                                 |
+     iso_3166_1         |                      [] []    [] [] []          |
+     iso_3166_2         |                                                 |
+     iso_3166_3         |                                  []             |
+     iso_4217           |                                                 |
+     iso_639            |                                                 |
+     jpilot             |                         []                      |
+     jtag               |                                                 |
+     jwhois             |                                                 |
+     kbd                |                         []    [] [] []          |
+     latrine            |                                  ()             |
+     ld                 |                               []                |
+     libc               |                      [] []    [] [] []          |
+     libextractor       |                                                 |
+     libgpewidget       |                         []    [] []             |
+     libgphoto2         |                                  []             |
+     libgphoto2_port    |                                  []             |
+     libgsasl           |                                                 |
+     libiconv           | []                   []       [] [] []          |
+     libidn             |                                                 |
+     lifelines          |                               [] ()             |
+     lilypond           |                                  []             |
+     lingoteach         |                                                 |
+     lynx               |                      [] []    [] []             |
+     m4                 |                         []    [] [] []          |
+     mailutils          |                      []                         |
+     make               |                               [] []             |
+     man-db             |                      [] ()    [] []             |
+     minicom            |                         []       []             |
+     mysecretdiary      |                               [] []             |
+     nano               |                      [] ()       []             |
+     nano_1_0           |                      [] ()    [] []             |
+     opcodes            |                                  []             |
+     parted             |                      [] []    [] []             |
+     psmisc             |                                                 |
+     ptx                |                      []       [] []             |
+     pwdutils           |                                                 |
+     python             |                                                 |
+     radius             |                      []                         |
+     recode             |             []       []       [] [] []          |
+     rpm                |                         []    []                |
+     screem             |                                                 |
+     scrollkeeper       |          [] []       [] [] [] [] []        []   |
+     sed                |                      []          []             |
+     sh-utils           |                               [] []             |
+     shared-mime-info   |                []       []                      |
+     sharutils          |                      [] []    [] [] []          |
+     silky              |                                                 |
+     skencil            |                               [] ()             |
+     sketch             |                               [] ()             |
+     solfege            |                                  []             |
+     soundtracker       |                               [] []             |
+     sp                 |                                  []             |
+     stardict           |                         []                      |
+     tar                |                                                 |
+     texinfo            |                               [] []             |
+     textutils          |                      []       [] []             |
+     tin                |                                  ()        ()   |
+     tp-robot           |                                  []             |
+     tuxpaint           | []                   [] []    [] [] []     []   |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux         |                      [] []    [] []             |
+     vorbis-tools       |             []          []    []           []   |
+     wastesedge         |                                  ()             |
+     wdiff              |                      []       [] []        []   |
+     wget               |                                                 |
+     xchat              |                []    []          [] []     []   |
+     xkeyboard-config   |                                                 |
+     xpad               |                                                 |
+                        +-------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB
+                          10  0  0  2  7  5  0 40 43  2 51 91 19  1  14
+
+                          eo es et eu fa fi fr  ga gl he hi hr hu id is
+                        +-----------------------------------------------+
+     GNUnet             |                                               |
+     a2ps               |       []       [] []                          |
+     aegis              |                                               |
+     ant-phone          |                   []                          |
+     anubis             |                   []                          |
+     ap-utils           |                   []                          |
+     aspell             |                   []  []                      |
+     bash               | [] []             []                 []       |
+     batchelor          |                   []  []                      |
+     bfd                |    []                                         |
+     bibshelf           |    []                 []                      |
+     binutils           |    []             []                          |
+     bison              |    [] []          []  []                []    |
+     bluez-pin          | []             [] []  []             [] []    |
+     clisp              |    []             []                          |
+     console-tools      |                                               |
+     coreutils          |    [] []       [] []  []                      |
+     cpio               |    []             []                          |
+     cpplib             |    []             []                          |
+     darkstat           |    []             ()  []             [] []    |
+     dialog             |    [] [] []    [] []  []             []       |
+     diffutils          | [] []          [] []  [] [] []       [] []    |
+     doodle             |                       []                      |
+     e2fsprogs          |    []             []                          |
+     enscript           |                   []              []          |
+     error              |    []          [] []  []             []       |
+     fetchmail          |    []                                         |
+     fileutils          |    [] []          []  []             []       |
+     findutils          |    [] []          []  []                      |
+     flex               |    []             []  []                      |
+     fslint             |                   []                          |
+     gas                |    []             []                          |
+     gawk               |    []             []  []    []                |
+     gbiff              |                   []                          |
+     gcal               |    []             []                          |
+     gcc                |    []                                         |
+     gettext-examples   |    []             []  []                      |
+     gettext-runtime    |    []          [] []  []                []    |
+     gettext-tools      |    []             []                          |
+     gimp-print         |    []             []                          |
+     gip                |    []    []       []                          |
+     gliv               |                   ()                          |
+     glunarclock        |                []     []             []       |
+     gmult              |          []       []                          |
+     gnubiff            |                   ()                          |
+     gnucash            |    []                                ()       |
+     gnucash-glossary   |    []                                         |
+     gpe-aerial         |    []             []                          |
+     gpe-beam           |    []             []                          |
+     gpe-calendar       |    []             []                 [] []    |
+     gpe-clock          |    []          [] []                          |
+     gpe-conf           |                   []                          |
+     gpe-contacts       |                   []                          |
+     gpe-edit           |                   []                    []    |
+     gpe-go             |    []             []                          |
+     gpe-login          |    []             []                 []       |
+     gpe-ownerinfo      |    []          [] []                 [] []    |
+     gpe-sketchbook     |    []             []                          |
+     gpe-su             |    []          [] []                          |
+     gpe-taskmanager    |    []          [] []                          |
+     gpe-timesheet      |    []             []  []                []    |
+     gpe-today          |    []          [] []  []                      |
+     gpe-todo           |    []             []                    []    |
+     gphoto2            |    []          [] []                 []       |
+     gprof              |    []             []                    []    |
+     gpsdrive           |    ()             ()                 []       |
+     gramadoir          |                   []  []                      |
+     grep               |    [] [] []    [] []  [] [] []    [] [] []    |
+     gretl              |    []             []                          |
+     gsasl              |          []       []  []                      |
+     gss                |                   []                          |
+     gst-plugins        |                   []                 []       |
+     gstreamer          |                                               |
+     gtick              |          []    [] []  []                      |
+     gtkspell           | [] []    []       []  []                      |
+     hello              | [] [] [] [] [] [] []  [] [] []    [] [] []    |
+     id-utils           |                   []                 [] []    |
+     impost             |                   []  []                      |
+     indent             | [] [] [] []    [] []  [] []          [] []    |
+     iso_3166           | []             [] []                          |
+     iso_3166_1         |    []    []    [] []  []             [] []    |
+     iso_3166_2         |                   []                          |
+     iso_3166_3         |                   []                          |
+     iso_4217           |       []       []        []                   |
+     iso_639            | []          [] [] []                          |
+     jpilot             |    []             []                          |
+     jtag               |                   []                          |
+     jwhois             |    []             []                 [] []    |
+     kbd                |    []             []                          |
+     latrine            |                   []  []                      |
+     ld                 |    []             []                          |
+     libc               |    []          [] []     []          []       |
+     libextractor       |                                               |
+     libgpewidget       |    []             []  []             [] []    |
+     libgphoto2         |    []             []                 []       |
+     libgphoto2_port    |                   []                          |
+     libgsasl           |                   []  []                      |
+     libiconv           | [] [] []       [] []  [] []       [] [] []    |
+     libidn             | []                []                          |
+     lifelines          |                   ()                          |
+     lilypond           |                                               |
+     lingoteach         |                   []                    []    |
+     lynx               |       []                             []       |
+     m4                 |                   []  [] []             []    |
+     mailutils          |    []             []                          |
+     make               |    []          [] []  [] [] []    []          |
+     man-db             |    ()                                         |
+     minicom            |    []          [] []                 []       |
+     mysecretdiary      |    []             []                    []    |
+     nano               |    []    []    () []                          |
+     nano_1_0           |    []             []     []             []    |
+     opcodes            |    []          [] []                          |
+     parted             |    []             []     []                   |
+     psmisc             |          []                                   |
+     ptx                | [] [] []       [] []  [] []          [] []    |
+     pwdutils           |                                               |
+     python             |                                               |
+     radius             |    []             []                          |
+     recode             | [] []             []     [] []       [] []    |
+     rpm                |                   []                          |
+     screem             |                                               |
+     scrollkeeper       |    []          []                    []       |
+     sed                | [] [] []          []  []             []       |
+     sh-utils           |    [] []       [] []  []             []       |
+     shared-mime-info   | [] []    []    [] []                 []       |
+     sharutils          |    [] []       [] []     []          []       |
+     silky              |                   []                          |
+     skencil            |    []             []                          |
+     sketch             |    []             []                          |
+     solfege            |                                               |
+     soundtracker       |    []             []                          |
+     sp                 |                   []                          |
+     stardict           |                                      []       |
+     tar                |    [] []          []  []                      |
+     texinfo            | []                []        []                |
+     textutils          |    []             []  [] []          []       |
+     tin                |       []          ()                          |
+     tp-robot           |                   []                 []       |
+     tuxpaint           |    []          [] []  []    []       [] [] [] |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                   []  []                      |
+     util-linux         |    [] []       [] []                 []       |
+     vorbis-tools       |    []             []                          |
+     wastesedge         |                   ()                          |
+     wdiff              |    [] []          []  [] []          [] []    |
+     wget               |       [] []           []          []          |
+     xchat              |    []    []    [] []           []             |
+     xkeyboard-config   |                                               |
+     xpad               |    []                 []             []       |
+                        +-----------------------------------------------+
+                          eo es et eu fa fi fr  ga gl he hi hr hu id is
+                          15 85 21 15  2 35 115 45 16  8  1  6 40 27  1
+
+                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               | ()    ()                   []       []    ()     |
+     aegis              |                                     ()           |
+     ant-phone          |                                     []           |
+     anubis             |                            []    [] []           |
+     ap-utils           |                                                  |
+     aspell             |                         []          []           |
+     bash               |                                     []           |
+     batchelor          |                                     []           |
+     bfd                |                                                  |
+     bibshelf           | []                                               |
+     binutils           |                                                  |
+     bison              | []                         []    [] []           |
+     bluez-pin          |          []                         []           |
+     clisp              |                                     []           |
+     console-tools      |                                                  |
+     coreutils          |    []                               []           |
+     cpio               |                                                  |
+     cpplib             |                                     []           |
+     darkstat           |                            []       []           |
+     dialog             | []                                  []           |
+     diffutils          | [] []                      []       []           |
+     doodle             | []                                               |
+     e2fsprogs          | []                                               |
+     enscript           |                                     []           |
+     error              |                                     []           |
+     fetchmail          |    []                               []           |
+     fileutils          | [] []       []                                   |
+     findutils          | []                                  []           |
+     flex               |       []                            []           |
+     fslint             |                                     []           |
+     gas                |                                                  |
+     gawk               |    []                               []           |
+     gbiff              |                                     []           |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | [] []                               []           |
+     gettext-runtime    | [] [] []                            []           |
+     gettext-tools      | [] [] []                                         |
+     gimp-print         |    []                               []           |
+     gip                |                                     []           |
+     gliv               |                                     []           |
+     glunarclock        |                            []       []           |
+     gmult              | [] []                                            |
+     gnubiff            | ()                                               |
+     gnucash            | [] ()                            () []           |
+     gnucash-glossary   | []                                  []           |
+     gpe-aerial         |                                     []           |
+     gpe-beam           |                                     []           |
+     gpe-calendar       |                                     []           |
+     gpe-clock          |                                     []           |
+     gpe-conf           |                                     []           |
+     gpe-contacts       |                                                  |
+     gpe-edit           |                                     []           |
+     gpe-go             |                                     []           |
+     gpe-login          |                                     []           |
+     gpe-ownerinfo      |                                     []           |
+     gpe-sketchbook     |                                     []           |
+     gpe-su             |                                     []           |
+     gpe-taskmanager    |          []                         []           |
+     gpe-timesheet      |                                     []           |
+     gpe-today          |                                     []           |
+     gpe-todo           |                                     []           |
+     gphoto2            | [] []                               []           |
+     gprof              |                                                  |
+     gpsdrive           | () ()                               ()    ()     |
+     gramadoir          |                                     ()           |
+     grep               | [] []                            [] []           |
+     gretl              | []                                               |
+     gsasl              |                                     []           |
+     gss                |                                                  |
+     gst-plugins        | []                                  []           |
+     gstreamer          | []                                  []           |
+     gtick              | []                                  []           |
+     gtkspell           | []                      []          []           |
+     hello              | [] [] []          []       []    [] [] [] []     |
+     id-utils           | []                                  []           |
+     impost             |                                                  |
+     indent             | [] []                               []           |
+     iso_3166           |                                     []           |
+     iso_3166_1         |                                     []    []     |
+     iso_3166_2         |                                     []           |
+     iso_3166_3         |                                     []           |
+     iso_4217           |    []                   []          []           |
+     iso_639            |    []                               [] []        |
+     jpilot             |    ()                               ()    ()     |
+     jtag               |                                                  |
+     jwhois             | []                                  []           |
+     kbd                |                                     []           |
+     latrine            | []                                  []           |
+     ld                 |                                                  |
+     libc               |    [] []                         [] []    []     |
+     libextractor       |                                                  |
+     libgpewidget       |                                     []           |
+     libgphoto2         | [] []                                            |
+     libgphoto2_port    | [] []                                            |
+     libgsasl           |                                     []           |
+     libiconv           | []                                  []           |
+     libidn             | []                                               |
+     lifelines          |                                     []           |
+     lilypond           |                                                  |
+     lingoteach         | []                                  []           |
+     lynx               | [] []                               []           |
+     m4                 |    []                               []           |
+     mailutils          |                                                  |
+     make               |    [] []                            []           |
+     man-db             |    ()                                            |
+     minicom            |    []                                            |
+     mysecretdiary      |                                     []           |
+     nano               | []                         []    []              |
+     nano_1_0           | []                         []    []    []        |
+     opcodes            |                                     []           |
+     parted             | [] []                               [] []        |
+     psmisc             | []                               [] []           |
+     ptx                |                                  [] []    []     |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     radius             |                                                  |
+     recode             | []                                  []           |
+     rpm                |    [] []                                         |
+     screem             |    []                                            |
+     scrollkeeper       |                                  [] [] []        |
+     sed                |    []                               []           |
+     sh-utils           | [] []                            []              |
+     shared-mime-info   |       []                         [] [] []        |
+     sharutils          | [] []                               []           |
+     silky              |                                     []           |
+     skencil            |                                                  |
+     sketch             |                                                  |
+     solfege            | []                                  []    []     |
+     soundtracker       | []                                               |
+     sp                 |    ()                                            |
+     stardict           |                      []             []           |
+     tar                | [] []                               []           |
+     texinfo            |    []                            [] []           |
+     textutils          |    [] []                         []              |
+     tin                |                                                  |
+     tp-robot           |                                     []           |
+     tuxpaint           | [] [] []       []          []       [] []        |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | [] []                               []           |
+     vorbis-tools       |                                     []           |
+     wastesedge         |                                     []           |
+     wdiff              | []                         []    []              |
+     wget               |    []                                            |
+     xchat              | []    []          [] []             []           |
+     xkeyboard-config   |                                     []           |
+     xpad               |                                     []           |
+                        +--------------------------------------------------+
+                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+                          46 35 11  2  1  1  2  2  3 11  0 15 96  7  5  0
+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
+                        +----------------------------------------------+
+     GNUnet             |                                              |
+     a2ps               |       ()     []      [] []       []    [] [] |
+     aegis              |                      () ()                   |
+     ant-phone          |                      []                      |
+     anubis             |       []             [] []                   |
+     ap-utils           |       ()                                     |
+     aspell             |                      [] []                   |
+     bash               |              []      [] []                   |
+     batchelor          |                      []                      |
+     bfd                |                                              |
+     bibshelf           |                                              |
+     binutils           |                         []                [] |
+     bison              |       []     []      [] []                [] |
+     bluez-pin          |       []     []   [] [] []    []       [] [] |
+     clisp              |                         []                   |
+     console-tools      |                         []                   |
+     coreutils          |       []                []       []       [] |
+     cpio               |       []                                  [] |
+     cpplib             |                                              |
+     darkstat           |       []     []      []       []       [] [] |
+     dialog             |       [] []  []   [] [] [] []                |
+     diffutils          |       []     []      [] []             [] [] |
+     doodle             |                                     []       |
+     e2fsprogs          |       []                                  [] |
+     enscript           |              []      [] []                [] |
+     error              |              []      []       []             |
+     fetchmail          |       []                []    []    []       |
+     fileutils          |       []             [] []       []       [] |
+     findutils          |       [] []          []       []       [] [] |
+     flex               |       []     []      [] []                [] |
+     fslint             |              []      []                []    |
+     gas                |                                              |
+     gawk               |       []     []      []                   [] |
+     gbiff              |                      []                      |
+     gcal               |                                           [] |
+     gcc                |                                              |
+     gettext-examples   |       []             [] []    []       [] [] |
+     gettext-runtime    |       []             [] []    [] []    [] [] |
+     gettext-tools      |       []             [] []    [] []    [] [] |
+     gimp-print         |                               []          [] |
+     gip                |                   []          []       []    |
+     gliv               |              []      []       []             |
+     glunarclock        |              []      [] []    []       [] [] |
+     gmult              |              []   [] []                []    |
+     gnubiff            |                      ()                   [] |
+     gnucash            |       () []             []    []          [] |
+     gnucash-glossary   |          []                   []          [] |
+     gpe-aerial         |          []  []      [] []             [] [] |
+     gpe-beam           |          []  []      [] []             [] [] |
+     gpe-calendar       |          []  []      [] []    []       [] [] |
+     gpe-clock          |          []  []      [] []    []       [] [] |
+     gpe-conf           |          []  []      [] []    []          [] |
+     gpe-contacts       |                      [] []             [] [] |
+     gpe-edit           |          []  []      [] []    []       [] [] |
+     gpe-go             |              []      [] []             [] [] |
+     gpe-login          |          []  []      [] []    []       [] [] |
+     gpe-ownerinfo      |          []  []      [] []    []       [] [] |
+     gpe-sketchbook     |          []  []      [] []    []       [] [] |
+     gpe-su             |          []  []      [] []    []       [] [] |
+     gpe-taskmanager    |          []  []      [] []    []       [] [] |
+     gpe-timesheet      |          []  []      [] []    []       [] [] |
+     gpe-today          |          []  []      [] []    []       [] [] |
+     gpe-todo           |    []    []  []      [] []    []       [] [] |
+     gphoto2            |                      []       []       [] [] |
+     gprof              |              []      []                   [] |
+     gpsdrive           |    []                []                      |
+     gramadoir          |                               []             |
+     grep               |       [] []  []      [] []       []    []    |
+     gretl              |       []                                     |
+     gsasl              |       []             []             [] [] [] |
+     gss                |       []             []                   [] |
+     gst-plugins        | []                                  [] [] [] |
+     gstreamer          |                         []          [] [] [] |
+     gtick              |                      [] []                [] |
+     gtkspell           |              []   [] [] []    []       []    |
+     hello              |       []     []      [] []    []       [] [] |
+     id-utils           |              []      [] []                [] |
+     impost             |                                              |
+     indent             |              []      [] []    []       [] [] |
+     iso_3166           |          []                []       [] [] [] |
+     iso_3166_1         |                               [] [] [] []    |
+     iso_3166_2         |                                              |
+     iso_3166_3         |                      []    []          []    |
+     iso_4217           |                            []          []    |
+     iso_639            |                            []          [] [] |
+     jpilot             |                                              |
+     jtag               |                               []             |
+     jwhois             |       []     []      [] ()                () |
+     kbd                |       []             []                   [] |
+     latrine            |                      []                   [] |
+     ld                 |                                           [] |
+     libc               |       []     []         []    []          [] |
+     libextractor       |                      []                      |
+     libgpewidget       |          []  []      []       []       [] [] |
+     libgphoto2         |                         []                [] |
+     libgphoto2_port    |                         []                   |
+     libgsasl           |       []             []                []    |
+     libiconv           |       []     []   [] [] []    [] [] [] [] [] |
+     libidn             |       []                                  () |
+     lifelines          |       []                                  [] |
+     lilypond           |                                              |
+     lingoteach         |              []                              |
+     lynx               |              []         []                [] |
+     m4                 |       []     []      [] []                [] |
+     mailutils          |       []             [] []                   |
+     make               |       []     []         []                [] |
+     man-db             |                      []                   [] |
+     minicom            |       []     []      [] []                   |
+     mysecretdiary      |              []      [] []                [] |
+     nano               |              []      []                   [] |
+     nano_1_0           |       []             [] []                [] |
+     opcodes            |                      []                   [] |
+     parted             |       [] []  []                           [] |
+     psmisc             |       []             []                      |
+     ptx                |       [] []  []      [] []                [] |
+     pwdutils           |       []                                     |
+     python             |                                              |
+     radius             |       []                []                   |
+     recode             |       []     []      [] []       []       [] |
+     rpm                |       [] []             []                [] |
+     screem             |                                              |
+     scrollkeeper       |       []             [] []    []    [] [] [] |
+     sed                |       [] []  []      [] []    []       [] [] |
+     sh-utils           |                         []       []    []    |
+     shared-mime-info   |          []  []         []          [] [] [] |
+     sharutils          |                         []             [] [] |
+     silky              |                               []             |
+     skencil            |          []  []                           [] |
+     sketch             |          []  []                           [] |
+     solfege            |                                              |
+     soundtracker       |                               []          [] |
+     sp                 |                                              |
+     stardict           |                         []    []             |
+     tar                |       []             [] []                [] |
+     texinfo            |       []             [] []                [] |
+     textutils          |                         []       []       [] |
+     tin                |                                              |
+     tp-robot           |                         []                   |
+     tuxpaint           |       [] []  []      []       []    [] [] [] |
+     unicode-han-tra... |                                              |
+     unicode-transla... |                                              |
+     util-linux         |              []         []                [] |
+     vorbis-tools       |                      [] []                   |
+     wastesedge         |                                              |
+     wdiff              |       []     []      [] []    []          [] |
+     wget               |                                              |
+     xchat              |    []                   []    [] [] [] [] [] |
+     xkeyboard-config   |                                              |
+     xpad               |                                              |
+                        +----------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
+                           1  3 47 29  57    6 78 73  5 44 12 12 50 85
+
+                          ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+                        +-----------------------------------------------+
+     GNUnet             |                                               |  0
+     a2ps               |             [] []     []                      | 19
+     aegis              |                                               |  0
+     ant-phone          |             []        []                      |  5
+     anubis             |             [] []     []                      | 11
+     ap-utils           |                ()     []                      |  2
+     aspell             |                []     [] []                   | 13
+     bash               |                       []                      | 11
+     batchelor          |             []        []                      |  7
+     bfd                |                                               |  1
+     bibshelf           |                       []                      |  5
+     binutils           |             []                                |  6
+     bison              |             []        []                      | 18
+     bluez-pin          |             [] []     [] []     []            | 25
+     clisp              |                                               |  7
+     console-tools      |             []        []                      |  5
+     coreutils          |             []        []                      | 17
+     cpio               |             [] []     []                      |  7
+     cpplib             |             []        []                      |  8
+     darkstat           |                       []        ()    ()      | 15
+     dialog             |             [] []     []                      | 25
+     diffutils          |             []        []        []    []      | 28
+     doodle             |                       []                      |  5
+     e2fsprogs          |             []                                |  8
+     enscript           |             []                                | 12
+     error              |             []        []              []      | 16
+     fetchmail          |             []                                | 12
+     fileutils          |             []                  []    []      | 18
+     findutils          |             []        []                      | 17
+     flex               |             []        []                      | 15
+     fslint             |                       []                      |  7
+     gas                |             []                                |  3
+     gawk               |             []                                | 14
+     gbiff              |                       []                      |  5
+     gcal               |             []                                |  5
+     gcc                |             []                  []            |  4
+     gettext-examples   |             [] []     []        []    []      | 21
+     gettext-runtime    |             [] []     []        []    []      | 25
+     gettext-tools      |             [] []     []        []    []      | 19
+     gimp-print         |                []                             | 11
+     gip                |                       []                      |  8
+     gliv               |             []        []                      |  7
+     glunarclock        |                       [] []                   | 13
+     gmult              |             []        []        []            | 13
+     gnubiff            |                       []                      |  3
+     gnucash            |             ()                        []      | 10
+     gnucash-glossary   |                       []              []      |  9
+     gpe-aerial         |                       []        []            | 13
+     gpe-beam           |                       []        []            | 13
+     gpe-calendar       |                       [] []     []    []      | 18
+     gpe-clock          |             []        [] []     []            | 17
+     gpe-conf           |                       []        []            | 12
+     gpe-contacts       |                       []        []            |  7
+     gpe-edit           |             []        [] []           []      | 15
+     gpe-go             |             []        []                      | 11
+     gpe-login          |             []        [] []     []    []      | 18
+     gpe-ownerinfo      |             []        []        []    []      | 19
+     gpe-sketchbook     |             []        []                      | 14
+     gpe-su             |             []        []        []            | 16
+     gpe-taskmanager    |             []        []        []            | 17
+     gpe-timesheet      |             []        []        []    []      | 17
+     gpe-today          |             []        [] []     []    []      | 19
+     gpe-todo           |                       [] []           []      | 17
+     gphoto2            |                []               []    []      | 18
+     gprof              |             []        []                      | 10
+     gpsdrive           |                                               |  3
+     gramadoir          |                       []                      |  6
+     grep               |             [] []     []              []      | 32
+     gretl              |                                               |  4
+     gsasl              |                       []        []            | 12
+     gss                |                       []                      |  5
+     gst-plugins        |                []     []              []      | 17
+     gstreamer          |             [] []     []              []      | 15
+     gtick              |                       []                      | 11
+     gtkspell           |                       [] []     []    []      | 21
+     hello              |             [] []     []        []            | 37
+     id-utils           |             []        []                      | 13
+     impost             |                       []                      |  3
+     indent             |             []        []        []    []      | 25
+     iso_3166           |          [] []        []                      | 12
+     iso_3166_1         |             []           []                   | 20
+     iso_3166_2         |                                               |  2
+     iso_3166_3         |                          []     []            |  8
+     iso_4217           |             []        []                      | 10
+     iso_639            |                       [] []                   | 12
+     jpilot             |             [] []               []            |  6
+     jtag               |                                               |  2
+     jwhois             |             []        []              []      | 12
+     kbd                |             []        []                      | 12
+     latrine            |             []        []                      |  8
+     ld                 |             []                                |  5
+     libc               |             []                  []            | 22
+     libextractor       |                                               |  1
+     libgpewidget       |                       [] []                   | 17
+     libgphoto2         |                                 []            |  9
+     libgphoto2_port    |                                               |  5
+     libgsasl           |                       []                      |  7
+     libiconv           |             [] []     [] []     []            | 32
+     libidn             |                       []        []            |  6
+     lifelines          |                                               |  4
+     lilypond           |                                               |  1
+     lingoteach         |                       []                      |  6
+     lynx               |             [] []     []                      | 15
+     m4                 |                       []        []            | 17
+     mailutils          |                []                             |  7
+     make               |             []                  []            | 18
+     man-db             |                                               |  5
+     minicom            |                                               | 11
+     mysecretdiary      |             []        []                      | 12
+     nano               |                       []              []      | 13
+     nano_1_0           |             [] []     []                      | 18
+     opcodes            |             []        []                      |  9
+     parted             |             [] []               []            | 18
+     psmisc             |                       []                      |  7
+     ptx                |             []                  []            | 23
+     pwdutils           |                                               |  1
+     python             |                                               |  0
+     radius             |                []                             |  6
+     recode             |             []        []                      | 22
+     rpm                |             [] []                             | 11
+     screem             |                                               |  1
+     scrollkeeper       |             [] []                     []      | 24
+     sed                |             []        []              []      | 21
+     sh-utils           |             []                                | 15
+     shared-mime-info   |                []               []    []      | 21
+     sharutils          |             []        []              []      | 20
+     silky              |                                               |  3
+     skencil            |                                               |  6
+     sketch             |                                               |  6
+     solfege            |                                               |  4
+     soundtracker       |             []                                |  8
+     sp                 |             []                                |  3
+     stardict           |                []     []        []    []      | 10
+     tar                |             [] []     []              []      | 15
+     texinfo            |             []                  []            | 14
+     textutils          |             []                  []    []      | 17
+     tin                |                                               |  1
+     tp-robot           |                       []        []    []      |  8
+     tuxpaint           |             []        [] []     []            | 34
+     unicode-han-tra... |                                               |  0
+     unicode-transla... |                                               |  2
+     util-linux         |             [] []     []                      | 18
+     vorbis-tools       |                []                             | 10
+     wastesedge         |                                               |  1
+     wdiff              |             []        []                      | 22
+     wget               |             []        []                      |  7
+     xchat              |                []     []        []    []      | 26
+     xkeyboard-config   |                       []                      |  2
+     xpad               |                       []                      |  5
+                        +-----------------------------------------------+
+       73 teams           ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+      149 domains          0  0  0  1 77 30  0  92 16  0  42    32    0  1746
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -599,15 +970,15 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If May 2003 seems to be old, you may fetch a more recent copy of
+   If May 2005 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
 
-Using `gettext' in new packages
-===============================
+1.6 Using `gettext' in new packages
+===================================
 
-   If you are writing a freely available program and want to
+If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 package.  Of course you have to respect the GNU Library General Public
 License which covers the use of the GNU `gettext' library.  This means
index 8526410..fd1ca86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,110 @@
+2005-12-20 [colin]     1.9.100cvs97
+
+       * ABOUT-NLS
+       * Makefile.am
+       * autogen.sh
+       * configure.ac
+       * config/config.rpath
+       * config/mkinstalldirs
+       * m4/Makefile.am
+       * m4/glibc2.m4
+       * m4/gnupg.m4
+       * m4/gpgme.m4
+       * m4/intmax.m4
+       * m4/longdouble.m4
+       * m4/longlong.m4
+       * m4/printf-posix.m4
+       * m4/signed.m4
+       * m4/size_max.m4
+       * m4/ulonglong.m4
+       * m4/wchar_t.m4
+       * m4/wint_t.m4
+       * m4/xsize.m4
+       * po/Makefile.in.in
+       * po/Makevars
+       * po/bg.po
+       * po/ca.po
+       * po/cs.po
+       * po/de.po
+       * po/el.po
+       * po/en_GB.po
+       * po/es.po
+       * po/fi.po
+       * po/fr.po
+       * po/hr.po
+       * po/hu.po
+       * po/it.po
+       * po/ja.po
+       * po/ko.po
+       * po/nb.po
+       * po/nl.po
+       * po/pl.po
+       * po/pt_BR.po
+       * po/ru.po
+       * po/sk.po
+       * po/sr.po
+       * po/stamp-po
+       * po/sv.po
+       * po/zh_CN.po
+       * po/zh_TW.po
+       * src/Makefile.am
+       * src/codeconv.c
+       * src/compose.c
+       * src/exporthtml.c
+       * src/exportldif.c
+       * src/folder.c
+       * src/main.c
+       * src/manual.c
+       * src/mh.c
+       * src/mimeview.c
+       * src/send_message.c
+       * src/common/Makefile.am
+       * src/common/fnmatch.c
+       * src/common/fnmatch.h
+       * src/common/fnmatch_loop.c
+       * src/common/nntp.c
+       * src/common/plugin.c
+       * src/common/smtp.c
+       * src/common/socket.c
+       * src/common/string_match.c
+       * src/common/sylpheed.c
+       * src/common/utils.c
+       * src/common/utils.h
+       * src/common/w32_dirent.c
+       * src/common/w32_reg.c
+       * src/common/w32_signal.c
+       * src/common/w32_stat.c
+       * src/common/w32_stdio.c
+       * src/common/w32_stdlib.c
+       * src/common/w32_string.c
+       * src/common/w32_time.c
+       * src/common/w32_unistd.c
+       * src/common/w32_wait.c
+       * src/common/w32lib.h
+       * src/etpan/Makefile.am
+       * src/gtk/Makefile.am
+       * src/plugins/clamav/Makefile.am
+       * src/plugins/demo/Makefile.am
+       * src/plugins/dillo_viewer/Makefile.am
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/pgpcore/passphrase.c
+       * src/plugins/pgpcore/plugin.def
+       * src/plugins/pgpcore/sgpgme.c
+       * src/plugins/pgpcore/sylpheed.def
+       * src/plugins/pgpcore/version.rc
+       * src/plugins/pgpinline/Makefile.am
+       * src/plugins/pgpinline/plugin.def
+       * src/plugins/pgpinline/sylpheed.def
+       * src/plugins/pgpinline/version.rc
+       * src/plugins/pgpmime/Makefile.am
+       * src/plugins/pgpmime/mypgpcore.def
+       * src/plugins/pgpmime/plugin.def
+       * src/plugins/pgpmime/sylpheed.def
+       * src/plugins/pgpmime/version.rc
+       * src/plugins/spamassassin/Makefile.am
+               Very little ;-) patch from Werner Koch, providing
+               infrastructure for cross-compiling to Win32
+
 2005-12-20 [paul]      1.9.100cvs96
 
        * src/account.c
index af8fad3..031814a 100644 (file)
@@ -1,4 +1,13 @@
-SUBDIRS = m4 po src tools config doc
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2
+
+if PLATFORM_WIN32
+tools = 
+else
+tools = tools
+endif
+
+SUBDIRS = m4 po src $(tools) config doc
 
 EXTRA_DIST = \
        ChangeLog \
index 87a910d..ec31832 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/pluginwindow.c;  ) > 1.9.100cvs94.patchset
 ( cvs diff -u -r 1.382.2.207 -r 1.382.2.208 src/compose.c;  cvs diff -u -r 1.50.2.17 -r 1.50.2.18 src/compose.h;  ) > 1.9.100cvs95.patchset
 ( cvs diff -u -r 1.61.2.39 -r 1.61.2.40 src/account.c;  cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/account.h;  cvs diff -u -r 1.274.2.81 -r 1.274.2.82 src/mainwindow.c;  cvs diff -u -r 1.39.2.9 -r 1.39.2.10 src/mainwindow.h;  cvs diff -u -r 1.43.2.33 -r 1.43.2.34 src/toolbar.c;  cvs diff -u -r 1.19.2.6 -r 1.19.2.7 src/toolbar.h;  cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/gtk/about.c;  ) > 1.9.100cvs96.patchset
+( cvs diff -u -r 1.4 -r 1.5 ABOUT-NLS;  cvs diff -u -r 1.24.2.11 -r 1.24.2.12 Makefile.am;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 autogen.sh;  cvs diff -u -r 1.654.2.1126 -r 1.654.2.1127 configure.ac;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 config/config.rpath;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 config/mkinstalldirs;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 m4/Makefile.am;  diff -u /dev/null m4/glibc2.m4;  diff -u /dev/null m4/gnupg.m4;  diff -u /dev/null m4/gpgme.m4;  diff -u /dev/null m4/intmax.m4;  diff -u /dev/null m4/longdouble.m4;  diff -u /dev/null m4/longlong.m4;  diff -u /dev/null m4/printf-posix.m4;  diff -u /dev/null m4/signed.m4;  diff -u /dev/null m4/size_max.m4;  diff -u /dev/null m4/ulonglong.m4;  diff -u /dev/null m4/wchar_t.m4;  diff -u /dev/null m4/wint_t.m4;  diff -u /dev/null m4/xsize.m4;  cvs diff -u -r 1.6.2.6 -r 1.6.2.7 po/Makefile.in.in;  cvs diff -u -r 1.1 -r 1.2 po/Makevars;  cvs diff -u -r 1.21.2.3 -r 1.21.2.4 po/bg.po;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 po/ca.po;  cvs diff -u -r 1.9.2.2 -r 1.9.2.3 po/cs.po;  cvs diff -u -r 1.58.2.17 -r 1.58.2.18 po/de.po;  cvs diff -u -r 1.9.2.2 -r 1.9.2.3 po/el.po;  cvs diff -u -r 1.12.2.7 -r 1.12.2.8 po/en_GB.po;  cvs diff -u -r 1.60.2.21 -r 1.60.2.22 po/es.po;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 po/fi.po;  cvs diff -u -r 1.42.2.17 -r 1.42.2.18 po/fr.po;  cvs diff -u -r 1.7.2.4 -r 1.7.2.5 po/hr.po;  cvs diff -u -r 1.5.2.2 -r 1.5.2.3 po/hu.po;  cvs diff -u -r 1.34.2.14 -r 1.34.2.15 po/it.po;  cvs diff -u -r 1.16.2.5 -r 1.16.2.6 po/ja.po;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 po/ko.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/nb.po;  cvs diff -u -r 1.28.2.2 -r 1.28.2.3 po/nl.po;  cvs diff -u -r 1.10.2.7 -r 1.10.2.8 po/pl.po;  cvs diff -u -r 1.50.2.13 -r 1.50.2.14 po/pt_BR.po;  cvs diff -u -r 1.17.2.10 -r 1.17.2.11 po/ru.po;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 po/sk.po;  cvs diff -u -r 1.17.2.15 -r 1.17.2.16 po/sr.po;  diff -u /dev/null po/stamp-po;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 po/sv.po;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 po/zh_CN.po;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/zh_TW.po;  cvs diff -u -r 1.155.2.34 -r 1.155.2.35 src/Makefile.am;  cvs diff -u -r 1.65.2.44 -r 1.65.2.45 src/codeconv.c;  cvs diff -u -r 1.382.2.208 -r 1.382.2.209 src/compose.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/exporthtml.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/exportldif.c;  cvs diff -u -r 1.213.2.70 -r 1.213.2.71 src/folder.c;  cvs diff -u -r 1.115.2.69 -r 1.115.2.70 src/main.c;  cvs diff -u -r 1.11.2.5 -r 1.11.2.6 src/manual.c;  cvs diff -u -r 1.79.2.19 -r 1.79.2.20 src/mh.c;  cvs diff -u -r 1.83.2.53 -r 1.83.2.54 src/mimeview.c;  cvs diff -u -r 1.17.2.23 -r 1.17.2.24 src/send_message.c;  cvs diff -u -r 1.24.2.8 -r 1.24.2.9 src/common/Makefile.am;  diff -u /dev/null src/common/fnmatch.c;  diff -u /dev/null src/common/fnmatch.h;  diff -u /dev/null src/common/fnmatch_loop.c;  cvs diff -u -r 1.6.2.7 -r 1.6.2.8 src/common/nntp.c;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/common/plugin.c;  cvs diff -u -r 1.11.2.13 -r 1.11.2.14 src/common/smtp.c;  cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/common/socket.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/string_match.c;  cvs diff -u -r 1.7.2.5 -r 1.7.2.6 src/common/sylpheed.c;  cvs diff -u -r 1.36.2.48 -r 1.36.2.49 src/common/utils.c;  cvs diff -u -r 1.20.2.27 -r 1.20.2.28 src/common/utils.h;  diff -u /dev/null src/common/w32_dirent.c;  diff -u /dev/null src/common/w32_reg.c;  diff -u /dev/null src/common/w32_signal.c;  diff -u /dev/null src/common/w32_stat.c;  diff -u /dev/null src/common/w32_stdio.c;  diff -u /dev/null src/common/w32_stdlib.c;  diff -u /dev/null src/common/w32_string.c;  diff -u /dev/null src/common/w32_time.c;  diff -u /dev/null src/common/w32_unistd.c;  diff -u /dev/null src/common/w32_wait.c;  diff -u /dev/null src/common/w32lib.h;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/Makefile.am;  cvs diff -u -r 1.20.2.7 -r 1.20.2.8 src/gtk/Makefile.am;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.3 -r 1.4 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/passphrase.c;  diff -u /dev/null src/plugins/pgpcore/plugin.def;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/sgpgme.c;  diff -u /dev/null src/plugins/pgpcore/sylpheed.def;  diff -u /dev/null src/plugins/pgpcore/version.rc;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/Makefile.am;  diff -u /dev/null src/plugins/pgpinline/plugin.def;  diff -u /dev/null src/plugins/pgpinline/sylpheed.def;  diff -u /dev/null src/plugins/pgpinline/version.rc;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/Makefile.am;  diff -u /dev/null src/plugins/pgpmime/mypgpcore.def;  diff -u /dev/null src/plugins/pgpmime/plugin.def;  diff -u /dev/null src/plugins/pgpmime/sylpheed.def;  diff -u /dev/null src/plugins/pgpmime/version.rc;  cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/plugins/spamassassin/Makefile.am;  ) > 1.9.100cvs97.patchset
index ab6f309..cfe7658 100644 (file)
@@ -1,5 +1,53 @@
 #!/bin/sh
 
+# ***** W32 build script *******
+# Used to cross-compile for Windows.
+if test "$1" = "--build-w32"; then
+    tmp=`dirname $0`
+    tsdir=`cd "$tmp"; pwd`
+    shift
+    if [ ! -f $tsdir/config/config.guess ]; then
+        echo "$tsdir/config/config.guess not found" >&2
+        exit 1
+    fi
+    build=`$tsdir/config/config.guess`
+
+    [ -z "$w32root" ] && w32root="$HOME/w32root"
+    echo "Using $w32root as standard install directory" >&2
+    
+    if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then
+        host=i586-mingw32msvc
+        crossbindir=/usr/$host/bin
+    else
+       echo "Debian's mingw32 cross-compiler packet is required" >&2
+       exit 1
+    fi
+   
+    if [ -f "$tsdir/config.log" ]; then
+        if ! head $tsdir/config.log | grep "$host" >/dev/null; then
+            echo "Pease run a 'make distclean' first" >&2
+            exit 1
+        fi
+    fi
+
+    ./configure --enable-maintainer-mode --prefix=${w32root}  \
+             --host=i586-mingw32msvc --build=${build} \
+             --with-lib-prefix=${w32root} \
+             --with-libiconv-prefix=${w32root} \
+             --with-gpg-error-prefix=${w32root} \
+            --with-gpgme-prefix=${w32root} \
+             --with-config-dir="Sylpheed-claws" \
+             --disable-openssl --disable-dillo-viewer-plugin \
+             --disable-nls --disable-libetpan --disable-aspell \
+             --disable-trayicon-plugin \
+             PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig"
+
+    rc=$?
+    exit $rc
+fi
+# ***** end W32 build script *******
+
+
 aclocal -I m4 \
   && libtoolize --force --copy \
   && autoheader \
index 937edf5..3f1bef3 100644 (file)
@@ -2,28 +2,13 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2003 Free Software Foundation, Inc.
+#   Copyright 1996-2005 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -50,6 +35,8 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
+cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
@@ -60,6 +47,13 @@ else
     aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case "$cc_basename" in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
     mingw* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -71,13 +65,19 @@ else
     newsos6)
       ;;
     linux*)
-      case $CC in
-        icc|ecc)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
           wl='-Wl,'
           ;;
-        ccc)
+        ccc*)
           wl='-Wl,'
           ;;
+        como)
+          wl='-lopt='
+          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -96,6 +96,9 @@ else
       ;;
     sysv4*MP*)
       ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
     uts4*)
       ;;
   esac
@@ -138,12 +141,12 @@ if test "$with_gnu_ld" = yes; then
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
+      # behavior of shared libraries on other platforms, we cannot use
       # them.
       ld_shlibs=no
       ;;
     beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -162,9 +165,9 @@ if test "$with_gnu_ld" = yes; then
     netbsd*)
       ;;
     solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -173,8 +176,15 @@ if test "$with_gnu_ld" = yes; then
     sunos4*)
       hardcode_direct=yes
       ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -266,7 +276,7 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
-    bsdi4*)
+    bsdi[45]*)
       ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
@@ -277,8 +287,17 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-        hardcode_direct=no
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case "$cc_basename" in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
       fi
       ;;
     dgux*)
@@ -295,7 +314,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -438,7 +457,7 @@ case "$host_os" in
     ;;
   beos*)
     ;;
-  bsdi4*)
+  bsdi[45]*)
     ;;
   cygwin* | mingw* | pw32*)
     shrext=.dll
@@ -450,6 +469,8 @@ case "$host_os" in
     ;;
   freebsd1*)
     ;;
+  kfreebsd*-gnu)
+    ;;
   freebsd*)
     ;;
   gnu*)
@@ -486,11 +507,13 @@ case "$host_os" in
     ;;
   linux*)
     ;;
+  knetbsd*-gnu)
+    ;;
   netbsd*)
     ;;
   newsos6)
     ;;
-  nto-qnx)
+  nto-qnx*)
     ;;
   openbsd*)
     ;;
@@ -519,7 +542,7 @@ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"
index d2d5f21..6fbe5e1 100644 (file)
@@ -1,20 +1,32 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
 errstatus=0
 dirmode=""
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
+      echo "$usage"
       exit 0
       ;;
     -m)                         # -m PERM arg
@@ -23,6 +35,10 @@ while test $# -gt 0 ; do
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,17 +66,37 @@ case $# in
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
@@ -84,17 +120,17 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-       errstatus=$lasterr
+       errstatus=$lasterr
       else
-       if test ! -z "$dirmode"; then
+       if test ! -z "$dirmode"; then
          echo "chmod $dirmode $pathcomp"
-         lasterr=""
-         chmod "$dirmode" "$pathcomp" || lasterr=$?
+         lasterr=""
+         chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-         if test ! -z "$lasterr"; then
-           errstatus=$lasterr
-         fi
-       fi
+         if test ! -z "$lasterr"; then
+           errstatus=$lasterr
+         fi
+       fi
       fi
     fi
 
@@ -107,5 +143,8 @@ exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
 # End:
-# mkinstalldirs ends here
index 436fa1d..3423a02 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=96
+EXTRA_VERSION=97
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -82,14 +82,19 @@ AC_PROG_CPP
 dnl AC_PROG_RANLIB
 AM_PROG_LEX
 AC_PROG_YACC
+AC_LIB_PREFIX
+AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 
 SYLPHEED_ACLOCAL_INCLUDE(m4)
   
 dnl ******************************
 dnl Checks for host
+dnl Not needed anymore because we 
+dnl do AC_CANONICAL_SYSTEM above
 dnl ******************************
-AC_CANONICAL_HOST
+dnl AC_CANONICAL_HOST
 
 dnl Copied from the official gtk+-2 configure.in
 AC_MSG_CHECKING([for some Win32 platform])
@@ -105,11 +110,6 @@ esac
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes")
 
-if test x"$platform_win32" = x"yes"; then
-    WINDRES=windres
-    AC_SUBST(WINDRES)
-fi
-
 AC_MSG_CHECKING([for native Win32])
 case "$host" in
   *-*-mingw*)
@@ -124,13 +124,18 @@ AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes")
 
 CFLAGS="$CFLAGS -Wall"
 
+pthread_name=
 case "$target" in
 *-darwin*)
        CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
        ;;
 *-*-mingw*)
+        # Note that we need to link to pthreadGC2 in all cases. This
+        # is because some locking is used even when pthread support is
+        # disabled.
+        pthread_name=pthreadGC2
        CFLAGS="$CFLAGS -mms-bitfields"
-       LIBS="$LIBS -lws2_32"
+       LIBS="$LIBS -l${pthread_name} -lws2_32 -lregex"
        ;;
 esac
   
@@ -151,9 +156,9 @@ GETTEXT_PACKAGE=sylpheed-claws
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
 
-AM_GLIB_GNU_GETTEXT
-dnl AM_GNU_GETTEXT
-dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
+AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external])
+
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_ARG_WITH(localedir,
        [  --with-localedir=DIR    Locale directory],
@@ -212,6 +217,9 @@ if test $ac_cv_dirent_d_type = yes; then
                  Define if `struct dirent' has `d_type' member.)
 fi
 
+# Check whether mkdir does not take the permission argument.
+GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -417,35 +425,51 @@ if test x$ac_cv_enable_pthread = xno; then
 else
        AC_MSG_RESULT(yes)
 
+        # For W32 we need to use a special ptrhead lib. In this case we can't
+        # use AC_CHECK_LIB because it has no means of checking for a
+        # library installed under a different name.  Checking for the
+        # header is okay.
+        if test -n "${pthread_name}" ; then
+           ac_cv_enable_pthread=yes
+        else
        AC_CHECK_LIB(pthread, pthread_create, :, ac_cv_enable_pthread=no)
+        fi
        AC_CHECK_HEADERS(pthread.h, :, ac_cv_enable_pthread=no)
 
        if test x$ac_cv_enable_pthread = xyes; then
                AC_DEFINE(USE_PTHREAD, 1, Define if you have pthread)
+                if test -z "${pthread_name}" ; then
                PTHREAD_LIBS="-lpthread"
        fi
+       fi
 
 fi
 AC_SUBST(PTHREAD_LIBS)
 
-t_oldLibs="$LIBS"
-LIBS="$LIBS"
-ac_cv_var__res_options=no
-AC_TRY_LINK([#include <sys/types.h>
+dnl
+dnl Check whether we need to pass -lresolv
+dnl We know that we don't need it for W32.
+dnl
+if test x$os_win32 = xno; then
+  t_oldLibs="$LIBS"
+  LIBS="$LIBS"
+  ac_cv_var__res_options=no
+  AC_TRY_LINK([#include <sys/types.h>
             #include <sys/socket.h>
             #include <netinet/in.h>
             #include <arpa/nameser.h>
             #include <resolv.h>],
                [_res.options = RES_INIT;],
                ac_cv_var__res_options=yes);
-if test "$ac_cv_var__res_options" != "yes"; then
+  if test "$ac_cv_var__res_options" != "yes"; then
        LIBRESOLV="-lresolv"
-fi
-LIBS="$t_oldLibs"
+  fi
+  LIBS="$t_oldLibs"
 
-if test "x$LIBRESOLV" = "x"; then
+  if test "x$LIBRESOLV" = "x"; then
        AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv])
        LIBS="$t_oldLibs"
+  fi
 fi
 AC_SUBST(LIBRESOLV)
 
@@ -594,7 +618,7 @@ AC_ARG_ENABLE(pgpcore-plugin,
        [ac_cv_enable_pgpcore_plugin=$enableval], [ac_cv_enable_pgpcore_plugin=yes])
 if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
        AC_MSG_RESULT(yes)
-       AM_PATH_GPGME(0.4.5, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
+       AM_PATH_GPGME(1.0.0, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
                      [ac_cv_enable_pgpcore_plugin=no])
        if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                PLUGINS="pgpcore $PLUGINS"
@@ -722,6 +746,8 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
 else
        AC_MSG_RESULT(no)
 fi
+AM_CONDITIONAL(SYLPHEED_LIBETPAN, test "x$libetpan_result" = "xyes")
+
 
 dnl Libgnomeprint
 AC_MSG_CHECKING([whether to use libgnomeprint])
index 816e2c5..ecce704 100644 (file)
@@ -3,9 +3,10 @@ MACROS = \
        check-type.m4 \
        gnupg-check-typedef.m4 \
        aspell.m4 \
-       spamassassin.m4
+       spamassassin.m4 \
+        gnupg.m4
 
-EXTRA_DIST = $(MACROS) \
+EXTRA_DIST = codeset.m4 glibc21.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 glibc2.m4 $(MACROS) \
        missing/gdk-pixbuf.m4 \
        missing/gettext.m4 \
        missing/gpgme.m4
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
new file mode 100644 (file)
index 0000000..e8f5bfe
--- /dev/null
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 1
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+      ac_cv_gnu_library_2,
+      [AC_EGREP_CPP([Lucky GNU user],
+       [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+       ],
+       ac_cv_gnu_library_2=yes,
+       ac_cv_gnu_library_2=no)
+      ]
+    )
+    AC_SUBST(GLIBC2)
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)
diff --git a/m4/gnupg.m4 b/m4/gnupg.m4
new file mode 100644 (file)
index 0000000..5f1cffc
--- /dev/null
@@ -0,0 +1,37 @@
+# gnupg.m4 - autoconf macros as used by GnuPG.
+# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+dnl Stolen from gcc
+dnl Define MKDIR_TAKES_ONE_ARG if mkdir accepts only one argument instead
+dnl of the usual 2.
+AC_DEFUN([GNUPG_FUNC_MKDIR_TAKES_ONE_ARG],
+[AC_CHECK_HEADERS(sys/stat.h unistd.h direct.h)
+AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg,
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifdef HAVE_DIRECT_H
+# include <direct.h>
+#endif], [mkdir ("foo", 0);],
+        gnupg_cv_mkdir_takes_one_arg=no, gnupg_cv_mkdir_takes_one_arg=yes)])
+if test $gnupg_cv_mkdir_takes_one_arg = yes ; then
+  AC_DEFINE(MKDIR_TAKES_ONE_ARG,1,
+            [Defined if mkdir() does not take permission flags])
+fi
+])
+
diff --git a/m4/gpgme.m4 b/m4/gpgme.m4
new file mode 100644 (file)
index 0000000..10ee13f
--- /dev/null
@@ -0,0 +1,238 @@
+# gpgme.m4 - autoconf macro to detect GPGME.
+# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+[ AC_ARG_WITH(gpgme-prefix,
+            AC_HELP_STRING([--with-gpgme-prefix=PFX],
+                           [prefix where GPGME is installed (optional)]),
+     gpgme_config_prefix="$withval", gpgme_config_prefix="")
+  if test "x$gpgme_config_prefix" != x ; then
+      GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
+  fi
+  AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+
+  if test "$GPGME_CONFIG" != "no" ; then
+    gpgme_version=`$GPGME_CONFIG --version`
+  fi
+  gpgme_version_major=`echo $gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+  gpgme_version_minor=`echo $gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+  gpgme_version_micro=`echo $gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+])
+
+dnl AM_PATH_GPGME([MINIMUM-VERSION,
+dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+  tmp=ifelse([$1], ,1:0.4.2,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+  else
+     req_gpgme_api=0
+     min_gpgme_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+  ok=no
+  if test "$GPGME_CONFIG" != "no" ; then
+    req_major=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+    req_minor=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+    req_micro=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+    if test "$gpgme_version_major" -gt "$req_major"; then
+        ok=yes
+    else 
+        if test "$gpgme_version_major" -eq "$req_major"; then
+            if test "$gpgme_version_minor" -gt "$req_minor"; then
+               ok=yes
+            else
+               if test "$gpgme_version_minor" -eq "$req_minor"; then
+                   if test "$gpgme_version_micro" -ge "$req_micro"; then
+                     ok=yes
+                   fi
+               fi
+            fi
+        fi
+    fi
+  fi
+  if test $ok = yes; then
+     # If we have a recent GPGME, we should also check that the
+     # API is compatible.
+     if test "$req_gpgme_api" -gt 0 ; then
+        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           if test "$req_gpgme_api" -ne "$tmp" ; then
+             ok=no
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
+    GPGME_LIBS=`$GPGME_CONFIG --libs`
+    AC_MSG_RESULT(yes)
+    ifelse([$2], , :, [$2])
+  else
+    GPGME_CFLAGS=""
+    GPGME_LIBS=""
+    AC_MSG_RESULT(no)
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GPGME_CFLAGS)
+  AC_SUBST(GPGME_LIBS)
+])
+
+dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION,
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME_PTH],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+  tmp=ifelse([$1], ,1:0.4.2,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+  else
+     req_gpgme_api=0
+     min_gpgme_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version)
+  ok=no
+  if test "$GPGME_CONFIG" != "no" ; then
+    if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then
+      req_major=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+      req_minor=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+      req_micro=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+      if test "$gpgme_version_major" -gt "$req_major"; then
+        ok=yes
+      else 
+        if test "$gpgme_version_major" -eq "$req_major"; then
+          if test "$gpgme_version_minor" -gt "$req_minor"; then
+            ok=yes
+          else
+            if test "$gpgme_version_minor" -eq "$req_minor"; then
+              if test "$gpgme_version_micro" -ge "$req_micro"; then
+                ok=yes
+              fi
+            fi
+          fi
+        fi
+      fi
+    fi
+  fi
+  if test $ok = yes; then
+     # If we have a recent GPGME, we should also check that the
+     # API is compatible.
+     if test "$req_gpgme_api" -gt 0 ; then
+        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           if test "$req_gpgme_api" -ne "$tmp" ; then
+             ok=no
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags`
+    GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs`
+    AC_MSG_RESULT(yes)
+    ifelse([$2], , :, [$2])
+  else
+    GPGME_PTH_CFLAGS=""
+    GPGME_PTH_LIBS=""
+    AC_MSG_RESULT(no)
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GPGME_PTH_CFLAGS)
+  AC_SUBST(GPGME_PTH_LIBS)
+])
+
+dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
+dnl                       [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
+dnl  and GPGME_PTHREAD_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+  tmp=ifelse([$1], ,1:0.4.2,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+  else
+     req_gpgme_api=0
+     min_gpgme_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
+  ok=no
+  if test "$GPGME_CONFIG" != "no" ; then
+    if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then
+      req_major=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+      req_minor=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+      req_micro=`echo $min_gpgme_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+      if test "$gpgme_version_major" -gt "$req_major"; then
+        ok=yes
+      else 
+        if test "$gpgme_version_major" -eq "$req_major"; then
+          if test "$gpgme_version_minor" -gt "$req_minor"; then
+            ok=yes
+          else
+            if test "$gpgme_version_minor" -eq "$req_minor"; then
+              if test "$gpgme_version_micro" -ge "$req_micro"; then
+                ok=yes
+              fi
+            fi
+          fi
+        fi
+      fi
+    fi
+  fi
+  if test $ok = yes; then
+     # If we have a recent GPGME, we should also check that the
+     # API is compatible.
+     if test "$req_gpgme_api" -gt 0 ; then
+        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           if test "$req_gpgme_api" -ne "$tmp" ; then
+             ok=no
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags`
+    GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
+    AC_MSG_RESULT(yes)
+    ifelse([$2], , :, [$2])
+  else
+    GPGME_PTHREAD_CFLAGS=""
+    GPGME_PTHREAD_LIBS=""
+    AC_MSG_RESULT(no)
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GPGME_PTHREAD_CFLAGS)
+  AC_SUBST(GPGME_PTHREAD_LIBS)
+])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
new file mode 100644 (file)
index 0000000..d99c999
--- /dev/null
@@ -0,0 +1,30 @@
+# intmax.m4 serial 2 (gettext-0.14.2)
+dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE(HAVE_INTMAX_T, 1,
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
new file mode 100644 (file)
index 0000000..40cd7ce
--- /dev/null
@@ -0,0 +1,28 @@
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
new file mode 100644 (file)
index 0000000..7b399e0
--- /dev/null
@@ -0,0 +1,23 @@
+# longlong.m4 serial 5
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
new file mode 100644 (file)
index 0000000..af10170
--- /dev/null
@@ -0,0 +1,44 @@
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+   dollar expansion (possibly an autoconf bug).  */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+  sprintf (buf, format, 33, 55);
+  return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])
diff --git a/m4/signed.m4 b/m4/signed.m4
new file mode 100644 (file)
index 0000000..048f593
--- /dev/null
@@ -0,0 +1,17 @@
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([bh_C_SIGNED],
+[
+  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+  if test $bh_cv_c_signed = no; then
+    AC_DEFINE(signed, ,
+              [Define to empty if the C compiler doesn't support this keyword.])
+  fi
+])
diff --git a/m4/size_max.m4 b/m4/size_max.m4
new file mode 100644 (file)
index 0000000..4fe81c7
--- /dev/null
@@ -0,0 +1,59 @@
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
new file mode 100644 (file)
index 0000000..dee10cc
--- /dev/null
@@ -0,0 +1,23 @@
+# ulonglong.m4 serial 4
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the 'unsigned long long' type.])
+  fi
+])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
new file mode 100644 (file)
index 0000000..cde2129
--- /dev/null
@@ -0,0 +1,20 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
new file mode 100644 (file)
index 0000000..b8fff9c
--- /dev/null
@@ -0,0 +1,20 @@
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])
diff --git a/m4/xsize.m4 b/m4/xsize.m4
new file mode 100644 (file)
index 0000000..85bb721
--- /dev/null
@@ -0,0 +1,13 @@
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS(stdint.h)
+])
index c995182..1f5cc28 100644 (file)
@@ -1,20 +1,18 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
 #
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+# Origin: gettext-0.14.4
 
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -26,230 +24,361 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
-libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-subdir = po
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-CC = @CC@
-GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
 MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
 POTFILES = \
 
 CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
 
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+# Makevars gets inserted here. (Don't remove this line!)
 
-.c.o:
-       $(COMPILE) $<
-
-.po.pox:
-       $(MAKE) $(GETTEXT_PACKAGE).pot
-       $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
-       $(MSGFMT) -c -o $@ $<
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
 .po.gmo:
-       file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-         && rm -f $$file && $(GMSGFMT) -c --statistics -o $$file $<
+       @lang=`echo $* | sed -e 's,.*/,,'`; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+       cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
-.po.cat:
-       sed -f ../intl/po2msg.sed < $< > $*.msg \
-         && rm -f $@ && $(GENCAT) $@ $*.msg
+.sin.sed:
+       sed -e '/^#/d' $< > t-$@
+       mv t-$@ $@
 
 
 all: all-@USE_NLS@
 
-all-yes: $(CATALOGS)
+all-yes: stamp-po
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-       $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
-         --add-comments --keyword=_ --keyword=N_ \
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+       test ! -f $(srcdir)/$(DOMAIN).pot || \
+         test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+       @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+         echo "touch stamp-po" && \
+         echo timestamp > stamp-poT && \
+         mv stamp-poT stamp-po; \
+       }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+       else \
+         msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+       fi; \
+       $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --files-from=$(srcdir)/POTFILES.in \
-         --msgid-bugs-address='twb@users.sourceforge.net' \
-       && test ! -f $(GETTEXT_PACKAGE).po \
-          || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-               && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
+         --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --msgid-bugs-address="$$msgid_bugs_address"
+       test ! -f $(DOMAIN).po || { \
+         if test -f $(srcdir)/$(DOMAIN).pot; then \
+           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+           sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+           if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+           else \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+             mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+           fi; \
+         else \
+           mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+         fi; \
+       }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+       $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+       @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+       if test -f "$(srcdir)/$${lang}.po"; then \
+         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+         echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+         cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+       else \
+         $(MAKE) $${lang}.po-create; \
+       fi
+
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-       if test -r "$(MKINSTALLDIRS)"; then \
-         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           $(INSTALL_DATA) $(srcdir)/$$file \
+                           $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+         for file in Makevars; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
        else \
-         $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+         ; \
        fi
+install-data-no: all
+install-data-yes: all
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
        @catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         case "$$cat" in \
-           *.gmo) destdir=$(gnulocaledir);; \
-           *)     destdir=$(localedir);; \
-         esac; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-         if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $$dir; \
-         else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-         fi; \
-         if test -r $$cat; then \
-           $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-           echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-         else \
-           $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-           echo "installing $(srcdir)/$$cat as" \
-                "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-         fi; \
-         if test -r $$cat.m; then \
-           $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-           echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-         else \
-           if test -r $(srcdir)/$$cat.m ; then \
-             $(INSTALL_DATA) $(srcdir)/$$cat.m \
-               $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-             echo "installing $(srcdir)/$$cat as" \
-                  "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-           else \
-             true; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
            fi; \
-         fi; \
+         done; \
        done
-       if test "$(PACKAGE)" = "glib"; then \
-         if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-         else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-         fi; \
-         $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-                         $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
        else \
          : ; \
        fi
+installdirs-data-no:
+installdirs-data-yes:
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+           fi; \
+         done; \
+       done
 
 # Define this as empty until I found a useful application.
 installcheck:
 
-uninstall:
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+uninstall-data-no:
+uninstall-data-yes:
        catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+         done; \
        done
-       if test "$(PACKAGE)" = "glib"; then \
-         rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-       fi
 
 check: all
 
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
 mostlyclean:
-       rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
+       rm -f remove-potcdate.sed
+       rm -f stamp-poT
+       rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
        rm -fr *.o
 
 clean: mostlyclean
 
 distclean: clean
-       rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+       rm -f Makefile Makefile.in POTFILES *.mo
 
 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
-       rm -f $(GMOFILES)
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+       rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+       $(MAKE) update-po
+       @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
        dists="$(DISTFILES)"; \
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         dists="$$dists Makevars.template"; \
+       fi; \
+       if test -f $(srcdir)/$(DOMAIN).pot; then \
+         dists="$$dists $(DOMAIN).pot stamp-po"; \
+       fi; \
+       if test -f $(srcdir)/ChangeLog; then \
+         dists="$$dists ChangeLog"; \
+       fi; \
+       for i in 0 1 2 3 4 5 6 7 8 9; do \
+         if test -f $(srcdir)/ChangeLog.$$i; then \
+           dists="$$dists ChangeLog.$$i"; \
+         fi; \
+       done; \
+       if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
        for file in $$dists; do \
-         ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-           || cp -p $(srcdir)/$$file $(distdir); \
+         if test -f $$file; then \
+           cp -p $$file $(distdir) || exit 1; \
+         else \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+         fi; \
        done
 
 update-po: Makefile
-       $(MAKE) $(GETTEXT_PACKAGE).pot
+       $(MAKE) $(DOMAIN).pot-update
+       test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+       $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+       @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+       echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+       exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+       @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+       if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
        tmpdir=`pwd`; \
+       echo "$$lang:"; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
        cd $(srcdir); \
-       catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         echo "$$lang:"; \
-         if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \
-           if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-             rm -f $$tmpdir/$$lang.new.po; \
-            else \
-             if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-               :; \
-             else \
-               echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-               rm -f $$tmpdir/$$lang.new.po; \
-               exit 1; \
-             fi; \
-           fi; \
-         else \
-           echo "msgmerge for $$cat failed!"; \
+       if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
            rm -f $$tmpdir/$$lang.new.po; \
-         fi; \
-       done
-
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-       ( if test 'x$(srcdir)' != 'x.'; then \
-           posrcprefix='$(top_srcdir)/'; \
          else \
-           posrcprefix="../"; \
+           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+             :; \
+           else \
+             echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+             exit 1; \
+           fi; \
          fi; \
-         rm -f $@-t $@ \
-           && (sed -e '/^#/d'                                          \
-                   -e "s/^\[.*\] +//"                                  \
-                   -e '/^[     ]*$$/d'                                 \
-                   -e "s@.*@   $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-               | sed -e '$$s/\\$$//') > $@-t \
-           && chmod a-w $@-t \
-           && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-       cd .. \
+       else \
+         echo "msgmerge for $$lang.po failed!" 1>&2; \
+         rm -f $$tmpdir/$$lang.new.po; \
+       fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+       @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+       cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
               $(SHELL) ./config.status
 
+force:
+
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
index 45a36e6..a670b45 100644 (file)
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+COPYRIGHT_HOLDER = The Sylpheed Authors
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
index 0fdc93c..52c1ec2 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-17 09:43+0300\n"
+"Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
+"POT-Creation-Date: 2005-12-20 18:32+0100\n"
 "PO-Revision-Date: 2003-08-18 14:26GMT\n"
 "Last-Translator: George Danchev <danchev@spnet.net>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/account.c:305
+#: src/account.c:376
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -22,528 +22,569 @@ msgstr ""
 "Èìà îòâîðåíè ïðîçîðöè çà ñúñòàâÿíå.\n"
 "Ìîëÿ çàòâîðåòå ãè, ïðåäè äà ðåäàêòèðàòå àêàóíòèòå."
 
-#: src/account.c:555
+#: src/account.c:423
+#, fuzzy
+msgid "Can't create folder."
+msgstr "Íå ìîãà äà ñúçäàì ïàïêà `%s'."
+
+#: src/account.c:648
 msgid "Edit accounts"
 msgstr "Ðåäàêòèðàíå íà àêàóíòè"
 
-#: src/account.c:573
+#: src/account.c:666
+#, fuzzy
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
+"on the 'G' column to enable message retrieval by 'Get all'."
 msgstr ""
 "Íîâèòå ñúîáùåíèÿ ùå áúäàò ïðîâåðÿâàíè â òîçè ðåä. Èçáåðåòå êóòèéêèòå\n"
 "â `G' êîëîíàòà çà äà âêëþ÷èòå ïîëó÷àâàíåòî íà ñúîáùåíèÿ ÷ðåç 'Âçåìè âñè÷êè'."
 
-#: src/account.c:593 src/addressadd.c:182 src/addressbook.c:616
-#: src/compose.c:4638 src/compose.c:4808 src/editaddress.c:774
-#: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
-#: src/editjpilot.c:295 src/editldap.c:394 src/editvcard.c:210
-#: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:199
-#: src/select-keys.c:301
+#: src/account.c:741
+#, fuzzy
+msgid " _Set as default account "
+msgstr "Èçáåðè êàòî ïîäðàçáèðàù ñå àêàóíò "
+
+#: src/account.c:831
+msgid "Accounts with remote folders cannot be copied."
+msgstr ""
+
+#: src/account.c:837
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: src/account.c:976
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Íàèñòèíà ëè èñêàø äà èçòðèåø òîçè àêàóíò?"
+
+#: src/account.c:978
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Íåîçàãëàâåí"
+
+#: src/account.c:979
+msgid "Delete account"
+msgstr "Èçòðèé àêàóíòà"
+
+#: src/account.c:1420 src/addressadd.c:185 src/addressbook.c:747
+#: src/compose.c:5133 src/compose.c:5359 src/editaddress.c:953
+#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:279
+#: src/editjpilot.c:270 src/editldap.c:398 src/editvcard.c:183
+#: src/importmutt.c:227 src/importpine.c:227 src/mimeview.c:199
+#: src/plugins/pgpcore/select-keys.c:332 src/prefs_filtering.c:1255
 msgid "Name"
 msgstr "Èìå"
 
-#: src/account.c:594 src/prefs_account.c:927
+#: src/account.c:1427 src/prefs_account.c:1169
 msgid "Protocol"
 msgstr "Ïðîòîêîë"
 
-#: src/account.c:595 src/ssl_manager.c:105
+#: src/account.c:1434 src/ssl_manager.c:99
 msgid "Server"
 msgstr "Ñúðâúð"
 
-#: src/account.c:624 src/addressbook.c:755 src/editaddress.c:722
-#: src/editaddress.c:856 src/prefs_actions.c:221 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:275 src/prefs_display_header.c:330
-#: src/prefs_filtering.c:417 src/prefs_matcher.c:557 src/prefs_scoring.c:271
-#: src/prefs_template.c:216 src/prefs_toolbar.c:769
-msgid "Add"
-msgstr "Äîáàâè"
+#: src/action.c:352
+#, fuzzy, c-format
+msgid "Could not get message file %d"
+msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
 
-#: src/account.c:630
-msgid "Edit"
-msgstr "Ïðîìåíè"
+#: src/action.c:383
+#, fuzzy
+msgid "Could not get message part."
+msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
 
-#: src/account.c:636 src/prefs_customheader.c:241
-msgid " Delete "
-msgstr "Èçòðèé"
+#: src/action.c:400
+#, fuzzy
+msgid "Can't get part of multipart message"
+msgstr "Íå ìîãà äà çàïàçÿ ÷àñò îò ðàç÷ëåíåíî ñúîáùåíèå."
 
-#: src/account.c:642 src/prefs_actions.c:284 src/prefs_customheader.c:289
-#: src/prefs_display_header.c:294 src/prefs_filtering.c:471
-#: src/prefs_matcher.c:639 src/prefs_scoring.c:325
-#: src/prefs_summary_column.c:289 src/prefs_toolbar.c:830
-msgid "Down"
-msgstr "Íàäîëó"
-
-#: src/account.c:648 src/prefs_actions.c:278 src/prefs_customheader.c:283
-#: src/prefs_display_header.c:288 src/prefs_filtering.c:465
-#: src/prefs_matcher.c:633 src/prefs_scoring.c:319
-#: src/prefs_summary_column.c:285 src/prefs_toolbar.c:826
-msgid "Up"
-msgstr "Íàãîðå"
-
-#: src/account.c:662
-msgid " Set as default account "
-msgstr "Èçáåðè êàòî ïîäðàçáèðàù ñå àêàóíò "
+#: src/action.c:514
+#, c-format
+msgid ""
+"The selected action cannot be used in the compose window\n"
+"because it contains %%f, %%F, %%as or %%p."
+msgstr ""
 
-#: src/account.c:668 src/addressbook.c:982 src/addressbook.c:2990
-#: src/addressbook.c:2994 src/addressbook.c:3032 src/crash.c:242
-#: src/exphtmldlg.c:196 src/expldifdlg.c:203 src/gtk/pluginwindow.c:224
-#: src/inc.c:689 src/message_search.c:135 src/summary_search.c:208
-msgid "Close"
-msgstr "Çàòâîðè"
+#: src/action.c:794
+#, c-format
+msgid ""
+"Command could not be started. Pipe creation failed.\n"
+"%s"
+msgstr ""
 
-#: src/account.c:736
-msgid "Delete account"
-msgstr "Èçòðèé àêàóíòà"
+#: src/action.c:889
+#, c-format
+msgid ""
+"Could not fork to execute the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
 
-#: src/account.c:737
-msgid "Do you really want to delete this account?"
-msgstr "Íàèñòèíà ëè èñêàø äà èçòðèåø òîçè àêàóíò?"
+#: src/action.c:1107 src/action.c:1257
+#, fuzzy
+msgid "Completed"
+msgstr "Ñú÷èíè"
 
-#: src/account.c:738 src/addressbook.c:1005 src/addressbook.c:2182
-#: src/compose.c:2966 src/compose.c:3452 src/compose.c:5923 src/compose.c:6231
-#: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
-#: src/folderview.c:2113 src/folderview.c:2172 src/folderview.c:2264
-#: src/folderview.c:2399 src/folderview.c:2438 src/inc.c:167 src/inc.c:268
-#: src/mainwindow.c:1408 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:969
-#: src/prefs_filtering.c:1096 src/prefs_matcher.c:1666 src/prefs_scoring.c:623
-#: src/prefs_scoring.c:760 src/prefs_template.c:544 src/ssl_manager.c:271
-#: src/summary_search.c:324 src/summaryview.c:916 src/summaryview.c:1379
-#: src/summaryview.c:1423 src/summaryview.c:1466 src/summaryview.c:1490
-#: src/summaryview.c:1522 src/summaryview.c:1547 src/summaryview.c:1572
-#: src/summaryview.c:1597 src/summaryview.c:3082 src/toolbar.c:2048
-msgid "Yes"
-msgstr "Äà"
+#: src/action.c:1143
+#, c-format
+msgid "--- Running: %s\n"
+msgstr ""
+
+#: src/action.c:1147
+#, c-format
+msgid "--- Ended: %s\n"
+msgstr ""
+
+#: src/action.c:1180
+msgid "Action's input/output"
+msgstr ""
+
+#: src/action.c:1447
+#, fuzzy, c-format
+msgid ""
+"Enter the argument for the following action:\n"
+"('%%h' will be replaced with the argument)\n"
+"  %s"
+msgstr ""
+"Âúâåäè êîìàíäà çà ïðèíòèðàíå:\n"
+"(`%s' ùå áúäå çàìåíåíî ñ èìåòî íà ôàéë)"
+
+#: src/action.c:1452
+msgid "Action's hidden user argument"
+msgstr ""
+
+#: src/action.c:1456
+#, fuzzy, c-format
+msgid ""
+"Enter the argument for the following action:\n"
+"('%%u' will be replaced with the argument)\n"
+"  %s"
+msgstr ""
+"Âúâåäè êîìàíäà çà ïðèíòèðàíå:\n"
+"(`%s' ùå áúäå çàìåíåíî ñ èìåòî íà ôàéë)"
 
-#: src/account.c:738 src/compose.c:3452 src/compose.c:5923
-#: src/folderview.c:2113 src/folderview.c:2172 src/folderview.c:2264
-#: src/folderview.c:2399 src/folderview.c:2438 src/ssl_manager.c:271
-msgid "+No"
-msgstr "+Íå"
+#: src/action.c:1461
+#, fuzzy
+msgid "Action's user argument"
+msgstr "çà àðãóìåíò ïðåäîñòàâåí îò ïîòðåáèëåëÿ"
 
-#: src/addressadd.c:162
+#: src/addressadd.c:165
 msgid "Add to address book"
 msgstr "Äîáàâè â Àäðåñíèêà"
 
-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:424
+#: src/addressadd.c:197 src/plugins/pgpcore/select-keys.c:333
+#: src/toolbar.c:441
 msgid "Address"
 msgstr "Àäðåñ"
 
-#: src/addressadd.c:204 src/addressbook.c:618 src/editaddress.c:628
-#: src/editaddress.c:692 src/editgroup.c:259
+#: src/addressadd.c:207 src/addressbook.c:749 src/editaddress.c:761
+#: src/editaddress.c:825 src/editgroup.c:281
 msgid "Remarks"
 msgstr "Áåëåæêè"
 
-#: src/addressadd.c:226
+#: src/addressadd.c:229
 msgid "Select Address Book Folder"
 msgstr "Èçáåðè ïàïêà çà Àäðåñíèêà"
 
-#: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
-#: src/alertpanel.c:324 src/compose.c:3091 src/compose.c:5745
-#: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
-#: src/editjpilot.c:344 src/editldap.c:340 src/editldap_basedn.c:212
-#: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
-#: src/grouplistdialog.c:241 src/gtk/about.c:233 src/gtk/prefswindow.c:319
-#: src/gtk/sslcertwindow.c:230 src/gtk/gtkaspell.c:1423
-#: src/gtk/gtkaspell.c:2336 src/import.c:190 src/importmutt.c:287
-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:609
-#: src/mainwindow.c:2164 src/messageview.c:937 src/mimeview.c:1018
-#: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_gtk.c:449
-#: src/prefs_actions.c:161 src/prefs_common.c:2986 src/prefs_common.c:3155
-#: src/prefs_common.c:3482 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:194 src/prefs_filtering.c:336
-#: src/prefs_matcher.c:370 src/prefs_scoring.c:196
-#: src/prefs_summary_column.c:313 src/prefs_template.c:263 src/sigstatus.c:134
-#: src/ssl_manager.c:98
-msgid "OK"
-msgstr "OK"
-
-#: src/addressadd.c:241 src/addressbook.c:2176 src/addrgather.c:507
-#: src/compose.c:3091 src/compose.c:5746 src/compose.c:6414 src/compose.c:6452
-#: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
-#: src/editjpilot.c:345 src/editldap.c:341 src/editldap_basedn.c:213
-#: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
-#: src/export.c:189 src/foldersel.c:194 src/grouplistdialog.c:242
-#: src/gtk/prefswindow.c:320 src/gtk/gtkaspell.c:1432 src/import.c:191
-#: src/importldif.c:1034 src/importmutt.c:288 src/importpine.c:288
-#: src/inputdialog.c:204 src/main.c:609 src/mainwindow.c:2164
-#: src/messageview.c:937 src/mimeview.c:1019 src/mimeview.c:1083
-#: src/passphrase.c:134 src/prefs_gtk.c:450 src/prefs_actions.c:162
-#: src/prefs_common.c:2987 src/prefs_common.c:3483
-#: src/prefs_customheader.c:158 src/prefs_display_header.c:195
-#: src/prefs_filtering.c:337 src/prefs_matcher.c:371 src/prefs_scoring.c:197
-#: src/prefs_summary_column.c:314 src/prefs_template.c:264
-#: src/progressdialog.c:77 src/select-keys.c:332 src/summaryview.c:916
-#: src/summaryview.c:3424
-msgid "Cancel"
-msgstr "Îòêàç"
-
-#: src/addressbook.c:355 src/compose.c:499 src/mainwindow.c:411
-#: src/messageview.c:143
-msgid "/_File"
-msgstr "/Ôàéë"
+#: src/addressbook.c:404
+#, fuzzy
+msgid "/_Book"
+msgstr "/Èíñòðóìåíòè"
 
-#: src/addressbook.c:356
-msgid "/_File/New _Book"
+#: src/addressbook.c:405
+#, fuzzy
+msgid "/_Book/New _Book"
 msgstr "/Ôàéë/Íîâà Êíèãà"
 
-#: src/addressbook.c:357
-msgid "/_File/New _vCard"
+#: src/addressbook.c:406
+#, fuzzy
+msgid "/_Book/New _Folder"
+msgstr "/Íîâà Ïàïêà"
+
+#: src/addressbook.c:407
+#, fuzzy
+msgid "/_Book/New _vCard"
 msgstr "/Ôàéë/Íîâ _vCard"
 
-#: src/addressbook.c:359
-msgid "/_File/New _JPilot"
+#: src/addressbook.c:409
+#, fuzzy
+msgid "/_Book/New _JPilot"
 msgstr "/Ôàéë/Íîâ _JPilot"
 
-#: src/addressbook.c:362
-msgid "/_File/New _Server"
-msgstr "/Ôàéë/Íîâ Ñúðâúð"
+#: src/addressbook.c:412
+#, fuzzy
+msgid "/_Book/New LDAP _Server"
+msgstr "Äîáàâî íîâ LDAP Ñúðâúð"
 
-#: src/addressbook.c:364 src/addressbook.c:367 src/compose.c:503
-#: src/mainwindow.c:427 src/mainwindow.c:430 src/messageview.c:146
-msgid "/_File/---"
-msgstr "/Ôàéë/---"
+#: src/addressbook.c:414 src/addressbook.c:417
+#, fuzzy
+msgid "/_Book/---"
+msgstr "/Èíñòðóìåíòè/---"
 
-#: src/addressbook.c:365
-msgid "/_File/_Edit"
-msgstr "/Ôàéë/Ðåäàêòèðàé"
+#: src/addressbook.c:415
+#, fuzzy
+msgid "/_Book/_Edit book"
+msgstr "/Èíñòðóìåíòè/_Àäðåñíèê"
 
-#: src/addressbook.c:366
-msgid "/_File/_Delete"
+#: src/addressbook.c:416
+#, fuzzy
+msgid "/_Book/_Delete book"
 msgstr "/Ôàéë/Èçòðèé"
 
-#: src/addressbook.c:368
-msgid "/_File/_Save"
+#: src/addressbook.c:418
+#, fuzzy
+msgid "/_Book/_Save"
 msgstr "/Ôàéë/Çàïàçè"
 
-#: src/addressbook.c:369 src/compose.c:504 src/messageview.c:147
-msgid "/_File/_Close"
+#: src/addressbook.c:419
+#, fuzzy
+msgid "/_Book/_Close"
 msgstr "/Ôàéë/Çàòâîðè"
 
-#: src/addressbook.c:370 src/addressbook.c:400 src/addressbook.c:414
-#: src/compose.c:506 src/mainwindow.c:434 src/messageview.c:149
-msgid "/_Edit"
-msgstr "/Ðåäàêòèðàé"
+#: src/addressbook.c:420
+msgid "/_Address"
+msgstr "/Àäðåñ"
 
-#: src/addressbook.c:371
-msgid "/_Edit/C_ut"
-msgstr "/Ðåäàêòèðàé/Èçðåæè"
+#: src/addressbook.c:421
+#, fuzzy
+msgid "/_Address/_Select all"
+msgstr "/Àäðåñ/Èçòðèé"
 
-#: src/addressbook.c:372 src/compose.c:511 src/mainwindow.c:435
-#: src/messageview.c:150
-msgid "/_Edit/_Copy"
-msgstr "/Ðåäàêòèðàé/Êîïèðàé"
+#: src/addressbook.c:422 src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:432
+msgid "/_Address/---"
+msgstr "/Àäðåñ/---"
 
-#: src/addressbook.c:373 src/compose.c:512
-msgid "/_Edit/_Paste"
-msgstr "/Ðåäàêòèðàé/Ïîñòàâè"
+#: src/addressbook.c:423
+#, fuzzy
+msgid "/_Address/C_ut"
+msgstr "/Àäðåñ/Ðåäàêòèðàé"
 
-#: src/addressbook.c:374 src/compose.c:509 src/compose.c:592
-#: src/mainwindow.c:438 src/messageview.c:152
-msgid "/_Edit/---"
-msgstr "/Ðåäàêòèðàé/---"
+#: src/addressbook.c:424
+#, fuzzy
+msgid "/_Address/_Copy"
+msgstr "/Àäðåñ"
 
-#: src/addressbook.c:375
-msgid "/_Edit/Pa_ste Address"
-msgstr "/Ðåäàêòèðàé/Ïîñòàâè Àäðåñ"
+#: src/addressbook.c:425
+#, fuzzy
+msgid "/_Address/_Paste"
+msgstr "/Àäðåñ/Èçòðèé"
 
-#: src/addressbook.c:376
-msgid "/_Address"
-msgstr "/Àäðåñ"
+#: src/addressbook.c:427
+msgid "/_Address/_Edit"
+msgstr "/Àäðåñ/Ðåäàêòèðàé"
+
+#: src/addressbook.c:428
+msgid "/_Address/_Delete"
+msgstr "/Àäðåñ/Èçòðèé"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:430
 msgid "/_Address/New _Address"
 msgstr "/Àäðåñ/Íîâ _Àäðåñ"
 
-#: src/addressbook.c:378
+#: src/addressbook.c:431
 msgid "/_Address/New _Group"
 msgstr "/Àäðåñ/Íîâà Ãðóïà"
 
-#: src/addressbook.c:379
-msgid "/_Address/New _Folder"
-msgstr "/Àäðåñ/Íîâà Ïàïêà"
-
-#: src/addressbook.c:380
-msgid "/_Address/---"
-msgstr "/Àäðåñ/---"
-
-#: src/addressbook.c:381
-msgid "/_Address/_Edit"
+#: src/addressbook.c:433
+#, fuzzy
+msgid "/_Address/_Mail To"
 msgstr "/Àäðåñ/Ðåäàêòèðàé"
 
-#: src/addressbook.c:382
-msgid "/_Address/_Delete"
-msgstr "/Àäðåñ/Èçòðèé"
-
-#: src/addressbook.c:383 src/addressbook.c:387 src/mainwindow.c:651
-#: src/mainwindow.c:662 src/mainwindow.c:664 src/mainwindow.c:667
-#: src/mainwindow.c:670 src/mainwindow.c:674 src/messageview.c:265
-#: src/messageview.c:276
-msgid "/_Tools/---"
-msgstr "/Èíñòðóìåíòè/---"
+#: src/addressbook.c:434 src/compose.c:737 src/mainwindow.c:721
+#: src/messageview.c:293
+msgid "/_Tools"
+msgstr "/Èíñòðóìåíòè"
 
-#: src/addressbook.c:384
+#: src/addressbook.c:435
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/Èñòðóìåíòè/Âíåñè _LDIF ôàéë"
 
-#: src/addressbook.c:385
+#: src/addressbook.c:436
 msgid "/_Tools/Import M_utt file..."
 msgstr "/Èñòðóìåíòè/Âíåñè M_utt ôàéë"
 
-#: src/addressbook.c:386
+#: src/addressbook.c:437
 msgid "/_Tools/Import _Pine file..."
 msgstr "/Èñòðóìåíòè/Âíåñè _Pine ôàéë..."
 
-#: src/addressbook.c:388
+#: src/addressbook.c:438 src/mainwindow.c:730 src/mainwindow.c:753
+#: src/mainwindow.c:755 src/mainwindow.c:764 src/mainwindow.c:767
+#: src/mainwindow.c:771 src/messageview.c:297 src/messageview.c:318
+msgid "/_Tools/---"
+msgstr "/Èíñòðóìåíòè/---"
+
+#: src/addressbook.c:439
 msgid "/_Tools/Export _HTML..."
 msgstr "/Èñòðóìåíòè/Èçíåñè _HTML ôàéë..."
 
-#: src/addressbook.c:389
+#: src/addressbook.c:440
 msgid "/_Tools/Export LDI_F..."
 msgstr "/Èñòðóìåíòè/Èçíåñè LDIF..."
 
-#: src/addressbook.c:390 src/compose.c:669 src/mainwindow.c:698
-#: src/messageview.c:279
+#: src/addressbook.c:441 src/compose.c:742 src/mainwindow.c:796
+#: src/messageview.c:321
 msgid "/_Help"
 msgstr "/Ïîìîù"
 
-#: src/addressbook.c:391 src/compose.c:670 src/mainwindow.c:708
-#: src/messageview.c:280
+#: src/addressbook.c:442 src/compose.c:743 src/mainwindow.c:804
+#: src/messageview.c:322
 msgid "/_Help/_About"
 msgstr "/Ïîìîù/Îòíîñíî"
 
-#: src/addressbook.c:396 src/addressbook.c:410
-msgid "/New _Address"
-msgstr "/Íîâ Àäðåñ"
-
-#: src/addressbook.c:397 src/addressbook.c:411
-msgid "/New _Group"
-msgstr "/Íîâà Ãðóïà"
+#: src/addressbook.c:447 src/addressbook.c:461 src/compose.c:528
+#: src/mainwindow.c:476 src/messageview.c:162
+msgid "/_Edit"
+msgstr "/Ðåäàêòèðàé"
 
-#: src/addressbook.c:398 src/addressbook.c:412
-msgid "/New _Folder"
-msgstr "/Íîâà Ïàïêà"
+#: src/addressbook.c:448 src/addressbook.c:462
+msgid "/_Delete"
+msgstr "/Èçòðèé"
 
-#: src/addressbook.c:399 src/addressbook.c:402 src/addressbook.c:413
-#: src/addressbook.c:416 src/addressbook.c:420 src/compose.c:493
-#: src/folderview.c:289 src/folderview.c:291 src/folderview.c:300
-#: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:321 src/folderview.c:326 src/folderview.c:330
-#: src/folderview.c:332 src/folderview.c:342 src/folderview.c:346
-#: src/folderview.c:349 src/folderview.c:351 src/summaryview.c:411
-#: src/summaryview.c:414 src/summaryview.c:416 src/summaryview.c:422
-#: src/summaryview.c:436 src/summaryview.c:448 src/summaryview.c:454
-#: src/summaryview.c:457
+#: src/addressbook.c:449 src/addressbook.c:451 src/addressbook.c:460
+#: src/addressbook.c:463 src/addressbook.c:466 src/addressbook.c:470
+#: src/compose.c:507 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
+#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:53
+#: src/news_gtk.c:56 src/news_gtk.c:58 src/plugins/trayicon/trayicon.c:94
+#: src/plugins/trayicon/trayicon.c:97 src/plugins/trayicon/trayicon.c:99
+#: src/summaryview.c:408 src/summaryview.c:412 src/summaryview.c:417
+#: src/summaryview.c:431 src/summaryview.c:452 src/summaryview.c:458
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:401 src/addressbook.c:415 src/summaryview.c:419
-msgid "/_Delete"
-msgstr "/Èçòðèé"
+#: src/addressbook.c:450
+msgid "/New _Folder"
+msgstr "/Íîâà Ïàïêà"
 
-#: src/addressbook.c:403 src/addressbook.c:417
+#: src/addressbook.c:452 src/addressbook.c:467
 msgid "/C_ut"
 msgstr "/Èçðåæè"
 
-#: src/addressbook.c:404 src/addressbook.c:418
+#: src/addressbook.c:453 src/addressbook.c:468
 msgid "/_Copy"
 msgstr "/Êîïèðàé"
 
-#: src/addressbook.c:405 src/addressbook.c:419
+#: src/addressbook.c:454 src/addressbook.c:469
 msgid "/_Paste"
 msgstr "/Ïîñòàâè"
 
-#: src/addressbook.c:421
-msgid "/Pa_ste Address"
-msgstr "/Ïîñòàâè Àäðåñ"
+#: src/addressbook.c:459
+#, fuzzy
+msgid "/_Select all"
+msgstr "/Èçáåðè âñè÷êè"
+
+#: src/addressbook.c:464
+msgid "/New _Address"
+msgstr "/Íîâ Àäðåñ"
+
+#: src/addressbook.c:465
+msgid "/New _Group"
+msgstr "/Íîâà Ãðóïà"
 
-#: src/addressbook.c:433 src/crash.c:444 src/crash.c:463 src/importldif.c:118
+#: src/addressbook.c:472
+#, fuzzy
+msgid "/_Mail To"
+msgstr "Ïîùåíñêà Êóòèÿ"
+
+#: src/addressbook.c:474
+msgid "/_Browse Entry"
+msgstr ""
+
+#: src/addressbook.c:487 src/crash.c:443 src/crash.c:462 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:122 src/prefs_themes.c:690
+#: src/prefs_themes.c:722 src/prefs_themes.c:723
 msgid "Unknown"
 msgstr "Íåèçâåñòåí"
 
-#: src/addressbook.c:440 src/addressbook.c:459 src/importldif.c:125
+#: src/addressbook.c:494 src/addressbook.c:513 src/importldif.c:126
 msgid "Success"
 msgstr "Óñïåõ"
 
-#: src/addressbook.c:441 src/importldif.c:126
+#: src/addressbook.c:495 src/importldif.c:127
 msgid "Bad arguments"
 msgstr "Íåêîðåêòíè àðãóìåíòè"
 
-#: src/addressbook.c:442 src/importldif.c:127
+#: src/addressbook.c:496 src/importldif.c:128
 msgid "File not specified"
 msgstr "Íå å ïîñî÷åí ôàéë"
 
-#: src/addressbook.c:443 src/importldif.c:128
+#: src/addressbook.c:497 src/importldif.c:129
 msgid "Error opening file"
 msgstr "Ãðåøêà ïðè îòâàðÿíåòî íà ôàéë."
 
-#: src/addressbook.c:444 src/importldif.c:129
+#: src/addressbook.c:498 src/importldif.c:130
 msgid "Error reading file"
 msgstr "Ãðåøêà ïðè ÷åòåíåòî íà ôàéë"
 
-#: src/addressbook.c:445 src/importldif.c:130
+#: src/addressbook.c:499 src/importldif.c:131
 msgid "End of file encountered"
 msgstr "Äîñòèãíàò å êðàÿ íà ôàéëà"
 
-#: src/addressbook.c:446 src/importldif.c:131
+#: src/addressbook.c:500 src/importldif.c:132
 msgid "Error allocating memory"
 msgstr "Ãðåøêà ïðè çàåìàíåòî íà ïàìåò"
 
-#: src/addressbook.c:447 src/importldif.c:132
+#: src/addressbook.c:501 src/importldif.c:133
 msgid "Bad file format"
 msgstr "Ëîø ôîðìàò íà ôàéë"
 
-#: src/addressbook.c:448 src/importldif.c:133
+#: src/addressbook.c:502 src/importldif.c:134
 msgid "Error writing to file"
 msgstr "Ãðåøêà ïðè ïèñàíåòî âúâ ôàéë"
 
-#: src/addressbook.c:449 src/importldif.c:134
+#: src/addressbook.c:503 src/importldif.c:135
 msgid "Error opening directory"
 msgstr "Ãðåøêà ïðè îòâàðÿíåòî íà äèðåêòîðèÿ"
 
-#: src/addressbook.c:450 src/importldif.c:135
+#: src/addressbook.c:504 src/importldif.c:136
 msgid "No path specified"
 msgstr "Íå å ïîñî÷åí ïúò"
 
-#: src/addressbook.c:460
+#: src/addressbook.c:514
 msgid "Error connecting to LDAP server"
 msgstr "Ñâúðçâàì ñå ñ POP3 ñúðâúðà: %s ..."
 
-#: src/addressbook.c:461
+#: src/addressbook.c:515
 msgid "Error initializing LDAP"
 msgstr "Ãðåøêà ïðè èíèöèèðàíåòî íà LDAP"
 
-#: src/addressbook.c:462
+#: src/addressbook.c:516
 msgid "Error binding to LDAP server"
 msgstr "Ãðåøêà ïðè ñâúðçâàíåòî êúì LDAP ñúðâúð"
 
-#: src/addressbook.c:463
+#: src/addressbook.c:517
 msgid "Error searching LDAP database"
 msgstr "Ãðåøêà ïðè òúðñåíåòî íà LDAP áàçàòà äàííè"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:518
 msgid "Timeout performing LDAP operation"
 msgstr "Òàéìàóò ïðè èçïúëíåíèåòî íà LDAP îïåðàöèÿòà"
 
-#: src/addressbook.c:465 src/addressbook.c:466
+#: src/addressbook.c:519
 msgid "Error in LDAP search criteria"
 msgstr "Ãðåøêà â LDAP êðèòåðèÿ çà òúðñåíå"
 
-#: src/addressbook.c:467
+#: src/addressbook.c:520
 msgid "No LDAP entries found for search criteria"
 msgstr "Íÿìà íàìåðåíè LDAP äàííè ïî òúðñåíèÿ êðèòåðèé"
 
-#: src/addressbook.c:617
+#: src/addressbook.c:521
+msgid "LDAP search terminated on request"
+msgstr ""
+
+#: src/addressbook.c:522
+#, fuzzy
+msgid "Error starting TLS connection"
+msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ssl êîíòåêñò\n"
+
+#: src/addressbook.c:746
+#, fuzzy
+msgid "Sources"
+msgstr "Óñïåõ"
+
+#: src/addressbook.c:748
 msgid "E-Mail address"
 msgstr "E-Mail àäðåñ"
 
-#: src/addressbook.c:621 src/prefs_common.c:2613 src/toolbar.c:178
-#: src/toolbar.c:1751
+#: src/addressbook.c:753 src/prefs_other.c:97 src/toolbar.c:186
+#: src/toolbar.c:1624
 msgid "Address book"
 msgstr "Àäðåñíèê"
 
-#: src/addressbook.c:720
-msgid "Name:"
-msgstr "Èìå:"
-
-#: src/addressbook.c:752 src/addressbook.c:2175 src/addressbook.c:2182
-#: src/editaddress.c:716 src/editaddress.c:850 src/prefs_actions.c:234
-#: src/prefs_display_header.c:281 src/prefs_display_header.c:337
-#: src/prefs_filtering.c:134 src/prefs_filtering.c:430 src/prefs_matcher.c:570
-#: src/prefs_scoring.c:284 src/prefs_template.c:229 src/prefs_toolbar.c:781
-#: src/ssl_manager.c:92 src/toolbar.c:374 src/toolbar.c:466
-msgid "Delete"
-msgstr "Èçòðèé"
-
-#: src/addressbook.c:758
-msgid "Lookup"
+#: src/addressbook.c:870
+#, fuzzy
+msgid "Lookup name:"
 msgstr "Ïîòúðñè"
 
-#: src/addressbook.c:770 src/compose.c:1408 src/compose.c:3141
-#: src/compose.c:4455 src/compose.c:5162 src/headerview.c:55
-#: src/prefs_template.c:173 src/summary_search.c:156
+#: src/addressbook.c:933 src/compose.c:1783 src/compose.c:3835
+#: src/compose.c:4990 src/compose.c:5669 src/headerview.c:53
+#: src/prefs_template.c:205 src/summary_search.c:218
 msgid "To:"
 msgstr "Äî:"
 
-#: src/addressbook.c:774 src/compose.c:1392 src/compose.c:3140
-#: src/prefs_template.c:175
+#: src/addressbook.c:937 src/compose.c:1767 src/compose.c:3649
+#: src/compose.c:3834 src/prefs_template.c:207
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:778 src/compose.c:1395 src/prefs_template.c:176
+#: src/addressbook.c:941 src/compose.c:1770 src/compose.c:3677
+#: src/prefs_template.c:208
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/addressbook.c:980 src/addressbook.c:1003
+#: src/addressbook.c:1173 src/addressbook.c:1196
 msgid "Delete address(es)"
 msgstr "Èçòðèé àäðåñ(è)"
 
-#: src/addressbook.c:981
+#: src/addressbook.c:1174
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Òåçè àäðåñíè äàííè ñà ñàìî çà ÷åòåíå è íå ìîãàò äà áúäàò èçòðèòè."
 
-#: src/addressbook.c:1004
+#: src/addressbook.c:1197
 msgid "Really delete the address(es)?"
 msgstr "Íàèñòèíà ëè äà èçòðèÿ àäðåñà/àäðåñèòå"
 
-#: src/addressbook.c:1005 src/addressbook.c:2182 src/compose.c:2966
-#: src/compose.c:6231 src/exphtmldlg.c:185 src/expldifdlg.c:192
-#: src/expldifdlg.c:250 src/inc.c:167 src/inc.c:268 src/mainwindow.c:1408
-#: src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:969
-#: src/prefs_filtering.c:1096 src/prefs_matcher.c:1666 src/prefs_scoring.c:623
-#: src/prefs_scoring.c:760 src/prefs_template.c:544 src/summary_search.c:324
-#: src/summaryview.c:916 src/summaryview.c:1379 src/summaryview.c:1423
-#: src/summaryview.c:1466 src/summaryview.c:1490 src/summaryview.c:1522
-#: src/summaryview.c:1547 src/summaryview.c:1572 src/summaryview.c:1597
-#: src/summaryview.c:3082 src/toolbar.c:2048
-msgid "No"
-msgstr "Íå"
-
-#: src/addressbook.c:1518 src/addressbook.c:1591
+#: src/addressbook.c:1789 src/addressbook.c:1868
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Íå ìîãà äà ïîñòàâÿì. Èçáðàíèÿ àäðåñíèê å ñàìî çà ÷åòåíå."
 
-#: src/addressbook.c:1529
+#: src/addressbook.c:1800
 msgid "Cannot paste into an address group."
 msgstr "Íå ìîãà äà ïîñòàâÿì â àäðåñíàòà ãðóïà."
 
-#: src/addressbook.c:2172
-#, c-format
+#: src/addressbook.c:2527
+#, fuzzy, c-format
+msgid "Do you want to delete the query results and addresses in '%s' ?"
+msgstr "Èñêàòå äà ïðèëîæèòå òîçè øàáëîíà `%s' ?"
+
+#: src/addressbook.c:2530 src/addressbook.c:2556
+#: src/prefs_filtering_action.c:151
+msgid "Delete"
+msgstr "Èçòðèé"
+
+#: src/addressbook.c:2539
+#, fuzzy, c-format
 msgid ""
-"Do you want to delete the folder AND all addresses in `%s' ? \n"
+"Do you want to delete the folder AND all addresses in '%s' ?\n"
 "If deleting the folder only, addresses will be moved into parent folder."
 msgstr ""
 "Èñêàòå ëè äà èçòðèåòå ïàïêàòà '%s' È âñè÷êè àäðåñè â íåÿ ? \n"
 "àêî èçòðèåòå ñàìî ïàïêàòà, àäðåñèòå ùå áúäàò ïðåìåñòåíè â ïî ãîðíàòà ïàïêà."
 
-#: src/addressbook.c:2176
-msgid "Folder only"
+#: src/addressbook.c:2542 src/imap_gtk.c:268 src/mh_gtk.c:179
+msgid "Delete folder"
+msgstr "Èçòðèâàì ïàïêà"
+
+#: src/addressbook.c:2543
+#, fuzzy
+msgid "_Folder only"
 msgstr "Ïàïêà ñàìî"
 
-#: src/addressbook.c:2176
-msgid "Folder and Addresses"
+#: src/addressbook.c:2543
+#, fuzzy
+msgid "Folder and _addresses"
 msgstr "Ïàïêà è àäðåñè"
 
-#: src/addressbook.c:2181
-#, c-format
-msgid "Really delete `%s' ?"
+#: src/addressbook.c:2555
+#, fuzzy, c-format
+msgid "Really delete '%s' ?"
 msgstr "Íàèñòèíà ëè äà èçòðèÿ `%s' ?"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:3360
 msgid "New user, could not save index file."
 msgstr "Íîâ ïîòðåáèòåë, íå ìîãà äà çàïàçÿ èíäåêñåí ôàéë."
 
-#: src/addressbook.c:2944
+#: src/addressbook.c:3364
 msgid "New user, could not save address book files."
 msgstr "Íîâ ïîòðåáèòåë, íå ìîãà äà çàïàçÿ ôàéëîâåòå íà àäðåñíèêà."
 
-#: src/addressbook.c:2954
+#: src/addressbook.c:3374
 msgid "Old address book converted successfully."
 msgstr "Ñòàðèÿ àäðåñíèê å ïðåîáðàçóâàí óñïåøíî"
 
-#: src/addressbook.c:2959
+#: src/addressbook.c:3379
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -551,7 +592,7 @@ msgstr ""
 "Ñòàðèÿ àäðåñíèê å ïðåîáðàçóâàí,\n"
 "íå ìîãà äà çàïàçÿ íîâèÿ èíäåêñ ôàéë"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:3392
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -559,7 +600,7 @@ msgstr ""
 "Íå ìîãà äà ïðåîáðàçóâàì àäðåñíèêà,\n"
 "íî ñúçäàäîõ íîâè ïðàçíè ôàéëîâå çà àäðåñíèêà."
 
-#: src/addressbook.c:2978
+#: src/addressbook.c:3398
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -567,7 +608,7 @@ msgstr ""
 "Íå ìîãà äà ïðåîáðàçóâàì àäðåñíèêà,\n"
 "íå ìîãà äà ñúçäàì íîâè ôàéëîâå çà àäðåñíèêà."
 
-#: src/addressbook.c:2983
+#: src/addressbook.c:3403
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -575,85 +616,92 @@ msgstr ""
 "Íå ìîãà äà êîíâåðòèðàì Àäðåñíèêà\n"
 "è íå ìîãà äà ñúçäàì íîâè ôàéëîâå çà íåãî."
 
-#: src/addressbook.c:2990
+#: src/addressbook.c:3410 src/addressbook.c:3416
 msgid "Addressbook conversion error"
 msgstr "Ãðåøêà ïðè ïðåîáðàçóâàíåòî íà àäðåñíèêà"
 
-#: src/addressbook.c:2994
-msgid "Addressbook conversion"
-msgstr "Ïðåîáðàçóâàíå íà àäðåñíèê"
-
-#: src/addressbook.c:3030
+#: src/addressbook.c:3454
 msgid "Addressbook Error"
 msgstr "Àäðåñíèê Ãðåøêà"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3455
 msgid "Could not read address index"
 msgstr "Íå ìîãà äà ÷åòà àäðåñíèÿ èíäåêñ"
 
-#: src/addressbook.c:3393
-msgid "Busy searching LDAP..."
+#: src/addressbook.c:3814
+msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:3528 src/prefs_common.c:1033
+#: src/addressbook.c:3885
+#, fuzzy, c-format
+msgid "Search '%s'"
+msgstr "Òúðñåíå"
+
+#: src/addressbook.c:4110
 msgid "Interface"
 msgstr "Èíòåðôåéñ"
 
-#: src/addressbook.c:3544 src/exphtmldlg.c:423 src/expldifdlg.c:435
-#: src/exporthtml.c:1011 src/importldif.c:690
+#: src/addressbook.c:4126 src/exphtmldlg.c:382 src/expldifdlg.c:394
+#: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Àäðåñíèê"
 
-#: src/addressbook.c:3560
+#: src/addressbook.c:4142
 msgid "Person"
 msgstr "Ëèöå"
 
-#: src/addressbook.c:3576
+#: src/addressbook.c:4158
 msgid "EMail Address"
 msgstr "EMail Àäðåñ"
 
-#: src/addressbook.c:3592
+#: src/addressbook.c:4174
 msgid "Group"
 msgstr "Ãðóïà"
 
-#: src/addressbook.c:3608 src/exporthtml.c:913 src/folderview.c:383
-#: src/prefs_account.c:2125
+#: src/addressbook.c:4190 src/exporthtml.c:922 src/folderview.c:430
+#: src/prefs_account.c:2367 src/prefs_folder_column.c:79
 msgid "Folder"
 msgstr "Ïàïêà"
 
-#: src/addressbook.c:3624
+#: src/addressbook.c:4206
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3640 src/addressbook.c:3656
+#: src/addressbook.c:4222 src/addressbook.c:4238
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3672
+#: src/addressbook.c:4254
 msgid "LDAP Server"
 msgstr "LDAP Ñúðâúð"
 
-#: src/addrgather.c:156
+#: src/addressbook.c:4270
+#, fuzzy
+msgid "LDAP Query"
+msgstr "LDAP Ñúðâúð"
+
+#: src/addrgather.c:158
 msgid "Please specify name for address book."
 msgstr "Ìîëÿ óêàæåòå èìå çà àäðåñíèêà."
 
-#: src/addrgather.c:176
+#: src/addrgather.c:178
 msgid "Please select the mail headers to search."
 msgstr "Ìîëÿ èçáåðåòå çàãëàâêè â êîèòî äà òúðñÿ."
 
-#: src/addrgather.c:183
-msgid "Busy harvesting addresses..."
+#: src/addrgather.c:185
+#, fuzzy
+msgid "Harvesting addresses..."
 msgstr "Ñúáèðàì àäðåñèòå ..."
 
-#: src/addrgather.c:221
+#: src/addrgather.c:224
 msgid "Addresses gathered successfully."
 msgstr "Àäðåñèòå ñà ñúáðàíè óñïåøíî."
 
-#: src/addrgather.c:285
+#: src/addrgather.c:294
 msgid "No folder or message was selected."
 msgstr "Íå å èçáðàíà íèòî ïàïêà, íèòî ñúîáùåíèå."
 
-#: src/addrgather.c:293
+#: src/addrgather.c:302
 msgid ""
 "Please select a folder to process from the folder\n"
 "list. Alternatively, select one or messages from\n"
@@ -663,143 +711,200 @@ msgstr ""
 "îáðàáîòÿ. Àëòåðíàòèâíî, èçáåðåòå ñúîáùåíèå îò\n"
 "ñïèñúêà ñúñ ñúîáùåíèÿ."
 
-#: src/addrgather.c:345
+#: src/addrgather.c:354
 msgid "Folder :"
 msgstr "Ïàïêà :"
 
-#: src/addrgather.c:356 src/exphtmldlg.c:637 src/expldifdlg.c:667
-#: src/importldif.c:948
+#: src/addrgather.c:365 src/exphtmldlg.c:596 src/expldifdlg.c:626
+#: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Àäðåñíèê :"
 
-#: src/addrgather.c:366
+#: src/addrgather.c:375
 msgid "Folder Size :"
 msgstr "Ðàçìåð íà ïàïêà :"
 
-#: src/addrgather.c:381
+#: src/addrgather.c:390
 msgid "Process these mail header fields"
 msgstr "Îáðàáîòè òåçè ïîëåòà îò çàãëàâêàòà"
 
-#: src/addrgather.c:399
+#: src/addrgather.c:408
 msgid "Include sub-folders"
 msgstr "Âêëþ÷è ïîä-ïàïêè"
 
-#: src/addrgather.c:422
+#: src/addrgather.c:431
 msgid "Header Name"
 msgstr "Èìå íà çàãëàâêà"
 
-#: src/addrgather.c:423
+#: src/addrgather.c:432
 msgid "Address Count"
 msgstr "Áðîé Àäðåñè"
 
-#: src/addrgather.c:527 src/alertpanel.c:155 src/main.c:263
-#: src/messageview.c:492
+#: src/addrgather.c:537 src/alertpanel.c:153 src/compose.c:4162
+#: src/messageview.c:559 src/messageview.c:572
+#: src/plugins/pgpcore/sgpgme.c:448
 msgid "Warning"
 msgstr "Ïðåäóïðåæäåíèå"
 
-#: src/addrgather.c:528
+#: src/addrgather.c:538
 msgid "Header Fields"
 msgstr "Ïîëåòà íà çàãëàâêà"
 
-#: src/addrgather.c:529 src/exphtmldlg.c:757 src/expldifdlg.c:778
-#: src/importldif.c:1067
+#: src/addrgather.c:539 src/exphtmldlg.c:716 src/expldifdlg.c:737
+#: src/importldif.c:1028
 msgid "Finish"
 msgstr "Çàâúðøè"
 
-#: src/addrgather.c:588
+#: src/addrgather.c:600
 msgid "Harvest E-Mail Addresses - from Selected Messages"
 msgstr "Ñúáèðàì àäðåñè - îò èçáðàíèòå ñúîáùåíèÿ"
 
-#: src/addrgather.c:596
+#: src/addrgather.c:608
 msgid "Harvest E-Mail Addresses - from Folder"
 msgstr "Ñúáèðàì àäðåñè - îò ïàïêà"
 
-#: src/addrindex.c:105 src/addrindex.c:109 src/addrindex.c:116
+#: src/addrindex.c:115 src/addrindex.c:126
 msgid "Common address"
 msgstr "Îáùè àäðåñè"
 
-#: src/addrindex.c:106 src/addrindex.c:110 src/addrindex.c:117
+#: src/addrindex.c:116 src/addrindex.c:127
 msgid "Personal address"
 msgstr "Ëè÷íè àäðåñè"
 
-#: src/alertpanel.c:142 src/compose.c:5923 src/main.c:591
+#: src/addrindex.c:119
+#, fuzzy
+msgid "Common addresses"
+msgstr "Îáùè àäðåñè"
+
+#: src/addrindex.c:120
+#, fuzzy
+msgid "Personal addresses"
+msgstr "Ëè÷íè àäðåñè"
+
+#: src/alertpanel.c:140 src/compose.c:6658
 msgid "Notice"
 msgstr "Ñúîáùåíèå"
 
-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3452 src/inc.c:571
+#: src/alertpanel.c:166 src/alertpanel.c:188 src/compose.c:4108 src/inc.c:584
+#: src/plugins/pgpcore/sgpgme.c:134 src/plugins/pgpcore/sgpgme.c:216
 msgid "Error"
 msgstr "Ãðåøêà"
 
-#: src/alertpanel.c:190
+#: src/alertpanel.c:189
 msgid "View log"
 msgstr "Âèæ ëîã"
 
-#: src/alertpanel.c:308
+#: src/alertpanel.c:335
 msgid "Show this message next time"
 msgstr "Ïîêàæè òîâà ñúîáùåíèå ñëåäâàùèÿ ïúò"
 
-#: src/common/nntp.c:68
+#: src/browseldap.c:219
+#, fuzzy
+msgid "Browse Directory Entry"
+msgstr "Ñúçäàé äèðåêòîðèÿ"
+
+#: src/browseldap.c:239
+#, fuzzy
+msgid "Server Name :"
+msgstr "Èìå íà Ôàéëà :"
+
+#: src/browseldap.c:249
+msgid "Distinguished Name (dn) :"
+msgstr ""
+
+#: src/browseldap.c:272
+#, fuzzy
+msgid "LDAP Name"
+msgstr "Ôàìèëèÿ"
+
+#: src/browseldap.c:274
+#, fuzzy
+msgid "Attribute Value"
+msgstr "Èìå íà àòðèáóòà"
+
+#: src/common/nntp.c:73
 #, c-format
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Íå ìîãà äà ñå ñâúðæà ñ NNTP ñúðâúðà: %s:%d\n"
 
-#: src/common/nntp.c:148 src/common/nntp.c:211
+#: src/common/nntp.c:181 src/common/nntp.c:244
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "ãðåøêà â ïðîòîêîëà: %s\n"
 
-#: src/common/nntp.c:171 src/common/nntp.c:217
+#: src/common/nntp.c:204 src/common/nntp.c:250
 msgid "protocol error\n"
 msgstr "ãðåøêà â ïðîòîêîëà\n"
 
-#: src/common/nntp.c:267
+#: src/common/nntp.c:300
 msgid "Error occurred while posting\n"
 msgstr "Ïîÿâè ñå ãðåøêà äîêàòî ïóáëèêóâàõ\n"
 
-#: src/common/smtp.c:152
+#: src/common/nntp.c:380
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Ïîÿâè ñå ãðåøêà äîêàòî èçïðàùàõ ñúîáùåíèåòî."
+
+#: src/common/plugin.c:231
+msgid "Plugin already loaded"
+msgstr ""
+
+#: src/common/plugin.c:239
+msgid "Failed to allocate memory for Plugin"
+msgstr ""
+
+#: src/common/plugin.c:265
+msgid "This module is not licenced under a GPL compatible licence."
+msgstr ""
+
+#: src/common/plugin.c:272
+msgid "This module is for Sylpheed-Claws GTK1."
+msgstr ""
+
+#: src/common/smtp.c:173
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH íå å íà ðàçïîëîæåíèå\n"
 
-#: src/common/smtp.c:417 src/common/smtp.c:466
+#: src/common/smtp.c:508 src/common/smtp.c:558
 msgid "bad SMTP response\n"
 msgstr "ëîø SMTP îòãîâîð\n"
 
-#: src/common/smtp.c:437 src/common/smtp.c:455 src/common/smtp.c:551
+#: src/common/smtp.c:529 src/common/smtp.c:547 src/common/smtp.c:666
 msgid "error occurred on SMTP session\n"
 msgstr "ïîÿâè ñå ãðåøêà ïðè SMTP ñåñèÿòà\n"
 
-#: src/common/smtp.c:446 src/pop.c:683
+#: src/common/smtp.c:538 src/pop.c:841
 msgid "error occurred on authentication\n"
 msgstr "ïîÿâè ñå ãðåøêà ïðè àóòåíòèôèêàöèÿòà\n"
 
-#: src/common/smtp.c:511 src/pop.c:676
+#: src/common/smtp.c:593
+#, c-format
+msgid "Message is too big (Maximum size is %s)\n"
+msgstr ""
+
+#: src/common/smtp.c:625 src/pop.c:834
 msgid "can't start TLS session\n"
 msgstr "íå ìîãà äà çàïî÷íà TLS ñåñèÿ\n"
 
-#: src/common/ssl.c:78
+#: src/common/ssl.c:144
 msgid "Error creating ssl context\n"
 msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ssl êîíòåêñò\n"
 
-#: src/common/ssl.c:97
+#: src/common/ssl.c:163
 #, c-format
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL âðúçêàòà ñå ïðîâàëè (%s)\n"
 
-#: src/common/ssl.c:105
-#, c-format
-msgid "SSL connection using %s\n"
-msgstr "SSL âðúçêà ïîëçâàéêè %s\n"
-
-#: src/common/ssl_certificate.c:139 src/common/ssl_certificate.c:150
-#: src/common/ssl_certificate.c:156 src/common/ssl_certificate.c:163
-#: src/common/ssl_certificate.c:174 src/common/ssl_certificate.c:180
+#: src/common/ssl_certificate.c:141 src/common/ssl_certificate.c:152
+#: src/common/ssl_certificate.c:158 src/common/ssl_certificate.c:165
+#: src/common/ssl_certificate.c:176 src/common/ssl_certificate.c:182
 #: src/gtk/sslcertwindow.c:63 src/gtk/sslcertwindow.c:74
 #: src/gtk/sslcertwindow.c:80 src/gtk/sslcertwindow.c:87
 #: src/gtk/sslcertwindow.c:98 src/gtk/sslcertwindow.c:104
 msgid "<not in certificate>"
 msgstr "<not in certificate>"
 
-#: src/common/ssl_certificate.c:189
+#: src/common/ssl_certificate.c:191
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
@@ -812,11 +917,11 @@ msgstr ""
 "  Îòïå÷àòúê: %s\n"
 "  Ñòàòóñ íà ïîäïèñà: %s"
 
-#: src/common/ssl_certificate.c:307
+#: src/common/ssl_certificate.c:309
 msgid "Can't load X509 default paths"
 msgstr "Íå ìîãà äà çàðåäÿ X509 ïîäðàçáèðàùèòå ñå ïúòèùà"
 
-#: src/common/ssl_certificate.c:362
+#: src/common/ssl_certificate.c:364
 #, c-format
 msgid ""
 "%s presented an unknown SSL certificate:\n"
@@ -825,7 +930,7 @@ msgstr ""
 "%s ïîêàçâà íåïîçíàò SSL ñåðòèôèêàò:\n"
 "%s"
 
-#: src/common/ssl_certificate.c:369 src/common/ssl_certificate.c:407
+#: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -838,12 +943,12 @@ msgstr ""
 "Íÿìà äà áúäå èçòåãëÿíà ïîùà ñ òîçè àêàóíò äîêàòî íå çàïàçèòå ñåðòèôèêàò.\n"
 "(Îòìàðêèðàéòå îïöèÿ \"%s\").\n"
 
-#: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
-#: src/prefs_common.c:1207
+#: src/common/ssl_certificate.c:373 src/common/ssl_certificate.c:411
+#: src/prefs_receive.c:214
 msgid "Don't popup error dialog on receive error"
 msgstr "Íå èçêàðâàé ñêà÷àùî ñúîáùåíèå çà ãðåøêà ïðè ïîëó÷àâàíå"
 
-#: src/common/ssl_certificate.c:398
+#: src/common/ssl_certificate.c:400
 #, c-format
 msgid ""
 "%s's SSL certificate changed !\n"
@@ -864,365 +969,505 @@ msgstr ""
 "\n"
 "Òîâà ìîæå äà îçíà÷àâà, ÷å îòãîâàðÿùèÿ ñúðâúð íå å òîçè êîéòî çíàåì."
 
-#: src/compose.c:491
+#: src/common/string_match.c:79
+msgid "(Subject cleared by RegExp)"
+msgstr ""
+
+#: src/common/utils.c:342
+#, c-format
+msgid "%dB"
+msgstr ""
+
+#: src/common/utils.c:344
+#, c-format
+msgid "%.1fKB"
+msgstr ""
+
+#: src/common/utils.c:346
+#, c-format
+msgid "%.2fMB"
+msgstr ""
+
+#: src/common/utils.c:348
+#, c-format
+msgid "%.2fGB"
+msgstr ""
+
+#: src/compose.c:505
 msgid "/_Add..."
 msgstr "/Äîáàâè..."
 
-#: src/compose.c:492
+#: src/compose.c:506
 msgid "/_Remove"
 msgstr "/Ìàõíè"
 
-#: src/compose.c:494 src/folderview.c:292 src/folderview.c:313
-#: src/folderview.c:334 src/folderview.c:353
+#: src/compose.c:508 src/folderview.c:283
 msgid "/_Properties..."
 msgstr "/Ñâîéñòâà..."
 
-#: src/compose.c:500
-msgid "/_File/_Attach file"
-msgstr "/Ôàéë/Ïðèêðåïè ôàéë"
+#: src/compose.c:513 src/mainwindow.c:679 src/messageview.c:274
+msgid "/_Message"
+msgstr "/Ñúîáùåíèå"
+
+#: src/compose.c:514
+msgid "/_Message/_Send"
+msgstr "/Ñúîáùåíèå/Èçïðàòè"
+
+#: src/compose.c:516
+msgid "/_Message/Send _later"
+msgstr "/Ñúîáùåíèå/Ïî-êúñíî"
+
+#: src/compose.c:518 src/compose.c:522 src/compose.c:525 src/mainwindow.c:689
+#: src/mainwindow.c:699 src/mainwindow.c:703 src/mainwindow.c:709
+#: src/mainwindow.c:718 src/messageview.c:277 src/messageview.c:285
+#: src/messageview.c:290
+msgid "/_Message/---"
+msgstr "/Ñúîáùåíèå/---"
+
+#: src/compose.c:519
+#, fuzzy
+msgid "/_Message/_Attach file"
+msgstr "/Ñúîáùåíèå/Ïðèêðåïÿíå"
 
-#: src/compose.c:501
-msgid "/_File/_Insert file"
+#: src/compose.c:520
+#, fuzzy
+msgid "/_Message/_Insert file"
 msgstr "/Ôàéë/Âìúêíè ôàéë"
 
-#: src/compose.c:502
-msgid "/_File/Insert si_gnature"
+#: src/compose.c:521
+#, fuzzy
+msgid "/_Message/Insert si_gnature"
 msgstr "/Ôàéë/Âìúêíè _ïîäïèñ"
 
-#: src/compose.c:507
+#: src/compose.c:523
+#, fuzzy
+msgid "/_Message/_Save"
+msgstr "/Ñúîáùåíèå/Èçïðàòè"
+
+#: src/compose.c:526
+#, fuzzy
+msgid "/_Message/_Close"
+msgstr "/Ñúîáùåíèå/_Cc"
+
+#: src/compose.c:529
 msgid "/_Edit/_Undo"
 msgstr "/Ðåäàêòèðàé/Îòìÿíà"
 
-#: src/compose.c:508
+#: src/compose.c:530
 msgid "/_Edit/_Redo"
 msgstr "/Ðåäàêòèðàé/_Redo"
 
-#: src/compose.c:510
+#: src/compose.c:531 src/compose.c:619 src/compose.c:625 src/mainwindow.c:480
+#: src/messageview.c:165
+msgid "/_Edit/---"
+msgstr "/Ðåäàêòèðàé/---"
+
+#: src/compose.c:532
 msgid "/_Edit/Cu_t"
 msgstr "/Ðåäàêòèðàé/Èçðåæè"
 
-#: src/compose.c:513
-msgid "/_Edit/Paste as _quotation"
+#: src/compose.c:533 src/mainwindow.c:477 src/messageview.c:163
+msgid "/_Edit/_Copy"
+msgstr "/Ðåäàêòèðàé/Êîïèðàé"
+
+#: src/compose.c:534
+msgid "/_Edit/_Paste"
+msgstr "/Ðåäàêòèðàé/Ïîñòàâè"
+
+#: src/compose.c:535
+#, fuzzy
+msgid "/_Edit/Special paste"
+msgstr "/Ðåäàêòèðàé/Ïîñòàâè"
+
+#: src/compose.c:536
+#, fuzzy
+msgid "/_Edit/Special paste/as _quotation"
 msgstr "/Ðåäàêòèðàé/Ïîñòàâè êàòî öèòàò"
 
-#: src/compose.c:515 src/mainwindow.c:436 src/messageview.c:151
+#: src/compose.c:538
+#, fuzzy
+msgid "/_Edit/Special paste/_wrapped"
+msgstr "/Ðåäàêòèðàé/Èçáåðè íèøêà"
+
+#: src/compose.c:540
+msgid "/_Edit/Special paste/_unwrapped"
+msgstr ""
+
+#: src/compose.c:542 src/mainwindow.c:478 src/messageview.c:164
 msgid "/_Edit/Select _all"
 msgstr "/Ðåäàêòèðàé/Èçáåðè âñè÷êî"
 
-#: src/compose.c:516
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ"
 
-#: src/compose.c:517
+#: src/compose.c:544
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå åäèí çíàê íàçàä"
 
-#: src/compose.c:522
+#: src/compose.c:549
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå åäèí çíàê íàïðåä"
 
-#: src/compose.c:527
+#: src/compose.c:554
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå åäíà äóìà íàçàä"
 
-#: src/compose.c:532
+#: src/compose.c:559
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå åäíà äóìà íàïðåä"
 
-#: src/compose.c:537
+#: src/compose.c:564
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå â íà÷àëîòî íà ðåäà"
 
-#: src/compose.c:542
+#: src/compose.c:569
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå â êðàÿ íà ðåäà"
 
-#: src/compose.c:547
+#: src/compose.c:574
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå íà ïðåäèøíèÿ ðåä"
 
-#: src/compose.c:552
+#: src/compose.c:579
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Ïðåìåñòè ñå íà ñëåäâàùèÿ ðåä"
 
-#: src/compose.c:557
+#: src/compose.c:584
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé åäèí çíàê íàçàä"
 
-#: src/compose.c:562
+#: src/compose.c:589
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé åäèí çíàê íàïðåä"
 
-#: src/compose.c:567
+#: src/compose.c:594
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé åäíà äóìà íàçàä"
 
-#: src/compose.c:572
+#: src/compose.c:599
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé åäíà äóìà íàïðåä"
 
-#: src/compose.c:577
+#: src/compose.c:604
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé ðåäà"
 
-#: src/compose.c:582
+#: src/compose.c:609
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé ðåäà"
 
-#: src/compose.c:587
+#: src/compose.c:614
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Ðåäàêòèðàé/Íàïðåäíè÷àâ/Èçòðèé äî êðàÿ íà ðåäà"
 
-#: src/compose.c:593
+#: src/compose.c:620
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Ðåäàêòèðàé/Ïðåíåñè òåêóùèÿ àáçàö"
 
-#: src/compose.c:595
+#: src/compose.c:622
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Ðåäàêòèðàé/Ïðåíåñè âñè÷êè äúëãè ðåäîâå"
 
-#: src/compose.c:597
+#: src/compose.c:624
+#, fuzzy
+msgid "/_Edit/Aut_o wrapping"
+msgstr "/Ðåäàêòèðàé/Êîïèðàé"
+
+#: src/compose.c:626
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/Ðåäàêòèðàé/Ðåäàêòèðàé ñ âúíøåí ðåäàêòîð"
 
-#: src/compose.c:600
+#: src/compose.c:629
 msgid "/_Spelling"
 msgstr "/Ñïåëèíã"
 
-#: src/compose.c:601
+#: src/compose.c:630
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Ñïåëèíã/Ïðîâåðè âñè÷êî èëè ñàìî ïîñî÷åíîòî"
 
-#: src/compose.c:603
+#: src/compose.c:632
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Ñïåëèíã/Ïîâäèãíè âñè÷êè íåïðàâèëíî èçïèñàíè äóìè"
 
-#: src/compose.c:605
+#: src/compose.c:634
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Ñïåëèíã/Ïðîâåðÿâè â îáðàòåí ðåä íåïðàâèëíî èçïèñàíèòå äóìè"
 
-#: src/compose.c:607
+#: src/compose.c:636
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Ñïåëèíã/Ïðåñêî÷è êúì ñëåäâàùàòà íåïðàâèëíî èçïèñàíà äóìà"
 
-#: src/compose.c:609
-msgid "/_Spelling/---"
+#: src/compose.c:639
+#, fuzzy
+msgid "/_Options"
+msgstr "/_Îòâîðè"
+
+#: src/compose.c:640
+msgid "/_Options/Privacy System"
+msgstr ""
+
+#: src/compose.c:641
+msgid "/_Options/Privacy System/None"
+msgstr ""
+
+#: src/compose.c:642
+#, fuzzy
+msgid "/_Options/Si_gn"
+msgstr "/Ñúîáùåíèå/Ïîäïèøè"
+
+#: src/compose.c:643
+#, fuzzy
+msgid "/_Options/_Encrypt"
+msgstr "/Ñúîáùåíèå/Êðèïòèðàé"
+
+#: src/compose.c:644 src/compose.c:651 src/compose.c:653 src/compose.c:655
+#, fuzzy
+msgid "/_Options/---"
 msgstr "/Ñïåëèíã/---"
 
-#: src/compose.c:610
-msgid "/_Spelling/_Spelling Configuration"
-msgstr "/Ñïåëèíã/Ñïåëèíã Íàñòðîéêè"
+#: src/compose.c:645
+#, fuzzy
+msgid "/_Options/_Priority"
+msgstr "/Ñúîáùåíèå/Ïðèîðèòåò"
 
-#: src/compose.c:614 src/mainwindow.c:442 src/messageview.c:156
-#: src/summaryview.c:449
-msgid "/_View"
-msgstr "/Èçãëåä"
+#: src/compose.c:646
+#, fuzzy
+msgid "/_Options/Priority/_Highest"
+msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íàé-âèñîê"
 
-#: src/compose.c:615
-msgid "/_View/_To"
-msgstr "/Èçãëåä/Äî"
+#: src/compose.c:647
+#, fuzzy
+msgid "/_Options/Priority/Hi_gh"
+msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Âèñîê"
 
-#: src/compose.c:616
-msgid "/_View/_Cc"
-msgstr "/Èçãëåä/_Cc"
+#: src/compose.c:648
+#, fuzzy
+msgid "/_Options/Priority/_Normal"
+msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íîðìàëåí"
 
-#: src/compose.c:617
-msgid "/_View/_Bcc"
-msgstr "/Èçãëåä/_Bcc"
+#: src/compose.c:649
+#, fuzzy
+msgid "/_Options/Priority/Lo_w"
+msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íèñúê"
 
-#: src/compose.c:618
-msgid "/_View/_Reply to"
-msgstr "/Èçãëåä/Îòãîâîðè íà"
+#: src/compose.c:650
+#, fuzzy
+msgid "/_Options/Priority/_Lowest"
+msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íàé-íèñúê"
 
-#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/mainwindow.c:460
-#: src/mainwindow.c:463 src/mainwindow.c:492 src/mainwindow.c:516
-#: src/mainwindow.c:598 src/mainwindow.c:602 src/messageview.c:238
-msgid "/_View/---"
-msgstr "/Èçãëåä/---"
+#: src/compose.c:652
+#, fuzzy
+msgid "/_Options/_Request Return Receipt"
+msgstr "/Ñúîáùåíèå/Ïîèñêàé ïîòâúðæäåíèå"
 
-#: src/compose.c:620
-msgid "/_View/_Followup to"
-msgstr "/Èçãëåä/Ïðîäúëæè äî"
+#: src/compose.c:654
+#, fuzzy
+msgid "/_Options/Remo_ve references"
+msgstr "/Ñúîáùåíèå/Ïðåìàõíè âðúçêèòå"
 
-#: src/compose.c:622
-msgid "/_View/R_uler"
-msgstr "/Èçãëåä/Ëèíèÿ"
+#: src/compose.c:661
+msgid "/_Options/Character _encoding"
+msgstr ""
 
-#: src/compose.c:624
-msgid "/_View/_Attachment"
-msgstr "/Èçãëåä/Ïðèêðåïêè"
+#: src/compose.c:662
+msgid "/_Options/Character _encoding/_Automatic"
+msgstr ""
 
-#: src/compose.c:626 src/mainwindow.c:605 src/messageview.c:242
-msgid "/_Message"
-msgstr "/Ñúîáùåíèå"
+#: src/compose.c:664 src/compose.c:670 src/compose.c:678 src/compose.c:682
+#: src/compose.c:688 src/compose.c:692 src/compose.c:698 src/compose.c:702
+#: src/compose.c:712 src/compose.c:716 src/compose.c:726 src/compose.c:730
+msgid "/_Options/Character _encoding/---"
+msgstr ""
 
-#: src/compose.c:627
-msgid "/_Message/_Send"
-msgstr "/Ñúîáùåíèå/Èçïðàòè"
+#: src/compose.c:666
+#, fuzzy
+msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/Èçãëåä/Êîäèðàíå/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:629
-msgid "/_Message/Send _later"
-msgstr "/Ñúîáùåíèå/Ïî-êúñíî"
+#: src/compose.c:668
+#, fuzzy
+msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
+msgstr "/Èçãëåä/Êîäèðàíå/Óíèêîä (_UTF-8)"
 
-#: src/compose.c:631 src/compose.c:637 src/compose.c:642 src/compose.c:644
-#: src/compose.c:648 src/compose.c:654 src/compose.c:661 src/mainwindow.c:610
-#: src/mainwindow.c:612 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:627 src/mainwindow.c:632 src/messageview.c:245
-#: src/messageview.c:253 src/messageview.c:258
-msgid "/_Message/---"
-msgstr "/Ñúîáùåíèå/---"
+#: src/compose.c:672
+#, fuzzy
+msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/Èçãëåä/Êîäèðàíå/Çàïàäíî åâðîïåéñêè (ISO-8859-_1)"
 
-#: src/compose.c:632
-msgid "/_Message/Save to _draft folder"
-msgstr "/Ñúîáùåíèå/Çàïàçè ïðè ÷åðíîâèòå"
+#: src/compose.c:674
+#, fuzzy
+msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/Èçãëåä/Êîäèðàíå/Çàïàäíî åâðîïåéñêè (ISO-8859-15)"
 
-#: src/compose.c:634
-msgid "/_Message/Save and _keep editing"
-msgstr "/Ñúîáùåíèå/Çàïàçè è ïðîäúëæè ðåäàêòèðàíåòî"
+#: src/compose.c:676
+msgid "/_Options/Character _encoding/Western European (Windows-1252)"
+msgstr ""
 
-#: src/compose.c:638
-msgid "/_Message/_To"
-msgstr "/Ñúîáùåíèå/Äî"
+#: src/compose.c:680
+#, fuzzy
+msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/Èçãëåä/Êîäèðàíå/Öåíòðàëíî åâðîïåéñêè (ISO-8859-_2)"
 
-#: src/compose.c:639
-msgid "/_Message/_Cc"
-msgstr "/Ñúîáùåíèå/_Cc"
+#: src/compose.c:684
+#, fuzzy
+msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/Èçãëåä/Êîäèðàíå/Áàëòèéñêè (ISO-8859-13)"
 
-#: src/compose.c:640
-msgid "/_Message/_Bcc"
-msgstr "/Ñúîáùåíèå/_Bcc"
+#: src/compose.c:686
+#, fuzzy
+msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/Èçãëåä/Êîäèðàíå/Áàëòèéñêè (ISO-8859-_4)"
 
-#: src/compose.c:641
-msgid "/_Message/_Reply to"
-msgstr "/Ñúîáùåíèå/Îòãîâîðè íà"
+#: src/compose.c:690
+#, fuzzy
+msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/Èçãëåä/Êîäèðàíå/Ãðúöêè (ISO-8859-_7)"
 
-#: src/compose.c:643
-msgid "/_Message/_Followup to"
-msgstr "/Èçãëåä/Ïðîäúëæè äî"
+#: src/compose.c:694
+msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
+msgstr ""
 
-#: src/compose.c:645
-msgid "/_Message/_Attach"
-msgstr "/Ñúîáùåíèå/Ïðèêðåïÿíå"
+#: src/compose.c:696
+msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
+msgstr ""
 
-#: src/compose.c:649
-msgid "/_Message/Si_gn"
-msgstr "/Ñúîáùåíèå/Ïîäïèøè"
+#: src/compose.c:700
+#, fuzzy
+msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/Èçãëåä/Êîäèðàíå/Òóðñêè (ISO-8859-_9)"
 
-#: src/compose.c:650
-msgid "/_Message/_Encrypt"
-msgstr "/Ñúîáùåíèå/Êðèïòèðàé"
+#: src/compose.c:704
+#, fuzzy
+msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/Èçãëåä/Êîäèðàíå/Êèðèëèöà (ISO-8859-_5)"
 
-#: src/compose.c:651
-msgid "/_Message/Mode/MIME"
-msgstr "/_Ñúîáùåíèå/Ðåæèì/MIME"
+#: src/compose.c:706
+#, fuzzy
+msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/Èçãëåä/Êîäèðàíå/Êèðèëèöà (KOI8-_R)"
 
-#: src/compose.c:652
-msgid "/_Message/Mode/Inline"
-msgstr "/_Ñúîáùåíèå/Ðåæèì/Inline"
+#: src/compose.c:708
+#, fuzzy
+msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/Èçãëåä/Êîäèðàíå/Êèðèëèöà (KOI8-_R)"
 
-#: src/compose.c:655
-msgid "/_Message/_Priority"
-msgstr "/Ñúîáùåíèå/Ïðèîðèòåò"
+#: src/compose.c:710
+#, fuzzy
+msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/Èçãëåä/Êîäèðàíå/Êèðèëèöà (Windows-1251)"
 
-#: src/compose.c:656
-msgid "/_Message/Priority/_Highest"
-msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íàé-âèñîê"
+#: src/compose.c:714
+#, fuzzy
+msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/Èçãëåä/Êîäèðàíå/ßïîíñêè (ISO-2022-_JP)"
 
-#: src/compose.c:657
-msgid "/_Message/Priority/Hi_gh"
-msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Âèñîê"
+#: src/compose.c:718
+#, fuzzy
+msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/Èçãëåä/Êîäèðàíå/Îïðîñòåí êèòàéñêè (_GB2312)"
 
-#: src/compose.c:658
-msgid "/_Message/Priority/_Normal"
-msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íîðìàëåí"
+#: src/compose.c:720
+#, fuzzy
+msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/Èçãëåä/Êîäèðàíå/Îïðîñòåí êèòàéñêè (_GB2312)"
 
-#: src/compose.c:659
-msgid "/_Message/Priority/Lo_w"
-msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íèñúê"
+#: src/compose.c:722
+#, fuzzy
+msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/Èçãëåä/Êîäèðàíå/Òðàäèöèîíåí êèòàéñêè (_Big5)"
 
-#: src/compose.c:660
-msgid "/_Message/Priority/_Lowest"
-msgstr "/Ñúîáùåíèå/Ïðèîðèòåò/Íàé-íèñúê"
+#: src/compose.c:724
+#, fuzzy
+msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/Èçãëåä/Êîäèðàíå/Òðàäèöèîíåí êèòàéñêè (EUC-_TW)"
 
-#: src/compose.c:662
-msgid "/_Message/_Request Return Receipt"
-msgstr "/Ñúîáùåíèå/Ïîèñêàé ïîòâúðæäåíèå"
+#: src/compose.c:728
+#, fuzzy
+msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
+msgstr "/Èçãëåä/Êîäèðàíå/Êîðåéñêè (EUC-_KR)"
 
-#: src/compose.c:663
-msgid "/_Message/Remo_ve references"
-msgstr "/Ñúîáùåíèå/Ïðåìàõíè âðúçêèòå"
+#: src/compose.c:732
+#, fuzzy
+msgid "/_Options/Character _encoding/Thai (TIS-620)"
+msgstr "/Èçãëåä/Êîäèðàíå/Òàéëàíäñêè (TIS-620)"
 
-#: src/compose.c:664 src/mainwindow.c:642 src/messageview.c:261
-msgid "/_Tools"
-msgstr "/Èíñòðóìåíòè"
+#: src/compose.c:734
+#, fuzzy
+msgid "/_Options/Character _encoding/Thai (Windows-874)"
+msgstr "/Èçãëåä/Êîäèðàíå/Òàéëàíäñêè (Windows-874)"
 
-#: src/compose.c:665
+#: src/compose.c:738
 msgid "/_Tools/Show _ruler"
 msgstr "/Èíñòðóìåíòè/Ïîêàæè ëèíèéêàòà"
 
-#: src/compose.c:666 src/messageview.c:262
+#: src/compose.c:739 src/messageview.c:294
 msgid "/_Tools/_Address book"
 msgstr "/Èíñòðóìåíòè/_Àäðåñíèê"
 
-#: src/compose.c:667
+#: src/compose.c:740
 msgid "/_Tools/_Template"
 msgstr "/Èíñòðóìåíòè/_Øàáëîí"
 
-#: src/compose.c:668 src/mainwindow.c:663 src/messageview.c:277
+#: src/compose.c:741 src/mainwindow.c:754 src/messageview.c:319
 msgid "/_Tools/Actio_ns"
 msgstr "/Èñòðóìåíòè/Äåéñòâèÿ"
 
-#: src/compose.c:1398
+#: src/compose.c:1437
+msgid "Fw: multiple emails"
+msgstr ""
+
+#: src/compose.c:1773
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:1401 src/compose.c:4452 src/compose.c:5164
-#: src/headerview.c:56
+#: src/compose.c:1776 src/compose.c:4987 src/compose.c:5671
+#: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Íîâèíàðñêè ãðóïè:"
 
-#: src/compose.c:1404
+#: src/compose.c:1779
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:1699
+#: src/compose.c:2169
 msgid "Quote mark format error."
 msgstr "Ãðåøêà ïðè ôîðìàòà íà çíàêà çà öèòèðàíå."
 
-#: src/compose.c:1715
+#: src/compose.c:2185
 msgid "Message reply/forward format error."
 msgstr "Ãðåøêà ïðè reply/forward ôîðìàòà."
 
-#: src/compose.c:2043
+#: src/compose.c:2726
 #, c-format
 msgid "File %s is empty."
 msgstr "Ôàéëà %s å ïðàçåí."
 
-#: src/compose.c:2047
+#: src/compose.c:2730
 #, c-format
 msgid "Can't read %s."
 msgstr "Íå ìîãà äà ÷åòà %s."
 
-#: src/compose.c:2085
+#: src/compose.c:2757
 #, c-format
 msgid "Message: %s"
 msgstr "Ñúîáùåíèå: %s"
 
-#: src/compose.c:2780
+#: src/compose.c:3523
 msgid " [Edited]"
 msgstr "[Ðåäàêòèðàíî]"
 
-#: src/compose.c:2782
+#: src/compose.c:3529
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Ñú÷èíè ñúîáùåíèå%s"
 
-#: src/compose.c:2785
-#, c-format
-msgid "Compose message%s"
-msgstr "Ñú÷èíè ñúîáùåíèå%s"
+#: src/compose.c:3532
+#, fuzzy, c-format
+msgid "[no subject] - Compose message%s"
+msgstr "%s - Ñú÷èíè ñúîáùåíèå%s"
 
-#: src/compose.c:2809 src/compose.c:3058
+#: src/compose.c:3557 src/messageview.c:594
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1230,127 +1475,148 @@ msgstr ""
 "Àêàóíòà çà èçïðàùàíå íà ïîùà íå å óòî÷íåí.\n"
 "Ìîëÿ èçáåðåòå èçáåðåòå àêàóíò ïðåäè èçïðàùàíåòî."
 
-#: src/compose.c:2956
-msgid "Recipient is not specified."
-msgstr "Ïîëó÷àòåëÿ íå å ïîñî÷åí"
-
-#: src/compose.c:2964 src/messageview.c:492 src/prefs_account.c:767
-#: src/prefs_common.c:1019 src/toolbar.c:366 src/toolbar.c:413
+#: src/compose.c:3659 src/compose.c:3687 src/compose.c:3714
+#: src/prefs_account.c:1011 src/prefs_send.c:336 src/toolbar.c:387
+#: src/toolbar.c:434
 msgid "Send"
 msgstr "Èçïðàòè"
 
-#: src/compose.c:2965
+#: src/compose.c:3660
+msgid "The only recipient is the default CC address. Send anyway?"
+msgstr ""
+
+#: src/compose.c:3688
+msgid "The only recipient is the default BCC address. Send anyway?"
+msgstr ""
+
+#: src/compose.c:3702
+msgid "Recipient is not specified."
+msgstr "Ïîëó÷àòåëÿ íå å ïîñî÷åí"
+
+#: src/compose.c:3715
 msgid "Subject is empty. Send it anyway?"
 msgstr "Íÿìà Òåìà. Äà ïðàùàì ëè áåç Òåìà?"
 
-#: src/compose.c:2986
-msgid "Could not queue message for sending"
+#: src/compose.c:3741
+#, fuzzy
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Charset conversion failed."
 msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
 
-#: src/compose.c:2991
+#: src/compose.c:3744
+#, fuzzy
 msgid ""
-"The message was queued but could not be sent.\n"
-"Use \"Send queued messages\" from the main window to retry."
-msgstr ""
+"Could not queue message for sending:\n"
+"\n"
+"Signature failed."
+msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
 
-#: src/compose.c:3074 src/procmsg.c:1229 src/send_message.c:235
-#, c-format
-msgid "Error occurred while posting the message to %s ."
-msgstr "Ïîÿâè ñå ãðåøêà äîêàòî ïðàùàõ ñúîáùåíèåòî äî %s ."
+#: src/compose.c:3747
+#, fuzzy, c-format
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"%s."
+msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
 
-#: src/compose.c:3088
-msgid "Queueing"
-msgstr "Èç÷àêâàì"
+#: src/compose.c:3749
+#, fuzzy
+msgid "Could not queue message for sending."
+msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
 
-#: src/compose.c:3089
+#: src/compose.c:3764 src/compose.c:3793
 msgid ""
-"Error occurred while sending the message.\n"
-"Put this message into queue folder?"
+"The message was queued but could not be sent.\n"
+"Use \"Send queued messages\" from the main window to retry."
 msgstr ""
-"Ïîÿâè ñå ãðåøêà äîêàòî èçïðàùàõ ñúîáùåíèåòî.\n"
-"Äà ñëîæà ëè ñúîáùåíèåòî â ïàïêàòà íà ÷àêàùèòå?"
-
-#: src/compose.c:3095
-msgid "Can't queue the message."
-msgstr "Íå ìîãà äà íàðåäÿ ñúîáùåíèåòî."
-
-#: src/compose.c:3098 src/send_message.c:586 src/send_message.c:605
-msgid "Error occurred while sending the message."
-msgstr "Ïîÿâè ñå ãðåøêà äîêàòî èçïðàùàõ ñúîáùåíèåòî."
 
-#: src/compose.c:3111
-msgid "Can't save the message to Sent."
-msgstr "Íå ìîãà äà çàïàçÿ ñúîáùåíèåòî â ïàïêà Èçïðàòåíè."
-
-#: src/compose.c:3342
-#, c-format
-msgid "Could not find any key associated with currently selected key id `%s'."
+#: src/compose.c:4105
+#, fuzzy, c-format
+msgid ""
+"Can't convert the character encoding of the message \n"
+"to the specified %s charset.\n"
+"Send it as %s?"
 msgstr ""
+"Íå ìîãà äà ïðåîáðàçóâàì êîäèðàíåòî íà ñúîáùåíèåòî\n"
+"%s êúì %s.\n"
+"Äà ãî èçïðàòÿ ëè âñå ïàê?"
 
-#: src/compose.c:3448
+#: src/compose.c:4158
 #, c-format
 msgid ""
-"Can't convert the character encoding of the message from\n"
-"%s to %s.\n"
+"Line %d exceeds the line length limit (998 bytes).\n"
+"The contents of the message might be broken on the way to the delivery.\n"
+"\n"
 "Send it anyway?"
 msgstr ""
-"Íå ìîãà äà ïðåîáðàçóâàì êîäèðàíåòî íà ñúîáùåíèåòî\n"
-"%s êúì %s.\n"
-"Äà ãî èçïðàòÿ ëè âñå ïàê?"
 
-#: src/compose.c:3712
+#: src/compose.c:4335
 msgid "No account for sending mails available!"
 msgstr "Íÿìà àêàóíò çà èçïðàùàíÿ íà ìåéë!"
 
-#: src/compose.c:3722
+#: src/compose.c:4345
 msgid "No account for posting news available!"
 msgstr "Íÿìà àêàóíò çà èçïðàùàíå íà íîâèíè!"
 
-#: src/compose.c:4532 src/headerview.c:54 src/summary_search.c:149
+#: src/compose.c:5070 src/headerview.c:52 src/summary_search.c:211
 msgid "From:"
 msgstr "Îò"
 
-#: src/compose.c:4636 src/compose.c:4806 src/compose.c:5684
-msgid "MIME type"
+#: src/compose.c:5121
+#, fuzzy
+msgid "Mime type"
 msgstr "MIME òèï"
 
-#: src/compose.c:4637 src/compose.c:4807 src/mimeview.c:198
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:469
+#: src/compose.c:5127 src/compose.c:5358 src/mimeview.c:198
+#: src/plugins/pgpcore/select-keys.c:330 src/prefs_summary_column.c:86
+#: src/summaryview.c:471
 msgid "Size"
 msgstr "Ðàçìåð"
 
-#: src/compose.c:4701
+#: src/compose.c:5187
 msgid "Save Message to "
 msgstr "Çàïàçè ñúîáùåíèåòî â"
 
-#: src/compose.c:4721
-msgid "Select ..."
-msgstr " Èçáåðè ... "
+#: src/compose.c:5209 src/editjpilot.c:289 src/editldap.c:479
+#: src/editvcard.c:202 src/export.c:190 src/import.c:196 src/importmutt.c:243
+#: src/importpine.c:243 src/plugins/clamav/clamav_plugin_gtk.c:157
+#: src/plugins/spamassassin/spamassassin_gtk.c:347 src/prefs_account.c:1422
+#: src/prefs_account.c:1511 src/prefs_account.c:1911 src/prefs_spelling.c:244
+#, fuzzy
+msgid "_Browse"
+msgstr "Êàôÿâ"
+
+#: src/compose.c:5357 src/compose.c:6412
+msgid "MIME type"
+msgstr "MIME òèï"
 
-#: src/compose.c:4857 src/prefs_account.c:1355 src/prefs_customheader.c:188
-#: src/prefs_matcher.c:146
+#: src/compose.c:5422 src/prefs_account.c:1662 src/prefs_customheader.c:201
+#: src/prefs_matcher.c:154
 msgid "Header"
 msgstr "Çàãëàâêà"
 
-#: src/compose.c:4859
+#: src/compose.c:5424
 msgid "Attachments"
 msgstr "Ïðèêðåïêè"
 
-#: src/compose.c:4861
+#: src/compose.c:5426
 msgid "Others"
 msgstr "Äðóãè"
 
-#: src/compose.c:4876 src/headerview.c:57 src/prefs_template.c:177
-#: src/summary_search.c:163
+#: src/compose.c:5441 src/headerview.c:55 src/prefs_template.c:209
+#: src/summary_search.c:225
 msgid "Subject:"
 msgstr "Òåìà:"
 
-#: src/compose.c:5111 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1497 src/gtk/gtkaspell.c:2094 src/summaryview.c:4193
+#: src/compose.c:5625 src/exphtmldlg.c:462 src/gtk/colorlabel.c:294
+#: src/gtk/gtkaspell.c:1617 src/gtk/gtkaspell.c:2280 src/prefs_account.c:637
+#: src/summaryview.c:4450
 msgid "None"
 msgstr "Íèêîé"
 
-#: src/compose.c:5120
+#: src/compose.c:5635
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -1359,31 +1625,38 @@ msgstr ""
 "Ïðîâåðêàòà íà ïðàâîïèñà íå ìîæå äà áúäå ñòàðòèðàíà.\n"
 "%s"
 
-#: src/compose.c:5579
+#: src/compose.c:5870
+#, c-format
+msgid ""
+"The privacy system '%s' cannot be loaded. You will not be able to sign or "
+"encrypt this message."
+msgstr ""
+
+#: src/compose.c:6303
 msgid "Invalid MIME type."
 msgstr "Íåâàëèäåí MIME òèï."
 
-#: src/compose.c:5597
+#: src/compose.c:6321
 msgid "File doesn't exist or is empty."
 msgstr "Ôàéëà íå ñúùåñòâóâà èëè å ïðàçåí."
 
-#: src/compose.c:5666
+#: src/compose.c:6394
 msgid "Properties"
 msgstr "Ñâîéñòâà"
 
-#: src/compose.c:5711
+#: src/compose.c:6445
 msgid "Encoding"
 msgstr "Åíêîäèíã"
 
-#: src/compose.c:5742
+#: src/compose.c:6470
 msgid "Path"
 msgstr "Ïúò"
 
-#: src/compose.c:5743 src/prefs_toolbar.c:808
+#: src/compose.c:6471 src/prefs_toolbar.c:1064
 msgid "File name"
 msgstr "Èìå íà ôàéëà"
 
-#: src/compose.c:5920
+#: src/compose.c:6655
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1394,61 +1667,88 @@ msgstr ""
 "Ïðèíóäèòåëíî äà ïðåêðàòÿ ïðîöåñà?\n"
 "process group id: %d"
 
-#: src/compose.c:6229 src/inc.c:165 src/inc.c:266 src/toolbar.c:2046
-msgid "Offline warning"
-msgstr "Îôëàéí ïðåäóïðåæäåíèå"
+#: src/compose.c:6697
+msgid "Compose: input from monitoring process\n"
+msgstr ""
 
-#: src/compose.c:6230 src/inc.c:166 src/inc.c:267 src/toolbar.c:2047
-msgid "You're working offline. Override?"
-msgstr "Ðàáîòèòå îôëàéí. Îòìÿíà?"
+#: src/compose.c:6982
+#, fuzzy, c-format
+msgid ""
+"Could not queue message:\n"
+"\n"
+"%s."
+msgstr "Íå ìîãà äà ïîñòàâÿ ñúîáùåíèåòî â îïàøêàòà çà èçïðàùàíå"
+
+#: src/compose.c:7064
+#, fuzzy
+msgid "Could not save draft."
+msgstr "Íå ìîãà äà ÷åòà ôàéëà."
 
-#: src/compose.c:6348 src/compose.c:6369
+#: src/compose.c:7132 src/compose.c:7155
 msgid "Select file"
 msgstr "Èçáåðè ôàéë"
 
-#: src/compose.c:6412
+#: src/compose.c:7168
+#, fuzzy, c-format
+msgid "File '%s' could not be read."
+msgstr "Ïàïêàòà ìå ìîæå äà áúäå îòâîðåíà."
+
+#: src/compose.c:7170
+#, c-format
+msgid ""
+"File '%s' contained invalid characters\n"
+"for the current encoding, insertion may be incorrect."
+msgstr ""
+
+#: src/compose.c:7218
 msgid "Discard message"
 msgstr "Îòõâúðëè ñúîáùåíèåòî"
 
-#: src/compose.c:6413
-msgid "This message has been modified. discard it?"
+#: src/compose.c:7219
+#, fuzzy
+msgid "This message has been modified. Discard it?"
 msgstr "Òîâà ñúîáùåíèå áåøå ïðîìåíåíî. Äà ãî îòõâúðëÿ?"
 
-#: src/compose.c:6414
-msgid "Discard"
+#: src/compose.c:7220
+#, fuzzy
+msgid "_Discard"
 msgstr "Îòõâúðëè"
 
-#: src/compose.c:6414
-msgid "to Draft"
+#: src/compose.c:7220
+#, fuzzy
+msgid "_Save to Drafts"
 msgstr "Ïðè ×åðíîâèòå"
 
-#: src/compose.c:6449
-#, c-format
-msgid "Do you want to apply the template `%s' ?"
+#: src/compose.c:7264
+#, fuzzy, c-format
+msgid "Do you want to apply the template '%s' ?"
 msgstr "Èñêàòå äà ïðèëîæèòå òîçè øàáëîíà `%s' ?"
 
-#: src/compose.c:6451
+#: src/compose.c:7266
 msgid "Apply template"
 msgstr "Ïðèëîæè øàáëîí"
 
-#: src/compose.c:6452
-msgid "Replace"
+#: src/compose.c:7267
+#, fuzzy
+msgid "_Replace"
 msgstr "Çàìåíè"
 
-#: src/compose.c:6452 src/toolbar.c:417
-msgid "Insert"
+#: src/compose.c:7267
+#, fuzzy
+msgid "_Insert"
 msgstr "Âìúêíè"
 
-#: src/crash.c:141
-#, c-format
-msgid "Sylpheed process (%ld) received signal %ld"
+#: src/crash.c:142
+#, fuzzy, c-format
+msgid "Sylpheed-Claws process (%ld) received signal %ld"
 msgstr "Sylpheed ïðîöåñ (%ld) ïîëó÷è ñèãíàë %ld"
 
-#: src/crash.c:186
-msgid "Sylpheed has crashed"
+#: src/crash.c:188
+#, fuzzy
+msgid "Sylpheed-Claws has crashed"
 msgstr "Sylpheed ñå ñðèíà"
 
-#: src/crash.c:202
+#: src/crash.c:204
 #, c-format
 msgid ""
 "%s.\n"
@@ -1457,125 +1757,119 @@ msgstr ""
 "%s.\n"
 "Ìîëÿ äîêëàäâàéòå áúã âêëþ÷âàéêè äîëóïîñî÷åíàòà èíôîðìàöèÿ."
 
-#: src/crash.c:207
+#: src/crash.c:209
 msgid "Debug log"
 msgstr "Äíåâíèê çà äåáúã"
 
-#: src/crash.c:247
+#: src/crash.c:246
+msgid "Close"
+msgstr "Çàòâîðè"
+
+#: src/crash.c:251
 msgid "Save..."
 msgstr "Çàïàçè..."
 
-#: src/crash.c:252
+#: src/crash.c:256
 msgid "Create bug report"
 msgstr "Ñúçäàé ðàïîðò çà áúã"
 
-#: src/crash.c:301
+#: src/crash.c:303
 msgid "Save crash information"
 msgstr "Çàïàçè Èíôîðìàöèÿ çà áúãà"
 
-#: src/editaddress.c:143
+#: src/editaddress.c:153
 msgid "Add New Person"
 msgstr "Äîáàâè Íîâî Ëèöå"
 
-#: src/editaddress.c:144
+#: src/editaddress.c:154
 msgid "Edit Person Details"
 msgstr "Ðåäàêòèðàé ïîäðîáíîñòèòå çà Ëèöåòî"
 
-#: src/editaddress.c:285
+#: src/editaddress.c:316
 msgid "An E-Mail address must be supplied."
 msgstr "E-mail àäðåñ òðÿáâà äà áúäå ïîïúëíåí."
 
-#: src/editaddress.c:422
+#: src/editaddress.c:490
 msgid "A Name and Value must be supplied."
 msgstr "Èìå è Ñòîéíîñò òðÿáâà äà áúäàò ïîïúëíåíè."
 
-#: src/editaddress.c:480
+#: src/editaddress.c:560
 msgid "Edit Person Data"
 msgstr "Ðåäàêòèðàé äàííèòå çà Ëèöåòî"
 
-#: src/editaddress.c:577 src/expldifdlg.c:549 src/exporthtml.c:790
-#: src/ldif.c:826
+#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/ldif.c:858
 msgid "Display Name"
 msgstr "Ïîêàæè Èìåòî"
 
-#: src/editaddress.c:583 src/editaddress.c:587 src/ldif.c:834
+#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:866
 msgid "Last Name"
 msgstr "Ôàìèëèÿ"
 
-#: src/editaddress.c:584 src/editaddress.c:586 src/ldif.c:830
+#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:862
 msgid "First Name"
 msgstr "Èìå"
 
-#: src/editaddress.c:589
+#: src/editaddress.c:683
 msgid "Nickname"
 msgstr "Ïðÿêîð"
 
-#: src/editaddress.c:626 src/editaddress.c:674 src/editaddress.c:884
-#: src/editgroup.c:258 src/expldifdlg.c:562 src/exporthtml.c:629
-#: src/exporthtml.c:793 src/ldif.c:842
+#: src/editaddress.c:759 src/editaddress.c:807 src/editgroup.c:280
+#: src/expldifdlg.c:521 src/exporthtml.c:638 src/exporthtml.c:802
+#: src/ldif.c:874
 msgid "E-Mail Address"
 msgstr "E-Mail àäðåñ"
 
-#: src/editaddress.c:627 src/editaddress.c:683
+#: src/editaddress.c:760 src/editaddress.c:816
 msgid "Alias"
 msgstr "Ïñåâäîíèì"
 
-#: src/editaddress.c:710
-msgid "Move Up"
-msgstr "Íàãîðå"
-
-#: src/editaddress.c:713
-msgid "Move Down"
-msgstr "Íàäîëó"
-
-#: src/editaddress.c:719 src/editaddress.c:853
-msgid "Modify"
-msgstr "Ïðîìåíè"
-
-#: src/editaddress.c:725 src/editaddress.c:859 src/message_search.c:134
-#: src/summary_search.c:207
-msgid "Clear"
-msgstr "Èç÷èñòè"
-
-#: src/editaddress.c:775 src/editaddress.c:832 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:455
+#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:218
+#: src/prefs_matcher.c:490
 msgid "Value"
 msgstr "Ñòîéíîñò"
 
-#: src/editaddress.c:883
-msgid "Basic Data"
-msgstr "Îñíîâíè äàííè"
+#: src/editaddress.c:1070
+#, fuzzy
+msgid "User Data"
+msgstr "Ïîòðåáèòåëñêè ID"
+
+#: src/editaddress.c:1071
+#, fuzzy
+msgid "E-Mail Addresses"
+msgstr "E-Mail àäðåñ"
 
-#: src/editaddress.c:885
-msgid "User Attributes"
+#: src/editaddress.c:1072
+#, fuzzy
+msgid "Other Attributes"
 msgstr "Õàðàêòåðèñòèêè íà Ïîòðåáèòåëÿ"
 
-#: src/editbook.c:112
+#: src/editbook.c:113
 msgid "File appears to be Ok."
 msgstr "Ôàéëà èçãëåæäà íàðåä."
 
-#: src/editbook.c:115
+#: src/editbook.c:116
 msgid "File does not appear to be a valid address book format."
 msgstr "Ôàéëà íå èçãëåæäà äà å âúâ âàëèäåí ôîðìàò çà àäðåñíèê."
 
-#: src/editbook.c:118 src/editjpilot.c:192 src/editvcard.c:99
+#: src/editbook.c:119 src/editjpilot.c:203 src/editvcard.c:107
 msgid "Could not read file."
 msgstr "Íå ìîãà äà ÷åòà ôàéëà."
 
-#: src/editbook.c:152 src/editbook.c:264
+#: src/editbook.c:153 src/editbook.c:266
 msgid "Edit Addressbook"
 msgstr "Ðåäàêòèðàé Àäðåñíèêà"
 
-#: src/editbook.c:181 src/editjpilot.c:302 src/editvcard.c:217
+#: src/editbook.c:182 src/editjpilot.c:277 src/editvcard.c:190
 msgid " Check File "
 msgstr "Ïðîâåðè Ôàéë "
 
-#: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1572
+#: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
+#: src/importmutt.c:236 src/importpine.c:236 src/prefs_account.c:1879
 msgid "File"
 msgstr "Ôàéë"
 
-#: src/editbook.c:283
+#: src/editbook.c:285
 msgid "Add New Addressbook"
 msgstr "Äîáàâè íîâ Àäðåñíèê"
 
@@ -1583,215 +1877,309 @@ msgstr "
 msgid "A Group Name must be supplied."
 msgstr "Èìå íà Ãðóïà òðÿáâà äà å ïîïúëíåíî."
 
-#: src/editgroup.c:264
+#: src/editgroup.c:286
 msgid "Edit Group Data"
 msgstr "Ðåäàêòèðàé äàííè çà Ãðóïà"
 
-#: src/editgroup.c:292 src/exporthtml.c:626
+#: src/editgroup.c:314 src/exporthtml.c:635
 msgid "Group Name"
 msgstr "Èìå íà Ãðóïà"
 
-#: src/editgroup.c:311
+#: src/editgroup.c:333
 msgid "Addresses in Group"
 msgstr "Àäðåñè â Ãðóïàòà"
 
-#: src/editgroup.c:313
+#: src/editgroup.c:335
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:340
+#: src/editgroup.c:362
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:342
+#: src/editgroup.c:364
 msgid "Available Addresses"
 msgstr "Íàëè÷íè Àäðåñè"
 
-#: src/editgroup.c:402
+#: src/editgroup.c:425
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Ïðåìåñòè E-Mail Àäðåñèòå âúâ èëè îò Ãðóïà ñúñ áóòîíèòå ñòðåëêè"
 
-#: src/editgroup.c:450
+#: src/editgroup.c:473
 msgid "Edit Group Details"
 msgstr "Ðåäàêòèðàé ïîäðîáíîñòèòå çà Ãðóïà"
 
-#: src/editgroup.c:453
+#: src/editgroup.c:476
 msgid "Add New Group"
 msgstr "Äîáàâè Íîâà Ãðóïà"
 
-#: src/editgroup.c:503
+#: src/editgroup.c:526
 msgid "Edit folder"
 msgstr "Ðåäàêòèðàé ïàïêà"
 
-#: src/editgroup.c:503
+#: src/editgroup.c:526
 msgid "Input the new name of folder:"
 msgstr "Âúâåäè íîâî èìå çà ïàïêàòà:"
 
-#: src/editgroup.c:506 src/folderview.c:1877 src/folderview.c:1929
-#: src/folderview.c:2202
+#: src/editgroup.c:529 src/foldersel.c:532 src/imap_gtk.c:133 src/mh_gtk.c:127
 msgid "New folder"
 msgstr "Íîâà ïàïêà"
 
-#: src/editgroup.c:507 src/folderview.c:1878 src/folderview.c:1930
+#: src/editgroup.c:530 src/foldersel.c:533 src/mh_gtk.c:128
 msgid "Input the name of new folder:"
 msgstr "Âúâåäè èìå çà íîâàòà ïàïêà:"
 
-#: src/editjpilot.c:189
+#: src/editjpilot.c:200
 msgid "File does not appear to be JPilot format."
 msgstr "Ôàéëà íå èãëåæäà äà å â JPilot ôîðìàò."
 
-#: src/editjpilot.c:225
+#: src/editjpilot.c:212
 msgid "Select JPilot File"
 msgstr "Èçáåðè JPilot ôàéë"
 
-#: src/editjpilot.c:273 src/editjpilot.c:401
+#: src/editjpilot.c:248 src/editjpilot.c:378
 msgid "Edit JPilot Entry"
 msgstr "Ðåäàêòèðàé JPilot äàííè"
 
-#: src/editjpilot.c:314 src/editldap.c:440 src/editvcard.c:229
-#: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2153
-#: src/prefs_spelling.c:251
-msgid " ... "
-msgstr " ... "
-
-#: src/editjpilot.c:319
+#: src/editjpilot.c:294
 msgid "Additional e-Mail address item(s)"
 msgstr "Äîïúëíèòåëíè e-Mail àäðåñ àòðèáóòè"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:385
 msgid "Add New JPilot Entry"
 msgstr "Add New JPilot Entry"
 
-#: src/editldap.c:147
+#: src/editldap_basedn.c:143
+msgid "Edit LDAP - Select Search Base"
+msgstr "Ðåäàêòèðàé LDAP - Èçáåðè Search Base"
+
+#: src/editldap_basedn.c:163 src/editldap.c:413
+msgid "Hostname"
+msgstr "Hostname"
+
+#: src/editldap_basedn.c:173 src/editldap.c:432 src/ssl_manager.c:107
+msgid "Port"
+msgstr "Ïîðò"
+
+#: src/editldap_basedn.c:183 src/editldap.c:461
+msgid "Search Base"
+msgstr "Òúðñè Îñíîâíî"
+
+#: src/editldap_basedn.c:204
+msgid "Available Search Base(s)"
+msgstr "Âúçìîæíè Search Base(s)"
+
+#: src/editldap_basedn.c:294
+msgid "Could not read Search Base(s) from server - please set manually"
+msgstr "Could not read Search Base(s) from server - ìîëÿ âúâåäåòå ðú÷íî"
+
+#: src/editldap_basedn.c:298 src/editldap.c:267
+msgid "Could not connect to server"
+msgstr "Íå ìîãà äà ñå ñâúðæà ñúñ ñúðâúðà"
+
+#: src/editldap.c:148
 msgid "A Name must be supplied."
 msgstr "Èìåòî òðÿáâà äà å ïîïúëíåíî."
 
-#: src/editldap.c:159
+#: src/editldap.c:160
 msgid "A Hostname must be supplied for the server."
 msgstr "Èìåòî íà õîñòà òðÿáâà äà ñå ïðåäîñòàâè íà ñúðâúðà."
 
-#: src/editldap.c:172
+#: src/editldap.c:173
 msgid "At least one LDAP search attribute should be supplied."
 msgstr "Ïîíå åäèí LDAP àòðèáóò çà òúðñåíå òðÿáâà äà ñå ïðåäîñòàâè."
 
-#: src/editldap.c:262
+#: src/editldap.c:264
 msgid "Connected successfully to server"
 msgstr "Óñïåøíî ñå ñâúðçà ñúñ ñúðâúðà"
 
-#: src/editldap.c:265 src/editldap_basedn.c:295
-msgid "Could not connect to server"
-msgstr "Íå ìîãà äà ñå ñâúðæà ñúñ ñúðâúðà"
-
-#: src/editldap.c:313 src/editldap.c:824
+#: src/editldap.c:315 src/editldap.c:967
 msgid "Edit LDAP Server"
 msgstr "Ðåäàêòèðàé LDAP Ñúðâúð"
 
-#: src/editldap.c:404 src/editldap_basedn.c:161
-msgid "Hostname"
-msgstr "Hostname"
+#: src/editldap.c:408
+#, fuzzy
+msgid "A name that you wish to call the server."
+msgstr "Èìåòî íà õîñòà òðÿáâà äà ñå ïðåäîñòàâè íà ñúðâúðà."
 
-#: src/editldap.c:414 src/editldap_basedn.c:171 src/ssl_manager.c:106
-msgid "Port"
-msgstr "Ïîðò"
+#: src/editldap.c:423
+msgid ""
+"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
+"be appropriate for the \"mydomain.com\" organization. An IP address may also "
+"be used. You may specify \"localhost\" if running an LDAP server on the same "
+"computer as Sylpheed-Claws."
+msgstr ""
+
+#: src/editldap.c:447
+msgid "The port number that the server listens on. Port 389 is the default."
+msgstr ""
 
-#: src/editldap.c:427
+#: src/editldap.c:451
 msgid " Check Server "
 msgstr "Ïðîâåðè ñúðâúðà"
 
-#: src/editldap.c:432 src/editldap_basedn.c:181
-msgid "Search Base"
-msgstr "Òúðñè Îñíîâíî"
+#: src/editldap.c:456
+msgid "Press this button to test the connection to the server."
+msgstr ""
+
+#: src/editldap.c:471
+msgid ""
+"This specifies the name of the directory to be searched on the server. "
+"Examples include:\n"
+"  dc=sylpheed,dc=org\n"
+"  ou=people,dc=domainname,dc=com\n"
+"  o=Organization Name,c=Country\n"
+msgstr ""
+
+#: src/editldap.c:484
+msgid ""
+"Press this button to lookup the name of available directory names on the "
+"server."
+msgstr ""
 
-#: src/editldap.c:488
+#: src/editldap.c:535
 msgid "Search Attributes"
 msgstr "Àòðèáóòè çà òúðñåíå"
 
-#: src/editldap.c:496
+#: src/editldap.c:545
+msgid ""
+"A list of LDAP attribute names that should be searched when attempting to "
+"find a name or address."
+msgstr ""
+
+#: src/editldap.c:549
 msgid " Defaults "
 msgstr " Ïî ïîäðàçáèðàíå "
 
-#: src/editldap.c:501
+#: src/editldap.c:554
+msgid ""
+"This resets the attribute names to a default value that should find most "
+"names and addresses during a name or address search process."
+msgstr ""
+
+#: src/editldap.c:561
 msgid "Max Query Age (secs)"
 msgstr ""
 
-#: src/editldap.c:518
+#: src/editldap.c:577
+msgid ""
+"This defines the maximum period of time (in seconds) that an address search "
+"result is valid for address completion purposes. Search results are stored "
+"in a cache until this period of time has passed and then retired. This will "
+"improve the response time when attempting to search for the same name or "
+"address on subsequent address completion requests. The cache will be "
+"searched in preference to performing a new server search request. The "
+"default value of 600 seconds (10 minutes), should be sufficient for most "
+"servers. A larger value will reduce the search time for subsequent searches. "
+"This is useful for servers that have slow response times at the expense of "
+"more memory to cache results."
+msgstr ""
+
+#: src/editldap.c:595
 msgid "Include server in dynamic search"
 msgstr "Âêëþ÷è ñúðâúðà â äèíàìè÷íîòî òúðñåíå"
 
-#: src/editldap.c:565
+#: src/editldap.c:601
+msgid ""
+"Check this option to include this server for dynamic searches when using "
+"address completion."
+msgstr ""
+
+#: src/editldap.c:608
+msgid "Match names 'containing' search term"
+msgstr ""
+
+#: src/editldap.c:614
+msgid ""
+"Searches for names and addresses can be performed either using \"begins-with"
+"\" or \"contains\" search term. Check this option to perform a \"contains\" "
+"search; this type of search usually takes longer to complete. Note that for "
+"performance reasons, address completion uses \"begins-with\" for all "
+"searches against other address interfaces."
+msgstr ""
+
+#: src/editldap.c:669
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:575
+#: src/editldap.c:679
+msgid ""
+"The LDAP user account name to be used to connect to the server. This is "
+"usually only used for protected servers. This name is typically formatted "
+"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"performing a search."
+msgstr ""
+
+#: src/editldap.c:687
 msgid "Bind Password"
 msgstr "Bind Password"
 
-#: src/editldap.c:585
-msgid "Timeout (secs)"
+#: src/editldap.c:698
+msgid "The password to be used when connecting as the \"Bind DN\" user."
+msgstr ""
+
+#: src/editldap.c:704
+msgid "Timeout (secs)"
 msgstr "Ïðåêúñâàíå (ñåêóíäè)"
 
-#: src/editldap.c:600
+#: src/editldap.c:719
+msgid "The timeout period in seconds."
+msgstr ""
+
+#: src/editldap.c:723
 msgid "Maximum Entries"
 msgstr "Ìàêñèìóì Entries"
 
-#: src/editldap.c:625 src/prefs_account.c:763
+#: src/editldap.c:738
+msgid ""
+"The maximum number of entries that should be returned in the search result."
+msgstr ""
+
+#: src/editldap.c:754 src/prefs_account.c:1007
 msgid "Basic"
 msgstr "Îñíîâíè"
 
-#: src/editldap.c:626 src/message_search.c:133 src/summary_search.c:206
+#: src/editldap.c:755
 msgid "Search"
 msgstr "Òúðñåíå"
 
-#: src/editldap.c:627 src/summaryview.c:644
+#: src/editldap.c:756 src/gtk/quicksearch.c:385
 msgid "Extended"
 msgstr "Ðàçøèðåíè"
 
-#: src/editldap.c:829
+#: src/editldap.c:972
 msgid "Add New LDAP Server"
 msgstr "Äîáàâî íîâ LDAP Ñúðâúð"
 
-#: src/editldap_basedn.c:141
-msgid "Edit LDAP - Select Search Base"
-msgstr "Ðåäàêòèðàé LDAP - Èçáåðè Search Base"
-
-#: src/editldap_basedn.c:202
-msgid "Available Search Base(s)"
-msgstr "Âúçìîæíè Search Base(s)"
-
-#: src/editldap_basedn.c:291
-msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "Could not read Search Base(s) from server - ìîëÿ âúâåäåòå ðú÷íî"
-
-#: src/editvcard.c:96
+#: src/editvcard.c:104
 msgid "File does not appear to be vCard format."
 msgstr "Ôàéëà íà èçãëåæäà äà å â vCard ôîðìàò."
 
-#: src/editvcard.c:132
+#: src/editvcard.c:116
 msgid "Select vCard File"
 msgstr "Èçáåðè vCard Ôàéë"
 
-#: src/editvcard.c:188 src/editvcard.c:291
+#: src/editvcard.c:161 src/editvcard.c:266
 msgid "Edit vCard Entry"
 msgstr "Ðåäàêòèðàé vCard Âïèñâàíå"
 
-#: src/editvcard.c:296
+#: src/editvcard.c:271
 msgid "Add New vCard Entry"
 msgstr "Äîáàâè Íîâî vCard Âïèñâàíå"
 
-#: src/exphtmldlg.c:111
+#: src/exphtmldlg.c:112
 msgid "Please specify output directory and file to create."
 msgstr "Ìîëÿ èçáåðåòå èçõîäíà äèðåêòîðèÿ è ôàéë çà ñúçäàâàíå."
 
-#: src/exphtmldlg.c:114
+#: src/exphtmldlg.c:115
 msgid "Select stylesheet and formatting."
 msgstr "Èçáåðåòå stylesheet è formatting."
 
-#: src/exphtmldlg.c:117 src/expldifdlg.c:116
+#: src/exphtmldlg.c:118 src/expldifdlg.c:117
 msgid "File exported successfully."
 msgstr "Ôàéëà å åêñïîðòèðàí óñïåøíî."
 
-#: src/exphtmldlg.c:181
+#: src/exphtmldlg.c:183
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
@@ -1800,11 +2188,11 @@ msgstr ""
 "HTML Output äèðåêòîðèÿòà '%s'\n"
 "íå ñúùåñòâóâà. Äà ñúçäàì ëè íîâà?"
 
-#: src/exphtmldlg.c:184 src/expldifdlg.c:191
+#: src/exphtmldlg.c:186 src/expldifdlg.c:193
 msgid "Create Directory"
 msgstr "Ñúçäàé äèðåêòîðèÿ"
 
-#: src/exphtmldlg.c:193
+#: src/exphtmldlg.c:195
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -1813,112 +2201,110 @@ msgstr ""
 "Íå ìîãà äà ñúçäàì èçõîäíà äèðåêòîðèÿ çà HTML ôàéë:\n"
 "%s"
 
-#: src/exphtmldlg.c:195 src/expldifdlg.c:202
+#: src/exphtmldlg.c:197 src/expldifdlg.c:204
 msgid "Failed to Create Directory"
 msgstr "Íå ìîæàõ äà ñúçäàì äèðåêòîðèÿ"
 
-#: src/exphtmldlg.c:241
+#: src/exphtmldlg.c:244
 msgid "Error creating HTML file"
 msgstr "Ãðåøêà ïðè ïðè ñúçäàâàíåòî íà HTML ôàéë"
 
-#: src/exphtmldlg.c:361
-msgid "Select HTML Output File"
+#: src/exphtmldlg.c:330
+#, fuzzy
+msgid "Select HTML output file"
 msgstr "Èçáåðè HTML Output Ôàéë"
 
-#: src/exphtmldlg.c:435
+#: src/exphtmldlg.c:394
 msgid "HTML Output File"
 msgstr "HTML Output Ôàéë"
 
-#: src/exphtmldlg.c:496
+#: src/exphtmldlg.c:403 src/expldifdlg.c:415 src/export.c:196 src/import.c:202
+#: src/importldif.c:682
+#, fuzzy
+msgid "B_rowse"
+msgstr "Êàôÿâ"
+
+#: src/exphtmldlg.c:455
 msgid "Stylesheet"
 msgstr "Stylesheet"
 
-#: src/exphtmldlg.c:509 src/prefs_common.c:3463 src/prefs_common.c:3745
+#: src/exphtmldlg.c:468 src/prefs_summaries.c:352 src/prefs_summaries.c:662
 msgid "Default"
 msgstr "Ïî ïîäðàçáèðàíå"
 
-#: src/exphtmldlg.c:515
+#: src/exphtmldlg.c:474 src/plugins/pgpcore/sgpgme.c:130
 msgid "Full"
 msgstr "Ïúëíî èìå"
 
-#: src/exphtmldlg.c:521
+#: src/exphtmldlg.c:480
 msgid "Custom"
 msgstr "Ïîòðåáèòåëñêè"
 
-#: src/exphtmldlg.c:527
+#: src/exphtmldlg.c:486
 msgid "Custom-2"
 msgstr "Ïîòðåáèòåëñêè-2"
 
-#: src/exphtmldlg.c:533
+#: src/exphtmldlg.c:492
 msgid "Custom-3"
 msgstr "Ïîòðåáèòåëñêè-3"
 
-#: src/exphtmldlg.c:539
+#: src/exphtmldlg.c:498
 msgid "Custom-4"
 msgstr "Ïîòðåáèòåëñêè-4"
 
-#: src/exphtmldlg.c:553
+#: src/exphtmldlg.c:512
 msgid "Full Name Format"
 msgstr "Ïúëíî èìå"
 
-#: src/exphtmldlg.c:560
+#: src/exphtmldlg.c:519
 msgid "First Name, Last Name"
 msgstr "Ïúðâî Èìå, Ïîñëåäíî Èìå"
 
-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:525
 msgid "Last Name, First Name"
 msgstr "Ïîñëåäíî Èìå, Ïúðâî Èìå"
 
-#: src/exphtmldlg.c:580
+#: src/exphtmldlg.c:539
 msgid "Color Banding"
 msgstr "Öâåòîâà ãàìà"
 
-#: src/exphtmldlg.c:586
+#: src/exphtmldlg.c:545
 msgid "Format E-Mail Links"
 msgstr "Ôîðìàòèðàé E-Mail âðúçêèòå"
 
-#: src/exphtmldlg.c:592
+#: src/exphtmldlg.c:551
 msgid "Format User Attributes"
 msgstr "Õàðàêòåðèñòèêè íà Ïîòðåáèòåëÿ"
 
-#: src/exphtmldlg.c:647 src/expldifdlg.c:677 src/importldif.c:958
+#: src/exphtmldlg.c:606 src/expldifdlg.c:636 src/importldif.c:919
 msgid "File Name :"
 msgstr "Èìå íà Ôàéëà :"
 
-#: src/exphtmldlg.c:657
+#: src/exphtmldlg.c:616
 msgid "Open with Web Browser"
 msgstr "Îòâîðè ñ óåá áðàóçúð"
 
-#: src/exphtmldlg.c:689
+#: src/exphtmldlg.c:648
 msgid "Export Address Book to HTML File"
 msgstr "Èçíåñè Àäðåñíèêà â HTML ôàéë"
 
-#: src/exphtmldlg.c:723 src/expldifdlg.c:744 src/importldif.c:1032
-msgid "Prev"
-msgstr "Ïðåäèøåí"
-
-#: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
-#: src/toolbar.c:376 src/toolbar.c:467
-msgid "Next"
-msgstr "Ñëåäâàù"
-
-#: src/exphtmldlg.c:755 src/expldifdlg.c:776 src/importldif.c:1065
+#: src/exphtmldlg.c:714 src/expldifdlg.c:735 src/importldif.c:1026
 msgid "File Info"
 msgstr "Èíôîðìàöèÿ çà ôàéëà"
 
-#: src/exphtmldlg.c:756
+#: src/exphtmldlg.c:715
 msgid "Format"
 msgstr "Ôîðìàò"
 
-#: src/expldifdlg.c:110
+#: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."
 msgstr "Ìîëÿ èçáåðåòå èçõîäíà äèðåêòîðèÿ è LDIF ôàéë çà ñúçäàâàíå."
 
-#: src/expldifdlg.c:113
+#: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."
 msgstr ""
 
-#: src/expldifdlg.c:188
+#: src/expldifdlg.c:190
 #, c-format
 msgid ""
 "LDIF Output Directory '%s'\n"
@@ -1927,7 +2313,7 @@ msgstr ""
 "LDIF Output äèðåêòîðèÿòà '%s'\n"
 "íå ñúùåñòâóâà. Äà ñúçäàì ëè íîâà?"
 
-#: src/expldifdlg.c:200
+#: src/expldifdlg.c:202
 #, c-format
 msgid ""
 "Could not create output directory for LDIF file:\n"
@@ -1936,33 +2322,34 @@ msgstr ""
 "Íå ìîãà äà ñúçäàì èçõîäíà äèðåêòîðèÿ çà LDIF ôàéë:\n"
 "%s"
 
-#: src/expldifdlg.c:244
+#: src/expldifdlg.c:247
 msgid "Suffix was not supplied"
 msgstr "Suffix íå å ïðåäîñòàâåí"
 
-#: src/expldifdlg.c:246
+#: src/expldifdlg.c:249
 msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
 msgstr ""
 
-#: src/expldifdlg.c:264
+#: src/expldifdlg.c:267
 msgid "Error creating LDIF file"
 msgstr "Ãðåøêà ïðè ñúçäàâàíåòî íà LDIF ôàéë"
 
-#: src/expldifdlg.c:373
-msgid "Select LDIF Output File"
+#: src/expldifdlg.c:342
+#, fuzzy
+msgid "Select LDIF output file"
 msgstr "Èçáåðè LDIF Output Ôàéë"
 
-#: src/expldifdlg.c:447
+#: src/expldifdlg.c:406
 msgid "LDIF Output File"
 msgstr "LDIF Output ôàéë"
 
-#: src/expldifdlg.c:508
+#: src/expldifdlg.c:467
 msgid "Suffix"
 msgstr ""
 
-#: src/expldifdlg.c:520
+#: src/expldifdlg.c:479
 msgid ""
 "The suffix is&nb