Gettext staff moved to 'po' directory. Main 'configure' now do not check for

gettext and related staff.

11 files changed, 147 insertions, 727 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d3bdd40..e9684532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 23 12:48:23 MSK 2016
+        Move all gettext-related staff to 'po' subdirectory.
+        Excluded gettext files generation from normal build.
+        Removed generated files from GIT. -EG
+
 Tue Nov 15 19:08:43 MSK 2016
         Fixed forwarding "upgraded" TLS connections for
         chunks sizes larger than buffer size. -EG
diff --git a/Makefile.am b/Makefile.am
index 1a47fba2..a8eaa2cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 # This Makefile.am is in the public domain
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = contrib m4 src po .
+SUBDIRS = contrib m4 src .
+DIST_SUBDIRS = $(SUBDIRS) po
+EXTRA_PO_DIST = po/ABOUT-NLS $(top_srcdir)/po/configure.ac po/configure
 W32COMMON = w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc \
   w32/common/MHD_config.h w32/common/vs_dirs.props w32/common/common-build-settings.vcxproj \
   w32/common/libmicrohttpd-build-settings.vcxproj w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \
@@ -15,9 +17,9 @@ W32VS2015 = w32/VS2015/libmicrohttpd.vcxproj w32/VS2015/libmicrohttpd.vcxproj.fi
   w32/VS2015/simplepost.vcxproj w32/VS2015/largepost.vcxproj \
   w32/VS2015/libmicrohttpd.sln
 EXTRA_DIST = \
-  ABOUT-NLS \
   acinclude.m4 \
   libmicrohttpd.pc.in \
+  $(EXTRA_PO_DIST) \
   $(W32COMMON) $(W32VS2013) $(W32VS2015)
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -26,3 +28,75 @@ pkgconfig_DATA = libmicrohttpd.pc
 if BUILD_DOC
 SUBDIRS += doc
 endif
