diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | po/ChangeLog | 12 | ||||
| -rw-r--r-- | po/LINGUAS | 0 | ||||
| -rw-r--r-- | po/Makevars | 43 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | ui/ncurses/nc-cui.c | 3 |
7 files changed, 61 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 0eca29c..7ae5012 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = lib discover test ui utils man +SUBDIRS = lib discover test ui utils man po ACLOCAL_AMFLAGS = -I m4 @@ -26,7 +26,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status libtool -EXTRA_DIST = version.sh configure.ac $(srcdir)/m4 +EXTRA_DIST = version.sh configure.ac $(srcdir)/m4 config.rpath MAINTAINERCLEANFILES = aclocal.m4 config.* configure configure.ac depcomp \ install-sh ltmain.sh Makefile.in missing ylwrap $(PACKAGE)-*.gz diff --git a/configure.ac b/configure.ac index 3d2ec18..aae5e08 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,8 @@ AC_PROG_INSTALL AM_INIT_AUTOMAKE AC_GNU_SOURCE +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION(0.18.1) LT_INIT AX_WITH_CURSES @@ -271,6 +273,7 @@ AC_CONFIG_FILES([ ui/test/Makefile ui/twin/Makefile utils/Makefile + po/Makefile.in ]) AC_OUTPUT diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 0000000..88efec7 --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1,12 @@ +2013-12-16 gettextize <bug-gnu-gettext@gnu.org> + + * Makefile.in.in: New file, from gettext-0.18.1. + * Rules-quot: New file, from gettext-0.18.1. + * boldquot.sed: New file, from gettext-0.18.1. + * en@boldquot.header: New file, from gettext-0.18.1. + * en@quot.header: New file, from gettext-0.18.1. + * insert-header.sin: New file, from gettext-0.18.1. + * quot.sed: New file, from gettext-0.18.1. + * remove-potcdate.sin: New file, from gettext-0.18.1. + * POTFILES.in: New file. + diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/po/LINGUAS diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..d3ec84c --- /dev/null +++ b/po/Makevars @@ -0,0 +1,43 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +MSGMERGE_OPTIONS = --no-location diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..667e27c --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1 @@ +# List of source files which contain translatable strings. diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 9d788fe..6a61694 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -24,7 +24,6 @@ #include <errno.h> #include <stdlib.h> #include <string.h> -#include <locale.h> #include <sys/ioctl.h> #include "log/log.h" @@ -677,8 +676,6 @@ struct cui *cui_init(void* platform_info, process_init(cui, cui->waitset, false); - setlocale(LC_ALL, ""); - /* Loop here for scripts that just started the server. */ retry_start: |
