aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.ja3
-rw-r--r--Makefile.am2
-rw-r--r--configure.in6
-rw-r--r--intl/ChangeLog4
-rw-r--r--intl/Makefile.in493
-rw-r--r--intl/VERSION1
-rw-r--r--intl/bindtextdom.c363
-rwxr-xr-xintl/config.charset608
-rw-r--r--intl/dcgettext.c56
-rw-r--r--intl/dcigettext.c1219
-rw-r--r--intl/dcngettext.c57
-rw-r--r--intl/dgettext.c58
-rw-r--r--intl/dngettext.c59
-rw-r--r--intl/eval-plural.h108
-rw-r--r--intl/explodename.c185
-rw-r--r--intl/finddomain.c192
-rw-r--r--intl/gettext.c63
-rw-r--r--intl/gettextP.h215
-rw-r--r--intl/gmo.h149
-rw-r--r--intl/hash-string.h48
-rw-r--r--intl/intl-compat.c131
-rw-r--r--intl/l10nflist.c421
-rw-r--r--intl/libgnuintl.h.in383
-rw-r--r--intl/loadinfo.h145
-rw-r--r--intl/loadmsgcat.c1420
-rw-r--r--intl/localcharset.c398
-rw-r--r--intl/localcharset.h42
-rw-r--r--intl/locale.alias78
-rw-r--r--intl/localealias.c414
-rw-r--r--intl/localename.c1142
-rw-r--r--intl/log.c98
-rw-r--r--intl/ngettext.c65
-rw-r--r--intl/os2compat.c98
-rw-r--r--intl/os2compat.h46
-rw-r--r--intl/osdep.c24
-rw-r--r--intl/plural-exp.c154
-rw-r--r--intl/plural-exp.h118
-rw-r--r--intl/plural.c1583
-rw-r--r--intl/plural.y381
-rw-r--r--intl/printf-args.c119
-rw-r--r--intl/printf-args.h137
-rw-r--r--intl/printf-parse.c537
-rw-r--r--intl/printf-parse.h75
-rw-r--r--intl/printf.c371
-rw-r--r--intl/ref-add.sin31
-rw-r--r--intl/ref-del.sin26
-rw-r--r--intl/relocatable.c449
-rw-r--r--intl/relocatable.h77
-rw-r--r--intl/textdomain.c141
-rw-r--r--intl/vasnprintf.c887
-rw-r--r--intl/vasnprintf.h61
-rw-r--r--intl/vasnwprintf.h46
-rw-r--r--intl/wprintf-parse.h75
-rw-r--r--intl/xsize.h109
-rw-r--r--po/Makefile.in.in426
-rw-r--r--po/bg.po262
-rw-r--r--po/cs.po262
-rw-r--r--po/da.po262
-rw-r--r--po/de.po262
-rw-r--r--po/el.po262
-rw-r--r--po/es.po262
-rw-r--r--po/et.po262
-rw-r--r--po/fr.po262
-rw-r--r--po/gl.po262
-rw-r--r--po/hr.po262
-rw-r--r--po/hu.po262
-rw-r--r--po/it.po262
-rw-r--r--po/ja.po262
-rw-r--r--po/ko.po262
-rw-r--r--po/nl.po262
-rw-r--r--po/pl.po262
-rw-r--r--po/pt_BR.po262
-rw-r--r--po/ro.po262
-rw-r--r--po/ru.po262
-rw-r--r--po/sk.po262
-rw-r--r--po/sl.po262
-rw-r--r--po/sr.po262
-rw-r--r--po/sv.po262
-rw-r--r--po/tr.po262
-rw-r--r--po/uk.po262
-rw-r--r--po/zh_CN.po262
-rw-r--r--po/zh_TW.Big5.po262
83 files changed, 4136 insertions, 17538 deletions
diff --git a/ChangeLog b/ChangeLog
index e25a2eb3..a1851fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2005-02-07
* src/*.c: replaced intl.h with glib/gi18n.h (thanks to Yoichi Imai).
+ * configure.in
+ Makefile.am
+ po/Makefile.in.in: use AM_GLIB_GNU_GETTEXT. Removed intl/.
2005-02-04
diff --git a/ChangeLog.ja b/ChangeLog.ja
index b79a1e9a..97945dc2 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,6 +1,9 @@
2005-02-07
* src/*.c: intl.h を glib/gi18n.h で置き換えた(今井さん thanks)。
+ * configure.in
+ Makefile.am
+ po/Makefile.in.in: AM_GLIB_GNU_GETTEXT を使用し、 intl/ を削除。
2005-02-04
diff --git a/Makefile.am b/Makefile.am
index 4438434a..470bfc2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = ac po intl src manual faq
+SUBDIRS = ac po src manual faq
EXTRA_DIST = config.rpath \
ChangeLog.ja \
diff --git a/configure.in b/configure.in
index 8bde23ce..c30061a2 100644
--- a/configure.in
+++ b/configure.in
@@ -75,8 +75,9 @@ ALL_LINGUAS="bg cs da de el es et fr gl hr hu it ja ko nl pl pt_BR ro ru sk sl s
GETTEXT_PACKAGE=sylpheed
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
-dnl AM_GLIB_GNU_GETTEXT
-AM_GNU_GETTEXT
+
+AM_GLIB_GNU_GETTEXT
+dnl AM_GNU_GETTEXT
dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
localedir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(localedir)
@@ -328,7 +329,6 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
AC_OUTPUT([
Makefile
sylpheed.spec
-intl/Makefile
ac/Makefile
po/Makefile.in
src/version.h
diff --git a/intl/ChangeLog b/intl/ChangeLog
deleted file mode 100644
index 75129192..00000000
--- a/intl/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2004-01-29 GNU <bug-gnu-gettext@gnu.org>
-
- * Version 0.14.1 released.
-
diff --git a/intl/Makefile.in b/intl/Makefile.in
deleted file mode 100644
index 05f15329..00000000
--- a/intl/Makefile.in
+++ /dev/null
@@ -1,493 +0,0 @@
-# Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = $(srcdir)
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
--Dset_relocation_prefix=libintl_set_relocation_prefix \
--Drelocate=libintl_relocate \
--DDEPENDS_ON_LIBICONV=1 @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = \
- gmo.h \
- gettextP.h \
- hash-string.h \
- loadinfo.h \
- plural-exp.h \
- eval-plural.h \
- localcharset.h \
- relocatable.h \
- xsize.h \
- printf-args.h printf-args.c \
- printf-parse.h wprintf-parse.h printf-parse.c \
- vasnprintf.h vasnwprintf.h vasnprintf.c \
- os2compat.h \
- libgnuintl.h.in
-SOURCES = \
- bindtextdom.c \
- dcgettext.c \
- dgettext.c \
- gettext.c \
- finddomain.c \
- loadmsgcat.c \
- localealias.c \
- textdomain.c \
- l10nflist.c \
- explodename.c \
- dcigettext.c \
- dcngettext.c \
- dngettext.c \
- ngettext.c \
- plural.y \
- plural-exp.c \
- localcharset.c \
- relocatable.c \
- localename.c \
- log.c \
- printf.c \
- osdep.c \
- os2compat.c \
- intl-compat.c
-OBJECTS = \
- bindtextdom.$lo \
- dcgettext.$lo \
- dgettext.$lo \
- gettext.$lo \
- finddomain.$lo \
- loadmsgcat.$lo \
- localealias.$lo \
- textdomain.$lo \
- l10nflist.$lo \
- explodename.$lo \
- dcigettext.$lo \
- dcngettext.$lo \
- dngettext.$lo \
- ngettext.$lo \
- plural.$lo \
- plural-exp.$lo \
- localcharset.$lo \
- relocatable.$lo \
- localename.$lo \
- log.$lo \
- printf.$lo \
- osdep.$lo \
- intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
-DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
-libgnuintl.h_vms Makefile.vms \
-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
-
-all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:
-
-libintl.a libgnuintl.a: $(OBJECTS)
- rm -f $@
- $(AR) cru $@ $(OBJECTS)
- $(RANLIB) $@
-
-libintl.la libgnuintl.la: $(OBJECTS)
- $(LIBTOOL) --mode=link \
- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
- $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
- -rpath $(libdir) \
- -no-undefined
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=7
-LTV_REVISION=0
-LTV_AGE=4
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-
-.c.o:
- $(COMPILE) $<
-
-.y.c:
- $(YACC) $(YFLAGS) --output $@ $<
- rm -f $*.h
-
-bindtextdom.lo: $(srcdir)/bindtextdom.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
-dcgettext.lo: $(srcdir)/dcgettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
-dgettext.lo: $(srcdir)/dgettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
-gettext.lo: $(srcdir)/gettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
-finddomain.lo: $(srcdir)/finddomain.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
-loadmsgcat.lo: $(srcdir)/loadmsgcat.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
-localealias.lo: $(srcdir)/localealias.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
-textdomain.lo: $(srcdir)/textdomain.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
-l10nflist.lo: $(srcdir)/l10nflist.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
-explodename.lo: $(srcdir)/explodename.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
-dcigettext.lo: $(srcdir)/dcigettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
-dcngettext.lo: $(srcdir)/dcngettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
-dngettext.lo: $(srcdir)/dngettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
-ngettext.lo: $(srcdir)/ngettext.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
-plural.lo: $(srcdir)/plural.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
-plural-exp.lo: $(srcdir)/plural-exp.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
-localcharset.lo: $(srcdir)/localcharset.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
-relocatable.lo: $(srcdir)/relocatable.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
-localename.lo: $(srcdir)/localename.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
-log.lo: $(srcdir)/log.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
-printf.lo: $(srcdir)/printf.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
-osdep.lo: $(srcdir)/osdep.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
-intl-compat.lo: $(srcdir)/intl-compat.c
- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
-
-ref-add.sed: $(srcdir)/ref-add.sin
- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
- mv t-ref-add.sed ref-add.sed
-ref-del.sed: $(srcdir)/ref-del.sin
- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
- mv t-ref-del.sed ref-del.sed
-
-INCLUDES = -I. -I$(srcdir) -I..
-
-libgnuintl.h: $(srcdir)/libgnuintl.h.in
- sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
- < $(srcdir)/libgnuintl.h.in > libgnuintl.h
-
-libintl.h: libgnuintl.h
- cp libgnuintl.h libintl.h
-
-charset.alias: $(srcdir)/config.charset
- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
- mv t-$@ $@
-
-check: all
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
- $(LIBTOOL) --mode=install \
- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
- if test "@RELOCATABLE@" = yes; then \
- dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
- if test -n "$$dependencies"; then \
- rm -f $(DESTDIR)$(libdir)/libintl.la; \
- fi; \
- fi; \
- else \
- : ; \
- fi
- if test "$(PACKAGE)" = "gettext-tools" \
- && test '@USE_INCLUDED_LIBINTL@' = no; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir); \
- $(LIBTOOL) --mode=install \
- $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
- $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
- $(LIBTOOL) --mode=uninstall \
- rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
- else \
- : ; \
- fi
- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
- dest=$(DESTDIR)$(libdir)/charset.alias; \
- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
- orig=$(DESTDIR)$(libdir)/charset.alias; \
- sed -f ref-add.sed $$orig > $$temp; \
- $(INSTALL_DATA) $$temp $$dest; \
- rm -f $$temp; \
- else \
- if test @GLIBC21@ = no; then \
- orig=charset.alias; \
- sed -f ref-add.sed $$orig > $$temp; \
- $(INSTALL_DATA) $$temp $$dest; \
- rm -f $$temp; \
- fi; \
- fi; \
- $(mkinstalldirs) $(DESTDIR)$(localedir); \
- test -f $(DESTDIR)$(localedir)/locale.alias \
- && orig=$(DESTDIR)$(localedir)/locale.alias \
- || orig=$(srcdir)/locale.alias; \
- temp=$(DESTDIR)$(localedir)/t-locale.alias; \
- dest=$(DESTDIR)$(localedir)/locale.alias; \
- sed -f ref-add.sed $$orig > $$temp; \
- $(INSTALL_DATA) $$temp $$dest; \
- rm -f $$temp; \
- else \
- : ; \
- fi
-install-data: all
- if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
- $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
- $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
- dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
- for file in $$dists; do \
- $(INSTALL_DATA) $(srcdir)/$$file \
- $(DESTDIR)$(gettextsrcdir)/$$file; \
- done; \
- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
- dists="$(DISTFILES.generated)"; \
- for file in $$dists; do \
- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
- $(INSTALL_DATA) $$dir/$$file \
- $(DESTDIR)$(gettextsrcdir)/$$file; \
- done; \
- dists="$(DISTFILES.obsolete)"; \
- for file in $$dists; do \
- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
- done; \
- else \
- : ; \
- fi
-
-install-strip: install
-
-installdirs:
- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
- else \
- : ; \
- fi
- if test "$(PACKAGE)" = "gettext-tools" \
- && test '@USE_INCLUDED_LIBINTL@' = no; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir); \
- else \
- : ; \
- fi
- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
- $(mkinstalldirs) $(DESTDIR)$(localedir); \
- else \
- : ; \
- fi
- if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
- else \
- : ; \
- fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
- rm -f $(DESTDIR)$(includedir)/libintl.h; \
- $(LIBTOOL) --mode=uninstall \
- rm -f $(DESTDIR)$(libdir)/libintl.$la; \
- else \
- : ; \
- fi
- if test "$(PACKAGE)" = "gettext-tools" \
- && test '@USE_INCLUDED_LIBINTL@' = no; then \
- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
- else \
- : ; \
- fi
- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
- dest=$(DESTDIR)$(libdir)/charset.alias; \
- sed -f ref-del.sed $$dest > $$temp; \
- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
- rm -f $$dest; \
- else \
- $(INSTALL_DATA) $$temp $$dest; \
- fi; \
- rm -f $$temp; \
- fi; \
- if test -f $(DESTDIR)$(localedir)/locale.alias; then \
- temp=$(DESTDIR)$(localedir)/t-locale.alias; \
- dest=$(DESTDIR)$(localedir)/locale.alias; \
- sed -f ref-del.sed $$dest > $$temp; \
- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
- rm -f $$dest; \
- else \
- $(INSTALL_DATA) $$temp $$dest; \
- fi; \
- rm -f $$temp; \
- fi; \
- else \
- : ; \
- fi
- if test "$(PACKAGE)" = "gettext-tools"; then \
- for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
- done; \
- else \
- : ; \
- fi
-
-info dvi ps pdf html:
-
-$(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
-dcigettext.$lo: $(srcdir)/eval-plural.h
-localcharset.$lo: $(srcdir)/localcharset.h
-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-ctags: CTAGS
-
-CTAGS: $(HEADERS) $(SOURCES)
- here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
- rm -f *.a *.la *.o *.obj *.lo core core.*
- rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
- rm -f -r .libs _libs
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile ID TAGS
- if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
- rm -f ChangeLog.inst $(DISTFILES.normal); \
- else \
- : ; \
- fi
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
- if test "$(PACKAGE)" = "gettext-tools"; then \
- : ; \
- else \
- if test "$(PACKAGE)" = "gettext-runtime"; then \
- additional="$(DISTFILES.gettext)"; \
- else \
- additional="$(DISTFILES.normal)"; \
- fi; \
- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
- for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
- cp -p $$dir/$$file $(distdir); \
- done; \
- fi
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status
-# This would be more efficient, but doesn't work any more with autoconf-2.57,
-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
-# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# 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:
diff --git a/intl/VERSION b/intl/VERSION
deleted file mode 100644
index b4b846ca..00000000
--- a/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.14.1
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
deleted file mode 100644
index dcdc4008..00000000
--- a/intl/bindtextdom.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
- Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications. */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc. */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
- names than the internal variables in GNU libc, otherwise programs
- using libintl.a cannot be linked statically. */
-#if !defined _LIBC
-# define _nl_default_dirname libintl_nl_default_dirname
-# define _nl_domain_bindings libintl_nl_domain_bindings
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs. */
-extern const char _nl_default_dirname[];
-#ifdef _LIBC
-extern const char _nl_default_dirname_internal[] attribute_hidden;
-#else
-# define INTUSE(name) name
-#endif
-
-/* List with bindings of specific domains. */
-extern struct binding *_nl_domain_bindings;
-
-/* Lock variable to protect the global data in the gettext implementation. */
-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
-
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
-# ifndef strdup
-# define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN libintl_bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
-#endif
-
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
- to be used for the DOMAINNAME message catalog.
- If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
- modified, only the current value is returned.
- If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
- modified nor returned. */
-static void
-set_binding_values (const char *domainname,
- const char **dirnamep, const char **codesetp)
-{
- struct binding *binding;
- int modified;
-
- /* Some sanity checks. */
- if (domainname == NULL || domainname[0] == '\0')
- {
- if (dirnamep)
- *dirnamep = NULL;
- if (codesetp)
- *codesetp = NULL;
- return;
- }
-
- __libc_rwlock_wrlock (_nl_state_lock);
-
- modified = 0;
-
- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
- {
- int compare = strcmp (domainname, binding->domainname);
- if (compare == 0)
- /* We found it! */
- break;
- if (compare < 0)
- {
- /* It is not in the list. */
- binding = NULL;
- break;
- }
- }
-
- if (binding != NULL)
- {
- if (dirnamep)
- {
- const char *dirname = *dirnamep;
-
- if (dirname == NULL)
- /* The current binding has be to returned. */
- *dirnamep = binding->dirname;
- else
- {
- /* The domain is already bound. If the new value and the old
- one are equal we simply do nothing. Otherwise replace the
- old binding. */
- char *result = binding->dirname;
- if (strcmp (dirname, result) != 0)
- {
- if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
- result = (char *) INTUSE(_nl_default_dirname);
- else
- {
-#if defined _LIBC || defined HAVE_STRDUP
- result = strdup (dirname);
-#else
- size_t len = strlen (dirname) + 1;
- result = (char *) malloc (len);
- if (__builtin_expect (result != NULL, 1))
- memcpy (result, dirname, len);
-#endif
- }
-
- if (__builtin_expect (result != NULL, 1))
- {
- if (binding->dirname != INTUSE(_nl_default_dirname))
- free (binding->dirname);
-
- binding->dirname = result;
- modified = 1;
- }
- }
- *dirnamep = result;
- }
- }
-
- if (codesetp)
- {
- const char *codeset = *codesetp;
-
- if (codeset == NULL)
- /* The current binding has be to returned. */
- *codesetp = binding->codeset;
- else
- {
- /* The domain is already bound. If the new value and the old
- one are equal we simply do nothing. Otherwise replace the
- old binding. */
- char *result = binding->codeset;
- if (result == NULL || strcmp (codeset, result) != 0)
- {
-#if defined _LIBC || defined HAVE_STRDUP
- result = strdup (codeset);
-#else
- size_t len = strlen (codeset) + 1;
- result = (char *) malloc (len);
- if (__builtin_expect (result != NULL, 1))
- memcpy (result, codeset, len);
-#endif
-
- if (__builtin_expect (result != NULL, 1))
- {
- if (binding->codeset != NULL)
- free (binding->codeset);
-
- binding->codeset = result;
- binding->codeset_cntr++;
- modified = 1;
- }
- }
- *codesetp = result;
- }
- }
- }
- else if ((dirnamep == NULL || *dirnamep == NULL)
- && (codesetp == NULL || *codesetp == NULL))
- {
- /* Simply return the default values. */
- if (dirnamep)
- *dirnamep = INTUSE(_nl_default_dirname);
- if (codesetp)
- *codesetp = NULL;
- }
- else
- {
- /* We have to create a new binding. */
- size_t len = strlen (domainname) + 1;
- struct binding *new_binding =
- (struct binding *) malloc (offsetof (struct binding, domainname) + len);
-
- if (__builtin_expect (new_binding == NULL, 0))
- goto failed;
-
- memcpy (new_binding->domainname, domainname, len);
-
- if (dirnamep)
- {
- const char *dirname = *dirnamep;
-
- if (dirname == NULL)
- /* The default value. */
- dirname = INTUSE(_nl_default_dirname);
- else
- {
- if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
- dirname = INTUSE(_nl_default_dirname);
- else
- {
- char *result;
-#if defined _LIBC || defined HAVE_STRDUP
- result = strdup (dirname);
- if (__builtin_expect (result == NULL, 0))
- goto failed_dirname;
-#else
- size_t len = strlen (dirname) + 1;
- result = (char *) malloc (len);
- if (__builtin_expect (result == NULL, 0))
- goto failed_dirname;
- memcpy (result, dirname, len);
-#endif
- dirname = result;
- }
- }
- *dirnamep = dirname;
- new_binding->dirname = (char *) dirname;
- }
- else
- /* The default value. */
- new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
-
- new_binding->codeset_cntr = 0;
-
- if (codesetp)
- {
- const char *codeset = *codesetp;
-
- if (codeset != NULL)
- {
- char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
- result = strdup (codeset);
- if (__builtin_expect (result == NULL, 0))
- goto failed_codeset;
-#else
- size_t len = strlen (codeset) + 1;
- result = (char *) malloc (len);
- if (__builtin_expect (result == NULL, 0))
- goto failed_codeset;
- memcpy (result, codeset, len);
-#endif
- codeset = result;
- new_binding->codeset_cntr++;
- }
- *codesetp = codeset;
- new_binding->codeset = (char *) codeset;
- }
- else
- new_binding->codeset = NULL;
-
- /* Now enqueue it. */
- if (_nl_domain_bindings == NULL
- || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
- {
- new_binding->next = _nl_domain_bindings;
- _nl_domain_bindings = new_binding;
- }
- else
- {
- binding = _nl_domain_bindings;
- while (binding->next != NULL
- && strcmp (domainname, binding->next->domainname) > 0)
- binding = binding->next;
-
- new_binding->next = binding->next;
- binding->next = new_binding;
- }
-
- modified = 1;
-
- /* Here we deal with memory allocation failures. */
- if (0)
- {
- failed_codeset:
- if (new_binding->dirname != INTUSE(_nl_default_dirname))
- free (new_binding->dirname);
- failed_dirname:
- free (new_binding);
- failed:
- if (dirnamep)
- *dirnamep = NULL;
- if (codesetp)
- *codesetp = NULL;
- }
- }
-
- /* If we modified any binding, we flush the caches. */
- if (modified)
- ++_nl_msg_cat_cntr;
-
- __libc_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
- in DIRNAME rather than in the system locale data base. */
-char *
-BINDTEXTDOMAIN (const char *domainname, const char *dirname)
-{
- set_binding_values (domainname, &dirname, NULL);
- return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
- DOMAINNAME message catalog will be returned. */
-char *
-BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
-{
- set_binding_values (domainname, NULL, &codeset);
- return (char *) codeset;
-}
-
-#ifdef _LIBC
-/* Aliases for function names in GNU C Library. */
-weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
-#endif
diff --git a/intl/config.charset b/intl/config.charset
deleted file mode 100755
index 43d45fb7..00000000
--- a/intl/config.charset
+++ /dev/null
@@ -1,608 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-# Copyright (C) 2000-2004 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-#
-# The table consists of lines of the form
-# ALIAS CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-# name MIME? used by which systems
-# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
-# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
-# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
-# ISO-8859-3 Y glibc solaris
-# ISO-8859-4 Y osf solaris freebsd darwin
-# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
-# ISO-8859-6 Y glibc aix hpux solaris
-# ISO-8859-7 Y glibc aix hpux irix osf solaris
-# ISO-8859-8 Y glibc aix hpux osf solaris
-# ISO-8859-9 Y glibc aix hpux irix osf solaris
-# ISO-8859-13 glibc
-# ISO-8859-14 glibc
-# ISO-8859-15 glibc aix osf solaris freebsd
-# KOI8-R Y glibc solaris freebsd darwin
-# KOI8-U Y glibc freebsd darwin
-# KOI8-T glibc
-# CP437 dos
-# CP775 dos
-# CP850 aix osf dos
-# CP852 dos
-# CP855 dos
-# CP856 aix
-# CP857 dos
-# CP861 dos
-# CP862 dos
-# CP864 dos
-# CP865 dos
-# CP866 freebsd darwin dos
-# CP869 dos
-# CP874 woe32 dos
-# CP922 aix
-# CP932 aix woe32 dos
-# CP943 aix
-# CP949 osf woe32 dos
-# CP950 woe32 dos
-# CP1046 aix
-# CP1124 aix
-# CP1125 dos
-# CP1129 aix
-# CP1250 woe32
-# CP1251 glibc solaris darwin woe32
-# CP1252 aix woe32
-# CP1253 woe32
-# CP1254 woe32
-# CP1255 glibc woe32
-# CP1256 woe32
-# CP1257 woe32
-# GB2312 Y glibc aix hpux irix solaris freebsd darwin
-# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
-# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
-# EUC-TW glibc aix hpux irix osf solaris
-# BIG5 Y glibc aix hpux osf solaris freebsd darwin
-# BIG5-HKSCS glibc solaris
-# GBK glibc aix osf solaris woe32 dos
-# GB18030 glibc solaris
-# SHIFT_JIS Y hpux osf solaris freebsd darwin
-# JOHAB glibc solaris woe32
-# TIS-620 glibc aix hpux osf solaris
-# VISCII Y glibc
-# TCVN5712-1 glibc
-# GEORGIAN-PS glibc
-# HP-ROMAN8 hpux
-# HP-ARABIC8 hpux
-# HP-GREEK8 hpux
-# HP-HEBREW8 hpux
-# HP-TURKISH8 hpux
-# HP-KANA8 hpux
-# DEC-KANJI osf
-# DEC-HANYU osf
-# UTF-8 Y glibc aix hpux osf solaris
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
- linux-gnulibc1*)
- # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "C ASCII"
- echo "POSIX ASCII"
- for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
- en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
- en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
- es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
- et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
- fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
- it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
- sv_FI sv_SE; do
- echo "$l ISO-8859-1"
- echo "$l.iso-8859-1 ISO-8859-1"
- echo "$l.iso-8859-15 ISO-8859-15"
- echo "$l.iso-8859-15@euro ISO-8859-15"
- echo "$l@euro ISO-8859-15"
- echo "$l.cp-437 CP437"
- echo "$l.cp-850 CP850"
- echo "$l.cp-1252 CP1252"
- echo "$l.cp-1252@euro CP1252"
- #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
- echo "$l.utf-8 UTF-8"
- echo "$l.utf-8@euro UTF-8"
- done
- for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
- sl_SI sr sr_CS sr_YU; do
- echo "$l ISO-8859-2"
- echo "$l.iso-8859-2 ISO-8859-2"
- echo "$l.cp-852 CP852"
- echo "$l.cp-1250 CP1250"
- echo "$l.utf-8 UTF-8"
- done
- for l in mk mk_MK ru ru_RU; do
- echo "$l ISO-8859-5"
- echo "$l.iso-8859-5 ISO-8859-5"
- echo "$l.koi8-r KOI8-R"
- echo "$l.cp-866 CP866"
- echo "$l.cp-1251 CP1251"
- echo "$l.utf-8 UTF-8"
- done
- for l in ar ar_SA; do
- echo "$l ISO-8859-6"
- echo "$l.iso-8859-6 ISO-8859-6"
- echo "$l.cp-864 CP864"
- #echo "$l.cp-868 CP868" # not a commonly used encoding
- echo "$l.cp-1256 CP1256"
- echo "$l.utf-8 UTF-8"
- done
- for l in el el_GR gr gr_GR; do
- echo "$l ISO-8859-7"
- echo "$l.iso-8859-7 ISO-8859-7"
- echo "$l.cp-869 CP869"
- echo "$l.cp-1253 CP1253"
- echo "$l.cp-1253@euro CP1253"
- echo "$l.utf-8 UTF-8"
- echo "$l.utf-8@euro UTF-8"
- done
- for l in he he_IL iw iw_IL; do
- echo "$l ISO-8859-8"
- echo "$l.iso-8859-8 ISO-8859-8"
- echo "$l.cp-862 CP862"
- echo "$l.cp-1255 CP1255"
- echo "$l.utf-8 UTF-8"
- done
- for l in tr tr_TR; do
- echo "$l ISO-8859-9"
- echo "$l.iso-8859-9 ISO-8859-9"
- echo "$l.cp-857 CP857"
- echo "$l.cp-1254 CP1254"
- echo "$l.utf-8 UTF-8"
- done
- for l in lt lt_LT lv lv_LV; do
- #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
- echo "$l ISO-8859-13"
- done
- for l in ru_UA uk uk_UA; do
- echo "$l KOI8-U"
- done
- for l in zh zh_CN; do
- #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
- echo "$l GB2312"
- done
- for l in ja ja_JP ja_JP.EUC; do
- echo "$l EUC-JP"
- done
- for l in ko ko_KR; do
- echo "$l EUC-KR"
- done
- for l in th th_TH; do
- echo "$l TIS-620"
- done
- for l in fa fa_IR; do
- #echo "$l ISIRI-3342" # a broken encoding
- echo "$l.utf-8 UTF-8"
- done
- ;;
- linux* | *-gnu*)
- # With glibc-2.1 or newer, we don't need any canonicalization,
- # because glibc has iconv and both glibc and libiconv support all
- # GNU canonical names directly. Therefore, the Makefile does not
- # need to install the alias file at all.
- # The following applies only to glibc-2.0.x and older libcs.
- echo "ISO_646.IRV:1983 ASCII"
- ;;
- aix*)
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-6 ISO-8859-6"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-8 ISO-8859-8"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-15 ISO-8859-15"
- echo "IBM-850 CP850"
- echo "IBM-856 CP856"
- echo "IBM-921 ISO-8859-13"
- echo "IBM-922 CP922"
- echo "IBM-932 CP932"
- echo "IBM-943 CP943"
- echo "IBM-1046 CP1046"
- echo "IBM-1124 CP1124"
- echo "IBM-1129 CP1129"
- echo "IBM-1252 CP1252"
- echo "IBM-eucCN GB2312"
- echo "IBM-eucJP EUC-JP"
- echo "IBM-eucKR EUC-KR"
- echo "IBM-eucTW EUC-TW"
- echo "big5 BIG5"
- echo "GBK GBK"
- echo "TIS-620 TIS-620"
- echo "UTF-8 UTF-8"
- ;;
- hpux*)
- echo "iso88591 ISO-8859-1"
- echo "iso88592 ISO-8859-2"
- echo "iso88595 ISO-8859-5"
- echo "iso88596 ISO-8859-6"
- echo "iso88597 ISO-8859-7"
- echo "iso88598 ISO-8859-8"
- echo "iso88599 ISO-8859-9"
- echo "iso885915 ISO-8859-15"
- echo "roman8 HP-ROMAN8"
- echo "arabic8 HP-ARABIC8"
- echo "greek8 HP-GREEK8"
- echo "hebrew8 HP-HEBREW8"
- echo "turkish8 HP-TURKISH8"
- echo "kana8 HP-KANA8"
- echo "tis620 TIS-620"
- echo "big5 BIG5"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- echo "hp15CN GB2312"
- #echo "ccdc ?" # what is this?
- echo "SJIS SHIFT_JIS"
- echo "utf8 UTF-8"
- ;;
- irix*)
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-9 ISO-8859-9"
- echo "eucCN GB2312"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- ;;
- osf*)
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-8 ISO-8859-8"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-15 ISO-8859-15"
- echo "cp850 CP850"
- echo "big5 BIG5"
- echo "dechanyu DEC-HANYU"
- echo "dechanzi GB2312"
- echo "deckanji DEC-KANJI"
- echo "deckorean EUC-KR"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- echo "GBK GBK"
- echo "KSC5601 CP949"
- echo "sdeckanji EUC-JP"
- echo "SJIS SHIFT_JIS"
- echo "TACTIS TIS-620"
- echo "UTF-8 UTF-8"
- ;;
- solaris*)
- echo "646 ASCII"
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-3 ISO-8859-3"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-6 ISO-8859-6"
- echo "ISO8859-7 ISO-8859-7"
- echo "ISO8859-8 ISO-8859-8"
- echo "ISO8859-9 ISO-8859-9"
- echo "ISO8859-15 ISO-8859-15"
- echo "koi8-r KOI8-R"
- echo "ansi-1251 CP1251"
- echo "BIG5 BIG5"
- echo "Big5-HKSCS BIG5-HKSCS"
- echo "gb2312 GB2312"
- echo "GBK GBK"
- echo "GB18030 GB18030"
- echo "cns11643 EUC-TW"
- echo "5601 EUC-KR"
- echo "ko_KR.johap92 JOHAB"
- echo "eucJP EUC-JP"
- echo "PCK SHIFT_JIS"
- echo "TIS620.2533 TIS-620"
- #echo "sun_eu_greek ?" # what is this?
- echo "UTF-8 UTF-8"
- ;;
- freebsd* | os2*)
- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
- # reuse FreeBSD's locale data for OS/2.
- echo "C ASCII"
- echo "US-ASCII ASCII"
- for l in la_LN lt_LN; do
- echo "$l.ASCII ASCII"
- done
- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
- lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
- echo "$l.ISO_8859-1 ISO-8859-1"
- echo "$l.DIS_8859-15 ISO-8859-15"
- done
- for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
- echo "$l.ISO_8859-2 ISO-8859-2"
- done
- for l in la_LN lt_LT; do
- echo "$l.ISO_8859-4 ISO-8859-4"
- done
- for l in ru_RU ru_SU; do
- echo "$l.KOI8-R KOI8-R"
- echo "$l.ISO_8859-5 ISO-8859-5"
- echo "$l.CP866 CP866"
- done
- echo "uk_UA.KOI8-U KOI8-U"
- echo "zh_TW.BIG5 BIG5"
- echo "zh_TW.Big5 BIG5"
- echo "zh_CN.EUC GB2312"
- echo "ja_JP.EUC EUC-JP"
- echo "ja_JP.SJIS SHIFT_JIS"
- echo "ja_JP.Shift_JIS SHIFT_JIS"
- echo "ko_KR.EUC EUC-KR"
- ;;
- netbsd*)
- echo "646 ASCII"
- echo "ISO8859-1 ISO-8859-1"
- echo "ISO8859-2 ISO-8859-2"
- echo "ISO8859-4 ISO-8859-4"
- echo "ISO8859-5 ISO-8859-5"
- echo "ISO8859-15 ISO-8859-15"
- echo "eucCN GB2312"
- echo "eucJP EUC-JP"
- echo "eucKR EUC-KR"
- echo "eucTW EUC-TW"
- echo "BIG5 BIG5"
- echo "SJIS SHIFT_JIS"
- ;;
- darwin*)
- # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "C ASCII"
- for l in en_AU en_CA en_GB en_US la_LN; do
- echo "$l.US-ASCII ASCII"
- done
- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
- nl_NL no_NO pt_PT sv_SE; do
- echo "$l ISO-8859-1"
- echo "$l.ISO8859-1 ISO-8859-1"
- echo "$l.ISO8859-15 ISO-8859-15"
- done
- for l in la_LN; do
- echo "$l.ISO8859-1 ISO-8859-1"
- echo "$l.ISO8859-15 ISO-8859-15"
- done
- for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
- echo "$l.ISO8859-2 ISO-8859-2"
- done
- for l in la_LN lt_LT; do
- echo "$l.ISO8859-4 ISO-8859-4"
- done
- for l in ru_RU; do
- echo "$l.KOI8-R KOI8-R"
- echo "$l.ISO8859-5 ISO-8859-5"
- echo "$l.CP866 CP866"
- done
- for l in bg_BG; do
- echo "$l.CP1251 CP1251"
- done
- echo "uk_UA.KOI8-U KOI8-U"
- echo "zh_TW.BIG5 BIG5"
- echo "zh_TW.Big5 BIG5"
- echo "zh_CN.EUC GB2312"
- echo "ja_JP.EUC EUC-JP"
- echo "ja_JP.SJIS SHIFT_JIS"
- echo "ko_KR.EUC EUC-KR"
- ;;
- beos*)
- # BeOS has a single locale, and it has UTF-8 encoding.
- echo "* UTF-8"
- ;;
- msdosdjgpp*)
- # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
- # localcharset.c falls back to using the full locale name
- # from the environment variables.
- echo "#"
- echo "# The encodings given here may not all be correct."
- echo "# If you find that the encoding given for your language and"
- echo "# country is not the one your DOS machine actually uses, just"
- echo "# correct it in this file, and send a mail to"
- echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
- echo "# and Bruno Haible <bruno@clisp.org>."
- echo "#"
- echo "C ASCII"
- # ISO-8859-1 languages
- echo "ca CP850"
- echo "ca_ES CP850"
- echo "da CP865" # not CP850 ??
- echo "da_DK CP865" # not CP850 ??
- echo "de CP850"
- echo "de_AT CP850"
- echo "de_CH CP850"
- echo "de_DE CP850"
- echo "en CP850"
- echo "en_AU CP850" # not CP437 ??
- echo "en_CA CP850"
- echo "en_GB CP850"
- echo "en_NZ CP437"
- echo "en_US CP437"
- echo "en_ZA CP850" # not CP437 ??
- echo "es CP850"
- echo "es_AR CP850"
- echo "es_BO CP850"
- echo "es_CL CP850"
- echo "es_CO CP850"
- echo "es_CR CP850"
- echo "es_CU CP850"
- echo "es_DO CP850"
- echo "es_EC CP850"
- echo "es_ES CP850"
- echo "es_GT CP850"
- echo "es_HN CP850"
- echo "es_MX CP850"
- echo "es_NI CP850"
- echo "es_PA CP850"
- echo "es_PY CP850"
- echo "es_PE CP850"
- echo "es_SV CP850"
- echo "es_UY CP850"
- echo "es_VE CP850"
- echo "et CP850"
- echo "et_EE CP850"
- echo "eu CP850"
- echo "eu_ES CP850"
- echo "fi CP850"
- echo "fi_FI CP850"
- echo "fr CP850"
- echo "fr_BE CP850"
- echo "fr_CA CP850"
- echo "fr_CH CP850"
- echo "fr_FR CP850"
- echo "ga CP850"
- echo "ga_IE CP850"
- echo "gd CP850"
- echo "gd_GB CP850"
- echo "gl CP850"
- echo "gl_ES CP850"
- echo "id CP850" # not CP437 ??
- echo "id_ID CP850" # not CP437 ??
- echo "is CP861" # not CP850 ??
- echo "is_IS CP861" # not CP850 ??
- echo "it CP850"
- echo "it_CH CP850"
- echo "it_IT CP850"
- echo "lt CP775"
- echo "lt_LT CP775"
- echo "lv CP775"
- echo "lv_LV CP775"
- echo "nb CP865" # not CP850 ??
- echo "nb_NO CP865" # not CP850 ??
- echo "nl CP850"
- echo "nl_BE CP850"
- echo "nl_NL CP850"
- echo "nn CP865" # not CP850 ??
- echo "nn_NO CP865" # not CP850 ??
- echo "no CP865" # not CP850 ??
- echo "no_NO CP865" # not CP850 ??
- echo "pt CP850"
- echo "pt_BR CP850"
- echo "pt_PT CP850"
- echo "sv CP850"
- echo "sv_SE CP850"
- # ISO-8859-2 languages
- echo "cs CP852"
- echo "cs_CZ CP852"
- echo "hr CP852"
- echo "hr_HR CP852"
- echo "hu CP852"
- echo "hu_HU CP852"
- echo "pl CP852"
- echo "pl_PL CP852"
- echo "ro CP852"
- echo "ro_RO CP852"
- echo "sk CP852"
- echo "sk_SK CP852"
- echo "sl CP852"
- echo "sl_SI CP852"
- echo "sq CP852"
- echo "sq_AL CP852"
- echo "sr CP852" # CP852 or CP866 or CP855 ??
- echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
- echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
- # ISO-8859-3 languages
- echo "mt CP850"
- echo "mt_MT CP850"
- # ISO-8859-5 languages
- echo "be CP866"
- echo "be_BE CP866"
- echo "bg CP866" # not CP855 ??
- echo "bg_BG CP866" # not CP855 ??
- echo "mk CP866" # not CP855 ??
- echo "mk_MK CP866" # not CP855 ??
- echo "ru CP866"
- echo "ru_RU CP866"
- echo "uk CP1125"
- echo "uk_UA CP1125"
- # ISO-8859-6 languages
- echo "ar CP864"
- echo "ar_AE CP864"
- echo "ar_DZ CP864"
- echo "ar_EG CP864"
- echo "ar_IQ CP864"
- echo "ar_IR CP864"
- echo "ar_JO CP864"
- echo "ar_KW CP864"
- echo "ar_MA CP864"
- echo "ar_OM CP864"
- echo "ar_QA CP864"
- echo "ar_SA CP864"
- echo "ar_SY CP864"
- # ISO-8859-7 languages
- echo "el CP869"
- echo "el_GR CP869"
- # ISO-8859-8 languages
- echo "he CP862"
- echo "he_IL CP862"
- # ISO-8859-9 languages
- echo "tr CP857"
- echo "tr_TR CP857"
- # Japanese
- echo "ja CP932"
- echo "ja_JP CP932"
- # Chinese
- echo "zh_CN GBK"
- echo "zh_TW CP950" # not CP938 ??
- # Korean
- echo "kr CP949" # not CP934 ??
- echo "kr_KR CP949" # not CP934 ??
- # Thai
- echo "th CP874"
- echo "th_TH CP874"
- # Other
- echo "eo CP850"
- echo "eo_EO CP850"
- ;;
-esac
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
deleted file mode 100644
index 850acdee..00000000
--- a/intl/dcgettext.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Implementation of the dcgettext(3) function.
- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCGETTEXT libintl_dcgettext
-# define DCIGETTEXT libintl_dcigettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
- locale. */
-char *
-DCGETTEXT (const char *domainname, const char *msgid, int category)
-{
- return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-INTDEF(__dcgettext)
-weak_alias (__dcgettext, dcgettext);
-#endif
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
deleted file mode 100644
index 35238e2c..00000000
--- a/intl/dcigettext.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* Implementation of the internal dcigettext function.
- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
- This must come before <config.h> because <config.h> may include
- <features.h>, and once <features.h> has been included, it's too late. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include <locale.h>
-
-#ifdef _LIBC
- /* Guess whether integer division by zero raises signal SIGFPE.
- Set to 1 only if you know for sure. In case of doubt, set to 0. */
-# if defined __alpha__ || defined __arm__ || defined __i386__ \
- || defined __m68k__ || defined __s390__
-# define INTDIV0_RAISES_SIGFPE 1
-# else
-# define INTDIV0_RAISES_SIGFPE 0
-# endif
-#endif
-#if !INTDIV0_RAISES_SIGFPE
-# include <signal.h>
-#endif
-
-#if defined HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-
-#include "gettextP.h"
-#include "plural-exp.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "hash-string.h"
-
-/* Thread safetyness. */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc. */
-# define __libc_lock_define_initialized(CLASS, NAME)
-# define __libc_lock_lock(NAME)
-# define __libc_lock_unlock(NAME)
-# define __libc_rwlock_define_initialized(CLASS, NAME)
-# define __libc_rwlock_rdlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* Alignment of types. */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define alignof(TYPE) __alignof__ (TYPE)
-#else
-# define alignof(TYPE) \
- ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
- names than the internal variables in GNU libc, otherwise programs
- using libintl.a cannot be linked statically. */
-#if !defined _LIBC
-# define _nl_default_default_domain libintl_nl_default_default_domain
-# define _nl_current_default_domain libintl_nl_current_default_domain
-# define _nl_default_dirname libintl_nl_default_dirname
-# define _nl_domain_bindings libintl_nl_domain_bindings
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions. This is required by the standard
- because some ANSI C functions will require linking with this object
- file and the name space must not be polluted. */
-# define getcwd __getcwd
-# ifndef stpcpy
-# define stpcpy __stpcpy
-# endif
-# define tfind __tfind
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-# define getcwd(buf, max) getwd (buf)
-# else
-# if VMS
-# define getcwd(buf, max) (getcwd) (buf, max, 0)
-# else
-char *getcwd ();
-# endif
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
-# endif
-# ifndef HAVE_MEMPCPY
-static void *mempcpy (void *dest, const void *src, size_t n);
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h. */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
- PATH_MAX but might cause redefinition warnings when sys/param.h is
- later included (as on MORE/BSD 4.3). */
-#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined PATH_MAX && defined _PC_PATH_MAX
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been. */
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* Pathname support.
- ISSLASH(C) tests whether C is a directory separator character.
- IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
- it may be concatenated to a directory pathname.
- IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
- /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
- && (P)[1] == ':')
-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
-# define IS_PATH_WITH_DIR(P) \
- (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-#else
- /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-#endif
-
-/* This is the type used for the search tree where known translations
- are stored. */
-struct known_translation_t
-{
- /* Domain in which to search. */
- char *domainname;
-
- /* The category. */
- int category;
-
- /* State of the catalog counter at the point the string was found. */
- int counter;
-
- /* Catalog where the string was found. */
- struct loaded_l10nfile *domain;
-
- /* And finally the translation. */
- const char *translation;
- size_t translation_length;
-
- /* Pointer to the string in question. */
- char msgid[ZERO];
-};
-
-/* Root of the search tree with known translations. We can use this
- only if the system provides the `tsearch' function family. */
-#if defined HAVE_TSEARCH || defined _LIBC
-# include <search.h>
-
-static void *root;
-
-# ifdef _LIBC
-# define tsearch __tsearch
-# endif
-
-/* Function to compare two entries in the table of known translations. */
-static int
-transcmp (const void *p1, const void *p2)
-{
- const struct known_translation_t *s1;
- const struct known_translation_t *s2;
- int result;
-
- s1 = (const struct known_translation_t *) p1;
- s2 = (const struct known_translation_t *) p2;
-
- result = strcmp (s1->msgid, s2->msgid);
- if (result == 0)
- {
- result = strcmp (s1->domainname, s2->domainname);
- if (result == 0)
- /* We compare the category last (though this is the cheapest
- operation) since it is hopefully always the same (namely
- LC_MESSAGES). */
- result = s1->category - s2->category;
- }
-
- return result;
-}
-#endif
-
-#ifndef INTVARDEF
-# define INTVARDEF(name)
-#endif
-#ifndef INTUSE
-# define INTUSE(name) name
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
- textdomain(3). The default value for this is "messages". */
-const char _nl_default_default_domain[] attribute_hidden = "messages";
-
-/* Value used as the default domain for gettext(3). */
-const char *_nl_current_default_domain attribute_hidden
- = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs. */
-#if defined __EMX__
-extern const char _nl_default_dirname[];
-#else
-const char _nl_default_dirname[] = LOCALEDIR;
-INTVARDEF (_nl_default_dirname)
-#endif
-
-/* List with bindings of specific domains created by bindtextdomain()
- calls. */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions. */
-static char *plural_lookup (struct loaded_l10nfile *domain,
- unsigned long int n,
- const char *translation, size_t translation_len)
- internal_function;
-static const char *guess_category_value (int category,
- const char *categoryname)
- internal_function;
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-# define category_to_name(category) _nl_category_names[category]
-#else
-static const char *category_to_name (int category) internal_function;
-#endif
-
-
-/* For those loosing systems which don't have `alloca' we have to add
- some additional code emulating it. */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done. */
-# define freea(p) /* nothing */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
- void *address;
- struct block_list *next;
-};
-# define ADD_BLOCK(list, addr) \
- do { \
- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
- /* If we cannot get a free block we cannot add the new element to \
- the list. */ \
- if (newp != NULL) { \
- newp->address = (addr); \
- newp->next = (list); \
- (list) = newp; \
- } \
- } while (0)
-# define FREE_BLOCKS(list) \
- do { \
- while (list != NULL) { \
- struct block_list *old = list; \
- list = list->next; \
- free (old->address); \
- free (old); \
- } \
- } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-# define freea(p) free (p)
-#endif /* have alloca */
-
-
-#ifdef _LIBC
-/* List of blocks allocated for translations. */
-typedef struct transmem_list
-{
- struct transmem_list *next;
- char data[ZERO];
-} transmem_block_t;
-static struct transmem_list *transmem_list;
-#else
-typedef unsigned char transmem_block_t;
-#endif
-
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define DCIGETTEXT __dcigettext
-#else
-# define DCIGETTEXT libintl_dcigettext
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation. */
-#ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
-#endif
-
-/* Checking whether the binaries runs SUID must be done and glibc provides
- easier methods therefore we make a difference here. */
-#ifdef _LIBC
-# define ENABLE_SECURE __libc_enable_secure
-# define DETERMINE_SECURE
-#else
-# ifndef HAVE_GETUID
-# define getuid() 0
-# endif
-# ifndef HAVE_GETGID
-# define getgid() 0
-# endif
-# ifndef HAVE_GETEUID
-# define geteuid() getuid()
-# endif
-# ifndef HAVE_GETEGID
-# define getegid() getgid()
-# endif
-static int enable_secure;
-# define ENABLE_SECURE (enable_secure == 1)
-# define DETERMINE_SECURE \
- if (enable_secure == 0) \
- { \
- if (getuid () != geteuid () || getgid () != getegid ()) \
- enable_secure = 1; \
- else \
- enable_secure = -1; \
- }
-#endif
-
-/* Get the function to evaluate the plural expression. */
-#include "eval-plural.h"
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
- CATEGORY locale and, if PLURAL is nonzero, search over string
- depending on the plural form determined by N. */
-char *
-DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
- int plural, unsigned long int n, int category)
-{
-#ifndef HAVE_ALLOCA
- struct block_list *block_list = NULL;
-#endif
- struct loaded_l10nfile *domain;
- struct binding *binding;
- const char *categoryname;
- const char *categoryvalue;
- char *dirname, *xdomainname;
- char *single_locale;
- char *retval;
- size_t retlen;
- int saved_errno;
-#if defined HAVE_TSEARCH || defined _LIBC
- struct known_translation_t *search;
- struct known_translation_t **foundp = NULL;
- size_t msgid_len;
-#endif
- size_t domainname_len;
-
- /* If no real MSGID is given return NULL. */
- if (msgid1 == NULL)
- return NULL;
-
-#ifdef _LIBC
- if (category < 0 || category >= __LC_LAST || category == LC_ALL)
- /* Bogus. */
- return (plural == 0
- ? (char *) msgid1
- /* Use the Germanic plural rule. */
- : n == 1 ? (char *) msgid1 : (char *) msgid2);
-#endif
-
- __libc_rwlock_rdlock (_nl_state_lock);
-
- /* If DOMAINNAME is NULL, we are interested in the default domain. If
- CATEGORY is not LC_MESSAGES this might not make much sense but the
- definition left this undefined. */
- if (domainname == NULL)
- domainname = _nl_current_default_domain;
-
- /* OS/2 specific: backward compatibility with older libintl versions */
-#ifdef LC_MESSAGES_COMPAT
- if (category == LC_MESSAGES_COMPAT)
- category = LC_MESSAGES;
-#endif
-
-#if defined HAVE_TSEARCH || defined _LIBC
- msgid_len = strlen (msgid1) + 1;
-
- /* Try to find the translation among those which we found at
- some time. */
- search = (struct known_translation_t *)
- alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
- memcpy (search->msgid, msgid1, msgid_len);
- search->domainname = (char *) domainname;
- search->category = category;
-
- foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
- freea (search);
- if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
- {
- /* Now deal with plural. */
- if (plural)
- retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
- (*foundp)->translation_length);
- else
- retval = (char *) (*foundp)->translation;
-
- __libc_rwlock_unlock (_nl_state_lock);
- return retval;
- }
-#endif
-
- /* Preserve the `errno' value. */
- saved_errno = errno;
-
- /* See whether this is a SUID binary or not. */
- DETERMINE_SECURE;
-
- /* First find matching binding. */
- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
- {
- int compare = strcmp (domainname, binding->domainname);
- if (compare == 0)
- /* We found it! */
- break;
- if (compare < 0)
- {
- /* It is not in the list. */
- binding = NULL;
- break;
- }
- }
-
- if (binding == NULL)
- dirname = (char *) INTUSE(_nl_default_dirname);
- else if (IS_ABSOLUTE_PATH (binding->dirname))
- dirname = binding->dirname;
- else
- {
- /* We have a relative path. Make it absolute now. */
- size_t dirname_len = strlen (binding->dirname) + 1;
- size_t path_max;
- char *ret;
-
- path_max = (unsigned int) PATH_MAX;
- path_max += 2; /* The getcwd docs say to do this. */
-
- for (;;)
- {
- dirname = (char *) alloca (path_max + dirname_len);
- ADD_BLOCK (block_list, dirname);
-
- __set_errno (0);
- ret = getcwd (dirname, path_max);
- if (ret != NULL || errno != ERANGE)
- break;
-
- path_max += path_max / 2;
- path_max += PATH_INCR;
- }
-
- if (ret == NULL)
- /* We cannot get the current working directory. Don't signal an
- error but simply return the default string. */
- goto return_untranslated;
-
- stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
- }
-
- /* Now determine the symbolic name of CATEGORY and its value. */
- categoryname = category_to_name (category);
- categoryvalue = guess_category_value (category, categoryname);
-
- domainname_len = strlen (domainname);
- xdomainname = (char *) alloca (strlen (categoryname)
- + domainname_len + 5);
- ADD_BLOCK (block_list, xdomainname);
-
- stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
- domainname, domainname_len),
- ".mo");
-
- /* Creating working area. */
- single_locale = (char *) alloca (strlen (categoryvalue) + 1);
- ADD_BLOCK (block_list, single_locale);
-
-
- /* Search for the given string. This is a loop because we perhaps
- got an ordered list of languages to consider for the translation. */
- while (1)
- {
- /* Make CATEGORYVALUE point to the next element of the list. */
- while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
- ++categoryvalue;
- if (categoryvalue[0] == '\0')
- {
- /* The whole contents of CATEGORYVALUE has been searched but
- no valid entry has been found. We solve this situation
- by implicitly appending a "C" entry, i.e. no translation
- will take place. */
- single_locale[0] = 'C';
- single_locale[1] = '\0';
- }
- else
- {
- char *cp = single_locale;
- while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
- *cp++ = *categoryvalue++;
- *cp = '\0';
-
- /* When this is a SUID binary we must not allow accessing files
- outside the dedicated directories. */
- if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
- /* Ingore this entry. */
- continue;
- }
-
- /* If the current locale value is C (or POSIX) we don't load a
- domain. Return the MSGID. */
- if (strcmp (single_locale, "C") == 0
- || strcmp (single_locale, "POSIX") == 0)
- break;
-
- /* Find structure describing the message catalog matching the
- DOMAINNAME and CATEGORY. */
- domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
-
- if (domain != NULL)
- {
- retval = _nl_find_msg (domain, binding, msgid1, &retlen);
-
- if (retval == NULL)
- {
- int cnt;
-
- for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
- {
- retval = _nl_find_msg (domain->successor[cnt], binding,
- msgid1, &retlen);
-
- if (retval != NULL)
- {
- domain = domain->successor[cnt];
- break;
- }
- }
- }
-
- if (retval != NULL)
- {
- /* Found the translation of MSGID1 in domain DOMAIN:
- starting at RETVAL, RETLEN bytes. */
- FREE_BLOCKS (block_list);
-#if defined HAVE_TSEARCH || defined _LIBC
- if (foundp == NULL)
- {
- /* Create a new entry and add it to the search tree. */
- struct known_translation_t *newp;
-
- newp = (struct known_translation_t *)
- malloc (offsetof (struct known_translation_t, msgid)
- + msgid_len + domainname_len + 1);
- if (newp != NULL)
- {
- newp->domainname =
- mempcpy (newp->msgid, msgid1, msgid_len);
- memcpy (newp->domainname, domainname, domainname_len + 1);
- newp->category = category;
- newp->counter = _nl_msg_cat_cntr;
- newp->domain = domain;
- newp->translation = retval;
- newp->translation_length = retlen;
-
- /* Insert the entry in the search tree. */
- foundp = (struct known_translation_t **)
- tsearch (newp, &root, transcmp);
- if (foundp == NULL
- || __builtin_expect (*foundp != newp, 0))
- /* The insert failed. */
- free (newp);
- }
- }
- else
- {
- /* We can update the existing entry. */
- (*foundp)->counter = _nl_msg_cat_cntr;
- (*foundp)->domain = domain;
- (*foundp)->translation = retval;
- (*foundp)->translation_length = retlen;
- }
-#endif
- __set_errno (saved_errno);
-
- /* Now deal with plural. */
- if (plural)
- retval = plural_lookup (domain, n, retval, retlen);
-
- __libc_rwlock_unlock (_nl_state_lock);
- return retval;
- }
- }
- }
-
- return_untranslated:
- /* Return the untranslated MSGID. */
- FREE_BLOCKS (block_list);
- __libc_rwlock_unlock (_nl_state_lock);
-#ifndef _LIBC
- if (!ENABLE_SECURE)
- {
- extern void _nl_log_untranslated (const char *logfilename,
- const char *domainname,
- const char *msgid1, const char *msgid2,
- int plural);
- const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
-
- if (logfilename != NULL && logfilename[0] != '\0')
- _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
- }
-#endif
- __set_errno (saved_errno);
- return (plural == 0
- ? (char *) msgid1
- /* Use the Germanic plural rule. */
- : n == 1 ? (char *) msgid1 : (char *) msgid2);
-}
-
-
-char *
-internal_function
-_nl_find_msg (struct loaded_l10nfile *domain_file,
- struct binding *domainbinding, const char *msgid,
- size_t *lengthp)
-{
- struct loaded_domain *domain;
- nls_uint32 nstrings;
- size_t act;
- char *result;
- size_t resultlen;
-
- if (domain_file->decided == 0)
- _nl_load_domain (domain_file, domainbinding);
-
- if (domain_file->data == NULL)
- return NULL;
-
- domain = (struct loaded_domain *) domain_file->data;
-
- nstrings = domain->nstrings;
-
- /* Locate the MSGID and its translation. */
- if (domain->hash_tab != NULL)
- {
- /* Use the hashing table. */
- nls_uint32 len = strlen (msgid);
- nls_uint32 hash_val = hash_string (msgid);
- nls_uint32 idx = hash_val % domain->hash_size;
- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-
- while (1)
- {
- nls_uint32 nstr =
- W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
-
- if (nstr == 0)
- /* Hash table entry is empty. */
- return NULL;
-
- nstr--;
-
- /* Compare msgid with the original string at index nstr.
- We compare the lengths with >=, not ==, because plural entries
- are represented by strings with an embedded NUL. */
- if (nstr < nstrings
- ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
- && (strcmp (msgid,
- domain->data + W (domain->must_swap,
- domain->orig_tab[nstr].offset))
- == 0)
- : domain->orig_sysdep_tab[nstr - nstrings].length > len
- && (strcmp (msgid,
- domain->orig_sysdep_tab[nstr - nstrings].pointer)
- == 0))
- {
- act = nstr;
- goto found;
- }
-
- if (idx >= domain->hash_size - incr)
- idx -= domain->hash_size - incr;
- else
- idx += incr;
- }
- /* NOTREACHED */
- }
- else
- {
- /* Try the default method: binary search in the sorted array of
- messages. */
- size_t top, bottom;
-
- bottom = 0;
- top = nstrings;
- while (bottom < top)
- {
- int cmp_val;
-
- act = (bottom + top) / 2;
- cmp_val = strcmp (msgid, (domain->data
- + W (domain->must_swap,
- domain->orig_tab[act].offset)));
- if (cmp_val < 0)
- top = act;
- else if (cmp_val > 0)
- bottom = act + 1;
- else
- goto found;
- }
- /* No translation was found. */
- return NULL;
- }
-
- found:
- /* The translation was found at index ACT. If we have to convert the
- string to use a different character set, this is the time. */
- if (act < nstrings)
- {
- result = (char *)
- (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
- resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
- }
- else
- {
- result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
- resultlen = domain->trans_sysdep_tab[act - nstrings].length;
- }
-
-#if defined _LIBC || HAVE_ICONV
- if (domain->codeset_cntr
- != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
- {
- /* The domain's codeset has changed through bind_textdomain_codeset()
- since the message catalog was initialized or last accessed. We
- have to reinitialize the converter. */
- _nl_free_domain_conv (domain);
- _nl_init_domain_conv (domain_file, domain, domainbinding);
- }
-
- if (
-# ifdef _LIBC
- domain->conv != (__gconv_t) -1
-# else
-# if HAVE_ICONV
- domain->conv != (iconv_t) -1
-# endif
-# endif
- )
- {
- /* We are supposed to do a conversion. First allocate an
- appropriate table with the same structure as the table
- of translations in the file, where we can put the pointers
- to the converted strings in.
- There is a slight complication with plural entries. They
- are represented by consecutive NUL terminated strings. We
- handle this case by converting RESULTLEN bytes, including
- NULs. */
-
- if (domain->conv_tab == NULL
- && ((domain->conv_tab =
- (char **) calloc (nstrings + domain->n_sysdep_strings,
- sizeof (char *)))
- == NULL))
- /* Mark that we didn't succeed allocating a table. */
- domain->conv_tab = (char **) -1;
-
- if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
- /* Nothing we can do, no more memory. */
- goto converted;
-
- if (domain->conv_tab[act] == NULL)
- {
- /* We haven't used this string so far, so it is not
- translated yet. Do this now. */
- /* We use a bit more efficient memory handling.
- We allocate always larger blocks which get used over
- time. This is faster than many small allocations. */
- __libc_lock_define_initialized (static, lock)
-# define INITIAL_BLOCK_SIZE 4080
- static unsigned char *freemem;
- static size_t freemem_size;
-
- const unsigned char *inbuf;
- unsigned char *outbuf;
- int malloc_count;
-# ifndef _LIBC
- transmem_block_t *transmem_list = NULL;
-# endif
-
- __libc_lock_lock (lock);
-
- inbuf = (const unsigned char *) result;
- outbuf = freemem + sizeof (size_t);
-
- malloc_count = 0;
- while (1)
- {
- transmem_block_t *newmem;
-# ifdef _LIBC
- size_t non_reversible;
- int res;
-
- if (freemem_size < sizeof (size_t))
- goto resize_freemem;
-
- res = __gconv (domain->conv,
- &inbuf, inbuf + resultlen,
- &outbuf,
- outbuf + freemem_size - sizeof (size_t),
- &non_reversible);
-
- if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
- break;
-
- if (res != __GCONV_FULL_OUTPUT)
- {
- __libc_lock_unlock (lock);
- goto converted;
- }
-
- inbuf = result;
-# else
-# if HAVE_ICONV
- const char *inptr = (const char *) inbuf;
- size_t inleft = resultlen;
- char *outptr = (char *) outbuf;
- size_t outleft;
-
- if (freemem_size < sizeof (size_t))
- goto resize_freemem;
-
- outleft = freemem_size - sizeof (size_t);
- if (iconv (domain->conv,
- (ICONV_CONST char **) &inptr, &inleft,
- &outptr, &outleft)
- != (size_t) (-1))
- {
- outbuf = (unsigned char *) outptr;
- break;
- }
- if (errno != E2BIG)
- {
- __libc_lock_unlock (lock);
- goto converted;
- }
-# endif
-# endif
-
- resize_freemem:
- /* We must allocate a new buffer or resize the old one. */
- if (malloc_count > 0)
- {
- ++malloc_count;
- freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
- newmem = (transmem_block_t *) realloc (transmem_list,
- freemem_size);
-# ifdef _LIBC
- if (newmem != NULL)
- transmem_list = transmem_list->next;
- else
- {
- struct transmem_list *old = transmem_list;
-
- transmem_list = transmem_list->next;
- free (old);
- }
-# endif
- }
- else
- {
- malloc_count = 1;
- freemem_size = INITIAL_BLOCK_SIZE;
- newmem = (transmem_block_t *) malloc (freemem_size);
- }
- if (__builtin_expect (newmem == NULL, 0))
- {
- freemem = NULL;
- freemem_size = 0;
- __libc_lock_unlock (lock);
- goto converted;
- }
-
-# ifdef _LIBC
- /* Add the block to the list of blocks we have to free
- at some point. */
- newmem->next = transmem_list;
- transmem_list = newmem;
-
- freemem = newmem->data;
- freemem_size -= offsetof (struct transmem_list, data);
-# else
- transmem_list = newmem;
- freemem = newmem;
-# endif
-
- outbuf = freemem + sizeof (size_t);
- }
-
- /* We have now in our buffer a converted string. Put this
- into the table of conversions. */
- *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
- domain->conv_tab[act] = (char *) freemem;
- /* Shrink freemem, but keep it aligned. */
- freemem_size -= outbuf - freemem;
- freemem = outbuf;
- freemem += freemem_size & (alignof (size_t) - 1);
- freemem_size = freemem_size & ~ (alignof (size_t) - 1);
-
- __libc_lock_unlock (lock);
- }
-
- /* Now domain->conv_tab[act] contains the translation of all
- the plural variants. */
- result = domain->conv_tab[act] + sizeof (size_t);
- resultlen = *(size_t *) domain->conv_tab[act];
- }
-
- converted:
- /* The result string is converted. */
-
-#endif /* _LIBC || HAVE_ICONV */
-
- *lengthp = resultlen;
- return result;
-}
-
-
-/* Look up a plural variant. */
-static char *
-internal_function
-plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
- const char *translation, size_t translation_len)
-{
- struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
- unsigned long int index;
- const char *p;
-
- index = plural_eval (domaindata->plural, n);
- if (index >= domaindata->nplurals)
- /* This should never happen. It means the plural expression and the
- given maximum value do not match. */
- index = 0;
-
- /* Skip INDEX strings at TRANSLATION. */
- p = translation;
- while (index-- > 0)
- {
-#ifdef _LIBC
- p = __rawmemchr (p, '\0');
-#else
- p = strchr (p, '\0');
-#endif
- /* And skip over the NUL byte. */
- p++;
-
- if (p >= translation + translation_len)
- /* This should never happen. It means the plural expression
- evaluated to a value larger than the number of variants
- available for MSGID1. */
- return (char *) translation;
- }
- return (char *) p;
-}
-
-#ifndef _LIBC
-/* Return string representation of locale CATEGORY. */
-static const char *
-internal_function
-category_to_name (int category)
-{
- const char *retval;
-
- switch (category)
- {
-#ifdef LC_COLLATE
- case LC_COLLATE:
- retval = "LC_COLLATE";
- break;
-#endif
-#ifdef LC_CTYPE
- case LC_CTYPE:
- retval = "LC_CTYPE";
- break;
-#endif
-#ifdef LC_MONETARY
- case LC_MONETARY:
- retval = "LC_MONETARY";
- break;
-#endif
-#ifdef LC_NUMERIC
- case LC_NUMERIC:
- retval = "LC_NUMERIC";
- break;
-#endif
-#ifdef LC_TIME
- case LC_TIME:
- retval = "LC_TIME";
- break;
-#endif
-#ifdef LC_MESSAGES
- case LC_MESSAGES:
- retval = "LC_MESSAGES";
- break;
-#endif
-#ifdef LC_RESPONSE
- case LC_RESPONSE:
- retval = "LC_RESPONSE";
- break;
-#endif
-#ifdef LC_ALL
- case LC_ALL:
- /* This might not make sense but is perhaps better than any other
- value. */
- retval = "LC_ALL";
- break;
-#endif
- default:
- /* If you have a better idea for a default value let me know. */
- retval = "LC_XXX";
- }
-
- return retval;
-}
-#endif
-
-/* Guess value of current locale from value of the environment variables. */
-static const char *
-internal_function
-guess_category_value (int category, const char *categoryname)
-{
- const char *language;
- const char *retval;
-
- /* The highest priority value is the `LANGUAGE' environment
- variable. But we don't use the value if the currently selected
- locale is the C locale. This is a GNU extension. */
- language = getenv ("LANGUAGE");
- if (language != NULL && language[0] == '\0')
- language = NULL;
-
- /* We have to proceed with the POSIX methods of looking to `LC_ALL',
- `LC_xxx', and `LANG'. On some systems this can be done by the
- `setlocale' function itself. */
-#ifdef _LIBC
- retval = __current_locale_name (category);
-#else
- retval = _nl_locale_name (category, categoryname);
-#endif
-
- /* Ignore LANGUAGE if the locale is set to "C" because
- 1. "C" locale usually uses the ASCII encoding, and most international
- messages use non-ASCII characters. These characters get displayed
- as question marks (if using glibc's iconv()) or as invalid 8-bit
- characters (because other iconv()s refuse to convert most non-ASCII
- characters to ASCII). In any case, the output is ugly.
- 2. The precise output of some programs in the "C" locale is specified
- by POSIX and should not depend on environment variables like
- "LANGUAGE". We allow such programs to use gettext(). */
- return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library. So we
- avoid the non-standard function stpcpy. In GNU C Library this
- function is available, though. Also allow the symbol HAVE_STPCPY
- to be defined. */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (char *dest, const char *src)
-{
- while ((*dest++ = *src++) != '\0')
- /* Do nothing. */ ;
- return dest - 1;
-}
-#endif
-
-#if !_LIBC && !HAVE_MEMPCPY
-static void *
-mempcpy (void *dest, const void *src, size_t n)
-{
- return (void *) ((char *) memcpy (dest, src, n) + n);
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
- program's end. */
-libc_freeres_fn (free_mem)
-{
- void *old;
-
- while (_nl_domain_bindings != NULL)
- {
- struct binding *oldp = _nl_domain_bindings;
- _nl_domain_bindings = _nl_domain_bindings->next;
- if (oldp->dirname != INTUSE(_nl_default_dirname))
- /* Yes, this is a pointer comparison. */
- free (oldp->dirname);
- free (oldp->codeset);
- free (oldp);
- }
-
- if (_nl_current_default_domain != _nl_default_default_domain)
- /* Yes, again a pointer comparison. */
- free ((char *) _nl_current_default_domain);
-
- /* Remove the search tree with the known translations. */
- __tdestroy (root, free);
- root = NULL;
-
- while (transmem_list != NULL)
- {
- old = transmem_list;
- transmem_list = transmem_list->next;
- free (old);
- }
-}
-#endif
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
deleted file mode 100644
index 48a3e09e..00000000
--- a/intl/dcngettext.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Implementation of the dcngettext(3) function.
- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT libintl_dcngettext
-# define DCIGETTEXT libintl_dcigettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
- locale. */
-char *
-DCNGETTEXT (const char *domainname,
- const char *msgid1, const char *msgid2, unsigned long int n,
- int category)
-{
- return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-weak_alias (__dcngettext, dcngettext);
-#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
deleted file mode 100644
index b64b0f5d..00000000
--- a/intl/dgettext.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Implementation of the dgettext(3) function.
- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-
-#include <locale.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT INTUSE(__dcgettext)
-#else
-# define DGETTEXT libintl_dgettext
-# define DCGETTEXT libintl_dcgettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
- LC_MESSAGES locale. */
-char *
-DGETTEXT (const char *domainname, const char *msgid)
-{
- return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/intl/dngettext.c b/intl/dngettext.c
deleted file mode 100644
index 7815637f..00000000
--- a/intl/dngettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dngettext(3) function.
- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-
-#include <locale.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define DNGETTEXT libintl_dngettext
-# define DCNGETTEXT libintl_dcngettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
- LC_MESSAGES locale and skip message according to the plural form. */
-char *
-DNGETTEXT (const char *domainname,
- const char *msgid1, const char *msgid2, unsigned long int n)
-{
- return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-weak_alias (__dngettext, dngettext);
-#endif
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
deleted file mode 100644
index 01bd5af5..00000000
--- a/intl/eval-plural.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Plural expression evaluation.
- Copyright (C) 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef STATIC
-#define STATIC static
-#endif
-
-/* Evaluate the plural expression and return an index value. */
-STATIC
-unsigned long int
-internal_function
-plural_eval (struct expression *pexp, unsigned long int n)
-{
- switch (pexp->nargs)
- {
- case 0:
- switch (pexp->operation)
- {
- case var:
- return n;
- case num:
- return pexp->val.num;
- default:
- break;
- }
- /* NOTREACHED */
- break;
- case 1:
- {
- /* pexp->operation must be lnot. */
- unsigned long int arg = plural_eval (pexp->val.args[0], n);
- return ! arg;
- }
- case 2:
- {
- unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
- if (pexp->operation == lor)
- return leftarg || plural_eval (pexp->val.args[1], n);
- else if (pexp->operation == land)
- return leftarg && plural_eval (pexp->val.args[1], n);
- else
- {
- unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
-
- switch (pexp->operation)
- {
- case mult:
- return leftarg * rightarg;
- case divide:
-#if !INTDIV0_RAISES_SIGFPE
- if (rightarg == 0)
- raise (SIGFPE);
-#endif
- return leftarg / rightarg;
- case module:
-#if !INTDIV0_RAISES_SIGFPE
- if (rightarg == 0)
- raise (SIGFPE);
-#endif
- return leftarg % rightarg;
- case plus:
- return leftarg + rightarg;
- case minus:
- return leftarg - rightarg;
- case less_than:
- return leftarg < rightarg;
- case greater_than:
- return leftarg > rightarg;
- case less_or_equal:
- return leftarg <= rightarg;
- case greater_or_equal:
- return leftarg >= rightarg;
- case equal:
- return leftarg == rightarg;
- case not_equal:
- return leftarg != rightarg;
- default:
- break;
- }
- }
- /* NOTREACHED */
- break;
- }
- case 3:
- {
- /* pexp->operation must be qmop. */
- unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
- return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
- }
- }
- /* NOTREACHED */
- return 0;
-}
diff --git a/intl/explodename.c b/intl/explodename.c
deleted file mode 100644
index 52c25e72..00000000
--- a/intl/explodename.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found. Sigh! */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-# define NULL ((void *) 0)
-# else
-# define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-char *
-_nl_find_language (const char *name)
-{
- while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
- && name[0] != '+' && name[0] != ',')
- ++name;
-
- return (char *) name;
-}
-
-
-int
-_nl_explode_name (char *name,
- const char **language, const char **modifier,
- const char **territory, const char **codeset,
- const char **normalized_codeset, const char **special,
- const char **sponsor, const char **revision)
-{
- enum { undecided, xpg, cen } syntax;
- char *cp;
- int mask;
-
- *modifier = NULL;
- *territory = NULL;
- *codeset = NULL;
- *normalized_codeset = NULL;
- *special = NULL;
- *sponsor = NULL;
- *revision = NULL;
-
- /* Now we determine the single parts of the locale name. First
- look for the language. Termination symbols are `_' and `@' if
- we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
- mask = 0;
- syntax = undecided;
- *language = cp = name;
- cp = _nl_find_language (*language);
-
- if (*language == cp)
- /* This does not make sense: language has to be specified. Use
- this entry as it is without exploding. Perhaps it is an alias. */
- cp = strchr (*language, '\0');
- else if (cp[0] == '_')
- {
- /* Next is the territory. */
- cp[0] = '\0';
- *territory = ++cp;
-
- while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
- && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
- ++cp;
-
- mask |= TERRITORY;
-
- if (cp[0] == '.')
- {
- /* Next is the codeset. */
- syntax = xpg;
- cp[0] = '\0';
- *codeset = ++cp;
-
- while (cp[0] != '\0' && cp[0] != '@')
- ++cp;
-
- mask |= XPG_CODESET;
-
- if (*codeset != cp && (*codeset)[0] != '\0')
- {
- *normalized_codeset = _nl_normalize_codeset (*codeset,
- cp - *codeset);
- if (strcmp (*codeset, *normalized_codeset) == 0)
- free ((char *) *normalized_codeset);
- else
- mask |= XPG_NORM_CODESET;
- }
- }
- }
-
- if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
- {
- /* Next is the modifier. */
- syntax = cp[0] == '@' ? xpg : cen;
- cp[0] = '\0';
- *modifier = ++cp;
-
- while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
- && cp[0] != ',' && cp[0] != '_')
- ++cp;
-
- mask |= XPG_MODIFIER | CEN_AUDIENCE;
- }
-
- if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
- {
- syntax = cen;
-
- if (cp[0] == '+')
- {
- /* Next is special application (CEN syntax). */
- cp[0] = '\0';
- *special = ++cp;
-
- while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
- ++cp;
-
- mask |= CEN_SPECIAL;
- }
-
- if (cp[0] == ',')
- {
- /* Next is sponsor (CEN syntax). */
- cp[0] = '\0';
- *sponsor = ++cp;
-
- while (cp[0] != '\0' && cp[0] != '_')
- ++cp;
-
- mask |= CEN_SPONSOR;
- }
-
- if (cp[0] == '_')
- {
- /* Next is revision (CEN syntax). */
- cp[0] = '\0';
- *revision = ++cp;
-
- mask |= CEN_REVISION;
- }
- }
-
- /* For CEN syntax values it might be important to have the
- separator character in the file name, not for XPG syntax. */
- if (syntax == xpg)
- {
- if (*territory != NULL && (*territory)[0] == '\0')
- mask &= ~TERRITORY;
-
- if (*codeset != NULL && (*codeset)[0] == '\0')
- mask &= ~XPG_CODESET;
-
- if (*modifier != NULL && (*modifier)[0] == '\0')
- mask &= ~XPG_MODIFIER;
- }
-
- return mask;
-}
diff --git a/intl/finddomain.c b/intl/finddomain.c
deleted file mode 100644
index 4992a8c9..00000000
--- a/intl/finddomain.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Handle list of needed message catalogs
- Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@gnu.org>, 1995.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains. */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
- the DOMAINNAME and CATEGORY parameters with respect to the currently
- established bindings. */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (const char *dirname, char *locale,
- const char *domainname, struct binding *domainbinding)
-{
- struct loaded_l10nfile *retval;
- const char *language;
- const char *modifier;
- const char *territory;
- const char *codeset;
- const char *normalized_codeset;
- const char *special;
- const char *sponsor;
- const char *revision;
- const char *alias_value;
- int mask;
-
- /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
- language[_territory[.codeset]][@modifier]
-
- and six parts for the CEN syntax:
-
- language[_territory][+audience][+special][,[sponsor][_revision]]
-
- Beside the first part all of them are allowed to be missing. If
- the full specified locale is not found, the less specific one are
- looked for. The various parts will be stripped off according to
- the following order:
- (1) revision
- (2) sponsor
- (3) special
- (4) codeset
- (5) normalized codeset
- (6) territory
- (7) audience/modifier
- */
-
- /* If we have already tested for this locale entry there has to
- be one data set in the list of loaded domains. */
- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
- strlen (dirname) + 1, 0, locale, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, domainname, 0);
- if (retval != NULL)
- {
- /* We know something about this locale. */
- int cnt;
-
- if (retval->decided == 0)
- _nl_load_domain (retval, domainbinding);
-
- if (retval->data != NULL)
- return retval;
-
- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
- {
- if (retval->successor[cnt]->decided == 0)
- _nl_load_domain (retval->successor[cnt], domainbinding);
-
- if (retval->successor[cnt]->data != NULL)
- break;
- }
- return cnt >= 0 ? retval : NULL;
- /* NOTREACHED */
- }
-
- /* See whether the locale value is an alias. If yes its value
- *overwrites* the alias name. No test for the original value is
- done. */
- alias_value = _nl_expand_alias (locale);
- if (alias_value != NULL)
- {
-#if defined _LIBC || defined HAVE_STRDUP
- locale = strdup (alias_value);
- if (locale == NULL)
- return NULL;
-#else
- size_t len = strlen (alias_value) + 1;
- locale = (char *) malloc (len);
- if (locale == NULL)
- return NULL;
-
- memcpy (locale, alias_value, len);
-#endif
- }
-
- /* Now we determine the single parts of the locale name. First
- look for the language. Termination symbols are `_' and `@' if
- we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
- mask = _nl_explode_name (locale, &language, &modifier, &territory,
- &codeset, &normalized_codeset, &special,
- &sponsor, &revision);
-
- /* Create all possible locale entries which might be interested in
- generalization. */
- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
- strlen (dirname) + 1, mask, language, territory,
- codeset, normalized_codeset, modifier, special,
- sponsor, revision, domainname, 1);
- if (retval == NULL)
- /* This means we are out of core. */
- return NULL;
-
- if (retval->decided == 0)
- _nl_load_domain (retval, domainbinding);
- if (retval->data == NULL)
- {
- int cnt;
- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
- {
- if (retval->successor[cnt]->decided == 0)
- _nl_load_domain (retval->successor[cnt], domainbinding);
- if (retval->successor[cnt]->data != NULL)
- break;
- }
- }
-
- /* The room for an alias was dynamically allocated. Free it now. */
- if (alias_value != NULL)
- free (locale);
-
- /* The space for normalized_codeset is dynamically allocated. Free it. */
- if (mask & XPG_NORM_CODESET)
- free ((void *) normalized_codeset);
-
- return retval;
-}
-
-
-#ifdef _LIBC
-libc_freeres_fn (free_mem)
-{
- struct loaded_l10nfile *runp = _nl_loaded_domains;
-
- while (runp != NULL)
- {
- struct loaded_l10nfile *here = runp;
- if (runp->data != NULL)
- _nl_unload_domain ((struct loaded_domain *) runp->data);
- runp = runp->next;
- free ((char *) here->filename);
- free (here);
- }
-}
-#endif
diff --git a/intl/gettext.c b/intl/gettext.c
deleted file mode 100644
index 92c42faa..00000000
--- a/intl/gettext.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Implementation of gettext(3) function.
- Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h> /* Just for NULL. */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DCGETTEXT INTUSE(__dcgettext)
-#else
-# define GETTEXT libintl_gettext
-# define DCGETTEXT libintl_dcgettext
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
- LC_MESSAGES locale. If not found, returns MSGID itself (the default
- text). */
-char *
-GETTEXT (const char *msgid)
-{
- return DCGETTEXT (NULL, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/intl/gettextP.h b/intl/gettextP.h
deleted file mode 100644
index 4d66c3de..00000000
--- a/intl/gettextP.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Header describing internals of libintl library.
- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include <stddef.h> /* Get size_t. */
-
-#ifdef _LIBC
-# include "../iconv/gconv_int.h"
-#else
-# if HAVE_ICONV
-# include <iconv.h>
-# endif
-#endif
-
-#include "loadinfo.h"
-
-#include "gmo.h" /* Get nls_uint32. */
-
-/* @@ end of prolog @@ */
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
- almost always true or almost always false. */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static inline nls_uint32
-SWAP (i)
- nls_uint32 i;
-{
- return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-/* In-memory representation of system dependent string. */
-struct sysdep_string_desc
-{
- /* Length of addressed string, including the trailing NUL. */
- size_t length;
- /* Pointer to addressed string. */
- const char *pointer;
-};
-
-/* The representation of an opened message catalog. */
-struct loaded_domain
-{
- /* Pointer to memory containing the .mo file. */
- const char *data;
- /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
- int use_mmap;
- /* Size of mmap()ed memory. */
- size_t mmap_size;
- /* 1 if the .mo file uses a different endianness than this machine. */
- int must_swap;
- /* Pointer to additional malloc()ed memory. */
- void *malloced;
-
- /* Number of static strings pairs. */
- nls_uint32 nstrings;
- /* Pointer to descriptors of original strings in the file. */
- const struct string_desc *orig_tab;
- /* Pointer to descriptors of translated strings in the file. */
- const struct string_desc *trans_tab;
-
- /* Number of system dependent strings pairs. */
- nls_uint32 n_sysdep_strings;
- /* Pointer to descriptors of original sysdep strings. */
- const struct sysdep_string_desc *orig_sysdep_tab;
- /* Pointer to descriptors of translated sysdep strings. */
- const struct sysdep_string_desc *trans_sysdep_tab;
-
- /* Size of hash table. */
- nls_uint32 hash_size;
- /* Pointer to hash table. */
- const nls_uint32 *hash_tab;
- /* 1 if the hash table uses a different endianness than this machine. */
- int must_swap_hash_tab;
-
- int codeset_cntr;
-#ifdef _LIBC
- __gconv_t conv;
-#else
-# if HAVE_ICONV
- iconv_t conv;
-# endif
-#endif
- char **conv_tab;
-
- struct expression *plural;
- unsigned long int nplurals;
-};
-
-/* We want to allocate a string at the end of the struct. But ISO C
- doesn't allow zero sized arrays. */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain. Used to store settings
- from bindtextdomain() and bind_textdomain_codeset(). */
-struct binding
-{
- struct binding *next;
- char *dirname;
- int codeset_cntr; /* Incremented each time codeset changes. */
- char *codeset;
- char domainname[ZERO];
-};
-
-/* A counter which is incremented each time some previous translations
- become invalid.
- This variable is part of the external ABI of the GNU libintl. */
-extern int _nl_msg_cat_cntr;
-
-#ifndef _LIBC
-const char *_nl_locale_name (int category, const char *categoryname);
-#endif
-
-struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
- const char *__domainname,
- struct binding *__domainbinding)
- internal_function;
-void _nl_load_domain (struct loaded_l10nfile *__domain,
- struct binding *__domainbinding)
- internal_function;
-void _nl_unload_domain (struct loaded_domain *__domain)
- internal_function;
-const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
- struct loaded_domain *__domain,
- struct binding *__domainbinding)
- internal_function;
-void _nl_free_domain_conv (struct loaded_domain *__domain)
- internal_function;
-
-char *_nl_find_msg (struct loaded_l10nfile *domain_file,
- struct binding *domainbinding, const char *msgid,
- size_t *lengthp)
- internal_function;
-
-#ifdef _LIBC
-extern char *__gettext (const char *__msgid);
-extern char *__dgettext (const char *__domainname, const char *__msgid);
-extern char *__dcgettext (const char *__domainname, const char *__msgid,
- int __category);
-extern char *__ngettext (const char *__msgid1, const char *__msgid2,
- unsigned long int __n);
-extern char *__dngettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int n);
-extern char *__dcngettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category);
-extern char *__dcigettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- int __plural, unsigned long int __n,
- int __category);
-extern char *__textdomain (const char *__domainname);
-extern char *__bindtextdomain (const char *__domainname,
- const char *__dirname);
-extern char *__bind_textdomain_codeset (const char *__domainname,
- const char *__codeset);
-#else
-/* Declare the exported libintl_* functions, in a way that allows us to
- call them under their real name. */
-# undef _INTL_REDIRECT_INLINE
-# undef _INTL_REDIRECT_MACROS
-# define _INTL_REDIRECT_MACROS
-# include "libgnuintl.h"
-extern char *libintl_dcigettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- int __plural, unsigned long int __n,
- int __category);
-#endif
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h */
diff --git a/intl/gmo.h b/intl/gmo.h
deleted file mode 100644
index e7c9cc14..00000000
--- a/intl/gmo.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Description of GNU message catalog format: general file layout.
- Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <limits.h>
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format. */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format. */
-#define MO_REVISION_NUMBER 0
-#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
-
-/* The following contortions are an attempt to use the C preprocessor
- to determine an unsigned integral type that is 32 bits wide. An
- alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
- as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
- when cross-compiling. */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
- This should be valid for all systems GNU cares about because
- that doesn't include 16-bit systems, and only modern systems
- (that certainly have <limits.h>) have 64+-bit integral types. */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-# if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-# else
- /* The following line is intended to throw an error. Using #error is
- not portable enough. */
- "Cannot determine unsigned 32-bit data type."
-# endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format. */
-struct mo_file_header
-{
- /* The magic number. */
- nls_uint32 magic;
- /* The revision number of the file format. */
- nls_uint32 revision;
-
- /* The following are only used in .mo files with major revision 0 or 1. */
-
- /* The number of strings pairs. */
- nls_uint32 nstrings;
- /* Offset of table with start offsets of original strings. */
- nls_uint32 orig_tab_offset;
- /* Offset of table with start offsets of translated strings. */
- nls_uint32 trans_tab_offset;
- /* Size of hash table. */
- nls_uint32 hash_tab_size;
- /* Offset of first hash table entry. */
- nls_uint32 hash_tab_offset;
-
- /* The following are only used in .mo files with minor revision >= 1. */
-
- /* The number of system dependent segments. */
- nls_uint32 n_sysdep_segments;
- /* Offset of table describing system dependent segments. */
- nls_uint32 sysdep_segments_offset;
- /* The number of system dependent strings pairs. */
- nls_uint32 n_sysdep_strings;
- /* Offset of table with start offsets of original sysdep strings. */
- nls_uint32 orig_sysdep_tab_offset;
- /* Offset of table with start offsets of translated sysdep strings. */
- nls_uint32 trans_sysdep_tab_offset;
-};
-
-/* Descriptor for static string contained in the binary .mo file. */
-struct string_desc
-{
- /* Length of addressed string, not including the trailing NUL. */
- nls_uint32 length;
- /* Offset of string in file. */
- nls_uint32 offset;
-};
-
-/* The following are only used in .mo files with minor revision >= 1. */
-
-/* Descriptor for system dependent string segment. */
-struct sysdep_segment
-{
- /* Length of addressed string, including the trailing NUL. */
- nls_uint32 length;
- /* Offset of string in file. */
- nls_uint32 offset;
-};
-
-/* Descriptor for system dependent string. */
-struct sysdep_string
-{
- /* Offset of static string segments in file. */
- nls_uint32 offset;
- /* Alternating sequence of static and system dependent segments.
- The last segment is a static segment, including the trailing NUL. */
- struct segment_pair
- {
- /* Size of static segment. */
- nls_uint32 segsize;
- /* Reference to system dependent string segment, or ~0 at the end. */
- nls_uint32 sysdepref;
- } segments[1];
-};
-
-/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
- regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
-#define SEGMENTS_END ((nls_uint32) ~0)
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettext.h */
diff --git a/intl/hash-string.h b/intl/hash-string.h
deleted file mode 100644
index 093e3b1c..00000000
--- a/intl/hash-string.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Description of GNU message catalog format: string hashing function.
- Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* @@ end of prolog @@ */
-
-/* We assume to have `unsigned long int' value with at least 32 bits. */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
- [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
- 1986, 1987 Bell Telephone Laboratories, Inc.] */
-static inline unsigned long int
-hash_string (const char *str_param)
-{
- unsigned long int hval, g;
- const char *str = str_param;
-
- /* Compute the hash value for the given string. */
- hval = 0;
- while (*str != '\0')
- {
- hval <<= 4;
- hval += (unsigned char) *str++;
- g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
- if (g != 0)
- {
- hval ^= g >> (HASHWORDBITS - 8);
- hval ^= g;
- }
- }
- return hval;
-}
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
deleted file mode 100644
index 96f9d955..00000000
--- a/intl/intl-compat.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
- Library.
- Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* This file redirects the gettext functions (without prefix) to those
- defined in the included GNU libintl library (with "libintl_" prefix).
- It is compiled into libintl in order to make the AM_GNU_GETTEXT test
- of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
- has the redirections primarily in the <libintl.h> include file.
- It is also compiled into libgnuintl so that libgnuintl.so can be used
- as LD_PRELOADable library on glibc systems, to provide the extra
- features that the functions in the libc don't have (namely, logging). */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef ngettext
-#undef dngettext
-#undef dcngettext
-#undef textdomain
-#undef bindtextdomain
-#undef bind_textdomain_codeset
-
-
-/* When building a DLL, we must export some functions. Note that because
- the functions are only defined for binary backward compatibility, we
- don't need to use __declspec(dllimport) in any case. */
-#if defined _MSC_VER && BUILDING_DLL
-# define DLL_EXPORTED __declspec(dllexport)
-#else
-# define DLL_EXPORTED
-#endif
-
-
-DLL_EXPORTED
-char *
-gettext (const char *msgid)
-{
- return libintl_gettext (msgid);
-}
-
-
-DLL_EXPORTED
-char *
-dgettext (const char *domainname, const char *msgid)
-{
- return libintl_dgettext (domainname, msgid);
-}
-
-
-DLL_EXPORTED
-char *
-dcgettext (const char *domainname, const char *msgid, int category)
-{
- return libintl_dcgettext (domainname, msgid, category);
-}
-
-
-DLL_EXPORTED
-char *
-ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
-{
- return libintl_ngettext (msgid1, msgid2, n);
-}
-
-
-DLL_EXPORTED
-char *
-dngettext (const char *domainname,
- const char *msgid1, const char *msgid2, unsigned long int n)
-{
- return libintl_dngettext (domainname, msgid1, msgid2, n);
-}
-
-
-DLL_EXPORTED
-char *
-dcngettext (const char *domainname,
- const char *msgid1, const char *msgid2, unsigned long int n,
- int category)
-{
- return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
-}
-
-
-DLL_EXPORTED
-char *
-textdomain (const char *domainname)
-{
- return libintl_textdomain (domainname);
-}
-
-
-DLL_EXPORTED
-char *
-bindtextdomain (const char *domainname, const char *dirname)
-{
- return libintl_bindtextdomain (domainname, dirname);
-}
-
-
-DLL_EXPORTED
-char *
-bind_textdomain_codeset (const char *domainname, const char *codeset)
-{
- return libintl_bind_textdomain_codeset (domainname, codeset);
-}
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
deleted file mode 100644
index eb995aaf..00000000
--- a/intl/l10nflist.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
- This must come before <config.h> because <config.h> may include
- <features.h>, and once <features.h> has been included, it's too late. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found. Sigh! */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-# define NULL ((void *) 0)
-# else
-# define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions. This is required by the standard
- because some ANSI C functions will require linking with this object
- file and the name space must not be polluted. */
-# ifndef stpcpy
-# define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
-# endif
-#endif
-
-/* Pathname support.
- ISSLASH(C) tests whether C is a directory separator character.
- IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
- it may be concatenated to a directory pathname.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
- /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
- && (P)[1] == ':')
-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
-#else
- /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-#endif
-
-/* Define function which are usually not available. */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ. */
-static size_t
-argz_count__ (const char *argz, size_t len)
-{
- size_t count = 0;
- while (len > 0)
- {
- size_t part_len = strlen (argz);
- argz += part_len + 1;
- len -= part_len + 1;
- count++;
- }
- return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#else
-# ifdef _LIBC
-# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
-# endif
-#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
- except the last into the character SEP. */
-static void
-argz_stringify__ (char *argz, size_t len, int sep)
-{
- while (len > 0)
- {
- size_t part_len = strlen (argz);
- argz += part_len;
- len -= part_len + 1;
- if (len > 0)
- *argz++ = sep;
- }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#else
-# ifdef _LIBC
-# define __argz_stringify(argz, len, sep) \
- INTUSE(__argz_stringify) (argz, len, sep)
-# endif
-#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *
-argz_next__ (char *argz, size_t argz_len, const char *entry)
-{
- if (entry)
- {
- if (entry < argz + argz_len)
- entry = strchr (entry, '\0') + 1;
-
- return entry >= argz + argz_len ? NULL : (char *) entry;
- }
- else
- if (argz_len > 0)
- return argz;
- else
- return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X. */
-static inline int
-pop (int x)
-{
- /* We assume that no more than 16 bits are used. */
- x = ((x & ~0x5555) >> 1) + (x & 0x5555);
- x = ((x & ~0x3333) >> 2) + (x & 0x3333);
- x = ((x >> 4) + x) & 0x0f0f;
- x = ((x >> 8) + x) & 0xff;
-
- return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
- const char *dirlist, size_t dirlist_len,
- int mask, const char *language, const char *territory,
- const char *codeset, const char *normalized_codeset,
- const char *modifier, const char *special,
- const char *sponsor, const char *revision,
- const char *filename, int do_allocate)
-{
- char *abs_filename;
- struct loaded_l10nfile **lastp;
- struct loaded_l10nfile *retval;
- char *cp;
- size_t dirlist_count;
- size_t entries;
- int cnt;
-
- /* If LANGUAGE contains an absolute directory specification, we ignore
- DIRLIST. */
- if (IS_ABSOLUTE_PATH (language))
- dirlist_len = 0;
-
- /* Allocate room for the full file name. */
- abs_filename = (char *) malloc (dirlist_len
- + strlen (language)
- + ((mask & TERRITORY) != 0
- ? strlen (territory) + 1 : 0)
- + ((mask & XPG_CODESET) != 0
- ? strlen (codeset) + 1 : 0)
- + ((mask & XPG_NORM_CODESET) != 0
- ? strlen (normalized_codeset) + 1 : 0)
- + (((mask & XPG_MODIFIER) != 0
- || (mask & CEN_AUDIENCE) != 0)
- ? strlen (modifier) + 1 : 0)
- + ((mask & CEN_SPECIAL) != 0
- ? strlen (special) + 1 : 0)
- + (((mask & CEN_SPONSOR) != 0
- || (mask & CEN_REVISION) != 0)
- ? (1 + ((mask & CEN_SPONSOR) != 0
- ? strlen (sponsor) : 0)
- + ((mask & CEN_REVISION) != 0
- ? strlen (revision) + 1 : 0)) : 0)
- + 1 + strlen (filename) + 1);
-
- if (abs_filename == NULL)
- return NULL;
-
- /* Construct file name. */
- cp = abs_filename;
- if (dirlist_len > 0)
- {
- memcpy (cp, dirlist, dirlist_len);
- __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
- cp += dirlist_len;
- cp[-1] = '/';
- }
-
- cp = stpcpy (cp, language);
-
- if ((mask & TERRITORY) != 0)
- {
- *cp++ = '_';
- cp = stpcpy (cp, territory);
- }
- if ((mask & XPG_CODESET) != 0)
- {
- *cp++ = '.';
- cp = stpcpy (cp, codeset);
- }
- if ((mask & XPG_NORM_CODESET) != 0)
- {
- *cp++ = '.';
- cp = stpcpy (cp, normalized_codeset);
- }
- if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
- {
- /* This component can be part of both syntaces but has different
- leading characters. For CEN we use `+', else `@'. */
- *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
- cp = stpcpy (cp, modifier);
- }
- if ((mask & CEN_SPECIAL) != 0)
- {
- *cp++ = '+';
- cp = stpcpy (cp, special);
- }
- if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
- {
- *cp++ = ',';
- if ((mask & CEN_SPONSOR) != 0)
- cp = stpcpy (cp, sponsor);
- if ((mask & CEN_REVISION) != 0)
- {
- *cp++ = '_';
- cp = stpcpy (cp, revision);
- }
- }
-
- *cp++ = '/';
- stpcpy (cp, filename);
-
- /* Look in list of already loaded domains whether it is already
- available. */
- lastp = l10nfile_list;
- for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
- if (retval->filename != NULL)
- {
- int compare = strcmp (retval->filename, abs_filename);
- if (compare == 0)
- /* We found it! */
- break;
- if (compare < 0)
- {
- /* It's not in the list. */
- retval = NULL;
- break;
- }
-
- lastp = &retval->next;
- }
-
- if (retval != NULL || do_allocate == 0)
- {
- free (abs_filename);
- return retval;
- }
-
- dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
-
- /* Allocate a new loaded_l10nfile. */
- retval =
- (struct loaded_l10nfile *)
- malloc (sizeof (*retval)
- + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
- * sizeof (struct loaded_l10nfile *)));
- if (retval == NULL)
- return NULL;
-
- retval->filename = abs_filename;
-
- /* We set retval->data to NULL here; it is filled in later.
- Setting retval->decided to 1 here means that retval does not
- correspond to a real file (dirlist_count > 1) or is not worth
- looking up (if an unnormalized codeset was specified). */
- retval->decided = (dirlist_count > 1
- || ((mask & XPG_CODESET) != 0
- && (mask & XPG_NORM_CODESET) != 0));
- retval->data = NULL;
-
- retval->next = *lastp;
- *lastp = retval;
-
- entries = 0;
- /* Recurse to fill the inheritance list of RETVAL.
- If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
- entry does not correspond to a real file; retval->filename contains
- colons. In this case we loop across all elements of DIRLIST and
- across all bit patterns dominated by MASK.
- If the DIRLIST is a single directory or entirely redundant (i.e.
- DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
- MASK, excluding MASK itself.
- In either case, we loop down from MASK to 0. This has the effect
- that the extra bits in the locale name are dropped in this order:
- first the modifier, then the territory, then the codeset, then the
- normalized_codeset. */
- for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
- if ((cnt & ~mask) == 0
- && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
- && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
- {
- if (dirlist_count > 1)
- {
- /* Iterate over all elements of the DIRLIST. */
- char *dir = NULL;
-
- while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
- != NULL)
- retval->successor[entries++]
- = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
- cnt, language, territory, codeset,
- normalized_codeset, modifier, special,
- sponsor, revision, filename, 1);
- }
- else
- retval->successor[entries++]
- = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
- cnt, language, territory, codeset,
- normalized_codeset, modifier, special,
- sponsor, revision, filename, 1);
- }
- retval->successor[entries] = NULL;
-
- return retval;
-}
-
-/* Normalize codeset name. There is no standard for the codeset
- names. Normalization allows the user to use any of the common
- names. The return value is dynamically allocated and has to be
- freed by the caller. */
-const char *
-_nl_normalize_codeset (const char *codeset, size_t name_len)
-{
- int len = 0;
- int only_digit = 1;
- char *retval;
- char *wp;
- size_t cnt;
-
- for (cnt = 0; cnt < name_len; ++cnt)
- if (isalnum ((unsigned char) codeset[cnt]))
- {
- ++len;
-
- if (isalpha ((unsigned char) codeset[cnt]))
- only_digit = 0;
- }
-
- retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
- if (retval != NULL)
- {
- if (only_digit)
- wp = stpcpy (retval, "iso");
- else
- wp = retval;
-
- for (cnt = 0; cnt < name_len; ++cnt)
- if (isalpha ((unsigned char) codeset[cnt]))
- *wp++ = tolower ((unsigned char) codeset[cnt]);
- else if (isdigit ((unsigned char) codeset[cnt]))
- *wp++ = codeset[cnt];
-
- *wp = '\0';
- }
-
- return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library. So we
- avoid the non-standard function stpcpy. In GNU C Library this
- function is available, though. Also allow the symbol HAVE_STPCPY
- to be defined. */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (char *dest, const char *src)
-{
- while ((*dest++ = *src++) != '\0')
- /* Do nothing. */ ;
- return dest - 1;
-}
-#endif
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
deleted file mode 100644
index 3be7eb99..00000000
--- a/intl/libgnuintl.h.in
+++ /dev/null
@@ -1,383 +0,0 @@
-/* Message catalogs for internationalization.
- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H 1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
- gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
- On systems that don't define it, use an arbitrary value instead.
- On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
- then includes <libintl.h> (i.e. this file!) and then only defines
- LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
- in this case. */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
- implementation of gettext. */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats. Returns the
- maximum minor revision number supported for a given major revision. */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
- ((major) == 0 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
- precedence over _conio_gettext. */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* We redirect the functions to those prefixed with "libintl_". This is
- necessary, because some systems define gettext/textdomain/... in the C
- library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
- If we used the unprefixed names, there would be cases where the
- definition in the C library would override the one in the libintl.so
- shared library. Recall that on ELF systems, the symbols are looked
- up in the following order:
- 1. in the executable,
- 2. in the shared libraries specified on the link command line, in order,
- 3. in the dependencies of the shared libraries specified on the link
- command line,
- 4. in the dlopen()ed shared libraries, in the order in which they were
- dlopen()ed.
- The definition in the C library would override the one in libintl.so if
- either
- * -lc is given on the link command line and -lintl isn't, or
- * -lc is given on the link command line before -lintl, or
- * libintl.so is a dependency of a dlopen()ed shared library but not
- linked to the executable at link time.
- Since Solaris gettext() behaves differently than GNU gettext(), this
- would be unacceptable.
-
- The redirection happens by default through macros in C, so that &gettext
- is independent of the compilation unit, but through inline functions in
- C++, in order not to interfere with the name mangling of class fields or
- class methods called 'gettext'. */
-
-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
- If he doesn't, we choose the method. A third possible method is
- _INTL_REDIRECT_ASM, supported only by GCC. */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-# define _INTL_REDIRECT_ASM
-# else
-# ifdef __cplusplus
-# define _INTL_REDIRECT_INLINE
-# else
-# define _INTL_REDIRECT_MACROS
-# endif
-# endif
-#endif
-/* Auxiliary macros. */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
- LC_MESSAGES locale. If not found, returns MSGID itself (the default
- text). */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid);
-static inline char *gettext (const char *__msgid)
-{
- return libintl_gettext (__msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-extern char *gettext (const char *__msgid)
- _INTL_ASM (libintl_gettext);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
- LC_MESSAGES locale. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
-static inline char *dgettext (const char *__domainname, const char *__msgid)
-{
- return libintl_dgettext (__domainname, __msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-extern char *dgettext (const char *__domainname, const char *__msgid)
- _INTL_ASM (libintl_dgettext);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
- locale. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
- int __category);
-static inline char *dcgettext (const char *__domainname, const char *__msgid,
- int __category)
-{
- return libintl_dcgettext (__domainname, __msgid, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-extern char *dcgettext (const char *__domainname, const char *__msgid,
- int __category)
- _INTL_ASM (libintl_dcgettext);
-#endif
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
- number N. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
- unsigned long int __n);
-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
- unsigned long int __n)
-{
- return libintl_ngettext (__msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
- unsigned long int __n)
- _INTL_ASM (libintl_ngettext);
-#endif
-
-/* Similar to `dgettext' but select the plural form corresponding to the
- number N. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
- const char *__msgid2, unsigned long int __n);
-static inline char *dngettext (const char *__domainname, const char *__msgid1,
- const char *__msgid2, unsigned long int __n)
-{
- return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-extern char *dngettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n)
- _INTL_ASM (libintl_dngettext);
-#endif
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
- number N. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcngettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category);
-static inline char *dcngettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category)
-{
- return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-extern char *dcngettext (const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category)
- _INTL_ASM (libintl_dcngettext);
-#endif
-
-
-/* Set the current default message catalog to DOMAINNAME.
- If DOMAINNAME is null, return the current default.
- If DOMAINNAME is "", reset to the default of "messages". */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_textdomain (const char *__domainname);
-static inline char *textdomain (const char *__domainname)
-{
- return libintl_textdomain (__domainname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-extern char *textdomain (const char *__domainname)
- _INTL_ASM (libintl_textdomain);
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
- in DIRNAME rather than in the system locale data base. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bindtextdomain (const char *__domainname,
- const char *__dirname);
-static inline char *bindtextdomain (const char *__domainname,
- const char *__dirname)
-{
- return libintl_bindtextdomain (__domainname, __dirname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-extern char *bindtextdomain (const char *__domainname, const char *__dirname)
- _INTL_ASM (libintl_bindtextdomain);
-#endif
-
-/* Specify the character encoding in which the messages from the
- DOMAINNAME message catalog will be returned. */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
- const char *__codeset);
-static inline char *bind_textdomain_codeset (const char *__domainname,
- const char *__codeset)
-{
- return libintl_bind_textdomain_codeset (__domainname, __codeset);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-extern char *bind_textdomain_codeset (const char *__domainname,
- const char *__codeset)
- _INTL_ASM (libintl_bind_textdomain_codeset);
-#endif
-
-
-/* Support for format strings with positions in *printf(), following the
- POSIX/XSI specification.
- Note: These replacements for the *printf() functions are visible only
- in source files that #include <libintl.h> or #include "gettext.h".
- Packages that use *printf() in source files that don't refer to _()
- or gettext() but for which the format string could be the return value
- of _() or gettext() need to add this #include. Oh well. */
-
-#if !@HAVE_POSIX_PRINTF@
-
-#include <stdio.h>
-#include <stddef.h>
-
-/* Get va_list. */
-#if __STDC__ || defined __cplusplus || defined _MSC_VER
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#undef fprintf
-#define fprintf libintl_fprintf
-extern int fprintf (FILE *, const char *, ...);
-#undef vfprintf
-#define vfprintf libintl_vfprintf
-extern int vfprintf (FILE *, const char *, va_list);
-
-#undef printf
-#define printf libintl_printf
-extern int printf (const char *, ...);
-#undef vprintf
-#define vprintf libintl_vprintf
-extern int vprintf (const char *, va_list);
-
-#undef sprintf
-#define sprintf libintl_sprintf
-extern int sprintf (char *, const char *, ...);
-#undef vsprintf
-#define vsprintf libintl_vsprintf
-extern int vsprintf (char *, const char *, va_list);
-
-#if @HAVE_SNPRINTF@
-
-#undef snprintf
-#define snprintf libintl_snprintf
-extern int snprintf (char *, size_t, const char *, ...);
-#undef vsnprintf
-#define vsnprintf libintl_vsnprintf
-extern int vsnprintf (char *, size_t, const char *, va_list);
-
-#endif
-
-#if @HAVE_ASPRINTF@
-
-#undef asprintf
-#define asprintf libintl_asprintf
-extern int asprintf (char **, const char *, ...);
-#undef vasprintf
-#define vasprintf libintl_vasprintf
-extern int vasprintf (char **, const char *, va_list);
-
-#endif
-
-#if @HAVE_WPRINTF@
-
-#undef fwprintf
-#define fwprintf libintl_fwprintf
-extern int fwprintf (FILE *, const wchar_t *, ...);
-#undef vfwprintf
-#define vfwprintf libintl_vfwprintf
-extern int vfwprintf (FILE *, const wchar_t *, va_list);
-
-#undef wprintf
-#define wprintf libintl_wprintf
-extern int wprintf (const wchar_t *, ...);
-#undef vwprintf
-#define vwprintf libintl_vwprintf
-extern int vwprintf (const wchar_t *, va_list);
-
-#undef swprintf
-#define swprintf libintl_swprintf
-extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-#undef vswprintf
-#define vswprintf libintl_vswprintf
-extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-
-#endif
-
-#endif
-
-
-/* Support for relocatable packages. */
-
-/* Sets the original and the current installation prefix of the package.
- Relocation simply replaces a pathname starting with the original prefix
- by the corresponding pathname with the current prefix instead. Both
- prefixes should be directory names without trailing slash (i.e. use ""
- instead of "/"). */
-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-extern void
- libintl_set_relocation_prefix (const char *orig_prefix,
- const char *curr_prefix);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
deleted file mode 100644
index 65e5ebd1..00000000
--- a/intl/loadinfo.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _LOADINFO_H
-#define _LOADINFO_H 1
-
-/* Declarations of locale dependent catalog lookup functions.
- Implemented in
-
- localealias.c Possibly replace a locale name by another.
- explodename.c Split a locale name into its various fields.
- l10nflist.c Generate a list of filenames of possible message catalogs.
- finddomain.c Find and open the relevant message catalogs.
-
- The main function _nl_find_domain() in finddomain.c is declared
- in gettextP.h.
- */
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
- almost always true or almost always false. */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Separator in PATH like lists of pathnames. */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
- /* Win32, OS/2, DOS */
-# define PATH_SEPARATOR ';'
-#else
- /* Unix */
-# define PATH_SEPARATOR ':'
-#endif
-
-/* Encoding of locale name parts. */
-#define CEN_REVISION 1
-#define CEN_SPONSOR 2
-#define CEN_SPECIAL 4
-#define XPG_NORM_CODESET 8
-#define XPG_CODESET 16
-#define TERRITORY 32
-#define CEN_AUDIENCE 64
-#define XPG_MODIFIER 128
-
-#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
- const char *filename;
- int decided;
-
- const void *data;
-
- struct loaded_l10nfile *next;
- struct loaded_l10nfile *successor[1];
-};
-
-
-/* Normalize codeset name. There is no standard for the codeset
- names. Normalization allows the user to use any of the common
- names. The return value is dynamically allocated and has to be
- freed by the caller. */
-extern const char *_nl_normalize_codeset (const char *codeset,
- size_t name_len);
-
-/* Lookup a locale dependent file.
- *L10NFILE_LIST denotes a pool of lookup results of locale dependent
- files of the same kind, sorted in decreasing order of ->filename.
- DIRLIST and DIRLIST_LEN are an argz list of directories in which to
- look, containing at least one directory (i.e. DIRLIST_LEN > 0).
- MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
- SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
- produced by _nl_explode_name(). FILENAME is the filename suffix.
- The return value is the lookup result, either found in *L10NFILE_LIST,
- or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
- If the return value is non-NULL, it is added to *L10NFILE_LIST, and
- its ->next field denotes the chaining inside *L10NFILE_LIST, and
- furthermore its ->successor[] field contains a list of other lookup
- results from which this lookup result inherits. */
-extern struct loaded_l10nfile *
-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
- const char *dirlist, size_t dirlist_len, int mask,
- const char *language, const char *territory,
- const char *codeset, const char *normalized_codeset,
- const char *modifier, const char *special,
- const char *sponsor, const char *revision,
- const char *filename, int do_allocate);
-
-/* Lookup the real locale name for a locale alias NAME, or NULL if
- NAME is not a locale alias (but possibly a real locale name).
- The return value is statically allocated and must not be freed. */
-extern const char *_nl_expand_alias (const char *name);
-
-/* Split a locale name NAME into its pieces: language, modifier,
- territory, codeset, special, sponsor, revision.
- NAME gets destructively modified: NUL bytes are inserted here and
- there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
- *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
- pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
- gets assigned the expanded *CODESET, if it is different from *CODESET;
- this one is dynamically allocated and has to be freed by the caller.
- The return value is a bitmask, where each bit corresponds to one
- filled-in value:
- XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
- TERRITORY for *TERRITORY,
- XPG_CODESET for *CODESET,
- XPG_NORM_CODESET for *NORMALIZED_CODESET,
- CEN_SPECIAL for *SPECIAL,
- CEN_SPONSOR for *SPONSOR,
- CEN_REVISION for *REVISION.
- */
-extern int _nl_explode_name (char *name, const char **language,
- const char **modifier, const char **territory,
- const char **codeset,
- const char **normalized_codeset,
- const char **special, const char **sponsor,
- const char **revision);
-
-/* Split a locale name NAME into a leading language part and all the
- rest. Return a pointer to the first character after the language,
- i.e. to the first byte of the rest. */
-extern char *_nl_find_language (const char *name);
-
-#endif /* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
deleted file mode 100644
index 99c51b4c..00000000
--- a/intl/loadmsgcat.c
+++ /dev/null
@@ -1,1420 +0,0 @@
-/* Load needed message catalogs.
- Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
- This must come before <config.h> because <config.h> may include
- <features.h>, and once <features.h> has been included, it's too late. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef __GNUC__
-# undef alloca
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || (defined _LIBC && defined _POSIX_MAPPED_FILES)
-# include <sys/mman.h>
-# undef HAVE_MMAP
-# define HAVE_MMAP 1
-#else
-# undef HAVE_MMAP
-#endif
-
-#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
-# include <stdint.h>
-#endif
-#if defined HAVE_INTTYPES_H || defined _LIBC
-# include <inttypes.h>
-#endif
-
-#include "gmo.h"
-#include "gettextP.h"
-#include "hash-string.h"
-#include "plural-exp.h"
-
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-#endif
-
-/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
- Note that our fallback values need not be literal strings, because we don't
- use them with preprocessor string concatenation. */
-#if !defined PRId8 || PRI_MACROS_BROKEN
-# undef PRId8
-# define PRId8 "d"
-#endif
-#if !defined PRIi8 || PRI_MACROS_BROKEN
-# undef PRIi8
-# define PRIi8 "i"
-#endif
-#if !defined PRIo8 || PRI_MACROS_BROKEN
-# undef PRIo8
-# define PRIo8 "o"
-#endif
-#if !defined PRIu8 || PRI_MACROS_BROKEN
-# undef PRIu8
-# define PRIu8 "u"
-#endif
-#if !defined PRIx8 || PRI_MACROS_BROKEN
-# undef PRIx8
-# define PRIx8 "x"
-#endif
-#if !defined PRIX8 || PRI_MACROS_BROKEN
-# undef PRIX8
-# define PRIX8 "X"
-#endif
-#if !defined PRId16 || PRI_MACROS_BROKEN
-# undef PRId16
-# define PRId16 "d"
-#endif
-#if !defined PRIi16 || PRI_MACROS_BROKEN
-# undef PRIi16
-# define PRIi16 "i"
-#endif
-#if !defined PRIo16 || PRI_MACROS_BROKEN
-# undef PRIo16
-# define PRIo16 "o"
-#endif
-#if !defined PRIu16 || PRI_MACROS_BROKEN
-# undef PRIu16
-# define PRIu16 "u"
-#endif
-#if !defined PRIx16 || PRI_MACROS_BROKEN
-# undef PRIx16
-# define PRIx16 "x"
-#endif
-#if !defined PRIX16 || PRI_MACROS_BROKEN
-# undef PRIX16
-# define PRIX16 "X"
-#endif
-#if !defined PRId32 || PRI_MACROS_BROKEN
-# undef PRId32
-# define PRId32 "d"
-#endif
-#if !defined PRIi32 || PRI_MACROS_BROKEN
-# undef PRIi32
-# define PRIi32 "i"
-#endif
-#if !defined PRIo32 || PRI_MACROS_BROKEN
-# undef PRIo32
-# define PRIo32 "o"
-#endif
-#if !defined PRIu32 || PRI_MACROS_BROKEN
-# undef PRIu32
-# define PRIu32 "u"
-#endif
-#if !defined PRIx32 || PRI_MACROS_BROKEN
-# undef PRIx32
-# define PRIx32 "x"
-#endif
-#if !defined PRIX32 || PRI_MACROS_BROKEN
-# undef PRIX32
-# define PRIX32 "X"
-#endif
-#if !defined PRId64 || PRI_MACROS_BROKEN
-# undef PRId64
-# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
-#endif
-#if !defined PRIi64 || PRI_MACROS_BROKEN
-# undef PRIi64
-# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
-#endif
-#if !defined PRIo64 || PRI_MACROS_BROKEN
-# undef PRIo64
-# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
-#endif
-#if !defined PRIu64 || PRI_MACROS_BROKEN
-# undef PRIu64
-# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
-#endif
-#if !defined PRIx64 || PRI_MACROS_BROKEN
-# undef PRIx64
-# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
-#endif
-#if !defined PRIX64 || PRI_MACROS_BROKEN
-# undef PRIX64
-# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
-#endif
-#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
-# undef PRIdLEAST8
-# define PRIdLEAST8 "d"
-#endif
-#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
-# undef PRIiLEAST8
-# define PRIiLEAST8 "i"
-#endif
-#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
-# undef PRIoLEAST8
-# define PRIoLEAST8 "o"
-#endif
-#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
-# undef PRIuLEAST8
-# define PRIuLEAST8 "u"
-#endif
-#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
-# undef PRIxLEAST8
-# define PRIxLEAST8 "x"
-#endif
-#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
-# undef PRIXLEAST8
-# define PRIXLEAST8 "X"
-#endif
-#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
-# undef PRIdLEAST16
-# define PRIdLEAST16 "d"
-#endif
-#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
-# undef PRIiLEAST16
-# define PRIiLEAST16 "i"
-#endif
-#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
-# undef PRIoLEAST16
-# define PRIoLEAST16 "o"
-#endif
-#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
-# undef PRIuLEAST16
-# define PRIuLEAST16 "u"
-#endif
-#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
-# undef PRIxLEAST16
-# define PRIxLEAST16 "x"
-#endif
-#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
-# undef PRIXLEAST16
-# define PRIXLEAST16 "X"
-#endif
-#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
-# undef PRIdLEAST32
-# define PRIdLEAST32 "d"
-#endif
-#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
-# undef PRIiLEAST32
-# define PRIiLEAST32 "i"
-#endif
-#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
-# undef PRIoLEAST32
-# define PRIoLEAST32 "o"
-#endif
-#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
-# undef PRIuLEAST32
-# define PRIuLEAST32 "u"
-#endif
-#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
-# undef PRIxLEAST32
-# define PRIxLEAST32 "x"
-#endif
-#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
-# undef PRIXLEAST32
-# define PRIXLEAST32 "X"
-#endif
-#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
-# undef PRIdLEAST64
-# define PRIdLEAST64 PRId64
-#endif
-#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
-# undef PRIiLEAST64
-# define PRIiLEAST64 PRIi64
-#endif
-#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
-# undef PRIoLEAST64
-# define PRIoLEAST64 PRIo64
-#endif
-#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
-# undef PRIuLEAST64
-# define PRIuLEAST64 PRIu64
-#endif
-#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
-# undef PRIxLEAST64
-# define PRIxLEAST64 PRIx64
-#endif
-#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
-# undef PRIXLEAST64
-# define PRIXLEAST64 PRIX64
-#endif
-#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
-# undef PRIdFAST8
-# define PRIdFAST8 "d"
-#endif
-#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
-# undef PRIiFAST8
-# define PRIiFAST8 "i"
-#endif
-#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
-# undef PRIoFAST8
-# define PRIoFAST8 "o"
-#endif
-#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
-# undef PRIuFAST8
-# define PRIuFAST8 "u"
-#endif
-#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
-# undef PRIxFAST8
-# define PRIxFAST8 "x"
-#endif
-#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
-# undef PRIXFAST8
-# define PRIXFAST8 "X"
-#endif
-#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
-# undef PRIdFAST16
-# define PRIdFAST16 "d"
-#endif
-#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
-# undef PRIiFAST16
-# define PRIiFAST16 "i"
-#endif
-#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
-# undef PRIoFAST16
-# define PRIoFAST16 "o"
-#endif
-#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
-# undef PRIuFAST16
-# define PRIuFAST16 "u"
-#endif
-#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
-# undef PRIxFAST16
-# define PRIxFAST16 "x"
-#endif
-#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
-# undef PRIXFAST16
-# define PRIXFAST16 "X"
-#endif
-#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
-# undef PRIdFAST32
-# define PRIdFAST32 "d"
-#endif
-#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
-# undef PRIiFAST32
-# define PRIiFAST32 "i"
-#endif
-#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
-# undef PRIoFAST32
-# define PRIoFAST32 "o"
-#endif
-#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
-# undef PRIuFAST32
-# define PRIuFAST32 "u"
-#endif
-#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
-# undef PRIxFAST32
-# define PRIxFAST32 "x"
-#endif
-#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
-# undef PRIXFAST32
-# define PRIXFAST32 "X"
-#endif
-#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
-# undef PRIdFAST64
-# define PRIdFAST64 PRId64
-#endif
-#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
-# undef PRIiFAST64
-# define PRIiFAST64 PRIi64
-#endif
-#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
-# undef PRIoFAST64
-# define PRIoFAST64 PRIo64
-#endif
-#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
-# undef PRIuFAST64
-# define PRIuFAST64 PRIu64
-#endif
-#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
-# undef PRIxFAST64
-# define PRIxFAST64 PRIx64
-#endif
-#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
-# undef PRIXFAST64
-# define PRIXFAST64 PRIX64
-#endif
-#if !defined PRIdMAX || PRI_MACROS_BROKEN
-# undef PRIdMAX
-# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
-#endif
-#if !defined PRIiMAX || PRI_MACROS_BROKEN
-# undef PRIiMAX
-# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
-#endif
-#if !defined PRIoMAX || PRI_MACROS_BROKEN
-# undef PRIoMAX
-# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
-#endif
-#if !defined PRIuMAX || PRI_MACROS_BROKEN
-# undef PRIuMAX
-# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
-#endif
-#if !defined PRIxMAX || PRI_MACROS_BROKEN
-# undef PRIxMAX
-# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
-#endif
-#if !defined PRIXMAX || PRI_MACROS_BROKEN
-# undef PRIXMAX
-# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
-#endif
-#if !defined PRIdPTR || PRI_MACROS_BROKEN
-# undef PRIdPTR
-# define PRIdPTR \
- (sizeof (void *) == sizeof (long) ? "ld" : \
- sizeof (void *) == sizeof (int) ? "d" : \
- "lld")
-#endif
-#if !defined PRIiPTR || PRI_MACROS_BROKEN
-# undef PRIiPTR
-# define PRIiPTR \
- (sizeof (void *) == sizeof (long) ? "li" : \
- sizeof (void *) == sizeof (int) ? "i" : \
- "lli")
-#endif
-#if !defined PRIoPTR || PRI_MACROS_BROKEN
-# undef PRIoPTR
-# define PRIoPTR \
- (sizeof (void *) == sizeof (long) ? "lo" : \
- sizeof (void *) == sizeof (int) ? "o" : \
- "llo")
-#endif
-#if !defined PRIuPTR || PRI_MACROS_BROKEN
-# undef PRIuPTR
-# define PRIuPTR \
- (sizeof (void *) == sizeof (long) ? "lu" : \
- sizeof (void *) == sizeof (int) ? "u" : \
- "llu")
-#endif
-#if !defined PRIxPTR || PRI_MACROS_BROKEN
-# undef PRIxPTR
-# define PRIxPTR \
- (sizeof (void *) == sizeof (long) ? "lx" : \
- sizeof (void *) == sizeof (int) ? "x" : \
- "llx")
-#endif
-#if !defined PRIXPTR || PRI_MACROS_BROKEN
-# undef PRIXPTR
-# define PRIXPTR \
- (sizeof (void *) == sizeof (long) ? "lX" : \
- sizeof (void *) == sizeof (int) ? "X" : \
- "llX")
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions. This is required by the standard
- because some ISO C functions will require linking with this object
- file and the name space must not be polluted. */
-# define open __open
-# define close __close
-# define read __read
-# define mmap __mmap
-# define munmap __munmap
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
- some additional code emulating it. */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
- O_BINARY is usually declared in <fcntl.h>. */
-#if !defined O_BINARY && defined _O_BINARY
- /* For MSC-compatible compilers. */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
- /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-/* On reasonable systems, binary I/O is the default. */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
- with all translations. This is important if the translations are
- cached by one of GCC's features. */
-int _nl_msg_cat_cntr;
-
-
-/* Expand a system dependent string segment. Return NULL if unsupported. */
-static const char *
-get_sysdep_segment_value (const char *name)
-{
- /* Test for an ISO C 99 section 7.8.1 format string directive.
- Syntax:
- P R I { d | i | o | u | x | X }
- { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
- /* We don't use a table of 14 times 6 'const char *' strings here, because
- data relocations cost startup time. */
- if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
- {
- if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
- || name[3] == 'x' || name[3] == 'X')
- {
- if (name[4] == '8' && name[5] == '\0')
- {
- if (name[3] == 'd')
- return PRId8;
- if (name[3] == 'i')
- return PRIi8;
- if (name[3] == 'o')
- return PRIo8;
- if (name[3] == 'u')
- return PRIu8;
- if (name[3] == 'x')
- return PRIx8;
- if (name[3] == 'X')
- return PRIX8;
- abort ();
- }
- if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
- {
- if (name[3] == 'd')
- return PRId16;
- if (name[3] == 'i')
- return PRIi16;
- if (name[3] == 'o')
- return PRIo16;
- if (name[3] == 'u')
- return PRIu16;
- if (name[3] == 'x')
- return PRIx16;
- if (name[3] == 'X')
- return PRIX16;
- abort ();
- }
- if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
- {
- if (name[3] == 'd')
- return PRId32;
- if (name[3] == 'i')
- return PRIi32;
- if (name[3] == 'o')
- return PRIo32;
- if (name[3] == 'u')
- return PRIu32;
- if (name[3] == 'x')
- return PRIx32;
- if (name[3] == 'X')
- return PRIX32;
- abort ();
- }
- if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
- {
- if (name[3] == 'd')
- return PRId64;
- if (name[3] == 'i')
- return PRIi64;
- if (name[3] == 'o')
- return PRIo64;
- if (name[3] == 'u')
- return PRIu64;
- if (name[3] == 'x')
- return PRIx64;
- if (name[3] == 'X')
- return PRIX64;
- abort ();
- }
- if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
- && name[7] == 'S' && name[8] == 'T')
- {
- if (name[9] == '8' && name[10] == '\0')
- {
- if (name[3] == 'd')
- return PRIdLEAST8;
- if (name[3] == 'i')
- return PRIiLEAST8;
- if (name[3] == 'o')
- return PRIoLEAST8;
- if (name[3] == 'u')
- return PRIuLEAST8;
- if (name[3] == 'x')
- return PRIxLEAST8;
- if (name[3] == 'X')
- return PRIXLEAST8;
- abort ();
- }
- if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
- {
- if (name[3] == 'd')
- return PRIdLEAST16;
- if (name[3] == 'i')
- return PRIiLEAST16;
- if (name[3] == 'o')
- return PRIoLEAST16;
- if (name[3] == 'u')
- return PRIuLEAST16;
- if (name[3] == 'x')
- return PRIxLEAST16;
- if (name[3] == 'X')
- return PRIXLEAST16;
- abort ();
- }
- if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
- {
- if (name[3] == 'd')
- return PRIdLEAST32;
- if (name[3] == 'i')
- return PRIiLEAST32;
- if (name[3] == 'o')
- return PRIoLEAST32;
- if (name[3] == 'u')
- return PRIuLEAST32;
- if (name[3] == 'x')
- return PRIxLEAST32;
- if (name[3] == 'X')
- return PRIXLEAST32;
- abort ();
- }
- if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
- {
- if (name[3] == 'd')
- return PRIdLEAST64;
- if (name[3] == 'i')
- return PRIiLEAST64;
- if (name[3] == 'o')
- return PRIoLEAST64;
- if (name[3] == 'u')
- return PRIuLEAST64;
- if (name[3] == 'x')
- return PRIxLEAST64;
- if (name[3] == 'X')
- return PRIXLEAST64;
- abort ();
- }
- }
- if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
- && name[7] == 'T')
- {
- if (name[8] == '8' && name[9] == '\0')
- {
- if (name[3] == 'd')
- return PRIdFAST8;
- if (name[3] == 'i')
- return PRIiFAST8;
- if (name[3] == 'o')
- return PRIoFAST8;
- if (name[3] == 'u')
- return PRIuFAST8;
- if (name[3] == 'x')
- return PRIxFAST8;
- if (name[3] == 'X')
- return PRIXFAST8;
- abort ();
- }
- if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
- {
- if (name[3] == 'd')
- return PRIdFAST16;
- if (name[3] == 'i')
- return PRIiFAST16;
- if (name[3] == 'o')
- return PRIoFAST16;
- if (name[3] == 'u')
- return PRIuFAST16;
- if (name[3] == 'x')
- return PRIxFAST16;
- if (name[3] == 'X')
- return PRIXFAST16;
- abort ();
- }
- if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
- {
- if (name[3] == 'd')
- return PRIdFAST32;
- if (name[3] == 'i')
- return PRIiFAST32;
- if (name[3] == 'o')
- return PRIoFAST32;
- if (name[3] == 'u')
- return PRIuFAST32;
- if (name[3] == 'x')
- return PRIxFAST32;
- if (name[3] == 'X')
- return PRIXFAST32;
- abort ();
- }
- if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
- {
- if (name[3] == 'd')
- return PRIdFAST64;
- if (name[3] == 'i')
- return PRIiFAST64;
- if (name[3] == 'o')
- return PRIoFAST64;
- if (name[3] == 'u')
- return PRIuFAST64;
- if (name[3] == 'x')
- return PRIxFAST64;
- if (name[3] == 'X')
- return PRIXFAST64;
- abort ();
- }
- }
- if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
- && name[7] == '\0')
- {
- if (name[3] == 'd')
- return PRIdMAX;
- if (name[3] == 'i')
- return PRIiMAX;
- if (name[3] == 'o')
- return PRIoMAX;
- if (name[3] == 'u')
- return PRIuMAX;
- if (name[3] == 'x')
- return PRIxMAX;
- if (name[3] == 'X')
- return PRIXMAX;
- abort ();
- }
- if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
- && name[7] == '\0')
- {
- if (name[3] == 'd')
- return PRIdPTR;
- if (name[3] == 'i')
- return PRIiPTR;
- if (name[3] == 'o')
- return PRIoPTR;
- if (name[3] == 'u')
- return PRIuPTR;
- if (name[3] == 'x')
- return PRIxPTR;
- if (name[3] == 'X')
- return PRIXPTR;
- abort ();
- }
- }
- }
- /* Test for a glibc specific printf() format directive flag. */
- if (name[0] == 'I' && name[1] == '\0')
- {
-#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
- /* The 'I' flag, in numeric format directives, replaces ASCII digits
- with the 'outdigits' defined in the LC_CTYPE locale facet. This is
- used for Farsi (Persian) and maybe Arabic. */
- return "I";
-#else
- return "";
-#endif
- }
- /* Other system dependent strings are not valid. */
- return NULL;
-}
-
-/* Initialize the codeset dependent parts of an opened message catalog.
- Return the header entry. */
-const char *
-internal_function
-_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
- struct loaded_domain *domain,
- struct binding *domainbinding)
-{
- /* Find out about the character set the file is encoded with.
- This can be found (in textual form) in the entry "". If this
- entry does not exist or if this does not contain the `charset='
- information, we will assume the charset matches the one the
- current locale and we don't have to perform any conversion. */
- char *nullentry;
- size_t nullentrylen;
-
- /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
- domain->codeset_cntr =
- (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _LIBC
- domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
- domain->conv = (iconv_t) -1;
-# endif
-#endif
- domain->conv_tab = NULL;
-
- /* Get the header entry. */
- nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
- if (nullentry != NULL)
- {
-#if defined _LIBC || HAVE_ICONV
- const char *charsetstr;
-
- charsetstr = strstr (nullentry, "charset=");
- if (charsetstr != NULL)
- {
- size_t len;
- char *charset;
- const char *outcharset;
-
- charsetstr += strlen ("charset=");
- len = strcspn (charsetstr, " \t\n");
-
- charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
- *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
- memcpy (charset, charsetstr, len);
- charset[len] = '\0';
-# endif
-
- /* The output charset should normally be determined by the
- locale. But sometimes the locale is not used or not correctly
- set up, so we provide a possibility for the user to override
- this. Moreover, the value specified through
- bind_textdomain_codeset overrides both. */
- if (domainbinding != NULL && domainbinding->codeset != NULL)
- outcharset = domainbinding->codeset;
- else
- {
- outcharset = getenv ("OUTPUT_CHARSET");
- if (outcharset == NULL || outcharset[0] == '\0')
- {
-# ifdef _LIBC
- outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
-# else
-# if HAVE_ICONV
- extern const char *locale_charset (void);
- outcharset = locale_charset ();
-# endif
-# endif
- }
- }
-
-# ifdef _LIBC
- /* We always want to use transliteration. */
- outcharset = norm_add_slashes (outcharset, "TRANSLIT");
- charset = norm_add_slashes (charset, NULL);
- if (__gconv_open (outcharset, charset, &domain->conv,
- GCONV_AVOID_NOCONV)
- != __GCONV_OK)
- domain->conv = (__gconv_t) -1;
-# else
-# if HAVE_ICONV
- /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
- we want to use transliteration. */
-# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
- || _LIBICONV_VERSION >= 0x0105
- if (strchr (outcharset, '/') == NULL)
- {
- char *tmp;
-
- len = strlen (outcharset);
- tmp = (char *) alloca (len + 10 + 1);
- memcpy (tmp, outcharset, len);
- memcpy (tmp + len, "//TRANSLIT", 10 + 1);
- outcharset = tmp;
-
- domain->conv = iconv_open (outcharset, charset);
-
- freea (outcharset);
- }
- else
-# endif
- domain->conv = iconv_open (outcharset, charset);
-# endif
-# endif
-
- freea (charset);
- }
-#endif /* _LIBC || HAVE_ICONV */
- }
-
- return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog. */
-void
-internal_function
-_nl_free_domain_conv (struct loaded_domain *domain)
-{
- if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
- free (domain->conv_tab);
-
-#ifdef _LIBC
- if (domain->conv != (__gconv_t) -1)
- __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
- if (domain->conv != (iconv_t) -1)
- iconv_close (domain->conv);
-# endif
-#endif
-}
-
-/* Load the message catalogs specified by FILENAME. If it is no valid
- message catalog do nothing. */
-void
-internal_function
-_nl_load_domain (struct loaded_l10nfile *domain_file,
- struct binding *domainbinding)
-{
- int fd;
- size_t size;
-#ifdef _LIBC
- struct stat64 st;
-#else
- struct stat st;
-#endif
- struct mo_file_header *data = (struct mo_file_header *) -1;
- int use_mmap = 0;
- struct loaded_domain *domain;
- int revision;
- const char *nullentry;
-
- domain_file->decided = 1;
- domain_file->data = NULL;
-
- /* Note that it would be useless to store domainbinding in domain_file
- because domainbinding might be == NULL now but != NULL later (after
- a call to bind_textdomain_codeset). */
-
- /* If the record does not represent a valid locale the FILENAME
- might be NULL. This can happen when according to the given
- specification the locale file name is different for XPG and CEN
- syntax. */
- if (domain_file->filename == NULL)
- return;
-
- /* Try to open the addressed file. */
- fd = open (domain_file->filename, O_RDONLY | O_BINARY);
- if (fd == -1)
- return;
-
- /* We must know about the size of the file. */
- if (
-#ifdef _LIBC
- __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
- __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
- || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
- || __builtin_expect (size < sizeof (struct mo_file_header), 0))
- {
- /* Something went wrong. */
- close (fd);
- return;
- }
-
-#ifdef HAVE_MMAP
- /* Now we are ready to load the file. If mmap() is available we try
- this first. If not available or it failed we try to load it. */
- data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
- MAP_PRIVATE, fd, 0);
-
- if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
- {
- /* mmap() call was successful. */
- close (fd);
- use_mmap = 1;
- }
-#endif
-
- /* If the data is not yet available (i.e. mmap'ed) we try to load
- it manually. */
- if (data == (struct mo_file_header *) -1)
- {
- size_t to_read;
- char *read_ptr;
-
- data = (struct mo_file_header *) malloc (size);
- if (data == NULL)
- return;
-
- to_read = size;
- read_ptr = (char *) data;
- do
- {
- long int nb = (long int) read (fd, read_ptr, to_read);
- if (nb <= 0)
- {
-#ifdef EINTR
- if (nb == -1 && errno == EINTR)
- continue;
-#endif
- close (fd);
- return;
- }
- read_ptr += nb;
- to_read -= nb;
- }
- while (to_read > 0);
-
- close (fd);
- }
-
- /* Using the magic number we can test whether it really is a message
- catalog file. */
- if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
- 0))
- {
- /* The magic number is wrong: not a message catalog file. */
-#ifdef HAVE_MMAP
- if (use_mmap)
- munmap ((caddr_t) data, size);
- else
-#endif
- free (data);
- return;
- }
-
- domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
- if (domain == NULL)
- return;
- domain_file->data = domain;
-
- domain->data = (char *) data;
- domain->use_mmap = use_mmap;
- domain->mmap_size = size;
- domain->must_swap = data->magic != _MAGIC;
- domain->malloced = NULL;
-
- /* Fill in the information about the available tables. */
- revision = W (domain->must_swap, data->revision);
- /* We support only the major revisions 0 and 1. */
- switch (revision >> 16)
- {
- case 0:
- case 1:
- domain->nstrings = W (domain->must_swap, data->nstrings);
- domain->orig_tab = (const struct string_desc *)
- ((char *) data + W (domain->must_swap, data->orig_tab_offset));
- domain->trans_tab = (const struct string_desc *)
- ((char *) data + W (domain->must_swap, data->trans_tab_offset));
- domain->hash_size = W (domain->must_swap, data->hash_tab_size);
- domain->hash_tab =
- (domain->hash_size > 2
- ? (const nls_uint32 *)
- ((char *) data + W (domain->must_swap, data->hash_tab_offset))
- : NULL);
- domain->must_swap_hash_tab = domain->must_swap;
-
- /* Now dispatch on the minor revision. */
- switch (revision & 0xffff)
- {
- case 0:
- domain->n_sysdep_strings = 0;
- domain->orig_sysdep_tab = NULL;
- domain->trans_sysdep_tab = NULL;
- break;
- case 1:
- default:
- {
- nls_uint32 n_sysdep_strings;
-
- if (domain->hash_tab == NULL)
- /* This is invalid. These minor revisions need a hash table. */
- goto invalid;
-
- n_sysdep_strings =
- W (domain->must_swap, data->n_sysdep_strings);
- if (n_sysdep_strings > 0)
- {
- nls_uint32 n_sysdep_segments;
- const struct sysdep_segment *sysdep_segments;
- const char **sysdep_segment_values;
- const nls_uint32 *orig_sysdep_tab;
- const nls_uint32 *trans_sysdep_tab;
- nls_uint32 n_inmem_sysdep_strings;
- size_t memneed;
- char *mem;
- struct sysdep_string_desc *inmem_orig_sysdep_tab;
- struct sysdep_string_desc *inmem_trans_sysdep_tab;
- nls_uint32 *inmem_hash_tab;
- unsigned int i, j;
-
- /* Get the values of the system dependent segments. */
- n_sysdep_segments =
- W (domain->must_swap, data->n_sysdep_segments);
- sysdep_segments = (const struct sysdep_segment *)
- ((char *) data
- + W (domain->must_swap, data->sysdep_segments_offset));
- sysdep_segment_values =
- alloca (n_sysdep_segments * sizeof (const char *));
- for (i = 0; i < n_sysdep_segments; i++)
- {
- const char *name =
- (char *) data
- + W (domain->must_swap, sysdep_segments[i].offset);
- nls_uint32 namelen =
- W (domain->must_swap, sysdep_segments[i].length);
-
- if (!(namelen > 0 && name[namelen - 1] == '\0'))
- {
- freea (sysdep_segment_values);
- goto invalid;
- }
-
- sysdep_segment_values[i] = get_sysdep_segment_value (name);
- }
-
- orig_sysdep_tab = (const nls_uint32 *)
- ((char *) data
- + W (domain->must_swap, data->orig_sysdep_tab_offset));
- trans_sysdep_tab = (const nls_uint32 *)
- ((char *) data
- + W (domain->must_swap, data->trans_sysdep_tab_offset));
-
- /* Compute the amount of additional memory needed for the
- system dependent strings and the augmented hash table.
- At the same time, also drop string pairs which refer to
- an undefined system dependent segment. */
- n_inmem_sysdep_strings = 0;
- memneed = domain->hash_size * sizeof (nls_uint32);
- for (i = 0; i < n_sysdep_strings; i++)
- {
- int valid = 1;
- size_t needs[2];
-
- for (j = 0; j < 2; j++)
- {
- const struct sysdep_string *sysdep_string =
- (const struct sysdep_string *)
- ((char *) data
- + W (domain->must_swap,
- j == 0
- ? orig_sysdep_tab[i]
- : trans_sysdep_tab[i]));
- size_t need = 0;
- const struct segment_pair *p = sysdep_string->segments;
-
- if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
- for (p = sysdep_string->segments;; p++)
- {
- nls_uint32 sysdepref;
-
- need += W (domain->must_swap, p->segsize);
-
- sysdepref = W (domain->must_swap, p->sysdepref);
- if (sysdepref == SEGMENTS_END)
- break;
-
- if (sysdepref >= n_sysdep_segments)
- {
- /* Invalid. */
- freea (sysdep_segment_values);
- goto invalid;
- }
-
- if (sysdep_segment_values[sysdepref] == NULL)
- {
- /* This particular string pair is invalid. */
- valid = 0;
- break;
- }
-
- need += strlen (sysdep_segment_values[sysdepref]);
- }
-
- needs[j] = need;
- if (!valid)
- break;
- }
-
- if (valid)
- {
- n_inmem_sysdep_strings++;
- memneed += needs[0] + needs[1];
- }
- }
- memneed += 2 * n_inmem_sysdep_strings
- * sizeof (struct sysdep_string_desc);
-
- if (n_inmem_sysdep_strings > 0)
- {
- unsigned int k;
-
- /* Allocate additional memory. */
- mem = (char *) malloc (memneed);
- if (mem == NULL)
- goto invalid;
-
- domain->malloced = mem;
- inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
- mem += n_inmem_sysdep_strings
- * sizeof (struct sysdep_string_desc);
- inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
- mem += n_inmem_sysdep_strings
- * sizeof (struct sysdep_string_desc);
- inmem_hash_tab = (nls_uint32 *) mem;
- mem += domain->hash_size * sizeof (nls_uint32);
-
- /* Compute the system dependent strings. */
- k = 0;
- for (i = 0; i < n_sysdep_strings; i++)
- {
- int valid = 1;
-
- for (j = 0; j < 2; j++)
- {
- const struct sysdep_string *sysdep_string =
- (const struct sysdep_string *)
- ((char *) data
- + W (domain->must_swap,
- j == 0
- ? orig_sysdep_tab[i]
- : trans_sysdep_tab[i]));
- const struct segment_pair *p =
- sysdep_string->segments;
-
- if (W (domain->must_swap, p->sysdepref)
- != SEGMENTS_END)
- for (p = sysdep_string->segments;; p++)
- {
- nls_uint32 sysdepref;
-
- sysdepref =
- W (domain->must_swap, p->sysdepref);
- if (sysdepref == SEGMENTS_END)
- break;
-
- if (sysdep_segment_values[sysdepref] == NULL)
- {
- /* This particular string pair is
- invalid. */
- valid = 0;
- break;
- }
- }
-
- if (!valid)
- break;
- }
-
- if (valid)
- {
- for (j = 0; j < 2; j++)
- {
- const struct sysdep_string *sysdep_string =
- (const struct sysdep_string *)
- ((char *) data
- + W (domain->must_swap,
- j == 0
- ? orig_sysdep_tab[i]
- : trans_sysdep_tab[i]));
- const char *static_segments =
- (char *) data
- + W (domain->must_swap, sysdep_string->offset);
- const struct segment_pair *p =
- sysdep_string->segments;
-
- /* Concatenate the segments, and fill
- inmem_orig_sysdep_tab[k] (for j == 0) and
- inmem_trans_sysdep_tab[k] (for j == 1). */
-
- struct sysdep_string_desc *inmem_tab_entry =
- (j == 0
- ? inmem_orig_sysdep_tab
- : inmem_trans_sysdep_tab)
- + k;
-
- if (W (domain->must_swap, p->sysdepref)
- == SEGMENTS_END)
- {
- /* Only one static segment. */
- inmem_tab_entry->length =
- W (domain->must_swap, p->segsize);
- inmem_tab_entry->pointer = static_segments;
- }
- else
- {
- inmem_tab_entry->pointer = mem;
-
- for (p = sysdep_string->segments;; p++)
- {
- nls_uint32 segsize =
- W (domain->must_swap, p->segsize);
- nls_uint32 sysdepref =
- W (domain->must_swap, p->sysdepref);
- size_t n;
-
- if (segsize > 0)
- {
- memcpy (mem, static_segments, segsize);
- mem += segsize;
- static_segments += segsize;
- }
-
- if (sysdepref == SEGMENTS_END)
- break;
-
- n = strlen (sysdep_segment_values[sysdepref]);
- memcpy (mem, sysdep_segment_values[sysdepref], n);
- mem += n;
- }
-
- inmem_tab_entry->length =
- mem - inmem_tab_entry->pointer;
- }
- }
-
- k++;
- }
- }
- if (k != n_inmem_sysdep_strings)
- abort ();
-
- /* Compute the augmented hash table. */
- for (i = 0; i < domain->hash_size; i++)
- inmem_hash_tab[i] =
- W (domain->must_swap_hash_tab, domain->hash_tab[i]);
- for (i = 0; i < n_inmem_sysdep_strings; i++)
- {
- const char *msgid = inmem_orig_sysdep_tab[i].pointer;
- nls_uint32 hash_val = hash_string (msgid);
- nls_uint32 idx = hash_val % domain->hash_size;
- nls_uint32 incr =
- 1 + (hash_val % (domain->hash_size - 2));
-
- for (;;)
- {
- if (inmem_hash_tab[idx] == 0)
- {
- /* Hash table entry is empty. Use it. */
- inmem_hash_tab[idx] = 1 + domain->nstrings + i;
- break;
- }
-
- if (idx >= domain->hash_size - incr)
- idx -= domain->hash_size - incr;
- else
- idx += incr;
- }
- }
-
- domain->n_sysdep_strings = n_inmem_sysdep_strings;
- domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
- domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
-
- domain->hash_tab = inmem_hash_tab;
- domain->must_swap_hash_tab = 0;
- }
- else
- {
- domain->n_sysdep_strings = 0;
- domain->orig_sysdep_tab = NULL;
- domain->trans_sysdep_tab = NULL;
- }
-
- freea (sysdep_segment_values);
- }
- else
- {
- domain->n_sysdep_strings = 0;
- domain->orig_sysdep_tab = NULL;
- domain->trans_sysdep_tab = NULL;
- }
- }
- break;
- }
- break;
- default:
- /* This is an invalid revision. */
- invalid:
- /* This is an invalid .mo file. */
- if (domain->malloced)
- free (domain->malloced);
-#ifdef HAVE_MMAP
- if (use_mmap)
- munmap ((caddr_t) data, size);
- else
-#endif
- free (data);
- free (domain);
- domain_file->data = NULL;
- return;
- }
-
- /* Now initialize the character set converter from the character set
- the file is encoded with (found in the header entry) to the domain's
- specified character set or the locale's character set. */
- nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
-
- /* Also look for a plural specification. */
- EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (struct loaded_domain *domain)
-{
- if (domain->plural != &__gettext_germanic_plural)
- __gettext_free_exp (domain->plural);
-
- _nl_free_domain_conv (domain);
-
- if (domain->malloced)
- free (domain->malloced);
-
-# ifdef _POSIX_MAPPED_FILES
- if (domain->use_mmap)
- munmap ((caddr_t) domain->data, domain->mmap_size);
- else
-# endif /* _POSIX_MAPPED_FILES */
- free ((void *) domain->data);
-
- free (domain);
-}
-#endif
diff --git a/intl/localcharset.c b/intl/localcharset.c
deleted file mode 100644
index 4865f103..00000000
--- a/intl/localcharset.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-
- Copyright (C) 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Written by Bruno Haible <bruno@clisp.org>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification. */
-#include "localcharset.h"
-
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
-#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32 /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#if defined __EMX__
-/* Assume EMX program runs on OS/2, even if compiled under DOS. */
-# define OS2
-#endif
-
-#if !defined WIN32
-# if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-# else
-# if HAVE_SETLOCALE
-# include <locale.h>
-# endif
-# endif
-#elif defined WIN32
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-#if defined OS2
-# define INCL_DOS
-# include <os2.h>
-#endif
-
-#if ENABLE_RELOCATABLE
-# include "relocatable.h"
-#else
-# define relocate(pathname) (pathname)
-#endif
-
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
- /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#endif
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-#if HAVE_DECL_GETC_UNLOCKED
-# undef getc
-# define getc getc_unlocked
-#endif
-
-/* The following static variable is declared 'volatile' to avoid a
- possible multithread problem in the function get_charset_aliases. If we
- are running in a threaded environment, and if two threads initialize
- 'charset_aliases' simultaneously, both will produce the same value,
- and everything will be ok if the two assignments to 'charset_aliases'
- are atomic. But I don't know what will happen if the two assignments mix. */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
- read, else NULL. Its format is:
- ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
-static const char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file. */
-static const char *
-get_charset_aliases ()
-{
- const char *cp;
-
- cp = charset_aliases;
- if (cp == NULL)
- {
-#if !(defined VMS || defined WIN32)
- FILE *fp;
- const char *dir = relocate (LIBDIR);
- const char *base = "charset.alias";
- char *file_name;
-
- /* Concatenate dir and base into freshly allocated file_name. */
- {
- size_t dir_len = strlen (dir);
- size_t base_len = strlen (base);
- int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
- file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
- if (file_name != NULL)
- {
- memcpy (file_name, dir, dir_len);
- if (add_slash)
- file_name[dir_len] = DIRECTORY_SEPARATOR;
- memcpy (file_name + dir_len + add_slash, base, base_len + 1);
- }
- }
-
- if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
- /* Out of memory or file not found, treat it as empty. */
- cp = "";
- else
- {
- /* Parse the file's contents. */
- int c;
- char buf1[50+1];
- char buf2[50+1];
- char *res_ptr = NULL;
- size_t res_size = 0;
- size_t l1, l2;
-
- for (;;)
- {
- c = getc (fp);
- if (c == EOF)
- break;
- if (c == '\n' || c == ' ' || c == '\t')
- continue;
- if (c == '#')
- {
- /* Skip comment, to end of line. */
- do
- c = getc (fp);
- while (!(c == EOF || c == '\n'));
- if (c == EOF)
- break;
- continue;
- }
- ungetc (c, fp);
- if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
- break;
- l1 = strlen (buf1);
- l2 = strlen (buf2);
- if (res_size == 0)
- {
- res_size = l1 + 1 + l2 + 1;
- res_ptr = (char *) malloc (res_size + 1);
- }
- else
- {
- res_size += l1 + 1 + l2 + 1;
- res_ptr = (char *) realloc (res_ptr, res_size + 1);
- }
- if (res_ptr == NULL)
- {
- /* Out of memory. */
- res_size = 0;
- break;
- }
- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
- strcpy (res_ptr + res_size - (l2 + 1), buf2);
- }
- fclose (fp);
- if (res_size == 0)
- cp = "";
- else
- {
- *(res_ptr + res_size) = '\0';
- cp = res_ptr;
- }
- }
-
- if (file_name != NULL)
- free (file_name);
-
-#else
-
-# if defined VMS
- /* To avoid the troubles of an extra file charset.alias_vms in the
- sources of many GNU packages, simply inline the aliases here. */
- /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
- "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
- section 10.7 "Handling Different Character Sets". */
- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
- "ISO8859-2" "\0" "ISO-8859-2" "\0"
- "ISO8859-5" "\0" "ISO-8859-5" "\0"
- "ISO8859-7" "\0" "ISO-8859-7" "\0"
- "ISO8859-8" "\0" "ISO-8859-8" "\0"
- "ISO8859-9" "\0" "ISO-8859-9" "\0"
- /* Japanese */
- "eucJP" "\0" "EUC-JP" "\0"
- "SJIS" "\0" "SHIFT_JIS" "\0"
- "DECKANJI" "\0" "DEC-KANJI" "\0"
- "SDECKANJI" "\0" "EUC-JP" "\0"
- /* Chinese */
- "eucTW" "\0" "EUC-TW" "\0"
- "DECHANYU" "\0" "DEC-HANYU" "\0"
- "DECHANZI" "\0" "GB2312" "\0"
- /* Korean */
- "DECKOREAN" "\0" "EUC-KR" "\0";
-# endif
-
-# if defined WIN32
- /* To avoid the troubles of installing a separate file in the same
- directory as the DLL and of retrieving the DLL's directory at
- runtime, simply inline the aliases here. */
-
- cp = "CP936" "\0" "GBK" "\0"
- "CP1361" "\0" "JOHAB" "\0"
- "CP20127" "\0" "ASCII" "\0"
- "CP20866" "\0" "KOI8-R" "\0"
- "CP21866" "\0" "KOI8-RU" "\0"
- "CP28591" "\0" "ISO-8859-1" "\0"
- "CP28592" "\0" "ISO-8859-2" "\0"
- "CP28593" "\0" "ISO-8859-3" "\0"
- "CP28594" "\0" "ISO-8859-4" "\0"
- "CP28595" "\0" "ISO-8859-5" "\0"
- "CP28596" "\0" "ISO-8859-6" "\0"
- "CP28597" "\0" "ISO-8859-7" "\0"
- "CP28598" "\0" "ISO-8859-8" "\0"
- "CP28599" "\0" "ISO-8859-9" "\0"
- "CP28605" "\0" "ISO-8859-15" "\0";
-# endif
-#endif
-
- charset_aliases = cp;
- }
-
- return cp;
-}
-
-/* Determine the current locale's character encoding, and canonicalize it
- into one of the canonical names listed in config.charset.
- The result must not be freed; it is statically allocated.
- If the canonical name cannot be determined, the result is a non-canonical
- name. */
-
-#ifdef STATIC
-STATIC
-#endif
-const char *
-locale_charset ()
-{
- const char *codeset;
- const char *aliases;
-
-#if !(defined WIN32 || defined OS2)
-
-# if HAVE_LANGINFO_CODESET
-
- /* Most systems support nl_langinfo (CODESET) nowadays. */
- codeset = nl_langinfo (CODESET);
-
-# else
-
- /* On old systems which lack it, use setlocale or getenv. */
- const char *locale = NULL;
-
- /* But most old systems don't have a complete set of locales. Some
- (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
- use setlocale here; it would return "C" when it doesn't support the
- locale name the user has set. */
-# if HAVE_SETLOCALE && 0
- locale = setlocale (LC_CTYPE, NULL);
-# endif
- if (locale == NULL || locale[0] == '\0')
- {
- locale = getenv ("LC_ALL");
- if (locale == NULL || locale[0] == '\0')
- {
- locale = getenv ("LC_CTYPE");
- if (locale == NULL || locale[0] == '\0')
- locale = getenv ("LANG");
- }
- }
-
- /* On some old systems, one used to set locale = "iso8859_1". On others,
- you set it to "language_COUNTRY.charset". In any case, we resolve it
- through the charset.alias file. */
- codeset = locale;
-
-# endif
-
-#elif defined WIN32
-
- static char buf[2 + 10 + 1];
-
- /* Woe32 has a function returning the locale's codepage as a number. */
- sprintf (buf, "CP%u", GetACP ());
- codeset = buf;
-
-#elif defined OS2
-
- const char *locale;
- static char buf[2 + 10 + 1];
- ULONG cp[3];
- ULONG cplen;
-
- /* Allow user to override the codeset, as set in the operating system,
- with standard language environment variables. */
- locale = getenv ("LC_ALL");
- if (locale == NULL || locale[0] == '\0')
- {
- locale = getenv ("LC_CTYPE");
- if (locale == NULL || locale[0] == '\0')
- locale = getenv ("LANG");
- }
- if (locale != NULL && locale[0] != '\0')
- {
- /* If the locale name contains an encoding after the dot, return it. */
- const char *dot = strchr (locale, '.');
-
- if (dot != NULL)
- {
- const char *modifier;
-
- dot++;
- /* Look for the possible @... trailer and remove it, if any. */
- modifier = strchr (dot, '@');
- if (modifier == NULL)
- return dot;
- if (modifier - dot < sizeof (buf))
- {
- memcpy (buf, dot, modifier - dot);
- buf [modifier - dot] = '\0';
- return buf;
- }
- }
-
- /* Resolve through the charset.alias file. */
- codeset = locale;
- }
- else
- {
- /* OS/2 has a function returning the locale's codepage as a number. */
- if (DosQueryCp (sizeof (cp), cp, &cplen))
- codeset = "";
- else
- {
- sprintf (buf, "CP%u", cp[0]);
- codeset = buf;
- }
- }
-
-#endif
-
- if (codeset == NULL)
- /* The canonical name cannot be determined. */
- codeset = "";
-
- /* Resolve alias. */
- for (aliases = get_charset_aliases ();
- *aliases != '\0';
- aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
- if (strcmp (codeset, aliases) == 0
- || (aliases[0] == '*' && aliases[1] == '\0'))
- {
- codeset = aliases + strlen (aliases) + 1;
- break;
- }
-
- /* Don't return an empty string. GNU libc and GNU libiconv interpret
- the empty string as denoting "the locale's character encoding",
- thus GNU libiconv would call this function a second time. */
- if (codeset[0] == '\0')
- codeset = "ASCII";
-
- return codeset;
-}
diff --git a/intl/localcharset.h b/intl/localcharset.h
deleted file mode 100644
index 3b137e73..00000000
--- a/intl/localcharset.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2003 Free Software Foundation, Inc.
- This file is part of the GNU CHARSET Library.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _LOCALCHARSET_H
-#define _LOCALCHARSET_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Determine the current locale's character encoding, and canonicalize it
- into one of the canonical names listed in config.charset.
- The result must not be freed; it is statically allocated.
- If the canonical name cannot be determined, the result is a non-canonical
- name. */
-extern const char * locale_charset (void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _LOCALCHARSET_H */
diff --git a/intl/locale.alias b/intl/locale.alias
deleted file mode 100644
index bd6bb256..00000000
--- a/intl/locale.alias
+++ /dev/null
@@ -1,78 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-# /usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete. If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us. Send it using the `glibcbug' script to
-# bugs@gnu.org.
-
-# Packages using this file:
-
-bokmal nb_NO.ISO-8859-1
-bokml nb_NO.ISO-8859-1
-catalan ca_ES.ISO-8859-1
-croatian hr_HR.ISO-8859-2
-czech cs_CZ.ISO-8859-2
-danish da_DK.ISO-8859-1
-dansk da_DK.ISO-8859-1
-deutsch de_DE.ISO-8859-1
-dutch nl_NL.ISO-8859-1
-eesti et_EE.ISO-8859-1
-estonian et_EE.ISO-8859-1
-finnish fi_FI.ISO-8859-1
-franais fr_FR.ISO-8859-1
-french fr_FR.ISO-8859-1
-galego gl_ES.ISO-8859-1
-galician gl_ES.ISO-8859-1
-german de_DE.ISO-8859-1
-greek el_GR.ISO-8859-7
-hebrew he_IL.ISO-8859-8
-hrvatski hr_HR.ISO-8859-2
-hungarian hu_HU.ISO-8859-2
-icelandic is_IS.ISO-8859-1
-italian it_IT.ISO-8859-1
-japanese ja_JP.eucJP
-japanese.euc ja_JP.eucJP
-ja_JP ja_JP.eucJP
-ja_JP.ujis ja_JP.eucJP
-japanese.sjis ja_JP.SJIS
-korean ko_KR.eucKR
-korean.euc ko_KR.eucKR
-ko_KR ko_KR.eucKR
-lithuanian lt_LT.ISO-8859-13
-no_NO nb_NO.ISO-8859-1
-no_NO.ISO-8859-1 nb_NO.ISO-8859-1
-norwegian nb_NO.ISO-8859-1
-nynorsk nn_NO.ISO-8859-1
-polish pl_PL.ISO-8859-2
-portuguese pt_PT.ISO-8859-1
-romanian ro_RO.ISO-8859-2
-russian ru_RU.ISO-8859-5
-slovak sk_SK.ISO-8859-2
-slovene sl_SI.ISO-8859-2
-slovenian sl_SI.ISO-8859-2
-spanish es_ES.ISO-8859-1
-swedish sv_SE.ISO-8859-1
-thai th_TH.TIS-620
-turkish tr_TR.ISO-8859-9
diff --git a/intl/localealias.c b/intl/localealias.c
deleted file mode 100644
index 2eaf8813..00000000
--- a/intl/localealias.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/* Handle aliases for locale names.
- Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
- This must come before <config.h> because <config.h> may include
- <features.h>, and once <features.h> has been included, it's too late. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#if defined _LIBC || defined HAVE___FSETLOCKING
-# include <stdio_ext.h>
-#endif
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# undef alloca
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "gettextP.h"
-
-#if ENABLE_RELOCATABLE
-# include "relocatable.h"
-#else
-# define relocate(pathname) (pathname)
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions. This is required by the standard
- because some ANSI C functions will require linking with this object
- file and the name space must not be polluted. */
-# define strcasecmp __strcasecmp
-
-# ifndef mempcpy
-# define mempcpy __mempcpy
-# endif
-# define HAVE_MEMPCPY 1
-# define HAVE___FSETLOCKING 1
-
-/* We need locking here since we can be called from different places. */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Some optimizations for glibc. */
-#ifdef _LIBC
-# define FEOF(fp) feof_unlocked (fp)
-# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
-#else
-# define FEOF(fp) feof (fp)
-# define FGETS(buf, n, fp) fgets (buf, n, fp)
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
- some additional code emulating it. */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
-# undef fgets
-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
-#endif
-#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
-# undef feof
-# define feof(s) feof_unlocked (s)
-#endif
-
-
-struct alias_map
-{
- const char *alias;
- const char *value;
-};
-
-
-#ifndef _LIBC
-# define libc_freeres_ptr(decl) decl
-#endif
-
-libc_freeres_ptr (static char *string_space);
-static size_t string_space_act;
-static size_t string_space_max;
-libc_freeres_ptr (static struct alias_map *map);
-static size_t nmap;
-static size_t maxmap;
-
-
-/* Prototypes for local functions. */
-static size_t read_alias_file (const char *fname, int fname_len)
- internal_function;
-static int extend_alias_table (void);
-static int alias_compare (const struct alias_map *map1,
- const struct alias_map *map2);
-
-
-const char *
-_nl_expand_alias (const char *name)
-{
- static const char *locale_alias_path;
- struct alias_map *retval;
- const char *result = NULL;
- size_t added;
-
-#ifdef _LIBC
- __libc_lock_lock (lock);
-#endif
-
- if (locale_alias_path == NULL)
- locale_alias_path = LOCALE_ALIAS_PATH;
-
- do
- {
- struct alias_map item;
-
- item.alias = name;
-
- if (nmap > 0)
- retval = (struct alias_map *) bsearch (&item, map, nmap,
- sizeof (struct alias_map),
- (int (*) (const void *,
- const void *)
- ) alias_compare);
- else
- retval = NULL;
-
- /* We really found an alias. Return the value. */
- if (retval != NULL)
- {
- result = retval->value;
- break;
- }
-
- /* Perhaps we can find another alias file. */
- added = 0;
- while (added == 0 && locale_alias_path[0] != '\0')
- {
- const char *start;
-
- while (locale_alias_path[0] == PATH_SEPARATOR)
- ++locale_alias_path;
- start = locale_alias_path;
-
- while (locale_alias_path[0] != '\0'
- && locale_alias_path[0] != PATH_SEPARATOR)
- ++locale_alias_path;
-
- if (start < locale_alias_path)
- added = read_alias_file (start, locale_alias_path - start);
- }
- }
- while (added != 0);
-
-#ifdef _LIBC
- __libc_lock_unlock (lock);
-#endif
-
- return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (const char *fname, int fname_len)
-{
- FILE *fp;
- char *full_fname;
- size_t added;
- static const char aliasfile[] = "/locale.alias";
-
- full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-#ifdef HAVE_MEMPCPY
- mempcpy (mempcpy (full_fname, fname, fname_len),
- aliasfile, sizeof aliasfile);
-#else
- memcpy (full_fname, fname, fname_len);
- memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
- fp = fopen (relocate (full_fname), "r");
- freea (full_fname);
- if (fp == NULL)
- return 0;
-
-#ifdef HAVE___FSETLOCKING
- /* No threads present. */
- __fsetlocking (fp, FSETLOCKING_BYCALLER);
-#endif
-
- added = 0;
- while (!FEOF (fp))
- {
- /* It is a reasonable approach to use a fix buffer here because
- a) we are only interested in the first two fields
- b) these fields must be usable as file names and so must not
- be that long
- We avoid a multi-kilobyte buffer here since this would use up
- stack space which we might not have if the program ran out of
- memory. */
- char buf[400];
- char *alias;
- char *value;
- char *cp;
-
- if (FGETS (buf, sizeof buf, fp) == NULL)
- /* EOF reached. */
- break;
-
- cp = buf;
- /* Ignore leading white space. */
- while (isspace ((unsigned char) cp[0]))
- ++cp;
-
- /* A leading '#' signals a comment line. */
- if (cp[0] != '\0' && cp[0] != '#')
- {
- alias = cp++;
- while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
- ++cp;
- /* Terminate alias name. */
- if (cp[0] != '\0')
- *cp++ = '\0';
-
- /* Now look for the beginning of the value. */
- while (isspace ((unsigned char) cp[0]))
- ++cp;
-
- if (cp[0] != '\0')
- {
- size_t alias_len;
- size_t value_len;
-
- value = cp++;
- while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
- ++cp;
- /* Terminate value. */
- if (cp[0] == '\n')
- {
- /* This has to be done to make the following test
- for the end of line possible. We are looking for
- the terminating '\n' which do not overwrite here. */
- *cp++ = '\0';
- *cp = '\n';
- }
- else if (cp[0] != '\0')
- *cp++ = '\0';
-
- if (nmap >= maxmap)
- if (__builtin_expect (extend_alias_table (), 0))
- return added;
-
- alias_len = strlen (alias) + 1;
- value_len = strlen (value) + 1;
-
- if (string_space_act + alias_len + value_len > string_space_max)
- {
- /* Increase size of memory pool. */
- size_t new_size = (string_space_max
- + (alias_len + value_len > 1024
- ? alias_len + value_len : 1024));
- char *new_pool = (char *) realloc (string_space, new_size);
- if (new_pool == NULL)
- return added;
-
- if (__builtin_expect (string_space != new_pool, 0))
- {
- size_t i;
-
- for (i = 0; i < nmap; i++)
- {
- map[i].alias += new_pool - string_space;
- map[i].value += new_pool - string_space;
- }
- }
-
- string_space = new_pool;
- string_space_max = new_size;
- }
-
- map[nmap].alias = memcpy (&string_space[string_space_act],
- alias, alias_len);
- string_space_act += alias_len;
-
- map[nmap].value = memcpy (&string_space[string_space_act],
- value, value_len);
- string_space_act += value_len;
-
- ++nmap;
- ++added;
- }
- }
-
- /* Possibly not the whole line fits into the buffer. Ignore
- the rest of the line. */
- while (strchr (buf, '\n') == NULL)
- if (FGETS (buf, sizeof buf, fp) == NULL)
- /* Make sure the inner loop will be left. The outer loop
- will exit at the `feof' test. */
- break;
- }
-
- /* Should we test for ferror()? I think we have to silently ignore
- errors. --drepper */
- fclose (fp);
-
- if (added > 0)
- qsort (map, nmap, sizeof (struct alias_map),
- (int (*) (const void *, const void *)) alias_compare);
-
- return added;
-}
-
-
-static int
-extend_alias_table ()
-{
- size_t new_size;
- struct alias_map *new_map;
-
- new_size = maxmap == 0 ? 100 : 2 * maxmap;
- new_map = (struct alias_map *) realloc (map, (new_size
- * sizeof (struct alias_map)));
- if (new_map == NULL)
- /* Simply don't extend: we don't have any more core. */
- return -1;
-
- map = new_map;
- maxmap = new_size;
- return 0;
-}
-
-
-static int
-alias_compare (const struct alias_map *map1, const struct alias_map *map2)
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
- return strcasecmp (map1->alias, map2->alias);
-#else
- const unsigned char *p1 = (const unsigned char *) map1->alias;
- const unsigned char *p2 = (const unsigned char *) map2->alias;
- unsigned char c1, c2;
-
- if (p1 == p2)
- return 0;
-
- do
- {
- /* I know this seems to be odd but the tolower() function in
- some systems libc cannot handle nonalpha characters. */
- c1 = isupper (*p1) ? tolower (*p1) : *p1;
- c2 = isupper (*p2) ? tolower (*p2) : *p2;
- if (c1 == '\0')
- break;
- ++p1;
- ++p2;
- }
- while (c1 == c2);
-
- return c1 - c2;
-#endif
-}
diff --git a/intl/localename.c b/intl/localename.c
deleted file mode 100644
index 5662e54f..00000000
--- a/intl/localename.c
+++ /dev/null
@@ -1,1142 +0,0 @@
-/* Determine the current selected locale.
- Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
-/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <locale.h>
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32 /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#ifdef WIN32
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-/* List of language codes, sorted by value:
- 0x01 LANG_ARABIC
- 0x02 LANG_BULGARIAN
- 0x03 LANG_CATALAN
- 0x04 LANG_CHINESE
- 0x05 LANG_CZECH
- 0x06 LANG_DANISH
- 0x07 LANG_GERMAN
- 0x08 LANG_GREEK
- 0x09 LANG_ENGLISH
- 0x0a LANG_SPANISH
- 0x0b LANG_FINNISH
- 0x0c LANG_FRENCH
- 0x0d LANG_HEBREW
- 0x0e LANG_HUNGARIAN
- 0x0f LANG_ICELANDIC
- 0x10 LANG_ITALIAN
- 0x11 LANG_JAPANESE
- 0x12 LANG_KOREAN
- 0x13 LANG_DUTCH
- 0x14 LANG_NORWEGIAN
- 0x15 LANG_POLISH
- 0x16 LANG_PORTUGUESE
- 0x17 LANG_RHAETO_ROMANCE
- 0x18 LANG_ROMANIAN
- 0x19 LANG_RUSSIAN
- 0x1a LANG_CROATIAN == LANG_SERBIAN
- 0x1b LANG_SLOVAK
- 0x1c LANG_ALBANIAN
- 0x1d LANG_SWEDISH
- 0x1e LANG_THAI
- 0x1f LANG_TURKISH
- 0x20 LANG_URDU
- 0x21 LANG_INDONESIAN
- 0x22 LANG_UKRAINIAN
- 0x23 LANG_BELARUSIAN
- 0x24 LANG_SLOVENIAN
- 0x25 LANG_ESTONIAN
- 0x26 LANG_LATVIAN
- 0x27 LANG_LITHUANIAN
- 0x28 LANG_TAJIK
- 0x29 LANG_FARSI
- 0x2a LANG_VIETNAMESE
- 0x2b LANG_ARMENIAN
- 0x2c LANG_AZERI
- 0x2d LANG_BASQUE
- 0x2e LANG_SORBIAN
- 0x2f LANG_MACEDONIAN
- 0x30 LANG_SUTU
- 0x31 LANG_TSONGA
- 0x32 LANG_TSWANA
- 0x33 LANG_VENDA
- 0x34 LANG_XHOSA
- 0x35 LANG_ZULU
- 0x36 LANG_AFRIKAANS
- 0x37 LANG_GEORGIAN
- 0x38 LANG_FAEROESE
- 0x39 LANG_HINDI
- 0x3a LANG_MALTESE
- 0x3b LANG_SAAMI
- 0x3c LANG_GAELIC
- 0x3d LANG_YIDDISH
- 0x3e LANG_MALAY
- 0x3f LANG_KAZAK
- 0x40 LANG_KYRGYZ
- 0x41 LANG_SWAHILI
- 0x42 LANG_TURKMEN
- 0x43 LANG_UZBEK
- 0x44 LANG_TATAR
- 0x45 LANG_BENGALI
- 0x46 LANG_PUNJABI
- 0x47 LANG_GUJARATI
- 0x48 LANG_ORIYA
- 0x49 LANG_TAMIL
- 0x4a LANG_TELUGU
- 0x4b LANG_KANNADA
- 0x4c LANG_MALAYALAM
- 0x4d LANG_ASSAMESE
- 0x4e LANG_MARATHI
- 0x4f LANG_SANSKRIT
- 0x50 LANG_MONGOLIAN
- 0x51 LANG_TIBETAN
- 0x52 LANG_WELSH
- 0x53 LANG_CAMBODIAN
- 0x54 LANG_LAO
- 0x55 LANG_BURMESE
- 0x56 LANG_GALICIAN
- 0x57 LANG_KONKANI
- 0x58 LANG_MANIPURI
- 0x59 LANG_SINDHI
- 0x5a LANG_SYRIAC
- 0x5b LANG_SINHALESE
- 0x5c LANG_CHEROKEE
- 0x5d LANG_INUKTITUT
- 0x5e LANG_AMHARIC
- 0x5f LANG_TAMAZIGHT
- 0x60 LANG_KASHMIRI
- 0x61 LANG_NEPALI
- 0x62 LANG_FRISIAN
- 0x63 LANG_PASHTO
- 0x64 LANG_TAGALOG
- 0x65 LANG_DIVEHI
- 0x66 LANG_EDO
- 0x67 LANG_FULFULDE
- 0x68 LANG_HAUSA
- 0x69 LANG_IBIBIO
- 0x6a LANG_YORUBA
- 0x70 LANG_IGBO
- 0x71 LANG_KANURI
- 0x72 LANG_OROMO
- 0x73 LANG_TIGRINYA
- 0x74 LANG_GUARANI
- 0x75 LANG_HAWAIIAN
- 0x76 LANG_LATIN
- 0x77 LANG_SOMALI
- 0x78 LANG_YI
- 0x79 LANG_PAPIAMENTU
-*/
-/* Mingw headers don't have latest language and sublanguage codes. */
-# ifndef LANG_AFRIKAANS
-# define LANG_AFRIKAANS 0x36
-# endif
-# ifndef LANG_ALBANIAN
-# define LANG_ALBANIAN 0x1c
-# endif
-# ifndef LANG_AMHARIC
-# define LANG_AMHARIC 0x5e
-# endif
-# ifndef LANG_ARABIC
-# define LANG_ARABIC 0x01
-# endif
-# ifndef LANG_ARMENIAN
-# define LANG_ARMENIAN 0x2b
-# endif
-# ifndef LANG_ASSAMESE
-# define LANG_ASSAMESE 0x4d
-# endif
-# ifndef LANG_AZERI
-# define LANG_AZERI 0x2c
-# endif
-# ifndef LANG_BASQUE
-# define LANG_BASQUE 0x2d
-# endif
-# ifndef LANG_BELARUSIAN
-# define LANG_BELARUSIAN 0x23
-# endif
-# ifndef LANG_BENGALI
-# define LANG_BENGALI 0x45
-# endif
-# ifndef LANG_BURMESE
-# define LANG_BURMESE 0x55
-# endif
-# ifndef LANG_CAMBODIAN
-# define LANG_CAMBODIAN 0x53
-# endif
-# ifndef LANG_CATALAN
-# define LANG_CATALAN 0x03
-# endif
-# ifndef LANG_CHEROKEE
-# define LANG_CHEROKEE 0x5c
-# endif
-# ifndef LANG_DIVEHI
-# define LANG_DIVEHI 0x65
-# endif
-# ifndef LANG_EDO
-# define LANG_EDO 0x66
-# endif
-# ifndef LANG_ESTONIAN
-# define LANG_ESTONIAN 0x25
-# endif
-# ifndef LANG_FAEROESE
-# define LANG_FAEROESE 0x38
-# endif
-# ifndef LANG_FARSI
-# define LANG_FARSI 0x29
-# endif
-# ifndef LANG_FRISIAN
-# define LANG_FRISIAN 0x62
-# endif
-# ifndef LANG_FULFULDE
-# define LANG_FULFULDE 0x67
-# endif
-# ifndef LANG_GAELIC
-# define LANG_GAELIC 0x3c
-# endif
-# ifndef LANG_GALICIAN
-# define LANG_GALICIAN 0x56
-# endif
-# ifndef LANG_GEORGIAN
-# define LANG_GEORGIAN 0x37
-# endif
-# ifndef LANG_GUARANI
-# define LANG_GUARANI 0x74
-# endif
-# ifndef LANG_GUJARATI
-# define LANG_GUJARATI 0x47
-# endif
-# ifndef LANG_HAUSA
-# define LANG_HAUSA 0x68
-# endif
-# ifndef LANG_HAWAIIAN
-# define LANG_HAWAIIAN 0x75
-# endif
-# ifndef LANG_HEBREW
-# define LANG_HEBREW 0x0d
-# endif
-# ifndef LANG_HINDI
-# define LANG_HINDI 0x39
-# endif
-# ifndef LANG_IBIBIO
-# define LANG_IBIBIO 0x69
-# endif
-# ifndef LANG_IGBO
-# define LANG_IGBO 0x70
-# endif
-# ifndef LANG_INDONESIAN
-# define LANG_INDONESIAN 0x21
-# endif
-# ifndef LANG_INUKTITUT
-# define LANG_INUKTITUT 0x5d
-# endif
-# ifndef LANG_KANNADA
-# define LANG_KANNADA 0x4b
-# endif
-# ifndef LANG_KANURI
-# define LANG_KANURI 0x71
-# endif
-# ifndef LANG_KASHMIRI
-# define LANG_KASHMIRI 0x60
-# endif
-# ifndef LANG_KAZAK
-# define LANG_KAZAK 0x3f
-# endif
-# ifndef LANG_KONKANI
-# define LANG_KONKANI 0x57
-# endif
-# ifndef LANG_KYRGYZ
-# define LANG_KYRGYZ 0x40
-# endif
-# ifndef LANG_LAO
-# define LANG_LAO 0x54
-# endif
-# ifndef LANG_LATIN
-# define LANG_LATIN 0x76
-# endif
-# ifndef LANG_LATVIAN
-# define LANG_LATVIAN 0x26
-# endif
-# ifndef LANG_LITHUANIAN
-# define LANG_LITHUANIAN 0x27
-# endif
-# ifndef LANG_MACEDONIAN
-# define LANG_MACEDONIAN 0x2f
-# endif
-# ifndef LANG_MALAY
-# define LANG_MALAY 0x3e
-# endif
-# ifndef LANG_MALAYALAM
-# define LANG_MALAYALAM 0x4c
-# endif
-# ifndef LANG_MALTESE
-# define LANG_MALTESE 0x3a
-# endif
-# ifndef LANG_MANIPURI
-# define LANG_MANIPURI 0x58
-# endif
-# ifndef LANG_MARATHI
-# define LANG_MARATHI 0x4e
-# endif
-# ifndef LANG_MONGOLIAN
-# define LANG_MONGOLIAN 0x50
-# endif
-# ifndef LANG_NEPALI
-# define LANG_NEPALI 0x61
-# endif
-# ifndef LANG_ORIYA
-# define LANG_ORIYA 0x48
-# endif
-# ifndef LANG_OROMO
-# define LANG_OROMO 0x72
-# endif
-# ifndef LANG_PAPIAMENTU
-# define LANG_PAPIAMENTU 0x79
-# endif
-# ifndef LANG_PASHTO
-# define LANG_PASHTO 0x63
-# endif
-# ifndef LANG_PUNJABI
-# define LANG_PUNJABI 0x46
-# endif
-# ifndef LANG_RHAETO_ROMANCE
-# define LANG_RHAETO_ROMANCE 0x17
-# endif
-# ifndef LANG_SAAMI
-# define LANG_SAAMI 0x3b
-# endif
-# ifndef LANG_SANSKRIT
-# define LANG_SANSKRIT 0x4f
-# endif
-# ifndef LANG_SERBIAN
-# define LANG_SERBIAN 0x1a
-# endif
-# ifndef LANG_SINDHI
-# define LANG_SINDHI 0x59
-# endif
-# ifndef LANG_SINHALESE
-# define LANG_SINHALESE 0x5b
-# endif
-# ifndef LANG_SLOVAK
-# define LANG_SLOVAK 0x1b
-# endif
-# ifndef LANG_SOMALI
-# define LANG_SOMALI 0x77
-# endif
-# ifndef LANG_SORBIAN
-# define LANG_SORBIAN 0x2e
-# endif
-# ifndef LANG_SUTU
-# define LANG_SUTU 0x30
-# endif
-# ifndef LANG_SWAHILI
-# define LANG_SWAHILI 0x41
-# endif
-# ifndef LANG_SYRIAC
-# define LANG_SYRIAC 0x5a
-# endif
-# ifndef LANG_TAGALOG
-# define LANG_TAGALOG 0x64
-# endif
-# ifndef LANG_TAJIK
-# define LANG_TAJIK 0x28
-# endif
-# ifndef LANG_TAMAZIGHT
-# define LANG_TAMAZIGHT 0x5f
-# endif
-# ifndef LANG_TAMIL
-# define LANG_TAMIL 0x49
-# endif
-# ifndef LANG_TATAR
-# define LANG_TATAR 0x44
-# endif
-# ifndef LANG_TELUGU
-# define LANG_TELUGU 0x4a
-# endif
-# ifndef LANG_THAI
-# define LANG_THAI 0x1e
-# endif
-# ifndef LANG_TIBETAN
-# define LANG_TIBETAN 0x51
-# endif
-# ifndef LANG_TIGRINYA
-# define LANG_TIGRINYA 0x73
-# endif
-# ifndef LANG_TSONGA
-# define LANG_TSONGA 0x31
-# endif
-# ifndef LANG_TSWANA
-# define LANG_TSWANA 0x32
-# endif
-# ifndef LANG_TURKMEN
-# define LANG_TURKMEN 0x42
-# endif
-# ifndef LANG_UKRAINIAN
-# define LANG_UKRAINIAN 0x22
-# endif
-# ifndef LANG_URDU
-# define LANG_URDU 0x20
-# endif
-# ifndef LANG_UZBEK
-# define LANG_UZBEK 0x43
-# endif
-# ifndef LANG_VENDA
-# define LANG_VENDA 0x33
-# endif
-# ifndef LANG_VIETNAMESE
-# define LANG_VIETNAMESE 0x2a
-# endif
-# ifndef LANG_WELSH
-# define LANG_WELSH 0x52
-# endif
-# ifndef LANG_XHOSA
-# define LANG_XHOSA 0x34
-# endif
-# ifndef LANG_YI
-# define LANG_YI 0x78
-# endif
-# ifndef LANG_YIDDISH
-# define LANG_YIDDISH 0x3d
-# endif
-# ifndef LANG_YORUBA
-# define LANG_YORUBA 0x6a
-# endif
-# ifndef LANG_ZULU
-# define LANG_ZULU 0x35
-# endif
-# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
-# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
-# endif
-# ifndef SUBLANG_ARABIC_IRAQ
-# define SUBLANG_ARABIC_IRAQ 0x02
-# endif
-# ifndef SUBLANG_ARABIC_EGYPT
-# define SUBLANG_ARABIC_EGYPT 0x03
-# endif
-# ifndef SUBLANG_ARABIC_LIBYA
-# define SUBLANG_ARABIC_LIBYA 0x04
-# endif
-# ifndef SUBLANG_ARABIC_ALGERIA
-# define SUBLANG_ARABIC_ALGERIA 0x05
-# endif
-# ifndef SUBLANG_ARABIC_MOROCCO
-# define SUBLANG_ARABIC_MOROCCO 0x06
-# endif
-# ifndef SUBLANG_ARABIC_TUNISIA
-# define SUBLANG_ARABIC_TUNISIA 0x07
-# endif
-# ifndef SUBLANG_ARABIC_OMAN
-# define SUBLANG_ARABIC_OMAN 0x08
-# endif
-# ifndef SUBLANG_ARABIC_YEMEN
-# define SUBLANG_ARABIC_YEMEN 0x09
-# endif
-# ifndef SUBLANG_ARABIC_SYRIA
-# define SUBLANG_ARABIC_SYRIA 0x0a
-# endif
-# ifndef SUBLANG_ARABIC_JORDAN
-# define SUBLANG_ARABIC_JORDAN 0x0b
-# endif
-# ifndef SUBLANG_ARABIC_LEBANON
-# define SUBLANG_ARABIC_LEBANON 0x0c
-# endif
-# ifndef SUBLANG_ARABIC_KUWAIT
-# define SUBLANG_ARABIC_KUWAIT 0x0d
-# endif
-# ifndef SUBLANG_ARABIC_UAE
-# define SUBLANG_ARABIC_UAE 0x0e
-# endif
-# ifndef SUBLANG_ARABIC_BAHRAIN
-# define SUBLANG_ARABIC_BAHRAIN 0x0f
-# endif
-# ifndef SUBLANG_ARABIC_QATAR
-# define SUBLANG_ARABIC_QATAR 0x10
-# endif
-# ifndef SUBLANG_AZERI_LATIN
-# define SUBLANG_AZERI_LATIN 0x01
-# endif
-# ifndef SUBLANG_AZERI_CYRILLIC
-# define SUBLANG_AZERI_CYRILLIC 0x02
-# endif
-# ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x00
-# endif
-# ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x01
-# endif
-# ifndef SUBLANG_CHINESE_MACAU
-# define SUBLANG_CHINESE_MACAU 0x05
-# endif
-# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
-# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
-# endif
-# ifndef SUBLANG_ENGLISH_JAMAICA
-# define SUBLANG_ENGLISH_JAMAICA 0x08
-# endif
-# ifndef SUBLANG_ENGLISH_CARIBBEAN
-# define SUBLANG_ENGLISH_CARIBBEAN 0x09
-# endif
-# ifndef SUBLANG_ENGLISH_BELIZE
-# define SUBLANG_ENGLISH_BELIZE 0x0a
-# endif
-# ifndef SUBLANG_ENGLISH_TRINIDAD
-# define SUBLANG_ENGLISH_TRINIDAD 0x0b
-# endif
-# ifndef SUBLANG_ENGLISH_ZIMBABWE
-# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
-# endif
-# ifndef SUBLANG_ENGLISH_PHILIPPINES
-# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
-# endif
-# ifndef SUBLANG_ENGLISH_INDONESIA
-# define SUBLANG_ENGLISH_INDONESIA 0x0e
-# endif
-# ifndef SUBLANG_ENGLISH_HONGKONG
-# define SUBLANG_ENGLISH_HONGKONG 0x0f
-# endif
-# ifndef SUBLANG_ENGLISH_INDIA
-# define SUBLANG_ENGLISH_INDIA 0x10
-# endif
-# ifndef SUBLANG_ENGLISH_MALAYSIA
-# define SUBLANG_ENGLISH_MALAYSIA 0x11
-# endif
-# ifndef SUBLANG_ENGLISH_SINGAPORE
-# define SUBLANG_ENGLISH_SINGAPORE 0x12
-# endif
-# ifndef SUBLANG_FRENCH_LUXEMBOURG
-# define SUBLANG_FRENCH_LUXEMBOURG 0x05
-# endif
-# ifndef SUBLANG_FRENCH_MONACO
-# define SUBLANG_FRENCH_MONACO 0x06
-# endif
-# ifndef SUBLANG_FRENCH_WESTINDIES
-# define SUBLANG_FRENCH_WESTINDIES 0x07
-# endif
-# ifndef SUBLANG_FRENCH_REUNION
-# define SUBLANG_FRENCH_REUNION 0x08
-# endif
-# ifndef SUBLANG_FRENCH_CONGO
-# define SUBLANG_FRENCH_CONGO 0x09
-# endif
-# ifndef SUBLANG_FRENCH_SENEGAL
-# define SUBLANG_FRENCH_SENEGAL 0x0a
-# endif
-# ifndef SUBLANG_FRENCH_CAMEROON
-# define SUBLANG_FRENCH_CAMEROON 0x0b
-# endif
-# ifndef SUBLANG_FRENCH_COTEDIVOIRE
-# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
-# endif
-# ifndef SUBLANG_FRENCH_MALI
-# define SUBLANG_FRENCH_MALI 0x0d
-# endif
-# ifndef SUBLANG_FRENCH_MOROCCO
-# define SUBLANG_FRENCH_MOROCCO 0x0e
-# endif
-# ifndef SUBLANG_FRENCH_HAITI
-# define SUBLANG_FRENCH_HAITI 0x0f
-# endif
-# ifndef SUBLANG_GERMAN_LUXEMBOURG
-# define SUBLANG_GERMAN_LUXEMBOURG 0x04
-# endif
-# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
-# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
-# endif
-# ifndef SUBLANG_KASHMIRI_INDIA
-# define SUBLANG_KASHMIRI_INDIA 0x02
-# endif
-# ifndef SUBLANG_MALAY_MALAYSIA
-# define SUBLANG_MALAY_MALAYSIA 0x01
-# endif
-# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
-# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
-# endif
-# ifndef SUBLANG_NEPALI_INDIA
-# define SUBLANG_NEPALI_INDIA 0x02
-# endif
-# ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x00
-# endif
-# ifndef SUBLANG_PUNJABI_PAKISTAN
-# define SUBLANG_PUNJABI_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x00
-# endif
-# ifndef SUBLANG_ROMANIAN_MOLDOVA
-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
-# endif
-# ifndef SUBLANG_SERBIAN_LATIN
-# define SUBLANG_SERBIAN_LATIN 0x02
-# endif
-# ifndef SUBLANG_SERBIAN_CYRILLIC
-# define SUBLANG_SERBIAN_CYRILLIC 0x03
-# endif
-# ifndef SUBLANG_SINDHI_INDIA
-# define SUBLANG_SINDHI_INDIA 0x00
-# endif
-# ifndef SUBLANG_SINDHI_PAKISTAN
-# define SUBLANG_SINDHI_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_SPANISH_GUATEMALA
-# define SUBLANG_SPANISH_GUATEMALA 0x04
-# endif
-# ifndef SUBLANG_SPANISH_COSTA_RICA
-# define SUBLANG_SPANISH_COSTA_RICA 0x05
-# endif
-# ifndef SUBLANG_SPANISH_PANAMA
-# define SUBLANG_SPANISH_PANAMA 0x06
-# endif
-# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
-# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
-# endif
-# ifndef SUBLANG_SPANISH_VENEZUELA
-# define SUBLANG_SPANISH_VENEZUELA 0x08
-# endif
-# ifndef SUBLANG_SPANISH_COLOMBIA
-# define SUBLANG_SPANISH_COLOMBIA 0x09
-# endif
-# ifndef SUBLANG_SPANISH_PERU
-# define SUBLANG_SPANISH_PERU 0x0a
-# endif
-# ifndef SUBLANG_SPANISH_ARGENTINA
-# define SUBLANG_SPANISH_ARGENTINA 0x0b
-# endif
-# ifndef SUBLANG_SPANISH_ECUADOR
-# define SUBLANG_SPANISH_ECUADOR 0x0c
-# endif
-# ifndef SUBLANG_SPANISH_CHILE
-# define SUBLANG_SPANISH_CHILE 0x0d
-# endif
-# ifndef SUBLANG_SPANISH_URUGUAY
-# define SUBLANG_SPANISH_URUGUAY 0x0e
-# endif
-# ifndef SUBLANG_SPANISH_PARAGUAY
-# define SUBLANG_SPANISH_PARAGUAY 0x0f
-# endif
-# ifndef SUBLANG_SPANISH_BOLIVIA
-# define SUBLANG_SPANISH_BOLIVIA 0x10
-# endif
-# ifndef SUBLANG_SPANISH_EL_SALVADOR
-# define SUBLANG_SPANISH_EL_SALVADOR 0x11
-# endif
-# ifndef SUBLANG_SPANISH_HONDURAS
-# define SUBLANG_SPANISH_HONDURAS 0x12
-# endif
-# ifndef SUBLANG_SPANISH_NICARAGUA
-# define SUBLANG_SPANISH_NICARAGUA 0x13
-# endif
-# ifndef SUBLANG_SPANISH_PUERTO_RICO
-# define SUBLANG_SPANISH_PUERTO_RICO 0x14
-# endif
-# ifndef SUBLANG_SWEDISH_FINLAND
-# define SUBLANG_SWEDISH_FINLAND 0x02
-# endif
-# ifndef SUBLANG_TAMAZIGHT_ARABIC
-# define SUBLANG_TAMAZIGHT_ARABIC 0x01
-# endif
-# ifndef SUBLANG_TAMAZIGHT_LATIN
-# define SUBLANG_TAMAZIGHT_LATIN 0x02
-# endif
-# ifndef SUBLANG_TIGRINYA_ETHIOPIA
-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
-# endif
-# ifndef SUBLANG_TIGRINYA_ERITREA
-# define SUBLANG_TIGRINYA_ERITREA 0x01
-# endif
-# ifndef SUBLANG_URDU_PAKISTAN
-# define SUBLANG_URDU_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_URDU_INDIA
-# define SUBLANG_URDU_INDIA 0x02
-# endif
-# ifndef SUBLANG_UZBEK_LATIN
-# define SUBLANG_UZBEK_LATIN 0x01
-# endif
-# ifndef SUBLANG_UZBEK_CYRILLIC
-# define SUBLANG_UZBEK_CYRILLIC 0x02
-# endif
-#endif
-
-/* XPG3 defines the result of 'setlocale (category, NULL)' as:
- "Directs 'setlocale()' to query 'category' and return the current
- setting of 'local'."
- However it does not specify the exact format. Neither do SUSV2 and
- ISO C 99. So we can use this feature only on selected systems (e.g.
- those using GNU C Library). */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Determine the current locale's name, and canonicalize it into XPG syntax
- language[_territory[.codeset]][@modifier]
- The codeset part in the result is not reliable; the locale_charset()
- should be used for codeset information instead.
- The result must not be freed; it is statically allocated. */
-
-const char *
-_nl_locale_name (int category, const char *categoryname)
-{
- const char *retval;
-
-#ifndef WIN32
-
- /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
- On some systems this can be done by the 'setlocale' function itself. */
-# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
- retval = setlocale (category, NULL);
-# else
- /* Setting of LC_ALL overwrites all other. */
- retval = getenv ("LC_ALL");
- if (retval == NULL || retval[0] == '\0')
- {
- /* Next comes the name of the desired category. */
- retval = getenv (categoryname);
- if (retval == NULL || retval[0] == '\0')
- {
- /* Last possibility is the LANG environment variable. */
- retval = getenv ("LANG");
- if (retval == NULL || retval[0] == '\0')
- /* We use C as the default domain. POSIX says this is
- implementation defined. */
- retval = "C";
- }
- }
-# endif
-
- return retval;
-
-#else /* WIN32 */
-
- /* Return an XPG style locale name language[_territory][@modifier].
- Don't even bother determining the codeset; it's not useful in this
- context, because message catalogs are not specific to a single
- codeset. */
-
- LCID lcid;
- LANGID langid;
- int primary, sub;
-
- /* Let the user override the system settings through environment
- variables, as on POSIX systems. */
- retval = getenv ("LC_ALL");
- if (retval != NULL && retval[0] != '\0')
- return retval;
- retval = getenv (categoryname);
- if (retval != NULL && retval[0] != '\0')
- return retval;
- retval = getenv ("LANG");
- if (retval != NULL && retval[0] != '\0')
- return retval;
-
- /* Use native Win32 API locale ID. */
- lcid = GetThreadLocale ();
-
- /* Strip off the sorting rules, keep only the language part. */
- langid = LANGIDFROMLCID (lcid);
-
- /* Split into language and territory part. */
- primary = PRIMARYLANGID (langid);
- sub = SUBLANGID (langid);
-
- /* Dispatch on language.
- See also http://www.unicode.org/unicode/onlinedat/languages.html .
- For details about languages, see http://www.ethnologue.com/ . */
- switch (primary)
- {
- case LANG_AFRIKAANS: return "af_ZA";
- case LANG_ALBANIAN: return "sq_AL";
- case LANG_AMHARIC: return "am_ET";
- case LANG_ARABIC:
- switch (sub)
- {
- case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
- case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
- case SUBLANG_ARABIC_EGYPT: return "ar_EG";
- case SUBLANG_ARABIC_LIBYA: return "ar_LY";
- case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
- case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
- case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
- case SUBLANG_ARABIC_OMAN: return "ar_OM";
- case SUBLANG_ARABIC_YEMEN: return "ar_YE";
- case SUBLANG_ARABIC_SYRIA: return "ar_SY";
- case SUBLANG_ARABIC_JORDAN: return "ar_JO";
- case SUBLANG_ARABIC_LEBANON: return "ar_LB";
- case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
- case SUBLANG_ARABIC_UAE: return "ar_AE";
- case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
- case SUBLANG_ARABIC_QATAR: return "ar_QA";
- }
- return "ar";
- case LANG_ARMENIAN: return "hy_AM";
- case LANG_ASSAMESE: return "as_IN";
- case LANG_AZERI:
- switch (sub)
- {
- /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
- case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
- case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
- }
- return "az";
- case LANG_BASQUE:
- return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
- case LANG_BELARUSIAN: return "be_BY";
- case LANG_BENGALI:
- switch (sub)
- {
- case SUBLANG_BENGALI_INDIA: return "bn_IN";
- case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
- }
- return "bn";
- case LANG_BULGARIAN: return "bg_BG";
- case LANG_BURMESE: return "my_MM";
- case LANG_CAMBODIAN: return "km_KH";
- case LANG_CATALAN: return "ca_ES";
- case LANG_CHEROKEE: return "chr_US";
- case LANG_CHINESE:
- switch (sub)
- {
- case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
- case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
- case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
- case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
- case SUBLANG_CHINESE_MACAU: return "zh_MO";
- }
- return "zh";
- case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
- * What used to be called Serbo-Croatian
- * should really now be two separate
- * languages because of political reasons.
- * (Says tml, who knows nothing about Serbian
- * or Croatian.)
- * (I can feel those flames coming already.)
- */
- switch (sub)
- {
- case SUBLANG_DEFAULT: return "hr_HR";
- case SUBLANG_SERBIAN_LATIN: return "sr_CS";
- case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
- }
- return "hr";
- case LANG_CZECH: return "cs_CZ";
- case LANG_DANISH: return "da_DK";
- case LANG_DIVEHI: return "dv_MV";
- case LANG_DUTCH:
- switch (sub)
- {
- case SUBLANG_DUTCH: return "nl_NL";
- case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
- }
- return "nl";
- case LANG_EDO: return "bin_NG";
- case LANG_ENGLISH:
- switch (sub)
- {
- /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
- * English was the language spoken in England.
- * Oh well.
- */
- case SUBLANG_ENGLISH_US: return "en_US";
- case SUBLANG_ENGLISH_UK: return "en_GB";
- case SUBLANG_ENGLISH_AUS: return "en_AU";
- case SUBLANG_ENGLISH_CAN: return "en_CA";
- case SUBLANG_ENGLISH_NZ: return "en_NZ";
- case SUBLANG_ENGLISH_EIRE: return "en_IE";
- case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
- case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
- case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
- case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
- case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
- case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
- case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
- case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
- case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
- case SUBLANG_ENGLISH_INDIA: return "en_IN";
- case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
- case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
- }
- return "en";
- case LANG_ESTONIAN: return "et_EE";
- case LANG_FAEROESE: return "fo_FO";
- case LANG_FARSI: return "fa_IR";
- case LANG_FINNISH: return "fi_FI";
- case LANG_FRENCH:
- switch (sub)
- {
- case SUBLANG_FRENCH: return "fr_FR";
- case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
- case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
- case SUBLANG_FRENCH_SWISS: return "fr_CH";
- case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
- case SUBLANG_FRENCH_MONACO: return "fr_MC";
- case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
- case SUBLANG_FRENCH_REUNION: return "fr_RE";
- case SUBLANG_FRENCH_CONGO: return "fr_CG";
- case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
- case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
- case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
- case SUBLANG_FRENCH_MALI: return "fr_ML";
- case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
- case SUBLANG_FRENCH_HAITI: return "fr_HT";
- }
- return "fr";
- case LANG_FRISIAN: return "fy_NL";
- case LANG_FULFULDE:
- /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
- return "ff_NG";
- case LANG_GAELIC:
- switch (sub)
- {
- case 0x01: /* SCOTTISH */ return "gd_GB";
- case 0x02: /* IRISH */ return "ga_IE";
- }
- return "C";
- case LANG_GALICIAN: return "gl_ES";
- case LANG_GEORGIAN: return "ka_GE";
- case LANG_GERMAN:
- switch (sub)
- {
- case SUBLANG_GERMAN: return "de_DE";
- case SUBLANG_GERMAN_SWISS: return "de_CH";
- case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
- case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
- case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
- }
- return "de";
- case LANG_GREEK: return "el_GR";
- case LANG_GUARANI: return "gn_PY";
- case LANG_GUJARATI: return "gu_IN";
- case LANG_HAUSA: return "ha_NG";
- case LANG_HAWAIIAN:
- /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
- or Hawaii Creole English ("cpe_US", 600000 speakers)? */
- return "cpe_US";
- case LANG_HEBREW: return "he_IL";
- case LANG_HINDI: return "hi_IN";
- case LANG_HUNGARIAN: return "hu_HU";
- case LANG_IBIBIO: return "nic_NG";
- case LANG_ICELANDIC: return "is_IS";
- case LANG_IGBO: return "ig_NG";
- case LANG_INDONESIAN: return "id_ID";
- case LANG_INUKTITUT: return "iu_CA";
- case LANG_ITALIAN:
- switch (sub)
- {
- case SUBLANG_ITALIAN: return "it_IT";
- case SUBLANG_ITALIAN_SWISS: return "it_CH";
- }
- return "it";
- case LANG_JAPANESE: return "ja_JP";
- case LANG_KANNADA: return "kn_IN";
- case LANG_KANURI: return "kr_NG";
- case LANG_KASHMIRI:
- switch (sub)
- {
- case SUBLANG_DEFAULT: return "ks_PK";
- case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
- }
- return "ks";
- case LANG_KAZAK: return "kk_KZ";
- case LANG_KONKANI:
- /* FIXME: Adjust this when such locales appear on Unix. */
- return "kok_IN";
- case LANG_KOREAN: return "ko_KR";
- case LANG_KYRGYZ: return "ky_KG";
- case LANG_LAO: return "lo_LA";
- case LANG_LATIN: return "la_VA";
- case LANG_LATVIAN: return "lv_LV";
- case LANG_LITHUANIAN: return "lt_LT";
- case LANG_MACEDONIAN: return "mk_MK";
- case LANG_MALAY:
- switch (sub)
- {
- case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
- case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
- }
- return "ms";
- case LANG_MALAYALAM: return "ml_IN";
- case LANG_MALTESE: return "mt_MT";
- case LANG_MANIPURI:
- /* FIXME: Adjust this when such locales appear on Unix. */
- return "mni_IN";
- case LANG_MARATHI: return "mr_IN";
- case LANG_MONGOLIAN:
- return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
- case LANG_NEPALI:
- switch (sub)
- {
- case SUBLANG_DEFAULT: return "ne_NP";
- case SUBLANG_NEPALI_INDIA: return "ne_IN";
- }
- return "ne";
- case LANG_NORWEGIAN:
- switch (sub)
- {
- case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
- case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
- }
- return "no";
- case LANG_ORIYA: return "or_IN";
- case LANG_OROMO: return "om_ET";
- case LANG_PAPIAMENTU: return "pap_AN";
- case LANG_PASHTO:
- return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
- case LANG_POLISH: return "pl_PL";
- case LANG_PORTUGUESE:
- switch (sub)
- {
- case SUBLANG_PORTUGUESE: return "pt_PT";
- /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
- Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
- case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
- }
- return "pt";
- case LANG_PUNJABI:
- switch (sub)
- {
- case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
- }
- return "pa";
- case LANG_RHAETO_ROMANCE: return "rm_CH";
- case LANG_ROMANIAN:
- switch (sub)
- {
- case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
- }
- return "ro";
- case LANG_RUSSIAN:
- return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
- case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
- case LANG_SANSKRIT: return "sa_IN";
- case LANG_SINDHI:
- switch (sub)
- {
- case SUBLANG_SINDHI_INDIA: return "sd_IN";
- case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
- }
- return "sd";
- case LANG_SINHALESE: return "si_LK";
- case LANG_SLOVAK: return "sk_SK";
- case LANG_SLOVENIAN: return "sl_SI";
- case LANG_SOMALI: return "so_SO";
- case LANG_SORBIAN:
- /* FIXME: Adjust this when such locales appear on Unix. */
- return "wen_DE";
- case LANG_SPANISH:
- switch (sub)
- {
- case SUBLANG_SPANISH: return "es_ES";
- case SUBLANG_SPANISH_MEXICAN: return "es_MX";
- case SUBLANG_SPANISH_MODERN:
- return "es_ES@modern"; /* not seen on Unix */
- case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
- case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
- case SUBLANG_SPANISH_PANAMA: return "es_PA";
- case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
- case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
- case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
- case SUBLANG_SPANISH_PERU: return "es_PE";
- case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
- case SUBLANG_SPANISH_ECUADOR: return "es_EC";
- case SUBLANG_SPANISH_CHILE: return "es_CL";
- case SUBLANG_SPANISH_URUGUAY: return "es_UY";
- case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
- case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
- case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
- case SUBLANG_SPANISH_HONDURAS: return "es_HN";
- case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
- case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
- }
- return "es";
- case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
- case LANG_SWAHILI: return "sw_KE";
- case LANG_SWEDISH:
- switch (sub)
- {
- case SUBLANG_DEFAULT: return "sv_SE";
- case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
- }
- return "sv";
- case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
- case LANG_TAGALOG: return "tl_PH";
- case LANG_TAJIK: return "tg_TJ";
- case LANG_TAMAZIGHT:
- switch (sub)
- {
- /* FIXME: Adjust this when Tamazight locales appear on Unix. */
- case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
- case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
- }
- return "ber_MA";
- case LANG_TAMIL:
- return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
- case LANG_TATAR: return "tt_RU";
- case LANG_TELUGU: return "te_IN";
- case LANG_THAI: return "th_TH";
- case LANG_TIBETAN: return "bo_CN";
- case LANG_TIGRINYA:
- switch (sub)
- {
- case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
- case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
- }
- return "ti";
- case LANG_TSONGA: return "ts_ZA";
- case LANG_TSWANA: return "tn_BW";
- case LANG_TURKISH: return "tr_TR";
- case LANG_TURKMEN: return "tk_TM";
- case LANG_UKRAINIAN: return "uk_UA";
- case LANG_URDU:
- switch (sub)
- {
- case SUBLANG_URDU_PAKISTAN: return "ur_PK";
- case SUBLANG_URDU_INDIA: return "ur_IN";
- }
- return "ur";
- case LANG_UZBEK:
- switch (sub)
- {
- case SUBLANG_UZBEK_LATIN: return "uz_UZ";
- case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
- }
- return "uz";
- case LANG_VENDA: return "ve_ZA";
- case LANG_VIETNAMESE: return "vi_VN";
- case LANG_WELSH: return "cy_GB";
- case LANG_XHOSA: return "xh_ZA";
- case LANG_YI: return "sit_CN";
- case LANG_YIDDISH: return "yi_IL";
- case LANG_YORUBA: return "yo_NG";
- case LANG_ZULU: return "zu_ZA";
- default: return "C";
- }
-
-#endif
-}
diff --git a/intl/log.c b/intl/log.c
deleted file mode 100644
index cb6076e8..00000000
--- a/intl/log.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Log file output.
- Copyright (C) 2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Written by Bruno Haible <bruno@clisp.org>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Print an ASCII string with quotes and escape sequences where needed. */
-static void
-print_escaped (FILE *stream, const char *str)
-{
- putc ('"', stream);
- for (; *str != '\0'; str++)
- if (*str == '\n')
- {
- fputs ("\\n\"", stream);
- if (str[1] == '\0')
- return;
- fputs ("\n\"", stream);
- }
- else
- {
- if (*str == '"' || *str == '\\')
- putc ('\\', stream);
- putc (*str, stream);
- }
- putc ('"', stream);
-}
-
-/* Add to the log file an entry denoting a failed translation. */
-void
-_nl_log_untranslated (const char *logfilename, const char *domainname,
- const char *msgid1, const char *msgid2, int plural)
-{
- static char *last_logfilename = NULL;
- static FILE *last_logfile = NULL;
- FILE *logfile;
-
- /* Can we reuse the last opened logfile? */
- if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
- {
- /* Close the last used logfile. */
- if (last_logfilename != NULL)
- {
- if (last_logfile != NULL)
- {
- fclose (last_logfile);
- last_logfile = NULL;
- }
- free (last_logfilename);
- last_logfilename = NULL;
- }
- /* Open the logfile. */
- last_logfilename = (char *) malloc (strlen (logfilename) + 1);
- if (last_logfilename == NULL)
- return;
- strcpy (last_logfilename, logfilename);
- last_logfile = fopen (logfilename, "a");
- if (last_logfile == NULL)
- return;
- }
- logfile = last_logfile;
-
- fprintf (logfile, "domain ");
- print_escaped (logfile, domainname);
- fprintf (logfile, "\nmsgid ");
- print_escaped (logfile, msgid1);
- if (plural)
- {
- fprintf (logfile, "\nmsgid_plural ");
- print_escaped (logfile, msgid2);
- fprintf (logfile, "\nmsgstr[0] \"\"\n");
- }
- else
- fprintf (logfile, "\nmsgstr \"\"\n");
- putc ('\n', logfile);
-}
diff --git a/intl/ngettext.c b/intl/ngettext.c
deleted file mode 100644
index e73e00c4..00000000
--- a/intl/ngettext.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Implementation of ngettext(3) function.
- Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h> /* Just for NULL. */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define NGETTEXT libintl_ngettext
-# define DCNGETTEXT libintl_dcngettext
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
- LC_MESSAGES locale. If not found, returns MSGID itself (the default
- text). */
-char *
-NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
-{
- return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-weak_alias (__ngettext, ngettext);
-#endif
diff --git a/intl/os2compat.c b/intl/os2compat.c
deleted file mode 100644
index c8dc33e7..00000000
--- a/intl/os2compat.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* OS/2 compatibility functions.
- Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#define OS2_AWARE
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-/* A version of getenv() that works from DLLs */
-extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
-
-char *
-_nl_getenv (const char *name)
-{
- unsigned char *value;
- if (DosScanEnv (name, &value))
- return NULL;
- else
- return value;
-}
-
-/* A fixed size buffer. */
-char libintl_nl_default_dirname[MAXPATHLEN+1];
-
-char *_nlos2_libdir = NULL;
-char *_nlos2_localealiaspath = NULL;
-char *_nlos2_localedir = NULL;
-
-static __attribute__((constructor)) void
-nlos2_initialize ()
-{
- char *root = getenv ("UNIXROOT");
- char *gnulocaledir = getenv ("GNULOCALEDIR");
-
- _nlos2_libdir = gnulocaledir;
- if (!_nlos2_libdir)
- {
- if (root)
- {
- size_t sl = strlen (root);
- _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
- memcpy (_nlos2_libdir, root, sl);
- memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
- }
- else
- _nlos2_libdir = LIBDIR;
- }
-
- _nlos2_localealiaspath = gnulocaledir;
- if (!_nlos2_localealiaspath)
- {
- if (root)
- {
- size_t sl = strlen (root);
- _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
- memcpy (_nlos2_localealiaspath, root, sl);
- memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
- }
- else
- _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
- }
-
- _nlos2_localedir = gnulocaledir;
- if (!_nlos2_localedir)
- {
- if (root)
- {
- size_t sl = strlen (root);
- _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
- memcpy (_nlos2_localedir, root, sl);
- memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
- }
- else
- _nlos2_localedir = LOCALEDIR;
- }
-
- if (strlen (_nlos2_localedir) <= MAXPATHLEN)
- strcpy (libintl_nl_default_dirname, _nlos2_localedir);
-}
diff --git a/intl/os2compat.h b/intl/os2compat.h
deleted file mode 100644
index 4f74e8c0..00000000
--- a/intl/os2compat.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* OS/2 compatibility defines.
- This file is intended to be included from config.h
- Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* When included from os2compat.h we need all the original definitions */
-#ifndef OS2_AWARE
-
-#undef LIBDIR
-#define LIBDIR _nlos2_libdir
-extern char *_nlos2_libdir;
-
-#undef LOCALEDIR
-#define LOCALEDIR _nlos2_localedir
-extern char *_nlos2_localedir;
-
-#undef LOCALE_ALIAS_PATH
-#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
-extern char *_nlos2_localealiaspath;
-
-#endif
-
-#undef HAVE_STRCASECMP
-#define HAVE_STRCASECMP 1
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-
-/* We have our own getenv() which works even if library is compiled as DLL */
-#define getenv _nl_getenv
-
-/* Older versions of gettext used -1 as the value of LC_MESSAGES */
-#define LC_MESSAGES_COMPAT (-1)
diff --git a/intl/osdep.c b/intl/osdep.c
deleted file mode 100644
index b3725983..00000000
--- a/intl/osdep.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* OS dependent parts of libintl.
- Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#if defined __EMX__
-# include "os2compat.c"
-#else
-/* Avoid AIX compiler warning. */
-typedef int dummy;
-#endif
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
deleted file mode 100644
index 8c04e642..00000000
--- a/intl/plural-exp.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Expression parsing for plural form selection.
- Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "plural-exp.h"
-
-#if (defined __GNUC__ && !defined __APPLE_CC__) \
- || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
- form determination. It represents the expression "n != 1". */
-static const struct expression plvar =
-{
- .nargs = 0,
- .operation = var,
-};
-static const struct expression plone =
-{
- .nargs = 0,
- .operation = num,
- .val =
- {
- .num = 1
- }
-};
-struct expression GERMANIC_PLURAL =
-{
- .nargs = 2,
- .operation = not_equal,
- .val =
- {
- .args =
- {
- [0] = (struct expression *) &plvar,
- [1] = (struct expression *) &plone
- }
- }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
- Initialization at run-time. */
-
-static struct expression plvar;
-static struct expression plone;
-struct expression GERMANIC_PLURAL;
-
-static void
-init_germanic_plural ()
-{
- if (plone.val.num == 0)
- {
- plvar.nargs = 0;
- plvar.operation = var;
-
- plone.nargs = 0;
- plone.operation = num;
- plone.val.num = 1;
-
- GERMANIC_PLURAL.nargs = 2;
- GERMANIC_PLURAL.operation = not_equal;
- GERMANIC_PLURAL.val.args[0] = &plvar;
- GERMANIC_PLURAL.val.args[1] = &plone;
- }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-void
-internal_function
-EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
- unsigned long int *npluralsp)
-{
- if (nullentry != NULL)
- {
- const char *plural;
- const char *nplurals;
-
- plural = strstr (nullentry, "plural=");
- nplurals = strstr (nullentry, "nplurals=");
- if (plural == NULL || nplurals == NULL)
- goto no_plural;
- else
- {
- char *endp;
- unsigned long int n;
- struct parse_args args;
-
- /* First get the number. */
- nplurals += 9;
- while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
- ++nplurals;
- if (!(*nplurals >= '0' && *nplurals <= '9'))
- goto no_plural;
-#if defined HAVE_STRTOUL || defined _LIBC
- n = strtoul (nplurals, &endp, 10);
-#else
- for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
- n = n * 10 + (*endp - '0');
-#endif
- if (nplurals == endp)
- goto no_plural;
- *npluralsp = n;
-
- /* Due to the restrictions bison imposes onto the interface of the
- scanner function we have to put the input string and the result
- passed up from the parser into the same structure which address
- is passed down to the parser. */
- plural += 7;
- args.cp = plural;
- if (PLURAL_PARSE (&args) != 0)
- goto no_plural;
- *pluralp = args.res;
- }
- }
- else
- {
- /* By default we are using the Germanic form: singular form only
- for `one', the plural form otherwise. Yes, this is also what
- English is using since English is a Germanic language. */
- no_plural:
- INIT_GERMANIC_PLURAL ();
- *pluralp = &GERMANIC_PLURAL;
- *npluralsp = 2;
- }
-}
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
deleted file mode 100644
index 49e2c5bf..00000000
--- a/intl/plural-exp.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Expression parsing and evaluation for plural form selection.
- Copyright (C) 2000-2003 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _PLURAL_EXP_H
-#define _PLURAL_EXP_H
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-
-/* This is the representation of the expressions to determine the
- plural form. */
-struct expression
-{
- int nargs; /* Number of arguments. */
- enum operator
- {
- /* Without arguments: */
- var, /* The variable "n". */
- num, /* Decimal number. */
- /* Unary operators: */
- lnot, /* Logical NOT. */
- /* Binary operators: */
- mult, /* Multiplication. */
- divide, /* Division. */
- module, /* Modulo operation. */
- plus, /* Addition. */
- minus, /* Subtraction. */
- less_than, /* Comparison. */
- greater_than, /* Comparison. */
- less_or_equal, /* Comparison. */
- greater_or_equal, /* Comparison. */
- equal, /* Comparison for equality. */
- not_equal, /* Comparison for inequality. */
- land, /* Logical AND. */
- lor, /* Logical OR. */
- /* Ternary operators: */
- qmop /* Question mark operator. */
- } operation;
- union
- {
- unsigned long int num; /* Number value for `num'. */
- struct expression *args[3]; /* Up to three arguments. */
- } val;
-};
-
-/* This is the data structure to pass information to the parser and get
- the result in a thread-safe way. */
-struct parse_args
-{
- const char *cp;
- struct expression *res;
-};
-
-
-/* Names for the libintl functions are a problem. This source code is used
- 1. in the GNU C Library library,
- 2. in the GNU libintl library,
- 3. in the GNU gettext tools.
- The function names in each situation must be different, to allow for
- binary incompatible changes in 'struct expression'. Furthermore,
- 1. in the GNU C Library library, the names have a __ prefix,
- 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
- must follow ANSI C and not start with __.
- So we have to distinguish the three cases. */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-# define PLURAL_PARSE __gettextparse
-# define GERMANIC_PLURAL __gettext_germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
-#elif defined (IN_LIBINTL)
-# define FREE_EXPRESSION libintl_gettext_free_exp
-# define PLURAL_PARSE libintl_gettextparse
-# define GERMANIC_PLURAL libintl_gettext_germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
-#else
-# define FREE_EXPRESSION free_plural_expression
-# define PLURAL_PARSE parse_plural_expression
-# define GERMANIC_PLURAL germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
-#endif
-
-extern void FREE_EXPRESSION (struct expression *exp)
- internal_function;
-extern int PLURAL_PARSE (void *arg);
-extern struct expression GERMANIC_PLURAL attribute_hidden;
-extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
- struct expression **pluralp,
- unsigned long int *npluralsp)
- internal_function;
-
-#if !defined (_LIBC) && !defined (IN_LIBINTL)
-extern unsigned long int plural_eval (struct expression *pexp,
- unsigned long int n);
-#endif
-
-#endif /* _PLURAL_EXP_H */
diff --git a/intl/plural.c b/intl/plural.c
deleted file mode 100644
index addededf..00000000
--- a/intl/plural.c
+++ /dev/null
@@ -1,1583 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875a. */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
- 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, 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* As a special exception, when this file is copied by Bison into a
- Bison output file, you may use that output file without restriction.
- This special exception was added by the Free Software Foundation
- in version 1.24 of Bison. */
-
-/* Written by Richard Stallman by simplifying the original so called
- ``semantic'' parser. */
-
-/* All symbols defined below should begin with yy or YY, to avoid
- infringing on user name space. This should be done even for local
- variables, as they might otherwise be expanded by user macros.
- There are some unavoidable exceptions within include files to
- define necessary library symbols; they are noted "INFRINGES ON
- USER NAME SPACE" below. */
-
-/* Identify Bison output. */
-#define YYBISON 1
-
-/* Skeleton name. */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers. */
-#define YYPURE 1
-
-/* Using locations. */
-#define YYLSP_NEEDED 0
-
-/* If NAME_PREFIX is specified substitute the variables and functions
- names. */
-#define yyparse __gettextparse
-#define yylex __gettextlex
-#define yyerror __gettexterror
-#define yylval __gettextlval
-#define yychar __gettextchar
-#define yydebug __gettextdebug
-#define yynerrs __gettextnerrs
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- EQUOP2 = 258,
- CMPOP2 = 259,
- ADDOP2 = 260,
- MULOP2 = 261,
- NUMBER = 262
- };
-#endif
-#define EQUOP2 258
-#define CMPOP2 259
-#define ADDOP2 260
-#define MULOP2 261
-#define NUMBER 262
-
-
-
-
-/* Copy the first part of user declarations. */
-#line 1 "plural.y"
-
-/* Expression parsing for plural form selection.
- Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* The bison generated parser uses alloca. AIX 3 forces us to put this
- declaration at the beginning of the file. The declaration in bison's
- skeleton file comes too late. This must come before <config.h>
- because <config.h> may include arbitrary system headers. */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "plural-exp.h"
-
-/* The main function generated by the parser is called __gettextparse,
- but we want it to be called PLURAL_PARSE. */
-#ifndef _LIBC
-# define __gettextparse PLURAL_PARSE
-#endif
-
-#define YYLEX_PARAM &((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM arg
-
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 49 "plural.y"
-typedef union YYSTYPE {
- unsigned long int num;
- enum operator op;
- struct expression *exp;
-} YYSTYPE;
-/* Line 191 of yacc.c. */
-#line 151 "plural.c"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-/* Copy the second part of user declarations. */
-#line 55 "plural.y"
-
-/* Prototypes for local functions. */
-static int yylex (YYSTYPE *lval, const char **pexp);
-static void yyerror (const char *str);
-
-/* Allocation of expressions. */
-
-static struct expression *
-new_exp (int nargs, enum operator op, struct expression * const *args)
-{
- int i;
- struct expression *newp;
-
- /* If any of the argument could not be malloc'ed, just return NULL. */
- for (i = nargs - 1; i >= 0; i--)
- if (args[i] == NULL)
- goto fail;
-
- /* Allocate a new expression. */
- newp = (struct expression *) malloc (sizeof (*newp));
- if (newp != NULL)
- {
- newp->nargs = nargs;
- newp->operation = op;
- for (i = nargs - 1; i >= 0; i--)
- newp->val.args[i] = args[i];
- return newp;
- }
-
- fail:
- for (i = nargs - 1; i >= 0; i--)
- FREE_EXPRESSION (args[i]);
-
- return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (enum operator op)
-{
- return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (enum operator op, struct expression *right)
-{
- struct expression *args[1];
-
- args[0] = right;
- return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (enum operator op, struct expression *left, struct expression *right)
-{
- struct expression *args[2];
-
- args[0] = left;
- args[1] = right;
- return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (enum operator op, struct expression *bexp,
- struct expression *tbranch, struct expression *fbranch)
-{
- struct expression *args[3];
-
- args[0] = bexp;
- args[1] = tbranch;
- args[2] = fbranch;
- return new_exp (3, op, args);
-}
-
-
-
-/* Line 214 of yacc.c. */
-#line 237 "plural.c"
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols. */
-
-# if YYSTACK_USE_ALLOCA
-# define YYSTACK_ALLOC alloca
-# else
-# ifndef YYSTACK_USE_ALLOCA
-# if defined (alloca) || defined (_ALLOCA_H)
-# define YYSTACK_ALLOC alloca
-# else
-# ifdef __GNUC__
-# define YYSTACK_ALLOC __builtin_alloca
-# endif
-# endif
-# endif
-# endif
-
-# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-# if defined (__STDC__) || defined (__cplusplus)
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
-# define YYSTACK_ALLOC malloc
-# define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-
-
-#if (! defined (yyoverflow) \
- && (! defined (__cplusplus) \
- || (YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member. */
-union yyalloc
-{
- short yyss;
- YYSTYPE yyvs;
- };
-
-/* The size of the maximum gap between one aligned stack and the next. */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
- N elements. */
-# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
- + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- register YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (0)
-# endif
-# endif
-
-/* Relocate STACK from its old location to the new one. The
- local variables YYSIZE and YYSTACKSIZE give the old and new number of
- elements in the stack, and YYPTR gives the new location of the
- stack. Advance YYPTR to a properly aligned location for the next
- stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
- while (0)
-
-#endif
-
-#if defined (__STDC__) || defined (__cplusplus)
- typedef signed char yysigned_char;
-#else
- typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 9
-/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 54
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 16
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 3
-/* YYNRULES -- Number of rules. */
-#define YYNRULES 13
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 27
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
-#define YYUNDEFTOK 2
-#define YYMAXUTOK 262
-
-#define YYTRANSLATE(YYX) \
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
-static const unsigned char yytranslate[] =
-{
- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
- 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
- 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 1, 2, 6, 7,
- 8, 9, 11
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const unsigned char yyprhs[] =
-{
- 0, 0, 3, 5, 11, 15, 19, 23, 27, 31,
- 35, 38, 40, 42
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
-{
- 17, 0, -1, 18, -1, 18, 3, 18, 12, 18,
- -1, 18, 4, 18, -1, 18, 5, 18, -1, 18,
- 6, 18, -1, 18, 7, 18, -1, 18, 8, 18,
- -1, 18, 9, 18, -1, 10, 18, -1, 13, -1,
- 11, -1, 14, 18, 15, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const unsigned char yyrline[] =
-{
- 0, 150, 150, 158, 162, 166, 170, 174, 178, 182,
- 186, 190, 194, 199
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
- "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
- "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
- "$accept", "start", "exp", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
-static const unsigned short yytoknum[] =
-{
- 0, 256, 257, 63, 124, 38, 258, 259, 260, 261,
- 33, 262, 58, 110, 40, 41
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const unsigned char yyr1[] =
-{
- 0, 16, 17, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const unsigned char yyr2[] =
-{
- 0, 2, 1, 5, 3, 3, 3, 3, 3, 3,
- 2, 1, 1, 3
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const unsigned char yydefact[] =
-{
- 0, 0, 12, 11, 0, 0, 2, 10, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 13, 0, 4,
- 5, 6, 7, 8, 9, 0, 3
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
-{
- -1, 5, 6
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -10
-static const yysigned_char yypact[] =
-{
- -9, -9, -10, -10, -9, 8, 36, -10, 13, -10,
- -9, -9, -9, -9, -9, -9, -9, -10, 26, 41,
- 45, 18, -2, 14, -10, -9, 36
-};
-
-/* YYPGOTO[NTERM-NUM]. */
-static const yysigned_char yypgoto[] =
-{
- -10, -10, -1
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -1
-static const unsigned char yytable[] =
-{
- 7, 1, 2, 8, 3, 4, 15, 16, 9, 18,
- 19, 20, 21, 22, 23, 24, 10, 11, 12, 13,
- 14, 15, 16, 16, 26, 14, 15, 16, 17, 10,
- 11, 12, 13, 14, 15, 16, 0, 0, 25, 10,
- 11, 12, 13, 14, 15, 16, 12, 13, 14, 15,
- 16, 13, 14, 15, 16
-};
-
-static const yysigned_char yycheck[] =
-{
- 1, 10, 11, 4, 13, 14, 8, 9, 0, 10,
- 11, 12, 13, 14, 15, 16, 3, 4, 5, 6,
- 7, 8, 9, 9, 25, 7, 8, 9, 15, 3,
- 4, 5, 6, 7, 8, 9, -1, -1, 12, 3,
- 4, 5, 6, 7, 8, 9, 5, 6, 7, 8,
- 9, 6, 7, 8, 9
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const unsigned char yystos[] =
-{
- 0, 10, 11, 13, 14, 17, 18, 18, 18, 0,
- 3, 4, 5, 6, 7, 8, 9, 15, 18, 18,
- 18, 18, 18, 18, 18, 12, 18
-};
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrlab1
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
-
-#define YYFAIL goto yyerrlab
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK; \
- goto yybackup; \
- } \
- else \
- { \
- yyerror ("syntax error: cannot back up");\
- YYERROR; \
- } \
-while (0)
-
-#define YYTERROR 1
-#define YYERRCODE 256
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
- are run). */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- Current.first_line = Rhs[1].first_line; \
- Current.first_column = Rhs[1].first_column; \
- Current.last_line = Rhs[N].last_line; \
- Current.last_column = Rhs[N].last_column;
-#endif
-
-/* YYLEX -- calling `yylex' with the right arguments. */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
-
-/* Enable debugging if requested. */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-# define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
-} while (0)
-
-# define YYDSYMPRINT(Args) \
-do { \
- if (yydebug) \
- yysymprint Args; \
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yysymprint (stderr, \
- Token, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
-} while (0)
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded). |
-`------------------------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short *bottom, short *top)
-#else
-static void
-yy_stack_print (bottom, top)
- short *bottom;
- short *top;
-#endif
-{
- YYFPRINTF (stderr, "Stack now");
- for (/* Nothing. */; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
- YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced. |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
- int yyrule;
-#endif
-{
- int yyi;
- unsigned int yylineno = yyrline[yyrule];
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
- yyrule - 1, yylineno);
- /* Print the symbols being reduced, and their result. */
- for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
- YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
- YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
-}
-
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (Rule); \
-} while (0)
-
-/* Nonzero means print parse trace. It is left uninitialized so that
- multiple parsers can coexist. */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
- if the built-in stack extension method is used).
-
- Do not make this value too large; the results are undefined if
- SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
- evaluated with infinite-precision integer arithmetic. */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-# if defined (__GLIBC__) && defined (_STRING_H)
-# define yystrlen strlen
-# else
-/* Return the length of YYSTR. */
-static YYSIZE_T
-# if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-# else
-yystrlen (yystr)
- const char *yystr;
-# endif
-{
- register const char *yys = yystr;
-
- while (*yys++ != '\0')
- continue;
-
- return yys - yystr - 1;
-}
-# endif
-# endif
-
-# ifndef yystpcpy
-# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-# define yystpcpy stpcpy
-# else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
- YYDEST. */
-static char *
-# if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-# else
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-# endif
-{
- register char *yyd = yydest;
- register const char *yys = yysrc;
-
- while ((*yyd++ = *yys++) != '\0')
- continue;
-
- return yyd - 1;
-}
-# endif
-# endif
-
-#endif /* !YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
-{
- /* Pacify ``unused variable'' warnings. */
- (void) yyvaluep;
-
- if (yytype < YYNTOKENS)
- {
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
- }
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
- switch (yytype)
- {
- default:
- break;
- }
- YYFPRINTF (yyoutput, ")");
-}
-
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol. |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yytype, yyvaluep)
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
-{
- /* Pacify ``unused variable'' warnings. */
- (void) yyvaluep;
-
- switch (yytype)
- {
-
- default:
- break;
- }
-}
-
-
-/* Prevent warnings from -Wmissing-prototypes. */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-
-/*----------.
-| yyparse. |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
- /* The lookahead symbol. */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far. */
-int yynerrs;
-
- register int yystate;
- register int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken = 0;
-
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- short yyssa[YYINITDEPTH];
- short *yyss = yyssa;
- register short *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- register YYSTYPE *yyvsp;
-
-
-
-#define YYPOPSTACK (yyvsp--, yyssp--)
-
- YYSIZE_T yystacksize = YYINITDEPTH;
-
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
-
- /* When reducing, the number of symbols on the RHS of the reduced
- rule. */
- int yylen;
-
- YYDPRINTF ((stderr, "Starting parse\n"));
-
- yystate = 0;
- yyerrstatus = 0;
- yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
-
- yyssp = yyss;
- yyvsp = yyvs;
-
- goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
-`------------------------------------------------------------*/
- yynewstate:
- /* In all cases, when you get here, the value and location stacks
- have just been pushed. so pushing a state here evens the stacks.
- */
- yyssp++;
-
- yysetstate:
- *yyssp = yystate;
-
- if (yyss + yystacksize - 1 <= yyssp)
- {
- /* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
- {
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- short *yyss1 = yyss;
-
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow ("parser stack overflow",
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
-
- &yystacksize);
-
- yyss = yyss1;
- yyvs = yyvs1;
- }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyoverflowlab;
-# else
- /* Extend the stack our own way. */
- if (YYMAXDEPTH <= yystacksize)
- goto yyoverflowlab;
- yystacksize *= 2;
- if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
-
- {
- short *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyoverflowlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
-# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
- }
-# endif
-#endif /* no yyoverflow */
-
- yyssp = yyss + yysize - 1;
- yyvsp = yyvs + yysize - 1;
-
-
- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
-
- if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
- }
-
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
- goto yybackup;
-
-/*-----------.
-| yybackup. |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state. */
-/* Read a lookahead token if we need one and don't already have one. */
-/* yyresume: */
-
- /* First try to decide what to do without reference to lookahead token. */
-
- yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
- goto yydefault;
-
- /* Not known => get a lookahead token if don't already have one. */
-
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
- if (yychar == YYEMPTY)
- {
- YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
- }
-
- if (yychar <= YYEOF)
- {
- yychar = yytoken = YYEOF;
- YYDPRINTF ((stderr, "Now at end of input.\n"));
- }
- else
- {
- yytoken = YYTRANSLATE (yychar);
- YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
- }
-
- /* If the proper action on seeing token YYTOKEN is to reduce or to
- detect an error, take that action. */
- yyn += yytoken;
- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
- goto yydefault;
- yyn = yytable[yyn];
- if (yyn <= 0)
- {
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
- yyn = -yyn;
- goto yyreduce;
- }
-
- if (yyn == YYFINAL)
- YYACCEPT;
-
- /* Shift the lookahead token. */
- YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
- /* Discard the token being shifted unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
- *++yyvsp = yylval;
-
-
- /* Count tokens shifted since error; after three, turn off error
- status. */
- if (yyerrstatus)
- yyerrstatus--;
-
- yystate = yyn;
- goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state. |
-`-----------------------------------------------------------*/
-yydefault:
- yyn = yydefact[yystate];
- if (yyn == 0)
- goto yyerrlab;
- goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction. |
-`-----------------------------*/
-yyreduce:
- /* yyn is the number of a rule to reduce with. */
- yylen = yyr2[yyn];
-
- /* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
-
- Otherwise, the following line sets YYVAL to garbage.
- This behavior is undocumented and Bison
- users should not rely upon it. Assigning to YYVAL
- unconditionally makes the parser a bit smaller, and it avoids a
- GCC warning that YYVAL may be used uninitialized. */
- yyval = yyvsp[1-yylen];
-
-
- YY_REDUCE_PRINT (yyn);
- switch (yyn)
- {
- case 2:
-#line 151 "plural.y"
- {
- if (yyvsp[0].exp == NULL)
- YYABORT;
- ((struct parse_args *) arg)->res = yyvsp[0].exp;
- }
- break;
-
- case 3:
-#line 159 "plural.y"
- {
- yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 4:
-#line 163 "plural.y"
- {
- yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 5:
-#line 167 "plural.y"
- {
- yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 6:
-#line 171 "plural.y"
- {
- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 7:
-#line 175 "plural.y"
- {
- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 8:
-#line 179 "plural.y"
- {
- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 9:
-#line 183 "plural.y"
- {
- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- }
- break;
-
- case 10:
-#line 187 "plural.y"
- {
- yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
- }
- break;
-
- case 11:
-#line 191 "plural.y"
- {
- yyval.exp = new_exp_0 (var);
- }
- break;
-
- case 12:
-#line 195 "plural.y"
- {
- if ((yyval.exp = new_exp_0 (num)) != NULL)
- yyval.exp->val.num = yyvsp[0].num;
- }
- break;
-
- case 13:
-#line 200 "plural.y"
- {
- yyval.exp = yyvsp[-1].exp;
- }
- break;
-
-
- }
-
-/* Line 999 of yacc.c. */
-#line 1212 "plural.c"
-
- yyvsp -= yylen;
- yyssp -= yylen;
-
-
- YY_STACK_PRINT (yyss, yyssp);
-
- *++yyvsp = yyval;
-
-
- /* Now `shift' the result of the reduction. Determine what state
- that goes to, based on the state we popped back to and the rule
- number reduced by. */
-
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTOKENS];
-
- goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
- /* If not already recovering from an error, report this error. */
- if (!yyerrstatus)
- {
- ++yynerrs;
-#if YYERROR_VERBOSE
- yyn = yypact[yystate];
-
- if (YYPACT_NINF < yyn && yyn < YYLAST)
- {
- YYSIZE_T yysize = 0;
- int yytype = YYTRANSLATE (yychar);
- char *yymsg;
- int yyx, yycount;
-
- yycount = 0;
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- for (yyx = yyn < 0 ? -yyn : 0;
- yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- yysize += yystrlen (yytname[yyx]) + 15, yycount++;
- yysize += yystrlen ("syntax error, unexpected ") + 1;
- yysize += yystrlen (yytname[yytype]);
- yymsg = (char *) YYSTACK_ALLOC (yysize);
- if (yymsg != 0)
- {
- char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
- yyp = yystpcpy (yyp, yytname[yytype]);
-
- if (yycount < 5)
- {
- yycount = 0;
- for (yyx = yyn < 0 ? -yyn : 0;
- yyx < (int) (sizeof (yytname) / sizeof (char *));
- yyx++)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- const char *yyq = ! yycount ? ", expecting " : " or ";
- yyp = yystpcpy (yyp, yyq);
- yyp = yystpcpy (yyp, yytname[yyx]);
- yycount++;
- }
- }
- yyerror (yymsg);
- YYSTACK_FREE (yymsg);
- }
- else
- yyerror ("syntax error; also virtual memory exhausted");
- }
- else
-#endif /* YYERROR_VERBOSE */
- yyerror ("syntax error");
- }
-
-
-
- if (yyerrstatus == 3)
- {
- /* If just tried and failed to reuse lookahead token after an
- error, discard it. */
-
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- {
- /* Pop the error token. */
- YYPOPSTACK;
- /* Pop the rest of the stack. */
- while (yyss < yyssp)
- {
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[*yyssp], yyvsp);
- YYPOPSTACK;
- }
- YYABORT;
- }
-
- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
- yydestruct (yytoken, &yylval);
- yychar = YYEMPTY;
-
- }
-
- /* Else will try to reuse lookahead token after shifting the error
- token. */
- goto yyerrlab1;
-
-
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action. |
-`----------------------------------------------------*/
-yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
-
- for (;;)
- {
- yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
-
- /* Pop the current state because it cannot handle the error token. */
- if (yyssp == yyss)
- YYABORT;
-
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[yystate], yyvsp);
- yyvsp--;
- yystate = *--yyssp;
-
- YY_STACK_PRINT (yyss, yyssp);
- }
-
- if (yyn == YYFINAL)
- YYACCEPT;
-
- YYDPRINTF ((stderr, "Shifting error token, "));
-
- *++yyvsp = yylval;
-
-
- yystate = yyn;
- goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here. |
-`-------------------------------------*/
-yyacceptlab:
- yyresult = 0;
- goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here. |
-`-----------------------------------*/
-yyabortlab:
- yyresult = 1;
- goto yyreturn;
-
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here. |
-`----------------------------------------------*/
-yyoverflowlab:
- yyerror ("parser stack overflow");
- yyresult = 2;
- /* Fall through. */
-#endif
-
-yyreturn:
-#ifndef yyoverflow
- if (yyss != yyssa)
- YYSTACK_FREE (yyss);
-#endif
- return yyresult;
-}
-
-
-#line 205 "plural.y"
-
-
-void
-internal_function
-FREE_EXPRESSION (struct expression *exp)
-{
- if (exp == NULL)
- return;
-
- /* Handle the recursive case. */
- switch (exp->nargs)
- {
- case 3:
- FREE_EXPRESSION (exp->val.args[2]);
- /* FALLTHROUGH */
- case 2:
- FREE_EXPRESSION (exp->val.args[1]);
- /* FALLTHROUGH */
- case 1:
- FREE_EXPRESSION (exp->val.args[0]);
- /* FALLTHROUGH */
- default:
- break;
- }
-
- free (exp);
-}
-
-
-static int
-yylex (YYSTYPE *lval, const char **pexp)
-{
- const char *exp = *pexp;
- int result;
-
- while (1)
- {
- if (exp[0] == '\0')
- {
- *pexp = exp;
- return YYEOF;
- }
-
- if (exp[0] != ' ' && exp[0] != '\t')
- break;
-
- ++exp;
- }
-
- result = *exp++;
- switch (result)
- {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- {
- unsigned long int n = result - '0';
- while (exp[0] >= '0' && exp[0] <= '9')
- {
- n *= 10;
- n += exp[0] - '0';
- ++exp;
- }
- lval->num = n;
- result = NUMBER;
- }
- break;
-
- case '=':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = equal;
- result = EQUOP2;
- }
- else
- result = YYERRCODE;
- break;
-
- case '!':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = not_equal;
- result = EQUOP2;
- }
- break;
-
- case '&':
- case '|':
- if (exp[0] == result)
- ++exp;
- else
- result = YYERRCODE;
- break;
-
- case '<':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = less_or_equal;
- }
- else
- lval->op = less_than;
- result = CMPOP2;
- break;
-
- case '>':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = greater_or_equal;
- }
- else
- lval->op = greater_than;
- result = CMPOP2;
- break;
-
- case '*':
- lval->op = mult;
- result = MULOP2;
- break;
-
- case '/':
- lval->op = divide;
- result = MULOP2;
- break;
-
- case '%':
- lval->op = module;
- result = MULOP2;
- break;
-
- case '+':
- lval->op = plus;
- result = ADDOP2;
- break;
-
- case '-':
- lval->op = minus;
- result = ADDOP2;
- break;
-
- case 'n':
- case '?':
- case ':':
- case '(':
- case ')':
- /* Nothing, just return the character. */
- break;
-
- case ';':
- case '\n':
- case '\0':
- /* Be safe and let the user call this function again. */
- --exp;
- result = YYEOF;
- break;
-
- default:
- result = YYERRCODE;
-#if YYDEBUG != 0
- --exp;
-#endif
- break;
- }
-
- *pexp = exp;
-
- return result;
-}
-
-
-static void
-yyerror (const char *str)
-{
- /* Do nothing. We don't print error messages here. */
-}
-
diff --git a/intl/plural.y b/intl/plural.y
deleted file mode 100644
index 4d33bd7c..00000000
--- a/intl/plural.y
+++ /dev/null
@@ -1,381 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
- Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* The bison generated parser uses alloca. AIX 3 forces us to put this
- declaration at the beginning of the file. The declaration in bison's
- skeleton file comes too late. This must come before <config.h>
- because <config.h> may include arbitrary system headers. */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "plural-exp.h"
-
-/* The main function generated by the parser is called __gettextparse,
- but we want it to be called PLURAL_PARSE. */
-#ifndef _LIBC
-# define __gettextparse PLURAL_PARSE
-#endif
-
-#define YYLEX_PARAM &((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM arg
-%}
-%pure_parser
-%expect 7
-
-%union {
- unsigned long int num;
- enum operator op;
- struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions. */
-static int yylex (YYSTYPE *lval, const char **pexp);
-static void yyerror (const char *str);
-
-/* Allocation of expressions. */
-
-static struct expression *
-new_exp (int nargs, enum operator op, struct expression * const *args)
-{
- int i;
- struct expression *newp;
-
- /* If any of the argument could not be malloc'ed, just return NULL. */
- for (i = nargs - 1; i >= 0; i--)
- if (args[i] == NULL)
- goto fail;
-
- /* Allocate a new expression. */
- newp = (struct expression *) malloc (sizeof (*newp));
- if (newp != NULL)
- {
- newp->nargs = nargs;
- newp->operation = op;
- for (i = nargs - 1; i >= 0; i--)
- newp->val.args[i] = args[i];
- return newp;
- }
-
- fail:
- for (i = nargs - 1; i >= 0; i--)
- FREE_EXPRESSION (args[i]);
-
- return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (enum operator op)
-{
- return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (enum operator op, struct expression *right)
-{
- struct expression *args[1];
-
- args[0] = right;
- return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (enum operator op, struct expression *left, struct expression *right)
-{
- struct expression *args[2];
-
- args[0] = left;
- args[1] = right;
- return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (enum operator op, struct expression *bexp,
- struct expression *tbranch, struct expression *fbranch)
-{
- struct expression *args[3];
-
- args[0] = bexp;
- args[1] = tbranch;
- args[2] = fbranch;
- return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
- precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
- There is no unary minus and no bitwise operators.
- Operators with the same syntactic behaviour have been merged into a single
- token, to save space in the array generated by bison. */
-%right '?' /* ? */
-%left '|' /* || */
-%left '&' /* && */
-%left EQUOP2 /* == != */
-%left CMPOP2 /* < > <= >= */
-%left ADDOP2 /* + - */
-%left MULOP2 /* * / % */
-%right '!' /* ! */
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start: exp
- {
- if ($1 == NULL)
- YYABORT;
- ((struct parse_args *) arg)->res = $1;
- }
- ;
-
-exp: exp '?' exp ':' exp
- {
- $$ = new_exp_3 (qmop, $1, $3, $5);
- }
- | exp '|' exp
- {
- $$ = new_exp_2 (lor, $1, $3);
- }
- | exp '&' exp
- {
- $$ = new_exp_2 (land, $1, $3);
- }
- | exp EQUOP2 exp
- {
- $$ = new_exp_2 ($2, $1, $3);
- }
- | exp CMPOP2 exp
- {
- $$ = new_exp_2 ($2, $1, $3);
- }
- | exp ADDOP2 exp
- {
- $$ = new_exp_2 ($2, $1, $3);
- }
- | exp MULOP2 exp
- {
- $$ = new_exp_2 ($2, $1, $3);
- }
- | '!' exp
- {
- $$ = new_exp_1 (lnot, $2);
- }
- | 'n'
- {
- $$ = new_exp_0 (var);
- }
- | NUMBER
- {
- if (($$ = new_exp_0 (num)) != NULL)
- $$->val.num = $1;
- }
- | '(' exp ')'
- {
- $$ = $2;
- }
- ;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (struct expression *exp)
-{
- if (exp == NULL)
- return;
-
- /* Handle the recursive case. */
- switch (exp->nargs)
- {
- case 3:
- FREE_EXPRESSION (exp->val.args[2]);
- /* FALLTHROUGH */
- case 2:
- FREE_EXPRESSION (exp->val.args[1]);
- /* FALLTHROUGH */
- case 1:
- FREE_EXPRESSION (exp->val.args[0]);
- /* FALLTHROUGH */
- default:
- break;
- }
-
- free (exp);
-}
-
-
-static int
-yylex (YYSTYPE *lval, const char **pexp)
-{
- const char *exp = *pexp;
- int result;
-
- while (1)
- {
- if (exp[0] == '\0')
- {
- *pexp = exp;
- return YYEOF;
- }
-
- if (exp[0] != ' ' && exp[0] != '\t')
- break;
-
- ++exp;
- }
-
- result = *exp++;
- switch (result)
- {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- {
- unsigned long int n = result - '0';
- while (exp[0] >= '0' && exp[0] <= '9')
- {
- n *= 10;
- n += exp[0] - '0';
- ++exp;
- }
- lval->num = n;
- result = NUMBER;
- }
- break;
-
- case '=':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = equal;
- result = EQUOP2;
- }
- else
- result = YYERRCODE;
- break;
-
- case '!':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = not_equal;
- result = EQUOP2;
- }
- break;
-
- case '&':
- case '|':
- if (exp[0] == result)
- ++exp;
- else
- result = YYERRCODE;
- break;
-
- case '<':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = less_or_equal;
- }
- else
- lval->op = less_than;
- result = CMPOP2;
- break;
-
- case '>':
- if (exp[0] == '=')
- {
- ++exp;
- lval->op = greater_or_equal;
- }
- else
- lval->op = greater_than;
- result = CMPOP2;
- break;
-
- case '*':
- lval->op = mult;
- result = MULOP2;
- break;
-
- case '/':
- lval->op = divide;
- result = MULOP2;
- break;
-
- case '%':
- lval->op = module;
- result = MULOP2;
- break;
-
- case '+':
- lval->op = plus;
- result = ADDOP2;
- break;
-
- case '-':
- lval->op = minus;
- result = ADDOP2;
- break;
-
- case 'n':
- case '?':
- case ':':
- case '(':
- case ')':
- /* Nothing, just return the character. */
- break;
-
- case ';':
- case '\n':
- case '\0':
- /* Be safe and let the user call this function again. */
- --exp;
- result = YYEOF;
- break;
-
- default:
- result = YYERRCODE;
-#if YYDEBUG != 0
- --exp;
-#endif
- break;
- }
-
- *pexp = exp;
-
- return result;
-}
-
-
-static void
-yyerror (const char *str)
-{
- /* Do nothing. We don't print error messages here. */
-}
diff --git a/intl/printf-args.c b/intl/printf-args.c
deleted file mode 100644
index f6f3219e..00000000
--- a/intl/printf-args.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification. */
-#include "printf-args.h"
-
-#ifdef STATIC
-STATIC
-#endif
-int
-printf_fetchargs (va_list args, arguments *a)
-{
- size_t i;
- argument *ap;
-
- for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
- switch (ap->type)
- {
- case TYPE_SCHAR:
- ap->a.a_schar = va_arg (args, /*signed char*/ int);
- break;
- case TYPE_UCHAR:
- ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
- break;
- case TYPE_SHORT:
- ap->a.a_short = va_arg (args, /*short*/ int);
- break;
- case TYPE_USHORT:
- ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
- break;
- case TYPE_INT:
- ap->a.a_int = va_arg (args, int);
- break;
- case TYPE_UINT:
- ap->a.a_uint = va_arg (args, unsigned int);
- break;
- case TYPE_LONGINT:
- ap->a.a_longint = va_arg (args, long int);
- break;
- case TYPE_ULONGINT:
- ap->a.a_ulongint = va_arg (args, unsigned long int);
- break;
-#ifdef HAVE_LONG_LONG
- case TYPE_LONGLONGINT:
- ap->a.a_longlongint = va_arg (args, long long int);
- break;
- case TYPE_ULONGLONGINT:
- ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
- break;
-#endif
- case TYPE_DOUBLE:
- ap->a.a_double = va_arg (args, double);
- break;
-#ifdef HAVE_LONG_DOUBLE
- case TYPE_LONGDOUBLE:
- ap->a.a_longdouble = va_arg (args, long double);
- break;
-#endif
- case TYPE_CHAR:
- ap->a.a_char = va_arg (args, int);
- break;
-#ifdef HAVE_WINT_T
- case TYPE_WIDE_CHAR:
- ap->a.a_wide_char = va_arg (args, wint_t);
- break;
-#endif
- case TYPE_STRING:
- ap->a.a_string = va_arg (args, const char *);
- break;
-#ifdef HAVE_WCHAR_T
- case TYPE_WIDE_STRING:
- ap->a.a_wide_string = va_arg (args, const wchar_t *);
- break;
-#endif
- case TYPE_POINTER:
- ap->a.a_pointer = va_arg (args, void *);
- break;
- case TYPE_COUNT_SCHAR_POINTER:
- ap->a.a_count_schar_pointer = va_arg (args, signed char *);
- break;
- case TYPE_COUNT_SHORT_POINTER:
- ap->a.a_count_short_pointer = va_arg (args, short *);
- break;
- case TYPE_COUNT_INT_POINTER:
- ap->a.a_count_int_pointer = va_arg (args, int *);
- break;
- case TYPE_COUNT_LONGINT_POINTER:
- ap->a.a_count_longint_pointer = va_arg (args, long int *);
- break;
-#ifdef HAVE_LONG_LONG
- case TYPE_COUNT_LONGLONGINT_POINTER:
- ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
- break;
-#endif
- default:
- /* Unknown type. */
- return -1;
- }
- return 0;
-}
diff --git a/intl/printf-args.h b/intl/printf-args.h
deleted file mode 100644
index f11e64c0..00000000
--- a/intl/printf-args.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _PRINTF_ARGS_H
-#define _PRINTF_ARGS_H
-
-/* Get size_t. */
-#include <stddef.h>
-
-/* Get wchar_t. */
-#ifdef HAVE_WCHAR_T
-# include <stddef.h>
-#endif
-
-/* Get wint_t. */
-#ifdef HAVE_WINT_T
-# include <wchar.h>
-#endif
-
-/* Get va_list. */
-#include <stdarg.h>
-
-
-/* Argument types */
-typedef enum
-{
- TYPE_NONE,
- TYPE_SCHAR,
- TYPE_UCHAR,
- TYPE_SHORT,
- TYPE_USHORT,
- TYPE_INT,
- TYPE_UINT,
- TYPE_LONGINT,
- TYPE_ULONGINT,
-#ifdef HAVE_LONG_LONG
- TYPE_LONGLONGINT,
- TYPE_ULONGLONGINT,
-#endif
- TYPE_DOUBLE,
-#ifdef HAVE_LONG_DOUBLE
- TYPE_LONGDOUBLE,
-#endif
- TYPE_CHAR,
-#ifdef HAVE_WINT_T
- TYPE_WIDE_CHAR,
-#endif
- TYPE_STRING,
-#ifdef HAVE_WCHAR_T
- TYPE_WIDE_STRING,
-#endif
- TYPE_POINTER,
- TYPE_COUNT_SCHAR_POINTER,
- TYPE_COUNT_SHORT_POINTER,
- TYPE_COUNT_INT_POINTER,
- TYPE_COUNT_LONGINT_POINTER
-#ifdef HAVE_LONG_LONG
-, TYPE_COUNT_LONGLONGINT_POINTER
-#endif
-} arg_type;
-
-/* Polymorphic argument */
-typedef struct
-{
- arg_type type;
- union
- {
- signed char a_schar;
- unsigned char a_uchar;
- short a_short;
- unsigned short a_ushort;
- int a_int;
- unsigned int a_uint;
- long int a_longint;
- unsigned long int a_ulongint;
-#ifdef HAVE_LONG_LONG
- long long int a_longlongint;
- unsigned long long int a_ulonglongint;
-#endif
- float a_float;
- double a_double;
-#ifdef HAVE_LONG_DOUBLE
- long double a_longdouble;
-#endif
- int a_char;
-#ifdef HAVE_WINT_T
- wint_t a_wide_char;
-#endif
- const char* a_string;
-#ifdef HAVE_WCHAR_T
- const wchar_t* a_wide_string;
-#endif
- void* a_pointer;
- signed char * a_count_schar_pointer;
- short * a_count_short_pointer;
- int * a_count_int_pointer;
- long int * a_count_longint_pointer;
-#ifdef HAVE_LONG_LONG
- long long int * a_count_longlongint_pointer;
-#endif
- }
- a;
-}
-argument;
-
-typedef struct
-{
- size_t count;
- argument *arg;
-}
-arguments;
-
-
-/* Fetch the arguments, putting them into a. */
-#ifdef STATIC
-STATIC
-#else
-extern
-#endif
-int printf_fetchargs (va_list args, arguments *a);
-
-#endif /* _PRINTF_ARGS_H */
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
deleted file mode 100644
index d19f903d..00000000
--- a/intl/printf-parse.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification. */
-#if WIDE_CHAR_VERSION
-# include "wprintf-parse.h"
-#else
-# include "printf-parse.h"
-#endif
-
-/* Get size_t, NULL. */
-#include <stddef.h>
-
-/* Get intmax_t. */
-#if HAVE_STDINT_H_WITH_UINTMAX
-# include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-# include <inttypes.h>
-#endif
-
-/* malloc(), realloc(), free(). */
-#include <stdlib.h>
-
-/* Checked size_t computations. */
-#include "xsize.h"
-
-#if WIDE_CHAR_VERSION
-# define PRINTF_PARSE wprintf_parse
-# define CHAR_T wchar_t
-# define DIRECTIVE wchar_t_directive
-# define DIRECTIVES wchar_t_directives
-#else
-# define PRINTF_PARSE printf_parse
-# define CHAR_T char
-# define DIRECTIVE char_directive
-# define DIRECTIVES char_directives
-#endif
-
-#ifdef STATIC
-STATIC
-#endif
-int
-PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
-{
- const CHAR_T *cp = format; /* pointer into format */
- size_t arg_posn = 0; /* number of regular arguments consumed */
- size_t d_allocated; /* allocated elements of d->dir */
- size_t a_allocated; /* allocated elements of a->arg */
- size_t max_width_length = 0;
- size_t max_precision_length = 0;
-
- d->count = 0;
- d_allocated = 1;
- d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
- if (d->dir == NULL)
- /* Out of memory. */
- return -1;
-
- a->count = 0;
- a_allocated = 0;
- a->arg = NULL;
-
-#define REGISTER_ARG(_index_,_type_) \
- { \
- size_t n = (_index_); \
- if (n >= a_allocated) \
- { \
- size_t memory_size; \
- argument *memory; \
- \
- a_allocated = xtimes (a_allocated, 2); \
- if (a_allocated <= n) \
- a_allocated = xsum (n, 1); \
- memory_size = xtimes (a_allocated, sizeof (argument)); \
- if (size_overflow_p (memory_size)) \
- /* Overflow, would lead to out of memory. */ \
- goto error; \
- memory = (a->arg \
- ? realloc (a->arg, memory_size) \
- : malloc (memory_size)); \
- if (memory == NULL) \
- /* Out of memory. */ \
- goto error; \
- a->arg = memory; \
- } \
- while (a->count <= n) \
- a->arg[a->count++].type = TYPE_NONE; \
- if (a->arg[n].type == TYPE_NONE) \
- a->arg[n].type = (_type_); \
- else if (a->arg[n].type != (_type_)) \
- /* Ambiguous type for positional argument. */ \
- goto error; \
- }
-
- while (*cp != '\0')
- {
- CHAR_T c = *cp++;
- if (c == '%')
- {
- size_t arg_index = ARG_NONE;
- DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
-
- /* Initialize the next directive. */
- dp->dir_start = cp - 1;
- dp->flags = 0;
- dp->width_start = NULL;
- dp->width_end = NULL;
- dp->width_arg_index = ARG_NONE;
- dp->precision_start = NULL;
- dp->precision_end = NULL;
- dp->precision_arg_index = ARG_NONE;
- dp->arg_index = ARG_NONE;
-
- /* Test for positional argument. */
- if (*cp >= '0' && *cp <= '9')
- {
- const CHAR_T *np;
-
- for (np = cp; *np >= '0' && *np <= '9'; np++)
- ;
- if (*np == '$')
- {
- size_t n = 0;
-
- for (np = cp; *np >= '0' && *np <= '9'; np++)
- n = xsum (xtimes (n, 10), *np - '0');
- if (n == 0)
- /* Positional argument 0. */
- goto error;
- if (size_overflow_p (n))
- /* n too large, would lead to out of memory later. */
- goto error;
- arg_index = n - 1;
- cp = np + 1;
- }
- }
-
- /* Read the flags. */
- for (;;)
- {
- if (*cp == '\'')
- {
- dp->flags |= FLAG_GROUP;
- cp++;
- }
- else if (*cp == '-')
- {
- dp->flags |= FLAG_LEFT;
- cp++;
- }
- else if (*cp == '+')
- {
- dp->flags |= FLAG_SHOWSIGN;
- cp++;
- }
- else if (*cp == ' ')
- {
- dp->flags |= FLAG_SPACE;
- cp++;
- }
- else if (*cp == '#')
- {
- dp->flags |= FLAG_ALT;
- cp++;
- }
- else if (*cp == '0')
- {
- dp->flags |= FLAG_ZERO;
- cp++;
- }
- else
- break;
- }
-
- /* Parse the field width. */
- if (*cp == '*')
- {
- dp->width_start = cp;
- cp++;
- dp->width_end = cp;
- if (max_width_length < 1)
- max_width_length = 1;
-
- /* Test for positional argument. */
- if (*cp >= '0' && *cp <= '9')
- {
- const CHAR_T *np;
-
- for (np = cp; *np >= '0' && *np <= '9'; np++)
- ;
- if (*np == '$')
- {
- size_t n = 0;
-
- for (np = cp; *np >= '0' && *np <= '9'; np++)
- n = xsum (xtimes (n, 10), *np - '0');
- if (n == 0)
- /* Positional argument 0. */
- goto error;
- if (size_overflow_p (n))
- /* n too large, would lead to out of memory later. */
- goto error;
- dp->width_arg_index = n - 1;
- cp = np + 1;
- }
- }
- if (dp->width_arg_index == ARG_NONE)
- {
- dp->width_arg_index = arg_posn++;
- if (dp->width_arg_index == ARG_NONE)
- /* arg_posn wrapped around. */
- goto error;
- }
- REGISTER_ARG (dp->width_arg_index, TYPE_INT);
- }
- else if (*cp >= '0' && *cp <= '9')
- {
- size_t width_length;
-
- dp->width_start = cp;
- for (; *cp >= '0' && *cp <= '9'; cp++)
- ;
- dp->width_end = cp;
- width_length = dp->width_end - dp->width_start;
- if (max_width_length < width_length)
- max_width_length = width_length;
- }
-
- /* Parse the precision. */
- if (*cp == '.')
- {
- cp++;
- if (*cp == '*')
- {
- dp->precision_start = cp - 1;
- cp++;
- dp->precision_end = cp;
- if (max_precision_length < 2)
- max_precision_length = 2;
-
- /* Test for positional argument. */
- if (*cp >= '0' && *cp <= '9')
- {
- const CHAR_T *np;
-
- for (np = cp; *np >= '0' && *np <= '9'; np++)
- ;
- if (*np == '$')
- {
- size_t n = 0;
-
- for (np = cp; *np >= '0' && *np <= '9'; np++)
- n = xsum (xtimes (n, 10), *np - '0');
- if (n == 0)
- /* Positional argument 0. */
- goto error;
- if (size_overflow_p (n))
- /* n too large, would lead to out of memory
- later. */
- goto error;
- dp->precision_arg_index = n - 1;
- cp = np + 1;
- }
- }
- if (dp->precision_arg_index == ARG_NONE)
- {
- dp->precision_arg_index = arg_posn++;
- if (dp->precision_arg_index == ARG_NONE)
- /* arg_posn wrapped around. */
- goto error;
- }
- REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
- }
- else
- {
- size_t precision_length;
-
- dp->precision_start = cp - 1;
- for (; *cp >= '0' && *cp <= '9'; cp++)
- ;
- dp->precision_end = cp;
- precision_length = dp->precision_end - dp->precision_start;
- if (max_precision_length < precision_length)
- max_precision_length = precision_length;
- }
- }
-
- {
- arg_type type;
-
- /* Parse argument type/size specifiers. */
- {
- int flags = 0;
-
- for (;;)
- {
- if (*cp == 'h')
- {
- flags |= (1 << (flags & 1));
- cp++;
- }
- else if (*cp == 'L')
- {
- flags |= 4;
- cp++;
- }
- else if (*cp == 'l')
- {
- flags += 8;
- cp++;
- }
-#ifdef HAVE_INTMAX_T
- else if (*cp == 'j')
- {
- if (sizeof (intmax_t) > sizeof (long))
- {
- /* intmax_t = long long */
- flags += 16;
- }
- else if (sizeof (intmax_t) > sizeof (int))
- {
- /* intmax_t = long */
- flags += 8;
- }
- cp++;
- }
-#endif
- else if (*cp == 'z' || *cp == 'Z')
- {
- /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
- because the warning facility in gcc-2.95.2 understands
- only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */
- if (sizeof (size_t) > sizeof (long))
- {
- /* size_t = long long */
- flags += 16;
- }
- else if (sizeof (size_t) > sizeof (int))
- {
- /* size_t = long */
- flags += 8;
- }
- cp++;
- }
- else if (*cp == 't')
- {
- if (sizeof (ptrdiff_t) > sizeof (long))
- {
- /* ptrdiff_t = long long */
- flags += 16;
- }
- else if (sizeof (ptrdiff_t) > sizeof (int))
- {
- /* ptrdiff_t = long */
- flags += 8;
- }
- cp++;
- }
- else
- break;
- }
-
- /* Read the conversion character. */
- c = *cp++;
- switch (c)
- {
- case 'd': case 'i':
-#ifdef HAVE_LONG_LONG
- if (flags >= 16 || (flags & 4))
- type = TYPE_LONGLONGINT;
- else
-#endif
- if (flags >= 8)
- type = TYPE_LONGINT;
- else if (flags & 2)
- type = TYPE_SCHAR;
- else if (flags & 1)
- type = TYPE_SHORT;
- else
- type = TYPE_INT;
- break;
- case 'o': case 'u': case 'x': case 'X':
-#ifdef HAVE_LONG_LONG
- if (flags >= 16 || (flags & 4))
- type = TYPE_ULONGLONGINT;
- else
-#endif
- if (flags >= 8)
- type = TYPE_ULONGINT;
- else if (flags & 2)
- type = TYPE_UCHAR;
- else if (flags & 1)
- type = TYPE_USHORT;
- else
- type = TYPE_UINT;
- break;
- case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
- case 'a': case 'A':
-#ifdef HAVE_LONG_DOUBLE
- if (flags >= 16 || (flags & 4))
- type = TYPE_LONGDOUBLE;
- else
-#endif
- type = TYPE_DOUBLE;
- break;
- case 'c':
- if (flags >= 8)
-#ifdef HAVE_WINT_T
- type = TYPE_WIDE_CHAR;
-#else
- goto error;
-#endif
- else
- type = TYPE_CHAR;
- break;
-#ifdef HAVE_WINT_T
- case 'C':
- type = TYPE_WIDE_CHAR;
- c = 'c';
- break;
-#endif
- case 's':
- if (flags >= 8)
-#ifdef HAVE_WCHAR_T
- type = TYPE_WIDE_STRING;
-#else
- goto error;
-#endif
- else
- type = TYPE_STRING;
- break;
-#ifdef HAVE_WCHAR_T
- case 'S':
- type = TYPE_WIDE_STRING;
- c = 's';
- break;
-#endif
- case 'p':
- type = TYPE_POINTER;
- break;
- case 'n':
-#ifdef HAVE_LONG_LONG
- if (flags >= 16 || (flags & 4))
- type = TYPE_COUNT_LONGLONGINT_POINTER;
- else
-#endif
- if (flags >= 8)
- type = TYPE_COUNT_LONGINT_POINTER;
- else if (flags & 2)
- type = TYPE_COUNT_SCHAR_POINTER;
- else if (flags & 1)
- type = TYPE_COUNT_SHORT_POINTER;
- else
- type = TYPE_COUNT_INT_POINTER;
- break;
- case '%':
- type = TYPE_NONE;
- break;
- default:
- /* Unknown conversion character. */
- goto error;
- }
- }
-
- if (type != TYPE_NONE)
- {
- dp->arg_index = arg_index;
- if (dp->arg_index == ARG_NONE)
- {
- dp->arg_index = arg_posn++;
- if (dp->arg_index == ARG_NONE)
- /* arg_posn wrapped around. */
- goto error;
- }
- REGISTER_ARG (dp->arg_index, type);
- }
- dp->conversion = c;
- dp->dir_end = cp;
- }
-
- d->count++;
- if (d->count >= d_allocated)
- {
- size_t memory_size;
- DIRECTIVE *memory;
-
- d_allocated = xtimes (d_allocated, 2);
- memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
- if (size_overflow_p (memory_size))
- /* Overflow, would lead to out of memory. */
- goto error;
- memory = realloc (d->dir, memory_size);
- if (memory == NULL)
- /* Out of memory. */
- goto error;
- d->dir = memory;
- }
- }
- }
- d->dir[d->count].dir_start = cp;
-
- d->max_width_length = max_width_length;
- d->max_precision_length = max_precision_length;
- return 0;
-
-error:
- if (a->arg)
- free (a->arg);
- if (d->dir)
- free (d->dir);
- return -1;
-}
-
-#undef DIRECTIVES
-#undef DIRECTIVE
-#undef CHAR_T
-#undef PRINTF_PARSE
diff --git a/intl/printf-parse.h b/intl/printf-parse.h
deleted file mode 100644
index 8aec50e2..00000000
--- a/intl/printf-parse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Parse printf format string.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _PRINTF_PARSE_H
-#define _PRINTF_PARSE_H
-
-#include "printf-args.h"
-
-
-/* Flags */
-#define FLAG_GROUP 1 /* ' flag */
-#define FLAG_LEFT 2 /* - flag */
-#define FLAG_SHOWSIGN 4 /* + flag */
-#define FLAG_SPACE 8 /* space flag */
-#define FLAG_ALT 16 /* # flag */
-#define FLAG_ZERO 32
-
-/* arg_index value indicating that no argument is consumed. */
-#define ARG_NONE (~(size_t)0)
-
-/* A parsed directive. */
-typedef struct
-{
- const char* dir_start;
- const char* dir_end;
- int flags;
- const char* width_start;
- const char* width_end;
- size_t width_arg_index;
- const char* precision_start;
- const char* precision_end;
- size_t precision_arg_index;
- char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
- size_t arg_index;
-}
-char_directive;
-
-/* A parsed format string. */
-typedef struct
-{
- size_t count;
- char_directive *dir;
- size_t max_width_length;
- size_t max_precision_length;
-}
-char_directives;
-
-
-/* Parses the format string. Fills in the number N of directives, and fills
- in directives[0], ..., directives[N-1], and sets directives[N].dir_start
- to the end of the format string. Also fills in the arg_type fields of the
- arguments and the needed count of arguments. */
-#ifdef STATIC
-STATIC
-#else
-extern
-#endif
-int printf_parse (const char *format, char_directives *d, arguments *a);
-
-#endif /* _PRINTF_PARSE_H */
diff --git a/intl/printf.c b/intl/printf.c
deleted file mode 100644
index 878646c2..00000000
--- a/intl/printf.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* Formatted output to strings, using POSIX/XSI format strings with positions.
- Copyright (C) 2003 Free Software Foundation, Inc.
- Written by Bruno Haible <bruno@clisp.org>, 2003.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#include <stdio.h>
-
-#if !HAVE_POSIX_PRINTF
-
-#include <stdlib.h>
-#include <string.h>
-
-/* When building a DLL, we must export some functions. Note that because
- the functions are only defined for binary backward compatibility, we
- don't need to use __declspec(dllimport) in any case. */
-#if defined _MSC_VER && BUILDING_DLL
-# define DLL_EXPORTED __declspec(dllexport)
-#else
-# define DLL_EXPORTED
-#endif
-
-#define STATIC static
-
-/* Define auxiliary functions declared in "printf-args.h". */
-#include "printf-args.c"
-
-/* Define auxiliary functions declared in "printf-parse.h". */
-#include "printf-parse.c"
-
-/* Define functions declared in "vasnprintf.h". */
-#define vasnprintf libintl_vasnprintf
-#include "vasnprintf.c"
-#if 0 /* not needed */
-#define asnprintf libintl_asnprintf
-#include "asnprintf.c"
-#endif
-
-DLL_EXPORTED
-int
-libintl_vfprintf (FILE *stream, const char *format, va_list args)
-{
- if (strchr (format, '$') == NULL)
- return vfprintf (stream, format, args);
- else
- {
- size_t length;
- char *result = libintl_vasnprintf (NULL, &length, format, args);
- int retval = -1;
- if (result != NULL)
- {
- if (fwrite (result, 1, length, stream) == length)
- retval = length;
- free (result);
- }
- return retval;
- }
-}
-
-DLL_EXPORTED
-int
-libintl_fprintf (FILE *stream, const char *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vfprintf (stream, format, args);
- va_end (args);
- return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vprintf (const char *format, va_list args)
-{
- return libintl_vfprintf (stdout, format, args);
-}
-
-DLL_EXPORTED
-int
-libintl_printf (const char *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vprintf (format, args);
- va_end (args);
- return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vsprintf (char *resultbuf, const char *format, va_list args)
-{
- if (strchr (format, '$') == NULL)
- return vsprintf (resultbuf, format, args);
- else
- {
- size_t length = (size_t) ~0 / (4 * sizeof (char));
- char *result = libintl_vasnprintf (resultbuf, &length, format, args);
- if (result != resultbuf)
- {
- free (result);
- return -1;
- }
- else
- return length;
- }
-}
-
-DLL_EXPORTED
-int
-libintl_sprintf (char *resultbuf, const char *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vsprintf (resultbuf, format, args);
- va_end (args);
- return retval;
-}
-
-#if HAVE_SNPRINTF
-
-# if HAVE_DECL__SNPRINTF
- /* Windows. */
-# define system_vsnprintf _vsnprintf
-# else
- /* Unix. */
-# define system_vsnprintf vsnprintf
-# endif
-
-DLL_EXPORTED
-int
-libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
-{
- if (strchr (format, '$') == NULL)
- return system_vsnprintf (resultbuf, length, format, args);
- else
- {
- size_t maxlength = length;
- char *result = libintl_vasnprintf (resultbuf, &length, format, args);
- if (result != resultbuf)
- {
- if (maxlength > 0)
- {
- if (length < maxlength)
- abort ();
- memcpy (resultbuf, result, maxlength - 1);
- resultbuf[maxlength - 1] = '\0';
- }
- free (result);
- return -1;
- }
- else
- return length;
- }
-}
-
-DLL_EXPORTED
-int
-libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vsnprintf (resultbuf, length, format, args);
- va_end (args);
- return retval;
-}
-
-#endif
-
-#if HAVE_ASPRINTF
-
-DLL_EXPORTED
-int
-libintl_vasprintf (char **resultp, const char *format, va_list args)
-{
- size_t length;
- char *result = libintl_vasnprintf (NULL, &length, format, args);
- if (result == NULL)
- return -1;
- *resultp = result;
- return length;
-}
-
-DLL_EXPORTED
-int
-libintl_asprintf (char **resultp, const char *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vasprintf (resultp, format, args);
- va_end (args);
- return retval;
-}
-
-#endif
-
-#if HAVE_FWPRINTF
-
-#include <wchar.h>
-
-#define WIDE_CHAR_VERSION 1
-
-/* Define auxiliary functions declared in "wprintf-parse.h". */
-#include "printf-parse.c"
-
-/* Define functions declared in "vasnprintf.h". */
-#define vasnwprintf libintl_vasnwprintf
-#include "vasnprintf.c"
-#if 0 /* not needed */
-#define asnwprintf libintl_asnwprintf
-#include "asnprintf.c"
-#endif
-
-# if HAVE_DECL__SNWPRINTF
- /* Windows. */
-# define system_vswprintf _vsnwprintf
-# else
- /* Unix. */
-# define system_vswprintf vswprintf
-# endif
-
-DLL_EXPORTED
-int
-libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
-{
- if (wcschr (format, '$') == NULL)
- return vfwprintf (stream, format, args);
- else
- {
- size_t length;
- wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
- int retval = -1;
- if (result != NULL)
- {
- size_t i;
- for (i = 0; i < length; i++)
- if (fputwc (result[i], stream) == WEOF)
- break;
- if (i == length)
- retval = length;
- free (result);
- }
- return retval;
- }
-}
-
-DLL_EXPORTED
-int
-libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vfwprintf (stream, format, args);
- va_end (args);
- return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vwprintf (const wchar_t *format, va_list args)
-{
- return libintl_vfwprintf (stdout, format, args);
-}
-
-DLL_EXPORTED
-int
-libintl_wprintf (const wchar_t *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vwprintf (format, args);
- va_end (args);
- return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
-{
- if (wcschr (format, '$') == NULL)
- return system_vswprintf (resultbuf, length, format, args);
- else
- {
- size_t maxlength = length;
- wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
- if (result != resultbuf)
- {
- if (maxlength > 0)
- {
- if (length < maxlength)
- abort ();
- memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
- resultbuf[maxlength - 1] = 0;
- }
- free (result);
- return -1;
- }
- else
- return length;
- }
-}
-
-DLL_EXPORTED
-int
-libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
-{
- va_list args;
- int retval;
-
- va_start (args, format);
- retval = libintl_vswprintf (resultbuf, length, format, args);
- va_end (args);
- return retval;
-}
-
-#endif
-
-#endif
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
deleted file mode 100644
index 167374e3..00000000
--- a/intl/ref-add.sin
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-# Copyright (C) 2000 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
- s/# Packages using this file://
- ta
- :a
- s/ @PACKAGE@ / @PACKAGE@ /
- tb
- s/ $/ @PACKAGE@ /
- :b
- s/^/# Packages using this file:/
-}
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
deleted file mode 100644
index 613cf37f..00000000
--- a/intl/ref-del.sin
+++ /dev/null
@@ -1,26 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-# Copyright (C) 2000 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
- s/# Packages using this file://
- s/ @PACKAGE@ / /
- s/^/# Packages using this file:/
-}
diff --git a/intl/relocatable.c b/intl/relocatable.c
deleted file mode 100644
index bf7c7085..00000000
--- a/intl/relocatable.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/* Provide relocatable packages.
- Copyright (C) 2003 Free Software Foundation, Inc.
- Written by Bruno Haible <bruno@clisp.org>, 2003.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-
-/* Tell glibc's <stdio.h> to provide a prototype for getline().
- This must come before <config.h> because <config.h> may include
- <features.h>, and once <features.h> has been included, it's too late. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-/* Specification. */
-#include "relocatable.h"
-
-#if ENABLE_RELOCATABLE
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef NO_XMALLOC
-# define xmalloc malloc
-#else
-# include "xalloc.h"
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-#if DEPENDS_ON_LIBCHARSET
-# include <libcharset.h>
-#endif
-#if DEPENDS_ON_LIBICONV && HAVE_ICONV
-# include <iconv.h>
-#endif
-#if DEPENDS_ON_LIBINTL && ENABLE_NLS
-# include <libintl.h>
-#endif
-
-/* Faked cheap 'bool'. */
-#undef bool
-#undef false
-#undef true
-#define bool int
-#define false 0
-#define true 1
-
-/* Pathname support.
- ISSLASH(C) tests whether C is a directory separator character.
- IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
- /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
- && (P)[1] == ':')
-# define IS_PATH_WITH_DIR(P) \
- (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
-#else
- /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-# define FILESYSTEM_PREFIX_LEN(P) 0
-#endif
-
-/* Original installation prefix. */
-static char *orig_prefix;
-static size_t orig_prefix_len;
-/* Current installation prefix. */
-static char *curr_prefix;
-static size_t curr_prefix_len;
-/* These prefixes do not end in a slash. Anything that will be concatenated
- to them must start with a slash. */
-
-/* Sets the original and the current installation prefix of this module.
- Relocation simply replaces a pathname starting with the original prefix
- by the corresponding pathname with the current prefix instead. Both
- prefixes should be directory names without trailing slash (i.e. use ""
- instead of "/"). */
-static void
-set_this_relocation_prefix (const char *orig_prefix_arg,
- const char *curr_prefix_arg)
-{
- if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
- /* Optimization: if orig_prefix and curr_prefix are equal, the
- relocation is a nop. */
- && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
- {
- /* Duplicate the argument strings. */
- char *memory;
-
- orig_prefix_len = strlen (orig_prefix_arg);
- curr_prefix_len = strlen (curr_prefix_arg);
- memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
-#ifdef NO_XMALLOC
- if (memory != NULL)
-#endif
- {
- memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
- orig_prefix = memory;
- memory += orig_prefix_len + 1;
- memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
- curr_prefix = memory;
- return;
- }
- }
- orig_prefix = NULL;
- curr_prefix = NULL;
- /* Don't worry about wasted memory here - this function is usually only
- called once. */
-}
-
-/* Sets the original and the current installation prefix of the package.
- Relocation simply replaces a pathname starting with the original prefix
- by the corresponding pathname with the current prefix instead. Both
- prefixes should be directory names without trailing slash (i.e. use ""
- instead of "/"). */
-void
-set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
-{
- set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-
- /* Now notify all dependent libraries. */
-#if DEPENDS_ON_LIBCHARSET
- libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-#endif
-#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
- libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-#endif
-#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
- libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-#endif
-}
-
-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
-
-/* Convenience function:
- Computes the current installation prefix, based on the original
- installation prefix, the original installation directory of a particular
- file, and the current pathname of this file. Returns NULL upon failure. */
-#ifdef IN_LIBRARY
-#define compute_curr_prefix local_compute_curr_prefix
-static
-#endif
-const char *
-compute_curr_prefix (const char *orig_installprefix,
- const char *orig_installdir,
- const char *curr_pathname)
-{
- const char *curr_installdir;
- const char *rel_installdir;
-
- if (curr_pathname == NULL)
- return NULL;
-
- /* Determine the relative installation directory, relative to the prefix.
- This is simply the difference between orig_installprefix and
- orig_installdir. */
- if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
- != 0)
- /* Shouldn't happen - nothing should be installed outside $(prefix). */
- return NULL;
- rel_installdir = orig_installdir + strlen (orig_installprefix);
-
- /* Determine the current installation directory. */
- {
- const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
- const char *p = curr_pathname + strlen (curr_pathname);
- char *q;
-
- while (p > p_base)
- {
- p--;
- if (ISSLASH (*p))
- break;
- }
-
- q = (char *) xmalloc (p - curr_pathname + 1);
-#ifdef NO_XMALLOC
- if (q == NULL)
- return NULL;
-#endif
- memcpy (q, curr_pathname, p - curr_pathname);
- q[p - curr_pathname] = '\0';
- curr_installdir = q;
- }
-
- /* Compute the current installation prefix by removing the trailing
- rel_installdir from it. */
- {
- const char *rp = rel_installdir + strlen (rel_installdir);
- const char *cp = curr_installdir + strlen (curr_installdir);
- const char *cp_base =
- curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
-
- while (rp > rel_installdir && cp > cp_base)
- {
- bool same = false;
- const char *rpi = rp;
- const char *cpi = cp;
-
- while (rpi > rel_installdir && cpi > cp_base)
- {
- rpi--;
- cpi--;
- if (ISSLASH (*rpi) || ISSLASH (*cpi))
- {
- if (ISSLASH (*rpi) && ISSLASH (*cpi))
- same = true;
- break;
- }
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
- /* Win32, OS/2, DOS - case insignificant filesystem */
- if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
- != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
- break;
-#else
- if (*rpi != *cpi)
- break;
-#endif
- }
- if (!same)
- break;
- /* The last pathname component was the same. opi and cpi now point
- to the slash before it. */
- rp = rpi;
- cp = cpi;
- }
-
- if (rp > rel_installdir)
- /* Unexpected: The curr_installdir does not end with rel_installdir. */
- return NULL;
-
- {
- size_t curr_prefix_len = cp - curr_installdir;
- char *curr_prefix;
-
- curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
-#ifdef NO_XMALLOC
- if (curr_prefix == NULL)
- return NULL;
-#endif
- memcpy (curr_prefix, curr_installdir, curr_prefix_len);
- curr_prefix[curr_prefix_len] = '\0';
-
- return curr_prefix;
- }
- }
-}
-
-#endif /* !IN_LIBRARY || PIC */
-
-#if defined PIC && defined INSTALLDIR
-
-/* Full pathname of shared library, or NULL. */
-static char *shared_library_fullname;
-
-#if defined _WIN32 || defined __WIN32__
-
-/* Determine the full pathname of the shared library when it is loaded. */
-
-BOOL WINAPI
-DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
-{
- (void) reserved;
-
- if (event == DLL_PROCESS_ATTACH)
- {
- /* The DLL is being loaded into an application's address range. */
- static char location[MAX_PATH];
-
- if (!GetModuleFileName (module_handle, location, sizeof (location)))
- /* Shouldn't happen. */
- return FALSE;
-
- if (!IS_PATH_WITH_DIR (location))
- /* Shouldn't happen. */
- return FALSE;
-
- shared_library_fullname = strdup (location);
- }
-
- return TRUE;
-}
-
-#else /* Unix */
-
-static void
-find_shared_library_fullname ()
-{
-#if defined __linux__ && __GLIBC__ >= 2
- /* Linux has /proc/self/maps. glibc 2 has the getline() function. */
- FILE *fp;
-
- /* Open the current process' maps file. It describes one VMA per line. */
- fp = fopen ("/proc/self/maps", "r");
- if (fp)
- {
- unsigned long address = (unsigned long) &find_shared_library_fullname;
- for (;;)
- {
- unsigned long start, end;
- int c;
-
- if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
- break;
- if (address >= start && address <= end - 1)
- {
- /* Found it. Now see if this line contains a filename. */
- while (c = getc (fp), c != EOF && c != '\n' && c != '/')
- continue;
- if (c == '/')
- {
- size_t size;
- int len;
-
- ungetc (c, fp);
- shared_library_fullname = NULL; size = 0;
- len = getline (&shared_library_fullname, &size, fp);
- if (len >= 0)
- {
- /* Success: filled shared_library_fullname. */
- if (len > 0 && shared_library_fullname[len - 1] == '\n')
- shared_library_fullname[len - 1] = '\0';
- }
- }
- break;
- }
- while (c = getc (fp), c != EOF && c != '\n')
- continue;
- }
- fclose (fp);
- }
-#endif
-}
-
-#endif /* WIN32 / Unix */
-
-/* Return the full pathname of the current shared library.
- Return NULL if unknown.
- Guaranteed to work only on Linux and Woe32. */
-static char *
-get_shared_library_fullname ()
-{
-#if !(defined _WIN32 || defined __WIN32__)
- static bool tried_find_shared_library_fullname;
- if (!tried_find_shared_library_fullname)
- {
- find_shared_library_fullname ();
- tried_find_shared_library_fullname = true;
- }
-#endif
- return shared_library_fullname;
-}
-
-#endif /* PIC */
-
-/* Returns the pathname, relocated according to the current installation
- directory. */
-const char *
-relocate (const char *pathname)
-{
-#if defined PIC && defined INSTALLDIR
- static int initialized;
-
- /* Initialization code for a shared library. */
- if (!initialized)
- {
- /* At this point, orig_prefix and curr_prefix likely have already been
- set through the main program's set_program_name_and_installdir
- function. This is sufficient in the case that the library has
- initially been installed in the same orig_prefix. But we can do
- better, to also cover the cases that 1. it has been installed
- in a different prefix before being moved to orig_prefix and (later)
- to curr_prefix, 2. unlike the program, it has not moved away from
- orig_prefix. */
- const char *orig_installprefix = INSTALLPREFIX;
- const char *orig_installdir = INSTALLDIR;
- const char *curr_prefix_better;
-
- curr_prefix_better =
- compute_curr_prefix (orig_installprefix, orig_installdir,
- get_shared_library_fullname ());
- if (curr_prefix_better == NULL)
- curr_prefix_better = curr_prefix;
-
- set_relocation_prefix (orig_installprefix, curr_prefix_better);
-
- initialized = 1;
- }
-#endif
-
- /* Note: It is not necessary to perform case insensitive comparison here,
- even for DOS-like filesystems, because the pathname argument was
- typically created from the same Makefile variable as orig_prefix came
- from. */
- if (orig_prefix != NULL && curr_prefix != NULL
- && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
- {
- if (pathname[orig_prefix_len] == '\0')
- /* pathname equals orig_prefix. */
- return curr_prefix;
- if (ISSLASH (pathname[orig_prefix_len]))
- {
- /* pathname starts with orig_prefix. */
- const char *pathname_tail = &pathname[orig_prefix_len];
- char *result =
- (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
-
-#ifdef NO_XMALLOC
- if (result != NULL)
-#endif
- {
- memcpy (result, curr_prefix, curr_prefix_len);
- strcpy (result + curr_prefix_len, pathname_tail);
- return result;
- }
- }
- }
- /* Nothing to relocate. */
- return pathname;
-}
-
-#endif
diff --git a/intl/relocatable.h b/intl/relocatable.h
deleted file mode 100644
index 48c5b71e..00000000
--- a/intl/relocatable.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Provide relocatable packages.
- Copyright (C) 2003 Free Software Foundation, Inc.
- Written by Bruno Haible <bruno@clisp.org>, 2003.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _RELOCATABLE_H
-#define _RELOCATABLE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* This can be enabled through the configure --enable-relocatable option. */
-#if ENABLE_RELOCATABLE
-
-/* When building a DLL, we must export some functions. Note that because
- this is a private .h file, we don't need to use __declspec(dllimport)
- in any case. */
-#if defined _MSC_VER && BUILDING_DLL
-# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
-#else
-# define RELOCATABLE_DLL_EXPORTED
-#endif
-
-/* Sets the original and the current installation prefix of the package.
- Relocation simply replaces a pathname starting with the original prefix
- by the corresponding pathname with the current prefix instead. Both
- prefixes should be directory names without trailing slash (i.e. use ""
- instead of "/"). */
-extern RELOCATABLE_DLL_EXPORTED void
- set_relocation_prefix (const char *orig_prefix,
- const char *curr_prefix);
-
-/* Returns the pathname, relocated according to the current installation
- directory. */
-extern const char * relocate (const char *pathname);
-
-/* Memory management: relocate() leaks memory, because it has to construct
- a fresh pathname. If this is a problem because your program calls
- relocate() frequently, think about caching the result. */
-
-/* Convenience function:
- Computes the current installation prefix, based on the original
- installation prefix, the original installation directory of a particular
- file, and the current pathname of this file. Returns NULL upon failure. */
-extern const char * compute_curr_prefix (const char *orig_installprefix,
- const char *orig_installdir,
- const char *curr_pathname);
-
-#else
-
-/* By default, we use the hardwired pathnames. */
-#define relocate(pathname) (pathname)
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RELOCATABLE_H */
diff --git a/intl/textdomain.c b/intl/textdomain.c
deleted file mode 100644
index 8745a843..00000000
--- a/intl/textdomain.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Implementation of the textdomain(3) function.
- Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications. */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc. */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
- names than the internal variables in GNU libc, otherwise programs
- using libintl.a cannot be linked statically. */
-#if !defined _LIBC
-# define _nl_default_default_domain libintl_nl_default_default_domain
-# define _nl_current_default_domain libintl_nl_current_default_domain
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain. */
-extern const char _nl_default_default_domain[] attribute_hidden;
-
-/* Default text domain in which entries for gettext(3) are to be found. */
-extern const char *_nl_current_default_domain attribute_hidden;
-
-
-/* Names for the libintl functions are a problem. They must not clash
- with existing names and they should follow ANSI C. But this source
- code is also used in GNU C Library where the names have a __
- prefix. So we have to make a difference here. */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-# define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN libintl_textdomain
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation. */
-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
-
-/* Set the current default message catalog to DOMAINNAME.
- If DOMAINNAME is null, return the current default.
- If DOMAINNAME is "", reset to the default of "messages". */
-char *
-TEXTDOMAIN (const char *domainname)
-{
- char *new_domain;
- char *old_domain;
-
- /* A NULL pointer requests the current setting. */
- if (domainname == NULL)
- return (char *) _nl_current_default_domain;
-
- __libc_rwlock_wrlock (_nl_state_lock);
-
- old_domain = (char *) _nl_current_default_domain;
-
- /* If domain name is the null string set to default domain "messages". */
- if (domainname[0] == '\0'
- || strcmp (domainname, _nl_default_default_domain) == 0)
- {
- _nl_current_default_domain = _nl_default_default_domain;
- new_domain = (char *) _nl_current_default_domain;
- }
- else if (strcmp (domainname, old_domain) == 0)
- /* This can happen and people will use it to signal that some
- environment variable changed. */
- new_domain = old_domain;
- else
- {
- /* If the following malloc fails `_nl_current_default_domain'
- will be NULL. This value will be returned and so signals we
- are out of core. */
-#if defined _LIBC || defined HAVE_STRDUP
- new_domain = strdup (domainname);
-#else
- size_t len = strlen (domainname) + 1;
- new_domain = (char *) malloc (len);
- if (new_domain != NULL)
- memcpy (new_domain, domainname, len);
-#endif
-
- if (new_domain != NULL)
- _nl_current_default_domain = new_domain;
- }
-
- /* We use this possibility to signal a change of the loaded catalogs
- since this is most likely the case and there is no other easy we
- to do it. Do it only when the call was successful. */
- if (new_domain != NULL)
- {
- ++_nl_msg_cat_cntr;
-
- if (old_domain != new_domain && old_domain != _nl_default_default_domain)
- free (old_domain);
- }
-
- __libc_rwlock_unlock (_nl_state_lock);
-
- return new_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library. */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
deleted file mode 100644
index 8a62282d..00000000
--- a/intl/vasnprintf.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/* vsprintf with automatic memory allocation.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
- This must come before <config.h> because <config.h> may include
- <features.h>, and once <features.h> has been included, it's too late. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#ifndef IN_LIBINTL
-# include <alloca.h>
-#endif
-
-/* Specification. */
-#if WIDE_CHAR_VERSION
-# include "vasnwprintf.h"
-#else
-# include "vasnprintf.h"
-#endif
-
-#include <stdio.h> /* snprintf(), sprintf() */
-#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
-#include <string.h> /* memcpy(), strlen() */
-#include <errno.h> /* errno */
-#include <limits.h> /* CHAR_BIT */
-#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
-#if WIDE_CHAR_VERSION
-# include "wprintf-parse.h"
-#else
-# include "printf-parse.h"
-#endif
-
-/* Checked size_t computations. */
-#include "xsize.h"
-
-#ifdef HAVE_WCHAR_T
-# ifdef HAVE_WCSLEN
-# define local_wcslen wcslen
-# else
- /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
- a dependency towards this library, here is a local substitute.
- Define this substitute only once, even if this file is included
- twice in the same compilation unit. */
-# ifndef local_wcslen_defined
-# define local_wcslen_defined 1
-static size_t
-local_wcslen (const wchar_t *s)
-{
- const wchar_t *ptr;
-
- for (ptr = s; *ptr != (wchar_t) 0; ptr++)
- ;
- return ptr - s;
-}
-# endif
-# endif
-#endif
-
-#if WIDE_CHAR_VERSION
-# define VASNPRINTF vasnwprintf
-# define CHAR_T wchar_t
-# define DIRECTIVE wchar_t_directive
-# define DIRECTIVES wchar_t_directives
-# define PRINTF_PARSE wprintf_parse
-# define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
- /* On Windows, the function swprintf() has a different signature than
- on Unix; we use the _snwprintf() function instead. */
-# define SNPRINTF _snwprintf
-# else
- /* Unix. */
-# define SNPRINTF swprintf
-# endif
-#else
-# define VASNPRINTF vasnprintf
-# define CHAR_T char
-# define DIRECTIVE char_directive
-# define DIRECTIVES char_directives
-# define PRINTF_PARSE printf_parse
-# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
-# if HAVE_DECL__SNPRINTF
- /* Windows. */
-# define SNPRINTF _snprintf
-# else
- /* Unix. */
-# define SNPRINTF snprintf
-# endif
-#endif
-
-CHAR_T *
-VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
-{
- DIRECTIVES d;
- arguments a;
-
- if (PRINTF_PARSE (format, &d, &a) < 0)
- {
- errno = EINVAL;
- return NULL;
- }
-
-#define CLEANUP() \
- free (d.dir); \
- if (a.arg) \
- free (a.arg);
-
- if (printf_fetchargs (args, &a) < 0)
- {
- CLEANUP ();
- errno = EINVAL;
- return NULL;
- }
-
- {
- size_t buf_neededlength;
- CHAR_T *buf;
- CHAR_T *buf_malloced;
- const CHAR_T *cp;
- size_t i;
- DIRECTIVE *dp;
- /* Output string accumulator. */
- CHAR_T *result;
- size_t allocated;
- size_t length;
-
- /* Allocate a small buffer that will hold a directive passed to
- sprintf or snprintf. */
- buf_neededlength =
- xsum4 (7, d.max_width_length, d.max_precision_length, 6);
-#if HAVE_ALLOCA
- if (buf_neededlength < 4000 / sizeof (CHAR_T))
- {
- buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
- buf_malloced = NULL;
- }
- else
-#endif
- {
- size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
- if (size_overflow_p (buf_memsize))
- goto out_of_memory_1;
- buf = (CHAR_T *) malloc (buf_memsize);
- if (buf == NULL)
- goto out_of_memory_1;
- buf_malloced = buf;
- }
-
- if (resultbuf != NULL)
- {
- result = resultbuf;
- allocated = *lengthp;
- }
- else
- {
- result = NULL;
- allocated = 0;
- }
- length = 0;
- /* Invariants:
- result is either == resultbuf or == NULL or malloc-allocated.
- If length > 0, then result != NULL. */
-
- /* Ensures that allocated >= needed. Aborts through a jump to
- out_of_memory if needed is SIZE_MAX or otherwise too big. */
-#define ENSURE_ALLOCATION(needed) \
- if ((needed) > allocated) \
- { \
- size_t memory_size; \
- CHAR_T *memory; \
- \
- allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \
- if ((needed) > allocated) \
- allocated = (needed); \
- memory_size = xtimes (allocated, sizeof (CHAR_T)); \
- if (size_overflow_p (memory_size)) \
- goto out_of_memory; \
- if (result == resultbuf || result == NULL) \
- memory = (CHAR_T *) malloc (memory_size); \
- else \
- memory = (CHAR_T *) realloc (result, memory_size); \
- if (memory == NULL) \
- goto out_of_memory; \
- if (result == resultbuf && length > 0) \
- memcpy (memory, result, length * sizeof (CHAR_T)); \
- result = memory; \
- }
-
- for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
- {
- if (cp != dp->dir_start)
- {
- size_t n = dp->dir_start - cp;
- size_t augmented_length = xsum (length, n);
-
- ENSURE_ALLOCATION (augmented_length);
- memcpy (result + length, cp, n * sizeof (CHAR_T));
- length = augmented_length;
- }
- if (i == d.count)
- break;
-
- /* Execute a single directive. */
- if (dp->conversion == '%')
- {
- size_t augmented_length;
-
- if (!(dp->arg_index == ARG_NONE))
- abort ();
- augmented_length = xsum (length, 1);
- ENSURE_ALLOCATION (augmented_length);
- result[length] = '%';
- length = augmented_length;
- }
- else
- {
- if (!(dp->arg_index != ARG_NONE))
- abort ();
-
- if (dp->conversion == 'n')
- {
- switch (a.arg[dp->arg_index].type)
- {
- case TYPE_COUNT_SCHAR_POINTER:
- *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
- break;
- case TYPE_COUNT_SHORT_POINTER:
- *a.arg[dp->arg_index].a.a_count_short_pointer = length;
- break;
- case TYPE_COUNT_INT_POINTER:
- *a.arg[dp->arg_index].a.a_count_int_pointer = length;
- break;
- case TYPE_COUNT_LONGINT_POINTER:
- *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
- break;
-#ifdef HAVE_LONG_LONG
- case TYPE_COUNT_LONGLONGINT_POINTER:
- *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
- break;
-#endif
- default:
- abort ();
- }
- }
- else
- {
- arg_type type = a.arg[dp->arg_index].type;
- CHAR_T *p;
- unsigned int prefix_count;
- int prefixes[2];
-#if !USE_SNPRINTF
- size_t tmp_length;
- CHAR_T tmpbuf[700];
- CHAR_T *tmp;
-
- /* Allocate a temporary buffer of sufficient size for calling
- sprintf. */
- {
- size_t width;
- size_t precision;
-
- width = 0;
- if (dp->width_start != dp->width_end)
- {
- if (dp->width_arg_index != ARG_NONE)
- {
- int arg;
-
- if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
- abort ();
- arg = a.arg[dp->width_arg_index].a.a_int;
- width = (arg < 0 ? (unsigned int) (-arg) : arg);
- }
- else
- {
- const CHAR_T *digitp = dp->width_start;
-
- do
- width = xsum (xtimes (width, 10), *digitp++ - '0');
- while (digitp != dp->width_end);
- }
- }
-
- precision = 6;
- if (dp->precision_start != dp->precision_end)
- {
- if (dp->precision_arg_index != ARG_NONE)
- {
- int arg;
-
- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
- abort ();
- arg = a.arg[dp->precision_arg_index].a.a_int;
- precision = (arg < 0 ? 0 : arg);
- }
- else
- {
- const CHAR_T *digitp = dp->precision_start + 1;
-
- precision = 0;
- do
- precision = xsum (xtimes (precision, 10), *digitp++ - '0');
- while (digitp != dp->precision_end);
- }
- }
-
- switch (dp->conversion)
- {
-
- case 'd': case 'i': case 'u':
-# ifdef HAVE_LONG_LONG
- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
- tmp_length =
- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
- * 0.30103 /* binary -> decimal */
- * 2 /* estimate for FLAG_GROUP */
- )
- + 1 /* turn floor into ceil */
- + 1; /* account for leading sign */
- else
-# endif
- if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
- tmp_length =
- (unsigned int) (sizeof (unsigned long) * CHAR_BIT
- * 0.30103 /* binary -> decimal */
- * 2 /* estimate for FLAG_GROUP */
- )
- + 1 /* turn floor into ceil */
- + 1; /* account for leading sign */
- else
- tmp_length =
- (unsigned int) (sizeof (unsigned int) * CHAR_BIT
- * 0.30103 /* binary -> decimal */
- * 2 /* estimate for FLAG_GROUP */
- )
- + 1 /* turn floor into ceil */
- + 1; /* account for leading sign */
- break;
-
- case 'o':
-# ifdef HAVE_LONG_LONG
- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
- tmp_length =
- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
- * 0.333334 /* binary -> octal */
- )
- + 1 /* turn floor into ceil */
- + 1; /* account for leading sign */
- else
-# endif
- if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
- tmp_length =
- (unsigned int) (sizeof (unsigned long) * CHAR_BIT
- * 0.333334 /* binary -> octal */
- )
- + 1 /* turn floor into ceil */
- + 1; /* account for leading sign */
- else
- tmp_length =
- (unsigned int) (sizeof (unsigned int) * CHAR_BIT
- * 0.333334 /* binary -> octal */
- )
- + 1 /* turn floor into ceil */
- + 1; /* account for leading sign */
- break;
-
- case 'x': case 'X':
-# ifdef HAVE_LONG_LONG
- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
- tmp_length =
- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
- * 0.25 /* binary -> hexadecimal */
- )
- + 1 /* turn floor into ceil */
- + 2; /* account for leading sign or alternate form */
- else
-# endif
- if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
- tmp_length =
- (unsigned int) (sizeof (unsigned long) * CHAR_BIT
- * 0.25 /* binary -> hexadecimal */
- )
- + 1 /* turn floor into ceil */
- + 2; /* account for leading sign or alternate form */
- else
- tmp_length =
- (unsigned int) (sizeof (unsigned int) * CHAR_BIT
- * 0.25 /* binary -> hexadecimal */
- )
- + 1 /* turn floor into ceil */
- + 2; /* account for leading sign or alternate form */
- break;
-
- case 'f': case 'F':
-# ifdef HAVE_LONG_DOUBLE
- if (type == TYPE_LONGDOUBLE)
- tmp_length =
- (unsigned int) (LDBL_MAX_EXP
- * 0.30103 /* binary -> decimal */
- * 2 /* estimate for FLAG_GROUP */
- )
- + 1 /* turn floor into ceil */
- + 10; /* sign, decimal point etc. */
- else
-# endif
- tmp_length =
- (unsigned int) (DBL_MAX_EXP
- * 0.30103 /* binary -> decimal */
- * 2 /* estimate for FLAG_GROUP */
- )
- + 1 /* turn floor into ceil */
- + 10; /* sign, decimal point etc. */
- tmp_length = xsum (tmp_length, precision);
- break;
-
- case 'e': case 'E': case 'g': case 'G':
- case 'a': case 'A':
- tmp_length =
- 12; /* sign, decimal point, exponent etc. */
- tmp_length = xsum (tmp_length, precision);
- break;
-
- case 'c':
-# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
- if (type == TYPE_WIDE_CHAR)
- tmp_length = MB_CUR_MAX;
- else
-# endif
- tmp_length = 1;
- break;
-
- case 's':
-# ifdef HAVE_WCHAR_T
- if (type == TYPE_WIDE_STRING)
- {
- tmp_length =
- local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
-
-# if !WIDE_CHAR_VERSION
- tmp_length = xtimes (tmp_length, MB_CUR_MAX);
-# endif
- }
- else
-# endif
- tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
- break;
-
- case 'p':
- tmp_length =
- (unsigned int) (sizeof (void *) * CHAR_BIT
- * 0.25 /* binary -> hexadecimal */
- )
- + 1 /* turn floor into ceil */
- + 2; /* account for leading 0x */
- break;
-
- default:
- abort ();
- }
-
- if (tmp_length < width)
- tmp_length = width;
-
- tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
- }
-
- if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
- tmp = tmpbuf;
- else
- {
- size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
-
- if (size_overflow_p (tmp_memsize))
- /* Overflow, would lead to out of memory. */
- goto out_of_memory;
- tmp = (CHAR_T *) malloc (tmp_memsize);
- if (tmp == NULL)
- /* Out of memory. */
- goto out_of_memory;
- }
-#endif
-
- /* Construct the format string for calling snprintf or
- sprintf. */
- p = buf;
- *p++ = '%';
- if (dp->flags & FLAG_GROUP)
- *p++ = '\'';
- if (dp->flags & FLAG_LEFT)
- *p++ = '-';
- if (dp->flags & FLAG_SHOWSIGN)
- *p++ = '+';
- if (dp->flags & FLAG_SPACE)
- *p++ = ' ';
- if (dp->flags & FLAG_ALT)
- *p++ = '#';
- if (dp->flags & FLAG_ZERO)
- *p++ = '0';
- if (dp->width_start != dp->width_end)
- {
- size_t n = dp->width_end - dp->width_start;
- memcpy (p, dp->width_start, n * sizeof (CHAR_T));
- p += n;
- }
- if (dp->precision_start != dp->precision_end)
- {
- size_t n = dp->precision_end - dp->precision_start;
- memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
- p += n;
- }
-
- switch (type)
- {
-#ifdef HAVE_LONG_LONG
- case TYPE_LONGLONGINT:
- case TYPE_ULONGLONGINT:
- *p++ = 'l';
- /*FALLTHROUGH*/
-#endif
- case TYPE_LONGINT:
- case TYPE_ULONGINT:
-#ifdef HAVE_WINT_T
- case TYPE_WIDE_CHAR:
-#endif
-#ifdef HAVE_WCHAR_T
- case TYPE_WIDE_STRING:
-#endif
- *p++ = 'l';
- break;
-#ifdef HAVE_LONG_DOUBLE
- case TYPE_LONGDOUBLE:
- *p++ = 'L';
- break;
-#endif
- default:
- break;
- }
- *p = dp->conversion;
-#if USE_SNPRINTF
- p[1] = '%';
- p[2] = 'n';
- p[3] = '\0';
-#else
- p[1] = '\0';
-#endif
-
- /* Construct the arguments for calling snprintf or sprintf. */
- prefix_count = 0;
- if (dp->width_arg_index != ARG_NONE)
- {
- if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
- abort ();
- prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
- }
- if (dp->precision_arg_index != ARG_NONE)
- {
- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
- abort ();
- prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
- }
-
-#if USE_SNPRINTF
- /* Prepare checking whether snprintf returns the count
- via %n. */
- ENSURE_ALLOCATION (xsum (length, 1));
- result[length] = '\0';
-#endif
-
- for (;;)
- {
- size_t maxlen;
- int count;
- int retcount;
-
- maxlen = allocated - length;
- count = -1;
- retcount = 0;
-
-#if USE_SNPRINTF
-# define SNPRINTF_BUF(arg) \
- switch (prefix_count) \
- { \
- case 0: \
- retcount = SNPRINTF (result + length, maxlen, buf, \
- arg, &count); \
- break; \
- case 1: \
- retcount = SNPRINTF (result + length, maxlen, buf, \
- prefixes[0], arg, &count); \
- break; \
- case 2: \
- retcount = SNPRINTF (result + length, maxlen, buf, \
- prefixes[0], prefixes[1], arg, \
- &count); \
- break; \
- default: \
- abort (); \
- }
-#else
-# define SNPRINTF_BUF(arg) \
- switch (prefix_count) \
- { \
- case 0: \
- count = sprintf (tmp, buf, arg); \
- break; \
- case 1: \
- count = sprintf (tmp, buf, prefixes[0], arg); \
- break; \
- case 2: \
- count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
- arg); \
- break; \
- default: \
- abort (); \
- }
-#endif
-
- switch (type)
- {
- case TYPE_SCHAR:
- {
- int arg = a.arg[dp->arg_index].a.a_schar;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_UCHAR:
- {
- unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_SHORT:
- {
- int arg = a.arg[dp->arg_index].a.a_short;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_USHORT:
- {
- unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_INT:
- {
- int arg = a.arg[dp->arg_index].a.a_int;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_UINT:
- {
- unsigned int arg = a.arg[dp->arg_index].a.a_uint;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_LONGINT:
- {
- long int arg = a.arg[dp->arg_index].a.a_longint;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_ULONGINT:
- {
- unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
- SNPRINTF_BUF (arg);
- }
- break;
-#ifdef HAVE_LONG_LONG
- case TYPE_LONGLONGINT:
- {
- long long int arg = a.arg[dp->arg_index].a.a_longlongint;
- SNPRINTF_BUF (arg);
- }
- break;
- case TYPE_ULONGLONGINT:
- {
- unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
- SNPRINTF_BUF (arg);
- }
- break;
-#endif
- case TYPE_DOUBLE:
- {
- double arg = a.arg[dp->arg_index].a.a_double;
- SNPRINTF_BUF (arg);
- }
- break;
-#ifdef HAVE_LONG_DOUBLE
- case TYPE_LONGDOUBLE:
- {
- long double arg = a.arg[dp->arg_index].a.a_longdouble;
- SNPRINTF_BUF (arg);
- }
- break;
-#endif
- case TYPE_CHAR:
- {
- int arg = a.arg[dp->arg_index].a.a_char;
- SNPRINTF_BUF (arg);
- }
- break;
-#ifdef HAVE_WINT_T
- case TYPE_WIDE_CHAR:
- {
- wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
- SNPRINTF_BUF (arg);
- }
- break;
-#endif
- case TYPE_STRING:
- {
- const char *arg = a.arg[dp->arg_index].a.a_string;
- SNPRINTF_BUF (arg);
- }
- break;
-#ifdef HAVE_WCHAR_T
- case TYPE_WIDE_STRING:
- {
- const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
- SNPRINTF_BUF (arg);
- }
- break;
-#endif
- case TYPE_POINTER:
- {
- void *arg = a.arg[dp->arg_index].a.a_pointer;
- SNPRINTF_BUF (arg);
- }
- break;
- default:
- abort ();
- }
-
-#if USE_SNPRINTF
- /* Portability: Not all implementations of snprintf()
- are ISO C 99 compliant. Determine the number of
- bytes that snprintf() has produced or would have
- produced. */
- if (count >= 0)
- {
- /* Verify that snprintf() has NUL-terminated its
- result. */
- if (count < maxlen && result[length + count] != '\0')
- abort ();
- /* Portability hack. */
- if (retcount > count)
- count = retcount;
- }
- else
- {
- /* snprintf() doesn't understand the '%n'
- directive. */
- if (p[1] != '\0')
- {
- /* Don't use the '%n' directive; instead, look
- at the snprintf() return value. */
- p[1] = '\0';
- continue;
- }
- else
- {
- /* Look at the snprintf() return value. */
- if (retcount < 0)
- {
- /* HP-UX 10.20 snprintf() is doubly deficient:
- It doesn't understand the '%n' directive,
- *and* it returns -1 (rather than the length
- that would have been required) when the
- buffer is too small. */
- size_t bigger_need =
- xsum (xtimes (allocated, 2), 12);
- ENSURE_ALLOCATION (bigger_need);
- continue;
- }
- else
- count = retcount;
- }
- }
-#endif
-
- /* Attempt to handle failure. */
- if (count < 0)
- {
- if (!(result == resultbuf || result == NULL))
- free (result);
- if (buf_malloced != NULL)
- free (buf_malloced);
- CLEANUP ();
- errno = EINVAL;
- return NULL;
- }
-
-#if !USE_SNPRINTF
- if (count >= tmp_length)
- /* tmp_length was incorrectly calculated - fix the
- code above! */
- abort ();
-#endif
-
- /* Make room for the result. */
- if (count >= maxlen)
- {
- /* Need at least count bytes. But allocate
- proportionally, to avoid looping eternally if
- snprintf() reports a too small count. */
- size_t n =
- xmax (xsum (length, count), xtimes (allocated, 2));
-
- ENSURE_ALLOCATION (n);
-#if USE_SNPRINTF
- continue;
-#endif
- }
-
-#if USE_SNPRINTF
- /* The snprintf() result did fit. */
-#else
- /* Append the sprintf() result. */
- memcpy (result + length, tmp, count * sizeof (CHAR_T));
- if (tmp != tmpbuf)
- free (tmp);
-#endif
-
- length += count;
- break;
- }
- }
- }
- }
-
- /* Add the final NUL. */
- ENSURE_ALLOCATION (xsum (length, 1));
- result[length] = '\0';
-
- if (result != resultbuf && length + 1 < allocated)
- {
- /* Shrink the allocated memory if possible. */
- CHAR_T *memory;
-
- memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
- if (memory != NULL)
- result = memory;
- }
-
- if (buf_malloced != NULL)
- free (buf_malloced);
- CLEANUP ();
- *lengthp = length;
- return result;
-
- out_of_memory:
- if (!(result == resultbuf || result == NULL))
- free (result);
- if (buf_malloced != NULL)
- free (buf_malloced);
- out_of_memory_1:
- CLEANUP ();
- errno = ENOMEM;
- return NULL;
- }
-}
-
-#undef SNPRINTF
-#undef USE_SNPRINTF
-#undef PRINTF_PARSE
-#undef DIRECTIVES
-#undef DIRECTIVE
-#undef CHAR_T
-#undef VASNPRINTF
diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
deleted file mode 100644
index 65f1bc13..00000000
--- a/intl/vasnprintf.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* vsprintf with automatic memory allocation.
- Copyright (C) 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _VASNPRINTF_H
-#define _VASNPRINTF_H
-
-/* Get va_list. */
-#include <stdarg.h>
-
-/* Get size_t. */
-#include <stddef.h>
-
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-# define __attribute__(Spec) /* empty */
-# endif
-/* The __-protected variants of `format' and `printf' attributes
- are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-# define __format__ format
-# define __printf__ printf
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Write formatted output to a string dynamically allocated with malloc().
- You can pass a preallocated buffer for the result in RESULTBUF and its
- size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
- If successful, return the address of the string (this may be = RESULTBUF
- if no dynamic memory allocation was necessary) and set *LENGTHP to the
- number of resulting bytes, excluding the trailing NUL. Upon error, set
- errno and return NULL. */
-extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
- __attribute__ ((__format__ (__printf__, 3, 4)));
-extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
- __attribute__ ((__format__ (__printf__, 3, 0)));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _VASNPRINTF_H */
diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
deleted file mode 100644
index d3cef4cb..00000000
--- a/intl/vasnwprintf.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* vswprintf with automatic memory allocation.
- Copyright (C) 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _VASNWPRINTF_H
-#define _VASNWPRINTF_H
-
-/* Get va_list. */
-#include <stdarg.h>
-
-/* Get wchar_t, size_t. */
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Write formatted output to a string dynamically allocated with malloc().
- You can pass a preallocated buffer for the result in RESULTBUF and its
- size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
- If successful, return the address of the string (this may be = RESULTBUF
- if no dynamic memory allocation was necessary) and set *LENGTHP to the
- number of resulting bytes, excluding the trailing NUL. Upon error, set
- errno and return NULL. */
-extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
-extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _VASNWPRINTF_H */
diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
deleted file mode 100644
index 24a2cfc2..00000000
--- a/intl/wprintf-parse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Parse printf format string.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _WPRINTF_PARSE_H
-#define _WPRINTF_PARSE_H
-
-#include "printf-args.h"
-
-
-/* Flags */
-#define FLAG_GROUP 1 /* ' flag */
-#define FLAG_LEFT 2 /* - flag */
-#define FLAG_SHOWSIGN 4 /* + flag */
-#define FLAG_SPACE 8 /* space flag */
-#define FLAG_ALT 16 /* # flag */
-#define FLAG_ZERO 32
-
-/* arg_index value indicating that no argument is consumed. */
-#define ARG_NONE (~(size_t)0)
-
-/* A parsed directive. */
-typedef struct
-{
- const wchar_t* dir_start;
- const wchar_t* dir_end;
- int flags;
- const wchar_t* width_start;
- const wchar_t* width_end;
- size_t width_arg_index;
- const wchar_t* precision_start;
- const wchar_t* precision_end;
- size_t precision_arg_index;
- wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
- size_t arg_index;
-}
-wchar_t_directive;
-
-/* A parsed format string. */
-typedef struct
-{
- size_t count;
- wchar_t_directive *dir;
- size_t max_width_length;
- size_t max_precision_length;
-}
-wchar_t_directives;
-
-
-/* Parses the format string. Fills in the number N of directives, and fills
- in directives[0], ..., directives[N-1], and sets directives[N].dir_start
- to the end of the format string. Also fills in the arg_type fields of the
- arguments and the needed count of arguments. */
-#ifdef STATIC
-STATIC
-#else
-extern
-#endif
-int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
-
-#endif /* _WPRINTF_PARSE_H */
diff --git a/intl/xsize.h b/intl/xsize.h
deleted file mode 100644
index 362e24b7..00000000
--- a/intl/xsize.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* xsize.h -- Checked size_t computations.
-
- Copyright (C) 2003 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
-
-#ifndef _XSIZE_H
-#define _XSIZE_H
-
-/* Get size_t. */
-#include <stddef.h>
-
-/* Get SIZE_MAX. */
-#include <limits.h>
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-/* The size of memory objects is often computed through expressions of
- type size_t. Example:
- void* p = malloc (header_size + n * element_size).
- These computations can lead to overflow. When this happens, malloc()
- returns a piece of memory that is way too small, and the program then
- crashes while attempting to fill the memory.
- To avoid this, the functions and macros in this file check for overflow.
- The convention is that SIZE_MAX represents overflow.
- malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
- implementation that uses mmap --, it's recommended to use size_overflow_p()
- or size_in_bounds_p() before invoking malloc().
- The example thus becomes:
- size_t size = xsum (header_size, xtimes (n, element_size));
- void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
-*/
-
-/* Convert an arbitrary value >= 0 to type size_t. */
-#define xcast_size_t(N) \
- ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
-
-/* Sum of two sizes, with overflow check. */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xsum (size_t size1, size_t size2)
-{
- size_t sum = size1 + size2;
- return (sum >= size1 ? sum : SIZE_MAX);
-}
-
-/* Sum of three sizes, with overflow check. */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xsum3 (size_t size1, size_t size2, size_t size3)
-{
- return xsum (xsum (size1, size2), size3);
-}
-
-/* Sum of four sizes, with overflow check. */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
-{
- return xsum (xsum (xsum (size1, size2), size3), size4);
-}
-
-/* Maximum of two sizes, with overflow check. */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xmax (size_t size1, size_t size2)
-{
- /* No explicit check is needed here, because for any n:
- max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
- return (size1 >= size2 ? size1 : size2);
-}
-
-/* Multiplication of a count with an element size, with overflow check.
- The count must be >= 0 and the element size must be > 0.
- This is a macro, not an inline function, so that it works correctly even
- when N is of a wider tupe and N > SIZE_MAX. */
-#define xtimes(N, ELSIZE) \
- ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
-
-/* Check for overflow. */
-#define size_overflow_p(SIZE) \
- ((SIZE) == SIZE_MAX)
-/* Check against overflow. */
-#define size_in_bounds_p(SIZE) \
- ((SIZE) != SIZE_MAX)
-
-#endif /* _XSIZE_H */
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 53efc5e1..092b4e0d 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,15 +1,18 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
-# 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.
+# 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.
#
-# Origin: gettext-0.14
+# - 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
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -23,344 +26,229 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/po
+libdir = @libdir@
+localedir = $(libdir)/locale
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+subdir = po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+MKINSTALLDIRS = $(top_srcdir)/@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@
-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 $(DOMAIN).pot stamp-po \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
+$(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \
CATALOGS = @CATALOGS@
-
-# Makevars gets inserted here. (Don't remove this line!)
+CATOBJEXT = @CATOBJEXT@
+INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+
+.c.o:
+ $(COMPILE) $<
+
+.po.pox:
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
- @echo "$(MSGFMT) -c -o $@ $<"; \
- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+ $(MSGFMT) -o $@ $<
.po.gmo:
- @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
+ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+ && rm -f $$file && $(GMSGFMT) -o $$file $<
-.sin.sed:
- sed -e '/^#/d' $< > t-$@
- mv t-$@ $@
+.po.cat:
+ sed -f ../intl/po2msg.sed < $< > $*.msg \
+ && rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@
-all-yes: stamp-po
+all-yes: $(CATALOGS)
all-no:
-# 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 -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
- @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
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+ $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
+ --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
- --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
-
+ && test ! -f $(GETTEXT_PACKAGE).po \
+ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
+ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
- 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 \
- : ; \
- fi
install-data-no: all
install-data-yes: all
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ if test -r "$(MKINSTALLDIRS)"; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ fi
@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; \
- 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"; \
+ 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; \
fi; \
- done; \
+ fi; \
done
-
-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); \
+ 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; \
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-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:
+uninstall:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
- 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; \
+ 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; \
done
+ if test "$(PACKAGE)" = "glib"; then \
+ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+ fi
check: all
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
+dvi info tags TAGS ID:
mostlyclean:
- rm -f remove-potcdate.sed
- rm -f stamp-poT
- rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+ rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
rm -fr *.o
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo
+ rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
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 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: $(DISTFILES)
+ rm -f $(GMOFILES)
+
+distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: update-po $(DISTFILES)
dists="$(DISTFILES)"; \
- if test "$(PACKAGE)" = "gettext-tools"; then \
- dists="$$dists Makevars.template"; \
- 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 \
- if test -f $$file; then \
- cp -p $$file $(distdir); \
- else \
- cp -p $(srcdir)/$$file $(distdir); \
- fi; \
+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+ || cp -p $(srcdir)/$$file $(distdir); \
done
update-po: Makefile
- $(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; \
+ $(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- echo "$$lang:"; \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
- 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; \
- 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; \
- exit 1; \
+ 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!"; \
+ rm -f $$tmpdir/$$lang.new.po; \
fi; \
- else \
- echo "msgmerge for $$lang.po failed!" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
- @:
+ done
-Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
- cd $(top_builddir) \
+# 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="../"; \
+ 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 .. \
&& 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:
diff --git a/po/bg.po b/po/bg.po
index 17b14342..1a864010 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 0.9.8\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-01-09 02:06+0200\n"
"Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr "仄亠"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "仂仂从仂仍"
@@ -187,7 +187,7 @@ msgstr ""
"亰弍舒仆仂仂 亟亠亶于亳亠 仆亠 仄仂亢亠 亟舒 亠 亳亰仗仂仍亰于舒 于 仗仂亰仂亠 亰舒 舒于礌亠\n"
"亰舒仂仂 亟亢舒 %%f, %%F or %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"仂仄舒仆亟舒舒 仆亠 仄仂亢舒 亟舒 亠 舒亳舒. 弌亰亟舒于舒仆亠仂 仆舒 pipe 亠 仗仂于舒仍亳.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -411,6 +412,7 @@ msgstr "亟亠仆舒 从仆亳亞舒"
msgid "Name:"
msgstr "仄亠:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -435,6 +437,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "亰亳于舒仆亠 仆舒 舒亟亠(亳亠)"
@@ -580,7 +583,8 @@ msgstr "EMail 亟亠"
msgid "Group"
msgstr "仗舒"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "舒仗从舒"
@@ -604,23 +608,23 @@ msgstr "弍仍亳亠仆 舒亟亠"
msgid "Personal address"
msgstr "亳亠仆 舒亟亠"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "舒弍亠仍亠亢从舒"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "亠亟仗亠亢亟亠仆亳亠"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "亠从舒"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "弌亰亟舒于舒仆亠 仆舒 舒仍舒仄亠仆 亟亳舒仍仂亞...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "仂从舒亰于舒仆亠 仆舒 仂于舒 仂弍亠仆亳亠 仍亠亟于舒亳 仗"
@@ -652,6 +656,10 @@ msgstr "亠仍亠仆"
msgid "Brown"
msgstr "舒磦"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "亳从仂亶"
@@ -944,7 +952,7 @@ msgid "Recipient is not specified."
msgstr "亠 亠 从舒亰舒仆 仗仂仍舒亠仍"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "亰仗舒舒仆亠"
@@ -1027,6 +1035,7 @@ msgstr "弌亰亟舒于舒仆亠 仆舒 仗仂亰仂亠 亰舒 舒于礌亠...\n"
msgid "MIME type"
msgstr "MIME 亳仗"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1072,7 +1081,8 @@ msgstr "亳从亠仗于舒仆亠"
msgid "Attach file"
msgstr "亳从亠仗于舒仆亠 仆舒 舒亶仍"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "弌亳亞仆舒舒"
@@ -1150,6 +1160,7 @@ msgstr "亠仄亠仆亠仆 舒亶仍: %s"
msgid "Compose: input from monitoring process\n"
msgstr "弌舒于礌亠: 于仂亟 仂 仆舒弍仍ミ莞夷火委 仗仂亠\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "亠 仄仂亢亠 亟舒 亠 舒亳舒 于仆亠仆 亠亟舒从仂\n"
@@ -1199,6 +1210,7 @@ msgstr "亳仍舒亞舒仆亠 仆舒 舒弍仍仂仆"
msgid "Replace"
msgstr "舒仄亠仆礌亠"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "亠亟舒从亳舒仆亠 仆舒 舒亟亠"
@@ -1219,6 +1231,7 @@ msgstr "丐磡于舒 亟舒 弍亟亠 仗仂仗仍仆亠仆 E-Mail 舒亟亠."
msgid "A Name and Value must be supplied."
msgstr "仄亠 亳 弌仂亶仆仂 磡于舒 亟舒 弍亟舒 仗仂仗仍仆亠仆亳."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "亠亟舒从亳舒仆亠 仆舒 亟舒仆仆亳 亰舒 仍亳亠"
@@ -1248,6 +1261,7 @@ msgstr "E-Mail 舒亟亠"
msgid "Alias"
msgstr "亠于亟仂仆亳仄"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "亠亠仆亠 仆舒亞仂亠"
@@ -1297,7 +1311,7 @@ msgid " Check File "
msgstr " 仂于亠从舒 仆舒 舒亶仍 "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "个舒亶仍"
@@ -1375,7 +1389,7 @@ msgid "Edit JPilot Entry"
msgstr "亠亟舒从亳舒仆亠 仆舒 JPilot 亰舒仗亳"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1439,7 +1453,7 @@ msgstr "舒亰舒 (亠从)"
msgid "Maximum Entries"
msgstr "舒从亳仄仄 亰舒仗亳亳"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "仆仂于仆亳"
@@ -1496,7 +1510,7 @@ msgid "Exporting file:"
msgstr "亰仂亟亠仆 舒亶仍:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "亰弍仂..."
@@ -1504,8 +1518,8 @@ msgstr "亰弍仂..."
msgid "Select exporting file"
msgstr "亰弍仂 仆舒 亳亰仂亟亠仆 舒亶仍"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1604,6 +1618,7 @@ msgstr "弌亰亟舒于舒仆亠 仆舒 亳亰亞仍亠亟 仆舒 仗舒仗从舒...\n"
msgid "New"
msgstr "仂于亳"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "亠仗仂亠亠仆亳"
@@ -2076,6 +2091,7 @@ msgstr "舒仗亳亳 :"
msgid "Import LDIF file into Address Book"
msgstr "仆舒礌亠 仆舒 LDIF 舒亶仍 于 亟亠仆舒舒 从仆亳亞舒"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "亠亟亳亠仆"
@@ -2301,6 +2317,7 @@ msgstr "于亠亟亠亠 仗舒仂仍舒"
msgid "Protocol log"
msgstr "仂仂从仂仍亠仆 亢仆舒仍"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2391,6 +2408,7 @@ msgid "Some unsent messages are queued. Exit now?"
msgstr ""
"磻仂亳 仆亠亳亰仗舒亠仆亳 仂弍亠仆亳 舒 于 仂仗舒从舒舒. 亠仍舒亠亠 仍亳 亳亰仂亟 仂 仗仂亞舒仄舒舒?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "亟亞 Sylpheed 亠 舒亳舒仆 于亠亠.\n"
@@ -2482,6 +2500,7 @@ msgstr "/_个舒亶仍/亠_舒..."
msgid "/_File/_Work offline"
msgstr "/_个舒亶仍/_舒弍仂舒 弍亠亰 仄亠亢舒"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_个舒亶仍/亰_仂亟"
@@ -3187,7 +3206,7 @@ msgstr "亳亠仄舒仆亠 仆舒 仆仂于舒 仗仂舒 仂 于亳从亳 舒从舒仆亳
msgid "Send queued message(s)"
msgstr "亰仗舒舒仆亠 仆舒 仂弍亠仆亳舒 于 仂仗舒从舒舒"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "弌舒于礌亠"
@@ -3694,207 +3713,207 @@ msgstr "从仂仄舒仆亟舒舒 仆亠 亠 仗仂亟亟亢舒\n"
msgid "error occurred on POP3 session\n"
msgstr "亞亠从舒 仗亳 POP3 亠亳舒\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "舒仄亠亠仆亳 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "舒仂亶从亳亠 舒 亰舒仗舒亰亠仆亳.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "于舒礌亠 仆舒 仗仂亰仂亠 仗亠亟仗仂亳舒仆亳舒 亰舒 舒从舒仆舒...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "从舒仆%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "亠亟仗仂亳舒仆亳 亰舒 仆仂于 舒从舒仆"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "亠亟仗仂亳舒仆亳 亰舒 舒从舒仆"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "弌亰亟舒于舒仆亠 仆舒 仗仂亰仂亠 仗亠亟仗仂亳舒仆亳舒 亰舒 舒从舒仆舒...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "仂仍舒于舒仆亠"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "亠仗亳从仂仆仂于亠仆仂"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "舒仗亠亟仆舒仍"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "仄亠 仆舒 舒从舒仆"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "丕舒仆仂于磦舒仆亠 从舒仂 仗仂亟舒亰弍亳舒 亠"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "亳仆舒 亳仆仂仄舒亳"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "仍仆仂 亳仄亠"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "仂亠仆从亳 舒亟亠"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "亞舒仆亳亰舒亳"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "仆仂仄舒亳 亰舒 于舒"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "仂于亳仆亳 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "亠亰 (仍仂从舒仍仆仂)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "弌于 亳亰亳从于舒 亟仂仂于亠磦舒仆亠"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "仂于亳仆舒从亳 于"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "弌于 亰舒 仗仂仍舒于舒仆亠"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP 于 (亳亰仗舒舒仆亠)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "仂亠弍亳亠仍从亳 ID"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "舒仂仍舒"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "弌于 亳亰亳从于舒 亟仂仂于亠磦舒仆亠"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "亰亳于舒仆亠 仂弍亠仆亳舒 仂 于舒 从仂亞舒仂 亠 仗仂仍舒"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "亠仄舒于舒仆亠 仍亠亟"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "亟仆亳"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 亟仆亳: 仆亠亰舒弍舒于仆仂 仗亠仄舒于舒仆亠)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "亰亠亞仍礌亠 仆舒 于亳从亳 仂弍亠仆亳 仂 于舒"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "亞舒仆亳亠仆亳亠 仆舒 舒亰仄亠舒 仗亳 仗仂仍舒于舒仆亠"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "B"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "个亳仍亳舒仆亠 仆舒 仂弍亠仆亳舒 仗亳 仗仂仍舒于舒仆亠"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "仂亟舒 从亳"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(亠亳仍亳舒仆亳亠 仂弍亠仆亳 亠 弍亟舒 舒仆磦舒仆亳 于 舒亰亳 仗舒仗从舒)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "亠仂亟 仆舒 亟仂仂于亠磦舒仆亠"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "于仂仄舒亳仆仂"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "'仂仍舒于舒仆亠 于亳从亳' 仗仂于亠磦舒 亰舒 仆仂于亳 仂弍亠仆亳 于 仂亰亳 舒从舒仆"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "舒亞仍舒于仆舒 舒"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "仂弍舒于礌亠 仆舒 亰舒亞仍舒于仆舒 舒 舒舒"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "亠仆亠亳舒仆亠 仆舒 Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "仂弍舒于礌亠 仆舒 亰舒亞仍舒于仆舒 舒 仂 仗仂亠弍亳亠仍"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " 亠亟舒从亳舒仆亠... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "丕亟仂仂于亠磦舒仆亠"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP 丕亟仂仂于亠磦舒仆亠 (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3903,172 +3922,172 @@ msgstr ""
"从仂 仂舒于亳亠 亠亰亳 仗仂仍亠舒 仗舒亰仆亳, 亠 弍亟舒 亳亰仗仂仍亰于舒仆亳\n"
"亳亠 user ID 亳 仗舒仂仍舒 从舒仂 亰舒 仗仂仍舒于舒仆亠."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "丕亟仂仂于亠磦舒仆亠 POP3 仗亠亟亳 亳亰仗舒舒仆亠"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "亰仂亟 仆舒 从仂仄舒仆亟舒"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "于仂仄舒亳仆仂 舒仆仂于磦舒仆亠 仆舒 仍亠亟仆亳亠 舒亟亠亳"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "亞仂于仂-亟仂"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "亳仗亳舒仆亠 仗仂 仗仂亟舒亰弍亳舒仆亠"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "仂亟仗亳于舒仆亠 仗仂 仗仂亟舒亰弍亳舒仆亠"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 ASCII-armored 仂仄舒 亰舒 从亳仗亳舒仆亠"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 仗仂亟仗亳 于 亳 亠从"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "仂亟仗亳于舒 从仍ム"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 仗仂亟舒亰弍亳舒亳 亠 GnuPG 从仍ム"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "亰弍仂 仆舒 从仍ム 仗仂 于舒亳 email 舒亟亠"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "亠仆 亳亰弍仂 仆舒 从仍ム"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "ID 仆舒 仗仂亠弍亳亠仍 亳仍亳 从仍ム舒:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "亠 亠 亳亰仗仂仍亰于舒 SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 POP3 于亰从舒"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 STARTTLS 从仂仄舒仆亟舒 亰舒 舒 仆舒 SSL 亠亳"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 IMAP4 于亰从舒"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 NNTP 于亰从舒"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "亰仗舒舒仆亠 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 SMTP 于亰从舒"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "亰仗仂仍亰于舒仆亠 仆舒 仆亠弍仍仂从亳舒 SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(亰从仍ム亠亠 舒从仂 亳仄舒亠 仗仂弍仍亠仄亳 SSL 于亰从舒)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "仗亠亟亠仍礌亠 仆舒 SMTP 仗仂"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "仗亠亟亠仍礌亠 仆舒 POP3 仗仂"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "仗亠亟亠仍礌亠 仆舒 IMAP4 仗仂"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "仗亠亟亠仍礌亠 仆舒 NNTP 仗仂"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "仗亠亟亠仍礌亠 仆舒 亳仄亠 仆舒 亟仂仄亠亶仆"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP 亟亳亠从仂亳 仆舒 于舒"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "仂舒于礌亠 仆舒 亳亰仗舒亠仆亳 仂弍亠仆亳 于"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "仂舒于礌亠 仆舒 亠仆仂于亳亠 于"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "仂舒于礌亠 仆舒 亳亰亳亳 仂弍亠仆亳 于"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "亠 亠 于于亠亟亠仆仂 亳仄亠 仆舒 舒从舒仆舒."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "亠 亠 于于亠亟亠仆 仗仂亠仆从亳 舒亟亠."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "亠 亠 于于亠亟亠仆 SMTP 于."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "亠 亠 于于亠亟亠仆 仗仂亠弍亳亠仍从亳 ID."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "亠 亠 于于亠亟亠仆 POP3 于."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "亠 亠 于于亠亟亠仆 IMAP4 于."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "亠 亠 于于亠亟亠仆 NNTP 于."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4447,6 +4466,7 @@ msgstr "丶亳亳舒仆亠 仆舒 仂弍亠仆亳亠仂 仗亳 仂亞仂于舒礌亠
msgid "Reply button invokes mailing list reply"
msgstr "仂仆舒 亰舒 仂亞仂于仂 亳亰仗仍仆磦舒 仂亞仂于仂 亟仂 仗仂亠仆从亳 仗亳从"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "个仂仄舒 仆舒 仂亞仂于仂舒"
@@ -4455,6 +4475,7 @@ msgstr "个仂仄舒 仆舒 仂亞仂于仂舒"
msgid "Quotation mark"
msgstr "舒从亳舒仆亠 仆舒 亳舒"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "个仂仄舒 仆舒 仗亠仗舒舒仆亠"
@@ -4483,6 +4504,7 @@ msgstr "弌从舒舒于舒仆亠 仆舒 仆仂于亳仆舒从亳 亞仗亳 仗仂 亟仍
msgid "letters"
msgstr "弍从于亳"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "亰亞仍亠亟 仆舒 亳亰于舒亟从舒舒"
@@ -5221,22 +5243,29 @@ msgstr "Reply-To:"
msgid "Mark"
msgstr "舒从亳舒仆亠"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "亳从舒"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "丐亠仄舒"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "仂亟舒亠仍"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "舒舒"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "仂仄亠"
@@ -5638,6 +5667,7 @@ msgstr "亠从舒 仗亳 亰亟舒于舒仆亠 仆舒 ssl 从仂仆亠从\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL 于亰从舒舒 亠 仗仂于舒仍亳 (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5766,10 +5796,12 @@ msgstr "/_亠舒..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr ""
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "No."
@@ -6075,7 +6107,7 @@ msgstr "舒 亟舒 亞仂 仗仂于亠亳亠, 亳亰于亳从舒亶亠 从仂仆亠从仆
msgid "right click and select `Check signature'.\n"
msgstr "舒从于舒仆亠 亟亠仆亳 弍仂仆 亳 亳亰弍亠亠亠 `仂于亠磦舒仆亠 仆舒 仗仂亟仗亳舒'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/cs.po b/po/cs.po
index 36eeb6ec..308ff05b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
"Last-Translator: Radek Vyb鱈ral <Radek.Vybiral@vsb.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -104,7 +104,7 @@ msgstr ""
msgid "Name"
msgstr "Jm辿no"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -186,7 +186,7 @@ msgstr ""
"V okn pro psan鱈 zpr叩vy nelze vybranou akci pou転鱈t\n"
"proto転e obsahuje %%f, %%F nebo %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -195,7 +195,8 @@ msgstr ""
"Nelze spustit p鱈kaz. Selhalo vytvoen鱈 roury.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -410,6 +411,7 @@ msgstr "Datab叩ze adres"
msgid "Name:"
msgstr "Jm辿no:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -434,6 +436,7 @@ msgstr "Kopie:"
msgid "Bcc:"
msgstr "Slep叩 kopie:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Smazat adresu(y)"
@@ -577,7 +580,8 @@ msgstr "Email adresa"
msgid "Group"
msgstr "Skupina"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Slo転ka"
@@ -601,23 +605,23 @@ msgstr "Spolen叩 adresa"
msgid "Personal address"
msgstr "Osobn鱈 adresa"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Pozn叩mka"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Varov叩n鱈"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Chyba"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Vytv叩鱈m dialog pro varov叩n鱈...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Zobrazovat p鱈邸t tuto zpr叩vu"
@@ -649,6 +653,10 @@ msgstr "Zelen叩"
msgid "Brown"
msgstr "Hnd叩"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "貼叩dn叩"
@@ -941,7 +949,7 @@ msgid "Recipient is not specified."
msgstr "Nen鱈 uveden p鱈jemce."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Odeslat"
@@ -1024,6 +1032,7 @@ msgstr "Vytv叩鱈m okno pro psan鱈...\n"
msgid "MIME type"
msgstr "MIME typ"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1069,7 +1078,8 @@ msgstr "P鱈loha"
msgid "Attach file"
msgstr "Pipoj鱈 soubor"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Podpis"
@@ -1147,6 +1157,7 @@ msgstr "Doasn箪 soubor: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Psan鱈: vstup z extern鱈ho procesu\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Nelze spustit extern鱈 editor\n"
@@ -1196,6 +1207,7 @@ msgstr "Pidat 邸ablonu"
msgid "Replace"
msgstr "Nahradit"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Upravit adresu"
@@ -1216,6 +1228,7 @@ msgstr "Nebyla zad叩na e-mail adresa."
msgid "A Name and Value must be supplied."
msgstr "Mus鱈 b箪t zad叩no jm辿no a hodnota."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Upravit data o osob"
@@ -1245,6 +1258,7 @@ msgstr "E-mail adresa"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Posunout nahoru"
@@ -1294,7 +1308,7 @@ msgid " Check File "
msgstr " Otestovat soubor "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Soubor"
@@ -1373,7 +1387,7 @@ msgid "Edit JPilot Entry"
msgstr "Upravit JPilot soubor"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1437,7 +1451,7 @@ msgstr "Timeout (vtein)"
msgid "Maximum Entries"
msgstr "Maximum polo転ek"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Z叩kladn鱈"
@@ -1494,7 +1508,7 @@ msgid "Exporting file:"
msgstr "Exportovan箪 soubor:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Vybrat... "
@@ -1502,8 +1516,8 @@ msgstr " Vybrat... "
msgid "Select exporting file"
msgstr "Vyberte soubor pro export"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1602,6 +1616,7 @@ msgstr "Vytv叩鱈m n叩hled pro slo転ku...\n"
msgid "New"
msgstr "Nov叩"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Nepeten辿"
@@ -2079,6 +2094,7 @@ msgstr "Z叩znam哲 :"
msgid "Import LDIF file into Address Book"
msgstr "Importovat LDIF soubor do datab叩ze adres"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Pedchoz鱈"
@@ -2305,6 +2321,7 @@ msgstr "Zadejte heslo"
msgid "Protocol log"
msgstr "Z叩znamov箪 protokol"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2393,6 +2410,7 @@ msgstr "Pozdr転en辿 zpr叩vy"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Ve front jsou neodeslan zpr叩vy. Skonit nyn鱈?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "aplikace Sylpheed je ji転 spu邸tna.\n"
@@ -2485,6 +2503,7 @@ msgstr "/_Soubor/_Tisk..."
msgid "/_File/_Work offline"
msgstr "/_Soubor/_Vlo転it soubor"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Soubor/_Konec"
@@ -3191,7 +3210,7 @@ msgstr "Zalen鱈 novou po邸tu ze v邸ech 炭t哲"
msgid "Send queued message(s)"
msgstr "Ode邸le pozdr転enou zpr叩vu(y)"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Napsat"
@@ -3698,207 +3717,207 @@ msgstr "P鱈kaz nen鱈 podporov叩n\n"
msgid "error occurred on POP3 session\n"
msgstr "v POP3 relaci se vyskytla\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Nalezen箪 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfigurace je ulo転ena.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Oteven鱈 okna s nastaven鱈m 炭tu...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "et%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Nastaven鱈 pro nov箪 炭et"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Nastaven鱈 炭tu"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Vyvol叩n鱈 okna pro nastaven鱈 炭tu...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "P鱈jem"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Soukrom鱈"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Roz邸鱈en鱈"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "N叩zev tohoto 炭tu"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Nastavit jako v箪choz鱈"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Osobn鱈 informace"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Cel辿 jm辿no"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Po邸tovn鱈 adresa"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizace"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informace o serveru"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "貼叩dn箪 (m鱈stn鱈)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Tento server vy転aduje autentizaci"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "News server"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server pro p鱈jem"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP server (odes鱈l叩n鱈)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "U転ivatelsk辿 jm辿no"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Heslo"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Tento server vy転aduje autentizaci"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Smazat zpr叩vy na serveru po jejich pijmut鱈"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Odstranit po"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dnech"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dn哲: odstranit ihned)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Pijmout v邸echny zpr叩vy ze serveru"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Limit velikosti pro p鱈jem"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtr zpr叩v pro p鱈jem"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "V箪choz鱈 inbox"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Nefiltrovan辿 zpr叩vy budou ulo転eny v t辿to slo転ce)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Metoda autentizace"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automaticky"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "Pi volb 'St叩hnout v邸e' zjistit nov辿 zpr叩vy"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Z叩hlav鱈"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Pidat do z叩hlav鱈 pole s datumem"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generovat 鱈slo zpr叩vy"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Pidat u転ivatelsky definovan辿 z叩hlav鱈"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Upravit..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autentizace"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP autentizace (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3907,172 +3926,172 @@ msgstr ""
"Pokud nech叩te tyto polo転ky pr叩zdn辿, bude\n"
"pou転ito stejn辿 jm辿no u転ivatele a heslo."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autentizace s POP3 ped posl叩n鱈m"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "V箪stup p鱈kazu"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automaticky nastavit n叩sleduj鱈c鱈 adresy"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Kopie"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Slep叩 kopie"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Odpovdt komu"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "V転dy za邸ifrovat zpr叩vu"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "V転dy pidat podpis"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Pou転鱈t form叩t ASCII-armored pro za邸ifrov叩n鱈"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Pou転鱈t ist箪 textov箪 podpis"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Kl鱈 pro podpis"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Pou転鱈t v箪choz鱈 GnuPG kl鱈"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Vybrat kl鱈 podle email adresy"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Zadat kl鱈 run"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "U転ivatel nebo ID kl鱈e:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Nepou転鱈vat SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Pou転鱈t SSL pro POP3 spojen鱈"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Pou転鱈t p鱈kaz STARTTLS pro spu邸tn鱈 SSL relace"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Pou転鱈t SSL pro IMAP4 spojen鱈"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Pou転鱈t SSL pro NNTP pipojen鱈"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Odes鱈l叩n鱈 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Pou転鱈t SSL pro SMTP pipojen鱈"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Urete SMTP port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Urete POP3 port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Urete IMAP4 port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Urete NNTP port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Urete n叩zev dom辿ny"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "adres叩 pro IMAP server"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Ukl叩dat odeslan辿 zpr叩vy do"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Ukl叩dat koncepty do"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Ukl叩dat smazan辿 zpr叩vy do"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Nebylo zad叩no jm辿no 炭tu."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Nebyla zad叩na po邸tovn鱈 adresa."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Nebyl zad叩n SMTP server."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Nebylo zad叩no u転ivatelsk辿 鱈slo."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Nebyl zad叩n POP3 server."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Nebyl zad叩n IMAP4 server."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Nebyl zad叩n NNTP server."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4451,6 +4470,7 @@ msgstr "Citovat zpr叩vy pi odpov鱈d叩n鱈"
msgid "Reply button invokes mailing list reply"
msgstr "Tla鱈tko s odpovd鱈 zvol鱈 odpov do diskusn鱈ho listu"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Form叩t odpovdi"
@@ -4459,6 +4479,7 @@ msgstr "Form叩t odpovdi"
msgid "Quotation mark"
msgstr "Znaka pro citaci"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Form叩t peposl叩n鱈"
@@ -4487,6 +4508,7 @@ msgstr "Zkr叩tit n叩zvy diskuzn鱈ch skupin del邸鱈 ne転"
msgid "letters"
msgstr "dopisy(哲)"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Souhrnn箪 pohled"
@@ -5227,22 +5249,29 @@ msgstr "Odpovdt komu:"
msgid "Mark"
msgstr "Oznait"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "P鱈loha"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Pedmt"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Od"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "鱈slo"
@@ -5645,6 +5674,7 @@ msgstr "Chyba pi vytv叩en鱈 ssl kontextu\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL spojen鱈 selhalo (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5773,10 +5803,12 @@ msgstr "/_Tisk..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "鱈s."
@@ -6084,7 +6116,7 @@ msgstr "Pro zkontrolov叩n鱈 vyvolejte kontextovou nab鱈dku pomoc鱈\n"
msgid "right click and select `Check signature'.\n"
msgstr "prav辿ho tla鱈tka my邸i a zvolte 'Zkontrolovat podpis'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/da.po b/po/da.po
index 83c123f3..440a32d2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed \n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-07-29 09:05+0200\n"
"Last-Translator: Andreas Hinz <news3@acci.dk>\n"
"Language-Team: \n"
@@ -103,7 +103,7 @@ msgstr ""
msgid "Name"
msgstr "Navn"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -185,7 +185,7 @@ msgstr ""
"Den valgte handling kan ikke benyttes i besked vindue\n"
"da det indeholder %%f, %%F eller %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -194,7 +194,8 @@ msgstr ""
"Kommando kunne ikke startes. Pipe oprettelse fejlet.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -409,6 +410,7 @@ msgstr "Adressebog"
msgid "Name:"
msgstr "Navn:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -433,6 +435,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Slet adresse(r)"
@@ -572,7 +575,8 @@ msgstr "E-post adresse"
msgid "Group"
msgstr "Gruppe"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Mappe"
@@ -596,23 +600,23 @@ msgstr "Normale adresser"
msgid "Personal address"
msgstr "Personlige adresser"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Note"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Advarsel"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Fejl"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Opretter alarm panel dialog...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Vis denne meddelelse igen"
@@ -644,6 +648,10 @@ msgstr "Gr淡n"
msgid "Brown"
msgstr "Brun"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ingen"
@@ -936,7 +944,7 @@ msgid "Recipient is not specified."
msgstr "Mangler modtager"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Send"
@@ -1019,6 +1027,7 @@ msgstr "Opretter instastnings vindue...\n"
msgid "MIME type"
msgstr "MIME type"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1064,7 +1073,8 @@ msgstr "Vedh脱ft"
msgid "Attach file"
msgstr "Vedh脱ft fil"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Underskrift"
@@ -1142,6 +1152,7 @@ msgstr "Midlertidig fil: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Instast: fra monitor process\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Kunne ikke starte ekstern editor\n"
@@ -1191,6 +1202,7 @@ msgstr "Benyt skabelon"
msgid "Replace"
msgstr "Erstat"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Redig辿r adresse"
@@ -1211,6 +1223,7 @@ msgstr "En e-post adresse skan indtastes"
msgid "A Name and Value must be supplied."
msgstr "Et navn og en v脱rdi skal indtastes."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Redig辿r person data"
@@ -1240,6 +1253,7 @@ msgstr "E-post adresse"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Op"
@@ -1289,7 +1303,7 @@ msgid " Check File "
msgstr " Check fil "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Fil"
@@ -1367,7 +1381,7 @@ msgid "Edit JPilot Entry"
msgstr "Redig辿r JPilot indtastning"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1431,7 +1445,7 @@ msgstr "Timeout (sek)"
msgid "Maximum Entries"
msgstr "Max. indtastninger"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Enkelt"
@@ -1488,7 +1502,7 @@ msgid "Exporting file:"
msgstr "Eksporterer fil:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " V脱lg... "
@@ -1496,8 +1510,8 @@ msgstr " V脱lg... "
msgid "Select exporting file"
msgstr "V脱lg fil til export"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1596,6 +1610,7 @@ msgstr "Opretter mappe tr脱...\n"
msgid "New"
msgstr "Ny"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Ul脱st"
@@ -2071,6 +2086,7 @@ msgstr "Poster :"
msgid "Import LDIF file into Address Book"
msgstr "Importer LDIF fil til adressebog"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Forrige"
@@ -2301,6 +2317,7 @@ msgstr "Indtast adgangskode"
msgid "Protocol log"
msgstr "Protokol log"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2389,6 +2406,7 @@ msgstr "Meddeleser i k淡"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Nogle usendte meddelelser i k淡. Afslut nu?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "sylpheed k淡rer allerede.\n"
@@ -2481,6 +2499,7 @@ msgstr "/_Filer/_Udskriv..."
msgid "/_File/_Work offline"
msgstr "/_Filer/_Inds脱t fil"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Filer/_Afslut"
@@ -3186,7 +3205,7 @@ msgstr "Hent ny post fra alle konti"
msgid "Send queued message(s)"
msgstr "Sender meddelelse(r) i k淡"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Opret"
@@ -3697,207 +3716,207 @@ msgstr "Kommando tekst"
msgid "error occurred on POP3 session\n"
msgstr "fejl under POP3 session\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Fundet %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfiguration er gemt.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "bner konti egenskaber...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Konto%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Ops脱t af ny konto"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Konto ops脱t"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Opretter konto egenskaber...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Modtag"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privat"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avanceret"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Navn p奪 denne konto"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Standard konto"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Personlige informationener"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Fuldt navn"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-post adresse"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organisation"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Server data"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Ingen (lokal)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Dennes server kr脱ver godkendelse"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Nyheds server"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server til modtagelse"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP server (afsendelse)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Bruger ID"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Adgangskode"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Dennes server kr脱ver godkendelse"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Slet meddelelser fra server efter modtagelse"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Slet efter"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dage"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dage: slet straks)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Hent alle meddelelser fra server"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Modtagelses st淡rrelse maks."
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "kB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrere meddelelse ved modtagelse"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Standard indbakke"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Godkendelses metode"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatisk"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Hent alle' henter post fra denne konto"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Hoved"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Tilf淡j dato linie"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Opret meddelelses ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Tilf淡j bruger defineret hoved"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Redig辿r... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Godkendelse"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP godkendelse (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3906,172 +3925,172 @@ msgstr ""
"Hvis du lader disse v脱re tomme, benyttes\n"
"samme bruger ID og adgangskode som ved modtagelse."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Godkend med POP3 f淡r afsendelse"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Kommando tekst"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Udfyld automatisk f淡lgende adresser"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Svar til"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Krypter altid meddelelser"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Signer altid meddelelse"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Benyt ASCII format til kodning"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Benyt klar tekst underskrift"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Underskrifts n淡gle"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Benyt standard GnuPg n淡gle"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "V脱lg n淡gle efter e-post adresse"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Angiv n淡gle manuelt"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Bruger eller n淡gle ID"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Benyt ikke SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Benyt SSL til POP3 forbindelse"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Benyt STARTTLS kommando til at starte SSL session"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Benyt SSL til IMAP4 forbindelse"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Benyt SSL til NNTP forbindelse"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Send (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Benyt SSL til SMTP forbindelse"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Benyt ublokerende SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Angiv SMTP port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Angiv POP3 port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Angiv IMAP4 port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Angiv NNTP port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Angiv dom脱ne navn"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP server sti."
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Gem sendte meddelelser i"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Gem kladde i"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Gem slettede meddelelser i"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Konto navn er ikke angivet."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "E-post adresse ikke angivet."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP server ikke angivet."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Bruger ID ikke angivet."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 server ikke angivet."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 server ikke angivet"
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP server ikke angivet."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4448,6 +4467,7 @@ msgstr "Citat af meddelelse i svar"
msgid "Reply button invokes mailing list reply"
msgstr "Svar knap starter svar til mail liste"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Svar format"
@@ -4456,6 +4476,7 @@ msgstr "Svar format"
msgid "Quotation mark"
msgstr "Citat tegn"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Videresend format"
@@ -4484,6 +4505,7 @@ msgstr "Forkort nyhedsgruppe l脱ngere end"
msgid "letters"
msgstr "bogstaver"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Meddelelses visning"
@@ -5221,22 +5243,29 @@ msgstr "Svar til:"
msgid "Mark"
msgstr "Mark辿r"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Vedh脱ftet"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Emne"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Fra"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Dato"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Nummer"
@@ -5641,6 +5670,7 @@ msgstr "Fejl ved oprettelse af SSL kontext\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL forbindelse fejlet (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5769,10 +5799,12 @@ msgstr "/_Udskriv..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Nr."
@@ -6082,7 +6114,7 @@ msgstr "For at checke det, 奪bn menuen med\n"
msgid "right click and select `Check signature'.\n"
msgstr "h淡jre mustast og v脱lg `Check signatur'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/de.po b/po/de.po
index b5588016..4147030a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-11-02 00:41+0100\n"
"Last-Translator: Manfred Usselmann <usselmann DOT m AT icg-online DOT de>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
msgid "Name"
msgstr "Name"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokoll"
@@ -190,7 +190,7 @@ msgstr ""
"Die erstellte Aktion kann nicht im Verfassen-Fenster benutzt werden,\n"
"weil sie %%f, %%F oder %%p beinhaltet."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -199,7 +199,8 @@ msgstr ""
"Befehl kann nicht gestartet werden. Pipe-Erstellung fehlgeschlagen.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -414,6 +415,7 @@ msgstr "Adressbuch"
msgid "Name:"
msgstr "Name:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -438,6 +440,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Adresse(n) l旦schen"
@@ -584,7 +587,8 @@ msgstr "E-Mail Adresse"
msgid "Group"
msgstr "Gruppe"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Ablage"
@@ -608,23 +612,23 @@ msgstr "Allgemeine Adressen"
msgid "Personal address"
msgstr "Pers旦nliche Adressen"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Notiz"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Warnung"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Fehler"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Erstelle Alarmpanel-Dialog...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Zeige diese Nachricht das n辰chste mal an"
@@ -656,6 +660,10 @@ msgstr "Gr端n"
msgid "Brown"
msgstr "Braun"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Keine"
@@ -940,7 +948,7 @@ msgid "Recipient is not specified."
msgstr "Empf辰nger nicht angegeben"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Senden"
@@ -1023,6 +1031,7 @@ msgstr "Erstelle Verfassenfenster...\n"
msgid "MIME type"
msgstr "MIME-Typ"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1068,7 +1077,8 @@ msgstr "Anh辰ngen"
msgid "Attach file"
msgstr "Datei anh辰ngen"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Unterschrift"
@@ -1146,6 +1156,7 @@ msgstr "Tempor辰re Datei: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Verfassen: Eingabe vom berwachungsprozess\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Kann externen Editor nicht ausf端hren\n"
@@ -1195,6 +1206,7 @@ msgstr "Schablone 端bernehmen"
msgid "Replace"
msgstr "Ersetzen"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Adresse bearbeiten"
@@ -1215,6 +1227,7 @@ msgstr "Eine E-Mail-Adresse muss angegeben werden."
msgid "A Name and Value must be supplied."
msgstr "Ein Name und ein Wert m端ssen angegeben werden."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Personen-Daten bearbeiten"
@@ -1244,6 +1257,7 @@ msgstr "E-Mail Adresse"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Auf"
@@ -1293,7 +1307,7 @@ msgid " Check File "
msgstr " Datei 端berpr端fen "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Datei"
@@ -1371,7 +1385,7 @@ msgid "Edit JPilot Entry"
msgstr "JPilot-Eintrag bearbeiten"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1435,7 +1449,7 @@ msgstr "Timeout (Sek.)"
msgid "Maximum Entries"
msgstr "Eintr辰ge (Max.)"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Einfach"
@@ -1492,7 +1506,7 @@ msgid "Exporting file:"
msgstr "Exportiere Datei:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Ausw辰hlen... "
@@ -1500,8 +1514,8 @@ msgstr " Ausw辰hlen... "
msgid "Select exporting file"
msgstr "W辰hle exportierte Datei"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1599,6 +1613,7 @@ msgstr "Erstelle Ablageansicht...\n"
msgid "New"
msgstr "Neu"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Ungelesen"
@@ -2072,6 +2087,7 @@ msgstr "Felder :"
msgid "Import LDIF file into Address Book"
msgstr "Importiere LDIF-Datei in Adressbuch"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Vorherige"
@@ -2295,6 +2311,7 @@ msgstr "Kennwort eingeben"
msgid "Protocol log"
msgstr "Mitschrift des Protokolls"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2383,6 +2400,7 @@ msgstr "Wartende Nachrichten"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "Ein anderes Sylpheed l辰uft schon.\n"
@@ -2474,6 +2492,7 @@ msgstr "/_Datei/_Drucken..."
msgid "/_File/_Work offline"
msgstr "/_Datei/_Ohne Verbindung arbeiten"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Datei/_Beenden"
@@ -3168,7 +3187,7 @@ msgstr "Neue E-Mail aller Accounts aufnehmen"
msgid "Send queued message(s)"
msgstr "Senden wartender Nachrichten"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Verfassen"
@@ -3676,208 +3695,208 @@ msgstr "Befehl wird nicht unterst端tzt\n"
msgid "error occurred on POP3 session\n"
msgstr "Fehler w辰hrend einer POP3-Sitzung\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Gefunden %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfiguration wurde gespeichert.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "ffne Accounteinstellungenfenster...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Account%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Einstellungen eines neuen Accounts"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Accounteinstellungen"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Erstelle Accounteinstellungenfenster...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Empfangen"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privat"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Speziell"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Name dieses Accounts"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Standard-Account"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Pers旦nliche Informationen"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Vollst辰ndiger Name"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-Mail-Adresse"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organisation"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Serverdaten"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Keiner (lokal)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Dieser Server ben旦tigt Beglaubigung"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Newsserver"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server zum Empfangen"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP-Server (senden)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Benutzer-ID"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Kennwort"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Dieser Server ben旦tigt Beglaubigung"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Nachrichten vom Server nach Empfang l旦schen"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Entfernen nach"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "Tag(en)"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 Tage: sofort entfernen)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Lade alle Nachrichten vom Server herunter"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Grenze f端r Nachrichteng旦e beim Empfang"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Nachrichten beim Empfang filtern"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Standard Posteingang"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Ungefilterte Nachrichten werden in dieser Ablage gespeichert)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Beglaubigungsmethode"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatisch"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr ""
"`Hole alle' 端bepr端ft ob neue Nachrichten f端r diesen Account vorhanden sind"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Kopfzeilen"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "F端ge Datum in Kopfzeile ein"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Erzeuge Nachrichten-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "F端ge benutzerdefinierte Kopfzeile ein"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Bearbeiten... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Beglaubigung"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP-Beglaubigung (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3886,172 +3905,172 @@ msgstr ""
"Wenn Sie diese Eintr辰ge frei lassen, wird\n"
"die ID und das Passwort zum Empfang verwendet."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Beglaubige mit POP3 vor dem Senden"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Befehlsausgabe"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Setze folgende Adressen automatisch"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Antwort an"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Nachrichten immer verschl端sseln"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Nachrichten immer digital unterschreiben"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Benutze ASCII-H端llen Format zum Verschl端sseln"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Benutze digitale Klartext-Unterschrift"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Schl端ssel f端r digitale Unterschrift"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Benutze voreingestellten GnuPG-Schl端ssel"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "W辰hle Schl端ssel nach E-Mail Adresse"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Schl端ssel manuell angeben"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Benutzer- oder Schl端ssel-ID"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "SSL nicht benutzen"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "SSL f端r POP3-Verbindung benutzen"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "F端r SSL-Sitzung STARTTLS-Befehl benutzen"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "SSL f端r IMAP4-Verbindung benutzen"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "SSL f端r NNTP-Verbindung benutzen"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Senden (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SSL f端r SMTP-Verbindung benutzen"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Benutze non-blocking SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Ausschlalten, wenn Probleme mit der SSL-Verbindung)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "SMTP-Port angeben"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "POP3-Port angeben"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "IMAP4-Port angeben"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "NNTP-Port angeben"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Dom辰nnamen angeben"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP-Serververzeichnis."
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Gesendete Nachrichten speichern in"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Entw端rfe speichern in"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Gel旦schte Nachrichten speichern in"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Keine Account-Name angegeben."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Keine E-Mail-Adresse angegeben."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Keinen SMTP-Server angegeben."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Keine Benutzer-ID angegeben."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Keinen POP3-Server angegeben."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Keinen IMAP4-Server angegeben."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Keinen NNTP-Server angegeben."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4428,6 +4447,7 @@ msgstr "Zitiere Nachricht in der Antwort"
msgid "Reply button invokes mailing list reply"
msgstr "Antwort-Knopf f端hrt Antwort an Mailing-Liste aus"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Antwort-Format"
@@ -4436,6 +4456,7 @@ msgstr "Antwort-Format"
msgid "Quotation mark"
msgstr "Zitatzeichen"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Weiterleiten-Format"
@@ -4464,6 +4485,7 @@ msgstr "K端rze Newsgroups l辰nger als"
msgid "letters"
msgstr "Zeichen"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Ablageninhaltsansicht"
@@ -5183,22 +5205,29 @@ msgstr "Antwort an:"
msgid "Mark"
msgstr "Markiert"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Anhang"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Betreff"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Von"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Nummer"
@@ -5602,6 +5631,7 @@ msgstr "Fehler beim Erstellen des SSL-Kontextes\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL-Verbindung fehlgeschlagen (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5731,10 +5761,12 @@ msgstr "/_Drucken..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Nr."
@@ -6039,7 +6071,7 @@ msgstr "Zum berpr端fen, 旦ffnen Sie das Kontextmen端 mit der\n"
msgid "right click and select `Check signature'.\n"
msgstr "rechten Maustaste und `Digitale Unterschrift 端berpr端fen' w辰hlen.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/el.po b/po/el.po
index 6a71c0db..c8bcd02f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2001-10-08\n"
"Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -106,7 +106,7 @@ msgstr ""
msgid "Name"
msgstr "僚凌亮留"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "虜凌了了凌"
@@ -188,14 +188,15 @@ msgid ""
"because it contains %%f, %%F or %%p."
msgstr ""
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
"%s"
msgstr ""
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, fuzzy, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -411,6 +412,7 @@ msgstr "留略了凌粒凌 隆旅竜慮僚竜僚"
msgid "Name:"
msgstr "僚凌亮留:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -435,6 +437,7 @@ msgstr "凌旅僚凌凌溜侶侶:"
msgid "Bcc:"
msgstr ""
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "旅留粒留流 隆旅竜慮僚侶 (隆旅竜慮僚竜僚)"
@@ -573,7 +576,8 @@ msgstr "旅竜慮僚侶 e-mail"
msgid "Group"
msgstr "劉留亮略隆留"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "留略了凌粒凌"
@@ -599,23 +603,23 @@ msgstr "凌旅僚劉 隆旅竜慮僚竜旅"
msgid "Personal address"
msgstr "凌旅虜劉 隆旅竜慮僚竜旅"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "裡侶亮竜溜侶"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "凌竜旅隆凌凌溜侶侶"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "裡略了亮留"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "侶亮旅凌粒 凌 隆旅略了凌粒凌 alert panel...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "留 竜亮留僚旅竜溜 留 凌 亮流僚亮留 侶僚 竜亮竜僚侶 凌略"
@@ -647,6 +651,10 @@ msgstr "略旅僚凌"
msgid "Brown"
msgstr "留劉"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "里劉了凌"
@@ -953,7 +961,7 @@ msgid "Recipient is not specified."
msgstr " 留留了流侶 隆竜僚 劉竜旅 凌旅竜溜."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "凌凌了流"
@@ -1034,6 +1042,7 @@ msgstr "侶亮旅凌粒 凌 留略慮凌 僚慮竜侶...\n"
msgid "MIME type"
msgstr "凌 MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1081,7 +1090,8 @@ msgstr "凌略侶侶"
msgid "Attach file"
msgstr "凌略侶侶 留竜溜凌"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Y凌粒留流"
@@ -1163,6 +1173,7 @@ msgstr "凌旅僚 留竜溜凌: %s"
msgid "Compose: input from monitoring process\n"
msgstr "裡僚慮竜侶: 竜旅留粒粒流 留 留留虜凌了凌慮凌亮竜僚侶 隆旅竜粒留溜留\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "竜僚 亮竜留 僚留 虜留了劉 凌 竜両竜旅虜 粒留亮亮留 竜竜両竜粒留溜留\n"
@@ -1214,6 +1225,7 @@ msgstr "旅留粒留流 亮侶僚亮留凌"
msgid "Replace"
msgstr "略僚侶侶"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
#, fuzzy
msgid "Edit address"
@@ -1235,6 +1247,7 @@ msgstr "劉竜旅 僚留 隆凌慮竜溜 亮溜留 隆旅竜慮僚侶 mail."
msgid "A Name and Value must be supplied."
msgstr "劉竜旅 僚留 隆凌慮竜溜 劉僚留 僚凌亮留 虜留旅 亮溜留 旅亮流."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "竜両竜粒留溜留 凌旅竜溜僚 留亮凌"
@@ -1264,6 +1277,7 @@ msgstr "旅竜慮僚侶 e-mail"
msgid "Alias"
msgstr "率竜隆ホ熟亮凌"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "竜留虜溜僚侶侶 略僚"
@@ -1313,7 +1327,7 @@ msgid " Check File "
msgstr " 了竜粒凌 竜溜凌 "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "竜溜凌"
@@ -1393,7 +1407,7 @@ msgid "Edit JPilot Entry"
msgstr "竜両竜粒留溜留 竜粒粒留流 JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1458,7 +1472,7 @@ msgstr ""
msgid "Maximum Entries"
msgstr "劉粒旅凌 留旅慮亮 竜粒粒留ホ"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "留旅虜略"
@@ -1519,7 +1533,7 @@ msgid "Exporting file:"
msgstr "両留粒粒流 留竜溜凌:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "旅了凌粒流... "
@@ -1527,8 +1541,8 @@ msgstr "旅了凌粒流... "
msgid "Select exporting file"
msgstr "旅了凌粒流 留竜溜凌 竜両留粒粒流"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1633,6 +1647,7 @@ msgstr "侶亮旅凌粒 侶僚 留竜旅虜僚旅侶 虜留留了粒僚...\n"
msgid "New"
msgstr "劉留"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "隆旅略硫留留"
@@ -2132,6 +2147,7 @@ msgstr ""
msgid "Import LDIF file into Address Book"
msgstr ""
+#. Button panel
#: src/importldif.c:760
#, fuzzy
msgid "Prev"
@@ -2360,6 +2376,7 @@ msgstr "マ竜 凌僚 虜隆旅虜"
msgid "Protocol log"
msgstr "留留粒留流 凌虜了了凌"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2447,6 +2464,7 @@ msgstr "侶僚亮留留 侶僚 凌略"
msgid "Some unsent messages are queued. Exit now?"
msgstr "竜旅虜略 亮侶僚亮留留 隆竜僚 劉凌僚 留了竜溜 虜留旅 竜溜僚留旅 侶僚 凌略. 留 虜了竜溜;"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "劉僚留 略了了凌 Sylpheed 劉竜旅 流隆侶.\n"
@@ -2539,6 +2557,7 @@ msgstr "/竜溜凌/虜侶..."
msgid "/_File/_Work offline"
msgstr "/竜溜凌/旅留粒粒流 留竜溜凌"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/竜溜凌/両凌隆凌"
@@ -3323,7 +3342,7 @@ msgstr "流侶 僚劉凌 mail 留 了凌 凌 了凌粒留旅留亮凌
msgid "Send queued message(s)"
msgstr "凌凌了流 了僚 僚 亮侶僚亮略僚 留 侶僚 凌略"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "裡僚慮竜侶"
@@ -3841,395 +3860,395 @@ msgstr "僚凌了流"
msgid "error occurred on POP3 session\n"
msgstr "凌劉虜竜 略了亮留 侶僚 竜両留虜溜硫侶\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "劉慮侶虜竜 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "旅 慮亮溜竜旅 留凌慮侶虜竜侶虜留僚.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "僚凌溜粒 凌 留略慮凌 竜旅了凌粒ホ 僚 了凌粒留旅留亮ホ...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "凌粒留旅留亮%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "旅了凌粒劉 粒旅留 凌 僚劉凌 了凌粒留旅留亮"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
#, fuzzy
msgid "Account preferences"
msgstr "凌旅僚劉 旅了凌粒劉"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "侶亮旅凌粒 凌 留略慮凌 竜旅了凌粒ホ 凌 了凌粒留旅留亮凌...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "流侶"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "旅虜侶留"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "凌侶亮劉僚留"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "僚凌亮留 凌 了凌粒留旅留亮凌"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
#, fuzzy
msgid "Set as default"
msgstr " 劉竜 僚侶慮侶 了凌粒留旅留亮 "
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "凌旅虜劉 了侶凌凌溜竜"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "了流竜 僚凌亮留"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "旅竜慮僚侶 mail"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "粒留僚旅亮"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "了侶凌凌溜竜 竜両侶劉侶"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "劉留 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "里溜凌留 (凌旅虜)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr " 凌 竜両侶劉侶 留留旅竜溜 旅凌凌溜侶侶"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "両侶劉侶 僚劉僚"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "両侶劉侶 粒旅留 了流侶"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "両侶劉侶 SMTP (留凌凌了流)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "僚凌亮留 流侶"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "隆旅虜"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr " 凌 竜両侶劉侶 留留旅竜溜 旅凌凌溜侶侶"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "旅留粒留流 亮侶僚亮略僚 留 凌僚 竜両侶劉侶 留僚 留留了侶慮凌僚"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
#, fuzzy
msgid "Remove after"
msgstr "留溜竜侶 虜留留了粒凌"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
#, fuzzy
msgid "days"
msgstr "略僚留"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr ""
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "流侶 了僚 僚 亮侶僚亮略僚 留 凌僚 竜両侶劉侶"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr ""
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "陸旅了略旅亮留 亮侶僚亮略僚 虜留略 侶僚 了流侶"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
#, fuzzy
msgid "Default inbox"
msgstr "凌虜留慮凌旅亮劉僚凌 虜了竜旅隆溜 凌粒留流"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
#, fuzzy
msgid "(Unfiltered messages will be stored in this folder)"
msgstr ""
"僚凌旅粒亮留 凌 マ凌 留隆旅略硫留凌 亮侶僚亮留凌 虜留略 侶 亮竜留虜溜僚侶侶 竜 劉僚留 虜留略了凌粒凌"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
#, fuzzy
msgid "Authentication method"
msgstr "旅凌凌溜侶侶"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "亮留侶"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
#, fuzzy
msgid "`Get all' checks for new messages on this account"
msgstr "`流侶 了僚' 竜了劉粒竜旅 粒旅留 僚劉留 亮侶僚亮留留 竜 留 凌 了凌粒留旅留亮"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "旅虜竜留了溜隆留"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "凌慮流虜侶 竜隆溜凌 侶亮竜凌亮侶僚溜留 侶僚 虜竜留了溜隆留"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "侶亮旅凌粒溜留 Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "凌慮流虜侶 虜竜留了溜隆留 凌旅亮劉僚侶 留 凌僚 流侶"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr "竜両竜粒留溜留..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "旅凌凌溜侶侶"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "旅凌凌溜侶侶 SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "旅凌凌溜侶侶 亮竜 POP3 旅僚 侶僚 留凌凌了流"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "僚凌了流"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
#, fuzzy
msgid "Automatically set the following addresses"
msgstr "亮留凌 凌旅亮 留ホ 僚 隆旅竜慮僚竜僚"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "凌旅僚凌凌溜侶侶"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "略僚侶侶 竜"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "凌粒略侶侶 亮侶僚亮略僚 竜両 凌旅亮凌"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "離凌粒留流 亮侶僚亮略僚 竜両 凌旅亮凌"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr ""
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
#, fuzzy
msgid "Use clear text signature"
msgstr "旅留粒粒流 凌粒留流"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "了竜旅隆溜 凌粒留流"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "律流侶 凌虜留慮凌旅亮劉僚凌 虜了竜旅隆旅凌 GnuPG"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "旅了凌粒流 虜了竜旅隆旅凌 亮竜 硫略侶 侶僚 email 隆旅竜慮僚侶"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "溜竜 亮竜 凌 劉旅 凌 虜了竜旅隆溜"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "律流侶 流 key ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "留 亮侶僚 侶旅亮凌凌旅竜溜留旅 SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "律流侶 SSL 粒旅留 僚隆竜侶 POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "律流侶 竜僚凌了流 STARTTLS 粒旅留 侶僚 劉僚留両侶 留留了凌 (SSL) 僚隆凌"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "律流侶 SSL 粒旅留 僚隆竜侶 IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr ""
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
#, fuzzy
msgid "Use SSL for NNTP connection"
msgstr "律流侶 SSL 粒旅留 僚隆竜侶 SMTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "凌凌了流 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "律流侶 SSL 粒旅留 僚隆竜侶 SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "凌隆旅凌旅亮 慮留 SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "凌隆旅凌旅亮 慮留 POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "凌隆旅凌旅亮 慮留 IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "凌隆旅凌旅亮 慮留 NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "旅亮 凌 凌僚亮留凌 凌 domain"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "留略了凌粒凌 凌僚 竜両侶劉侶 IMAP4"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
#, fuzzy
msgid "Put sent messages in"
msgstr "凌慮流虜竜侶 留了亮劉僚僚 亮侶僚亮略僚 凌 outbox"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
#, fuzzy
msgid "Put draft messages in"
msgstr "里了旅両侶 亮侶僚亮略僚 凌"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
#, fuzzy
msgid "Put deleted messages in"
msgstr "旅留粒留流 亮侶僚亮留凌"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
#, fuzzy
msgid "Account name is not entered."
msgstr " 隆旅竜慮僚侶 mail 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr " 隆旅竜慮僚侶 mail 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr " 竜両侶劉侶 SMTP 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "里凌 僚凌亮留 流侶 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr " 竜両侶劉侶 POP3 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr " 竜両侶劉侶 IMAP4 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr " 竜両侶劉侶 NNTP 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4594,6 +4613,7 @@ msgstr "留略慮竜侶 凌 亮侶僚亮留凌 留僚 留留僚略竜"
msgid "Reply button invokes mailing list reply"
msgstr "/略僚侶侶 竜 了凌"
+#. reply
#: src/prefs_common.c:1404
#, fuzzy
msgid "Reply format"
@@ -4603,6 +4623,7 @@ msgstr "凌凌凌溜侶侶 侶亮竜凌亮侶僚溜留"
msgid "Quotation mark"
msgstr "裡流亮留 留略慮竜侶"
+#. forward
#: src/prefs_common.c:1443
#, fuzzy
msgid "Forward format"
@@ -4634,6 +4655,7 @@ msgstr ""
msgid "letters"
msgstr "旅留粒留流"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "竜旅虜僚旅侶 竜溜了侶侶"
@@ -5372,23 +5394,30 @@ msgstr "略僚侶侶 竜"
msgid "Mark"
msgstr "裡流亮留僚侶"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
#, fuzzy
msgid "Attachment"
msgstr "凌略侶侶"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "劉亮留"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr ""
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "亮竜凌亮侶僚溜留"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "旅慮亮"
@@ -5805,6 +5834,7 @@ msgstr ""
msgid "SSL connect failed (%s)\n"
msgstr " 留留了流 (SSL) 僚隆竜侶 留劉竜 (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5940,10 +5970,12 @@ msgstr "/虜侶..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "."
@@ -6258,7 +6290,7 @@ msgstr "旅留 僚留 侶僚 竜了劉粒両竜竜, 竜旅了劉両竜 凌 亮竜僚凌 亮
msgid "right click and select `Check signature'.\n"
msgstr "隆竜両溜 虜凌亮溜 虜留旅 竜旅了劉両竜 `了竜粒凌 凌粒留流'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/es.po b/po/es.po
index c155d5db..b8a8b6b5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-12-21 11:18+0100\n"
"Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
"Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr "Nombre"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocolo"
@@ -187,7 +187,7 @@ msgstr ""
"La acci坦n seleccionada no se puede utilizar en la ventana de\n"
"composici坦n porque contiene %%f, %%F o %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"La orden no pudo ejecutarse. Fall坦 la creaci坦n de la tuber鱈a.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -411,6 +412,7 @@ msgstr "Agenda de direcciones"
msgid "Name:"
msgstr "Nombre:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -435,6 +437,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Borrar direcci坦n(es)"
@@ -580,7 +583,8 @@ msgstr "Direcci坦n e-mail"
msgid "Group"
msgstr "Grupo"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Carpeta"
@@ -604,23 +608,23 @@ msgstr "Direcci坦n com炭n"
msgid "Personal address"
msgstr "Direcci坦n personal"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Notificaci坦n"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Error"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Creando el di叩logo de alerta...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Mostrar este mensaje de nuevo"
@@ -652,6 +656,10 @@ msgstr "Verde"
msgid "Brown"
msgstr "Marr坦n"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ninguno"
@@ -936,7 +944,7 @@ msgid "Recipient is not specified."
msgstr "No se especific坦 el destinatario."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Enviar"
@@ -1021,6 +1029,7 @@ msgstr "Creando ventana de composici坦n...\n"
msgid "MIME type"
msgstr "Tipo MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1066,7 +1075,8 @@ msgstr "Adjuntar"
msgid "Attach file"
msgstr "Adjuntar fichero"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Firma"
@@ -1144,6 +1154,7 @@ msgstr "Fichero temporal: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Componer: entrada desde proceso monitor\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "No se pudo ejecutar el editor externo\n"
@@ -1193,6 +1204,7 @@ msgstr "Aplicar plantilla"
msgid "Replace"
msgstr "Reemplazar"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Editar direcci坦n"
@@ -1213,6 +1225,7 @@ msgstr "Debe especificarse una direcci坦n de correo."
msgid "A Name and Value must be supplied."
msgstr "Debe especificarse un Nombre y un Valor"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Editar datos personales"
@@ -1242,6 +1255,7 @@ msgstr "Direcci坦n e-mail"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Arriba"
@@ -1291,7 +1305,7 @@ msgid " Check File "
msgstr " Comprobar fichero "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Fichero"
@@ -1369,7 +1383,7 @@ msgid "Edit JPilot Entry"
msgstr "Editar entrada JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1433,7 +1447,7 @@ msgstr "Tiempo l鱈mite (seg.)"
msgid "Maximum Entries"
msgstr "N尊 entradas m叩ximas"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "B叩sico"
@@ -1491,7 +1505,7 @@ msgid "Exporting file:"
msgstr "Fichero de exportaci坦n:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "Seleccionar..."
@@ -1499,8 +1513,8 @@ msgstr "Seleccionar..."
msgid "Select exporting file"
msgstr "Seleccione fichero de exportaci坦n"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1597,6 +1611,7 @@ msgstr "Creando vista de carpeta...\n"
msgid "New"
msgstr "Nuevos"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "No le鱈dos"
@@ -2069,6 +2084,7 @@ msgstr "Registros :"
msgid "Import LDIF file into Address Book"
msgstr "Importar fichero LDIF a la agenda"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Anterior"
@@ -2292,6 +2308,7 @@ msgstr "Contrase単a"
msgid "Protocol log"
msgstr "Traza del protocolo"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2380,6 +2397,7 @@ msgstr "Mensajes en cola"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hay mensajes sin enviar en la cola. 多Salir ahora?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "ya hay otro Sylpheed ejecut叩ndose.\n"
@@ -2463,6 +2481,7 @@ msgstr "/_Fichero/_Imprimir..."
msgid "/_File/_Work offline"
msgstr "/_Fichero/_Trabajar sin conexi坦n"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Fichero/Sali_r"
@@ -3156,7 +3175,7 @@ msgstr "Incorporar correo nuevo de todas las cuentas"
msgid "Send queued message(s)"
msgstr "Enviar mensaje(s) en la cola"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Componer"
@@ -3664,206 +3683,206 @@ msgstr "mandato no soportado\n"
msgid "error occurred on POP3 session\n"
msgstr "hubo alg炭n error en la sesi坦n POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Encontrado %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Configuraci坦n guardada.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Abriendo ventana de preferencias de cuenta...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Cuenta%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Preferencias para una nueva cuenta"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Preferencias de la cuenta"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Creando ventana de preferencias de cuenta...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Recibir"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privacidad"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avanzadas"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Nombre de esta cuenta"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Cuenta por defecto"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informaci坦n personal"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Nombre completo"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Direcci坦n de correo"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizaci坦n"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informaci坦n del servidor"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Noticias (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Ninguna (local)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Este servidor requiere autentificaci坦n"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Servidor de news"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Servidor de recepci坦n"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Servidor SMTP (enviar)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Usuario"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Contrase単a"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "Usar autentificaci坦n segura (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Eliminar los mensajes del servidor al recibir"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Eliminar despu辿s de"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "d鱈as"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 d鱈as: eliminar inmediatamente)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Descargar todos los mensajes del servidor"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Tama単o l鱈mite para recibir"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "Kb"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrar mensajes al recibir"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Buz坦n por defecto"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Los mensajes sin filtrar se guardar叩n en esta carpeta)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "M辿todo de autentificaci坦n"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Autom叩tica"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Traer todo' comprueba si hay mensajes nuevos en esta cuenta"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Cabecera"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "A単adir campo Fecha"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generar ID-Mensaje"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "A単adir cabecera de usuario"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Editar... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autentificaci坦n"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Autentificaci坦n SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3872,172 +3891,172 @@ msgstr ""
"Si deja estos campos vac鱈os, se utilizar叩 el mismo\n"
"ID de usuario y contrase単a usados para la recepci坦n."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autentificaci坦n con POP3 antes de enviar"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Salida de la orden"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Establecer las siguientes direcciones autom叩ticamente"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Responder a"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Encriptar el mensaje por defecto"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Firmar el mensaje por defecto"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Usar formato ASCII blindado para encriptaci坦n"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Usar firma de texto claro"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Firmar clave"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Usar clave GnuPG por defecto"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Seleccionar clave por direcci坦n de correo"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Especificar clave manualmente"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Usuario o ID clave:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "No usar SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Usar SSL para la conexi坦n POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Usar el mandato STARTTLS para abrir la sesi坦n SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Usar SSL para la conexi坦n IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Usar SSL para la conexi坦n NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Enviar (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Usar SSL para la conexi坦n SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Utilizar SSL no bloqueante"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Deshabil鱈telo si tiene problemas con la conexi坦n SSL)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Puerto SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Puerto POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Puerto IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Puerto NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Nombre del dominio"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Directorio del servidor IMAP4"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Poner mensajes enviados en"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Poner borradores de mensajes en"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Poner mensajes borrados en"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "No se especific坦 el nombre de cuenta."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "No se especific坦 la direcci坦n de correo."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "No se especific坦 el servidor SMTP."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "No se especific坦 el usuario."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "No se especific坦 el servidor POP3."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "No se especific坦 el servidor IMAP4."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "No se especific坦 el servidor NNTP."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4416,6 +4435,7 @@ msgstr "Citar el mensaje al responder"
msgid "Reply button invokes mailing list reply"
msgstr "El bot坦n Responder invoca responder a la lista de correo"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Formato de r辿plica"
@@ -4424,6 +4444,7 @@ msgstr "Formato de r辿plica"
msgid "Quotation mark"
msgstr "Marca de citaci坦n"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Formato de reenvio"
@@ -4452,6 +4473,7 @@ msgstr "Abreviar nombres de grupos con m叩s de"
msgid "letters"
msgstr "letras"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Vista resumen"
@@ -5164,22 +5186,29 @@ msgstr "Responder-A:"
msgid "Mark"
msgstr "Marca"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Adjunto"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Asunto"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Desde"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Fecha"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "N炭mero"
@@ -5581,6 +5610,7 @@ msgstr "Error creando el contexto SSL\n"
msgid "SSL connect failed (%s)\n"
msgstr "Conexi坦n SSL fallida (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5708,10 +5738,12 @@ msgstr "/_Imprimir..."
msgid "M"
msgstr "x"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "N"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "No."
@@ -6016,7 +6048,7 @@ msgstr "Para verificarla, abra el menu contextual con\n"
msgid "right click and select `Check signature'.\n"
msgstr "el bot坦n derecho y seleccione `Verificar firma'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/et.po b/po/et.po
index 0ffae931..dff0f44a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2002-10-02 09:08+0300\n"
"Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -103,7 +103,7 @@ msgstr ""
msgid "Name"
msgstr "Nimi"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokoll"
@@ -185,7 +185,7 @@ msgstr ""
"M辰rgitud tegevust ei saa kasutada kirja kirjutamise aknas,\n"
"sest see sisaldab %%f, %%F v探i %%p-d."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -194,7 +194,8 @@ msgstr ""
"K辰sklust ei suudeta k辰ivitada. Toru loomine eba端nnestus.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -407,6 +408,7 @@ msgstr "Aadressiraamat"
msgid "Name:"
msgstr "Nimi:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -431,6 +433,7 @@ msgstr "Koopia:"
msgid "Bcc:"
msgstr "Pimekoopia:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Kustuta aadress(id)"
@@ -575,7 +578,8 @@ msgstr "EPosti Aadress"
msgid "Group"
msgstr "Grupp"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Kaust"
@@ -599,23 +603,23 @@ msgstr "ldine aadress"
msgid "Personal address"
msgstr "Isiklik aadress"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "M辰rkus"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Hoiatus"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Viga"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "*Loon alert paneeli dialoogi...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "N辰ita seda teadet j辰rgmisel korral"
@@ -647,6 +651,10 @@ msgstr "Roheline"
msgid "Brown"
msgstr "Pruun"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Mittemiski"
@@ -940,7 +948,7 @@ msgid "Recipient is not specified."
msgstr "Saaja pole m辰辰ratud."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Saada"
@@ -1023,6 +1031,7 @@ msgstr "Loon kirjutamise akent...\n"
msgid "MIME type"
msgstr "MIME t端端p"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1068,7 +1077,8 @@ msgstr "Manusta"
msgid "Attach file"
msgstr "Manusta fail"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Allkiri"
@@ -1147,6 +1157,7 @@ msgstr "Ajutine fail: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Ei suutnud v辰list redaktorit k辰ivitada\n"
@@ -1196,6 +1207,7 @@ msgstr "Lisa mall"
msgid "Replace"
msgstr "Asenda"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Redigeeri aadressi"
@@ -1216,6 +1228,7 @@ msgstr "E-Posti aadress tuleb lisada."
msgid "A Name and Value must be supplied."
msgstr "Nimi ja V辰辰rtus tulevad lisada."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Muuda persooni andmeid"
@@ -1245,6 +1258,7 @@ msgstr "E-Posti aadress"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Liiguta 端lesse"
@@ -1294,7 +1308,7 @@ msgid " Check File "
msgstr " Kontrolli faili "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Fail"
@@ -1372,7 +1386,7 @@ msgid "Edit JPilot Entry"
msgstr "Redigeeri JPilot sissekannet"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1436,7 +1450,7 @@ msgstr "Ajalimiit (sek)"
msgid "Maximum Entries"
msgstr "Sissekannete piirarv"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Baas"
@@ -1493,7 +1507,7 @@ msgid "Exporting file:"
msgstr "V辰ljastatav fail:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Vali... "
@@ -1501,8 +1515,8 @@ msgstr " Vali... "
msgid "Select exporting file"
msgstr "Vali v辰ljastatav fail"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1602,6 +1616,7 @@ msgstr "Loon kausta vaate...\n"
msgid "New"
msgstr "Uus"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Pole loetud"
@@ -2083,6 +2098,7 @@ msgstr "Salvestisi :"
msgid "Import LDIF file into Address Book"
msgstr "Impordi LDIF fail aadressiraamatusse"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Eelm"
@@ -2305,6 +2321,7 @@ msgstr "Sisesta parool"
msgid "Protocol log"
msgstr "Protokolli s端ndmustik"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2393,6 +2410,7 @@ msgstr "kirjad j辰rjekorras"
msgid "Some unsent messages are queued. Exit now?"
msgstr "M探ned saatmata kirjad on j辰rjekooras. L探petame?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "端ks teine Sylpheed juba t旦旦tab.\n"
@@ -2485,6 +2503,7 @@ msgstr "/_Fail/_Tr端ki..."
msgid "/_File/_Work offline"
msgstr "/_Fail/L_isa fail"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Fail/_V辰lju"
@@ -3190,7 +3209,7 @@ msgstr "V探ta k探igilt kontodelt uued kirjad"
msgid "Send queued message(s)"
msgstr "Saada kirjad j辰rjekorrast"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Kirjuta"
@@ -3701,207 +3720,207 @@ msgstr "K辰sklus"
msgid "error occurred on POP3 session\n"
msgstr "autoriseerimisel tekkis viga\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Leiti %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "H辰辰lestus on salvestatud.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Avan konto parameetrite akent...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Konto%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Uue konto omadused"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Konto omadused"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Loon konto omaduste akent...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Saabuvad kirjad"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privaatsus"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Spetsiaalne"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Selle konto nimi"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr " M辰辰ra vaikimisi kontoks "
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Isiku informatsioon"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "T辰isnimi"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-Posti aadress"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Ofganisatsioon"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Serveri informatsioon"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Uudised (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Lokaalarvutist"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "See servar n探uab autoriseerimist"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Uudiste server"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Sissetulevate kirjade server"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Saatmise server (SMTP)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Kasutajanimi"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Parool"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "See servar n探uab autoriseerimist"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Kustuta kirjad p辰rast kohalej探udmist serverist"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Eemalda p辰rast"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "p辰eva"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 p辰eva: eemalda kohe)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "V探ta serverist k探ik kirjad"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "T探mbamise suuruse limiit"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtreeri saabuvaid kirju"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Vaikimisi sisendkast"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Autoriseerimise meetod"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automaatne"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "Kui vajutate nuppu 'V探ta k探ik', siis uusi kirju v探etakse ka siia"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "P辰is"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Lisa kuup辰ev p辰isesse"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Loo Kirja-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Lisa kasutaja defineeritud p辰is"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Redigeeri... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autoriseerimine"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP Autoriseerimine (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3910,173 +3929,173 @@ msgstr ""
"Kui te j辰tate need sissekanded t端hjaks, siis \n"
"kasutatakse vastuv探tva kasutaja ID-d ja parooli."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autoriseeri POP3 enne saatmist"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "K辰sklus"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "S辰ti j辰rgmised aadressid automaatselt"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Vastus saata"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Vaikimisi tuleb kiri kr端pteerida"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Vaikimisi tuleb kiri allkirjastada"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Kasuta ASCII-ga varustatud kr端pteerimise formaati"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Kasuta seleget teksti allkirja"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Allkirja v探ti"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Kasuta algset GnuPG v探tit"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Vali v探ti elektronposti aadressi juurest"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "M辰辰ra v探ti k辰sitsi"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Kasutaja v探i v探tme ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "ra kasuta SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Kasuta SSL-i POP3-e 端henduse jaoks"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Kasuta STARTTLS k辰sklust et alustada SSL sessiooni"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Kasuta SSL-i IMAP4-ja 端henduse jaoks"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Kasuta SSL-i NNTP 端henduse loomisel"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Saada (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Kasuta SSL-i SMTP 端henduse jaoks"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "M辰辰ra SMTP port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "M辰辰ra POP3 port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "M辰辰ra IMAP4 port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "M辰辰ra NNTP port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "M辰辰ra domeeni nimi"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP serveri kataloog"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Pane saadetud kirjad"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Pane mustandi kirjad"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Pane kustutatud kirjad"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Konto nime ei ole sisestatud."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Postiaadressi ei ole sisestatud."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP serverit ei ole sisestatud."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Kasutajanime ei ole sisestatud."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 serverit ei ole sisestatud."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 serverit ei ole sisestatud"
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP serverit ei ole sisestatud."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4451,6 +4470,7 @@ msgstr "Kirjale vastamisel tsiteeri seda."
msgid "Reply button invokes mailing list reply"
msgstr "Vasta nupp k辰ivitab vastamise kirjalisti"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Vastuse formaat"
@@ -4459,6 +4479,7 @@ msgstr "Vastuse formaat"
msgid "Quotation mark"
msgstr "Tsitaadi m辰rk"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Edasta formaat"
@@ -4487,6 +4508,7 @@ msgstr "l端henda uudistegruppe, mis on pikemad kui"
msgid "letters"
msgstr "t辰hte"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Kirjaloendi vaade"
@@ -5228,22 +5250,29 @@ msgstr "Vastus saata"
msgid "Mark"
msgstr "M辰rk"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Manus"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Pealkiri"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Kellelt"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Kuup辰ev"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Number"
@@ -5648,6 +5677,7 @@ msgstr "Viga ssl konteksti loomisel\n"
msgid "SSL connect failed (%s)\n"
msgstr "hendamine SSL-iga eba探nnestus (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5776,10 +5806,12 @@ msgstr "Tr端ki..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Ei."
@@ -6087,7 +6119,7 @@ msgstr "Et seda kontrollida, ava kontekstimen端端 tehes\n"
msgid "right click and select `Check signature'.\n"
msgstr "paremkl探ps ja vali `kontrolli signatuur'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/fr.po b/po/fr.po
index 2289d024..ab65cb88 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-12-09 20:16+0100\n"
"Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
msgid "Name"
msgstr "Nom"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocole"
@@ -195,7 +195,7 @@ msgstr ""
"L'action s辿lectionn辿e ne peut 棚tre utilis辿e partir de la\n"
"fen棚tre de composition car elle contient %%f, %%F ou %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -204,7 +204,8 @@ msgstr ""
"La commande n'a pu 棚tre lanc辿e. chec lors de la cr辿ation\n"
"d'une connexion 束 pipe 損 : %s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -419,6 +420,7 @@ msgstr "Carnet d'adresses"
msgid "Name:"
msgstr "Nom :"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -443,6 +445,7 @@ msgstr "Copie :"
msgid "Bcc:"
msgstr "Copie discr竪te :"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Suppression d'adresse(s)"
@@ -591,7 +594,8 @@ msgstr "Adresse 辿lectronique"
msgid "Group"
msgstr "Groupe"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Dossier"
@@ -615,23 +619,23 @@ msgstr "Adresse courante :"
msgid "Personal address"
msgstr "Adresse personnelle :"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Information"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Avertissement"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Erreur"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Cr辿ation du dialogue d'alerte...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Afficher ce message la prochaine fois"
@@ -663,6 +667,10 @@ msgstr "Vert"
msgid "Brown"
msgstr "Brun"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Aucun"
@@ -949,7 +957,7 @@ msgid "Recipient is not specified."
msgstr "Destinataire non sp辿cifi辿."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Envoyer"
@@ -1031,6 +1039,7 @@ msgstr "Cr辿ation de la fen棚tre de composition...\n"
msgid "MIME type"
msgstr "Type MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1076,7 +1085,8 @@ msgstr "Joindre"
msgid "Attach file"
msgstr "Joindre un fichier"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Signature"
@@ -1154,6 +1164,7 @@ msgstr "Fichier temporaire : %s"
msgid "Compose: input from monitoring process\n"
msgstr "Compose : entr辿e partir d'une surveillance de traitement\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Impossible de lancer l'辿diteur externe\n"
@@ -1205,6 +1216,7 @@ msgstr "Appliquer un mod竪le"
msgid "Replace"
msgstr "Remplacer"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "dition d'une adresse"
@@ -1225,6 +1237,7 @@ msgstr "L'adresse 辿lectronique est obligatoire."
msgid "A Name and Value must be supplied."
msgstr "Un nom et une valeur doivent 棚tre donn辿s."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "dition des coordonn辿es d'une personne"
@@ -1254,6 +1267,7 @@ msgstr "Adresse 辿lectronique"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Plus haut"
@@ -1303,7 +1317,7 @@ msgid " Check File "
msgstr " V辿rifier le fichier "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Fichier"
@@ -1382,7 +1396,7 @@ msgid "Edit JPilot Entry"
msgstr "dition de donn辿es JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1446,7 +1460,7 @@ msgstr "D辿lai d'attente (secs)"
msgid "Maximum Entries"
msgstr "Nombre maximal d'entr辿es"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "G辿n辿ral"
@@ -1504,7 +1518,7 @@ msgid "Exporting file:"
msgstr "Fichier mbox :"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Choisir... "
@@ -1512,8 +1526,8 @@ msgstr " Choisir... "
msgid "Select exporting file"
msgstr "S辿lection du fichier export辿"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1610,6 +1624,7 @@ msgstr "Cr辿ation de la vue des dossiers...\n"
msgid "New"
msgstr "Nouveau"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Non lu"
@@ -2085,6 +2100,7 @@ msgstr "Enregistrements :"
msgid "Import LDIF file into Address Book"
msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Pr辿c辿dent"
@@ -2308,6 +2324,7 @@ msgstr "Saisissez le mot de passe"
msgid "Protocol log"
msgstr "Journal de connexion"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2402,6 +2419,7 @@ msgstr ""
"Quelques messages non envoy辿s sont dans la file d'attente. Quitter "
"maintenant ?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "une autre session de Sylpheed existe.\n"
@@ -2487,6 +2505,7 @@ msgstr "/_Fichier/Im_primer..."
msgid "/_File/_Work offline"
msgstr "/_Fichier/_Travailler d辿connect辿"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Fichier/_Quitter"
@@ -3180,7 +3199,7 @@ msgstr "Relever le courrier de tous les comptes"
msgid "Send queued message(s)"
msgstr "Envoyer les messages en attente"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Composer"
@@ -3690,206 +3709,206 @@ msgstr "commande non support辿e\n"
msgid "error occurred on POP3 session\n"
msgstr "Une erreur est survenue pendant la session POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Trouv辿 : %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "La configuration est enregistr辿e.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Ouverture de la fen棚tre de configuration du compte...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Compte%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Configuration du nouveau compte"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Configuration du compte"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Cr辿ation de la fen棚tre de configuration du compte...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "R辿ception"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Confidentialit辿"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avanc辿e"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Nom du compte"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "D辿finir comme compte par d辿faut"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informations personnelles"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Nom complet"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Adresse 辿lectronique"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organisation"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Configuration des serveurs"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Aucun (local)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Ce serveur n辿cessite une authentification"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Serveur de groupes de discussion"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Serveur de r辿ception"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Serveur SMTP (envoi)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Nom de l'utilisateur"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Mot de passe"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "Utiliser l'authentification s辿curis辿e (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Suppression des messages du serveur apr竪s r辿ception"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Supprimer apr竪s"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "jours"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 jours : supprimer imm辿diatement)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "R辿ception de tous les messages sur le serveur"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Taille maximale pour la r辿ception"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "Ko"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrage des messages la r辿ception"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Bo樽te de r辿ception par d辿faut"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Les messages non filtr辿s seront plac辿s dans ce dossier)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "M辿thode d'authentification"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatique"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "束 Tout relever 損 rel竪ve le courrier pour ce compte"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "En-t棚te"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Ajouter un champ 束 Date 損 l'en-t棚te"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "G辿n辿ration d'un Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Ajouter des en-t棚tes suppl辿mentaires"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Modifier... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Authentification"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Authentification SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3898,172 +3917,172 @@ msgstr ""
"Laissez ces champs vides pour utiliser le nom d'utilisateur \n"
"et le mot de passe sp辿cifi辿s pour la r辿ception."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "S'authentifier sur le POP3 avant l'envoi"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Sortie"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "D辿finition automatique des adresses suivantes"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Copie"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Copie discr竪te"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "R辿pondre "
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Chiffrer le message par d辿faut"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Signer le message par d辿faut"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Utiliser le format ASCII-arm辿 pour le chiffrement"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Utiliser une signature non chiffr辿e"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Cl辿 de signature"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Utiliser la cl辿 par d辿faut de GnuPG"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "S辿lectionner la cl辿 en fonction de l'adresse 辿lectronique"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Indiquer manuellement la cl辿"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Utilisateur ou identificateur (ID) de cl辿 :"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Ne pas utiliser SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Utiliser SSL pour les connexions POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Utiliser SSL pour les connexions IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Utiliser SSL pour les connexions NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Envoi (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Utiliser SSL pour les connexions SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Utiliser SSL non-bloquant"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(d辿sactivez ceci si vous rencontrez des probl竪mes de connexion SSL)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Indiquer le port SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Indiquer le port POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Indiquer le port IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Indiquer le port NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Indiquer le nom de domaine"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "R辿pertoire IMAP4"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Placer les messages envoy辿s dans"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Placer les brouillons dans"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Placer les messages supprim辿s dans"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Nom du compte non indiqu辿."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Adresse 辿lectronique non saisie."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Serveur SMTP non indiqu辿."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Nom d'utilisateur manquant."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Serveur POP3 non indiqu辿."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Serveur IMAP4 non indiqu辿."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Serveur NNTP non indiqu辿."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4443,6 +4462,7 @@ msgstr "Citer le message en r辿pondant"
msgid "Reply button invokes mailing list reply"
msgstr "Le bouton r辿pondre agit pour la liste de diffusion"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Citation lors d'une r辿ponse"
@@ -4451,6 +4471,7 @@ msgstr "Citation lors d'une r辿ponse"
msgid "Quotation mark"
msgstr "Caract竪re de citation"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Citation lors d'un transfert"
@@ -4479,6 +4500,7 @@ msgstr "Abr辿ger les noms des groupes de discussion de plus de"
msgid "letters"
msgstr "lettres"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "R辿sum辿 des messages"
@@ -5194,22 +5216,29 @@ msgstr "R辿pondre :"
msgid "Mark"
msgstr "Marque"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Pi竪ces jointes"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Sujet"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Exp辿diteur"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Date"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Num辿ro"
@@ -5612,6 +5641,7 @@ msgstr "Erreur lors de la cr辿ation du contexte SSL\n"
msgid "SSL connect failed (%s)\n"
msgstr "chec de la connexion SSL (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5739,10 +5769,12 @@ msgstr "/Im_primer..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "N属"
@@ -6049,7 +6081,7 @@ msgstr "Pour la v辿rifier, ouvrir le menu contextuel avec\n"
msgid "right click and select `Check signature'.\n"
msgstr "un clic droit et s辿lectionner 束 V辿rifier la signature 損.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/gl.po b/po/gl.po
index 2b27609c..ba4e6c53 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-01-17 10:05+0100\n"
"Last-Translator: Jorge Rivas\n"
"Language-Team: Jorge Rivas\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr "Nome"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocolo"
@@ -187,7 +187,7 @@ msgstr ""
"a acci坦n seleccionada non se pode utilizar na fiestra de\n"
"composici坦n porque conten %%f, %%F o %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"Non se pudo iniciar o comando. Fallou a creaci坦n da tuber鱈a.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -409,6 +410,7 @@ msgstr "Axenda de enderezos"
msgid "Name:"
msgstr "Nome:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -433,6 +435,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Borrar enderezo(s)"
@@ -578,7 +581,8 @@ msgstr "Enderezo e-mail"
msgid "Group"
msgstr "Grupo"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Carpeta"
@@ -602,23 +606,23 @@ msgstr "Enderezo com炭n"
msgid "Personal address"
msgstr "Enderezo persoal"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Notificaci坦n"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Erro"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Creando o di叩logo de alerta...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Mostrar este mensaxe de novo"
@@ -650,6 +654,10 @@ msgstr "Verde"
msgid "Brown"
msgstr "Marr坦n"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ning炭n"
@@ -943,7 +951,7 @@ msgid "Recipient is not specified."
msgstr "Non se especificou o destinatario."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Enviar"
@@ -1026,6 +1034,7 @@ msgstr "Creando fiestra de composicion...\n"
msgid "MIME type"
msgstr "Tipo MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1071,7 +1080,8 @@ msgstr "Adxuntar"
msgid "Attach file"
msgstr "Adxuntar ficheiro"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Sinatura"
@@ -1149,6 +1159,7 @@ msgstr "Ficheiro temporal: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Compo単er: entrada dende proceso monitor\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Non se puido executar o editor externo\n"
@@ -1198,6 +1209,7 @@ msgstr "Aplicar plantilla"
msgid "Replace"
msgstr "Substitu鱈r"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Editar enderezo"
@@ -1218,6 +1230,7 @@ msgstr "Debe especificarse un enderezo de correo."
msgid "A Name and Value must be supplied."
msgstr "Debe especificarse un Nome e un Valor"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Editar datos persoais"
@@ -1247,6 +1260,7 @@ msgstr "Enderezo e-mail"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Arriba"
@@ -1296,7 +1310,7 @@ msgid " Check File "
msgstr " Comprobar ficheiro "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Ficheiro"
@@ -1374,7 +1388,7 @@ msgid "Edit JPilot Entry"
msgstr "Editar entrada JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1438,7 +1452,7 @@ msgstr "Tiempo l鱈mite (seg.)"
msgid "Maximum Entries"
msgstr "N尊 entradas m叩ximas"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Basico"
@@ -1496,7 +1510,7 @@ msgid "Exporting file:"
msgstr "Ficheiro de exportaci坦n:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "Seleccionar..."
@@ -1504,8 +1518,8 @@ msgstr "Seleccionar..."
msgid "Select exporting file"
msgstr "Seleccione ficheiro de exportaci坦n"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1604,6 +1618,7 @@ msgstr "Creando vista de carpeta...\n"
msgid "New"
msgstr "Novos"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Non le鱈dos"
@@ -2081,6 +2096,7 @@ msgstr "Rexistros :"
msgid "Import LDIF file into Address Book"
msgstr "Importar ficheiro LDIF na axenda"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Anterior"
@@ -2307,6 +2323,7 @@ msgstr "Contrasinal"
msgid "Protocol log"
msgstr "Rexistro do protocolo"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2395,6 +2412,7 @@ msgstr "Mensaxes en cola"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hai mensaxes sin enviar na cola. 多Sair agora?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "xa hai outro Sylpheed execut叩ndose.\n"
@@ -2487,6 +2505,7 @@ msgstr "/_Ficheiro/_Imprimir"
msgid "/_File/_Work offline"
msgstr "/_Ficheiro/_Inserir ficheiro"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Ficheiro/Sai_r"
@@ -3193,7 +3212,7 @@ msgstr "Incorporar correo novo de todas as contas"
msgid "Send queued message(s)"
msgstr "Enviar mensaxe(s) na cola"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Compo単er"
@@ -3702,207 +3721,207 @@ msgstr "Comando non soportado\n"
msgid "error occurred on POP3 session\n"
msgstr "ocurriu alg炭n erro na sesi坦n POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Atopado %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Configuraci坦n gardada.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Abrindo Fiestra de preferencias de conta...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "conta%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Preferencias para unha nova conta"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Preferencias da conta"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Creando Fiestra de preferencias de conta...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Recibir"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privacidad"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avanzadas"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Nome desta conta"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "conta por defecto"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informaci坦n persoal"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Nome completo"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Enderezo de correo"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizaci坦n"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informaci坦n do servidor"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Novas (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Ningunha (local)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Este servidor require autenticaci坦n"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Servidor de novas"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Servidor de recepci坦n"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Servidor SMTP (enviar)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Usuario"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Contrasinal"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Este servidor require autenticaci坦n"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Eliminar mensaxes do servidor 坦 recibir"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Eliminar despois de"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "d鱈as"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 d鱈as: eliminar inmediatamente)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Descargar todas as mensaxes do servidor"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Tama単o l鱈mite para recibir"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrar mensaxes 坦 recibir"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Caixa de correo por defecto"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(As mensaxes sen filtrar gardar叩nse nesta carpeta)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "M辿todo de autenticaci坦n"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Autom叩tica"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Cabeceira"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Engadir campo Data"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Xenerar ID-Mensaxe"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Engadir cabeceira de usuario"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Editar... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autenticaci坦n"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Autenticaci坦n SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3911,173 +3930,173 @@ msgstr ""
"Si deixa estes campos valeiros, utilizar叩se o mesmo\n"
"ID de usuario e contrasinal usados para a recepci坦n."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autenticaci坦n con POP3 antes de enviar"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Saida do comando"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Establecer os seguintes enderezos autom叩ticamente"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Respostar a"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Encriptar a mensaxe por defecto"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Asinar a mensaxe por defecto"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Usar formato ASCII blindado para encriptaci坦n"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Usar sinatura de texto claro"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Asinar clave"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Usar clave GnuPG por defecto"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Seleccionar clave por direcci坦n de correo"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Especificar clave manualmente"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Usuario ou ID clave:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Non usar SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Usar SSL para a conexi坦n POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Usar o comando STARTTLS para abrir a sesi坦n SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Usar SSL para a conexi坦n IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Usar SSL para a conexi坦n NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Enviar (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Usar SSL para a conexi坦n SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Porto SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Porto POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Porto IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Porto NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Nome do dominio"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Directorio do servidor IMAP4"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Po単er mensaxes enviadas en"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Po単er borradores de mensaxes en"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Po単er mensaxes borradas en"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Non se especificou o nome de conta."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Non se especificou o enderezo de correo."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Non se especificou o servidor SMTP."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Non se especificou o usuario."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Non se especificou o servidor POP3."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Non se especificou o servidor IMAP4."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Non se especificou o servidor NNTP."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4451,6 +4470,7 @@ msgstr "Citar a mensaxe 坦 respostar"
msgid "Reply button invokes mailing list reply"
msgstr "o bot坦n Respostar invoca respostar 叩 lista de correo"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Formato de r辿plica"
@@ -4459,6 +4479,7 @@ msgstr "Formato de r辿plica"
msgid "Quotation mark"
msgstr "Marca de citaci坦n"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Formato de reenvio"
@@ -4487,6 +4508,7 @@ msgstr "Abreviar nomes de grupos con mais de"
msgid "letters"
msgstr "letras"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Vista resumo"
@@ -5226,22 +5248,29 @@ msgstr "Respostar-A:"
msgid "Mark"
msgstr "Marca"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Adxunto"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Asunto"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Dende"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Data"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "N炭mero"
@@ -5644,6 +5673,7 @@ msgstr "Error creando o contexto SSL\n"
msgid "SSL connect failed (%s)\n"
msgstr "Conexi坦n SSL fallida (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5772,10 +5802,12 @@ msgstr "/_Imprimir..."
msgid "M"
msgstr "x"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "N"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Non."
@@ -6083,7 +6115,7 @@ msgstr "Para verificarla, abra o menu contextual con\n"
msgid "right click and select `Check signature'.\n"
msgstr "o bot坦n dereito e seleccione `Verificar sinatura'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/hr.po b/po/hr.po
index 8c0716c0..818faa7e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2001-09-17 13:22+0100\n"
"Last-Translator: Ante Karamati <ante@cdnet.com.hr>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -104,7 +104,7 @@ msgstr ""
msgid "Name"
msgstr "Ime"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -186,14 +186,15 @@ msgid ""
"because it contains %%f, %%F or %%p."
msgstr ""
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
"%s"
msgstr ""
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, fuzzy, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -406,6 +407,7 @@ msgstr "Adresar"
msgid "Name:"
msgstr "Ime:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -430,6 +432,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Obri邸i adresu/e"
@@ -567,7 +570,8 @@ msgstr "E-mail adresa"
msgid "Group"
msgstr "Grupa"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Spis"
@@ -592,23 +596,23 @@ msgstr "Uobiajene adrese"
msgid "Personal address"
msgstr "Osobne adrese"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Obavijest"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Upozorenje"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Gre邸ka"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Stvaram suelje za upozoravajui prozor...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Prika転i ovu poruku slijedei put"
@@ -640,6 +644,10 @@ msgstr "Zelena"
msgid "Brown"
msgstr "Smea"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ni邸ta"
@@ -946,7 +954,7 @@ msgid "Recipient is not specified."
msgstr "Nije upisan primatelj."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Po邸alji"
@@ -1027,6 +1035,7 @@ msgstr "Stvaram prozor za pisanje...\n"
msgid "MIME type"
msgstr "MIME tip"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1072,7 +1081,8 @@ msgstr "Prilo転i"
msgid "Attach file"
msgstr "Prilo転i datoteku"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Potpis"
@@ -1152,6 +1162,7 @@ msgstr "Privremena datoteka: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Napi邸i: unos iz procesa motrenja\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Ne mogu pokrenuti vanjski ureiva\n"
@@ -1203,6 +1214,7 @@ msgstr "Bri邸i obrazac"
msgid "Replace"
msgstr "Obrazac"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Uredi adresu"
@@ -1223,6 +1235,7 @@ msgstr "E-mail adresa nije upisana."
msgid "A Name and Value must be supplied."
msgstr "Ime i iznos moraju biti upisani."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Uredi osobne podatke"
@@ -1252,6 +1265,7 @@ msgstr "E-mail adresa"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Pomakni gore"
@@ -1301,7 +1315,7 @@ msgid " Check File "
msgstr " Provjeri datoteku "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Datoteka"
@@ -1379,7 +1393,7 @@ msgid "Edit JPilot Entry"
msgstr "Uredite JPilot unos"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1443,7 +1457,7 @@ msgstr "Timeout (sek)"
msgid "Maximum Entries"
msgstr "Max. Unos"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Osnovno"
@@ -1500,7 +1514,7 @@ msgid "Exporting file:"
msgstr "Iznosim datoteku:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Odaberite... "
@@ -1508,8 +1522,8 @@ msgstr " Odaberite... "
msgid "Select exporting file"
msgstr "Odaberite datoteku za izno邸enje"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1612,6 +1626,7 @@ msgstr "Stvaram spisni pregled...\n"
msgid "New"
msgstr "Novo"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Neproitano"
@@ -2105,6 +2120,7 @@ msgstr ""
msgid "Import LDIF file into Address Book"
msgstr "Unesi LDIF datoteku u Adresar"
+#. Button panel
#: src/importldif.c:760
#, fuzzy
msgid "Prev"
@@ -2335,6 +2351,7 @@ msgstr "Unesite lozinku"
msgid "Protocol log"
msgstr "Zapis protokola"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2422,6 +2439,7 @@ msgstr "Odlo転ene poruke"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Neke neposlane poruke su odlo転ene. Izai odmah?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "drugi Sylpheed ve radi.\n"
@@ -2514,6 +2532,7 @@ msgstr "/_Datoteka/Is_pi邸i..."
msgid "/_File/_Work offline"
msgstr "/_Datoteka/_Unesi datoteku"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Datoteka/I_zlaz"
@@ -3291,7 +3310,7 @@ msgstr "Prima novu po邸tu sa svih rauna"
msgid "Send queued message(s)"
msgstr "alje odlo転ene poruke"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Kreiraj"
@@ -3806,389 +3825,389 @@ msgstr "Naredba"
msgid "error occurred on POP3 session\n"
msgstr "gre邸ka prilikom ovjeravanja\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Pronaen %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfiguracija je spremljena.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Otvaram prozor za postavke rauna...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Raun%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Postavke za novi raun"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Postavke rauna"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Kreiram prozor za postvake rauna...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Primanje"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privatnost"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Napredno"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Ime ovog rauna"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Postavi kao uobiajeni"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Osobne informacije"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Puno ime"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-mail adresa"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizacija"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informacije o poslu転itelju"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Ni邸ta (lokalno)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Ovaj server zahtijeva autorizaciju"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "News poslu転itelj"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Poslu転itelj za primanje"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP poslu転itelj (slanje)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "ID korisnika"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Lozinka"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Ovaj server zahtijeva autorizaciju"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Ukloni poruke sa poslu転itelja nakon primanja"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
#, fuzzy
msgid "Remove after"
msgstr "Ukloni spis"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
#, fuzzy
msgid "days"
msgstr "Uvijek"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr ""
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Primi sve poruke sa poslu転itelja"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr ""
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtriraj poruke pri primanju"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Uobiajeni sandui"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Nefiltrirane poruke biti e spremljene u ovaj spis)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
#, fuzzy
msgid "Authentication method"
msgstr "Autorizacija"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr ""
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
#, fuzzy
msgid "`Get all' checks for new messages on this account"
msgstr "`Primi sve' uzima po邸tu s ovog rauna"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Zaglavlje"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Dodaj polje Datum u zaglavlje"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generiraj ID poruke"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Dodatna zaglavlja"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Uredi... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autorizacija"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP autorizacija (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autoriziraj s POP3 prije slanja"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Naredba"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automatski postavi slijedee adrese"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Odvovori-Na"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Uvijek kriptiraj poruke"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Uvijek potpi邸i poruke"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr ""
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
#, fuzzy
msgid "Use clear text signature"
msgstr "Unesi potpis"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Klju potpisa"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Koristi uobiajeni GnuPG klju"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Odaberi klju po e-mail adresi"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Neki drugi klju"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "ID kljua ili korisnika:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Ne koristi SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Koristi SSL za POP3 veze"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Koristi SSL za IMAP4 veze"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr ""
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
#, fuzzy
msgid "Use SSL for NNTP connection"
msgstr "Koristi SSL za SMTP veze"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Slanje (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Koristi SSL za SMTP veze"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Specificirani SMTP port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Specificirani POP3 port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Specificirani IMAP4 port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Specificirani NNTP port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Specificirano ime domene"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Direktorij IMAP poslu転itelja"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
#, fuzzy
msgid "Put sent messages in"
msgstr "Spremi poslane poruke u poslano"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
#, fuzzy
msgid "Put draft messages in"
msgstr "Sa転mi poruke na"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
#, fuzzy
msgid "Put deleted messages in"
msgstr "Obri邸i poruku/e"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
#, fuzzy
msgid "Account name is not entered."
msgstr "E-mail adresa nije upisana."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "E-mail adresa nije upisana."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP poslu転itelj nije upisan."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "ID korisnika nije upisan."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 poslu転itelj nije upisan."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 poslu転itelj nije upisan."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP poslu転itelj nije upisan."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4553,6 +4572,7 @@ msgstr "Citiraj poruku pri odgovaranju"
msgid "Reply button invokes mailing list reply"
msgstr "/Odgovori svi_ma"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Format odgovora"
@@ -4561,6 +4581,7 @@ msgstr "Format odgovora"
msgid "Quotation mark"
msgstr "Oznaka citata"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Format prosljeivanja"
@@ -4590,6 +4611,7 @@ msgstr ""
msgid "letters"
msgstr "Obri邸i"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Pregled odr転avanja"
@@ -5322,22 +5344,29 @@ msgstr "Odvovori-Na"
msgid "Mark"
msgstr "Oznaka"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Prilog"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Tema"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Od"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Broj"
@@ -5745,6 +5774,7 @@ msgstr "Gre邸ka pri kreiranju ssl konteksta\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL veza propala (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5878,10 +5908,12 @@ msgstr "/Is_pi邸i"
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Ne."
@@ -6194,7 +6226,7 @@ msgstr "Za prvojeru, podignite kontekst menu s\n"
msgid "right click and select `Check signature'.\n"
msgstr "desnom tipkom i odaberite `Provjeri potpis'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/hu.po b/po/hu.po
index 8e1353b7..46ff5811 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-07-26 22:58-0100\n"
"Last-Translator: Zahemszky G叩bor <Gabor@Zahemszky.HU>\n"
"Language-Team: Hungarian <gnome-hu@gnome.org>\n"
@@ -107,7 +107,7 @@ msgstr ""
msgid "Name"
msgstr "N辿v"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokoll"
@@ -189,7 +189,7 @@ msgstr ""
"A kiv叩lasztott m撤velet nem alkalmazhat坦 szerkesztablakban\n"
"mert tartalmaz %%f-t, %%F-t vagy %%p-t."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -198,7 +198,8 @@ msgstr ""
"A parancsot nem siker端lt elind鱈tani. Csvezet辿k l辿trehoz叩sa sikertelen.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -414,6 +415,7 @@ msgstr "C鱈mjegyz辿k"
msgid "Name:"
msgstr "N辿v:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -438,6 +440,7 @@ msgstr "M叩solat:"
msgid "Bcc:"
msgstr "Titkos m叩solat:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "C鱈m(ek) t旦rl辿se"
@@ -579,7 +582,8 @@ msgstr "E-mail c鱈m"
msgid "Group"
msgstr "Csoport"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Mappa"
@@ -603,23 +607,23 @@ msgstr "ltal叩nos c鱈m"
msgid "Personal address"
msgstr "Szem辿lyes c鱈m"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Megjegyz辿s"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Figyelmeztet辿s"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Hiba"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Figyelmeztetpanel dial坦gus l辿trehoz叩sa...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Mutasd ezt az 端zenetet legk旦zelebb"
@@ -651,6 +655,10 @@ msgstr "Z旦ld"
msgid "Brown"
msgstr "Barna"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Semmi"
@@ -943,7 +951,7 @@ msgid "Recipient is not specified."
msgstr "Nincs c鱈mzett."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "K端ld辿s"
@@ -1027,6 +1035,7 @@ msgstr "Szerkesztablak l辿trehoz叩sa...\n"
msgid "MIME type"
msgstr "MIME t鱈pus"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1072,7 +1081,8 @@ msgstr "Csatol叩s"
msgid "Attach file"
msgstr "F叩jl csatol叩sa"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Al叩鱈r叩s"
@@ -1150,6 +1160,7 @@ msgstr "Ideiglenes f叩jl: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Szerkeszt辿s: bemenet a monitoroz坦 processzbl\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "K端ls szerkeszt nem ind鱈that坦\n"
@@ -1199,6 +1210,7 @@ msgstr "Sablon alkalmaz叩sa"
msgid "Replace"
msgstr "Helyettes鱈t"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "C鱈m szerkeszt辿se"
@@ -1219,6 +1231,7 @@ msgstr "Egy E-mail c鱈met meg kell adni."
msgid "A Name and Value must be supplied."
msgstr "Nevet 辿s 辿rt辿ket kell adni."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Szem辿ly adatainak szerkeszt辿se"
@@ -1248,6 +1261,7 @@ msgstr "E-mail c鱈m"
msgid "Alias"
msgstr "ln辿v"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Mozgat叩s fel"
@@ -1297,7 +1311,7 @@ msgid " Check File "
msgstr " F叩jl ellenrz辿se"
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "F叩jl"
@@ -1375,7 +1389,7 @@ msgid "Edit JPilot Entry"
msgstr "JPilot bejegyz辿s szerkeszt辿se"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1439,7 +1453,7 @@ msgstr "Idt炭ll辿p辿s (sec)"
msgid "Maximum Entries"
msgstr "Maxim叩lis bejegyz辿sek"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Alap"
@@ -1497,7 +1511,7 @@ msgid "Exporting file:"
msgstr "Export f叩jlba:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Kiv叩laszt... "
@@ -1505,8 +1519,8 @@ msgstr " Kiv叩laszt... "
msgid "Select exporting file"
msgstr "Export叩land坦 f叩jl v叩laszt叩s"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1605,6 +1619,7 @@ msgstr "Mappa n辿zet l辿trehoz叩sa...\n"
msgid "New"
msgstr "j"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Olvasatlan"
@@ -2079,6 +2094,7 @@ msgstr "Rekordok:"
msgid "Import LDIF file into Address Book"
msgstr "LDIF f叩jl import叩l叩sa a c鱈mjegyz辿kbe"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Elz"
@@ -2304,6 +2320,7 @@ msgstr "K辿rem a jelsz坦t"
msgid "Protocol log"
msgstr "Protokoll napl坦"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2392,6 +2409,7 @@ msgstr "V叩rakoz坦 端zenetek"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Vannak elk端ldetlen 端zenetek. Kil辿p辿s most?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "Egy m叩sik Sylpheed m叩r fut.\n"
@@ -2484,6 +2502,7 @@ msgstr "/_F叩jl/_Nyomtat叩s..."
msgid "/_File/_Work offline"
msgstr "/_F叩jl/F叩jl _besz炭r叩sa"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_F叩jl/_Kil辿p辿s"
@@ -3189,7 +3208,7 @@ msgstr "j E-mail fogad叩sa minden hozz叩f辿r辿sen"
msgid "Send queued message(s)"
msgstr "V叩rakoz坦 sorb坦l 端zenet(ek) k端ld辿se"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Szerkeszt辿s"
@@ -3699,207 +3718,207 @@ msgstr "A parancs nem t叩mogatott\n"
msgid "error occurred on POP3 session\n"
msgstr "hiba t旦rt辿nt a POP3 kapcsolat k旦zben\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Tal叩ltam %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Be叩ll鱈t叩sok t叩rolva.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Hozz叩f辿r辿sek be叩ll鱈t叩sa...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Hozz叩f辿r辿s%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "j hozz叩f辿r辿s be叩ll鱈t叩sai"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Hozz叩f辿r辿s be叩ll鱈t叩sok"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Hozz叩f辿r辿sek be叩ll鱈t叩sa ablak megnyit叩sa...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Fogad叩s"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Mag叩nszf辿ra"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Halad坦"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Hozz叩f辿r辿s neve"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Alap辿rtelmz辿sk辿nt be叩ll鱈t叩s"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Szem辿lyes inform叩ci坦"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Teljes n辿v"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-mail c鱈m"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Szervezet"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Szerver inform叩ci坦"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "H鱈rek (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Semmi (lok叩lis)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Ezen a szerveren k旦telez az azonos鱈t叩s"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "H鱈rszerver"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Szerver fogad叩shoz"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP szerver (k端ld辿s)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Felhaszn叩l坦i Azonos鱈t坦"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Jelsz坦"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Ezen a szerveren k旦telez az azonos鱈t叩s"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "zenetek t旦rl辿se a szerverrl fogad叩s ut叩n"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Elt叩vol鱈t叩s ut叩na"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "nap"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 nap: azonnal elt叩vol鱈tani)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Minden 端zenet let旦lt辿se a szerverrl"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Fogadott lev辿l m辿retkorl叩t"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "zenetek sz撤r辿se fogad叩s k旦zben"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Alap辿rtelmezett bej旦v postafi坦k"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(A nem sz撤rt 端zenetek ebbe a mapp叩ba ker端lnek)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Azonos鱈t叩si m坦dszer"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatikus"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Mindent fogad' ellenrizze ezt a hozz叩f辿r辿st is"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Fejl辿c"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "D叩tum fejl辿c mez hozz叩ad叩s"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "zenet-azonos鱈t坦 gener叩l叩sa"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Felhaszn叩l坦 叩ltal defini叩lt fejl辿c hozz叩ad叩sa"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Szerkeszt辿s... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Azonos鱈t叩s"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP Azonos鱈t叩s (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3908,172 +3927,172 @@ msgstr ""
"Ha ezeket a mezket 端resen hagyod, a levelek fogad叩s叩hoz\n"
"haszn叩latos felhaszn叩l坦i azonos鱈t坦t 辿s jelsz坦t fogom haszn叩lni."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Azonos鱈t叩s k端ld辿s eltti POP3-mal"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Parancskimenet"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Az al叩bbi c鱈mek automatikus be叩ll鱈t叩sa"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "M叩solat"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Titkos m叩solat"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "V叩lasz"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "zenetet mindig titkos鱈tsa"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "zenetet mindig 鱈rja al叩 digit叩lisan"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "ASCII-p叩nc辿lozott form叩tum haszn叩lata titkos鱈t叩shoz"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Sz旦veges al叩鱈r叩s haszn叩lata"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Digit叩lis al叩鱈r叩s kulcs"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Alap辿rtelmezett GnuPG kulcs haszn叩lata"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Kulcs v叩laszt叩s E-mail c鱈med alapj叩n"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Kulcs k辿zi megad叩sa"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Felhaszn叩l坦 vagy kulcs Azonos鱈t坦:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Nem haszn叩l SSL-t"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "SSL haszn叩lata POP3 kapcsolathoz"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "STARTTLS parancs haszn叩lata SSL kapcsolat ind鱈t叩s叩hoz"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "SSL haszn叩lata IMAP4 kapcsolathoz"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "SSL haszn叩lata NNTP kapcsolathoz"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "K端ld辿s (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SSL haszn叩lata SMTP kapcsolathoz"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Nem-blokkol坦d坦 SSL haszn叩lata"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Ezt kapcsold ki, ha az SSL kapcsolattal probl辿ma van!)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "SMTP port megad叩sa"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "POP3 port megad叩sa"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "IMAP4 port megad叩sa"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "NNTP port megad叩sa"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Tartom叩nyn辿v (domain) megad叩sa"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP szerver k旦nyvt叩r"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Elk端ld旦tt 端zenetek elhelyez辿se"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "V叩zlatok elhelyez辿se"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "T旦r旦lt 端zenetek elhelyez辿se"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Hozz叩f辿r辿s n辿v nincs megadva."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Nincs E-mail c鱈m megadva."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Nincs megadott SMTP szerver."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Nincs felhaszn叩l坦i azonos鱈t坦 megadva."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Nincs megadott POP3 szerver."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Nincs megadott IMAP4 szerver."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Nincs megadott NNTP szerver."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4453,6 +4472,7 @@ msgstr "zenet id辿z辿se a v叩laszban"
msgid "Reply button invokes mailing list reply"
msgstr "A `V叩lasz' gomb a `V叩lasz levelez list叩ra' funkci坦t hozza fel"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "V叩lasz form叩tuma"
@@ -4461,6 +4481,7 @@ msgstr "V叩lasz form叩tuma"
msgid "Quotation mark"
msgstr "Id辿zet jele"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Tov叩bb鱈t叩si form叩tuma"
@@ -4489,6 +4510,7 @@ msgstr "H鱈rcsoportok r旦vid鱈t辿se, ha hosszabb mint"
msgid "letters"
msgstr "lev辿l"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "sszefoglal坦 n辿zet"
@@ -5228,22 +5250,29 @@ msgstr "V叩lasz:"
msgid "Mark"
msgstr "Kijel旦lt"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Csatol叩s"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "T叩rgy"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Felad坦"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "D叩tum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Sz叩m"
@@ -5644,6 +5673,7 @@ msgstr "Hiba az ssl k旦rnyezet l辿trehoz叩sa k旦zben\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL kapcsolat hiba (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5772,10 +5802,12 @@ msgstr "/_Nyomtat..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "J"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Db"
@@ -6085,7 +6117,7 @@ msgstr ""
"jobb eg辿rgombbal 辿s v叩laszd a `Digit叩lis al叩鱈r叩s ellenrz辿se' men端pontot!\n"
"\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/it.po b/po/it.po
index c1741a10..f1fa107e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 1.0.0beta2\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-11-13 11:30+0100\n"
"Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -108,7 +108,7 @@ msgstr ""
msgid "Name"
msgstr "Nome"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocollo"
@@ -190,7 +190,7 @@ msgstr ""
"L'azione selezionata non pu嘆 essere usata nella finestra di composizione\n"
"perch竪 contiene %%f, %%F o %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -199,7 +199,8 @@ msgstr ""
"Il comando non pu嘆 essere avviato. La creazione della pipe 竪 fallita.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -414,6 +415,7 @@ msgstr "Rubrica"
msgid "Name:"
msgstr "Nome:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -438,6 +440,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Elimina l'indirizzo(i)"
@@ -584,7 +587,8 @@ msgstr "Indirizzo email"
msgid "Group"
msgstr "Gruppo"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Cartella"
@@ -608,23 +612,23 @@ msgstr "Indirizzo comune"
msgid "Personal address"
msgstr "Indirizzo personale"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Avviso"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Avvertimento"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Errore"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Creazione della finestra di dialogo dell'allarme...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Mostra questo messaggio la prossima volta"
@@ -656,6 +660,10 @@ msgstr "Verde"
msgid "Brown"
msgstr "Marrone"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Niente"
@@ -940,7 +948,7 @@ msgid "Recipient is not specified."
msgstr "Il destinatario non 竪 specificato."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Invia"
@@ -1025,6 +1033,7 @@ msgstr "Creazione della finestra di composizione...\n"
msgid "MIME type"
msgstr "Tipo MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1070,7 +1079,8 @@ msgstr "Allega"
msgid "Attach file"
msgstr "Allega il file"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Firma"
@@ -1148,6 +1158,7 @@ msgstr "File temporaneo: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Composizione: input da un processo di controllo\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Impossibile eseguire l'editor esterno\n"
@@ -1197,6 +1208,7 @@ msgstr "Applica il modello"
msgid "Replace"
msgstr "Sostituisci"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Modifica l'indirizzo"
@@ -1217,6 +1229,7 @@ msgstr "Deve essere fornito un indirizzo e-mail."
msgid "A Name and Value must be supplied."
msgstr "Devono essere forniti un nome e un valore."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Modifica i dati della persona"
@@ -1246,6 +1259,7 @@ msgstr "Indirizzo e-mail"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Sposta su"
@@ -1295,7 +1309,7 @@ msgid " Check File "
msgstr " Controllo file "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "File"
@@ -1374,7 +1388,7 @@ msgid "Edit JPilot Entry"
msgstr "Modifica la voce JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1438,7 +1452,7 @@ msgstr "Timeout (secondi)"
msgid "Maximum Entries"
msgstr "Numero massimo di voci"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Essenziale"
@@ -1496,7 +1510,7 @@ msgid "Exporting file:"
msgstr "File su cui esportare:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Seleziona... "
@@ -1504,8 +1518,8 @@ msgstr " Seleziona... "
msgid "Select exporting file"
msgstr "Seleziona il file da esportare"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1602,6 +1616,7 @@ msgstr "Creazione della vista della cartella...\n"
msgid "New"
msgstr "Nuovi"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Non letti"
@@ -2074,6 +2089,7 @@ msgstr "Record :"
msgid "Import LDIF file into Address Book"
msgstr "Importazione del file LDIF nella rubrica"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Precedente"
@@ -2297,6 +2313,7 @@ msgstr "Inserire la password"
msgid "Protocol log"
msgstr "Log del protocollo"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2385,6 +2402,7 @@ msgstr "Messaggi accodati"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Ci sono messaggi non spediti in 束Coda損. Uscire ora ?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "un altro Sylpheed 竪 gi in esecuzione.\n"
@@ -2470,6 +2488,7 @@ msgstr "/_File/Stam_pa..."
msgid "/_File/_Work offline"
msgstr "/_File/Lavora offli_ne"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_File/_Esci"
@@ -3165,7 +3184,7 @@ msgstr "Include la nuova posta di tutti gli account"
msgid "Send queued message(s)"
msgstr "Invia i messaggi accodati"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Componi"
@@ -3673,207 +3692,207 @@ msgstr "comando non supportato\n"
msgid "error occurred on POP3 session\n"
msgstr "si 竪 verificato un errore durante la sessione POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Trovato %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "La configurazione 竪 stata salvata.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Apertura della finestra delle preferenze degli account...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Account%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Preferenze per il nuovo account"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Preferenze dell'account"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Creazione della finestra delle preferenze degli account...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Ricevi"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privacy"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avanzato"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Nome di questo account"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Imposta come predefinito"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informazioni personali"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Nome completo"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Indirizzo di posta"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizzazione"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informazioni sui server"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
# src/prefs_account.c:634
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Nessuno (locale)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Questo server richiede l'autenticazione"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Server delle news"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server per la ricezione"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Server SMTP (spedisce)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "User ID"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Password"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "Usa l'autenticazione sicura (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Rimuovi dopo "
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr " giorni"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 giorni: rimuovi immediatamente)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Scarica tutti i messaggi sul server"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Limite della dimensione da ricevere di"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtra i messaggi in ricezione"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Inbox predefinita"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(I messaggi non filtrati saranno memorizzati in questa cartella)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Metodo di autenticazione"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatico"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "束Ricevi tutti損 controlla i nuovi messaggi su questo account"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Intestazione"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Aggiungi il campo Data nell'intestazione"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Genera ID messaggio"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Aggiungi un'intestazione definita dall'utente"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Modifica... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autenticazione"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Autenticazione SMTP (SMTP AUT)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3882,172 +3901,172 @@ msgstr ""
"Lasciando vuote queste voci verranno usate\n"
"la stessa user ID e password della ricezione."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autentica con POP3 prima dell'invio"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Output del comando"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Imposta automaticamente i seguenti indirizzi"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Rispondi a"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Cifra il messaggio per predefinizione"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Firma il messaggio per predefinizione"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Usa il formato ASCII-armato per la cifratura"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Usa la firma con il testo in chiaro"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Chiave della firma"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Usa la chiave predefinita di GnuPG"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Scegli la chiave per il tuo indirizzo email"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Specifica la chiave manualmente"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "ID user o chiave:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Non usare SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Usa SSL per la connessione POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Usa SSL per la connessione IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Usa SSL per la connessione NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Invio (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Usa SSL per la connessione SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Usa SSL non bloccato"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Disattivare se si hanno problemi nella connessione SSL)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Specifica la porta SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Specifica la porta POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Specifica la porta IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Specifica la porta NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Specifica il nome di dominio"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Directory del server IMAP4"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Metti i messaggi spediti in"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Metti i messaggi abbozzati in"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Mettei i messaggi eliminati in"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Non 竪 stato immesso il nome dell'account."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Non 竪 stato immesso l'indirizzo di posta."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Non 竪 stato immesso il server SMTP."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Non 竪 stato immesso lo user ID."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Non 竪 stato immesso il server POP3."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Non 竪 stato immesso il server IMAP4."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Non 竪 stato immesso il server NNTP."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4427,6 +4446,7 @@ msgstr "Cita il messaggio quando rispondi"
msgid "Reply button invokes mailing list reply"
msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Formato della risposta"
@@ -4435,6 +4455,7 @@ msgstr "Formato della risposta"
msgid "Quotation mark"
msgstr "Simbolo di citazione"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Formato di inoltro"
@@ -4463,6 +4484,7 @@ msgstr "Accorcia i newsgroup pi湛 lunghi di"
msgid "letters"
msgstr "lettere"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Vista sommario"
@@ -5177,22 +5199,29 @@ msgstr "Rispondi a:"
msgid "Mark"
msgstr "Segna"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Allegato"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Oggetto"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Da"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Data"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Numero"
@@ -5595,6 +5624,7 @@ msgstr "Errore creando il contesto ssl\n"
msgid "SSL connect failed (%s)\n"
msgstr "Connessione SSL fallita (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5722,10 +5752,12 @@ msgstr "/Stam_pa..."
msgid "M"
msgstr "S"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "N"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "No."
@@ -6032,7 +6064,7 @@ msgstr "Per controllarla, aprire il men湛 contestuale cliccando con\n"
msgid "right click and select `Check signature'.\n"
msgstr "il tasto destro e selezionare 束Controlla firma損.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/ja.po b/po/ja.po
index c20b3589..92cecbad 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 1999-10-12\n"
"Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "潟"
@@ -187,7 +187,7 @@ msgstr ""
"御≪激с潟 %%f, %%F, %%p с\n"
"<祉若娯c潟с篏睡с障"
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"潟潟紮с障ゃ篏紊掩障\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -411,6 +412,7 @@ msgstr "≪劫験"
msgid "Name:"
msgstr ":"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -435,6 +437,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "≪鴻"
@@ -578,7 +581,8 @@ msgstr "糸<若 ≪"
msgid "Group"
msgstr "違若"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr ""
@@ -602,23 +606,23 @@ msgstr "掩≪"
msgid "Personal address"
msgstr "篋榊≪"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "羈"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "茘"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr ""
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "茘ゃ≪違篏筝...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "罨≦<祉若吾茵腓冴"
@@ -650,6 +654,10 @@ msgstr "膩"
msgid "Brown"
msgstr ""
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr ""
@@ -934,7 +942,7 @@ msgid "Recipient is not specified."
msgstr "絎絎障"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "篆"
@@ -1017,6 +1025,7 @@ msgstr "<祉若娯c潟篏筝...\n"
msgid "MIME type"
msgstr "MIME 帥ゃ"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1062,7 +1071,8 @@ msgstr "羞私"
msgid "Attach file"
msgstr "<ゃ羞私"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "臀峨"
@@ -1140,6 +1150,7 @@ msgstr "筝<ゃ: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Compose: h祉鴻ュ\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "紊c帥絎茵с障\n"
@@ -1189,6 +1200,7 @@ msgstr "潟若"
msgid "Replace"
msgstr "臀"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "≪鴻膩"
@@ -1209,6 +1221,7 @@ msgstr "<若≪鴻絎綽荀障"
msgid "A Name and Value must be supplied."
msgstr "ゃ絎綽荀障"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "篋榊若帥膩"
@@ -1238,6 +1251,7 @@ msgstr "糸<若 ≪"
msgid "Alias"
msgstr "ュ"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "筝腱糸"
@@ -1287,7 +1301,7 @@ msgid " Check File "
msgstr " <ゃс "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "<ゃ"
@@ -1365,7 +1379,7 @@ msgid "Edit JPilot Entry"
msgstr "JPilot潟膩"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1429,7 +1443,7 @@ msgstr "帥ゃ≪(腱)"
msgid "Maximum Entries"
msgstr "紊с潟"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "堺"
@@ -1486,7 +1500,7 @@ msgid "Exporting file:"
msgstr "鴻若<ゃ:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " 御... "
@@ -1494,8 +1508,8 @@ msgstr " 御... "
msgid "Select exporting file"
msgstr "鴻若<ゃ御"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1592,6 +1606,7 @@ msgstr "ャ若篏筝...\n"
msgid "New"
msgstr "亥"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "茯"
@@ -2064,6 +2079,7 @@ msgstr "潟若 :"
msgid "Import LDIF file into Address Book"
msgstr "LDIF<ゃ≪劫験吾ゃ潟若"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr ""
@@ -2287,6 +2303,7 @@ msgstr "鴻若ュ"
msgid "Protocol log"
msgstr "潟"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2375,6 +2392,7 @@ msgstr "篆≦罘筝<祉若"
msgid "Some unsent messages are queued. Exit now?"
msgstr "篆≦罘筝篆<<祉若吾障腟篋障?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "ャ Sylpheed с莎桁障\n"
@@ -2461,6 +2479,7 @@ msgstr "/<ゃ(_F)/医(_P)..."
msgid "/_File/_Work offline"
msgstr "/<ゃ(_F)/ゃ潟(_W)"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/<ゃ(_F)/腟篋(_X)"
@@ -3152,7 +3171,7 @@ msgstr "≪潟亥<若莨"
msgid "Send queued message(s)"
msgstr "篆≦罘筝<祉若吾篆<"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "篏"
@@ -3660,378 +3679,378 @@ msgstr "潟潟泣若障\n"
msgid "error occurred on POP3 session\n"
msgstr "POP3 祉激с割賢若榊障\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "%s 荀ゃ障\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "荐絎篆絖障\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "≪潟<潟鴻c潟障...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Account%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "域≪潟荐絎"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "≪潟荐絎"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "≪潟<潟鴻c潟篏筝...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "篆"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "篋堺"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "蕭綺荐絎"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "≪潟腱"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "絽娯戎"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "篋堺"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr ""
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "<若≪"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "腟膵"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "泣若"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "ャ若 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr " (若)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "泣若茯荐若綽荀"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "ャ若鴻泣若"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "篆∞泣若"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP泣若 (篆)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "若ID"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "鴻若"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "絎茯荐惹劫篏睡 (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "篆≧泣若筝<祉若吾ゃ"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "<祉若吾"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "ュ"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0: 喝婚)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "泣若筝鴻<祉若吾篆<"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "篆<泣ゃ阪狗"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "篆≧<祉若吾"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "罔羣篆∞"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(<祉若吾主障)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "茯荐惹劫"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr ""
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "篆<с≪潟亥<祉若吾с"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr ""
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Datec若篁"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "<祉若ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "若九臂菴遵"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " 膩... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "茯荐"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP茯荐 (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
"潟腥冴篆≧若ID鴻若篏睡障"
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "篆≦POP3茯荐若茵"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "潟潟阪"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "篁ヤ≪鴻絎"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Reply-To"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "罔羣с<祉若吾垸"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "罔羣с<祉若吾臀峨"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "垸 ASCII 茖綵√篏睡"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "≪鴻臀峨篏睡"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "臀峨"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "罔羣GnuPG泣篏睡"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "糸<若≪鴻ч泣御"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "泣ф絎"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "若吟障ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "SSL篏睡"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "POP3・膓SSL篏睡"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "SSL祉激с潟紮STARTTLS潟潟篏睡"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "IMAP4・膓SSL篏睡"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "NNTP・膓SSL篏睡"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "篆 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SMTP・膓SSL篏睡"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "潟SSL篏睡"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(SSL ・膓馹翫)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "SMTP若絎"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "POP3若絎"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "IMAP4若絎"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "NNTP若絎"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "<ゃ喝絎"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP泣若c"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "篆≧ァ贋"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "腮帥贋"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "睡宴贋"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "≪潟ュ障"
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "<若≪鴻ュ障"
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP泣若ュ障"
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "若IDュ障"
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3泣若ュ障"
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4泣若ュ障"
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP泣若ュ障"
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4408,6 +4427,7 @@ msgstr "菴篆≧<祉若吾綣"
msgid "Reply button invokes mailing list reply"
msgstr "菴篆<帥潟с<若潟違鴻菴篆<"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "菴篆<後"
@@ -4416,6 +4436,7 @@ msgstr "菴篆<後"
msgid "Quotation mark"
msgstr "綣膃"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "荵∫後"
@@ -4444,6 +4465,7 @@ msgstr "絖違"
msgid "letters"
msgstr "絖激ャ若鴻違若膂∞ヨ;腓"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "泣ャ"
@@ -5149,22 +5171,29 @@ msgstr "Reply-To:"
msgid "Mark"
msgstr "若"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "羞私"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "篁九"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "綏坂査"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "ヤ"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr ""
@@ -5569,6 +5598,7 @@ msgstr "ssl 潟潟鴻筝主榊\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL ・膓紊掩障 (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5696,10 +5726,12 @@ msgstr "/医(_P)..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr ""
@@ -6006,7 +6038,7 @@ msgstr ""
"臀峨罎荐若御\n"
"\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/ko.po b/po/ko.po
index 2b80ab51..6b9a0ba2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed 0.8.6\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2002-12-02 11:09+0900\n"
"Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
"Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -92,7 +92,7 @@ msgstr ""
msgid "Name"
msgstr "企"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "襦貊"
@@ -174,7 +174,7 @@ msgstr ""
" ク讌 谿曙 給\n"
"覃 %%f, %%F 轟 %%p襯 螻 蠍 覓語."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -183,7 +183,8 @@ msgstr ""
"覈轟 給. 危 煙 ろ給.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -396,6 +397,7 @@ msgstr "譯殊襦"
msgid "Name:"
msgstr "企:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -420,6 +422,7 @@ msgstr "谿語^:"
msgid "Bcc:"
msgstr " 谿語^:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "譯殊襯 "
@@ -558,7 +561,8 @@ msgstr "企 譯殊"
msgid "Group"
msgstr "蠏碁9"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "启"
@@ -582,23 +586,23 @@ msgstr "螻旧 譯殊襦"
msgid "Personal address"
msgstr "螳 譯殊襦"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "襴"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "蟆所"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr ""
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "蟆所 れ伎朱蠏碁ゼ 燕...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "れ覯 覃讌 覲願鍵"
@@ -630,6 +634,10 @@ msgstr "轟"
msgid "Brown"
msgstr "螳"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr ""
@@ -923,7 +931,7 @@ msgid "Recipient is not specified."
msgstr "覦 讌讌給"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "覃 覦"
@@ -1005,6 +1013,7 @@ msgstr "ク讌谿曙 燕...\n"
msgid "MIME type"
msgstr "襷 "
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1050,7 +1059,8 @@ msgstr "豌覿"
msgid "Attach file"
msgstr " 豌覿"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "覈"
@@ -1129,6 +1139,7 @@ msgstr " : %s"
msgid "Compose: input from monitoring process\n"
msgstr "ク讌: 覈磯 襦語る覿 レ 給\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "碁 ク讌蠍磯ゼ ろ 螳 給\n"
@@ -1178,6 +1189,7 @@ msgstr "襴酔 ."
msgid "Replace"
msgstr "豌"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "譯殊 ク讌"
@@ -1198,6 +1210,7 @@ msgstr "覃 譯殊螳 讌讌 給."
msgid "A Name and Value must be supplied."
msgstr "企螻 螳 讌讌 給."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "碁 襭 ク讌"
@@ -1227,6 +1240,7 @@ msgstr "企 譯殊"
msgid "Alias"
msgstr "覲覈"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "襦 企"
@@ -1276,7 +1290,7 @@ msgid " Check File "
msgstr " "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr ""
@@ -1354,7 +1368,7 @@ msgid "Edit JPilot Entry"
msgstr "JPilot 覈 ク讌"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1418,7 +1432,7 @@ msgstr ""
msgid "Maximum Entries"
msgstr ""
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "蠍磯蓋"
@@ -1475,7 +1489,7 @@ msgid "Exporting file:"
msgstr ""
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "螻襯願鍵..."
@@ -1483,8 +1497,8 @@ msgstr "螻襯願鍵..."
msgid "Select exporting file"
msgstr ""
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1583,6 +1597,7 @@ msgstr "启 觀磯ゼ 燕...\n"
msgid "New"
msgstr "蟆"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "曙"
@@ -2061,6 +2076,7 @@ msgstr ""
msgid "Import LDIF file into Address Book"
msgstr "LDIF 殊 譯殊襦朱 螳語り鍵"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "伎"
@@ -2280,6 +2296,7 @@ msgstr " "
msgid "Protocol log"
msgstr "襦貊 襦蠏"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2368,6 +2385,7 @@ msgstr ""
msgid "Some unsent messages are queued. Exit now?"
msgstr "覲企伎讌 覃讌螳 給. 讌蠍 譬襭蟾?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "るジ Sylpheed螳 企 ろ螻 給.\n"
@@ -2460,6 +2478,7 @@ msgstr "/(_F)/語(_P)..."
msgid "/_File/_Work offline"
msgstr "/(_F)/ 曙(_I)"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/(_F)/願鍵(_x)"
@@ -3166,7 +3185,7 @@ msgstr "覈 螻 覃殊 螳語給"
msgid "Send queued message(s)"
msgstr " 覲願 覃讌襯 覲企"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr ""
@@ -3677,379 +3696,379 @@ msgstr "覈轟"
msgid "error occurred on POP3 session\n"
msgstr "語 譴 覦\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "%s 覦蟆\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "れ ル給.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "螻 れ 谿曙 暑...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "螻%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr " 螻 れ"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "螻 蠍磯蓋 れ"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "螻 れ 谿曙 燕...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "覦蠍"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "殊企"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "螻蠍"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr " 螻 企"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "蠍磯蓋 螻朱 れ"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr " 覲"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr " 企"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "覃 譯殊"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "蠍郁"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "覯 覲"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "伎(NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "襦貉"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr " 覯 語 襦 "
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "伎 覯"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "覦 覯"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP 覯(覦′)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr " 螻"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr ""
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr " 覯 語 襦 "
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "覦 覯 覃讌襯 讌"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr ""
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr ""
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 : 讀 )"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "覯 覈 覃讌襯 覦"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "覦 蠍 "
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "覦 覃讌襯 磯"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "蠍磯蓋 壱ク"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(磯 讌 覃讌 启 ル 蟆)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "語 覦覯"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr ""
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr ""
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "る"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Date る 覈 豢螳"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Message-ID "
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr " る 豢螳"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " ク讌..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "語"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP 語(SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "覲企願鍵 POP3 語"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "覈轟"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "れ 譯殊襯 朱 "
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "谿語^"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr " 谿語^"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "譯殊"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "蠍磯蓋朱 覃讌襯 誤"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "蠍磯蓋朱 覃讌 語 "
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr ""
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr " ろ 覈 "
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr ""
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "蠍磯蓋 GnuPG "
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "轟 壱ク 譯殊襦 "
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "朱 讌"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr " 轟 ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "SSL 讌 給"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "POP3 郁屋 SSL "
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "SSL 語 蠍 STARTTLS 覈轟 "
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "IMAP4 郁屋 SSL "
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "NNTP 郁屋 SSL "
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr ""
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SMTP 郁屋 SSL "
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "SMTP 覯"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "POP3 覯"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "IMAP4 讌"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "NNTP 讌"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "覃 企 讌"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP 覯 襴"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "覲企 覃讌 "
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr " 覃讌 "
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr " 覃讌 "
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "螻 企 ル讌 給."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "覃 譯殊螳 讌讌給."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP 覯螳 讌讌給."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr " 企螳 讌讌給."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 覯螳 讌讌給."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 覯螳 讌讌給."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP 覯螳 讌讌給."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4407,6 +4426,7 @@ msgstr " 覃讌襯 語"
msgid "Reply button invokes mailing list reply"
msgstr " 覯殊 覃朱襴ろ語 朱 "
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr " "
@@ -4415,6 +4435,7 @@ msgstr " "
msgid "Quotation mark"
msgstr "語 覿"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr " "
@@ -4443,6 +4464,7 @@ msgstr ""
msgid "letters"
msgstr ""
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr " 覲願鍵"
@@ -5169,22 +5191,29 @@ msgstr "譯殊:"
msgid "Mark"
msgstr ""
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "豌覿"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "覈"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "覲企 "
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "讌"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr ""
@@ -5583,6 +5612,7 @@ msgstr "ssl 覓碁Д \n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL 郁屋 ろ給(%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5711,10 +5741,12 @@ msgstr "/語(_)..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "覯"
@@ -6018,7 +6050,7 @@ msgstr ""
msgid "right click and select `Check signature'.\n"
msgstr ""
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/nl.po b/po/nl.po
index bc317e9d..68ee2864 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 0.8\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-02-18 13:03--100\n"
"Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
"Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -107,7 +107,7 @@ msgstr ""
msgid "Name"
msgstr "Naam"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocol"
@@ -189,7 +189,7 @@ msgstr ""
"De geselecteerde actie kan niet gebruikt worden in het venster\n"
"'bericht opstellen' omdat het %%f, %%F of %%p bevat."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -198,7 +198,8 @@ msgstr ""
"Opdracht kon niet gestart worden. Pijp kon niet aangemaakt worden.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -411,6 +412,7 @@ msgstr "Adresboek"
msgid "Name:"
msgstr "Naam:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -435,6 +437,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Adres(sen) verwijderen"
@@ -579,7 +582,8 @@ msgstr "E-mail adres"
msgid "Group"
msgstr "Groep"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Accounts"
@@ -603,23 +607,23 @@ msgstr "Algemene adressen"
msgid "Personal address"
msgstr "Persoonlijke adressen"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Bericht"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Waarschuwing"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Fout"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Waarschuwingsdialoog wordt gemaakt...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Dit bericht de volgende keer weergeven"
@@ -651,6 +655,10 @@ msgstr "Groen"
msgid "Brown"
msgstr "Bruin"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Geen"
@@ -943,7 +951,7 @@ msgid "Recipient is not specified."
msgstr "Ontvanger is niet gespecificeerd."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Verzenden"
@@ -1026,6 +1034,7 @@ msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
msgid "MIME type"
msgstr "MIME type"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1071,7 +1080,8 @@ msgstr "Bijvoegen"
msgid "Attach file"
msgstr "Bestand bijvoegen"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Tekenen"
@@ -1149,6 +1159,7 @@ msgstr "Tijdelijk bestand: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Opstellen: invoer van \"monitoring process\"\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
@@ -1198,6 +1209,7 @@ msgstr "Sjabloon toepassen"
msgid "Replace"
msgstr "Vervangen"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Adres bewerken"
@@ -1218,6 +1230,7 @@ msgstr "E-mail adres is niet ingevoerd."
msgid "A Name and Value must be supplied."
msgstr "Een naam en waarde moeten worden gegeven."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Persoonsgegevens bewerken"
@@ -1247,6 +1260,7 @@ msgstr "E-mail adres"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Omhoog"
@@ -1296,7 +1310,7 @@ msgid " Check File "
msgstr " Controleer bestand"
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Bestand"
@@ -1375,7 +1389,7 @@ msgid "Edit JPilot Entry"
msgstr "Bewerk JPilot veld"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr "Bladeren..."
@@ -1439,7 +1453,7 @@ msgstr "Timeout (sec)"
msgid "Maximum Entries"
msgstr "Maximum aantal velden"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Algemeen"
@@ -1497,7 +1511,7 @@ msgid "Exporting file:"
msgstr "Doelbestand:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "Selecteer..."
@@ -1505,8 +1519,8 @@ msgstr "Selecteer..."
msgid "Select exporting file"
msgstr "Selecteer doelbestand"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1605,6 +1619,7 @@ msgstr "Mapoverzicht wordt gemaakt...\n"
msgid "New"
msgstr "Nieuw"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Ongelezen"
@@ -2087,6 +2102,7 @@ msgstr "Kaarten :"
msgid "Import LDIF file into Address Book"
msgstr "Importeer LDIF bestand in het adresboek"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Vorig"
@@ -2307,6 +2323,7 @@ msgstr "Geef wachtwoord"
msgid "Protocol log"
msgstr "Protocol-logboek"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2397,6 +2414,7 @@ msgstr "Berichten zijn in de wachtrij gezet"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "er draait al een Sylpheed.\n"
@@ -2489,6 +2507,7 @@ msgstr "/_Bestand/Af_drukken..."
msgid "/_File/_Work offline"
msgstr "/_Bestand/Bijlage _invoegen"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Bestand/A_fsluiten"
@@ -3195,7 +3214,7 @@ msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
msgid "Send queued message(s)"
msgstr "Verzend berichten uit de wachtrij"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Opstellen"
@@ -3706,207 +3725,207 @@ msgstr "Opdracht"
msgid "error occurred on POP3 session\n"
msgstr "er is een fout opgetreden tijdens de identificatie\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "%s gevonden\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Configuratie is opgeslagen.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Venster accountvoorkeuren wordt geopend...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Account%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Voorkeuren voor nieuw account"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Accountvoorkeuren"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Venster accountvoorkeuren wordt geopend...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Ontvangen"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privacy"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Geavanceerd"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Naam van dit account"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Instellen als standaard"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Persoonlijke informatie"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Volledige naam"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-mail adres"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organisatie"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Serverinformatie"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Nieuws (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Niets (lokaal)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Deze server vereist authentificatie"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Nieuwsserver"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server om van te ontvangen"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP server (om te verzenden)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Gebruikersnaam"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Wachtwoord"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Deze server vereist authentificatie"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Verwijderen na"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dagen"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dagen: direct verwijderen)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Haal alle berichten op van server"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Limiet ontvangstgrootte"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filter de berichten bij het ophalen"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Standaard inbox"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Identificatiemethode"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatisch"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Header"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Datum veld toevoegen aan header"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Bericht-ID aanmaken"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Voeg een door de gebruiker gespecificeerde header toe"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr "Bewerken"
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Identificatie"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP identificatie (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3916,173 +3935,173 @@ msgstr ""
"naam/wachtwoord-paar gebruikt worden als\n"
"voor het ontvangen."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Identificatie met POP3 voor het verzenden"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Opdracht"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Stel automatisch de volgende adressen in"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Antwoorden naar"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Standaard het bericht coderen"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Standaard een identificatiehandtekening toevoegen"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "ASCII-versterkt formaat gebruiken voor codering"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Teksthandtekening gebruiken"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Signeersleutel"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Gebruik standaard GnuPG sleutel"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Selecteer sleutel naar e-mail adres"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Specificeer sleutel zelf"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Gebruikers- of sleutel-ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Geen SSL gebruiken"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "SSL gebruiken voor POP3 verbinding"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "SSL gebruiken voor IMAP verbinding"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "SSL gebruiken voor NNTP verbinding"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Verzenden (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SSL gebruiken voor SMTP verbinding"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "SMTP poort"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "POP3 poort"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "IMAP4 poort"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "SMTP poort"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Specificeer domeinnaam"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP server-map"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Verzonden berichten opslaan in"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Kladberichten opslaan in"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Verwijderde berichten opslaan in"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Accountnaam is niet ingevuld."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "E-mail adres is niet ingevoerd."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP server is niet ingevoerd."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Gebruikersnaam is niet ingevoerd."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 server is niet ingevoerd."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 server is niet ingevoerd."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP server is niet ingevoerd."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4458,6 +4477,7 @@ msgstr "Originele bericht citeren bij beantwoorden"
msgid "Reply button invokes mailing list reply"
msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Antwoordopmaak"
@@ -4466,6 +4486,7 @@ msgstr "Antwoordopmaak"
msgid "Quotation mark"
msgstr "Citeerteken"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Doorstuuropmaak"
@@ -4494,6 +4515,7 @@ msgstr "Nieuwsgroepen inkorten die langer zijn dan"
msgid "letters"
msgstr "brieven"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Berichtenlijst"
@@ -5241,22 +5263,29 @@ msgstr "Antwoord-Aan:"
msgid "Mark"
msgstr "Gemarkeerd"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Bijvoeging"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Onderwerp"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Afzender"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Nummer"
@@ -5658,6 +5687,7 @@ msgstr "Fout bij het maken van de ssl context\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL verbinding mislukt (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5786,10 +5816,12 @@ msgstr "/Afdrukken..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "O"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Nr."
@@ -6097,7 +6129,7 @@ msgstr ""
msgid "right click and select `Check signature'.\n"
msgstr "en de optie'Controleer handtekening' selecteren.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/pl.po b/po/pl.po
index 11c4b56f..e3df7737 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed 0.9.9 \n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-12-26 11:25+0200\n"
"Last-Translator: Przemysaw Suek <pbs@linux.net.pl>\n"
"Language-Team: POLISH <pl@li.org>\n"
@@ -106,7 +106,7 @@ msgstr ""
msgid "Name"
msgstr "Nazwa"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protok坦"
@@ -188,7 +188,7 @@ msgstr ""
"Wybrane polecenie nie mo甜e by u甜yte w oknie tworzenia wiadomoci\n"
"poniewa甜 zawiera %%f, %%F lub %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -197,7 +197,8 @@ msgstr ""
"Polecenie nie mogo zosta uruchomione. Bd podczas tworzenia potoku.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -412,6 +413,7 @@ msgstr "Ksi甜ka adresowa"
msgid "Name:"
msgstr "Nazwa:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -436,6 +438,7 @@ msgstr "Kopia:"
msgid "Bcc:"
msgstr "Ukryta kopia:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Usu adres(y)"
@@ -582,7 +585,8 @@ msgstr "Adres e-mail"
msgid "Group"
msgstr "Grupa"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Katalog"
@@ -606,23 +610,23 @@ msgstr "Wsp坦lny adres:"
msgid "Personal address"
msgstr "Osobisty adres:"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Notatka"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Ostrze甜enie"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Bd"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Tworzenie panelu z ostrze甜eniami...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Wywietl t wiadomo nastpnym razem"
@@ -654,6 +658,10 @@ msgstr "Zielony"
msgid "Brown"
msgstr "Brzowy"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Brak"
@@ -946,7 +954,7 @@ msgid "Recipient is not specified."
msgstr "Nie podano odbiorcy."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Wylij"
@@ -1030,6 +1038,7 @@ msgstr "Tworzenie okna edycji...\n"
msgid "MIME type"
msgstr "typ MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1075,7 +1084,8 @@ msgstr "Docz"
msgid "Attach file"
msgstr "Docz plik"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Podpis"
@@ -1153,6 +1163,7 @@ msgstr "Plik tymczasowy: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Edycja: wejcie z procesu monitorujcego\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Nie mo甜na uruchomi zewntrznego edytora\n"
@@ -1202,6 +1213,7 @@ msgstr "Zastosuj szablon"
msgid "Replace"
msgstr "Zamie"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Edytuj adres"
@@ -1222,6 +1234,7 @@ msgstr "Nale甜y poda adres e-mail."
msgid "A Name and Value must be supplied."
msgstr "Nale甜y poda nazw i warto."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Edytuj dane osoby"
@@ -1251,6 +1264,7 @@ msgstr "Adres e-mail"
msgid "Alias"
msgstr "Zwany inaczej"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "W g坦r"
@@ -1300,7 +1314,7 @@ msgid " Check File "
msgstr " Sprawd添 plik"
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Plik"
@@ -1378,7 +1392,7 @@ msgid "Edit JPilot Entry"
msgstr "Edytuj wpis JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1442,7 +1456,7 @@ msgstr "Op坦添nienie (sek)"
msgid "Maximum Entries"
msgstr "Maksymalna ilo pozycji"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Podstawowe"
@@ -1499,7 +1513,7 @@ msgid "Exporting file:"
msgstr "Eksportowanie pliku:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Wybierz... "
@@ -1507,8 +1521,8 @@ msgstr " Wybierz... "
msgid "Select exporting file"
msgstr "Wybierz plik eksportu"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1607,6 +1621,7 @@ msgstr "Tworzenie widoku katalog坦w...\n"
msgid "New"
msgstr "Nowy"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Nieprzeczytane"
@@ -2080,6 +2095,7 @@ msgstr "Rekordy :"
msgid "Import LDIF file into Address Book"
msgstr "Importuj plik LDIF do ksi甜ki adresowej"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Poprzednia"
@@ -2305,6 +2321,7 @@ msgstr "Wprowad添 haso"
msgid "Protocol log"
msgstr "Dziennik protokou"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2394,6 +2411,7 @@ msgstr "Skolejkowane wiadomoci"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Niekt坦re niewysane wiadomoci zostay skolejkowane. Czy wyj?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "Jest ju甜 uruchomiona kopia programu Sylpheed.\n"
@@ -2485,6 +2503,7 @@ msgstr "/_Plik/_Drukuj..."
msgid "/_File/_Work offline"
msgstr "/_Plik/Praca _offline"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Plik/_Koniec"
@@ -3186,7 +3205,7 @@ msgstr "Odbierz now poczt z wszystkich kont"
msgid "Send queued message(s)"
msgstr "Wylij wiadomoci z kolejki"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Utw坦rz"
@@ -3696,207 +3715,207 @@ msgstr "nieobsugiwane polecenie\n"
msgid "error occurred on POP3 session\n"
msgstr "wystpi bd podczas sesji POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Znaleziono: %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfiguracja zapisana.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Otwieranie okna preferencji konta...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Konto%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Preferencje nowego konta"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Preferencje konta"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Tworzenie okna preferencji okna...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Odbieranie"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Prywatno"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Zaawansowane"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Nazwa tego konta"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Ustaw jako domylne"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informacje osobiste"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Pena nazwa"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Adres e-mail"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizacja"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informacje o serwerze"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "纏aden (lokalnie)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Ten serwer wymaga autoryzacji"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Serwer news"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Serwer dla odbioru"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Serwer SMTP (dla wysyania)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Identyfikator u甜ytkownika"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Haso"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Ten serwer wymaga autoryzacji"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Usuwanie wiadomoci z serwera po odebraniu"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Usuwanie po"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dniach"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dni: usuwa natychmiast)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Pobieranie wszystkich wiadomoci z serwera"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Ograniczenie wielkoci pobierania"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrowanie wiadomoci podczas odbierania"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Domylny inbox"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Nieprzefiltrowane wiadomoci zostan zachowane w tym katalogu)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Spos坦b uwierzytelniania"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatycznie"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "\"Odbierz wszystkie\" sprawdza poczt dla tego konta"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Nag坦wek"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Dodawanie pola Data do nag坦wka"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generowanie identyrikatora wiadomoci"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Dodawanie nag坦wka zdefiniowanego przez u甜ytkownika"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr "Edycja..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Uwierzytelnianie"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3905,172 +3924,172 @@ msgstr ""
"Jeli te pola nie zostan wypenione, u甜yty zostanie\n"
"ten sam identyfikator u甜ytkownika i haso co przy odbieraniu."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Uwierzytelnianie POP3 przed wysyaniem"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Wyjcie polecenia"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automatyczne ustawianie nastpujcych adres坦w"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Kopia"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Ukryta kopia"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Adres zwrotny"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Domylnie szyfrowanie wiadomoci"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Domylnie podpisywanie wiadomoci"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "U甜ywanie formatu ASCII-armored dla szyfrowania"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Wstawianie podpisu czystym tekstem"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Klucz"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "U甜ywanie standardowego klucza GnuPG"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Wybieranie klucz poprzez sw坦j adres e-mail"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Rczne okrelanie klucza"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "U甜ytkownik lub klucz ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Nie korzystanie z SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "U甜ywanie SSL dla pocze POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "U甜ywanie polecenia STARTTLS by rozpocz sesj SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "U甜ywanie SSL dla pocze IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "U甜ywanie SSL dla pocze NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Wysyanie (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "U甜ywanie SSL dla pocze SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "U甜ywanie nieblokujcego SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Wycz to, jeli masz problemy z poczeniem SSL)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Okrel port SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Okrel port POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Okrel port IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Okrel port NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Okrel nazw domeny"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Katalog serwera IMAP4."
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Zapisywanie wysanych wiadomoci do"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Zapisywanie szablon坦w wiadomoci do"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Zapisywanie usunitych wiadomoci do"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Nie okrelono nazwy konta."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Nie okrelono adresu e-mail."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Nie okrelono serwera SMTP."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Nie okrelono ID u甜ytkownika."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Nie okrelono serwera POP3."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Nie okrelono serwera IMAP4."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Nie okrelono serwera NNTP."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4449,6 +4468,7 @@ msgstr "Cytowanie wiadomoci przy odpowiedzi"
msgid "Reply button invokes mailing list reply"
msgstr "Przycisk Odpowiedz wysya odpowied添 na list dyskusyjn"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Format odpowiedzi"
@@ -4457,6 +4477,7 @@ msgstr "Format odpowiedzi"
msgid "Quotation mark"
msgstr "Znak cytowania"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Format przekazywania"
@@ -4485,6 +4506,7 @@ msgstr "Skracanie nazwy grup du甜szych ni甜 "
msgid "letters"
msgstr "liter"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Widok listy wiadomoci"
@@ -5223,22 +5245,29 @@ msgstr "Adres zwrotny:"
msgid "Mark"
msgstr "Zaznacz"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Zacznik"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Temat"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Od"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Data"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Numer"
@@ -5640,6 +5669,7 @@ msgstr "Bd tworzenia kontekstu ssl\n"
msgid "SSL connect failed (%s)\n"
msgstr "Bd poczenia SSL (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5768,10 +5798,12 @@ msgstr "/_Drukuj..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Nr"
@@ -6093,7 +6125,7 @@ msgstr "By to sprawdzi, rozwi menu kontekstowe prawym \n"
msgid "right click and select `Check signature'.\n"
msgstr "przyciskiem myszy i wybierz \"Sprawd添 podpis\".\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3a2948af..ecae94f0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2002-07-15 13:06-0300\n"
"Last-Translator: Andr辿 Casteliano <digitalcoder@users.sourceforge.net>\n"
"Language-Team: Andr辿 Casteliano <digitalcoder@users.sourceforge.net> Isa鱈as "
@@ -106,7 +106,7 @@ msgstr ""
msgid "Name"
msgstr "Nome"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocolo"
@@ -188,7 +188,7 @@ msgstr ""
"A a巽達o selecionada n達o pode ser usada na mensagem de composi巽達o\n"
"porque cont辿m %%f, %%F ou %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -197,7 +197,8 @@ msgstr ""
"O comando n達o p担de ser iniciado. Cria巽達o do pipe falhou.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -410,6 +411,7 @@ msgstr "Livro de endere巽os"
msgid "Name:"
msgstr "Nome:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -434,6 +436,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Apagar endere巽o(s)"
@@ -579,7 +582,8 @@ msgstr "Endere巽o de e-mail"
msgid "Group"
msgstr "Grupo"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Pasta"
@@ -603,23 +607,23 @@ msgstr "Endere巽os comuns"
msgid "Personal address"
msgstr "Endere巽os pessoais"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Notifica巽達o"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Erro"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Criando a tela de alerta...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Mostrar essa mensagem da pr坦xima vez"
@@ -651,6 +655,10 @@ msgstr "Verde"
msgid "Brown"
msgstr "Marrom"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Nenhuma"
@@ -944,7 +952,7 @@ msgid "Recipient is not specified."
msgstr "Destinat叩rio n達o especificado."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Enviar"
@@ -1026,6 +1034,7 @@ msgstr "Criando janela de composi巽達o...\n"
msgid "MIME type"
msgstr "Tipo MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1071,7 +1080,8 @@ msgstr "Anexar"
msgid "Attach file"
msgstr "Anexar arquivo"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Assinatura"
@@ -1150,6 +1160,7 @@ msgstr "Arquivo tempor叩rio: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Compositor: entrada para monitorar processo\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "N達o foi poss鱈vel executar o editor externo\n"
@@ -1199,6 +1210,7 @@ msgstr "Aplicar Modelo"
msgid "Replace"
msgstr "Substituir"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Editar endere巽o"
@@ -1219,6 +1231,7 @@ msgstr "Endere巽o de e-mail n達o especificado."
msgid "A Name and Value must be supplied."
msgstr "Um Nome e um Valor devem ser informados"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Editar dados pessoais"
@@ -1248,6 +1261,7 @@ msgstr "Endere巽o de e-mail"
msgid "Alias"
msgstr "Apelido"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Mover para cima"
@@ -1297,7 +1311,7 @@ msgid " Check File "
msgstr " Verificar Arquivo "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Arquivo"
@@ -1376,7 +1390,7 @@ msgid "Edit JPilot Entry"
msgstr "Editar entrada JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1440,7 +1454,7 @@ msgstr "Timeout (segundos)"
msgid "Maximum Entries"
msgstr "M叩ximo de Entradas"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "B叩sicas"
@@ -1499,7 +1513,7 @@ msgid "Exporting file:"
msgstr "Arquivo a exportar:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "Selecionar..."
@@ -1507,8 +1521,8 @@ msgstr "Selecionar..."
msgid "Select exporting file"
msgstr "Selecione o filtro de exporta巽達o"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1607,6 +1621,7 @@ msgstr "Criando visualizador de pasta...\n"
msgid "New"
msgstr "Nova"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "N達o lido"
@@ -2086,6 +2101,7 @@ msgstr "Registros :"
msgid "Import LDIF file into Address Book"
msgstr "Importar arquivo LDIF para o Livro de Endere巽os"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Anterior"
@@ -2306,6 +2322,7 @@ msgstr "Informe a senha"
msgid "Protocol log"
msgstr "Log do protocolo"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2391,6 +2408,7 @@ msgstr "Mensagens enviadas para a fila"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Algumas mensagens n達o enviadas est達o na fila. Sair agora?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "outra c坦pia do Sylpheed j叩 est叩 sendo executada.\n"
@@ -2483,6 +2501,7 @@ msgstr "/_Arquivo/Im_primir"
msgid "/_File/_Work offline"
msgstr "/_Arquivo/_Inserir arquivo"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Arquivo/Sai_r"
@@ -3189,7 +3208,7 @@ msgstr "Incorporar novas mensagens de todas as contas"
msgid "Send queued message(s)"
msgstr "Enviar Mensagem(s) da fila"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Escrever"
@@ -3700,207 +3719,207 @@ msgstr "Comando"
msgid "error occurred on POP3 session\n"
msgstr "ocorreu um erro na autentica巽達o\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Encontrado %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Configura巽達o salva.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Abrindo janela de prefer棚ncias da conta...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Conta%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Prefer棚ncias para a nova conta"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Prefer棚ncias da Conta"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Criando janela de prefer棚ncias da conta...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Receber"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privacidade"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avan巽adas"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Nome desta conta"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Marcar como padr達o"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informa巽探es pessoais"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Nome completo"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Endere巽o de e-mail"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organiza巽達o"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informa巽探es do servidor"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Not鱈cias (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Nenhuma (local)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Este servidor requer autentica巽達o"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Servidor de not鱈cias"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Servidor de recep巽達o"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Servidor SMTP (envio)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Usuario"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Senha"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Este servidor requer autentica巽達o"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Ao receber, eliminar a(s) mensagem(ns) do servidor"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Remover depois de"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dias"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dias: remover imediatamente)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Receber todas as mensagens no servidor"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Limite de tamanho de recebimento"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrar mensagens ao receber"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Caixa de Entrada Padr達o"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Mensagens n達o filtradas ser達o guardadas nesta pasta)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "M辿todo de Autentica巽達o"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Autom叩tico"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Obter todas' confere novas mensagens nessa conta"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Cabe巽alho"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Adicionar campo de data"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Gerar Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Adicionar cabe巽alho do usu叩rio"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Editar... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autentica巽達o"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Autentica巽達o SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3909,173 +3928,173 @@ msgstr ""
"Se voc棚 deixar essas entradas em branco, o mesmo\n"
"ID de usu叩rio e senha do recebimento ser達o usados."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autenticar com POP3 antes de enviar"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Comando"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Estabelecer os seguintes endere巽os automaticamente"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Responder"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Encriptar mensagems por padr達o"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Assinar mensagens por padr達o"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Usar formato ASCII-armored para encripta巽達o"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Inserir assinatura de texto puro"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Assinar chave"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Usar chave GnuPG padr達o"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Selecionar chave atrav辿s de seu endere巽o de e-mail"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Especificar chave manualmente"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Usu叩rio ou ID da chave:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "N達o usar SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Utilizar SSL para conex達o POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Utilizar comando STARTTLS para iniciar a sess達o SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Utilizar SSL para conex達o IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Usar SSL para conex達o NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Enviar (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Utilizar SSL para conex達o SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Especifique a porta SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Especifique a porta POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Especificar a porta IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Especificar a porta NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Especificar nome do dom鱈nio"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Servidor de diret坦rio IMAP"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Colocar mensagens enviadas em"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Colocar mensagens de rascunho em"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Colocar mensagens apagadas em"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Nome da conta n達o definido."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Endere巽o de e-mail n達o especificado."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Servidor SMTP n達o especificado."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Usu叩rio n達o especificado."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Servidor POP3 n達o especificado."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Servidor IMAP4 n達o especificado."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Servidor NNTP n達o especificado."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4450,6 +4469,7 @@ msgstr "Quotar mensagem ao responder"
msgid "Reply button invokes mailing list reply"
msgstr "Bot達o de responder chama resposta para a lista"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Formato de resposta"
@@ -4458,6 +4478,7 @@ msgstr "Formato de resposta"
msgid "Quotation mark"
msgstr "Marca de cita巽達o"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Formato de Mensagem Encaminhada"
@@ -4486,6 +4507,7 @@ msgstr "Abreviar newsgroups maiores que"
msgid "letters"
msgstr "letras"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Vis達o de Sum叩rio "
@@ -5230,22 +5252,29 @@ msgstr "Responder para:"
msgid "Mark"
msgstr "Marca"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Anexo"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Assunto"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "De"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Data"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "N炭mero"
@@ -5648,6 +5677,7 @@ msgstr "Erro criando contexto SSL\n"
msgid "SSL connect failed (%s)\n"
msgstr "Conex達o SSL falhou (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5776,10 +5806,12 @@ msgstr "/_Imprimir..."
msgid "M"
msgstr "x"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "N"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "N達o."
@@ -6087,7 +6119,7 @@ msgstr "Para chec叩-la, abra o menu de contexto com\n"
msgid "right click and select `Check signature'.\n"
msgstr "um clique do bot達o direito e selecione `Checar assinatura'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/ro.po b/po/ro.po
index f2894fa0..18e14689 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2000-08-28\n"
"Last-Translator: Little Dragon <littledragon@altern.org>\n"
"Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -109,7 +109,7 @@ msgstr ""
msgid "Name"
msgstr "Nume"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protocol"
@@ -192,14 +192,15 @@ msgid ""
"because it contains %%f, %%F or %%p."
msgstr ""
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
"%s"
msgstr ""
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, fuzzy, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -416,6 +417,7 @@ msgstr "Agend"
msgid "Name:"
msgstr " Nume:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -440,6 +442,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "tergere adrese"
@@ -586,7 +589,8 @@ msgstr "Adres E-Mail"
msgid "Group"
msgstr "Group"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Director"
@@ -610,23 +614,23 @@ msgstr "Adresse comun:"
msgid "Personal address"
msgstr "Adresse personal:"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Informa釘ie"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Avertisment"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Eroare"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Creare dialog de avertisment...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Acest mesaj va aprea i data viitoare"
@@ -658,6 +662,10 @@ msgstr "Verde"
msgid "Brown"
msgstr "Maro"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Niciunul"
@@ -959,7 +967,7 @@ msgid "Recipient is not specified."
msgstr "Destinatarul nu a fost specificat."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Trimitere"
@@ -1040,6 +1048,7 @@ msgstr "Creare fereastra de compunere...\n"
msgid "MIME type"
msgstr "Tip MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1085,7 +1094,8 @@ msgstr "Ataament"
msgid "Attach file"
msgstr "Ataare fiier"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Semntur"
@@ -1164,6 +1174,7 @@ msgstr "Fiier temporar: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Compunere: introducere din proces monitorizat\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Editorul extern nu poate fi executat\n"
@@ -1215,6 +1226,7 @@ msgstr "tergere mesaj"
msgid "Replace"
msgstr "/_Utilitare/_Modele"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Editare adres"
@@ -1235,6 +1247,7 @@ msgstr "O adresa E-Mail trebuie specificat."
msgid "A Name and Value must be supplied."
msgstr "Un Nume i o Valoare trebuiesc specificate."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Editare Date Personale"
@@ -1264,6 +1277,7 @@ msgstr "Adres E-Mail"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Sus"
@@ -1313,7 +1327,7 @@ msgid " Check File "
msgstr " Verificare Fiier "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Fiier"
@@ -1391,7 +1405,7 @@ msgid "Edit JPilot Entry"
msgstr "Editare nregistrare JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1455,7 +1469,7 @@ msgstr "Timeout (secs)"
msgid "Maximum Entries"
msgstr "Numr Maxim de nregistrri"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "General"
@@ -1514,7 +1528,7 @@ msgid "Exporting file:"
msgstr "Exportare fiier:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Selectare... "
@@ -1522,8 +1536,8 @@ msgstr " Selectare... "
msgid "Select exporting file"
msgstr "Selectare fiier exportat"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1630,6 +1644,7 @@ msgstr "Creare mod vedere director...\n"
msgid "New"
msgstr "Nou"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Necitit"
@@ -2115,6 +2130,7 @@ msgstr "nregistrri:"
msgid "Import LDIF file into Address Book"
msgstr "Importare fiier LDIF 樽n agend"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "napio"
@@ -2342,6 +2358,7 @@ msgstr "Introducere parol"
msgid "Protocol log"
msgstr "Log protocol"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2432,6 +2449,7 @@ msgstr "Mesaje 樽n lista de ateptare"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Exista mesaje netrimise 樽n lista de ateptare. Dori釘i sa iei釘i ?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "ruleaz o alta sesiune Sylpheed.\n"
@@ -2532,6 +2550,7 @@ msgstr "/_Fiier/Im_primare..."
msgid "/_File/_Work offline"
msgstr "/_Fiier/_Inserare fiier"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Fiier/Iei_re"
@@ -3342,7 +3361,7 @@ msgstr "Recep釘ionare mesaje noi pentru toate conturile"
msgid "Send queued message(s)"
msgstr "Trimiterea mesajului(lor) din lista de ateptare"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Creare"
@@ -3860,400 +3879,400 @@ msgstr "Command"
msgid "error occurred on POP3 session\n"
msgstr "a avut loc o eroare la autoriza釘ie\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Gsit: %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Configura釘ia a fost salvat.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Deschidere fereastr de configurare cont...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Cont%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Preferin釘e pentru noul cont"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
#, fuzzy
msgid "Account preferences"
msgstr "Preferin釘e comune"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Creare fereastr de preferin釘e cont...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Recep釘ionare"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr ""
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr ""
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avansat"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Numele contului"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr ""
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Informatii personale"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Nume complet"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Adresa de mail"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organiza釘ie"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informatii despre server"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Nimic (local)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr ""
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Server news"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server pentru recep釘ionare"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Server SMTP (trimitere)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Utilizator"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Parola"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "a avut loc o eroare la autoriza釘ie\n"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "tergere mesaje de pe server dup primire"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
#, fuzzy
msgid "Remove after"
msgstr "tergere director"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
#, fuzzy
msgid "days"
msgstr "Alias"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr ""
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
#, fuzzy
msgid "Download all messages on server"
msgstr "Recep釘ionare toate mesajele de pe server"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr ""
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrare mesaje la primire"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr ""
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
#, fuzzy
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "Deschide primul mesaj necitit la intrarea 樽ntr-un director"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
#, fuzzy
msgid "Authentication method"
msgstr "Autentificare..."
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automat"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr ""
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Antet"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Adugare c但mp Date la antet"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generare Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Adugare de c但mpuri definite de utilizator"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Editare..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
#, fuzzy
msgid "Authentication"
msgstr "Autentificare..."
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr ""
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr ""
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Command"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
#, fuzzy
msgid "Automatically set the following addresses"
msgstr "Setare automat a adreselor urmtoare"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Reply-To"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
#, fuzzy
msgid "Encrypt message by default"
msgstr "Taie liniile mesajului la"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr ""
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr ""
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
#, fuzzy
msgid "Use clear text signature"
msgstr "Inserare semntur"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr ""
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr ""
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr ""
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
#, fuzzy
msgid "Specify key manually"
msgstr "Nume domeniu"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
#, fuzzy
msgid "User or key ID:"
msgstr "Utilizator"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr ""
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr ""
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr ""
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
#, fuzzy
msgid "Use SSL for IMAP4 connection"
msgstr "creare conexiune tunel IMAP4\n"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr ""
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
#, fuzzy
msgid "Use SSL for NNTP connection"
msgstr "creare conexiune tunel IMAP4\n"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr ""
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr ""
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Port SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Port POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
#, fuzzy
msgid "Specify IMAP4 port"
msgstr "Port SMTP"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
#, fuzzy
msgid "Specify NNTP port"
msgstr "Port SMTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Nume domeniu"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
#, fuzzy
msgid "IMAP server directory"
msgstr "Serverul IMAP4 nu a fost introdus."
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
#, fuzzy
msgid "Put sent messages in"
msgstr "Salvare mesaje trimise 樽n outbox"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
#, fuzzy
msgid "Put draft messages in"
msgstr "Taie liniile mesajului la"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
#, fuzzy
msgid "Put deleted messages in"
msgstr "tergere mesaj"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
#, fuzzy
msgid "Account name is not entered."
msgstr "Adresa de mail nu a fost introdus."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Adresa de mail nu a fost introdus."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Serverul SMTP nu a fost introdus."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Numele de utilizator nu a fost introdus."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Serverul POP3 nu a fost introdus."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Serverul IMAP4 nu a fost introdus."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Serverul NNTP nu a fost introdus."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4623,6 +4642,7 @@ msgstr "Citeaz mesajul la care se rspunde"
msgid "Reply button invokes mailing list reply"
msgstr "/Rspunde _la to釘i"
+#. reply
#: src/prefs_common.c:1404
#, fuzzy
msgid "Reply format"
@@ -4632,6 +4652,7 @@ msgstr "Rspunde la to釘i"
msgid "Quotation mark"
msgstr "Semn de citare"
+#. forward
#: src/prefs_common.c:1443
#, fuzzy
msgid "Forward format"
@@ -4662,6 +4683,7 @@ msgstr ""
msgid "letters"
msgstr "tergere"
+#. ---- Summary ----
#: src/prefs_common.c:1593
#, fuzzy
msgid "Summary View"
@@ -5415,23 +5437,30 @@ msgstr "Rspuns La:"
msgid "Mark"
msgstr "Marcaj"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
#, fuzzy
msgid "Attachment"
msgstr "Ataamente"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Subiect"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "De la"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Data"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Numr"
@@ -5863,6 +5892,7 @@ msgstr ""
msgid "SSL connect failed (%s)\n"
msgstr "Conexiunea a euat"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -6003,10 +6033,12 @@ msgstr "/Im_primare..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Nu."
@@ -6359,7 +6391,7 @@ msgstr ""
" tasta 'y'.\n"
"\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/ru.po b/po/ru.po
index e5c4f18a..6c7f7746 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed 1.0.0beta4\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-12-05 17:16+0300\n"
"Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -107,7 +107,7 @@ msgstr ""
msgid "Name"
msgstr "仄"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "仂仂从仂仍"
@@ -189,7 +189,7 @@ msgstr ""
"弍舒仆仆仂亠 亟亠亶于亳亠 仆亠 仄仂亢亠 弍 于仗仂仍仆亠仆仂 于 仂从仆亠 仂亰亟舒仆亳 仂仂弍亠仆亳,\n"
"舒从 从舒从 仂仆仂 仂亟亠亢亳 %%f, %%F or %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -198,7 +198,8 @@ msgstr ""
"亠 亟舒仍仂 于仗仂仍仆亳 从仂仄舒仆亟. 亳弍从舒 仗亳 仂亰亟舒仆亳亳 从舒仆舒仍舒.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -413,6 +414,7 @@ msgstr "亟亠仆舒 从仆亳亞舒"
msgid "Name:"
msgstr "仄:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -437,6 +439,7 @@ msgstr "仂仗亳:"
msgid "Bcc:"
msgstr "弌从仆仂:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "丕亟舒仍亳 舒亟亠(舒)"
@@ -581,7 +584,8 @@ msgstr "亟亠 E-Mail"
msgid "Group"
msgstr "仗仗舒"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "舒仗从舒"
@@ -605,23 +609,23 @@ msgstr "亟亠舒 仂亞舒仆亳亰舒亳亶"
msgid "Personal address"
msgstr "亳仆亠 舒亟亠舒"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "丕于亠亟仂仄仍亠仆亳亠"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "亠亟仗亠亢亟亠仆亳亠"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "亳弍从舒"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仗亠亟仗亠亢亟亠仆亳...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "仂从舒亰于舒 仂 仂仂弍亠仆亳亠 于 仍亠亟ム亳亶 舒亰"
@@ -653,6 +657,10 @@ msgstr "亠仍亠仆亶"
msgid "Brown"
msgstr "仂亳仆亠于亶"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "亠"
@@ -937,7 +945,7 @@ msgid "Recipient is not specified."
msgstr "仂仍舒亠仍 仂仂弍亠仆亳 仆亠 从舒亰舒仆."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "仗舒于亳"
@@ -1020,6 +1028,7 @@ msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仗仂亟亞仂仂于从亳 仂仂弍亠仆亳...\n"
msgid "MIME type"
msgstr "丐亳仗 MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1065,7 +1074,8 @@ msgstr "仍仂亢亠仆亳亠"
msgid "Attach file"
msgstr "仍仂亢亳 舒亶仍"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "仂亟仗亳"
@@ -1143,6 +1153,7 @@ msgstr "亠仄亠仆仆亶 舒亶仍: %s"
msgid "Compose: input from monitoring process\n"
msgstr "仂亟亞仂仂于从舒 仂仂弍亠仆亳: 于于仂亟 亳亰 仗仂亠舒 仍亠亢亠仆亳\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "亠 亟舒仍仂 亰舒仗亳 于仆亠仆亳亶 亠亟舒从仂\n"
@@ -1192,6 +1203,7 @@ msgstr "亳仄亠仆亳 舒弍仍仂仆"
msgid "Replace"
msgstr "舒仄亠仆亳"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "亠亟舒从亳仂于舒仆亳亠 舒亟亠舒"
@@ -1212,6 +1224,7 @@ msgstr "亠仂弍仂亟亳仄仂 从舒亰舒 舒亟亠 E-Mail."
msgid "A Name and Value must be supplied."
msgstr "亠仂弍仂亟亳仄仂 从舒亰舒 亳仄 亳 亰仆舒亠仆亳亠."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "亠亟舒从亳仂于舒仆亳亠 于亠亟亠仆亳亶 仂 从仂仆舒从亠"
@@ -1241,6 +1254,7 @@ msgstr "亟亠 E-Mail"
msgid "Alias"
msgstr "亠于亟仂仆亳仄"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "于亠"
@@ -1290,7 +1304,7 @@ msgid " Check File "
msgstr " 仂于亠亳 舒亶仍 "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "个舒亶仍"
@@ -1368,7 +1382,7 @@ msgid "Edit JPilot Entry"
msgstr "亠亟舒从亳仂于舒仆亳亠 亰舒仗亳亳 JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1432,7 +1446,7 @@ msgstr "丐舒亶仄-舒 (亠从)"
msgid "Maximum Entries"
msgstr "舒从亳仄舒仍仆亶 舒亰仄亠 亠亰仍舒舒"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "仆仂于仆亠"
@@ -1490,7 +1504,7 @@ msgid "Exporting file:"
msgstr "亅从仗仂亳仂于舒 于 舒亶仍:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " 弍仂... "
@@ -1498,8 +1512,8 @@ msgstr " 弍仂... "
msgid "Select exporting file"
msgstr "弍仂 舒亶仍舒 亟仍 从仗仂舒"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1596,6 +1610,7 @@ msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒亳 仗仂仄仂舒 仗舒仗仂从...\n"
msgid "New"
msgstr "仂于亠"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "亠仗仂亳舒仆仆亠"
@@ -2068,6 +2083,7 @@ msgstr "舒仗亳亠亶:"
msgid "Import LDIF file into Address Book"
msgstr "仄仗仂 舒亶仍舒 LDIF 于 舒亟亠仆 从仆亳亞"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "舒亰舒亟"
@@ -2291,6 +2307,7 @@ msgstr "于仂亟 仗舒仂仍"
msgid "Protocol log"
msgstr "仆舒仍"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2380,6 +2397,7 @@ msgstr "弌仂仂弍亠仆亳 于 仂亠亠亟亳"
msgid "Some unsent messages are queued. Exit now?"
msgstr " 仂亠亠亟亳 亠 仆亠仗仂仍舒仆仆亠 仂仂弍亠仆亳. 仂亟亳?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "亟亞舒 从仂仗亳 Sylpheed 亢亠 亰舒仗亠仆舒.\n"
@@ -2463,6 +2481,7 @@ msgstr "/个舒亶仍/亠舒..."
msgid "/_File/_Work offline"
msgstr "/个舒亶仍/舒弍仂舒 舒于仂仆仂仄仆仂"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/个舒亶仍/仂亟"
@@ -3156,7 +3175,7 @@ msgstr "仂仍亳 仂仂弍亠仆亳 仂 于亠 亠仆 亰舒仗
msgid "Send queued message(s)"
msgstr "仂仍舒 仂仂弍亠仆亳 亳亰 仂亠亠亟亳"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "舒仗亳舒"
@@ -3666,206 +3685,206 @@ msgstr "从仂仄舒仆亟舒 仆亠 仗仂亟亟亠亢亳于舒亠\n"
msgid "error occurred on POP3 session\n"
msgstr "仂亳弍从舒 亠舒仆舒 POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "舒亶亟亠仆仂 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "舒仂亶从亳 仂舒仆亠仆.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "从亳亠 仂从仆舒 仆舒仂亠从 亠仆仂亶 亰舒仗亳亳...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "丕亠仆舒 亰舒仗亳 %d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "舒仂亶从亳 仆仂于仂亶 亠仆仂亶 亰舒仗亳亳"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "舒仂亶从亳 亠仆仂亶 亰舒仗亳亳"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仆舒仂亠从 亠仆仂亶 亰舒仗亳亳...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "亳亠仄"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "舒亳舒"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "仂仗仂仍仆亳亠仍仆亠"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "仄 亠仆仂亶 亰舒仗亳亳"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "仂 仄仂仍舒仆亳"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "亳仆舒 亳仆仂仄舒亳"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "仂仍仆仂亠 亳仄"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "亟亠 E-Mail"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "亞舒仆亳亰舒亳"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "弌于亠亟亠仆亳 仂 亠于亠舒"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "仂于仂仆仂亶 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "亠 (仍仂从舒仍仆亶)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "亅仂 亠于亠 亠弍亠 舒亠仆亳亳从舒亳亳"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "弌亠于亠 仆仂于仂亠亶"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "弌亠于亠 亟仍 仗亳亠仄舒"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "弌亠于亠 SMTP (仂仗舒于从舒)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "ID 仗仂仍亰仂于舒亠仍"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "舒仂仍"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "仗仂仍亰仂于舒 弍亠亰仂仗舒仆 舒亠仆亳亳从舒亳 (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "丕亟舒仍 仂仂弍亠仆亳 亠于亠舒 仗仂仍亠 仗亳亠仄舒"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "丕亟舒仍亳 亠亠亰"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "亟仆亠亶"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 亟仆亠亶: 亟舒仍亳 仆亠仄亠亟仍亠仆仆仂)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "亳仆亳仄舒 于亠 仂仂弍亠仆亳 亠于亠舒"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "亞舒仆亳亳 舒亰仄亠 仗亳仆亳仄舒亠仄 仂仂弍亠仆亳亶"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "从弍"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "个亳仍仂于舒 仂仂弍亠仆亳 仗亳 仗亳亠仄亠"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "舒仗从舒 亟仍 于仂亟亳 仂仂弍亠仆亳亶"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(亠仂亳仍仂于舒仆仆亠 仂仂弍亠仆亳 弍亟 仂舒仆亠仆 于 仂亶 仗舒仗从亠)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "亠仂亟 舒亠仆亳亳从舒亳亳"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "于仂仄舒亳亠从亳"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "仂于亠 仗仂 从仂仄舒仆亟亠 '仂仍亳 于亠'"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "舒亞仂仍仂于仂从"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "仂弍舒于亳 于 亰舒亞仂仍仂于仂从 仗仂仍亠 Date"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "弌仂亰亟舒于舒 Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "仂弍舒于亳 亟仂仗仂仍仆亳亠仍仆亠 亰舒亞仂仍仂于从亳"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " 仗亠亟亠仍亳... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "亠仆亳亳从舒亳"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "亠仆亳亳从舒亳 SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3874,172 +3893,172 @@ msgstr ""
"仍亳 仂舒于亳 亳 仗仂仍 仗仄亳, 弍亟 亳仗仂仍亰仂于舒\n"
"亳仄 仗仂仍亰仂于舒亠仍 亳 仗舒仂仍, 亰舒亟舒仆仆亠 亟仍 仗亳亠仄舒 仗仂."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "仂于亠从舒 仗舒仂仍 亠亠亰 POP3 仗亠亠亟 仂仗舒于从仂亶"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "于仂亟 从仂仄舒仆亟"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "于仂仄舒亳亠从亳 舒仆舒于仍亳于舒 舒亟亠舒"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "仂仗亳"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "弌从仆仂"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "弍舒仆亶 舒亟亠"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "丿亳仂于舒 仂仂弍亠仆亳 仗仂 仄仂仍舒仆亳"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "仂亟仗亳于舒 仂仂弍亠仆亳 仗仂 仄仂仍舒仆亳"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "仗仂仍亰仂于舒 ASCII-从仂亟亳仂于舒仆亳亠 仗亳 亳仂于舒仆亳亳"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "仗仂仍亰仂于舒 仂从 亠从仂于 仗仂亟仗亳"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "仍ム 仗仂亟仗亳亳"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "仍ム GnuPG 仗仂 仄仂仍舒仆亳"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "仍ム 亟仍 于弍舒仆仆仂亞仂 舒亟亠舒 E-mail"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "亞仂亶 从仍ム"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "ID 仗仂仍亰仂于舒亠仍 从仍ム舒:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "亠 亳仗仂仍亰仂于舒 SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "仗仂仍亰仂于舒 SSL 亟仍 仂亠亟亳仆亠仆亳 POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "仗仂仍亰仂于舒 从仂仄舒仆亟 STARTTLS 亟仍 仆舒舒仍舒 亠舒仆舒 SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "仗仂仍亰仂于舒 SSL 亟仍 仂亠亟亳仆亠仆亳 IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "仗仂仍亰仂于舒 SSL 亟仍 仂亠亟亳仆亠仆亳 NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "仗舒于从舒 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "仗仂仍亰仂于舒 SSL 亟仍 仂亠亟亳仆亠仆亳 SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "仗仂仍亰仂于舒 仆亠弍仍仂从亳ム亳亶 亠亢亳仄 SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(从仍ム亳亠 仂仗亳, 亠仍亳 于仂亰仆亳从舒ム 仗仂弍仍亠仄 仗亳 亳仗仂仍亰仂于舒仆亳亳 SSL)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "仂 SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "仂 POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "仂 IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "仂 NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "仄 亟仂仄亠仆舒"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "舒舒仍仂亞 亠于亠舒 IMAP4"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "弌仂舒仆 仂仗舒于仍亠仆仆亠 仂仂弍亠仆亳 于"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "弌仂舒仆 亠仆仂于亳从亳 于"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "弌仂舒仆 亟舒仍亠仆仆亠 仂仂弍亠仆亳 于"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "亠 从舒亰舒仆仂 亳仄 亠仆仂亶 亰舒仗亳亳."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "亠 从舒亰舒仆 舒亟亠."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "亠 从舒亰舒仆 亠于亠 SMTP."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "亠 从舒亰舒仆 亳亟亠仆亳亳从舒仂 仗仂仍亰仂于舒亠仍."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "亠 从舒亰舒仆 亠于亠 POP3."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "亠 从舒亰舒仆 亠于亠 IMAP4."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "亠 从舒亰舒仆 亠于亠 NNTP."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4417,6 +4436,7 @@ msgstr "丶亳亳仂于舒 仗亳 仂于亠亠"
msgid "Reply button invokes mailing list reply"
msgstr "仂 从仆仂仗从亠 \"于亠亳\" 仂于亠舒 于 仗亳仂从 舒仍从亳"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "个仂仄舒 仂于亠舒"
@@ -4425,6 +4445,7 @@ msgstr "个仂仄舒 仂于亠舒"
msgid "Quotation mark"
msgstr "仆舒从 亳舒"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "个仂仄舒 仗亠亠仍舒亠仄仂亞仂 仂仂弍亠仆亳"
@@ -4453,6 +4474,7 @@ msgstr "弌仂从舒舒 仆舒亰于舒仆亳 亞仗仗 仆仂于仂亠亶 亟仍亳仆
msgid "letters"
msgstr "弍从于"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "弌仗亳仂从 仂仂弍亠仆亳亶"
@@ -5166,22 +5188,29 @@ msgstr "亟亠 亟仍 仂于亠仂于:"
msgid "Mark"
msgstr "亠从舒"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "仍仂亢亠仆亳亠"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "丐亠仄舒"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr ""
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "舒舒"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "仂仄亠"
@@ -5584,6 +5613,7 @@ msgstr "亳弍从舒 仗亳 仂亰亟舒仆亳亳 从仂仆亠从舒 SSL\n"
msgid "SSL connect failed (%s)\n"
msgstr "亳弍从舒 仂亠亟亳仆亠仆亳 SSL (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5711,10 +5741,12 @@ msgstr "/亠舒..."
msgid "M"
msgstr ""
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "丼"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "仂仄亠"
@@ -6019,7 +6051,7 @@ msgstr "丼仂弍 仗仂于亠亳 亠亠, 于亰仂于亳亠 从仂仆亠从仆
msgid "right click and select `Check signature'.\n"
msgstr "从仆仂仗从仂亶 仄亳, 亳 于弍亠亳亠 '仂于亠亳 仗仂亟仗亳'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/sk.po b/po/sk.po
index 0bdfa599..4ada953e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-01-22 17:46+0100\n"
"Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr "Meno"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -187,7 +187,7 @@ msgstr ""
"Zvolen叩 akcia nem担転e by泥 pou転it叩 v okne p鱈sania spr叩vy,\n"
"preto転e obsahuje %%f, %%F alebo %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"Pr鱈kaz nemohol by泥 vykonan箪. Nepodarilo sa vytvori泥 potrubie.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -411,6 +412,7 @@ msgstr "Otvori泥 adres叩r"
msgid "Name:"
msgstr "Meno:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -435,6 +437,7 @@ msgstr "K坦pia:"
msgid "Bcc:"
msgstr "Slep叩 k坦pia:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Zmaza泥 adresu(y)"
@@ -580,7 +583,8 @@ msgstr "E-mailov叩 adresa"
msgid "Group"
msgstr "Skupina"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Prieinok"
@@ -604,23 +608,23 @@ msgstr "Spolon叩 adresa"
msgid "Personal address"
msgstr "S炭kromn叩 adresa"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Upozornenie"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Varovanie"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Chyba"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Vytv叩ram dial坦g pre varovania...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Zobrazi泥 t炭to spr叩vu nabud炭ce"
@@ -652,6 +656,10 @@ msgstr "Zelen叩"
msgid "Brown"
msgstr "Hned叩"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "貼iadna"
@@ -944,7 +952,7 @@ msgid "Recipient is not specified."
msgstr "Nie je uren箪 pr鱈jemca."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Odosla泥"
@@ -1027,6 +1035,7 @@ msgstr "Vytv叩ram okno pre p鱈sanie spr叩vy...\n"
msgid "MIME type"
msgstr "MIME typ"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1072,7 +1081,8 @@ msgstr "Pripoji泥"
msgid "Attach file"
msgstr "Pripoji泥 s炭bor"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Podpis"
@@ -1150,6 +1160,7 @@ msgstr "Doasn箪 s炭bor: %s"
msgid "Compose: input from monitoring process\n"
msgstr "P鱈sanie: vstup z extern辿ho procesu\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Ned叩 sa spusti泥 extern箪 editor\n"
@@ -1199,6 +1210,7 @@ msgstr "Pou転i泥 邸abl坦nu"
msgid "Replace"
msgstr "Nahradi泥"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Upravi泥 adresu"
@@ -1219,6 +1231,7 @@ msgstr "Mus鱈te zada泥 e-mailov炭 adresu."
msgid "A Name and Value must be supplied."
msgstr "Mus鱈te zada泥 n叩zov a hodnotu."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Upravi泥 炭daje o kontakte"
@@ -1248,6 +1261,7 @@ msgstr "E-mailov叩 adresa"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Posun炭泥 nahor"
@@ -1297,7 +1311,7 @@ msgid " Check File "
msgstr "Testova泥 s炭bor"
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "S炭bor"
@@ -1376,7 +1390,7 @@ msgid "Edit JPilot Entry"
msgstr "Upravi泥 z叩znam JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1440,7 +1454,7 @@ msgstr "Timeout (v sekund叩ch)"
msgid "Maximum Entries"
msgstr "Maximum z叩znamov"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Z叩kladn辿"
@@ -1498,7 +1512,7 @@ msgid "Exporting file:"
msgstr "Exportovan箪 s炭bor:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "Zvo直te..."
@@ -1506,8 +1520,8 @@ msgstr "Zvo直te..."
msgid "Select exporting file"
msgstr "Zvo直te s炭bor pre export"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1606,6 +1620,7 @@ msgstr "Vytv叩ram n叩h直ad pre prieinok...\n"
msgid "New"
msgstr "Nov箪"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Nepre鱈tan辿"
@@ -2078,6 +2093,7 @@ msgstr "Z叩znamy:"
msgid "Import LDIF file into Address Book"
msgstr "Importova泥 s炭bor LDIF do adres叩ra"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Predch叩dzaj炭ci"
@@ -2303,6 +2319,7 @@ msgstr "Zadajte heslo"
msgid "Protocol log"
msgstr "Z叩znam protokolu"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2393,6 +2410,7 @@ msgstr "Spr叩vy vo fronte"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Vo fronte s炭 neodoslan辿 spr叩vy. Ukoni泥 program?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "u転 be転鱈 in叩 k坦pia Sylpheedu.\n"
@@ -2484,6 +2502,7 @@ msgstr "/_S炭bor/_Tlai泥..."
msgid "/_File/_Work offline"
msgstr "/_S炭bor/P_racova泥 odpojen箪"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_S炭bor/Uk_oni泥"
@@ -3185,7 +3204,7 @@ msgstr "Prija泥 nov炭 po邸tu pre v邸etky kont叩"
msgid "Send queued message(s)"
msgstr "Odosla泥 spr叩vy vo fronte"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Nov叩 spr叩va"
@@ -3694,207 +3713,207 @@ msgstr "pr鱈kaz nie je podporovan箪\n"
msgid "error occurred on POP3 session\n"
msgstr "vyskytla sa chyba pri POP3 spojen鱈\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "N叩jden辿 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Nastavenie ulo転en辿.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Otv叩ram okno nastavenia konta...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Konto%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Nastavenie nov辿ho konta"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Nastavenie konta"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Vytv叩ram okno nastavenia konta...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Prija泥"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "S炭kromie"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Roz邸鱈ren辿"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "N叩zov tohto konta"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Nastavi泥 ako v箪chodzie"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Osobn辿 inform叩cie"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Cel辿 meno"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-mailov叩 adresa"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organiz叩cia"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Inform叩cie o serveri"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "貼iadne (lok叩lne)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Tento server vy転aduje autentiz叩ciu"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "News server"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server pre prij鱈manie"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP server (odosielanie)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Prihlasovacie meno"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Heslo"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Tento server vy転aduje autentiz叩ciu"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Vymaza泥 spr叩vy na serveri po ich prijat鱈"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Vymaza泥 po"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "doch"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dn鱈: zmaza泥 ihne)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Prija泥 v邸etky spr叩vy na serveri"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Obmedzenie ve直kosti spr叩vy pre pr鱈jem"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrova泥 spr叩vy pri prijat鱈"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "V箪chodz鱈 inbox"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Nefiltrovan辿 spr叩vy bud炭 umiestnen辿 v tomto prieinku)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Met坦da autentiz叩cie"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatick叩"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "Pri vo直be 'Prija泥 v邸etko' prija泥 spr叩vy aj pre toto konto"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Hlavika"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Prida泥 d叩tum do hlaviky"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generova泥 Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Prida泥 u転ivate直om definovan辿 hlaviky"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Upresni泥... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autentiz叩cia"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP Autentiz叩cia (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3903,172 +3922,172 @@ msgstr ""
"Ak nech叩te tieto polia pr叩zdne, bude pou転it辿 to ist辿\n"
"prihlasovacie meno a heslo ako pri prij鱈man鱈."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autentizova泥 cez POP3 pred odosielan鱈m"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "V箪stup pr鱈kazu"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automaticky nastavi泥 nasleduj炭ce adresy"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "K坦pia"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Slep叩 k坦pia"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Odpoveda泥 komu"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Implicitne za邸ifrova泥 spr叩vu"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Implicitne podp鱈sa泥 spr叩vu"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "ifrova泥 do ASCII-armored tvaru"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Podp鱈sa泥 ist箪m textom"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "K直炭 pre podpis"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Pou転i泥 v箪chodz鱈 k直炭 GnuPG"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Zvoli泥 k直炭 pod直a va邸ej emailovej adresy"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Zada泥 k直炭 rune"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "User alebo key ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Nepou転鱈va泥 SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Pou転i泥 SSL pre POP3 spojenie"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Pou転i泥 pr鱈kaz STARTTLS pre nadviazanie SSL spojenia"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Pou転i泥 SSL pre IMAP4 spojenie"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Pou転i泥 SSL pre NNTP spojenie"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Odosla泥 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Pou転i泥 SSL pre SMTP spojenie"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Pou転鱈va泥 non-blocking SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Vypnite t炭to vo直bu ak m叩te probl辿my pri SSL spojeniach)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Uri泥 SMTP port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Uri泥 POP3 port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Uri泥 IMAP4 port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Uri泥 NNTP port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Uri泥 n叩zov dom辿ny"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Prieinok serveru IMAP"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Ulo転i泥 odoslan辿 spr叩vy do"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Ulo転i泥 koncepty do"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Ulo転i泥 vymazan辿 spr叩vy do"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Nebol zadan箪 n叩zov konta."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Nebola zadan叩 e-mailov叩 adresa."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Nebol zadan箪 SMTP server."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Nebol zadan箪 user ID."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Nebol zadan箪 POP3 server."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Nebol zadan箪 IMAP4 server."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Nebol zadan箪 NNTP server."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4447,6 +4466,7 @@ msgstr "Pri odpovedan鱈 citova泥 spr叩vu"
msgid "Reply button invokes mailing list reply"
msgstr "Tla鱈tko Odpoveda泥 zvol鱈 odpove do mailinglistu"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Form叩t odpovede"
@@ -4455,6 +4475,7 @@ msgstr "Form叩t odpovede"
msgid "Quotation mark"
msgstr "Znaka cit叩cie"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Form叩t posielania alej"
@@ -4483,6 +4504,7 @@ msgstr "Skr叩ti泥 diskusn辿 skupiny dlh邸ie ako"
msgid "letters"
msgstr "p鱈smen"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Zoznam spr叩v"
@@ -5219,22 +5241,29 @@ msgstr "Odpoveda泥 komu:"
msgid "Mark"
msgstr "Znaka"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Pr鱈loha"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Predmet"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Od"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "D叩tum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "鱈slo"
@@ -5637,6 +5666,7 @@ msgstr "Pri vytv叩ran鱈 SSL kontextu sa vyskytla chyba\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL spojenie zlyhalo (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5765,10 +5795,12 @@ msgstr "/_Tlai泥..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "."
@@ -6075,7 +6107,7 @@ msgstr "Pre overenie, vyvolajte kontextov辿 menu\n"
msgid "right click and select `Check signature'.\n"
msgstr "prav箪m tla鱈tkom a vyberte 'Overi泥 podpis'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/sl.po b/po/sl.po
index 27e17d8b..376375d2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2003-01-24 20:39CET\n"
"Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
"Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr "Ime"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -187,7 +187,7 @@ msgstr ""
"Izbranega dejanjani mogoe uporabiti v oknu za sestavljanje,\n"
"saj vsebuje %%f, %%F ali %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"Ukaza ni mogoe prieti. Izdelava cevi je spodletela.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -409,6 +410,7 @@ msgstr "Imenik naslovov"
msgid "Name:"
msgstr "Ime:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -433,6 +435,7 @@ msgstr "Kp:"
msgid "Bcc:"
msgstr "Skp:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Brisanje naslova"
@@ -577,7 +580,8 @@ msgstr "Elektronski naslov"
msgid "Group"
msgstr "Skupina"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Mapa"
@@ -601,23 +605,23 @@ msgstr "Skupni naslov"
msgid "Personal address"
msgstr "Osebni naslov"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Opomba"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Opozorilo"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Napaka"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Delam pogovorno okno z alarmno plo邸o...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Poka転i to sporoilo naslednji"
@@ -649,6 +653,10 @@ msgstr "Zelena"
msgid "Brown"
msgstr "Rjava"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ni"
@@ -942,7 +950,7 @@ msgid "Recipient is not specified."
msgstr "Naslovnik ni doloen."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Po邸lji"
@@ -1024,6 +1032,7 @@ msgstr "Odpiram okno za sestavljanje sporoila...\n"
msgid "MIME type"
msgstr "Tip MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1069,7 +1078,8 @@ msgstr "Pripni"
msgid "Attach file"
msgstr "Pripni datoteko"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Podpis"
@@ -1148,6 +1158,7 @@ msgstr "Zaasna datoteka: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Ne morem pognati zunanjega urejevalnika\n"
@@ -1197,6 +1208,7 @@ msgstr "Uporabi predlogo"
msgid "Replace"
msgstr "Zamenjaj"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Urejanje naslova"
@@ -1217,6 +1229,7 @@ msgstr "Elektronski naslov mora biti podan."
msgid "A Name and Value must be supplied."
msgstr "Ime in vrednost morata biti podana."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Urejanje podatkov o osebi"
@@ -1246,6 +1259,7 @@ msgstr "Elektronski Naslov"
msgid "Alias"
msgstr "Vzdevek"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Premakni navzgor"
@@ -1295,7 +1309,7 @@ msgid " Check File "
msgstr " Preveri Datoteko "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Datoteka"
@@ -1373,7 +1387,7 @@ msgid "Edit JPilot Entry"
msgstr "Urejanje vnosa JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1437,7 +1451,7 @@ msgstr "as izteka (sek.)"
msgid "Maximum Entries"
msgstr "Najveje 邸t. vnosov"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Osnovno"
@@ -1494,7 +1508,7 @@ msgid "Exporting file:"
msgstr "Izvozi datoteko:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Izberi... "
@@ -1502,8 +1516,8 @@ msgstr " Izberi... "
msgid "Select exporting file"
msgstr "Izberite datoteko za izvoziti"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1602,6 +1616,7 @@ msgstr "Delam mapo View...\n"
msgid "New"
msgstr "Novo"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Neprebrano"
@@ -2080,6 +2095,7 @@ msgstr "Zapisi :"
msgid "Import LDIF file into Address Book"
msgstr "Uvozi datoteko LDIF v imenik naslovov"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Prej邸nji"
@@ -2300,6 +2316,7 @@ msgstr "Vnesite geslo"
msgid "Protocol log"
msgstr "Dnevnik protokola"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2388,6 +2405,7 @@ msgstr "akajoa sporoila"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Nekaj neposlamih sporoil je na akanju. Ali naj konam?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "Sylpheed 転e tee.\n"
@@ -2480,6 +2498,7 @@ msgstr "/_Datoteka/_Natisni..."
msgid "/_File/_Work offline"
msgstr "/Datoteka/Vr_ini datoteko"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Datoteka/_Konaj"
@@ -3185,7 +3204,7 @@ msgstr "Pripoji novo po邸to z vseh raunov"
msgid "Send queued message(s)"
msgstr "Po邸lji akajoa sporoila"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Sestavi"
@@ -3696,207 +3715,207 @@ msgstr "Ukaz"
msgid "error occurred on POP3 session\n"
msgstr "Med preverjanjem istovetnosti je pri邸lo do napake\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Najden %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfiguracija je shranjena.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Odpiram okno za nastavitve rauna...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Raun%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Nastavitve novega rauna"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Nastavitve rauna"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Ustvarjam okno za nastavitve rauna...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Sprejmi"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Zasebnost"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Napredno"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Ime tega rauna"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Nastavi kot privzeto"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Osebni podatki"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Polno ime"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Po邸tni naslov"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizacija"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Podatki o stre転niku"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Novice (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Noben (lokalen)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Ta stre転nik zahteva overovitev"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Noviarski stre転nik"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Stre転nik za sprejemanje"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Stre転nik SMTP (po邸iljanje)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Uporabni邸ko ime"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Geslo"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Ta stre転nik zahteva overovitev"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Ob sprejemu odstrani sporoila s stre転nika"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Odstrani po"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dneh"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dnevih: odstrani nemudoma)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Nalo転i vsa sporoila na stre転niku"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Omejitev dol転ine pri sprejemanju"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtriranje sporoil ob sprejemu"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Privzeta mapa za prejeto po邸to"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Nefiltrirana sporoila bodo shranjena v tej mapi)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Overovitvena metoda"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Samodejno"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Poberi vsa' preveri novo po邸to na tem raunu"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Zaglavje"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Dodaj polje z datumom v zaglavje"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generiran ID sporoila"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Dodaj uporabni邸ko definirano zaglavje"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Uredi... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Overovitev"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Avtentikacija SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3905,173 +3924,173 @@ msgstr ""
"e pustite te vnose prazne, bosta uporabljena\n"
"isti uporabn邸ki ID in geslo kot pri sprejemu."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Pred po邸iljanjem avtenticiraj s POP3"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Ukaz"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Samodejno nastavi sledee naslove"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Kp:"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Skp:"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Odgovor za"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "privzeto zakodiraj sporoio"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Privzeto podpi邸i sporoilo"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Uporabi jasen tekstovni podpis"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Klju za podpisovanje"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Uporabi privzet klju GnuPG"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Izberi klju glede na va邸 el. naslov"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Rono doloi klju"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Uporabnik ali ID kljua"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Ne uporabljaj SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Uporabi SSL za povezavo POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Uporabi ukaz STARTTLS za prietek seje SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Uporabi SSL za povezavo IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Uporabi SSL za povezavo NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Po邸lji (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Uporabi SSL za povezavo SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Vnesite vrata SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Vnesite vrata POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Vnesite vrata IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Vnesite vrata NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Vnesite ime domene"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Imenik stre転nika IMAP"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Postavi poslana sporoila v"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Postavi osnutke sporoil v"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Postavi izbrisana sporoila v"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Ime rauna ni vne邸eno."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Elektronski naslov ni naveden."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "Stre転nik SMTP ni naveden."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Uporabnikov ID ni vne邸en."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "Stre転nik POP3 ni vne邸en."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "Stre転nik IMAP4 ni naveden."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "Stre転nik NNTP ni naveden."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4446,6 +4465,7 @@ msgstr "Citiraj sporoila ob odgovarjanju"
msgid "Reply button invokes mailing list reply"
msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Oblika odgovora"
@@ -4454,6 +4474,7 @@ msgstr "Oblika odgovora"
msgid "Quotation mark"
msgstr "Znak za citiranje"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Oblika posredovanja"
@@ -4482,6 +4503,7 @@ msgstr "Skraj邸aj noviarske skupine dalj邸e od"
msgid "letters"
msgstr "Izbri邸i"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Ogled povzetka"
@@ -5223,22 +5245,29 @@ msgstr "Odgovor za:"
msgid "Mark"
msgstr "Oznai"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Priloga"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Zadeva"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Od"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "tevilo"
@@ -5640,6 +5669,7 @@ msgstr "Napaka pri ustvarjanju konteksta ssl\n"
msgid "SSL connect failed (%s)\n"
msgstr "Povezava SSL ni uspela (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5768,10 +5798,12 @@ msgstr "/_Natisni..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Ne."
@@ -6080,7 +6112,7 @@ msgstr "Da ga preverite, odprite meni z\n"
msgid "right click and select `Check signature'.\n"
msgstr "desnim klikom in izberite `Preveri podpis'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/sr.po b/po/sr.po
index 949d48b3..09af6ab7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2002-11-29 21:08+0100\n"
"Last-Translator: garret <garret@garrets.tk>\n"
"Language-Team: Serbian\n"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Name"
msgstr "Ime"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -187,7 +187,7 @@ msgstr ""
"ODabrana akcija se ne m転e koristiti u prozoru za pisanje\n"
"zato 邸to sadr転i %%f, %%F ili %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -196,7 +196,8 @@ msgstr ""
"Naredba se ne mo転e izvr邸iti. Pravljenje cevi nije uspelo.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -409,6 +410,7 @@ msgstr "Adresar"
msgid "Name:"
msgstr "Ime:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -433,6 +435,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Obri邸i adresu/e"
@@ -571,7 +574,8 @@ msgstr "Adresa e-po邸te"
msgid "Group"
msgstr "Grupa"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Direktorijum"
@@ -595,23 +599,23 @@ msgstr "Uobiajene adrese"
msgid "Personal address"
msgstr "Line adrese"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Obave邸tenje"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Upozorenje"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Gre邸ka"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Stvaram dijalog za prozor sa upozorenjem...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Prika転i ovu poruku sledei put"
@@ -643,6 +647,10 @@ msgstr "Zelena"
msgid "Brown"
msgstr "Smea"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ni邸ta"
@@ -936,7 +944,7 @@ msgid "Recipient is not specified."
msgstr "Primalac nije upisan."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Po邸alji"
@@ -1019,6 +1027,7 @@ msgstr "Stvaranje prozora za pisanje...\n"
msgid "MIME type"
msgstr "MIME tip"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1064,7 +1073,8 @@ msgstr "Prikai"
msgid "Attach file"
msgstr "Prikai datoteku"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Potpis"
@@ -1143,6 +1153,7 @@ msgstr "Privremena datoteka: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Napi邸i: unos iz procesa praenja\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Ne mogu pokrenuti nezavisni editor\n"
@@ -1192,6 +1203,7 @@ msgstr "Primeni 邸ablon"
msgid "Replace"
msgstr "Zameni"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Izmeni adresu"
@@ -1212,6 +1224,7 @@ msgstr "Adresa e-po邸te mora biti navedena."
msgid "A Name and Value must be supplied."
msgstr "Ime i iznos moraju biti navedeni."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Izmeni line podatke"
@@ -1241,6 +1254,7 @@ msgstr "Adresa e-po邸te"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Pomeri gore"
@@ -1290,7 +1304,7 @@ msgid " Check File "
msgstr " Proveri datoteku "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Datoteka"
@@ -1368,7 +1382,7 @@ msgid "Edit JPilot Entry"
msgstr "Izmenite JPilot unos"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1432,7 +1446,7 @@ msgstr "Timeout (sek)"
msgid "Maximum Entries"
msgstr "Max. Unos"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Osnovno"
@@ -1489,7 +1503,7 @@ msgid "Exporting file:"
msgstr "Izvozim datoteku:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Odaberite... "
@@ -1497,8 +1511,8 @@ msgstr " Odaberite... "
msgid "Select exporting file"
msgstr "Odaberite datoteku za izvoz"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1597,6 +1611,7 @@ msgstr "Stvaram pregled za direktorijum...\n"
msgid "New"
msgstr "Novo"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Neproitano"
@@ -2075,6 +2090,7 @@ msgstr "Bele邸ke :"
msgid "Import LDIF file into Address Book"
msgstr "Unesi LDIF datoteku u Adresar"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "Preth."
@@ -2295,6 +2311,7 @@ msgstr "Unesite lozinku"
msgid "Protocol log"
msgstr "Zapis protokola"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2383,6 +2400,7 @@ msgstr "Odlo転ene poruke"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Neke neposlate poruke su odlo転ene. Izai odmah?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "drugi Sylpheed ve radi.\n"
@@ -2475,6 +2493,7 @@ msgstr "/_Datoteka/tampanje..."
msgid "/_File/_Work offline"
msgstr "/_Datoteka/_Unesi datoteku"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Datoteka/I_zlaz"
@@ -3181,7 +3200,7 @@ msgstr "Prima novu po邸tu sa svih naloga"
msgid "Send queued message(s)"
msgstr "alje odlo転ene poruku/e"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Napi邸i"
@@ -3692,207 +3711,207 @@ msgstr "Naredba"
msgid "error occurred on POP3 session\n"
msgstr "gre邸ka prilikom provere identiteta\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Pronaeno %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfiguracija je spremljena.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Otvaram prozor za svojstva naloga...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Nalog%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Pode邸avanja za novi nalog"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Pode邸avanje naloga"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Stvaranje prozora za pode邸avanje naloga...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Primanje"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privatnost"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Napredno"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Ime ovog naloga"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Postavi kao uobiajeni"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Line informacije"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Puno ime"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "Adresa e-po邸te"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organizacija"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Informacije o serveru"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Ni邸ta (lokalno)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Ovaj server zahteva proveru identiteta"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "News server"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server za primanje"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP server (slanje)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "ID korisnika"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Lozinka"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "Ovaj server zahteva proveru identiteta"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Ukloni poruke sa servera nakon primanja"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Ukloni posle"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dana"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dana: odmah ukloni)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Preuzmi sve poruke sa servera"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Ogranienje u veliini za primanje"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtriraj poruke pri primanju"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "Uobiajeno sandue"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Nefiltrirane poruke biti e stavljene u ovaj direktorijum)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Nain provere identieta"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatski"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "`Primi sve' proverava poruke za ovaj nalog"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Zaglavlje"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Dodaj polje Datum u zaglavlje"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Generi邸i ID poruke"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Dodaj zaglavlje korisnika"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " Izmeni... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Provera identiteta"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP identifikacija (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3901,173 +3920,173 @@ msgstr ""
"Ako ostavi邸 ove unose prazne, isti\n"
"koririsniki ID i lozinka e biti kori邸eni."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Proveri identitet sa POP3 pre slanja"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
#, fuzzy
msgid "Command output"
msgstr "Naredba"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automatski postavi sledee adrese"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Odvovori-Na"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Uvek 邸ifruj poruke"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Uvek potpi邸i poruke"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Koristi ASCII-armored format za 邸ifrovanje"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Koristi prazan tekst za potpis"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Klju potpisa"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Koristi uobiajeni GnuPG klju"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Odaberi klju po adresi e-po邸te"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Navedi neki drugi klju"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "ID kljua ili korisnika:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Ne koristi SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Koristi SSL za POP3 veze"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Koristi SSL za IMAP4 veze"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Koristi SSL za NNTP veze"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Slanje (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Koristi SSL za SMTP veze"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr ""
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Navedi SMTP port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Navedi POP3 port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Navedi IMAP4 port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Navedi NNTP port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Navedi ime domena"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "Direktorijum IMAP servera"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "Stavi poslate poruke u"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Stavi nedovr邸ene poruke u"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Stavi obrisane poruke u"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Ime naloga nije upisano."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "Adresa e-po邸te nije upisana."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP server nije upisan."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "ID korisnika nije upisan."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 server nije upisan."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 server nije upisan."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP server nije upisan."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4442,6 +4461,7 @@ msgstr "Citiraj poruku pri odgovaranju"
msgid "Reply button invokes mailing list reply"
msgstr "Taster za odgovor povlai odgovor za listu"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Format odgovora"
@@ -4450,6 +4470,7 @@ msgstr "Format odgovora"
msgid "Quotation mark"
msgstr "Oznaka citata"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Format proseivanja"
@@ -4478,6 +4499,7 @@ msgstr "Skrati news grupe du転e od"
msgid "letters"
msgstr "slova"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Pregled odr転avanja"
@@ -5218,22 +5240,29 @@ msgstr "Odvovori-Na:"
msgid "Mark"
msgstr "Oznaka"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Dodatak"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Tema"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Od"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Broj"
@@ -5638,6 +5667,7 @@ msgstr "Gre邸ka pri kreiranju ssl konteksta\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL veza nije uspela (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5766,10 +5796,12 @@ msgstr "/_tampanje..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Ne."
@@ -6077,7 +6109,7 @@ msgstr "Za prvoeru, otvorite kontekst meni sa\n"
msgid "right click and select `Check signature'.\n"
msgstr "desnom tipkom i odaberite `Proveri potpis'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/sv.po b/po/sv.po
index 77a64b84..c865bd53 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-12-05 14:40+0100\n"
"Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -107,7 +107,7 @@ msgstr ""
msgid "Name"
msgstr "Namn"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokoll"
@@ -189,7 +189,7 @@ msgstr ""
"Den valda 奪tg辰rden kan inte anv辰ndas i skrivf旦nstret\n"
"eftersom det inneh奪ller %%f, %%F eller %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -198,7 +198,8 @@ msgstr ""
"Kommandot kunde inte startas. Misslyckades med att skapa r旦r.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -413,6 +414,7 @@ msgstr "Adressbok"
msgid "Name:"
msgstr "Namn:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -437,6 +439,7 @@ msgstr "Kopia:"
msgid "Bcc:"
msgstr "Dold kopia:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Ta bort adress(er)"
@@ -577,7 +580,8 @@ msgstr "E-postadress"
msgid "Group"
msgstr "Grupp"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Mapp"
@@ -601,23 +605,23 @@ msgstr "Vanlig adress"
msgid "Personal address"
msgstr "Privat adress"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Notera"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Varning"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Fel"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Skapar dialog f旦r meddelandepanel...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Visa detta meddelande n辰sta g奪ng"
@@ -649,6 +653,10 @@ msgstr "Gr旦n"
msgid "Brown"
msgstr "Brun"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Ingen"
@@ -933,7 +941,7 @@ msgid "Recipient is not specified."
msgstr "Mottagare 辰r inte angiven."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "Skicka"
@@ -1017,6 +1025,7 @@ msgstr "Skapar skrivf旦nster...\n"
msgid "MIME type"
msgstr "MIME-typ"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1062,7 +1071,8 @@ msgstr "Bifoga"
msgid "Attach file"
msgstr "Bifoga fil"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "Signatur"
@@ -1140,6 +1150,7 @@ msgstr "Tempor辰r fil: %s"
msgid "Compose: input from monitoring process\n"
msgstr "Skriv: indata fr奪n bevakad process\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Kunde inte k旦ra extern redigerare\n"
@@ -1189,6 +1200,7 @@ msgstr "Anv辰nd mall"
msgid "Replace"
msgstr "Ers辰tt"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Redigera adress"
@@ -1209,6 +1221,7 @@ msgstr "En e-postadress m奪ste anges."
msgid "A Name and Value must be supplied."
msgstr "Namn och V辰rde m奪ste anges."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Redigera persondata"
@@ -1238,6 +1251,7 @@ msgstr "E-postadress"
msgid "Alias"
msgstr "Alias"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Flytta upp"
@@ -1287,7 +1301,7 @@ msgid " Check File "
msgstr " Kontrollera fil "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Fil"
@@ -1365,7 +1379,7 @@ msgid "Edit JPilot Entry"
msgstr "Redigera JPilot-post"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1429,7 +1443,7 @@ msgstr "V辰ntetid (sek)"
msgid "Maximum Entries"
msgstr "Maximalt antal poster"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Grundl辰ggande"
@@ -1486,7 +1500,7 @@ msgid "Exporting file:"
msgstr "Exporterar fil:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " V辰lj... "
@@ -1494,8 +1508,8 @@ msgstr " V辰lj... "
msgid "Select exporting file"
msgstr "V辰lj exportfil"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1592,6 +1606,7 @@ msgstr "Skapar mappvy...\n"
msgid "New"
msgstr "Nya"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Ol辰sta"
@@ -2064,6 +2079,7 @@ msgstr "Register:"
msgid "Import LDIF file into Address Book"
msgstr "Importera LDIF-fil till adressboken"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "F旦reg奪ende"
@@ -2287,6 +2303,7 @@ msgstr "Skriv in l旦senord"
msgid "Protocol log"
msgstr "Protokollogg"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2375,6 +2392,7 @@ msgstr "Meddelanden i k旦"
msgid "Some unsent messages are queued. Exit now?"
msgstr "N奪gra oskickade meddelanden ligger i k旦. Avsluta nu?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "en annan instans av Sylpheed 辰r redan ig奪ng.\n"
@@ -2458,6 +2476,7 @@ msgstr "/_Arkiv/Skriv _ut..."
msgid "/_File/_Work offline"
msgstr "/_Arkiv/Arbeta _offline"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Arkiv/_Avsluta"
@@ -3150,7 +3169,7 @@ msgstr "H辰mta ny post fr奪n alla konton"
msgid "Send queued message(s)"
msgstr "Skicka k旦ade meddelanden"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Skriv"
@@ -3658,206 +3677,206 @@ msgstr "kommando 辰r inte st旦tt\n"
msgid "error occurred on POP3 session\n"
msgstr "fel uppstod vid POP3-session\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "Fann %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Konfigurationen 辰r sparad.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "ppnar f旦nster f旦r kontoinst辰llningar...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Konto%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Inst辰llningar f旦r nytt konto"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Kontoinst辰llningar"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Skapar f旦nster f旦r kontoinst辰llningar...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Ta emot"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Integritet"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Avancerat"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Detta kontos namn"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "Anv辰nd som f旦rvalt konto"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Personlig information"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Fullst. namn"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-postadress"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Organisation"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Serverinformation"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Diskussionsgrupper (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Inget (lokalt)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Denna server kr辰ver autentisering"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Diskussionsgruppsserver"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "Server f旦r mottagning"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "Server att skicka med (SMTP)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Anv辰ndar-ID"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "L旦senord"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "Anv辰nd s辰ker autentisering (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "Ta bort meddelanden p奪 server n辰r de mottagits"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Ta bort efter"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "dagar"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 dagar: ta bort direkt)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "H辰mta alla meddelanden fr奪n server"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Gr辰ns f旦r mottagningsstorlek"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "Filtrera meddelanden vid mottagning"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "F旦rvald inkorg"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Autentiseringsmetod"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Automatisk"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "\"H辰mta allt\" h辰mtar post p奪 detta konto"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Brevhuvud"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "L辰gg till datumf辰lt i brevhuvud"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "Skapa Meddelande-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "L辰gg till anv辰ndardefinierat brevhuvud"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr "Redigera..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Autentisering"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP-Autentisering (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3866,172 +3885,172 @@ msgstr ""
"Om du l辰mnar dessa poster tomma, kommer samma\n"
"anv辰ndar-ID och l旦senord som vid h辰mtning att anv辰ndas."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "Autentisera med POP3 innan brev skickas"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Kommandoutdata"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "S辰tt automatiskt f旦ljande adresser"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Kopia"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Dold kopia"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Svara till"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "Kryptera alla meddelanden"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "Signera alla meddelanden"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "Anv辰nd ASCII-pansar f旦r kryptering"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Anv辰nd klartextsignatur"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "Signaturnyckel"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "Anv辰nd f旦rvald GnuPG-nyckel"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "V辰lj nyckel genom din e-postadress"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Ange nyckel manuellt"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Anv辰ndar- eller nyckel-ID:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "Anv辰nd inte SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "Anv辰nd SSL f旦r POP3-f旦rbindelse"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "Anv辰nd STARTTLS-kommando f旦r att starta SSL-session"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "Anv辰nd SSL f旦r IMAP4-f旦rbindelse"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "Anv辰nd SSL f旦r NNTP-f旦rbindelse"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "Skicka (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "Anv辰nd SSL f旦r SMTP-f旦rbindelse"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Anv辰nd icke-blockerande SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(Sl奪 av detta om du har problem med SSL-f旦rbindelsen)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "Ange SMTP-port"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "Ange POP3-port"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "Ange IMAP4-port"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "Ange NNTP-port"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Ange dom辰nnamn"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP-servermapp"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "L辰gg skickade meddelanden i"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "L辰gg utkast i"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "L辰gg borttagna meddelanden i"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Kontonamn har inte angivits."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "E-postadress har inte angivits."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP-server har inte angivits."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Anv辰ndar-ID har inte angivits."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3-server har inte angivits."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4-server har inte angivits."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP-server har inte angivits."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4410,6 +4429,7 @@ msgstr "Citera meddelande vid svar"
msgid "Reply button invokes mailing list reply"
msgstr "Svara-knappen ger svar till e-postlista"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Svarsformat"
@@ -4418,6 +4438,7 @@ msgstr "Svarsformat"
msgid "Quotation mark"
msgstr "Citationstecken"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Vidarebefordringsformat"
@@ -4446,6 +4467,7 @@ msgstr "F旦rkorta diskussionsgrupper l辰ngre 辰n"
msgid "letters"
msgstr "bokst辰ver"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "Summeringsvy"
@@ -5159,22 +5181,29 @@ msgstr "Svara till:"
msgid "Mark"
msgstr "Markering"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Bilaga"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "rende"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Fr奪n"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Datum"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Nummer"
@@ -5577,6 +5606,7 @@ msgstr "Fel vid skapande av SSL-kontext\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL-anslutning misslyckades (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5704,10 +5734,12 @@ msgstr "/Skriv _ut"
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "O"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Nr."
@@ -6012,7 +6044,7 @@ msgstr "F旦r att unders旦ka den, 旦ppna snabbmenyn genom att\n"
msgid "right click and select `Check signature'.\n"
msgstr "h旦gerklicka och v辰lja \"Unders旦k signatur\".\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/tr.po b/po/tr.po
index 51f13f8c..7995d608 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@
msgid ""
msgstr ""
"Project-Id-Version: tr\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-12-03 11:44+0200\n"
"Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
"Language-Team: <gnome-turk@gnome.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
msgid "Name"
msgstr "聴sim"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "Protokol"
@@ -190,7 +190,7 @@ msgstr ""
"Se巽ilen eylem mesaj d端zenleme penceresinde kullan脹lamaz\n"
"端nk端 %%f, %%F veya %%p i巽eriyor."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -199,7 +199,8 @@ msgstr ""
"Komut balat脹lamad脹. Boru yarat脹m脹nda hata olutu.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -414,6 +415,7 @@ msgstr "Adres defteri"
msgid "Name:"
msgstr "聴sim:"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -438,6 +440,7 @@ msgstr "Cc:"
msgid "Bcc:"
msgstr "Bcc:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "Adres(ler)i sil"
@@ -581,7 +584,8 @@ msgstr "聴leti Adresi"
msgid "Group"
msgstr "Grup"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "Dizin"
@@ -605,23 +609,23 @@ msgstr "Ortak adres"
msgid "Personal address"
msgstr "Kiisel adres"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "Not"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "Uyar脹"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "Hata"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "Uyar脹 panel penceresi oluturuluyor...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "Bu iletiyi sonraki a巽脹l脹ta tekrar g旦ster"
@@ -653,6 +657,10 @@ msgstr "Yeil"
msgid "Brown"
msgstr "Kahverengi"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "Hi巽biri"
@@ -937,7 +945,7 @@ msgid "Recipient is not specified."
msgstr "Al脹c脹 belirtilmedi."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "G旦nder"
@@ -1020,6 +1028,7 @@ msgstr "D端zenleme penceresi oluturuluyor...\n"
msgid "MIME type"
msgstr "MIME t端r端"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1065,7 +1074,8 @@ msgstr "Ekle"
msgid "Attach file"
msgstr "Dosya ekle"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "聴mza"
@@ -1143,6 +1153,7 @@ msgstr "Ge巽ici dosya: %s"
msgid "Compose: input from monitoring process\n"
msgstr "D端zenle: s端re巽 g旦r端nt端s端n端 i巽er\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "Harici d端zenleyici 巽al脹t脹r脹lamad脹\n"
@@ -1192,6 +1203,7 @@ msgstr "ablonu uygula"
msgid "Replace"
msgstr "Deitir"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "Adresi D端zenle"
@@ -1212,6 +1224,7 @@ msgstr "Bir e-posta adresi girilmelidir."
msgid "A Name and Value must be supplied."
msgstr "Bir isim ve deer girilmelidir."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "Kii Verilerini D端zenle"
@@ -1241,6 +1254,7 @@ msgstr "E-posta Adresi"
msgid "Alias"
msgstr "Takma isim"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "Yukar脹"
@@ -1290,7 +1304,7 @@ msgid " Check File "
msgstr " Dosyay脹 Denetle "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "Dosya"
@@ -1369,7 +1383,7 @@ msgid "Edit JPilot Entry"
msgstr "JPilot Girdisini D端zenle"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1433,7 +1447,7 @@ msgstr "Zaman a脹m脹 (sn) "
msgid "Maximum Entries"
msgstr "Azami Girdi Say脹s脹"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "Temel"
@@ -1490,7 +1504,7 @@ msgid "Exporting file:"
msgstr "Dosya aktar脹l脹yor:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " Se巽... "
@@ -1498,8 +1512,8 @@ msgstr " Se巽... "
msgid "Select exporting file"
msgstr "Aktar脹lacak dosyay脹 se巽in"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1596,6 +1610,7 @@ msgstr "Dizin g旦r端nt端s端 oluturuluyor...\n"
msgid "New"
msgstr "Yeni"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "Okunmam脹"
@@ -2068,6 +2083,7 @@ msgstr "Kay脹tlar :"
msgid "Import LDIF file into Address Book"
msgstr "LDIF dosyas脹n脹 Adres Defterine aktar"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "nceki"
@@ -2291,6 +2307,7 @@ msgstr "Parolay脹 girin"
msgid "Protocol log"
msgstr "Protokol g端nl端端"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2379,6 +2396,7 @@ msgstr "Kuyruktaki iletiler"
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hala g旦nderilmemi baz脹 iletiler kuyrukta bekliyor. imdi 巽脹k脹ls脹n m脹?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "Baka bir Sylpheed sistemde 巽al脹脹yor.\n"
@@ -2463,6 +2481,7 @@ msgstr "/_Dosya/_Yazd脹r..."
msgid "/_File/_Work offline"
msgstr "/_Dosya/evrimd脹_脹 巽al脹"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/_Dosya/脹_k"
@@ -3155,7 +3174,7 @@ msgstr "T端m hesaplardaki postalar脹 da脹t"
msgid "Send queued message(s)"
msgstr "Kuyruktaki iletileri g旦nder"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "D端zenle"
@@ -3664,206 +3683,206 @@ msgstr "komut desteklenmiyor\n"
msgid "error occurred on POP3 session\n"
msgstr "POP3 oturumunda hata olutu\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "%s bulundu\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "Yap脹land脹rma kaydedildi.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "Hesap tercihleri penceresi a巽脹l脹yor...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "Hesap%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "Yeni hesap i巽in tercihler"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "Hesap tercihleri"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "Hesap tercihleri penceresi oluturuluyor...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "Al"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Gizlilik"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Gelimi"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "Bu hesab脹n ad脹"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "ntan脹ml脹 kullan"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "Kiisel bilgiler"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "Tam ad脹"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "E-Posta adresi"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "Kurum"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "Sunucu bilgisi"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "Haber grubu (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "Hi巽biri (yerel)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "Bu sunucu parola istiyor"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "Haber grubu sunucusu"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "聴letilerin al脹naca脹 sunucu"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "G旦nderme i巽in SMTP sunucu"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "Kullan脹c脹 ad脹"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "Parola"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "G端venli yetkilendirme kullan (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "聴leti al脹nd脹脹 zaman sunucudaki kopyas脹n脹 sil"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "Postay脹"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "g端n sonra sil"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 g端n: hemen sil)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "Sunucudaki t端m iletileri indir"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "Al脹nan ileti boyutu s脹n脹r脹"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "聴letileri al脹rken filtrele"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "ntan脹ml脹 gelen kutusu"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(Filtrelenmemi iletiler bu kutuda bekleyecektir)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "Kimlik denetim y旦ntemi"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "Otomatik"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "'Hepsini Al' se巽enei bu hesaptaki yeni postalar脹 da kontrol etsin"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "Bal脹k"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "Tarih bal脹脹n脹 ekle"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "聴leti Numaras脹 Olutur"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "Kullan脹c脹 tan脹ml脹 bal脹k ekle"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " D端zenle... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "Kimlik denetimi"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3872,172 +3891,172 @@ msgstr ""
"Eer bu girdileri bo b脹rak脹rsan脹z, ayn脹\n"
"kullan脹c脹 ad脹 ve parolas脹 kullan脹l脹r."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "G旦ndermeden 旦nce POP3 ile kimlik denetimi yap"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "Komut 巽脹kt脹s脹"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Aa脹daki adresleri otomatik olarak tan脹mla"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "Cc"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "Bcc"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "Yan脹tla"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "聴letileri 旦ntan脹ml脹 olarak ifrele"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "聴letileri 旦ntan脹ml脹 olarak imzala"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "ASCII format脹nda ifrele"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "Metin formatl脹 imza ekle"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "聴mza anahtar脹"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "ntan脹ml脹 GnuPG anahtar脹n脹 kullan"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "Anahtar脹 e-posta adresine g旦re se巽"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "Anahtar脹 elle se巽"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "Kullan脹c脹 ya da anahtar numaras脹:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "SSL kullanma"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "POP3 balant脹s脹 i巽in SSL kullan"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "SSL oturumuna balamak i巽in STARTSSL komutunu kullan"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "IMAP4 balant脹s脹 i巽in SSL kullan"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "NNTP balant脹s脹 i巽in SSL kullan"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "G旦nder (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SMTP balant脹s脹 i巽in SSL kullan"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "Bloklanmam脹 SSL Kullan"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(SSL balant脹s脹nda sorunlar ya脹yorsan脹z, bu 旦zellii kapat脹n)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "SMTP portu belirt"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "POP3 portu belirt"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "IMAP4 portu belirt"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "NNTP portu belirt"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "Alan ad脹 belirt"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP sunucu dizini"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "G旦nderilen iletileri nerede sakla"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "Taslak mesajlar脹n脹 buraya koy"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "Silinen mesajlar脹 buraya koy"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "Hesap ad脹 girilmemi."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "聴leti adresi girilmemi."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "SMTP sunucu girilmemi."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "Kullan脹c脹 numaras脹 girilmemi."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "POP3 sunucu girilmemi."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "IMAP4 sunucu girilmemi."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "NNTP sunucu girilmemi."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4417,6 +4436,7 @@ msgstr "Yan脹tlarken al脹nt脹 yap"
msgid "Reply button invokes mailing list reply"
msgstr "Yan脹tla tuu eposta listelerine de yan脹tlas脹n"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "Yan脹tlama format脹"
@@ -4425,6 +4445,7 @@ msgstr "Yan脹tlama format脹"
msgid "Quotation mark"
msgstr "Al脹nt脹 iareti"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "Y旦nlendirme bi巽imi"
@@ -4453,6 +4474,7 @@ msgstr "Belirtilenden daha uzun olan haber gruplar脹n脹 k脹salt"
msgid "letters"
msgstr "posta"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "zet G旦r端n端m"
@@ -5164,22 +5186,29 @@ msgstr "Yan脹tla:"
msgid "Mark"
msgstr "聴aretle"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "Ek"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "Konu"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "Kimden"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "Tarih"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "Numara"
@@ -5580,6 +5609,7 @@ msgstr "SSL metni oluturulurken hata\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL balant脹s脹nda hata (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5707,10 +5737,12 @@ msgstr "/_Yazd脹r...."
msgid "M"
msgstr "聴"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "O"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "Hay脹r."
@@ -6015,7 +6047,7 @@ msgstr "Kontrol etmek i巽in, i巽erik men端s端n端\n"
msgid "right click and select `Check signature'.\n"
msgstr "ile a巽脹n, sa t脹klay脹n ve '聴mzay脹 Kontrol Et'i se巽in.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/uk.po b/po/uk.po
index e8ed85cb..0537ab9a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 1.0.0beta1\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
"Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
msgid "Name"
msgstr "仄'"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "仂仂从仂仍"
@@ -190,7 +190,7 @@ msgstr ""
"弍舒仆 亟 仆亠 仄仂亢仆舒 于亢亳于舒亳 于从仆 于仂亠仆仆,\n"
"仂从仍从亳 于仂仆舒 仄亳 %%f, %%F 舒弍仂 %%p."
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -199,7 +199,8 @@ msgstr ""
"仂仄舒仆亟 仆亠 亰舒仗亠仆仂. 亠 于亟舒仍仂 于仂亳亳 从舒仆舒仍.\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -414,6 +415,7 @@ msgstr "亟亠仆舒 从仆亳亞舒"
msgid "Name:"
msgstr "仄':"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -438,6 +440,7 @@ msgstr "仂仗:"
msgid "Bcc:"
msgstr "亳仂于舒仆仂:"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "亳亟舒仍亳亳 舒亟亠(亳)"
@@ -576,7 +579,8 @@ msgstr "亟亠舒 e-mail"
msgid "Group"
msgstr "仗舒"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "舒仗从舒"
@@ -600,23 +604,23 @@ msgstr "亟亠舒 仂亞舒仆亰舒"
msgid "Personal address"
msgstr "仂弍亳舒 舒亟亠舒"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "亳仄从舒"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "仂仗亠亠亟亢亠仆仆"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "仂仄亳仍从舒"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "弌于仂亠仆仆 亟舒仍仂亞 亠仄仆仂于仂亞仂 仗仂仗亠亠亟亢亠仆仆...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "仂从舒亰舒亳 亠 仗仂于亟仂仄仍亠仆仆 仆舒仗仆仂亞仂 舒亰"
@@ -648,6 +652,10 @@ msgstr "亠仍亠仆亳亶"
msgid "Brown"
msgstr "仂亳仆亠于亳亶"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "磻亳亶"
@@ -932,7 +940,7 @@ msgid "Recipient is not specified."
msgstr "亠 于从舒亰舒仆仂 仂亳仄于舒舒."
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr "仂仍舒亳"
@@ -1015,6 +1023,7 @@ msgstr "亟从亳于舒仄仂 于从仆仂 于仂亠仆仆 仍亳舒...\n"
msgid "MIME type"
msgstr "亳仗 MIME"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1060,7 +1069,8 @@ msgstr "亳亟仆舒亳"
msgid "Attach file"
msgstr "亳亟仆舒亳 舒亶仍"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "亟仗亳"
@@ -1138,6 +1148,7 @@ msgstr "丐亳仄舒仂于亳亶 舒亶仍: %s"
msgid "Compose: input from monitoring process\n"
msgstr "弌于仂亠仆仆: 于于亟 于亟 仗仂亠亞舒ム仂亞仂 仗仂亠\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "亠 于亟舒仍仂 亰舒仗亳亳 亰仂于仆仆亶 亠亟舒从仂\n"
@@ -1187,6 +1198,7 @@ msgstr "舒仂于舒亳 舒弍仍仂仆"
msgid "Replace"
msgstr "舒仄仆亳亳"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "亠亟舒亞于舒亳 舒亟亠"
@@ -1207,6 +1219,7 @@ msgstr "亟亠舒 e-mail 仂弍仂于'磶从仂于舒."
msgid "A Name and Value must be supplied."
msgstr "仂弍仆仂 仆舒亟舒亳 仄' 舒 亰仆舒亠仆仆."
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "亠亟舒亞于舒亳 仂仂弍亳 亟舒仆"
@@ -1236,6 +1249,7 @@ msgstr "亟亠舒 e-mail"
msgid "Alias"
msgstr "弌亳仆仂仆仄"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "亞仂"
@@ -1285,7 +1299,7 @@ msgid " Check File "
msgstr " 亠亠于亳亳 舒亶仍 "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "个舒亶仍"
@@ -1363,7 +1377,7 @@ msgid "Edit JPilot Entry"
msgstr "亠亟舒亞于舒亳 亰舒仗亳 JPilot"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1427,7 +1441,7 @@ msgstr "丐舒亶仄舒 ()"
msgid "Maximum Entries"
msgstr "舒从亳仄舒仍仆亳亶 仂亰仄 亠亰仍舒"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "仆仂于仆"
@@ -1484,7 +1498,7 @@ msgid "Exporting file:"
msgstr "从仗仂 舒亶仍舒:"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " 弍舒亳... "
@@ -1492,8 +1506,8 @@ msgstr " 弍舒亳... "
msgid "Select exporting file"
msgstr "弍亠 舒亶仍 亟仍 亠从仗仂"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1591,6 +1605,7 @@ msgstr "弌于仂亠仆仆 仂弍仍舒 仗亠亠亞仍磲 仗舒仗仂从...\n"
msgid "New"
msgstr "仂于"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "亠仗仂亳舒仆"
@@ -2063,6 +2078,7 @@ msgstr "舒仗亳亳 :"
msgid "Import LDIF file into Address Book"
msgstr "仄仗仂于舒亳 舒亶仍 LDIF 于 舒亟亠仆 从仆亳亞"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "舒亰舒亟"
@@ -2286,6 +2302,7 @@ msgstr "于亠亟 仗舒仂仍"
msgid "Protocol log"
msgstr "仆舒仍 仗仂仂从仂仍"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2374,6 +2391,7 @@ msgstr "亳亳 于 亠亰"
msgid "Some unsent messages are queued. Exit now?"
msgstr "亠磻 仆亠于亟仍舒仆 仍亳亳 - 于 亠亰. 亳亶亳 亰舒舒亰?"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "于亢亠 亰舒仗亠仆仂 仆亳亶 Sylpheed.\n"
@@ -2465,6 +2483,7 @@ msgstr "/个舒亶仍/从于舒亳..."
msgid "/_File/_Work offline"
msgstr "/个舒亶仍/舒ミ火委亳 弍亠亰 亰'亟仆舒仆仆"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/个舒亶仍/亳亶亳"
@@ -3160,7 +3179,7 @@ msgstr "亳仄舒亳 仆仂于 仍亳亳 亟仍 于 亰舒仗亳于"
msgid "Send queued message(s)"
msgstr "亟仍舒亳 仍亳(亳) 亰 亠亞亳"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "弌于仂亠仆仆 仍亳舒"
@@ -3668,207 +3687,207 @@ msgstr "从仂仄舒仆亟舒 仆亠 仗亟亳仄\n"
msgid "error occurred on POP3 session\n"
msgstr "仗仂仄亳仍从舒 仗亟 舒 亠 POP3\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "仆舒亶亟亠仆仂 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "仂仆亞舒 亰弍亠亠亢亠仆仂.\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "亟从亳 于从仆舒 仂仗亶 account'舒...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "舒仗亳%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "舒仍舒于舒仆仆 亟仍 仆仂于仂亞仂 亰舒仗亳"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "舒仍舒于舒仆仆 亰舒仗亳"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "弌于仂亠仆仆 于从仆舒 仂仗亶 亰舒仗亳...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "亳仄舒仆仆"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "Privacy"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "Advanced"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "舒亰于舒 仂亞仂 亰舒仗亳"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "舒仆仂于亳亳 磻 default"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "仂弍亳舒 仆仂仄舒"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr "仂于仆亠 仄'"
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "仂仂于舒 舒亟亠舒"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "亞舒仆亰舒"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "仆仂仄舒 仗仂 亠于亠"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "仂于亳仆亳 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "亠仄舒 (仍仂从舒仍仆仂)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "丶亠亶 亠于亠 于亳仄舒亞舒 舒亠仆亳从舒"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "弌亠于亠 仆仂于亳仆"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "弌亠于亠 亟仍 仂亳仄舒仆仆"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "弌亠于亠 SMTP (于亟亳仍舒仆仆)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "ID 从仂亳于舒舒"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "舒仂仍"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
#, fuzzy
msgid "Use secure authentication (APOP)"
msgstr "丶亠亶 亠于亠 于亳仄舒亞舒 舒亠仆亳从舒"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "亳亟舒仍亳 仍亳亳 仆舒 亠于亠 仗仍 仂亳仄舒仆仆"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "亳亟舒仍亳亳 亠亠亰"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "亟仆于"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 亟仆于 - 于亳亟舒仍亳 仆亠亞舒亶仆仂)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "舒于舒仆舒亢亳亳 于 仍亳亳 仆舒 亠于亠"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "弍仄亠亢亠仆仆 仂亰仄 仂亳仄舒仆亳 仍亳于"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "弍"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "个仍于舒亳 仍亳亳 仗亳 仂亳仄舒仆仆"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "亟仆舒 仗舒仗从舒 仗仂 亰舒仄仂于于舒仆仆"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(丐 从仍舒亟舒仄仂 仆亠于亟仍仂于舒仆 仍亳亳)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "亠仂亟 舒亠仆亳从舒"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr "于仂仄舒亳仆仂"
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "亠亠于亳 亰舒 从仂仄舒仆亟仂 `亳仄舒亳 于'"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "舒亞仂仍仂于仂从"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "仂亟舒亳 仗仂仍亠 亟舒亳 亰舒亞仂仍仂于从舒"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "亠仆亠于舒亳 Message-ID"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "亢亳于舒亳 亰舒亞仂仍仂于仂从, 于亳亰仆舒亠仆亳亶 从仂亳于舒亠仄"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " 亠亟舒亞于舒亳... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "亠仆亳从舒"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "亠仆亳从舒 SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3877,172 +3896,172 @@ msgstr ""
"亊从仂 亳 亰舒仍亳亳亠 仗仂仍 仗仂仂亢仆仄亳, 弍亟亠 于亢亳仂 亢\n"
"ID 从仂亳于舒舒 舒 仗舒仂仍, 仂 亶 亟仍 仂亳仄舒仆仆 仗仂亳."
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "亠仆亳从舒 POP3 仗亠亠亟 于亟亳仍舒仆仆礆"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "亳于亟 从仂仄舒仆亟亳"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "于仂仄舒亳仆仂 于舒仆仂于仍ミ火委亳 仆舒仗仆 舒亟亠亳"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "仂仗"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "亳仂于舒仆仂"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "于仂仂仆 舒亟亠舒"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "丿亳于舒亳 仍亳 仗仂 亰舒仄仂于于舒仆仆"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "亟仗亳于舒亳 仍亳 仗仂 亰舒仄仂于于舒仆仆"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "亢亳于舒亳 \"ASCII-armored\" 仂仄舒 亟仍 亳于舒仆仆"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "亢亳于舒亳 仗亟仗亳 于亟从亳亳仄 亠从仂仄"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "仍ム 仗亟仗亳"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "亢亳于舒亳 从仍ム GnuPG 仗仂 亰舒仄仂于于舒仆仆"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "弍舒亳 从仍ム 亰舒 舒仂 舒亟亠仂 e-mail"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "亳亰仆舒亳亳 从仍ム 于仍舒仆仂仆仂"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "仂亳于舒 舒弍仂 亟亠仆亳从舒仂 从仍ム舒:"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "亠 于亢亳于舒亳 SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "亢亳于舒亳 SSL 亟仍 亰'亟仆舒仆仆 POP3"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "亢亳于舒亳 从仂仄舒仆亟 STARTTLS 亟仍 仗仂舒从 亠 SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "亢亳于舒亳 SSL 亟仍 亰'亟仆舒仆仆 IMAP4"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "亢亳于舒亳 SSL 亟仍 亰'亟仆舒仆仆 NNTP"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "亟亳仍从舒 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "亢亳于舒亳 SSL 亟仍 亰'亟仆舒仆仆 SMTP"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "亢亳于舒亳 仆亠弍仍仂从ム亳亶 SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(亳仄从仆 亠, 磻仂 亳从舒亠 亰 仗仂弍仍亠仄舒仄亳 仗亳 亰'亟仆舒仆仆 SSL )"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "从舒亰舒亳 仗仂 SMTP"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "从舒亰舒亳 仗仂 POP3"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "从舒亰舒亳 仗仂 IMAP4"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "从舒亰舒亳 仗仂 NNTP"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "从舒亰舒亳 仄' 亟仂仄亠仆舒"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "舒舒仍仂亞 亠于亠舒 IMAP"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "弍亠亞舒亳 于亟仍舒仆 仍亳亳 于"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "弍亠亞舒亳 仂仆仂于亳从亳 仍亳于 于"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "弍亠亞舒亳 于亳亟舒仍亠仆 仍亳亳 于"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "舒亰于 亰舒仗亳 仆亠 于从舒亰舒仆仂."
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "亠 于从舒亰舒仆仂 仗仂仂于 舒亟亠."
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "亠 于从舒亰舒仆仂 亠于亠 SMTP."
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "亠 于从舒亰舒仆仂 ID 从仂亳于舒舒."
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "亠 于从舒亰舒仆仂 亠于亠 POP3."
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "亠 于从舒亰舒仆仂 亠于亠 IMAP4."
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "亠 于从舒亰舒仆仂 亠于亠 NNTP."
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4421,6 +4440,7 @@ msgstr "丶亳于舒亳 仍亳 仗亳 于亟仗仂于亟"
msgid "Reply button invokes mailing list reply"
msgstr "仆仂仗从舒 于亟仗仂于亟 亰舒仗从舒 于亟仗仂于亟 从仂仆亠亠仆"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "个仂仄舒 于亟仗仂于亟"
@@ -4429,6 +4449,7 @@ msgstr "个仂仄舒 于亟仗仂于亟"
msgid "Quotation mark"
msgstr "仆舒从 亳舒亳"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "个仂仄舒 仗亠亠亳仍舒仆仆"
@@ -4457,6 +4478,7 @@ msgstr "弌从仂仂于舒亳 仆舒亰于亳 从仂仆亠亠仆亶, 亟仂于 仆
msgid "letters"
msgstr "仍亠"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "弌仗亳仂从 仗仂于亟仂仄仍亠仆"
@@ -5169,22 +5191,29 @@ msgstr "于仂仂仆:"
msgid "Mark"
msgstr "仂亰仆舒从舒"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "从仍舒亟亠仆仆"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "丐亠仄舒"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "亟"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "舒舒"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "仂仄亠"
@@ -5586,6 +5615,7 @@ msgstr "仂仄亳仍从舒 于仂亠仆仆 从仂仆亠从 ssl\n"
msgid "SSL connect failed (%s)\n"
msgstr "弍亶 从仂仆亠从 SSL (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5715,10 +5745,12 @@ msgstr "/从..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "仂仄亠"
@@ -6023,7 +6055,7 @@ msgstr "乂仂弍 仗亠亠于亳亳 亶仂亞仂, 于亳从仍亳亠 从仂仆亠从
msgid "right click and select `Check signature'.\n"
msgstr "仗舒于仂 从仆仂仗从仂 仂弍亠 `亠亠于亳亳 仗亟仗亳'.\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 572ca8f3..e2f2f280 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2005-02-02 09:02+0800\n"
"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -103,7 +103,7 @@ msgstr ""
msgid "Name"
msgstr "腱"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "顒"
@@ -185,7 +185,7 @@ msgstr ""
"篏筝遵医腦d戎鐚\n"
"筝阪 %%f, %%F or %%p "
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -194,7 +194,8 @@ msgstr ""
"巡擦羈綮榊♂紊沿乾\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -409,6 +410,7 @@ msgstr "医膂"
msgid "Name:"
msgstr "紮鐚"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -433,6 +435,7 @@ msgstr "鐚"
msgid "Bcc:"
msgstr "絲篁倶鐚"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "ゅ医"
@@ -568,7 +571,8 @@ msgstr "球篁九医"
msgid "Group"
msgstr "臂ょ"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "篁九す"
@@ -592,23 +596,23 @@ msgstr "医"
msgid "Personal address"
msgstr "筝篋阪医"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "羈"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "茘"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "莚"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "罩e綮堺∽水壕罅...\n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "筝罨∴丞ず莚ヤ拭"
@@ -640,6 +644,10 @@ msgstr "膸粋"
msgid "Brown"
msgstr "罍"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr "羃≧"
@@ -924,7 +932,7 @@ msgid "Recipient is not specified."
msgstr "羃≧絎銀散篋冴"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr ""
@@ -1007,6 +1015,7 @@ msgstr "罩e綮堺医腦...\n"
msgid "MIME type"
msgstr "MIME 膠糸"
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1052,7 +1061,8 @@ msgstr "篁"
msgid "Attach file"
msgstr "ラ篁"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "膈上"
@@ -1130,6 +1140,7 @@ msgstr "筝贋倶篁駈%s"
msgid "Compose: input from monitoring process\n"
msgstr "医鐚篁菴腮筝莨\n"
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "羈ц紊膽莨\n"
@@ -1179,6 +1190,7 @@ msgstr "篏睡罔≧"
msgid "Replace"
msgstr "炊"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "膽莨医"
@@ -1199,6 +1211,7 @@ msgstr "綽蕁肢ョ球篁九医"
msgid "A Name and Value must be supplied."
msgstr "綽蕁肢ュ絖若"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "膽莨膤私査篆≧"
@@ -1228,6 +1241,7 @@ msgstr "球篁九医"
msgid "Alias"
msgstr ""
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "筝腱"
@@ -1277,7 +1291,7 @@ msgid " Check File "
msgstr " 罍ユ篁 "
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "篁"
@@ -1355,7 +1369,7 @@ msgid "Edit JPilot Entry"
msgstr "膽莨 JPilot 蕁"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr " ... "
@@ -1419,7 +1433,7 @@ msgstr "莇(腱)"
msgid "Maximum Entries"
msgstr "紊ч々"
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "堺"
@@ -1476,7 +1490,7 @@ msgid "Exporting file:"
msgstr "絲弱堺篁駈"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr " ... "
@@ -1484,8 +1498,8 @@ msgstr " ... "
msgid "Select exporting file"
msgstr "絲弱堺篁"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1582,6 +1596,7 @@ msgstr "罩e綮堺篁九す茹...\n"
msgid "New"
msgstr "医産"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "莚"
@@ -2054,6 +2069,7 @@ msgstr "莅医鐚"
msgid "Import LDIF file into Address Book"
msgstr "絲弱 LDIF 篁九医医膂"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "筝筝筝"
@@ -2277,6 +2293,7 @@ msgstr "莨ュ"
msgid "Protocol log"
msgstr "顒莅医"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2364,6 +2381,7 @@ msgstr "筝篁"
msgid "Some unsent messages are queued. Exit now?"
msgstr "筝篋篆>散茴上ラー阪鐚"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "Ϊ筝筝 Sylpheed 罩e菴茵\n"
@@ -2448,6 +2466,7 @@ msgstr "/篁(_F)/(_P)..."
msgid "/_File/_Work offline"
msgstr "/篁(_F)/胼紫鎖綏ヤ(_W)"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/篁(_F)/(_X)"
@@ -3139,7 +3158,7 @@ msgstr "綛倶絽埇育篁"
msgid "Send queued message(s)"
msgstr "筝篁"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "医"
@@ -3647,206 +3666,206 @@ msgstr "筝巡擦\n"
msgid "error occurred on POP3 session\n"
msgstr "POP3 篌莚莚\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "ー %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "臀綏牙鋓絖\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "罩e綣絽埌蕁合...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "絽%d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "医埇薤蕁"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "絽埌蕁"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "罩e綮阪埌蕁合...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "・"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "腱"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "蕭膾"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "絽垸腱"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "莅丞舟筝咲莅ゅ"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "筝篋肴"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr ""
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "篁九医"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "膸膸"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "≦莎"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "育紫 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr "()"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "莚ユ≦荀薨莚"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "育紫≦"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "・倶≦"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "SMTP≦()"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "桁"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "絲"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "篏睡絎薨莚 (APOP)"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "九育篁九篁≦筝"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "篁ュ"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "紊"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(0 紊鐚腴喝)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "筝莉醇≦筝篁"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "・九ぇ絨"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr "KB"
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "・狗篁倶区茵菴羯"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "藥莅ゆ銀散膊"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "(羃≧菴羯ょ篁銀篆絖莚ユ篁九す筝)"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "薨莚号"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr ""
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "・金倶ヨュ埇育篁"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "篁九ご"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "羞糸ユ紊翫"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "篁倶莚"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "羞糸桁箙紊翫"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr " 膽莨... "
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "薨莚"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP薨莚(SMTP AUTH)"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
@@ -3855,172 +3874,172 @@ msgstr ""
"絋筝紂菴篋蕁刻絨篏睡・狗篁句後\n"
"桁d擦"
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "POP3薨莚"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "巡擦莨"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "莅丞舟篁ヤ医"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr ""
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "絲篁倶"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "紊"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "藥莅ゅ拷篁九絲"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "藥莅ゅ拷篁句上"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "篏睡 ASCII 茖号弱颷茵絲"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "篏睡膈上"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "膈上絲"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "篏睡藥莅ょGnuPG絲"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "ч篁九医絲"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "綏ユ絎絲"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "傑絲ID鐚"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "筝篏睡SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "篏睡SSL菴・POP3≦"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr "篏睡STARTTLS巡擦綣紮SSL篌莚"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "篏睡SSL菴・IMAP4≦"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "篏睡SSL菴・NNTP≦"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "(SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "篏睡SSL菴・SMTP≦"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "篏睡糸綣SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "(絋SSL菴・蘂鐚莚桁渇莚ラ蕁)"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "絎SMTP腴"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "絎POP3腴"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "絎IMAP4腴"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "絎NNTP腴"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "絎"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP4 ≦綵"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "絨綏峨榊篁銀絖篋"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "絨篁区腮推絖篋"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "絨ょ篁銀絖篋"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "羃≧莨ュ垸腱違"
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "羃≧莨ラ篁九医"
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "羃≧莨SMTP≦"
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "羃≧莨ョ傑莚"
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "羃≧莨POP3≦"
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "羃≧莨IMAP4≦"
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "羃≧莨NNTP≦"
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4398,6 +4417,7 @@ msgstr "紊九"
msgid "Reply button invokes mailing list reply"
msgstr "紊篌紊育篁九茵"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "紊弱"
@@ -4406,6 +4426,7 @@ msgstr "紊弱"
msgid "Quotation mark"
msgstr "綣膃"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "莉弱"
@@ -4434,6 +4455,7 @@ msgstr "膽育紫推"
msgid "letters"
msgstr "篆>散"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "荀茹"
@@ -5142,22 +5164,29 @@ msgstr "紊鰹"
msgid "Mark"
msgstr "莅"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr "篁"
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "筝脂"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "篁銀査"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "ユ"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "綺"
@@ -5561,6 +5590,7 @@ msgstr "綮SSL筝筝九莚\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL菴・紊沿乾(%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5688,10 +5718,12 @@ msgstr "/(_P)..."
msgid "M"
msgstr "M"
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr "U"
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr "No."
@@ -5996,7 +6028,7 @@ msgstr "荀罍ュ鐚糸勌綣劫坂筝\n"
msgid "right click and select `Check signature'.\n"
msgstr "綛狗罍ョ上\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 5f3f810b..99a161b6 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
-"Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-02-04 15:19+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-07 18:21+0900\n"
"PO-Revision-Date: 2004-12-04 08:24+0800\n"
"Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
"Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -90,7 +90,7 @@ msgstr ""
msgid "Name"
msgstr "腮"
-#: src/account.c:639 src/prefs_account.c:832
+#: src/account.c:639 src/prefs_account.c:833
msgid "Protocol"
msgstr "荐絎"
@@ -172,7 +172,7 @@ msgstr ""
"後篁ょ≧惹医篆>散\n"
"阪 %%f, %%F, %%p"
-#: src/action.c:704
+#: src/action.c:705
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
@@ -181,7 +181,8 @@ msgstr ""
"≧篁わ膊∞≧綮榊鐚\n"
"%s"
-#: src/action.c:792
+#. Fork error
+#: src/action.c:793
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -396,6 +397,7 @@ msgstr "篏膂"
msgid "Name:"
msgstr "紮鐚"
+#. Buttons
#: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
@@ -420,6 +422,7 @@ msgstr ""
msgid "Bcc:"
msgstr "絲篁九"
+#. Confirm deletion
#: src/addressbook.c:838
msgid "Delete address(es)"
msgstr "や膣"
@@ -559,7 +562,8 @@ msgstr "糸灸散篆∞"
msgid "Group"
msgstr "臂ょ"
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1822
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1823
msgid "Folder"
msgstr "莖紊"
@@ -583,23 +587,23 @@ msgstr "援篏膣"
msgid "Personal address"
msgstr "腱篋坂膣"
-#: src/alertpanel.c:122 src/compose.c:4974 src/main.c:464
+#: src/alertpanel.c:123 src/compose.c:4974 src/main.c:464
msgid "Notice"
msgstr "羈"
-#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
+#: src/alertpanel.c:136 src/main.c:261 src/textview.c:1650
msgid "Warning"
msgstr "茘"
-#: src/alertpanel.c:148 src/compose.c:2756 src/inc.c:557
+#: src/alertpanel.c:149 src/compose.c:2756 src/inc.c:557
msgid "Error"
msgstr "茯"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:192
msgid "Creating alert panel dialog...\n"
msgstr "∝茘絨荅掩筝... \n"
-#: src/alertpanel.c:277
+#: src/alertpanel.c:278
msgid "Show this message next time"
msgstr "筝罨≦"
@@ -631,6 +635,10 @@ msgstr "膓"
msgid "Brown"
msgstr "罍"
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we
+#. * pass an invalid (high) value. also we attach a data pointer so we
+#. * can always get back the SummaryView pointer.
#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
msgid "None"
msgstr ""
@@ -915,7 +923,7 @@ msgid "Recipient is not specified."
msgstr "羃絎銀散篋冴"
#: src/compose.c:2501 src/compose.c:4279 src/mainwindow.c:2133
-#: src/prefs_account.c:702 src/prefs_common.c:843
+#: src/prefs_account.c:703 src/prefs_common.c:843
msgid "Send"
msgstr ""
@@ -997,6 +1005,7 @@ msgstr "∝育灸散...\n"
msgid "MIME type"
msgstr "MIME "
+#. S_COL_DATE
#: src/compose.c:3817 src/mimeview.c:148 src/prefs_filter_edit.c:569
#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
msgid "Size"
@@ -1042,7 +1051,8 @@ msgstr ""
msgid "Attach file"
msgstr "罟罅"
-#: src/compose.c:4328 src/prefs_account.c:1337 src/prefs_common.c:1254
+#. signature
+#: src/compose.c:4328 src/prefs_account.c:1338 src/prefs_common.c:1254
msgid "Signature"
msgstr "膂遵"
@@ -1120,6 +1130,7 @@ msgstr "絖罟罅鐚%s"
msgid "Compose: input from monitoring process\n"
msgstr ""
+#. failed
#: src/compose.c:5042
msgid "Couldn't exec external editor\n"
msgstr "≧決紊膩莠\n"
@@ -1169,6 +1180,7 @@ msgstr "絅篆>散罔f"
msgid "Replace"
msgstr "臀"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
#: src/editaddress.c:177
msgid "Edit address"
msgstr "膩莠篏膣"
@@ -1189,6 +1201,7 @@ msgstr "莠後ラ糸灸散篆∞宴"
msgid "A Name and Value must be supplied."
msgstr "莠後ュ腮沿"
+#. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
#: src/editaddress.c:640
msgid "Edit Person Data"
msgstr "膩莠篋榊莖"
@@ -1218,6 +1231,7 @@ msgstr "E-Mail篏"
msgid "Alias"
msgstr "ュ"
+#. Buttons
#: src/editaddress.c:872
msgid "Move Up"
msgstr "筝腱"
@@ -1267,7 +1281,7 @@ msgid " Check File "
msgstr "罟∽ユ罅(_C)"
#: src/editbook.c:203 src/editjpilot.c:308 src/editvcard.c:223
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1349
msgid "File"
msgstr "/罟罅(_F)"
@@ -1345,7 +1359,7 @@ msgid "Edit JPilot Entry"
msgstr "膩莠 JPilot 莖"
#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
-#: src/importldif.c:527 src/prefs_account.c:1850
+#: src/importldif.c:527 src/prefs_account.c:1851
msgid " ... "
msgstr "..."
@@ -1409,7 +1423,7 @@ msgstr ""
msgid "Maximum Entries"
msgstr ""
-#: src/editldap.c:463 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:699
msgid "Basic"
msgstr "堺荐絎"
@@ -1466,7 +1480,7 @@ msgid "Exporting file:"
msgstr "堺鐚"
#: src/export.c:185 src/export.c:191 src/import.c:190 src/import.c:196
-#: src/prefs_account.c:1081
+#: src/prefs_account.c:1082
msgid " Select... "
msgstr "御..."
@@ -1474,8 +1488,8 @@ msgstr "御..."
msgid "Select exporting file"
msgstr "御堺罅鐚"
-#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
-#: src/prefs_account.c:562 src/prefs_account.c:576
+#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/prefs_account.c:563 src/prefs_account.c:577
#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
msgid "failed to write configuration to file\n"
@@ -1572,6 +1586,7 @@ msgstr "∝莖紊...\n"
msgid "New"
msgstr "亥"
+#. S_COL_MARK
#: src/folderview.c:285 src/prefs_summary_column.c:68
msgid "Unread"
msgstr "莅"
@@ -2044,6 +2059,7 @@ msgstr "膣鐚"
msgid "Import LDIF file into Address Book"
msgstr "絨 LDIF 罟ヤ膂"
+#. Button panel
#: src/importldif.c:760
msgid "Prev"
msgstr "筝絨"
@@ -2265,6 +2281,7 @@ msgstr "莠後ュ腆"
msgid "Protocol log"
msgstr "荐絎膣"
+#. for gettext
#: src/main.c:128 src/main.c:137 src/mh.c:792
#, c-format
msgid ""
@@ -2350,6 +2367,7 @@ msgstr "坂拭篁"
msgid "Some unsent messages are queued. Exit now?"
msgstr "篋篆>散罩e絖莖紊鞘賢絨冴腆阪荀∫鐚"
+#. remote command mode
#: src/main.c:551
msgid "another Sylpheed is already running.\n"
msgstr "綏牙 Sylpheed 腮綣閫e決筝\n"
@@ -2433,6 +2451,7 @@ msgstr "/罟罅(_F)/...(_P)"
msgid "/_File/_Work offline"
msgstr "/罟罅(_F)/∝綏ヤ(_W)"
+#. {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
#: src/mainwindow.c:482
msgid "/_File/E_xit"
msgstr "/罟罅(_F)/∫(_X)"
@@ -3125,7 +3144,7 @@ msgstr "罟∽ユ絽活育灸散"
msgid "Send queued message(s)"
msgstr "絨絖莖紊鞘賢篆>散"
-#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
+#: src/mainwindow.c:2144 src/prefs_account.c:705 src/prefs_common.c:845
#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "医灸散"
@@ -3629,378 +3648,378 @@ msgstr "巡擦\n"
msgid "error occurred on POP3 session\n"
msgstr "篏睡 POP3 荐絎主茯\n"
-#: src/prefs.c:200
+#: src/prefs.c:201
#, c-format
msgid "Found %s\n"
msgstr "上 %s\n"
-#: src/prefs.c:233
+#: src/prefs.c:234
msgid "Configuration is saved.\n"
msgstr "腟荐絎綏峨峨\n"
-#: src/prefs_account.c:607
+#: src/prefs_account.c:608
msgid "Opening account preferences window...\n"
msgstr "絽活荐絎荀腦...\n"
-#: src/prefs_account.c:633
+#: src/prefs_account.c:634
#, c-format
msgid "Account%d"
msgstr "絽活 %d"
-#: src/prefs_account.c:652
+#: src/prefs_account.c:653
msgid "Preferences for new account"
msgstr "医験荐絎"
-#: src/prefs_account.c:657
+#: src/prefs_account.c:658
msgid "Account preferences"
msgstr "絽活荐絎"
-#: src/prefs_account.c:680
+#: src/prefs_account.c:681
msgid "Creating account preferences window...\n"
msgstr "∝絽活荐絎荀腦...\n"
-#: src/prefs_account.c:700 src/prefs_common.c:841
+#: src/prefs_account.c:701 src/prefs_common.c:841
msgid "Receive"
msgstr "・区┃絎"
-#: src/prefs_account.c:707 src/prefs_common.c:854
+#: src/prefs_account.c:708 src/prefs_common.c:854
msgid "Privacy"
msgstr "腱篋肴"
-#: src/prefs_account.c:711
+#: src/prefs_account.c:712
msgid "SSL"
msgstr ""
-#: src/prefs_account.c:714
+#: src/prefs_account.c:715
msgid "Advanced"
msgstr "臥荐絎"
-#: src/prefs_account.c:763
+#: src/prefs_account.c:764
msgid "Name of this account"
msgstr "絽活腮"
-#: src/prefs_account.c:772
+#: src/prefs_account.c:773
msgid "Set as default"
msgstr "荐咲荐絽活"
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
msgid "Personal information"
msgstr "篋肴荐"
-#: src/prefs_account.c:785
+#: src/prefs_account.c:786
msgid "Full name"
msgstr ""
-#: src/prefs_account.c:791
+#: src/prefs_account.c:792
msgid "Mail address"
msgstr "糸灸散医"
-#: src/prefs_account.c:797
+#: src/prefs_account.c:798
msgid "Organization"
msgstr "/腟膵"
-#: src/prefs_account.c:821
+#: src/prefs_account.c:822
msgid "Server information"
msgstr "篌堺莖荐"
-#: src/prefs_account.c:842 src/prefs_account.c:989 src/prefs_account.c:1594
+#: src/prefs_account.c:843 src/prefs_account.c:990 src/prefs_account.c:1595
msgid "POP3"
msgstr ""
-#: src/prefs_account.c:844 src/prefs_account.c:1101 src/prefs_account.c:1611
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:845 src/prefs_account.c:1102 src/prefs_account.c:1612
+#: src/prefs_account.c:1799
msgid "IMAP4"
msgstr ""
-#: src/prefs_account.c:846
+#: src/prefs_account.c:847
msgid "News (NNTP)"
msgstr "域 (NNTP)"
-#: src/prefs_account.c:848
+#: src/prefs_account.c:849
msgid "None (local)"
msgstr " (local)"
-#: src/prefs_account.c:861
+#: src/prefs_account.c:862
msgid "This server requires authentication"
msgstr "篌堺荀茯茘"
-#: src/prefs_account.c:900
+#: src/prefs_account.c:901
msgid "News server"
msgstr "域篌堺"
-#: src/prefs_account.c:906
+#: src/prefs_account.c:907
msgid "Server for receiving"
msgstr "・狗灸散篌堺"
-#: src/prefs_account.c:912
+#: src/prefs_account.c:913
msgid "SMTP server (send)"
msgstr "守灸散篌堺 (SMTP)"
-#: src/prefs_account.c:919 src/prefs_account.c:1257
+#: src/prefs_account.c:920 src/prefs_account.c:1258
msgid "User ID"
msgstr "絽活"
-#: src/prefs_account.c:925 src/prefs_account.c:1266
+#: src/prefs_account.c:926 src/prefs_account.c:1267
msgid "Password"
msgstr "絲腆"
-#: src/prefs_account.c:997
+#: src/prefs_account.c:998
msgid "Use secure authentication (APOP)"
msgstr "篏睡絎茯茘鐚APOP鐚"
-#: src/prefs_account.c:1000
+#: src/prefs_account.c:1001
msgid "Remove messages on server when received"
msgstr "・狗灸散筝篏球篌堺筝腱脂ゃ"
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1012
msgid "Remove after"
msgstr "綛上ぉ緇わ"
-#: src/prefs_account.c:1020
+#: src/prefs_account.c:1021
msgid "days"
msgstr "紊"
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1038
msgid "(0 days: remove immediately)"
msgstr "(荐 0 榊喝)"
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
msgid "Download all messages on server"
msgstr "・銀失筝灸散"
-#: src/prefs_account.c:1050
+#: src/prefs_account.c:1051
msgid "Receive size limit"
msgstr "・狗灸散紊у"
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
msgid "KB"
msgstr ""
-#: src/prefs_account.c:1064
+#: src/prefs_account.c:1065
msgid "Filter messages on receiving"
msgstr "・銀拭篁倶画羶"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1073
msgid "Default inbox"
msgstr "荐銀散紊"
-#: src/prefs_account.c:1095
+#: src/prefs_account.c:1096
msgid "(Unfiltered messages will be stored in this folder)"
msgstr "鐚膓羶丞篆>散絨茴育莖紊鞘鐚"
-#: src/prefs_account.c:1112 src/prefs_account.c:1228
+#: src/prefs_account.c:1113 src/prefs_account.c:1229
msgid "Authentication method"
msgstr "茯茘号"
-#: src/prefs_account.c:1122 src/prefs_account.c:1238 src/prefs_common.c:1182
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1182
msgid "Automatic"
msgstr ""
-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1131
msgid "`Get all' checks for new messages on this account"
msgstr "罟∽ャ罟∽ラ絽活育灸散"
-#: src/prefs_account.c:1178 src/prefs_customheader.c:189
+#: src/prefs_account.c:1179 src/prefs_customheader.c:189
msgid "Header"
msgstr "篆>散罔荐絎"
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1186
msgid "Add Date header field"
msgstr "ユユ"
-#: src/prefs_account.c:1186
+#: src/prefs_account.c:1187
msgid "Generate Message-ID"
msgstr "∝灸散茘ョ⊆"
-#: src/prefs_account.c:1193
+#: src/prefs_account.c:1194
msgid "Add user-defined header"
msgstr "ヤ戎絎臂罔"
-#: src/prefs_account.c:1195 src/prefs_common.c:1698 src/prefs_common.c:1723
+#: src/prefs_account.c:1196 src/prefs_common.c:1698 src/prefs_common.c:1723
msgid " Edit... "
msgstr "膩莠..."
-#: src/prefs_account.c:1205
+#: src/prefs_account.c:1206
msgid "Authentication"
msgstr "茯茘"
-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1214
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP 茯茘"
-#: src/prefs_account.c:1288
+#: src/prefs_account.c:1289
#, fuzzy
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr "ユ罩ゆ腥榊緒絨篏睡・倶絽活絲腆若"
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1301
msgid "Authenticate with POP3 before sending"
msgstr "篆≦ POP3 茯茘"
-#: src/prefs_account.c:1356
+#: src/prefs_account.c:1357
msgid "Command output"
msgstr "巡擦莠後"
-#: src/prefs_account.c:1367 src/prefs_folder_item.c:300
+#: src/prefs_account.c:1368 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "檎罨篏筝ヤ糸灸散篆∞縁"
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1377
msgid "Cc"
msgstr "茲"
-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1390
msgid "Bcc"
msgstr "絲篁区"
-#: src/prefs_account.c:1402
+#: src/prefs_account.c:1403
msgid "Reply-To"
msgstr "篆≦医"
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1455
msgid "Encrypt message by default"
msgstr "篆>散絲"
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1457
msgid "Sign message by default"
msgstr "篆>散娯膂順"
-#: src/prefs_account.c:1458
+#: src/prefs_account.c:1459
msgid "Use ASCII-armored format for encryption"
msgstr "篏睡 ASCII-armored 弱絲"
-#: src/prefs_account.c:1460
+#: src/prefs_account.c:1461
msgid "Use clear text signature"
msgstr "篏睡腆主綾"
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
msgid "Sign key"
msgstr "膂順医"
-#: src/prefs_account.c:1473
+#: src/prefs_account.c:1474
msgid "Use default GnuPG key"
msgstr "篏睡荐 GnuPG key"
-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1483
msgid "Select key by your email address"
msgstr "号篏糸灸散医御 key"
-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1492
msgid "Specify key manually"
msgstr "絎 key"
-#: src/prefs_account.c:1507
+#: src/prefs_account.c:1508
msgid "User or key ID:"
msgstr "篏睡篁h key 茘ョ⊆鐚"
-#: src/prefs_account.c:1602 src/prefs_account.c:1619 src/prefs_account.c:1635
-#: src/prefs_account.c:1653
+#: src/prefs_account.c:1603 src/prefs_account.c:1620 src/prefs_account.c:1636
+#: src/prefs_account.c:1654
msgid "Don't use SSL"
msgstr "筝篏睡 SSL"
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1606
msgid "Use SSL for POP3 connection"
msgstr "POP3 g篏睡 SSL"
-#: src/prefs_account.c:1608 src/prefs_account.c:1625 src/prefs_account.c:1659
+#: src/prefs_account.c:1609 src/prefs_account.c:1626 src/prefs_account.c:1660
msgid "Use STARTTLS command to start SSL session"
msgstr " STARTTLS 巡擦箴 SSL"
-#: src/prefs_account.c:1622
+#: src/prefs_account.c:1623
msgid "Use SSL for IMAP4 connection"
msgstr "IMAP4 g篏睡 SSL"
-#: src/prefs_account.c:1628
+#: src/prefs_account.c:1629
msgid "NNTP"
msgstr ""
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1644
msgid "Use SSL for NNTP connection"
msgstr "NNTP g篏睡 SSL"
-#: src/prefs_account.c:1645
+#: src/prefs_account.c:1646
msgid "Send (SMTP)"
msgstr "篆∴┃絎 (SMTP)"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1657
msgid "Use SSL for SMTP connection"
msgstr "SMTP g篏睡 SSL"
-#: src/prefs_account.c:1667
+#: src/prefs_account.c:1668
msgid "Use non-blocking SSL"
msgstr "篏睡 non-blocking SSL"
-#: src/prefs_account.c:1679
+#: src/prefs_account.c:1680
msgid "(Turn this off if you have problems in SSL connection)"
msgstr "鐚ユ篏睡 SSL g主馹鐚茫罩ら檎鐚"
-#: src/prefs_account.c:1768
+#: src/prefs_account.c:1769
msgid "Specify SMTP port"
msgstr "絎 SMTP f・"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1775
msgid "Specify POP3 port"
msgstr "絎 POP3 f・"
-#: src/prefs_account.c:1780
+#: src/prefs_account.c:1781
msgid "Specify IMAP4 port"
msgstr "絎 IMAP4 f・"
-#: src/prefs_account.c:1786
+#: src/prefs_account.c:1787
msgid "Specify NNTP port"
msgstr "絎 NNTP f・"
-#: src/prefs_account.c:1791
+#: src/prefs_account.c:1792
msgid "Specify domain name"
msgstr "絎膓峨"
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1810
msgid "IMAP server directory"
msgstr "IMAP 篌堺"
-#: src/prefs_account.c:1863
+#: src/prefs_account.c:1864
msgid "Put sent messages in"
msgstr "絨綏臥坂篆>散絖"
-#: src/prefs_account.c:1865
+#: src/prefs_account.c:1866
msgid "Put draft messages in"
msgstr "絨篆>散腮水"
-#: src/prefs_account.c:1867
+#: src/prefs_account.c:1868
msgid "Put deleted messages in"
msgstr "絨や拭篁九"
-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1929
msgid "Account name is not entered."
msgstr "莠後ュ験腮宴"
-#: src/prefs_account.c:1932
+#: src/prefs_account.c:1933
msgid "Mail address is not entered."
msgstr "莠後ラ糸灸散篆∞宴"
-#: src/prefs_account.c:1937
+#: src/prefs_account.c:1938
msgid "SMTP server is not entered."
msgstr "莠後ョ守灸散篌堺"
-#: src/prefs_account.c:1942
+#: src/prefs_account.c:1943
msgid "User ID is not entered."
msgstr "莠後ヤ戎絽活"
-#: src/prefs_account.c:1947
+#: src/prefs_account.c:1948
msgid "POP3 server is not entered."
msgstr "莠後ユ・狗灸散篌堺"
-#: src/prefs_account.c:1952
+#: src/prefs_account.c:1953
msgid "IMAP4 server is not entered."
msgstr "莠後ユ・狗灸散篌堺"
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:1958
msgid "NNTP server is not entered."
msgstr "莠後ユ域篌堺"
-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2040
msgid ""
"It's not recommended to use the old style ASCII-armored\n"
"mode for encrypted messages. It doesn't comply with the\n"
@@ -4371,6 +4390,7 @@ msgstr "篆≧綣"
msgid "Reply button invokes mailing list reply"
msgstr "莅 Mailing List 篆>散筝荀茵腓阪荀腟 Mailing list"
+#. reply
#: src/prefs_common.c:1404
msgid "Reply format"
msgstr "荀弱"
@@ -4379,6 +4399,7 @@ msgstr "荀弱"
msgid "Quotation mark"
msgstr "綣荐膃"
+#. forward
#: src/prefs_common.c:1443
msgid "Forward format"
msgstr "莉絲弱"
@@ -4407,6 +4428,7 @@ msgstr "域臂ょ膰絲桁墾紊ф"
msgid "letters"
msgstr "絖罸"
+#. ---- Summary ----
#: src/prefs_common.c:1593
msgid "Summary View"
msgstr "篆>散茵"
@@ -5113,22 +5135,29 @@ msgstr "篆>鐚"
msgid "Mark"
msgstr "罔荐"
+#. S_COL_UNREAD
#: src/prefs_summary_column.c:69
msgid "Attachment"
msgstr ""
+#. S_COL_MIME
+#. S_COL_UNREAD
+#. S_COL_MIME
#: src/prefs_summary_column.c:70 src/summaryview.c:383
msgid "Subject"
msgstr "筝脂"
+#. S_COL_SUBJECT
#: src/prefs_summary_column.c:71 src/summaryview.c:384
msgid "From"
msgstr "箴羣(From)"
+#. S_COL_FROM
#: src/prefs_summary_column.c:72 src/summaryview.c:385
msgid "Date"
msgstr "ユ"
+#. S_COL_SIZE
#: src/prefs_summary_column.c:74
msgid "Number"
msgstr "膩"
@@ -5530,6 +5559,7 @@ msgstr "SSL 活叱主茯\n"
msgid "SSL connect failed (%s)\n"
msgstr "SSL g紊掩 (%s)\n"
+#. Get the cipher
#: src/ssl.c:113
#, c-format
msgid "SSL connection using %s\n"
@@ -5657,10 +5687,12 @@ msgstr "/...(_P)"
msgid "M"
msgstr ""
+#. S_COL_MARK
#: src/summaryview.c:381
msgid "U"
msgstr ""
+#. S_COL_SIZE
#: src/summaryview.c:387
msgid "No."
msgstr ""
@@ -5965,7 +5997,7 @@ msgstr "荀罟∽ユ娯膂順鐚茫筝羯藜勌灸研筝\n"
msgid "right click and select `Check signature'.\n"
msgstr "御罟∽ユ娯膂順\n"
-#: src/textview.c:1640
+#: src/textview.c:1646
#, c-format
msgid ""
"The real URL (%s) is different from\n"