Translate help strigns.

diff --git a/Makefile.in b/Makefile.in
index 30381fd741d4b30897251933d31e00744509d8a0..2c4b1c2c2b251f4fa052594f357ef35abcfa181b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,6 +164,23 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
+DEP_FILES =  .deps/addrbook.P .deps/alias.P .deps/attach.P \
+.deps/browser.P .deps/buffy.P .deps/charset.P .deps/color.P \
+.deps/commands.P .deps/complete.P .deps/compose.P .deps/copy.P \
+.deps/curs_lib.P .deps/curs_main.P .deps/date.P .deps/dotlock.P \
+.deps/edit.P .deps/enter.P .deps/filter.P .deps/flags.P .deps/from.P \
+.deps/getdomain.P .deps/gnupgparse.P .deps/handler.P .deps/hash.P \
+.deps/hdrline.P .deps/headers.P .deps/help.P .deps/history.P \
+.deps/hook.P .deps/imap.P .deps/init.P .deps/keymap.P .deps/lib.P \
+.deps/main.P .deps/mbox.P .deps/menu.P .deps/mh.P .deps/mutt_dotlock \
+.deps/mutt_dotlock.P .deps/mx.P .deps/pager.P .deps/parse.P \
+.deps/pattern.P .deps/pgp.P .deps/pgpinvoke.P .deps/pgpkey.P \
+.deps/pgppubring.P .deps/pop.P .deps/postpone.P .deps/query.P \
+.deps/recvattach.P .deps/resize.P .deps/rfc1524.P .deps/rfc2047.P \
+.deps/rfc822.P .deps/score.P .deps/send.P .deps/sendlib.P \
+.deps/sha1dgst.P .deps/signal.P .deps/snprintf.P .deps/socket.P \
+.deps/sort.P .deps/status.P .deps/strcasecmp.P .deps/system.P \
+.deps/thread.P
 SOURCES = mutt_dotlock.c $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
 OBJECTS = mutt_dotlock.o $(mutt_OBJECTS)
 
@@ -172,9 +189,9 @@ all: all-recursive-am all-am
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-       cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -234,9 +251,6 @@ uninstall-binPROGRAMS:
          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
        done
 
-.c.o:
-       $(COMPILE) -c $<
-
 .s.o:
        $(COMPILE) -c $<
 
