From 4e2caeddd1efd32502de66a9b4e428a71de92224 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 18 Feb 2012 13:55:16 +0100 Subject: Update from gnulib. --- gettext-runtime/intl/ChangeLog | 4 ++++ gettext-runtime/intl/vasnprintf.c | 4 ++-- gettext-runtime/libasprintf/ChangeLog | 4 ++++ gettext-runtime/libasprintf/vasnprintf.c | 4 ++-- gettext-runtime/m4/ChangeLog | 4 ++++ gettext-runtime/m4/po.m4 | 10 +++++----- gettext-runtime/tests/ChangeLog | 4 ++++ gettext-runtime/tests/test-lock.c | 4 ++-- 8 files changed, 27 insertions(+), 11 deletions(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 16e4155..0c037ad 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,7 @@ +2012-02-05 Paul Eggert + + * vasnprintf.c: Spelling fixes. + 2012-01-26 Bruno Haible Modernize quoting. diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c index f767ef9..f8b138d 100644 --- a/gettext-runtime/intl/vasnprintf.c +++ b/gettext-runtime/intl/vasnprintf.c @@ -2813,7 +2813,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (has_width) { # if ENABLE_UNISTDIO - /* Outside POSIX, it's preferrable to compare the width + /* Outside POSIX, it's preferable to compare the width against the number of _characters_ of the converted value. */ w = DCHAR_MBSNLEN (result + length, characters); @@ -5416,7 +5416,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { size_t w; # if ENABLE_UNISTDIO - /* Outside POSIX, it's preferrable to compare the width + /* Outside POSIX, it's preferable to compare the width against the number of _characters_ of the converted value. */ w = DCHAR_MBSNLEN (result + length, count); diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index ef28735..3bb28c0 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,7 @@ +2012-02-05 Paul Eggert + + * vasnprintf.c: Spelling fixes. + 2012-01-26 Bruno Haible Modernize quoting. diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c index f767ef9..f8b138d 100644 --- a/gettext-runtime/libasprintf/vasnprintf.c +++ b/gettext-runtime/libasprintf/vasnprintf.c @@ -2813,7 +2813,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (has_width) { # if ENABLE_UNISTDIO - /* Outside POSIX, it's preferrable to compare the width + /* Outside POSIX, it's preferable to compare the width against the number of _characters_ of the converted value. */ w = DCHAR_MBSNLEN (result + length, characters); @@ -5416,7 +5416,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { size_t w; # if ENABLE_UNISTDIO - /* Outside POSIX, it's preferrable to compare the width + /* Outside POSIX, it's preferable to compare the width against the number of _characters_ of the converted value. */ w = DCHAR_MBSNLEN (result + length, count); diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index d499508..60e7259 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,7 @@ +2012-02-05 Paul Eggert + + * po.m4: Spelling fixes. + 2012-01-26 Bruno Haible * gettext.m4: Update copyright year. diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index 47a8342..616e3cb 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 19 (gettext-0.18.2) -dnl Copyright (C) 1995-2011 Free Software Foundation, Inc. +# po.m4 serial 20 (gettext-0.18.2) +dnl Copyright (C) 1995-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -130,12 +130,12 @@ changequote([,])dnl test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -317,7 +317,7 @@ changequote([,])dnl sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) diff --git a/gettext-runtime/tests/ChangeLog b/gettext-runtime/tests/ChangeLog index da87921..38051d1 100644 --- a/gettext-runtime/tests/ChangeLog +++ b/gettext-runtime/tests/ChangeLog @@ -1,3 +1,7 @@ +2012-02-05 Paul Eggert + + * test-lock.c: Spelling fixes. + 2012-01-06 Bruno Haible Talk about "native Windows API", not "Woe32". diff --git a/gettext-runtime/tests/test-lock.c b/gettext-runtime/tests/test-lock.c index 1258412..a3047b9 100644 --- a/gettext-runtime/tests/test-lock.c +++ b/gettext-runtime/tests/test-lock.c @@ -589,7 +589,7 @@ test_once (void) for (repeat = 0; repeat <= REPEAT_COUNT; repeat++) { /* Wait until every thread is ready. */ - dbgprintf ("Main thread before synchonizing for round %d\n", repeat); + dbgprintf ("Main thread before synchronizing for round %d\n", repeat); for (;;) { int ready_count = 0; @@ -603,7 +603,7 @@ test_once (void) break; yield (); } - dbgprintf ("Main thread after synchonizing for round %d\n", repeat); + dbgprintf ("Main thread after synchronizing for round %d\n", repeat); if (repeat > 0) { -- cgit v1.1