diff --git a/ChangeLog b/ChangeLog index e1af18d6..6bd4694b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -CVS code - +nano 1.0.5 - 10/03/2001 - cut.c: do_cut_text() - Don't recenter the line when cutting one line (David Lawrence diff --git a/NEWS b/NEWS index f1cd337e..83295c23 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +10/03/2001 - GNU nano 1.0.5 is released. This release is mostly + to add and update translations, there is now a new + Dutch translation, a new Danish translation, and updates + for Italian, Finnish and Catalian. There are also a few + minor bugfixes for cutting marked text. Enjoy! + 08/24/2001 - GNU nano 1.0.4 is released. This is the first release in almost two months, and the biggest fixes are for search strings when switching back and forth from Pico mode. diff --git a/aclocal.m4 b/aclocal.m4 index a685036e..efced845 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -125,24 +125,6 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) -#serial 1 -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) - # Configure paths for GLIB # Owen Taylor 97-11-3 @@ -344,43 +326,13 @@ main () # Ulrich Drepper , 1995. # # 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. +# 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. -# serial 10 +# serial 5 -dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). -dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). Otherwise, a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. -dnl LIBDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_WITH_NLS], +AC_DEFUN(AM_WITH_NLS, [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -389,15 +341,11 @@ AC_DEFUN([AM_WITH_NLS], AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) - BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no - INTLLIBS= dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) + AC_DEFINE(ENABLE_NLS) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -408,74 +356,86 @@ AC_DEFUN([AM_WITH_NLS], nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= CATOBJEXT=NONE - dnl Add a version number to the cache macros. - define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) - define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - LIBS="$gt_save_LIBS"]) + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_CHECK_LIB(intl, gettext, + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)], + gt_cv_func_gettext_libintl=no)]) fi - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - dnl If iconv() is in a separate libiconv library, then anyone - dnl linking with libintl{.a,.so} also needs to link with - dnl libiconv. - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - LIBS="$gt_save_LIBS" - - dnl Search for GNU msgfmt in the PATH. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext in the PATH. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) - - CATOBJEXT=.gmo - fi + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi ]) if test "$CATOBJEXT" = "NONE"; then - dnl GNU gettext is not found in the C library. + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. dnl Fall back on GNU gettext library. nls_cv_use_gnu_gettext=yes fi @@ -485,38 +445,27 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) AC_SUBST(MSGFMT) - BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo - INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found msgfmt program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then dnl If it is no GNU xgettext we define it as : so that the dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else AC_MSG_RESULT( @@ -525,76 +474,25 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" fi fi - dnl We need to process the po/ directory. + # We need to process the po/ directory. POSUB=po - fi - AC_OUTPUT_COMMANDS( - [for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - fi - ;; - esac - done]) - - - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi - if test $ac_verc_fail = yes; then - INTLBISON=: + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes fi dnl These rules are solely for the distribution goal. While doing this @@ -606,38 +504,22 @@ changequote([,])dnl done dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) AC_SUBST(INTLLIBS) AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) ]) -dnl Usage: Just like AM_WITH_NLS, which see. -AC_DEFUN([AM_GNU_GETTEXT], +AC_DEFUN(AM_GNU_GETTEXT, [AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl @@ -647,18 +529,21 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +strdup __argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY) + fi - AM_ICONV - AM_LANGINFO_CODESET AM_LC_MESSAGES - AM_WITH_NLS([$1],[$2],[$3]) + AM_WITH_NLS if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then @@ -666,21 +551,10 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) else AC_MSG_CHECKING(for catalogs to be installed) NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac done LINGUAS=$NEW_LINGUAS AC_MSG_RESULT($LINGUAS) @@ -692,8 +566,47 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) fi fi + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). dnl Try to locate is. MKINSTALLDIRS= if test -n "$ac_aux_dir"; then @@ -704,26 +617,40 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) fi AC_SUBST(MKINSTALLDIRS) - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES ]) # Search path for a program which passes the given test. # Ulrich Drepper , 1996. # # 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. +# 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. -# serial 2 +# serial 1 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], +AC_DEFUN(AM_PATH_PROG_WITH_TEST, [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) @@ -751,7 +678,7 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ;; esac])dnl $1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +if test -n "[$]$1"; then AC_MSG_RESULT([$]$1) else AC_MSG_RESULT(no) @@ -759,141 +686,23 @@ fi AC_SUBST($1)dnl ]) -#serial 2 - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([jm_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) - -#serial AM2 - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - AC_ARG_WITH([libiconv-prefix], -[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - ]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - fi - AC_SUBST(LIBICONV) -]) - -#serial AM1 - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) - # Check whether LC_MESSAGES is available in . # Ulrich Drepper , 1995. # # 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. +# 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. -# serial 2 +# serial 1 -AC_DEFUN([AM_LC_MESSAGES], +AC_DEFUN(AM_LC_MESSAGES, [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) + AC_DEFINE(HAVE_LC_MESSAGES) fi fi]) diff --git a/config.h.in b/config.h.in index 02da23fe..0bb4b94d 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if using alloca.c. */ #undef C_ALLOCA @@ -31,6 +31,9 @@ /* Define to `long' if doesn't define. */ #undef off_t +/* Define if you need to in order for stat and other things to work. */ +#undef _POSIX_SOURCE + /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE @@ -58,6 +61,21 @@ /* Define this if your curses lib has the _use_keypad flag */ #undef HAVE_USEKEYPAD +/* Define this if you have NLS */ +#undef ENABLE_NLS + +/* Define this is you have the catgets command */ +#undef HAVE_CATGETS + +/* Define this is you have GNU gettext */ +#undef HAVE_GETTEXT + +/* Define this for HAVE_LC_MESSAGES */ +#undef HAVE_LC_MESSAGES + +/* Define this if you have the stpcpy function (cool) */ +#undef HAVE_STPCPY + /* Define this to make the nano executable as small as possible */ #undef NANO_SMALL @@ -97,36 +115,15 @@ /* Define if you have the dcgettext function. */ #undef HAVE_DCGETTEXT -/* Define if you have the feof_unlocked function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define if you have the fgets_unlocked function. */ -#undef HAVE_FGETS_UNLOCKED - /* Define if you have the getcwd function. */ #undef HAVE_GETCWD -/* Define if you have the getegid function. */ -#undef HAVE_GETEGID - -/* Define if you have the geteuid function. */ -#undef HAVE_GETEUID - -/* Define if you have the getgid function. */ -#undef HAVE_GETGID - /* Define if you have the getopt_long function. */ #undef HAVE_GETOPT_LONG /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE -/* Define if you have the getuid function. */ -#undef HAVE_GETUID - -/* Define if you have the mempcpy function. */ -#undef HAVE_MEMPCPY - /* Define if you have the munmap function. */ #undef HAVE_MUNMAP @@ -154,12 +151,6 @@ /* Define if you have the strdup function. */ #undef HAVE_STRDUP -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL - -/* Define if you have the tsearch function. */ -#undef HAVE_TSEARCH - /* Define if you have the vsnprintf function. */ #undef HAVE_VSNPRINTF @@ -193,12 +184,6 @@ /* Define if you have the header file. */ #undef HAVE_REGEX_H -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H - /* Define if you have the header file. */ #undef HAVE_STRING_H @@ -214,28 +199,12 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H +/* Define if you have the i library (-li). */ +#undef HAVE_LIBI + /* Name of package */ #undef PACKAGE /* Version number of package */ #undef VERSION -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST - -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if translation of program messages to the user's native language - is requested. */ -#undef ENABLE_NLS - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - diff --git a/configure.in b/configure.in index 9e1c06ca..0c46b13c 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # $Id$ dnl Process this file with autoconf to produce a configure script. AC_INIT(nano.c) -AM_INIT_AUTOMAKE(nano, 1.0.4-cvs) +AM_INIT_AUTOMAKE(nano, 1.0.5) AM_CONFIG_HEADER(config.h:config.h.in) ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no nl da" diff --git a/faq.html b/faq.html index 067d9a82..175304b8 100644 --- a/faq.html +++ b/faq.html @@ -167,7 +167,7 @@ sense of the word.