@@ -362,6 +376,11 @@ distdir: $(DISTFILES)
        -rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(distdir) && pwd`; \
+       distdir=`cd $(distdir) && pwd`; \
+       cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
@@ -376,6 +395,30 @@ distdir: $(DISTFILES)
          (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+       -rm -rf .deps
+
+%.o: %.c
+       @echo '$(COMPILE) -c $<'; \
+       $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.c
+       @echo '$(LTCOMPILE) -c $<'; \
+       $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+       @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+         < .deps/$(*F).p > .deps/$(*F).P
+       @-rm -f .deps/$(*F).p
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
@@ -422,18 +465,20 @@ maintainer-clean-generic:
        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-               mostlyclean-compile mostlyclean-tags \
+               mostlyclean-compile mostlyclean-tags mostlyclean-depend \
                mostlyclean-generic
 
 clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-               clean-generic mostlyclean-am
+               clean-depend clean-generic mostlyclean-am
 
 distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-               distclean-tags distclean-generic clean-am
+               distclean-tags distclean-depend distclean-generic \
+               clean-am
 
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
                maintainer-clean-compile maintainer-clean-tags \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-depend maintainer-clean-generic \
+               distclean-am
 
 mostlyclean:  mostlyclean-recursive mostlyclean-am
 
@@ -457,11 +502,13 @@ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec-am uninstall-am \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
+install-exec-am uninstall-am install-exec install-data install \
+uninstall all installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
 
 
 mutt_dotlock.c: dotlock.c

diff --git a/charsets/Makefile.in b/charsets/Makefile.in
index c97e1e2229377d7814f04f3714b59b5fcfa21940..68a0393ece50fd1e7b8f3b0406b2d9c8ea883813 100644 (file)
--- a/charsets/Makefile.in
+++ b/charsets/Makefile.in
@@ -41,6 +41,8 @@ distclean: clean veryclean
 veryclean:
        -rm -f `cat charsets.list` charsets.list charsets.alias
 
+maintainer-clean: distclean
+
 charmaps: parse_i18n
        ( cd $(srcdir) && ./gen_charsets )
 

diff --git a/compose.c b/compose.c
index 377ee37af8c97c11e01e617e005c2aad423e5514..24a163d95e73afc4d7224382d13dd3ac47d2f9fa 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -65,7 +65,7 @@ static struct mapping_t ComposeHelp[] = {
   { "To",      OP_COMPOSE_EDIT_TO },
   { "CC",      OP_COMPOSE_EDIT_CC },
   { "Subj",    OP_COMPOSE_EDIT_SUBJECT },
-  { N_("Attach"),  OP_COMPOSE_ATTACH_FILE },
+  { N_("Attach file"),  OP_COMPOSE_ATTACH_FILE },
   { N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION },
   { N_("Help"),    OP_HELP },
   { NULL }

diff --git a/help.c b/help.c
index 22dbabf6a139fb681ae8038c1b94e8f618d11c33..6dbd8cea08e57b8e00243a37f8a3109a1c49eec7 100644 (file)
--- a/help.c
+++ b/help.c
@@ -76,7 +76,7 @@ mutt_compile_help (char *buf, size_t buflen, int menu, struct mapping_t *items)
       *pbuf++ = ' ';
       buflen -= 2;
     }
-    mutt_make_help (pbuf, buflen, items[i].name, menu, items[i].value);
+    mutt_make_help (pbuf, buflen, gettext(items[i].name), menu, items[i].value);
     len = strlen (pbuf);
     pbuf += len;
     buflen -= len;

diff --git a/pager.c b/pager.c
index 5ec569c61e81402d48aa26671fc7515ed2190c15..0919acb125562c1b5ef43f5efd6a305537323884 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1354,6 +1354,22 @@ upNLines (int nlines, struct line_t *info, int cur, int hiding)
   return cur;
 }
 
+static struct mapping_t PagerHelp[] = {
+  { N_("Exit"),        OP_PAGER_EXIT },
+  { N_("PrevPg"),      OP_PREV_PAGE },
+  { N_("NextPg"), OP_NEXT_PAGE },
+  { NULL,      0 }
+};
+static struct mapping_t PagerHelpExtra[] = {
+  { N_("View Attachm."),       OP_VIEW_ATTACHMENTS },
+  { N_("Del"), OP_DELETE },
+  { N_("Reply"),       OP_REPLY },
+  { N_("Next"),        OP_MAIN_NEXT_UNDELETED },
+  { NULL,      0 }
+};
+
+
+
 /* This pager is actually not so simple as it once was.  It now operates in
    two modes: one for viewing messages and the other for viewing help.  These
    can be distinguished by whether or not ``hdr'' is NULL.  The ``hdr'' arg
@@ -1392,20 +1408,6 @@ mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra)
   int old_PagerIndexLines;             /* some people want to resize it
                                         * while inside the pager... */
 
-  static struct mapping_t PagerHelp[] = {
-    { N_("Exit"),      OP_PAGER_EXIT },
-    { N_("PrevPg"),    OP_PREV_PAGE },
-    { N_("NextPg"), OP_NEXT_PAGE },
-    { NULL,    0 }
-  };
-  static struct mapping_t PagerHelpExtra[] = {
-    { N_("Attach"),    OP_VIEW_ATTACHMENTS },
-    { N_("Del"),       OP_DELETE },
-    { N_("Reply"),     OP_REPLY },
-    { N_("Next"),      OP_MAIN_NEXT_UNDELETED },
-    { NULL,    0 }
-  };
-
   do_color = do_color ? M_SHOWCOLOR : M_SHOWFLAT;
 
   if ((fp = fopen (fname, "r")) == NULL)
@@ -1444,11 +1446,13 @@ mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra)
   if (IsHeader (extra))
   {
     mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER, PagerHelpExtra);
+    strcat (helpstr, "  ");
     strcat (helpstr, buffer);
   }
   if (!InHelp)
   {
     mutt_make_help (buffer, sizeof (buffer), _("Help"), MENU_PAGER, OP_HELP);
+    strcat (helpstr, "  ");
     strcat (helpstr, buffer);
   }
 

diff --git a/postpone.c b/postpone.c
index 42a31f5b9d69f3b156b143e08b2cbeab08de4806..4b8cfb7278af802ab6b434b8e8707c0d725c81e3 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -29,10 +29,10 @@
 #include <sys/stat.h>
 
 static struct mapping_t PostponeHelp[] = {
-  { "Exit",  OP_EXIT },
-  { "Del",   OP_DELETE },
-  { "Undel", OP_UNDELETE },
-  { "Help",  OP_HELP },
+  { N_("Exit"),  OP_EXIT },
+  { N_("Del"),   OP_DELETE },
+  { N_("Undel"), OP_UNDELETE },
+  { N_("Help"),  OP_HELP },
   { NULL }
 };