+
+.PHONY: po-files update-po-files po-files-pre-distdir renew-po-configure.ac update-POTFILES.in
+
+# Do not override automake rule, only add prerequisite
+distdir@EMPTY_VAR@: po-files-pre-distdir
+
+# Do not override automake rule, only add prerequisite
+distclean-recursive@EMPTY_VAR@: po/Makefile
+
+srcdir_po = $(top_srcdir)/po
+
+# Test target: build main po file
+po-files: $(srcdir_po)/libmicrohttpd.pot
+
+# Test target: force update all po files
+update-po-files: po-files-pre-distdir Makefile
+        @$(am__cd) po && $(MAKE) $(AM_MAKEFLAGS) libmicrohttpd.pot-update
+
+# Update po-related files before make distdir
+po-files-pre-distdir: update-POTFILES.in renew-po-configure.ac
+        @$(MAKE) $(AM_MAKEFLAGS) po/Makefile
+
+# Clean in po directory only if po/Makefile was generated to avoid
+# useless generation of po/Makefile only for 'clean' target
+clean-local:
+        @ if test -f po/Makefile; then $(am__cd) po && $(MAKE) $(AM_MAKEFLAGS) clean || exit 1; fi;
+
+po/Makefile: $(srcdir_po)/Makefile.in.in $(srcdir_po)/Makevars $(srcdir_po)/POTFILES.in po/config.status
+        @$(am__cd) po && @SHELL@ ./config.status ./Makefile.in po-directories
+
+# Regenerate po/config.status if this Makefile is changed as configure parameters may be updated
+po/config.status: $(srcdir_po)/configure Makefile
+        @$(MKDIR_P) po && $(am__cd) po && echo "cd po && @SHELL@ ./configure @ac_configure_args@" && \
+          @SHELL@ $(abs_top_srcdir)/po/configure @ac_configure_args@ --srcdir=$(abs_top_srcdir)/po \
+            --disable-option-checking --no-create --no-recursion
+
+# Next rules actually create files in source tree, not in build tree, but those files should
+# stay in source tree and should be distributed in tarball, i.e. should not be created during
+# normal builds.
+$(srcdir_po)/libmicrohttpd.pot: po/Makefile
+        @$(am__cd) po && $(MAKE) $(AM_MAKEFLAGS) libmicrohttpd.pot
+
+# This target doesn't depend on po/configure.acT so po/configure.ac (and po/configure) will not be
+# forced to regenerate after each run of main configure.
+# If po/configure.ac is missing - it will be generated.
+$(srcdir_po)/configure.ac:
+        @$(MAKE) $(AM_MAKEFLAGS) renew-po-configure.ac
+
+# Update po/configure.ac only if po/configure.acT (generated by main configure) is different.
+# If po/configure.ac is unchanged then po/configure will not be regenerated
+renew-po-configure.ac:
+        @$(MAKE) $(AM_MAKEFLAGS) po/configure.acT && \
+          if ! test -f $(srcdir_po)/configure.ac || \
+             ! cmp -s po/configure.acT $(srcdir_po)/configure.ac ; then \
+            echo "cp po/configure.acT $(srcdir_po)/configure.ac" && \
+            cp po/configure.acT $(srcdir_po)/configure.ac || exit 1; \
+          fi
+
+$(srcdir_po)/configure: $(srcdir_po)/configure.ac
+        @$(am__cd) $(srcdir_po) && echo "Creating po/configure..." && \
+          echo "@ACLOCAL@" && @ACLOCAL@ && \
+          echo "@AUTOCONF@" && @AUTOCONF@
+
+# Generate po/POTFILES.in if po/POTFILES.in is missing
+$(srcdir_po)/POTFILES.in:
+        @$(MAKE) $(AM_MAKEFLAGS) update-POTFILES.in
+
+update-POTFILES.in:
+        @$(am__cd) $(srcdir_po) && echo @ECHO_N@ "Creating po/POTFILES.in... @ECHO_C@" && \
+          find '../src/include' ! -name 'include' -prune -name '*.h' ! -name 'mhd_options.h' > POTFILES.in && \
+          find '../src/microhttpd' ! -name 'microhttpd' -prune \( -name '*.h' -o -name '*.c' \) ! -name 'test_*' >> POTFILES.in && \
+          echo "@ECHO_T@done." || (rm -f POTFILES.in ; echo "@ECHO_T@failed." && false)
diff --git a/bootstrap b/bootstrap
index 41295bf6..0ce931c8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,4 +4,3 @@ if ! test -n "$BASH_SOURCE" || ! workdir="${BASH_SOURCE[0]%/*}" || ! test -n "$w
 fi
 aclocal -I m4 --install
 autoreconf -I m4 -f -i
-contrib/pogen.sh
diff --git a/configure.ac b/configure.ac
index 8cdb94b6..4da55816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,6 @@ AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
 
-# check for gettext
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
-
 AC_MSG_CHECKING([[whether z/OS special settings are required]])
 if test `uname -s` = "OS/390"
 then
@@ -1376,16 +1372,20 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(LDFLAGS)
 
+# Used for 'po' directory staff
+AC_SUBST([ac_configure_args])
+AC_SUBST([EMPTY_VAR], [[]])
+
 AC_CONFIG_FILES([
 libmicrohttpd.pc
 w32/common/microhttpd_dll_res_vc.rc
+po/configure.acT:po/configure.ac.in
 Makefile
 contrib/Makefile
 doc/Makefile
 doc/doxygen/Makefile
 doc/examples/Makefile
 m4/Makefile
-po/Makefile.in
 src/Makefile
 src/include/Makefile
 src/microhttpd/Makefile
diff --git a/ABOUT-NLS b/po/ABOUT-NLS
index 3cc82865..3cc82865 100644
--- a/ABOUT-NLS
+++ b/po/ABOUT-NLS
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 38c293d2..4e5c700e 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -18,8 +18,12 @@ SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+# Modified to fit MHD needs
+top_po_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
+top_po_builddir = $(top_builddir)/po
+# See '$(POTFILES):' rule
+VPATH = @srcdir@:@srcdir@/po
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -155,6 +159,7 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # The determination of whether the package xyz is a GNU one is based on the
 # heuristic whether some file in the top level directory mentions "GNU xyz".
 # If GNU 'find' is available, we avoid grepping through monster files.
+# Modified to fit MHD needs
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
         package_gnu="$(PACKAGE_GNU)"; \
         test -n "$$package_gnu" || { \
@@ -183,19 +188,19 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
         fi; \
         case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
-            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_po_srcdir) \
               --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
               --files-from=$(srcdir)/POTFILES.in \
               --copyright-holder='$(COPYRIGHT_HOLDER)' \
               --msgid-bugs-address="$$msgid_bugs_address" \
             ;; \
           *) \
-            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_po_srcdir) \
               --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
               --files-from=$(srcdir)/POTFILES.in \
               --copyright-holder='$(COPYRIGHT_HOLDER)' \
               --package-name="$${package_prefix}@PACKAGE@" \