The event...

It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect -license Pico was distributed under, the 1.0.4 makefiles that came with +license Pico was distributed under, the 1.0.5 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM).  Having been a convert from Slackware to debian, he missed having a simple binary package that included Pine and Pico, and @@ -200,7 +200,7 @@ nano was developed). of nano?

The current version of nano *should* -be 1.0.4.  Of course you should always check the nano hompage to +be 1.0.5.  Of course you should always check the nano hompage to see what the latest and greatest version is.

diff --git a/nano.texi b/nano.texi index 430572f0..724bbfef 100644 --- a/nano.texi +++ b/nano.texi @@ -8,7 +8,7 @@ @c Run `makeinfo' rather than `texinfo-format-buffer'. @smallbook @set EDITION 0.1 -@set VERSION 1.0.4 +@set VERSION 1.0.5 @set UPDATED 12 Feb 2001 @dircategory Editors @@ -23,7 +23,7 @@ @titlepage @title GNU @code{nano} @subtitle a small and friendly text editor. -@subtitle version 1.0.4 +@subtitle version 1.0.5 @author Chris Allegretta @page diff --git a/po/ca.po b/po/ca.po index 1cc5ad85..ba895e49 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.4\n" -"POT-Creation-Date: 2001-09-05 14:11+0200\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-09-10 14:04+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -20,7 +20,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer cridat amb inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Hem foragitat el cuttbuffer =)\n" @@ -461,9 +461,9 @@ msgid "" "commonly used shortcuts in the editor.\n" "\n" " The notation for shortcuts is as follows: Control-key sequences are notated " -"with a caret (^) symbol and are entered with the Control (Ctrl) key. Escape-" -"key sequences are notated with the Meta (M) symbol and can be entered using " -"either the Esc, Alt or Meta key depending on your keyboard setup. The " +"with a caret (^) symbol and are entered with the Control (Ctrl) key. " +"Escape-key sequences are notated with the Meta (M) symbol and can be entered " +"using either the Esc, Alt or Meta key depending on your keyboard setup. The " "following keystrokes are available in the main editor window. Optional keys " "are shown in parentheses:\n" "\n" diff --git a/po/cs.po b/po/cs.po index fbe4f44c..225e487e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0.0\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "Last-Translator: Václav Haisman \n" "Language-Team: N/A\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer voláno s inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Blew away cutbuffer =)\n" @@ -989,6 +989,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "øádka %d z %d (%.0f%%), znak %d z %d (%.0f%%)" diff --git a/po/da.po b/po/da.po index d04e2d6e..8d7ad45e 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.4\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-09-03 22:27+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -19,7 +19,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer kaldt med inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Sprængte udklipsbufferen =)\n" @@ -423,13 +423,21 @@ msgstr "Til filer" #: nano.c:141 #, c-format -msgid "\nBuffer written to %s\n" -msgstr "\nBufferen skrevet til %s\n" +msgid "" +"\n" +"Buffer written to %s\n" +msgstr "" +"\n" +"Bufferen skrevet til %s\n" #: nano.c:143 #, c-format -msgid "\nNo %s written (file exists?)\n" -msgstr "\nIngen %s skrevet (eksisterer filen?)\n" +msgid "" +"\n" +"No %s written (file exists?)\n" +msgstr "" +"\n" +"Ingen %s skrevet (eksisterer filen?)\n" #: nano.c:152 msgid "Window size is too small for Nano..." @@ -443,16 +451,38 @@ msgstr "Tasten ugyldig i VISNINGstilstand" msgid "" " nano help text\n" "\n" -" The nano editor is designed to emulate the functionality and ease-of-use of the UW Pico text editor. There are four main sections of the editor: The top line shows the program version, the current filename being edited, and whether or not the file has been modified. Next is the main editor window showing the file being edited. The status line is the third line from the bottom and shows important messages. The bottom two lines show the most commonly used shortcuts in the editor.\n" +" The nano editor is designed to emulate the functionality and ease-of-use of " +"the UW Pico text editor. There are four main sections of the editor: The " +"top line shows the program version, the current filename being edited, and " +"whether or not the file has been modified. Next is the main editor window " +"showing the file being edited. The status line is the third line from the " +"bottom and shows important messages. The bottom two lines show the most " +"commonly used shortcuts in the editor.\n" "\n" -" The notation for shortcuts is as follows: Control-key sequences are notated with a caret (^) symbol and are entered with the Control (Ctrl) key. Escape-key sequences are notated with the Meta (M) symbol and can be entered using either the Esc, Alt or Meta key depending on your keyboard setup. The following keystrokes are available in the main editor window. Optional keys are shown in parentheses:\n" +" The notation for shortcuts is as follows: Control-key sequences are notated " +"with a caret (^) symbol and are entered with the Control (Ctrl) key. " +"Escape-key sequences are notated with the Meta (M) symbol and can be entered " +"using either the Esc, Alt or Meta key depending on your keyboard setup. The " +"following keystrokes are available in the main editor window. Optional keys " +"are shown in parentheses:\n" "\n" msgstr "" " hjælpetekst for nano\n" "\n" -" Tekstredigereren nano er skabt for at efterligne funktionaliteten og letanvendeligheden hos tekstredigereren UW Pico. Det findes fire hoveddele i redigereren: Øverste linje viser programmets versionsnummer, navnet på filen som redigeres, og om filen er ændret. Efter dette findes hovedvinduet som viser filen som redigeres. Statuslinjen er tredje linje fra underkanten og viser vigtige meddelelser. De nederste to linjer viser de almindeligste kommandoer som bruges i tekstredigereren.\n" +" Tekstredigereren nano er skabt for at efterligne funktionaliteten og " +"letanvendeligheden hos tekstredigereren UW Pico. Det findes fire hoveddele i " +"redigereren: Øverste linje viser programmets versionsnummer, navnet på filen " +"som redigeres, og om filen er ændret. Efter dette findes hovedvinduet som " +"viser filen som redigeres. Statuslinjen er tredje linje fra underkanten og " +"viser vigtige meddelelser. De nederste to linjer viser de almindeligste " +"kommandoer som bruges i tekstredigereren.\n" "\n" -" Notationen for kommandoer er som følger: Sekvenser med Control-tast skrives med en cirkumfleks (^) og trykkes samtidigt med Control-tasten (Ctrl). Escape-sekvenser skrives med metategnet (M) og angives enten med Esc-, Alt- eller Meta-tasten afhængig af dine tastaturindstillinger. Følgende tastekombinationer er tilgængelige i redigererens hovedvindue. Alternative taster vises inden i parentes:\n" +" Notationen for kommandoer er som følger: Sekvenser med Control-tast skrives " +"med en cirkumfleks (^) og trykkes samtidigt med Control-tasten (Ctrl). " +"Escape-sekvenser skrives med metategnet (M) og angives enten med Esc-, Alt- " +"eller Meta-tasten afhængig af dine tastaturindstillinger. Følgende " +"tastekombinationer er tilgængelige i redigererens hovedvindue. Alternative " +"taster vises inden i parentes:\n" "\n" #: nano.c:298 @@ -464,8 +494,12 @@ msgid "delete_node(): free'd last node.\n" msgstr "delete_node(): frigjorde sidste knude.\n" #: nano.c:358 -msgid "Usage: nano [GNU long option] [option] +LINE \n\n" -msgstr "Brug: nano [langt GNU-flag] [flag] +LINJE \n\n" +msgid "" +"Usage: nano [GNU long option] [option] +LINE \n" +"\n" +msgstr "" +"Brug: nano [langt GNU-flag] [flag] +LINJE \n" +"\n" #: nano.c:359 msgid "Option\t\tLong option\t\tMeaning\n" @@ -473,7 +507,8 @@ msgstr "Flag\t\tLangt flag\t\tBetydning\n" #: nano.c:361 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n" -msgstr " -T [tal]\t--tabsize=[tal]\t\tSæt bredden på et tabulatortegn til tal\n" +msgstr "" +" -T [tal]\t--tabsize=[tal]\t\tSæt bredden på et tabulatortegn til tal\n" #: nano.c:364 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n" @@ -497,7 +532,8 @@ msgstr " -i \t\t--autoindent\t\tIndryk automatisk nye linjer\n" #: nano.c:377 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n" -msgstr " -k \t\t--cut\t\t\tLad ^K klippe ud fra markøren til slutningen på linjen\n" +msgstr "" +" -k \t\t--cut\t\t\tLad ^K klippe ud fra markøren til slutningen på linjen\n" #: nano.c:380 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n" @@ -512,7 +548,8 @@ msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n" msgstr " -p\t \t--pico\t\t\tEfterlign Pico så tæt som muligt\n" #: nano.c:390 -msgid " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" +msgid "" +" -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [tegn] \t--fill=[#tegn]\t\tBryd linjer efter antal tegn\n" #: nano.c:393 @@ -544,8 +581,12 @@ msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LINJE\t\t\t\t\tStart ved linjenummer LINJE\n" #: nano.c:410 -msgid "Usage: nano [option] +LINE \n\n" -msgstr "Brug: nano [flag] +LINJE \n\n" +msgid "" +"Usage: nano [option] +LINE \n" +"\n" +msgstr "" +"Brug: nano [flag] +LINJE \n" +"\n" #: nano.c:411 msgid "Option\t\tMeaning\n" @@ -633,8 +674,12 @@ msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org" msgstr " E-post: nano@nano-editor.org\tHjemmeside: http://www.nano-editor.org" #: nano.c:451 -msgid "\n Compiled options:" -msgstr "\n Oversættelsesflag:" +msgid "" +"\n" +" Compiled options:" +msgstr "" +"\n" +" Oversættelsesflag:" #: nano.c:519 msgid "Mark Set" @@ -934,6 +979,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "linje %d af %d (%.0f%%), tegn %d af %d (%.0f%%)" diff --git a/po/de.po b/po/de.po index 5e08339c..fca7e226 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.0\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-02-08 17:56+0200\n" "Last-Translator: Florian König \n" "Language-Team: German \n" @@ -20,7 +20,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer aufgerufen mit inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Inhalt der Zwischenablage verworfen\n" @@ -996,6 +996,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "Zeile %d von %d (%.0f%%), Zeichen %d von %d (%.0f%%)" diff --git a/po/es.po b/po/es.po index 4a086730..04ccf7b7 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.4\n" -"POT-Creation-Date: 2001-09-05 14:11+0200\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-09-9 13:00+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Spanish \n" @@ -19,7 +19,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer llamado con inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Nos hemos cargado el cutbuffer =)\n" @@ -460,9 +460,9 @@ msgid "" "commonly used shortcuts in the editor.\n" "\n" " The notation for shortcuts is as follows: Control-key sequences are notated " -"with a caret (^) symbol and are entered with the Control (Ctrl) key. Escape-" -"key sequences are notated with the Meta (M) symbol and can be entered using " -"either the Esc, Alt or Meta key depending on your keyboard setup. The " +"with a caret (^) symbol and are entered with the Control (Ctrl) key. " +"Escape-key sequences are notated with the Meta (M) symbol and can be entered " +"using either the Esc, Alt or Meta key depending on your keyboard setup. The " "following keystrokes are available in the main editor window. Optional keys " "are shown in parentheses:\n" "\n" diff --git a/po/fi.po b/po/fi.po index a7f727d7..8c06083a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.4\n" -"POT-Creation-Date: 2001-10-03 21:46+0300\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-10-03 21:45+0300\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" @@ -462,9 +462,9 @@ msgid "" "commonly used shortcuts in the editor.\n" "\n" " The notation for shortcuts is as follows: Control-key sequences are notated " -"with a caret (^) symbol and are entered with the Control (Ctrl) key. Escape-" -"key sequences are notated with the Meta (M) symbol and can be entered using " -"either the Esc, Alt or Meta key depending on your keyboard setup. The " +"with a caret (^) symbol and are entered with the Control (Ctrl) key. " +"Escape-key sequences are notated with the Meta (M) symbol and can be entered " +"using either the Esc, Alt or Meta key depending on your keyboard setup. The " "following keystrokes are available in the main editor window. Optional keys " "are shown in parentheses:\n" "\n" diff --git a/po/fr.po b/po/fr.po index b91b1215..7e2b600d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.9\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2000-07-09 01:32+0100\n" "Last-Translator: Clement Laforet \n" "Language-Team: French \n" @@ -20,7 +20,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer appelé avec inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "cutbuffer annihilé -)\n" @@ -1003,6 +1003,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "ligne %d sur %d (%.0f%%), caractère %d sur %d (%.0f%%)" diff --git a/po/gl.po b/po/gl.po index 64596b51..e5059af2 100644 --- a/po/gl.po +++ b/po/gl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.3\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-07-03 11:53+02:00\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "chamouse a add_to_cutbuffer con inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Borrouse o buffer de cortado =)\n" @@ -976,6 +976,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "liña %d de %d (%.0f%%), carácter %d de %d (%.0f%%)" diff --git a/po/hu.po b/po/hu.po index cf21c22c..16e4ff73 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 0.9.99pre2\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-02-03 07:47-0000\n" "Last-Translator: Szabolcs Horvath \n" "Language-Team: Hungarian \n" @@ -19,7 +19,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer az inptr->data-val lett meghívva = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "a cutbuffert elfújta a szél =)\n" @@ -984,6 +984,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "%d(/%d). sor (%.0f%%) és a(z) %d(/%d). karakter (%.0f%%)" diff --git a/po/id.po b/po/id.po index 5d689a6d..f78383a0 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.2\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-06-22 14:38GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -19,7 +19,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer dipanggil dgn inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Hapus cutbuffer =)\n" @@ -980,6 +980,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "baris %d dari %d (%f.0f%%), karakter %d dari %d (%.0f%%)" diff --git a/po/it.po b/po/it.po index cd52b3cb..82c90e92 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.4\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-10-03 20:31+02:00\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italian \n" @@ -19,7 +19,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer chiamato con inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Svuota cutbuffer =)\n" @@ -468,9 +468,22 @@ msgid "" msgstr "" "Aiuto di nano\n" "\n" -" nano è un editor di testi disegnato per emulare le funzionalità e la facilità d'uso di Pico. Ci sono quattro sezioni principali dell'editor: La riga superiore mostra la versione del programma, il nome del file correntemente in uso e se il file è stato modificato oppure no. Più sotto c'è la finestra principale che mostra il contenuto del file che si sta editando. La barra di stato è la terza riga dal basso e mostra importanti messaggi. Le due righe finali mostrano le abbreviazioni più comunemente usate. \n" +" nano è un editor di testi disegnato per emulare le funzionalità e la " +"facilità d'uso di Pico. Ci sono quattro sezioni principali dell'editor: La " +"riga superiore mostra la versione del programma, il nome del file " +"correntemente in uso e se il file è stato modificato oppure no. Più sotto " +"c'è la finestra principale che mostra il contenuto del file che si sta " +"editando. La barra di stato è la terza riga dal basso e mostra importanti " +"messaggi. Le due righe finali mostrano le abbreviazioni più comunemente " +"usate. \n" "\n" -" La notazione per le abbreviazioni è la seguente: Le sequenze col tasto Control sono identificate con il simbolo (^) e sono introdotte col tasto Control (Ctrl). Le sequenze col tasto Escape sono identificate col simbolo Meta (M) e possono essere inserite usato alternativamente il tasto Esc, Alt o Meta secondo la configurazione della vostra tastiera. Le seguenti abbreviazioni sono disponibili nella finestra principale dell'editor. Le sequenze alternative sono mostrate tra parentesi.\n" +" La notazione per le abbreviazioni è la seguente: Le sequenze col tasto " +"Control sono identificate con il simbolo (^) e sono introdotte col tasto " +"Control (Ctrl). Le sequenze col tasto Escape sono identificate col simbolo " +"Meta (M) e possono essere inserite usato alternativamente il tasto Esc, Alt " +"o Meta secondo la configurazione della vostra tastiera. Le seguenti " +"abbreviazioni sono disponibili nella finestra principale dell'editor. Le " +"sequenze alternative sono mostrate tra parentesi.\n" "\n" #: nano.c:298 @@ -485,7 +498,9 @@ msgstr "delete_node(): liberato l'ultimo nodo.\n" msgid "" "Usage: nano [GNU long option] [option] +LINE \n" "\n" -msgstr "Utilizzo: nano [opzioni lunghe GNU] [opzioni] +RIGA \n\n" +msgstr "" +"Utilizzo: nano [opzioni lunghe GNU] [opzioni] +RIGA \n" +"\n" #: nano.c:359 msgid "Option\t\tLong option\t\tMeaning\n" @@ -493,7 +508,8 @@ msgstr "Opzioni\t\tOpzioni lunghe\t\tSignificato\n" #: nano.c:361 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n" -msgstr " -T [num]\t--tabsize=[num]\t\tImposta la lunghezza della tabulazione a num\n" +msgstr "" +" -T [num]\t--tabsize=[num]\t\tImposta la lunghezza della tabulazione a num\n" #: nano.c:364 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n" @@ -540,11 +556,13 @@ msgstr "" #: nano.c:393 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" -msgstr " -s [prog] \t--speller=[prog]\tAttiva correttore ortografico alternativo\n" +msgstr "" +" -s [prog] \t--speller=[prog]\tAttiva correttore ortografico alternativo\n" #: nano.c:396 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" -msgstr " -t \t\t--tempfile\t\tSalvataggio automatico in uscita senza conferma\n" +msgstr "" +" -t \t\t--tempfile\t\tSalvataggio automatico in uscita senza conferma\n" #: nano.c:398 msgid " -v \t\t--view\t\t\tView (read only) mode\n" @@ -570,7 +588,9 @@ msgstr " +RIGA\t\t\t\t\tInizia alla riga numero RIGA\n" msgid "" "Usage: nano [option] +LINE \n" "\n" -msgstr "Utilizzo: nano [opzioni] +RIGA \n\n" +msgstr "" +"Utilizzo: nano [opzioni] +RIGA \n" +"\n" #: nano.c:411 msgid "Option\t\tMeaning\n" @@ -618,7 +638,8 @@ msgstr " -p \t\tEmula Pico il pi #: nano.c:429 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" -msgstr " -r [#cols] \tConfigura riempimento colonne (interrompi righe a) #cols\n" +msgstr "" +" -r [#cols] \tConfigura riempimento colonne (interrompi righe a) #cols\n" #: nano.c:431 msgid " -s [prog] \tEnable alternate speller\n" @@ -699,7 +720,8 @@ msgstr "Impossibile creare un nome file temporaneo: %s" #: nano.c:1469 msgid "Spell checking failed: unable to write temp file!" -msgstr "Controllo ortografico fallito: impossibile scrivere su file temporaneo!" +msgstr "" +"Controllo ortografico fallito: impossibile scrivere su file temporaneo!" #: nano.c:1481 msgid "Finished checking spelling" @@ -711,7 +733,9 @@ msgstr "Controllo ortografico fallito" #: nano.c:1503 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " -msgstr "Salva il buffer modificato? (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI AVVENUTI) " +msgstr "" +"Salva il buffer modificato? (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI " +"AVVENUTI) " #: nano.c:1599 msgid "Received SIGHUP" @@ -760,7 +784,9 @@ msgstr "disabilitato" #: nano.c:2162 msgid "NumLock glitch detected. Keypad will malfunction with NumLock off" -msgstr "Rilevata pressione del NumLock. Il keypad potrebbe non funzionare col Numlock spento" +msgstr "" +"Rilevata pressione del NumLock. Il keypad potrebbe non funzionare col " +"Numlock spento" #: nano.c:2388 msgid "Main: set up windows\n" @@ -962,6 +988,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "Riga %d di %d (%.0f%%), carattere %d di %d (%.0f%%)" diff --git a/po/nl.po b/po/nl.po index 094508da..fb8e01be 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0.4\n" -"POT-Creation-Date: 2001-09-05 14:11+0200\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-09-04 17:25:56+0200\n" "Last-Translator: Guus Sliepen \n" "Language-Team: Dutch \n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer aangeroepen met inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Knipbuffer weggeblazen =)\n" @@ -458,9 +458,9 @@ msgid "" "commonly used shortcuts in the editor.\n" "\n" " The notation for shortcuts is as follows: Control-key sequences are notated " -"with a caret (^) symbol and are entered with the Control (Ctrl) key. Escape-" -"key sequences are notated with the Meta (M) symbol and can be entered using " -"either the Esc, Alt or Meta key depending on your keyboard setup. The " +"with a caret (^) symbol and are entered with the Control (Ctrl) key. " +"Escape-key sequences are notated with the Meta (M) symbol and can be entered " +"using either the Esc, Alt or Meta key depending on your keyboard setup. The " "following keystrokes are available in the main editor window. Optional keys " "are shown in parentheses:\n" "\n" diff --git a/po/no.po b/po/no.po index 9c1cf1e5..6c9bbbf5 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0.3\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eivind Kjørstad \n" "Language-Team: Norwegian \n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer vart kalla med inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Frigjorde cut-bufferet\n" @@ -985,6 +985,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "linje %d av %d (%.0f%%), tegn %d av %d (%.0f%%)" diff --git a/po/ru.po b/po/ru.po index 340becc4..e46f89b3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.1\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-05-16 10:10+0200\n" "Last-Translator: Sergey A. Ribalchenko \n" "Language-Team: Russian \n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer ×ÙÚ×ÁÎ Ó inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "cutbuffer ÓÄÕÌÏ ×ÅÔÒÏÍ =)\n" @@ -977,6 +977,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "ÓÔÒÏËÁ %d ÉÚ %d (%.0f%%), ÓÉÍ×ÏÌ %d ÉÚ %d (%.0f%%)" diff --git a/po/sv.po b/po/sv.po index a1547c7d..3a1d7950 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.3\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-07-06 22:27+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer anropades med inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "Sprängde urklippsbufferten =)\n" @@ -980,6 +980,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "rad %d av %d (%.0f%%), tecken %d av %d (%.0f%%)" diff --git a/po/uk.po b/po/uk.po index c2377edd..bd235f7b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 1.0.1\n" -"POT-Creation-Date: 2001-08-20 09:49-0400\n" +"POT-Creation-Date: 2001-10-03 19:08-0400\n" "PO-Revision-Date: 2001-04-10 18:40+0300\n" "Last-Translator: Sergey A. Ribalchenko \n" "Language-Team: Ukrainian \n" @@ -18,7 +18,7 @@ msgstr "" msgid "add_to_cutbuffer called with inptr->data = %s\n" msgstr "add_to_cutbuffer ×ÉÚ×ÁÎÏ Ú inptr->data = %s\n" -#: cut.c:158 +#: cut.c:161 msgid "Blew away cutbuffer =)\n" msgstr "cutbuffer ÚÄÕÔÏ ×¦ÔÒÏÍ =)\n" @@ -980,6 +980,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "do_cursorpos: linepct = %f, bytepct = %f\n" #: winio.c:1207 +#, c-format msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "ÒÑÄÏË %d Ú %d (%.0f%%), ̦ÔÅÒÁ %d Ú %d (%.0f%%)"