-              --package-version='@VERSION@' \
+              --package-version='$(VERSION)' \
               --msgid-bugs-address="$$msgid_bugs_address" \
             ;; \
         esac
@@ -373,24 +378,51 @@ check: all
 
 info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
+# Modified for MHD
 mostlyclean:
         rm -f remove-potcdate.sed
         rm -f stamp-poT
         rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
         rm -fr *.o
+        rm -fr po
 
 clean: mostlyclean
 
+# Modified to fit MHD needs
 distclean: clean
         rm -f Makefile Makefile.in POTFILES *.mo
+        rm -f config.status config.cache config.log configure.lineno config.status.lineno stamp-po
 
+# Modified to fit MHD needs
 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)
+        rm -f $(GMOFILES)
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
+
+# Added for MHD
+# If source path is in absolute form, POTFILES generated with correct path,
+# but if source path in relative form (forced by 'configure' for inplace builds)
+# then POTFILES is generated with extra '..' ('po-directories' in config.status
+# think that '.' is subdirectory and add additional '..' to path to source files)
+# This rule create additional 'po' subdirectory which is included in VPATH.
+$(POTFILES):
+        @ case "$(srcdir)" in \
+          /* ) : ;; \
+          * ) @mkdir_p@ po ;; \
+          esac
+
+# Modified to fit MHD needs
+mkdistdir:
+        @ $(mkdir_p) $(distdir)
+        @ case "$(srcdir)" in \
+          /* ) : ;; \
+          * ) @mkdir_p@ po ;; \
+          esac
+
+# Modified to fit MHD needs
+dist distdir: mkdistdir
         test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
         @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
@@ -472,9 +504,10 @@ update-gmo: Makefile $(GMOFILES)
 # because execution permission bits may not work on the current file system.
 # Use @SHELL@, which is the shell determined by autoconf for the use by its
 # scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-        cd $(top_builddir) \
-          && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+# Note: Fixed missging 'srcdir', Modified to fit MHD needs
+Makefile: $(srcdir)/Makefile.in.in $(srcdir)/Makevars $(top_po_builddir)/config.status @POMAKEFILEDEPS@
+        cd $(top_po_builddir) \
+          && @SHELL@ ./config.status ./$@.in po-directories
 
 force:
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 1fda6ce6..00000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,53 +0,0 @@
-src/examples/authorization_example.c
-src/examples/benchmark.c
-src/examples/benchmark_https.c
-src/examples/chunked_example.c
-src/examples/demo.c
-src/examples/demo_https.c
-src/examples/digest_auth_example.c
-src/examples/dual_stack_example.c
-src/examples/fileserver_example.c
-src/examples/fileserver_example_dirs.c
-src/examples/fileserver_example_external_select.c
-src/examples/https_fileserver_example.c
-src/examples/minimal_example.c
-src/examples/minimal_example_comet.c
-src/examples/post_example.c
-src/examples/querystring_example.c
-src/examples/refuse_post_example.c
-src/examples/timeout.c
-src/examples/upgrade_example.c
-src/microhttpd/base64.c
-src/microhttpd/basicauth.c
-src/microhttpd/connection.c
-src/microhttpd/connection_https.c
-src/microhttpd/daemon.c
-src/microhttpd/digestauth.c
-src/microhttpd/internal.c
-src/microhttpd/md5.c
-src/microhttpd/memorypool.c
-src/microhttpd/mhd_compat.c
-src/microhttpd/mhd_itc.c
-src/microhttpd/mhd_mono_clock.c
-src/microhttpd/mhd_sem.c
-src/microhttpd/mhd_sockets.c
-src/microhttpd/mhd_str.c
-src/microhttpd/mhd_threads.c
-src/microhttpd/postprocessor.c
-src/microhttpd/reason_phrase.c
-src/microhttpd/response.c
-src/microhttpd/sysfdsetsize.c
-src/microhttpd/tsearch.c
-src/testcurl/curl_version_check.c
-src/testcurl/https/tls_test_common.c
-src/testzzuf/socat.c
-src/include/mhd_options.h
-src/include/microhttpd.h
-src/microhttpd/connection.h
-src/microhttpd/internal.h
-src/microhttpd/mhd_compat.h
-src/microhttpd/mhd_itc.h
-src/microhttpd/mhd_locks.h
-src/microhttpd/mhd_sockets.h
-src/microhttpd/mhd_str.h
-src/microhttpd/mhd_threads.h
diff --git a/po/configure.ac.in b/po/configure.ac.in
new file mode 100644
index 00000000..c0b98669
--- /dev/null
+++ b/po/configure.ac.in
@@ -0,0 +1,17 @@
+# This configure.ac.in is in the public domain
+
+# Use versions from parent configure
+AC_INIT([@PACKAGE_NAME@], [@PACKAGE_VERSION@], [@PACKAGE_BUGREPORT@])
+
+AC_CONFIG_SRCDIR([Makevars])
+AC_CONFIG_MACRO_DIR([../m4])
+AC_CONFIG_AUX_DIR([..])
+AM_INIT_AUTOMAKE([silent-rules])
+
+AM_GNU_GETTEXT([external])
+
+# gettext expect that 'po' files will stay in subdirectory.
+# Form './Makefile.in' is accepted by gettext as subdirectory but caused some
+# troubles with in-place build (with relative path to source files). To workaround
+# this, some hack are used in Makefile.
+AC_OUTPUT([./Makefile.in])
diff --git a/po/libmicrohttpd.pot b/po/libmicrohttpd.pot
deleted file mode 100644
index 2af0c97f..00000000
--- a/po/libmicrohttpd.pot
+++ /dev/null
@@ -1,654 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Christian Grothoff
-# This file is distributed under the same license as the GNU libmicrohttpd package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU libmicrohttpd 0.9.52\n"
-"Report-Msgid-Bugs-To: libmicrohttpd@gnu.org\n"
-"POT-Creation-Date: 2016-10-17 19:09+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/microhttpd/basicauth.c:67
-msgid "Error decoding basic authentication\n"
-msgstr ""
-
-#: src/microhttpd/basicauth.c:77
-msgid "Basic authentication doesn't contain ':' separator\n"
-msgstr ""
-
-#: src/microhttpd/basicauth.c:95
-msgid "Failed to allocate memory for password\n"
-msgstr ""
-
-#: src/microhttpd/basicauth.c:158
-msgid "Failed to add Basic auth header\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:528
-msgid ""
-"Failed to signal end of connection via inter-thread communication channel"
-msgstr ""
-
-#: src/microhttpd/connection.c:621
-msgid "Closing connection (application reported error generating data)\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:667
-msgid "Closing connection (out of memory)\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:711
-msgid "Closing connection (application error generating response)\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1233
-#, c-format
-msgid ""
-"Error processing request (HTTP response code is %u (`%s')). Closing "
-"connection.\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1250 src/microhttpd/connection.c:2859
-#: src/microhttpd/connection.c:2962
-msgid "Closing connection (failed to create response header)\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1274 src/microhttpd/connection.c:2329
-#: src/microhttpd/connection.c:2390 src/microhttpd/connection.c:2626
-#: src/microhttpd/connection_https.c:139
-#, c-format
-msgid "In function %s handling connection at state: %s\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1490
-msgid "Not enough memory in pool to allocate header record!\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1532
-msgid "Not enough memory in pool to parse cookies!\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1737 src/microhttpd/connection.c:1899
-msgid "Application reported internal error, closing connection.\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1789 src/microhttpd/connection.c:1844
-msgid ""
-"Received malformed HTTP request (bad chunked encoding). Closing connection.\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:1907
-msgid "libmicrohttpd API violation"
-msgstr ""
-
-#: src/microhttpd/connection.c:1923
-msgid ""
-"WARNING: incomplete POST processing and connection not suspended will result "
-"in hung connection.\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2027
-#, c-format
-msgid "Sent response: `%.*s'\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2088
-msgid "Received malformed line (no colon). Closing connection.\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2224
-msgid "Received HTTP 1.1 request without `Host' header.\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2419 src/microhttpd/connection.c:2493
-#, c-format
-msgid "Failed to send data: %s\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2428
-#, c-format
-msgid "Sent 100 continue response: `%.*s'\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2468
-msgid "Data offset exceeds limit"
-msgstr ""
-
-#: src/microhttpd/connection.c:2478
-#, c-format
-msgid "Sent %d-byte DATA response: `%.*s'\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:2544 src/microhttpd/daemon.c:5249
-msgid "Internal error\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:3164 src/microhttpd/daemon.c:2078
-#: src/microhttpd/daemon.c:3417 src/microhttpd/daemon.c:3437
-#: src/microhttpd/daemon.c:4387 src/microhttpd/daemon.c:4405
-#: src/microhttpd/response.c:838 src/microhttpd/response.c:864
-#, c-format
-msgid "Call to epoll_ctl failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:3328
-msgid "Application used invalid status code for 'upgrade' response!\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:3338
-msgid ""
-"Application attempted 'upgrade' without setting MHD_USE_SUSPEND_RESUME!\n"
-msgstr ""
-
-#: src/microhttpd/connection.c:3349
-msgid ""
-"Application attempted 'upgrade' HTTPS connection in epoll mode without "
-"setting MHD_USE_HTTPS_EPOLL_UPGRADE!\n"
-msgstr ""
-
-#: src/microhttpd/connection_https.c:70
-msgid "Error: received handshake message out of context\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:107
-#, c-format
-msgid "Fatal error in GNU libmicrohttpd %s:%u: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:323
-msgid "Failed to add IP connection count node\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:381
-msgid "Failed to find previously-added IP address\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:387
-msgid "Previously-added IP address had counter of zero\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:553
-msgid ""
-"Failed to setup x509 certificate/key: pre 3.X.X version of GnuTLS does not "
-"support setting key password"
-msgstr ""
-
-#: src/microhttpd/daemon.c:603
-#, c-format
-msgid "Error: invalid credentials type %d specified.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:849
-#, c-format
-msgid "Maximum socket in select set: %d\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:945 src/microhttpd/daemon.c:962
-#: src/microhttpd/daemon.c:2202 src/microhttpd/daemon.c:2576
-#: src/microhttpd/daemon.c:5142
-msgid "Failed to remove FD from epoll set\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1185
-msgid "Error preparing select\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1205 src/microhttpd/daemon.c:1426
-#, c-format
-msgid "Error during select (%d): `%s'\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1255 src/microhttpd/daemon.c:1500
-#, c-format
-msgid "Error during poll: `%s'\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1408
-msgid "Failed to add FD to fd_set\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1546 src/microhttpd/response.c:664
-msgid "Processing thread terminating. Closing connection\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1809 src/microhttpd/daemon.c:4906
-#, c-format
-msgid "Socket descriptor larger than FD_SETSIZE: %d > %d\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1824 src/microhttpd/daemon.c:2496
-#, c-format
-msgid "Accepted connection on socket %d\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1836
-msgid "Server reached connection limit. Closing inbound connection.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1854
-msgid "Connection rejected by application. Closing connection.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1902 src/microhttpd/daemon.c:1922
-#: src/microhttpd/daemon.c:3006
-#, c-format
-msgid "Error allocating memory: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1955
-#, c-format
-msgid "Failed to set nonblocking mode on connection socket: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1983
-#, c-format
-msgid "Failed to setup TLS credentials: unknown credential type %d\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:1992
-msgid "Unknown credential type"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2058
-msgid "Failed to signal new connection via inter-thread communication channel."
-msgstr ""
-
-#: src/microhttpd/daemon.c:2164
-msgid "Cannot suspend connections without enabling MHD_USE_SUSPEND_RESUME!\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2229
-msgid "Cannot resume connections without enabling MHD_USE_SUSPEND_RESUME!\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2239
-msgid "Failed to signal resume via inter-thread communication channel."
-msgstr ""
-
-#: src/microhttpd/daemon.c:2366
-#, c-format
-msgid "Failed to set nonblocking mode on new client socket: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2374
-msgid "Failed to set noninheritable mode on new client socket.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2442
-#, c-format
-msgid "Error accepting connection: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2459
-msgid ""
-"Hit process or system resource limit at FIRST connection. This is really bad "
-"as there is no sane way to proceed. Will try busy waiting for system "
-"resources to become magically available.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2467
-#, c-format
-msgid ""
-"Hit process or system resource limit at %u connections, temporarily "
-"suspending accept(). Consider setting a lower MHD_OPTION_CONNECTION_LIMIT.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2479
-#, c-format
-msgid "Failed to set nonblocking mode on incoming connection socket: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2489
-msgid "Failed to set noninheritable mode on incoming connection socket.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2535 src/microhttpd/daemon.c:5213
-#: src/microhttpd/daemon.c:5228 src/microhttpd/daemon.c:5356
-#: src/microhttpd/daemon.c:5387
-msgid "Failed to join a thread\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2627
-msgid "Illegal call to MHD_get_timeout\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2845
-msgid "Could not obtain daemon fdsets"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2861
-msgid "Could not add listen socket to fdset"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2888
-msgid "Could not add control inter-thread communication channel FD to fdset"
-msgstr ""
-
-#: src/microhttpd/daemon.c:2945
-#, c-format
-msgid "select failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:3103 src/microhttpd/daemon.c:3233
-#, c-format
-msgid "poll failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:3322 src/microhttpd/daemon.c:3493
-#, c-format
-msgid "Call to epoll_wait failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:3455 src/microhttpd/daemon.c:3853
-msgid "Failed to remove listen FD from epoll set\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:3861
-msgid "Failed to signal quiesce via inter-thread communication channel"
-msgstr ""
-
-#: src/microhttpd/daemon.c:3882
-msgid "failed to signal quiesce via inter-thread communication channel"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4015
-#, c-format
-msgid "Specified thread pool size (%u) too big\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4029 src/microhttpd/daemon.c:4040
-#: src/microhttpd/daemon.c:4051 src/microhttpd/daemon.c:4062
-#: src/microhttpd/daemon.c:4104
-#, c-format
-msgid "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4081
-msgid "Error initializing DH parameters\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4093
-msgid "Bad Diffie-Hellman parameters format\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4121
-#, c-format
-msgid "Setting priorities to `%s' failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4134
-msgid ""
-"MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4303
-#, c-format
-msgid "MHD HTTPS option %d passed to MHD compiled without HTTPS support\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4309
-#, c-format
-msgid "Invalid option %d! (Did you terminate the list with MHD_OPTION_END?)\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4335
-#, c-format
-msgid "Call to epoll_create1 failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4345
-msgid "Failed to set noninheritable mode on epoll FD.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4530
-#, c-format
-msgid "Failed to create inter-thread communication channel: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4544
-msgid ""
-"file descriptor for inter-thread communication channel exceeds maximum "
-"value\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4583
-msgid "Specified value for NC_SIZE too large\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4597
-#, c-format
-msgid "Failed to allocate memory for nonce-nc map: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4613
-msgid "MHD failed to initialize nonce-nc mutex\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4631
-msgid "MHD thread pooling only works with MHD_USE_SELECT_INTERNALLY\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4641
-msgid ""
-"Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_SUSPEND_RESUME is not "
-"supported.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4651
-msgid "Threaded operations are not supported on Symbian.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4665
-#, c-format
-msgid "Failed to create socket for listening: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4683 src/microhttpd/daemon.c:4727
-#: src/microhttpd/daemon.c:4759 src/microhttpd/daemon.c:4829
-#: src/microhttpd/daemon.c:4860
-#, c-format
-msgid "setsockopt failed: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4737
-msgid "Cannot allow listening address reuse: SO_REUSEPORT not defined\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4767
-msgid ""
-"Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4840
-#, c-format
-msgid "Failed to bind to port %u: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4871
-#, c-format
-msgid "Failed to listen for connections: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4887
-#, c-format
-msgid "Failed to set nonblocking mode on listening socket: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4923
-msgid ""
-"Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_EPOLL is not supported.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4935
-msgid "epoll is not supported on this platform by this build.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4945 src/microhttpd/daemon.c:4955
-msgid "MHD failed to initialize IP connection limit mutex\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4970
-msgid "Failed to initialize TLS support\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4992
-#, c-format
-msgid "Failed to create listen thread: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5041
-#, c-format
-msgid "Failed to create worker inter-thread communication channel: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5053
-msgid ""
-"File descriptor for worker inter-thread communication channel exceeds "
-"maximum value\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5075
-msgid "MHD failed to initialize cleanup connection mutex\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5089
-#, c-format
-msgid "Failed to create pool thread: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5190
-msgid "MHD_stop_daemon() called while we have suspended connections.\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5198 src/microhttpd/daemon.c:5317
-msgid "Failed to signal shutdown via inter-thread communication channel"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5257
-msgid ""
-"Failed to add inter-thread communication channel FD to epoll set to signal "
-"termination\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5339
-msgid "MHD listen socket shutdown\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5353
-msgid "Failed to signal shutdown via inter-thread communication channel."
-msgstr ""
-
-#: src/microhttpd/daemon.c:5725
-msgid "Failed to initialize winsock\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5728
-msgid "Winsock version 2.2 is not available\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5735 src/microhttpd/daemon.c:5739
-msgid "Failed to initialise multithreading in libgcrypt\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5744
-msgid "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:443
-msgid ""
-"Stale nonce received.  If this happens a lot, you should probably increase "
-"the size of the nonce array.\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:630
-msgid "Failed to allocate memory for copy of URI arguments\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:759
-msgid "Authentication failed, invalid timestamp format.\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:820
-msgid "Authentication failed, invalid format.\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:830
-msgid "Authentication failed, invalid nc format.\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:856
-msgid "Failed to allocate memory for auth header processing\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:896
-msgid "Authentication failed, URI does not match.\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:916
-msgid "Authentication failed, arguments do not match.\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:971
-msgid "Could not register nonce (is the nonce array size zero?).\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:994
-msgid "Failed to allocate memory for auth response header\n"
-msgstr ""
-
-#: src/microhttpd/digestauth.c:1028
-msgid "Failed to add Digest auth header\n"
-msgstr ""
-
-#: src/microhttpd/response.c:721
-msgid ""
-"Invalid response for upgrade: application failed to set the 'Upgrade' "
-"header!\n"
-msgstr ""
-
-#: src/microhttpd/response.c:760
-#, c-format
-msgid "Failed to make loopback sockets non-blocking: %s\n"
-msgstr ""
-
-#: src/microhttpd/response.c:771
-#, c-format
-msgid "Socketpair descriptor larger than FD_SETSIZE: %d > %d\n"
-msgstr ""
-
-#: src/microhttpd/response.c:861
-msgid "Error cleaning up while handling epoll error"
-msgstr ""
-
-#: src/microhttpd/internal.h:74
-msgid "Failed to close FD.\n"
-msgstr ""
-
-#: src/microhttpd/mhd_itc.h:347
-msgid "Failed to destroy ITC.\n"
-msgstr ""
-
-#: src/microhttpd/mhd_locks.h:111
-msgid "Failed to destroy mutex.\n"
-msgstr ""
-
-#: src/microhttpd/mhd_locks.h:144
-msgid "Failed to lock mutex.\n"
-msgstr ""
-
-#: src/microhttpd/mhd_locks.h:170
-msgid "Failed to unlock mutex.\n"
-msgstr ""
-
-#: src/microhttpd/mhd_sockets.h:248
-msgid "Close socket failed.\n"
-msgstr ""
diff --git a/po/stamp-po b/po/stamp-po
deleted file mode 100644
index 9788f702..00000000
--- a/po/stamp-po
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index d25ea8c2..b72173e8 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -126,7 +126,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00095210
+#define MHD_VERSION 0x00095211
 
 /**
  * MHD-internal return code for "YES".