diff --git a/acconfig.h b/acconfig.h index ce9f23c3..be612af1 100644 --- a/acconfig.h +++ b/acconfig.h @@ -21,3 +21,6 @@ /* Define to use the slang wrappers for curses instead of native curses */ #undef USE_SLANG + +/* Define this if you have the TABSIZE global in your curses lib */ +#undef HAVE_TABSIZE diff --git a/config.h.in b/config.h.in index a6cdb362..ee6f67c6 100644 --- a/config.h.in +++ b/config.h.in @@ -76,6 +76,9 @@ /* Define to use the slang wrappers for curses instead of native curses */ #undef USE_SLANG +/* Define this if you have the TABSIZE global in your curses lib */ +#undef HAVE_TABSIZE + /* Define if you have the __argz_count function. */ #undef HAVE___ARGZ_COUNT diff --git a/configure b/configure index 81feb577..4a25e0a7 100755 --- a/configure +++ b/configure @@ -2244,9 +2244,53 @@ else echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking for TABSIZE in -l$CURSES_LIB_NAME""... $ac_c" 1>&6 +echo "configure:2249: checking for TABSIZE in -l$CURSES_LIB_NAME" >&5 +ac_lib_var=`echo $CURSES_LIB_NAME'_'TABSIZE | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-l$CURSES_LIB_NAME $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_TABSIZE 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + LIBS="$LIBS $CURSES_LIB" + # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -2268,7 +2312,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2272: checking for $ac_word" >&5 +echo "configure:2316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2296,12 +2340,12 @@ else fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2300: checking for working const" >&5 +echo "configure:2344: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2371,21 +2415,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2375: checking for inline" >&5 +echo "configure:2419: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2411,12 +2455,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2415: checking for off_t" >&5 +echo "configure:2459: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2444,12 +2488,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2448: checking for size_t" >&5 +echo "configure:2492: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2479,19 +2523,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2483: checking for working alloca.h" >&5 +echo "configure:2527: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2512,12 +2556,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2516: checking for alloca" >&5 +echo "configure:2560: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2577,12 +2621,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2581: checking whether alloca needs Cray hooks" >&5 +echo "configure:2625: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2611: checking for $ac_func" >&5 +echo "configure:2655: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2662,7 +2706,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2666: checking stack direction for C alloca" >&5 +echo "configure:2710: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2670,7 +2714,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2714,17 +2758,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2718: checking for $ac_hdr" >&5 +echo "configure:2762: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2753,12 +2797,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2757: checking for $ac_func" >&5 +echo "configure:2801: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2806,7 +2850,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2810: checking for working mmap" >&5 +echo "configure:2854: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2814,7 +2858,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2985,17 +3029,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2989: checking for $ac_hdr" >&5 +echo "configure:3033: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3025,12 +3069,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3029: checking for $ac_func" >&5 +echo "configure:3073: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3082,12 +3126,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3086: checking for $ac_func" >&5 +echo "configure:3130: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3144,19 +3188,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3148: checking for LC_MESSAGES" >&5 +echo "configure:3192: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3177,7 +3221,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3181: checking whether NLS is requested" >&5 +echo "configure:3225: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3197,7 +3241,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3201: checking whether included gettext is requested" >&5 +echo "configure:3245: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3216,17 +3260,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3220: checking for libintl.h" >&5 +echo "configure:3264: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3243,19 +3287,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3247: checking for gettext in libc" >&5 +echo "configure:3291: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3271,7 +3315,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3275: checking for bindtextdomain in -lintl" >&5 +echo "configure:3319: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3279,7 +3323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3306,12 +3350,12 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3310: checking for gettext in libintl" >&5 +echo "configure:3354: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3315: checking for gettext in -lintl" >&5 +echo "configure:3359: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3319,7 +3363,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3369,7 +3413,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3373: checking for $ac_word" >&5 +echo "configure:3417: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3403,12 +3447,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3407: checking for $ac_func" >&5 +echo "configure:3451: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3458,7 +3502,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3462: checking for $ac_word" >&5 +echo "configure:3506: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3494,7 +3538,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3498: checking for $ac_word" >&5 +echo "configure:3542: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3526,7 +3570,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3557,7 +3601,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:3561: checking whether catgets can be used" >&5 +echo "configure:3605: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -3570,7 +3614,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:3574: checking for main in -li" >&5 +echo "configure:3618: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3578,14 +3622,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3613,12 +3657,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3617: checking for catgets" >&5 +echo "configure:3661: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3663,7 +3707,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3667: checking for $ac_word" >&5 +echo "configure:3711: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3699,7 +3743,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3703: checking for $ac_word" >&5 +echo "configure:3747: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3736,7 +3780,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3740: checking for $ac_word" >&5 +echo "configure:3784: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3771,7 +3815,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3775: checking for $ac_word" >&5 +echo "configure:3819: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3829,7 +3873,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3833: checking for $ac_word" >&5 +echo "configure:3877: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3863,7 +3907,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3867: checking for $ac_word" >&5 +echo "configure:3911: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3899,7 +3943,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3903: checking for $ac_word" >&5 +echo "configure:3947: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3992,7 +4036,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3996: checking for catalogs to be installed" >&5 +echo "configure:4040: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4020,17 +4064,17 @@ echo "configure:3996: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4024: checking for linux/version.h" >&5 +echo "configure:4068: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* diff --git a/configure.in b/configure.in index b53f8f35..36a747e6 100644 --- a/configure.in +++ b/configure.in @@ -126,10 +126,12 @@ fi AC_CHECK_LIB($CURSES_LIB_NAME, wresize, AC_DEFINE(HAVE_WRESIZE)) +AC_CHECK_LIB($CURSES_LIB_NAME, TABSIZE, AC_DEFINE(HAVE_TABSIZE)) dnl Parse any configure options LIBS="$LIBS $CURSES_LIB" + AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging (def disabled)],) AC_SUBST(CURSES_LIB) diff --git a/nano.c b/nano.c index f6755d04..86a0c383 100644 --- a/nano.c +++ b/nano.c @@ -310,6 +310,10 @@ void usage(void) #ifdef HAVE_GETOPT_LONG printf(_("Usage: nano [GNU long option] [option] +LINE \n\n")); printf(_("Option Long option Meaning\n")); +#ifdef HAVE_TABSIZE + printf(_ + (" -T --tabsize=[num] Set width of a tab to num\n")); +#endif printf (_ (" -V --version Print version information and exit\n")); @@ -348,6 +352,10 @@ void usage(void) #else printf(_("Usage: nano [option] +LINE \n\n")); printf(_("Option Meaning\n")); +#ifdef HAVE_TABSIZE + printf(_ + (" -T [num] Set width of a tab to num\n")); +#endif printf(_(" -V Print version information and exit\n")); printf(_(" -c Constantly show cursor position\n")); printf(_(" -h Show this message\n")); @@ -601,8 +609,8 @@ assert (strlenpt(inptr->data) >= fill); } if (inptr->data[i] == NANO_CONTROL_I) { - if (i_tabs % 8 != 0); - i_tabs += 8 - (i_tabs % 8); + if (i_tabs % TABSIZE != 0); + i_tabs += TABSIZE - (i_tabs % TABSIZE); } if (current_word_end_t >= fill) @@ -1552,6 +1560,9 @@ int main(int argc, char *argv[]) struct sigaction act; /* For our lovely signals */ int keyhandled = 0; /* Have we handled the keystroke yet? */ int tmpkey = 0, i; +#ifdef HAVE_TABSIZE + int usrtabsize = 0; /* User defined tab size */ +#endif char *argv0; struct termios term; @@ -1571,6 +1582,9 @@ int main(int argc, char *argv[]) {"mouse", 0, 0, 'm'}, {"pico", 0, 0, 'p'}, {"nofollow", 0, 0, 'l'}, +#ifdef HAVE_TABSIZE + {"tabsize", 0, 0, 'T'}, +#endif {0, 0, 0, 0} }; #endif @@ -1585,13 +1599,26 @@ int main(int argc, char *argv[]) #endif #ifdef HAVE_GETOPT_LONG - while ((optchr = getopt_long(argc, argv, "?Vchilmpr:s:tvwxz", + while ((optchr = getopt_long(argc, argv, "?T:Vchilmpr:s:tvwxz", long_options, &option_index)) != EOF) { #else - while ((optchr = getopt(argc, argv, "h?Vcilmpr:s:tvwxz")) != EOF) { + while ((optchr = getopt(argc, argv, "h?T:Vcilmpr:s:tvwxz")) != EOF) { #endif switch (optchr) { +#ifdef HAVE_TABSIZE + case 'T': + usrtabsize = atoi(optarg); + if (usrtabsize <= 0) { + usage(); /* To stop bogus data for tab width */ + finish(1); + } + break; +#else + case 'T': + usage(); /* Oops! You dont really have that option */ + finish(1); +#endif case 'V': version(); exit(0); @@ -1761,6 +1788,11 @@ int main(int argc, char *argv[]) edit_refresh(); reset_cursor(); +#ifdef HAVE_TABSIZE + if (usrtabsize > 0) + TABSIZE = usrtabsize; +#endif + while (1) { kbinput = wgetch(edit); if (kbinput == 27) { /* Grab Alt-key stuff first */ diff --git a/nano.h b/nano.h index 82be177b..774a1613 100644 --- a/nano.h +++ b/nano.h @@ -44,6 +44,11 @@ #include #endif /* CURSES_H */ +#ifndef HAVE_TABSIZE + static int TABSIZE = 8; +#endif + + #ifdef HAVE_LIBINTL_H #include #endif diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 2a179c27..ff6ff014 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -116,99 +116,101 @@ Optional keys are shown in parentheses:\n\ Usage: nano [GNU long option] [option] +LINE \n\ \n", 89}, {"Option\t\tLong option\t\tMeaning\n", 90}, - {" -V \t\t--version\t\tPrint version information and exit\n", 91}, - {" -c \t\t--const\t\t\tConstantly show cursor position\n", 92}, - {" -h \t\t--help\t\t\tShow this message\n", 93}, - {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 94}, - {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 95}, - {" -m \t\t--mouse\t\t\tEnable mouse\n", 96}, + {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 91}, + {" -V \t\t--version\t\tPrint version information and exit\n", 92}, + {" -c \t\t--const\t\t\tConstantly show cursor position\n", 93}, + {" -h \t\t--help\t\t\tShow this message\n", 94}, + {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 95}, + {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 96}, + {" -m \t\t--mouse\t\t\tEnable mouse\n", 97}, {"\ - -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 97}, - {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 98}, - {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 99}, - {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 100}, - {" -v \t\t--view\t\t\tView (read only) mode\n", 101}, - {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 102}, - {" -x \t\t--nohelp\t\tDon't show help window\n", 103}, - {" -z \t\t--suspend\t\tEnable suspend\n", 104}, - {" +LINE\t\t\t\t\tStart at line number LINE\n", 105}, + -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 98}, + {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 99}, + {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 100}, + {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 101}, + {" -v \t\t--view\t\t\tView (read only) mode\n", 102}, + {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 103}, + {" -x \t\t--nohelp\t\tDon't show help window\n", 104}, + {" -z \t\t--suspend\t\tEnable suspend\n", 105}, + {" +LINE\t\t\t\t\tStart at line number LINE\n", 106}, {"\ Usage: nano [option] +LINE \n\ -\n", 106}, - {"Option\t\tMeaning\n", 107}, - {" -V \t\tPrint version information and exit\n", 108}, - {" -c \t\tConstantly show cursor position\n", 109}, - {" -h \t\tShow this message\n", 110}, - {" -i \t\tAutomatically indent new lines\n", 111}, - {" -l \t\tDon't follow symbolic links, overwrite.\n", 112}, - {" -m \t\tEnable mouse\n", 113}, - {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 114}, - {" -s [prog] \tEnable alternate speller\n", 115}, - {" -p \t\tMake bottom 2 lines more Pico-like\n", 116}, - {" -t \t\tAuto save on exit, don't prompt\n", 117}, - {" -v \t\tView (read only) mode\n", 118}, - {" -w \t\tDon't wrap long lines\n", 119}, - {" -x \t\tDon't show help window\n", 120}, - {" -z \t\tEnable suspend\n", 121}, - {" +LINE\t\tStart at line number LINE\n", 122}, - {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 123}, - {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 124}, - {"Mark Set", 125}, - {"Mark UNset", 126}, - {"check_wrap called with inptr->data=\"%s\"\n", 127}, - {"current->data now = \"%s\"\n", 128}, - {"After, data = \"%s\"\n", 129}, - {"Error deleting tempfile, ack!", 130}, - {"Could not create a temporary filename: %s", 131}, - {"Could not invoke spell program \"%s\"", 132}, - {"Could not invoke \"ispell\"", 133}, - {"Finished checking spelling", 134}, - {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 135}, - {"Cannot resize top win", 136}, - {"Cannot move top win", 137}, - {"Cannot resize edit win", 138}, - {"Cannot move edit win", 139}, - {"Cannot resize bottom win", 140}, - {"Cannot move bottom win", 141}, - {"Main: set up windows\n", 142}, - {"Main: bottom win\n", 143}, - {"Main: open file\n", 144}, - {"I got Alt-[-%c! (%d)\n", 145}, - {"I got Alt-%c! (%d)\n", 146}, - {"Case Sensitive Search%s", 147}, - {"Search%s", 148}, - {"Search Cancelled", 149}, - {"Search Wrapped", 150}, - {"Replaced %d occurences", 151}, - {"Replaced 1 occurence", 152}, - {"Replace Cancelled", 153}, - {"Replace with [%s]", 154}, - {"Replace with", 155}, - {"Replace this instance?", 156}, - {"Enter line number", 157}, - {"Aborted", 158}, - {"Come on, be reasonable", 159}, - {"Only %d lines available, skipping to last line", 160}, - {"actual_x_from_start for xplus=%d returned %d\n", 161}, - {"input '%c' (%d)\n", 162}, - {"New Buffer", 163}, - {" File: ...", 164}, - {"Modified", 165}, - {"Moved to (%d, %d) in edit buffer\n", 166}, - {"current->data = \"%s\"\n", 167}, - {"I got \"%s\"\n", 168}, - {" Y", 169}, - {"Yes", 170}, - {" A", 171}, - {"All", 172}, - {" N", 173}, - {"No", 174}, - {"^C", 175}, - {"do_cursorpos: linepct = %f, bytepct = %f\n", 176}, - {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 177}, - {"Dumping file buffer to stderr...\n", 178}, - {"Dumping cutbuffer to stderr...\n", 179}, - {"Dumping a buffer to stderr...\n", 180}, +\n", 107}, + {"Option\t\tMeaning\n", 108}, + {" -T [num]\tSet width of a tab to num\n", 109}, + {" -V \t\tPrint version information and exit\n", 110}, + {" -c \t\tConstantly show cursor position\n", 111}, + {" -h \t\tShow this message\n", 112}, + {" -i \t\tAutomatically indent new lines\n", 113}, + {" -l \t\tDon't follow symbolic links, overwrite.\n", 114}, + {" -m \t\tEnable mouse\n", 115}, + {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 116}, + {" -s [prog] \tEnable alternate speller\n", 117}, + {" -p \t\tMake bottom 2 lines more Pico-like\n", 118}, + {" -t \t\tAuto save on exit, don't prompt\n", 119}, + {" -v \t\tView (read only) mode\n", 120}, + {" -w \t\tDon't wrap long lines\n", 121}, + {" -x \t\tDon't show help window\n", 122}, + {" -z \t\tEnable suspend\n", 123}, + {" +LINE\t\tStart at line number LINE\n", 124}, + {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 125}, + {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 126}, + {"Mark Set", 127}, + {"Mark UNset", 128}, + {"check_wrap called with inptr->data=\"%s\"\n", 129}, + {"current->data now = \"%s\"\n", 130}, + {"After, data = \"%s\"\n", 131}, + {"Error deleting tempfile, ack!", 132}, + {"Could not create a temporary filename: %s", 133}, + {"Could not invoke spell program \"%s\"", 134}, + {"Could not invoke \"ispell\"", 135}, + {"Finished checking spelling", 136}, + {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 137}, + {"Cannot resize top win", 138}, + {"Cannot move top win", 139}, + {"Cannot resize edit win", 140}, + {"Cannot move edit win", 141}, + {"Cannot resize bottom win", 142}, + {"Cannot move bottom win", 143}, + {"Main: set up windows\n", 144}, + {"Main: bottom win\n", 145}, + {"Main: open file\n", 146}, + {"I got Alt-[-%c! (%d)\n", 147}, + {"I got Alt-%c! (%d)\n", 148}, + {"Case Sensitive Search%s", 149}, + {"Search%s", 150}, + {"Search Cancelled", 151}, + {"Search Wrapped", 152}, + {"Replaced %d occurences", 153}, + {"Replaced 1 occurence", 154}, + {"Replace Cancelled", 155}, + {"Replace with [%s]", 156}, + {"Replace with", 157}, + {"Replace this instance?", 158}, + {"Enter line number", 159}, + {"Aborted", 160}, + {"Come on, be reasonable", 161}, + {"Only %d lines available, skipping to last line", 162}, + {"actual_x_from_start for xplus=%d returned %d\n", 163}, + {"input '%c' (%d)\n", 164}, + {"New Buffer", 165}, + {" File: ...", 166}, + {"Modified", 167}, + {"Moved to (%d, %d) in edit buffer\n", 168}, + {"current->data = \"%s\"\n", 169}, + {"I got \"%s\"\n", 170}, + {" Y", 171}, + {"Yes", 172}, + {" A", 173}, + {"All", 174}, + {" N", 175}, + {"No", 176}, + {"^C", 177}, + {"do_cursorpos: linepct = %f, bytepct = %f\n", 178}, + {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 179}, + {"Dumping file buffer to stderr...\n", 180}, + {"Dumping cutbuffer to stderr...\n", 181}, + {"Dumping a buffer to stderr...\n", 182}, }; -int _msg_tbl_length = 180; +int _msg_tbl_length = 182; diff --git a/po/de.gmo b/po/de.gmo index bbc3eda9..ee1e2446 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 504d0c8a..e2f8e825 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-19 01:59-0400\n" +"POT-Creation-Date: 2000-06-19 18:16-0400\n" "PO-Revision-Date: 2000-03-30 20:50+0100\n" "Last-Translator: Florian König \n" "Language-Team: German \n" @@ -55,7 +55,7 @@ msgstr "Lese Datei" msgid "File to insert [from ./] " msgstr "Datei zum Einfügen [von ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1171 +#: files.c:271 files.c:295 files.c:459 nano.c:1167 msgid "Cancelled" msgstr "Abgebrochen" @@ -425,73 +425,77 @@ msgstr "" msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Option\t\tlange Option\t\tBedeutung\n" -#: nano.c:315 +#: nano.c:314 +msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:317 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--version\t\tVersionsinfo ausgeben und beenden\n" -#: nano.c:317 +#: nano.c:319 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tCursorposition ständig anzeigen\n" -#: nano.c:319 +#: nano.c:321 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tDiese Meldung anzeigen\n" -#: nano.c:321 +#: nano.c:323 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr " -i \t\t--autoindent\t\tNeue Zeilen automatisch einrücken\n" -#: nano.c:323 +#: nano.c:325 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:326 +#: nano.c:328 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tMaus aktivieren\n" -#: nano.c:331 +#: nano.c:333 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "" " -r [#Spalten] \t--fill=[#Spalten]\t\tSpalten auffüllen (Zeilenumbruch bei) " "#Spalten\n" -#: nano.c:333 +#: nano.c:335 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr " -p\t \t--pico\t\t\tErscheinungsbild von Pico stärker imitieren\n" -#: nano.c:335 +#: nano.c:337 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "" " -s [Programm] \t--speller=[Programm]\tAlternative Rechtschreibprüfung\n" -#: nano.c:337 +#: nano.c:339 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr " -t \t\t--tempfile\t\tBeim Beenden ohne Rückfrage speichern\n" -#: nano.c:339 +#: nano.c:341 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr "" " -v \t\t--view\t\t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n" -#: nano.c:341 +#: nano.c:343 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tLange Zeilen nicht in neue Zeilen umbrechen\n" -#: nano.c:343 +#: nano.c:345 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tHilfe-Fenster nicht anzeigen\n" -#: nano.c:345 +#: nano.c:347 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr "" " -z \t\t--suspend\t\tSuspend (anhalten und zurück zur Shell) aktivieren\n" -#: nano.c:347 +#: nano.c:349 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +ZEILE\t\t\t\t\tBei Zeile ZEILE beginnen\n" -#: nano.c:349 +#: nano.c:351 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -499,171 +503,175 @@ msgstr "" "Aufruf: nano [Option] +ZEILE \n" "\n" -#: nano.c:350 +#: nano.c:352 msgid "Option\t\tMeaning\n" msgstr "Option\t\tBedeutung\n" -#: nano.c:351 +#: nano.c:354 +msgid " -T [num]\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:355 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tVersionsinfo ausgeben und beenden\n" -#: nano.c:352 +#: nano.c:356 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tCursorposition ständig anzeigen\n" -#: nano.c:353 +#: nano.c:357 msgid " -h \t\tShow this message\n" msgstr " -h \t\tDiese Meldung anzeigen\n" -#: nano.c:354 +#: nano.c:358 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -i \t\tNeue Zeilen automatisch einrücken\n" -#: nano.c:356 +#: nano.c:360 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:359 +#: nano.c:363 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tMaus aktivieren\n" -#: nano.c:363 +#: nano.c:367 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#Spalten] \tSpalten auffüllen (Zeilenumbruch bei) #Spalten\n" -#: nano.c:364 +#: nano.c:368 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [Programm] \tAlternative Rechtschreibprüfung\n" -#: nano.c:365 +#: nano.c:369 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tErscheinungsbild von Pico stärker imitieren\n" -#: nano.c:366 +#: nano.c:370 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tBeim Beenden ohne Rückfrage speichern\n" -#: nano.c:367 +#: nano.c:371 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n" -#: nano.c:368 +#: nano.c:372 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tLange Zeilen nicht in neue Zeilen umbrechen\n" -#: nano.c:369 +#: nano.c:373 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tHilfe-Fenster nicht anzeigen\n" -#: nano.c:370 +#: nano.c:374 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tSuspend (anhalten und zurück zur Shell) aktivieren\n" -#: nano.c:371 +#: nano.c:375 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +ZEILE\t\tBei Zeile ZEILE beginnen\n" -#: nano.c:378 +#: nano.c:382 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano Version %s von Chris Allegretta (compiliert um %s, %s)\n" -#: nano.c:380 +#: nano.c:384 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr " Email: nano@asty.org\tWWW: http://www.asty.org/nano\n" -#: nano.c:405 +#: nano.c:409 msgid "Mark Set" msgstr "Markierung gesetzt" -#: nano.c:410 +#: nano.c:414 msgid "Mark UNset" msgstr "Markierung gelöscht" -#: nano.c:845 +#: nano.c:841 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap aufgerufen mit inptr->data=\"%s\"\n" -#: nano.c:929 +#: nano.c:925 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data jetzt = \"%s\"\n" -#: nano.c:974 +#: nano.c:970 #, c-format msgid "After, data = \"%s\"\n" msgstr "Nachher, data = \"%s\"\n" -#: nano.c:1038 +#: nano.c:1034 msgid "Error deleting tempfile, ack!" msgstr "Konnte temporäre Datei nicht löschen" -#: nano.c:1051 nano.c:1101 +#: nano.c:1047 nano.c:1097 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Konnte keine temporäre Datei erzeugen: %s" -#: nano.c:1073 nano.c:1123 +#: nano.c:1069 nano.c:1119 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Konnte Rechtschreibprogramm \"%s\" nicht aufrufen" #. Why 32512? I dont know! -#: nano.c:1079 nano.c:1129 +#: nano.c:1075 nano.c:1125 msgid "Could not invoke \"ispell\"" msgstr "Konnte \"ispell\" nicht aufrufen" -#: nano.c:1091 nano.c:1141 +#: nano.c:1087 nano.c:1137 msgid "Finished checking spelling" msgstr "Rechtschreibprüfung abgeschlossen" -#: nano.c:1158 +#: nano.c:1154 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "Veränderten Puffer speichern (\"Nein\" verwirft die Änderungen) ? " -#: nano.c:1281 +#: nano.c:1277 msgid "Cannot resize top win" msgstr "Kann die Größe des oberen Fensters nicht verändern" -#: nano.c:1283 +#: nano.c:1279 msgid "Cannot move top win" msgstr "Kann oberes Fenster nicht verschieben" -#: nano.c:1285 +#: nano.c:1281 msgid "Cannot resize edit win" msgstr "Kann Größe des Bearbeitungsfensters nicht verändern" -#: nano.c:1287 +#: nano.c:1283 msgid "Cannot move edit win" msgstr "Kann Bearbeitungsfenster nicht verschieben" -#: nano.c:1289 +#: nano.c:1285 msgid "Cannot resize bottom win" msgstr "Kann Größe des unteren Fensters nicht verändern" -#: nano.c:1291 +#: nano.c:1287 msgid "Cannot move bottom win" msgstr "Kann unteres Fenster nicht verschieben" -#: nano.c:1727 +#: nano.c:1732 msgid "Main: set up windows\n" msgstr "Hauptprogramm: Fenster konfigurieren\n" -#: nano.c:1749 +#: nano.c:1754 msgid "Main: bottom win\n" msgstr "Hauptprogramm: unteres Fenster\n" -#: nano.c:1755 +#: nano.c:1760 msgid "Main: open file\n" msgstr "Hauptprogramm: Datei öffnen\n" -#: nano.c:1823 +#: nano.c:1831 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Erhielt Alt-[-%c! (%d)\n" -#: nano.c:1839 +#: nano.c:1847 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Erhielt Alt-%c! (%d)\n" diff --git a/po/es.gmo b/po/es.gmo index cbebc28a..b05695df 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 429f9aa1..7f20ce65 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.9\n" -"POT-Creation-Date: 2000-06-19 01:59-0400\n" +"POT-Creation-Date: 2000-06-19 18:16-0400\n" "PO-Revision-Date: 2000-06-04 20:21+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Spanish \n" @@ -55,7 +55,7 @@ msgstr "Leyendo Fichero" msgid "File to insert [from ./] " msgstr "Fichero a insertar [desde ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1171 +#: files.c:271 files.c:295 files.c:459 nano.c:1167 msgid "Cancelled" msgstr "Cancelado" @@ -425,69 +425,73 @@ msgstr "" msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Opcion\t\tOpcion larga\t\tSignificado\n" -#: nano.c:315 +#: nano.c:314 +msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:317 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--version\t\tImprimir versión y salir\n" -#: nano.c:317 +#: nano.c:319 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tMostrar siempre la posición del cursor\n" -#: nano.c:319 +#: nano.c:321 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tMostrar este mensaje\n" -#: nano.c:321 +#: nano.c:323 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n" -#: nano.c:323 +#: nano.c:325 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" " -l \t\t--nofollow\t\tNo seguir enlaces simbólicos, sobreescribirlos.\n" -#: nano.c:326 +#: nano.c:328 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tHabilitar ratón\n" -#: nano.c:331 +#: nano.c:333 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \t--fill=[#cols]\t\tRellenar columnas (wrapear en) #cols\n" -#: nano.c:333 +#: nano.c:335 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr " -p\t \t--pico\t\t\tHacer el menú más parecido a Pico\n" -#: nano.c:335 +#: nano.c:337 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr " -s [prog] \t--speller=[prog]\tHabilitar corrector alternativo\n" -#: nano.c:337 +#: nano.c:339 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr " -t \t\t--tempfile\t\tAutosalvar al salir, sin preguntar\n" -#: nano.c:339 +#: nano.c:341 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr " -v \t\t--view\t\t\tModo visualización (sólo lectura)\n" -#: nano.c:341 +#: nano.c:343 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tNo wrapear líneas largas\n" -#: nano.c:343 +#: nano.c:345 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tNo mostrar la ventana de ayuda\n" -#: nano.c:345 +#: nano.c:347 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr " -z \t\t--suspend\t\tHabilitar suspensión\n" -#: nano.c:347 +#: nano.c:349 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LINE\t\t\t\t\tComenzar en la línea número LÍNEA\n" -#: nano.c:349 +#: nano.c:351 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -495,171 +499,175 @@ msgstr "" "Uso: nano [opción] +LÍNEA \n" "\n" -#: nano.c:350 +#: nano.c:352 msgid "Option\t\tMeaning\n" msgstr "Opción\t\tSignificado\n" -#: nano.c:351 +#: nano.c:354 +msgid " -T [num]\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:355 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tImprimir información sobre la versión y salir\n" -#: nano.c:352 +#: nano.c:356 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tMostrar constantemente la posición del cursor\n" -#: nano.c:353 +#: nano.c:357 msgid " -h \t\tShow this message\n" msgstr " -h \t\tMostrar este mensaje\n" -#: nano.c:354 +#: nano.c:358 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -v \t\tIndentar automáticamente nuevas líneas\n" -#: nano.c:356 +#: nano.c:360 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr " -l \t\tNo seguir enlaces simbólicos, sobreescribirlos.\n" -#: nano.c:359 +#: nano.c:363 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tHabilitar ratón\n" -#: nano.c:363 +#: nano.c:367 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \tRellenar columnas (wrapear líneas en) #cols\n" -#: nano.c:364 +#: nano.c:368 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [prog] \tHabilitar corrector alternativo\n" -#: nano.c:365 +#: nano.c:369 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tHacer el menú más parecido a Pico\n" -#: nano.c:366 +#: nano.c:370 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tAutosalvar al salir, no preguntar\n" -#: nano.c:367 +#: nano.c:371 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tModo visualización (sólo lectura)\n" -#: nano.c:368 +#: nano.c:372 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tNo wrapear líneas largas\n" -#: nano.c:369 +#: nano.c:373 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tNo mostrar la ventana de ayuda\n" -#: nano.c:370 +#: nano.c:374 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tHabilitar suspensión\n" -#: nano.c:371 +#: nano.c:375 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +LÍNEA\t\tComenzar en la línea número LÍNEA\n" -#: nano.c:378 +#: nano.c:382 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano versión %s por Chris Allegretta (compilado %s, %s)\n" -#: nano.c:380 +#: nano.c:384 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr " Correo-e: nano@asty.org\tWeb: http://www.asty.org/nano\n" -#: nano.c:405 +#: nano.c:409 msgid "Mark Set" msgstr "Marca Establecida" -#: nano.c:410 +#: nano.c:414 msgid "Mark UNset" msgstr "Marca Borrada" -#: nano.c:845 +#: nano.c:841 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap llamada con inptr->data=\"%s\"\n" -#: nano.c:929 +#: nano.c:925 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data ahora = \"%d\"\n" -#: nano.c:974 +#: nano.c:970 #, c-format msgid "After, data = \"%s\"\n" msgstr "Después, data = \"%s\"\n" -#: nano.c:1038 +#: nano.c:1034 msgid "Error deleting tempfile, ack!" msgstr "Error borrando el fichero temporal, ouch!" -#: nano.c:1051 nano.c:1101 +#: nano.c:1047 nano.c:1097 #, c-format msgid "Could not create a temporary filename: %s" msgstr "No pude crear un fichero temporal: %s" -#: nano.c:1073 nano.c:1123 +#: nano.c:1069 nano.c:1119 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "No se pudo llamar al corrector \"%s\"" #. Why 32512? I dont know! -#: nano.c:1079 nano.c:1129 +#: nano.c:1075 nano.c:1125 msgid "Could not invoke \"ispell\"" msgstr "No pude llamar a \"ispell\"" -#: nano.c:1091 nano.c:1141 +#: nano.c:1087 nano.c:1137 msgid "Finished checking spelling" msgstr "Revisión de ortografía finalizada" -#: nano.c:1158 +#: nano.c:1154 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "Salvar el buffer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?" -#: nano.c:1281 +#: nano.c:1277 msgid "Cannot resize top win" msgstr "No se puede cambiar el tamaño de la ventana superior" -#: nano.c:1283 +#: nano.c:1279 msgid "Cannot move top win" msgstr "No se puede mover la ventana superior" -#: nano.c:1285 +#: nano.c:1281 msgid "Cannot resize edit win" msgstr "No se puede cambiar el tamaño de la ventana de edición" -#: nano.c:1287 +#: nano.c:1283 msgid "Cannot move edit win" msgstr "No se puede mover la ventana de edición" -#: nano.c:1289 +#: nano.c:1285 msgid "Cannot resize bottom win" msgstr "No se puede cambiar el tamaño de la ventana inferior" -#: nano.c:1291 +#: nano.c:1287 msgid "Cannot move bottom win" msgstr "No se puede mover la ventana inferior" -#: nano.c:1727 +#: nano.c:1732 msgid "Main: set up windows\n" msgstr "Main: configurar las ventanas\n" -#: nano.c:1749 +#: nano.c:1754 msgid "Main: bottom win\n" msgstr "Main: ventana inferior\n" -#: nano.c:1755 +#: nano.c:1760 msgid "Main: open file\n" msgstr "Main: abrir fichero\n" -#: nano.c:1823 +#: nano.c:1831 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Pillé Alt-[-%c! (%d)\n" -#: nano.c:1839 +#: nano.c:1847 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Pillé Alt-%c! (%d)\n" diff --git a/po/fr.po b/po/fr.po index bf248155..a5b8da4a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.9\n" -"POT-Creation-Date: 2000-06-19 01:59-0400\n" +"POT-Creation-Date: 2000-06-19 18:16-0400\n" "PO-Revision-Date: 2000-03-24 01:32+0100\n" "Last-Translator: Pierre Tane \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Lecture du fichier" msgid "File to insert [from ./] " msgstr "Fichier à insérer [depuis ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1171 +#: files.c:271 files.c:295 files.c:459 nano.c:1167 msgid "Cancelled" msgstr "Annulé" @@ -414,75 +414,79 @@ msgstr "" msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Option\t\tOption Longue\t\tSignification\n" -#: nano.c:315 +#: nano.c:314 +msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:317 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--version\t\tAfficher les informations de version et sortir\n" -#: nano.c:317 +#: nano.c:319 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tAfficher constamment la position du curseur\n" -#: nano.c:319 +#: nano.c:321 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tAfficher ce message\n" -#: nano.c:321 +#: nano.c:323 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr "" " -i \t\t--autoindent\t\tIndenter automatiquement les nouvelles lignes\n" -#: nano.c:323 +#: nano.c:325 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:326 +#: nano.c:328 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tActiver le support souris\n" -#: nano.c:331 +#: nano.c:333 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "" " -r [#cols] \t--fill=[#cols]\t\tMettre la colonne de fin de ligne à (couper " "les lignes à) #cols\n" -#: nano.c:333 +#: nano.c:335 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr "" " -p\t \t--pico\t\t\tRendre les deux lignes du bas plus semblables à Pico\n" -#: nano.c:335 +#: nano.c:337 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "" " -s [prog] \t--speller=[prog]\tActiver un vérificateur orthographique " "alternatif\n" -#: nano.c:337 +#: nano.c:339 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" " -t \t\t--tempfile\t\tSauver automatiquement à la sortie, sans demander\n" -#: nano.c:339 +#: nano.c:341 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr " -v \t\t--view\t\t\tMode Visualisation (lecture seule)\n" -#: nano.c:341 +#: nano.c:343 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tNe pas couper les lignes trop longues\n" -#: nano.c:343 +#: nano.c:345 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tNe pas afficher la fenêtre d'aide\n" -#: nano.c:345 +#: nano.c:347 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr " -z \t\t--suspend\t\tAutoriser la suspension\n" -#: nano.c:347 +#: nano.c:349 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LIGNE\t\t\t\t\tCommencer à la ligne LIGNE\n" -#: nano.c:349 +#: nano.c:351 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -490,173 +494,177 @@ msgstr "" "Utilisation: nano [option] +LIGNE \n" "\n" -#: nano.c:350 +#: nano.c:352 msgid "Option\t\tMeaning\n" msgstr "Option\t\tSignification\n" -#: nano.c:351 +#: nano.c:354 +msgid " -T [num]\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:355 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tAfficher les informations de version et sortir\n" -#: nano.c:352 +#: nano.c:356 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tAfficher constamment la position du curseur\n" -#: nano.c:353 +#: nano.c:357 msgid " -h \t\tShow this message\n" msgstr " -h \t\tAfficher ce message\n" -#: nano.c:354 +#: nano.c:358 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -i \t\tIndenter automatiquement les nouvelles lignes\n" -#: nano.c:356 +#: nano.c:360 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:359 +#: nano.c:363 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tActiver la souris\n" -#: nano.c:363 +#: nano.c:367 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr "" " -r [#cols] \tMettre la colonne de fin de ligne à (couper les lignes à) " "#cols\n" -#: nano.c:364 +#: nano.c:368 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [prog] \tActiver un vérificateur orthographique alternatif\n" -#: nano.c:365 +#: nano.c:369 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tRendre les 2 lignes du bas plus semblables à Pico\n" -#: nano.c:366 +#: nano.c:370 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tSauver automatiquement à la sortie, sans demander\n" -#: nano.c:367 +#: nano.c:371 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tMode Visualisation seule (lecture seule)\n" -#: nano.c:368 +#: nano.c:372 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tNe pas couper les lignes longues\n" -#: nano.c:369 +#: nano.c:373 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tNe pas afficher la fenêtre d'aide\n" -#: nano.c:370 +#: nano.c:374 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tAutoriser la suspension\n" -#: nano.c:371 +#: nano.c:375 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +LIGNE\t\tDémarrer à la ligne LIGNE\n" -#: nano.c:378 +#: nano.c:382 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano version %s de Chris Allegretta (compilée %s, %s)\n" -#: nano.c:380 +#: nano.c:384 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" -#: nano.c:405 +#: nano.c:409 msgid "Mark Set" msgstr "Marque enregistrée" -#: nano.c:410 +#: nano.c:414 msgid "Mark UNset" msgstr "Marque effacée" -#: nano.c:845 +#: nano.c:841 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap appelée avec inptr->data=\"%s\"\n" -#: nano.c:929 +#: nano.c:925 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data vaut maintenant \"%s\"\n" -#: nano.c:974 +#: nano.c:970 #, c-format msgid "After, data = \"%s\"\n" msgstr "Après, data = \"%s\"\n" -#: nano.c:1038 +#: nano.c:1034 msgid "Error deleting tempfile, ack!" msgstr "Erreur lors de l'effacement du fichier temporaire, zut!" -#: nano.c:1051 nano.c:1101 +#: nano.c:1047 nano.c:1097 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Impossible de créer un nom de fichier temporaire: %s" -#: nano.c:1073 nano.c:1123 +#: nano.c:1069 nano.c:1119 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Impossible d'invoquer le programme spell \"%s\"" #. Why 32512? I dont know! -#: nano.c:1079 nano.c:1129 +#: nano.c:1075 nano.c:1125 msgid "Could not invoke \"ispell\"" msgstr "Impossible d'invoquer \"ispell\"" -#: nano.c:1091 nano.c:1141 +#: nano.c:1087 nano.c:1137 msgid "Finished checking spelling" msgstr "Vérification orthographique terminée" -#: nano.c:1158 +#: nano.c:1154 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "Sauver le buffer modifié (RÉPONDRE \"No\" EFFACERA LES CHANGEMENTS" -#: nano.c:1281 +#: nano.c:1277 msgid "Cannot resize top win" msgstr "Impossible de redimensionner la fenêtre du haut" -#: nano.c:1283 +#: nano.c:1279 msgid "Cannot move top win" msgstr "Impossible de bouger la fenêtre du haut" -#: nano.c:1285 +#: nano.c:1281 msgid "Cannot resize edit win" msgstr "Impossible de redimensionner la fenêtre d'édition" -#: nano.c:1287 +#: nano.c:1283 msgid "Cannot move edit win" msgstr "Impossible de bouger la fenêtre d'édition" -#: nano.c:1289 +#: nano.c:1285 msgid "Cannot resize bottom win" msgstr "Impossible de redimensionner la fenêtre du bas" -#: nano.c:1291 +#: nano.c:1287 msgid "Cannot move bottom win" msgstr "Impossible de bouger la fenêtre du bas" -#: nano.c:1727 +#: nano.c:1732 msgid "Main: set up windows\n" msgstr "Main: configuration des fenêtres\n" -#: nano.c:1749 +#: nano.c:1754 msgid "Main: bottom win\n" msgstr "Main: fenêtre du bas\n" -#: nano.c:1755 +#: nano.c:1760 msgid "Main: open file\n" msgstr "Main: ouvrir fichier\n" -#: nano.c:1823 +#: nano.c:1831 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "J'ai reçu Alt-[-%c! (%d)\n" -#: nano.c:1839 +#: nano.c:1847 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "J'ai reçu Alt-%c! (%d)\n" diff --git a/po/id.po b/po/id.po index 932aa9ea..5e775daa 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: nano-0.9.10\n" -"POT-Creation-Date: 2000-06-19 01:59-0400\n" +"POT-Creation-Date: 2000-06-19 18:16-0400\n" "PO-Revision-Date: 2000-06-08 20:56+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -54,7 +54,7 @@ msgstr "Membaca File" msgid "File to insert [from ./] " msgstr "File untuk disisipkan " -#: files.c:271 files.c:295 files.c:459 nano.c:1171 +#: files.c:271 files.c:295 files.c:459 nano.c:1167 msgid "Cancelled" msgstr "Dibatalkan" @@ -421,69 +421,73 @@ msgstr "Pemakaian: nano [GNU long option] [option] +LINE \n" msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Option: Long option Arti\n" -#: nano.c:315 +#: nano.c:314 +msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:317 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr "-V --version Tampilkan versi dan keluar\n" -#: nano.c:317 +#: nano.c:319 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr "-c --const Menampilkan posisi kursor secara konstan\n" -#: nano.c:319 +#: nano.c:321 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr "-h --help Tampilkan pesan ini\n" -#: nano.c:321 +#: nano.c:323 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr "-i --autoindent Indent baris barus secara otomatis\n" -#: nano.c:323 +#: nano.c:325 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "-l --nofollow Jangan ikuti link simbolik, timpa.\n" -#: nano.c:326 +#: nano.c:328 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr "-m --mouse Aktifkan mouse\n" -#: nano.c:331 +#: nano.c:333 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "-r [#cols] --fill=[#cols] Set fill col ke (wrap line di) #cols\n" -#: nano.c:333 +#: nano.c:335 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr "-p --pico Buat dua baris terbawah seperti Pico\n" -#: nano.c:335 +#: nano.c:337 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "-s [prog] --speller=[prog] Aktifkan speller alternatif\n" -#: nano.c:337 +#: nano.c:339 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" "-t --tempfile Autosave saat keluar, jangan minta konfirmasi\n" -#: nano.c:339 +#: nano.c:341 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr "-v --view View mode (read only)\n" -#: nano.c:341 +#: nano.c:343 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr "-w --nowrap Jangan wrap baris panjang\n" -#: nano.c:343 +#: nano.c:345 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr "-x --nohelp Jangan tampilkan jendela bantuan\n" -#: nano.c:345 +#: nano.c:347 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr "-z --suspend Aktifkan suspend\n" -#: nano.c:347 +#: nano.c:349 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr "+LINE Mulai pada nomor baris LINE\n" -#: nano.c:349 +#: nano.c:351 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -491,172 +495,176 @@ msgstr "" "Pemakaian: nano [option] +LINE \n" "\n" -#: nano.c:350 +#: nano.c:352 msgid "Option\t\tMeaning\n" msgstr "Option Arti\n" -#: nano.c:351 +#: nano.c:354 +msgid " -T [num]\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:355 msgid " -V \t\tPrint version information and exit\n" msgstr "-V Tampilkan informasi versi dan keluar\n" -#: nano.c:352 +#: nano.c:356 msgid " -c \t\tConstantly show cursor position\n" msgstr "-c Menampilkan posisi kursor secara konstan\n" -#: nano.c:353 +#: nano.c:357 msgid " -h \t\tShow this message\n" msgstr "-h Tampilkan pesan ini\n" -#: nano.c:354 +#: nano.c:358 msgid " -i \t\tAutomatically indent new lines\n" msgstr "-i Indent baris barus secara otomatis\n" -#: nano.c:356 +#: nano.c:360 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "-l Jangan ikuti link simbolik, timpa.\n" -#: nano.c:359 +#: nano.c:363 msgid " -m \t\tEnable mouse\n" msgstr "-m Aktifkan mouse\n" -#: nano.c:363 +#: nano.c:367 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr "-r [#cols] Set fill col ke (wrap line di) #cols\n" -#: nano.c:364 +#: nano.c:368 msgid " -s [prog] \tEnable alternate speller\n" msgstr "-s [prog] Aktifkan speller alternatif\n" -#: nano.c:365 +#: nano.c:369 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr "-p Buat dua baris terbawah seperti Pico\n" -#: nano.c:366 +#: nano.c:370 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr "-t Autosave saat keluar, jangan minta konfirmasi.\n" -#: nano.c:367 +#: nano.c:371 msgid " -v \t\tView (read only) mode\n" msgstr "-v View mode (read only)\n" -#: nano.c:368 +#: nano.c:372 msgid " -w \t\tDon't wrap long lines\n" msgstr "-w Jangan wrap baris panjang\n" -#: nano.c:369 +#: nano.c:373 msgid " -x \t\tDon't show help window\n" msgstr "-x Jangan tampilkan jendela bantuan\n" -#: nano.c:370 +#: nano.c:374 msgid " -z \t\tEnable suspend\n" msgstr "-z Aktifkan suspend\n" -#: nano.c:371 +#: nano.c:375 msgid " +LINE\t\tStart at line number LINE\n" msgstr "+LINE Mulai pada nomor baris LINE\n" -#: nano.c:378 +#: nano.c:382 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr "nano versi %s oleh Chris Allegretta (compiled %s, %s)\n" -#: nano.c:380 +#: nano.c:384 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr "Email: nano@asty.org Web: http://www.asty.org/nano\n" -#: nano.c:405 +#: nano.c:409 msgid "Mark Set" msgstr "Set Tanda" -#: nano.c:410 +#: nano.c:414 msgid "Mark UNset" msgstr "Unset Tanda" -#: nano.c:845 +#: nano.c:841 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap dipanggil dengan inptr->data=\"%s\"\n" -#: nano.c:929 +#: nano.c:925 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data sekarang =\"%s\"\n" -#: nano.c:974 +#: nano.c:970 #, c-format msgid "After, data = \"%s\"\n" msgstr "Setelah, data= \"%s\"\n" -#: nano.c:1038 +#: nano.c:1034 msgid "Error deleting tempfile, ack!" msgstr "Kesalahan menghapus tempfile, ack!" -#: nano.c:1051 nano.c:1101 +#: nano.c:1047 nano.c:1097 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Tidak dapat membuat nama file temporer: %s" -#: nano.c:1073 nano.c:1123 +#: nano.c:1069 nano.c:1119 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Tidak dapat memanggil program spell \"%s\"" #. Why 32512? I dont know! -#: nano.c:1079 nano.c:1129 +#: nano.c:1075 nano.c:1125 msgid "Could not invoke \"ispell\"" msgstr "Tidak dapat memanggil \"ispell\"" -#: nano.c:1091 nano.c:1141 +#: nano.c:1087 nano.c:1137 msgid "Finished checking spelling" msgstr "Selesai memeriksa ejaan" -#: nano.c:1158 +#: nano.c:1154 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "" "Simpan buffer termodifikasi (JAWABAN \"No\" AKAN MENGHAPUS PERUBAHAN) ?" -#: nano.c:1281 +#: nano.c:1277 msgid "Cannot resize top win" msgstr "Tidak dapat resize jendela atas" -#: nano.c:1283 +#: nano.c:1279 msgid "Cannot move top win" msgstr "Tidak memindahkan jendela atas" -#: nano.c:1285 +#: nano.c:1281 msgid "Cannot resize edit win" msgstr "Tidak dapat resize jendela edit" -#: nano.c:1287 +#: nano.c:1283 msgid "Cannot move edit win" msgstr "Tidak dapat memindah jendela edit" -#: nano.c:1289 +#: nano.c:1285 msgid "Cannot resize bottom win" msgstr "Tidak dapat meresize jendela bawah" -#: nano.c:1291 +#: nano.c:1287 msgid "Cannot move bottom win" msgstr "Tidak dapat memindah jendela bawah" -#: nano.c:1727 +#: nano.c:1732 msgid "Main: set up windows\n" msgstr "Main: menset jendelan\n" -#: nano.c:1749 +#: nano.c:1754 msgid "Main: bottom win\n" msgstr "Main: jendela bawah\n" -#: nano.c:1755 +#: nano.c:1760 msgid "Main: open file\n" msgstr "Main: membuka file\n" -#: nano.c:1823 +#: nano.c:1831 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" -#: nano.c:1839 +#: nano.c:1847 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" diff --git a/po/it.gmo b/po/it.gmo index 862d898f..cd6d7290 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index f5a0d21f..a706b31c 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.7\n" -"POT-Creation-Date: 2000-06-19 01:59-0400\n" +"POT-Creation-Date: 2000-06-19 18:16-0400\n" "PO-Revision-Date: 2000-03-03 04:57+0100\n" "Last-Translator: Daniele Medri \n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Lettura file" msgid "File to insert [from ./] " msgstr "File da inserire [da ./] " -#: files.c:271 files.c:295 files.c:459 nano.c:1171 +#: files.c:271 files.c:295 files.c:459 nano.c:1167 msgid "Cancelled" msgstr "Cancellato" @@ -408,69 +408,73 @@ msgstr "" msgid "Option\t\tLong option\t\tMeaning\n" msgstr "Opzioni\t\tLunghe opzioni\t\tSignificato\n" -#: nano.c:315 +#: nano.c:314 +msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:317 msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr " -V \t\t--versione\t\tStampa informazioni sulla versione ed esci\n" -#: nano.c:317 +#: nano.c:319 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr " -c \t\t--const\t\t\tMostra sempre la posizione del cursore\n" -#: nano.c:319 +#: nano.c:321 msgid " -h \t\t--help\t\t\tShow this message\n" msgstr " -h \t\t--help\t\t\tMostra questo messaggio\n" -#: nano.c:321 +#: nano.c:323 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n" -#: nano.c:323 +#: nano.c:325 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:326 +#: nano.c:328 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr " -m \t\t--mouse\t\t\tAttiva mouse\n" -#: nano.c:331 +#: nano.c:333 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \t--fill=[#cols]\t\tConfigura riempimento colonne\n" -#: nano.c:333 +#: nano.c:335 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr " -p\t \t--pico\t\t\tCrea in basso 2 linee come l'aspetto di Pico\n" -#: nano.c:335 +#: nano.c:337 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr " -s [prog] \t--speller=[prog]\tAttiva correttore alternativo\n" -#: nano.c:337 +#: nano.c:339 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 richiesta\n" -#: nano.c:339 +#: nano.c:341 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr " -v \t\t--view\t\t\tVisualizzazione (sola lettura)\n" -#: nano.c:341 +#: nano.c:343 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr " -w \t\t--nowrap\t\tNon interrompere linee lunghe\n" -#: nano.c:343 +#: nano.c:345 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr " -x \t\t--nohelp\t\tNon mostrare finestra aiuti\n" -#: nano.c:345 +#: nano.c:347 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr " -z \t\t--suspend\t\tAbilita sospensione\n" -#: nano.c:347 +#: nano.c:349 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr " +LINE\t\t\t\t\tInizia alla linea numero\n" -#: nano.c:349 +#: nano.c:351 msgid "" "Usage: nano [option] +LINE \n" "\n" @@ -478,173 +482,177 @@ msgstr "" "Uso: nano [opzioni] +LINEA \n" "\n" -#: nano.c:350 +#: nano.c:352 msgid "Option\t\tMeaning\n" msgstr "Opzioni\t\tSignificato\n" -#: nano.c:351 +#: nano.c:354 +msgid " -T [num]\tSet width of a tab to num\n" +msgstr "" + +#: nano.c:355 msgid " -V \t\tPrint version information and exit\n" msgstr " -V \t\tStampa informazioni sulla versione ed esci\n" -#: nano.c:352 +#: nano.c:356 msgid " -c \t\tConstantly show cursor position\n" msgstr " -c \t\tMostra sempre la posizione del cursore\n" -#: nano.c:353 +#: nano.c:357 msgid " -h \t\tShow this message\n" msgstr " -h \t\tMostra questo messaggio\n" -#: nano.c:354 +#: nano.c:358 msgid " -i \t\tAutomatically indent new lines\n" msgstr " -v \t\tIndentazione automatica nuove linee\n" -#: nano.c:356 +#: nano.c:360 msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr " -l \t\tNon seguire i link simbolici, sovrascrivi.\n" -#: nano.c:359 +#: nano.c:363 msgid " -m \t\tEnable mouse\n" msgstr " -m \t\tAttiva mouse\n" -#: nano.c:363 +#: nano.c:367 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" msgstr " -r [#cols] \tRiempimento colonne (interrompi linee a) #cols\n" -#: nano.c:364 +#: nano.c:368 msgid " -s [prog] \tEnable alternate speller\n" msgstr " -s [prog] \tAttiva correttore alternativo\n" -#: nano.c:365 +#: nano.c:369 msgid " -p \t\tMake bottom 2 lines more Pico-like\n" msgstr " -p \t\tCrea in basso 2 linee sullo stile di Pico\n" -#: nano.c:366 +#: nano.c:370 msgid " -t \t\tAuto save on exit, don't prompt\n" msgstr " -t \t\tSalvataggio automatico in uscita senza avviso\n" -#: nano.c:367 +#: nano.c:371 msgid " -v \t\tView (read only) mode\n" msgstr " -v \t\tVisualizza (sola lettura)\n" -#: nano.c:368 +#: nano.c:372 msgid " -w \t\tDon't wrap long lines\n" msgstr " -w \t\tNon interrompere linee lunghe\n" -#: nano.c:369 +#: nano.c:373 msgid " -x \t\tDon't show help window\n" msgstr " -x \t\tNon mostrare la finestra Aiuti\n" -#: nano.c:370 +#: nano.c:374 msgid " -z \t\tEnable suspend\n" msgstr " -z \t\tAttiva sospensione\n" -#: nano.c:371 +#: nano.c:375 msgid " +LINE\t\tStart at line number LINE\n" msgstr " +LINEA\t\tInizia alla LINEA numero\n" -#: nano.c:378 +#: nano.c:382 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr " nano versione %s di Chris Allegretta (compilato %s, %s\n" -#: nano.c:380 +#: nano.c:384 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr "Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" -#: nano.c:405 +#: nano.c:409 msgid "Mark Set" msgstr "" -#: nano.c:410 +#: nano.c:414 msgid "Mark UNset" msgstr "" -#: nano.c:845 +#: nano.c:841 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "check_wrap chiamata con inptr->data=\"%s\"\n" -#: nano.c:929 +#: nano.c:925 #, c-format msgid "current->data now = \"%s\"\n" msgstr "current->data ora = \"%d\"\n" -#: nano.c:974 +#: nano.c:970 #, c-format msgid "After, data = \"%s\"\n" msgstr "Dopo, data = \"%s\"\n" -#: nano.c:1038 +#: nano.c:1034 msgid "Error deleting tempfile, ack!" msgstr "" -#: nano.c:1051 nano.c:1101 +#: nano.c:1047 nano.c:1097 #, c-format msgid "Could not create a temporary filename: %s" msgstr "Impossibile creare un nome file temporaneo: %s" -#: nano.c:1073 nano.c:1123 +#: nano.c:1069 nano.c:1119 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "Impossibile invocare correttore ortografico \"%s\"" #. Why 32512? I dont know! -#: nano.c:1079 nano.c:1129 +#: nano.c:1075 nano.c:1125 msgid "Could not invoke \"ispell\"" msgstr "Impossibile invocare \"ispell\"" -#: nano.c:1091 nano.c:1141 +#: nano.c:1087 nano.c:1137 msgid "Finished checking spelling" msgstr "Controllo ortografico terminato" -#: nano.c:1158 +#: nano.c:1154 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "" "Salva il buffer modificato (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI " "AVVENUTI) ?" -#: nano.c:1281 +#: nano.c:1277 msgid "Cannot resize top win" msgstr "Impossibile ridimensionare la finestra superiore" -#: nano.c:1283 +#: nano.c:1279 msgid "Cannot move top win" msgstr "Impossibile spostare la finestra superiore" -#: nano.c:1285 +#: nano.c:1281 msgid "Cannot resize edit win" msgstr "Impossibile ridimensionare la finestra di modifica" -#: nano.c:1287 +#: nano.c:1283 msgid "Cannot move edit win" msgstr "Impossibile spostare finestra di modifica" -#: nano.c:1289 +#: nano.c:1285 msgid "Cannot resize bottom win" msgstr "Impossibile ridimensionare la finestra inferiore" -#: nano.c:1291 +#: nano.c:1287 msgid "Cannot move bottom win" msgstr "Impossibile spostare la finestra inferiore" -#: nano.c:1727 +#: nano.c:1732 msgid "Main: set up windows\n" msgstr "Main: configura finestre\n" -#: nano.c:1749 +#: nano.c:1754 msgid "Main: bottom win\n" msgstr "Main: finestra inferiore\n" -#: nano.c:1755 +#: nano.c:1760 msgid "Main: open file\n" msgstr "Main: apri file\n" -#: nano.c:1823 +#: nano.c:1831 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Premuto Alt-[-%c! (%d)\n" -#: nano.c:1839 +#: nano.c:1847 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Premuto Alt-%c! (%d)\n" diff --git a/po/nano.pot b/po/nano.pot index 2ccb81bf..542089e4 100644 --- a/po/nano.pot +++ b/po/nano.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-19 01:59-0400\n" +"POT-Creation-Date: 2000-06-19 19:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -404,150 +404,158 @@ msgid "Option\t\tLong option\t\tMeaning\n" msgstr "" #: nano.c:315 -msgid " -V \t\t--version\t\tPrint version information and exit\n" -msgstr "" - -#: nano.c:317 -msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" +msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n" msgstr "" #: nano.c:319 -msgid " -h \t\t--help\t\t\tShow this message\n" +msgid " -V \t\t--version\t\tPrint version information and exit\n" msgstr "" #: nano.c:321 -msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" +msgid " -c \t\t--const\t\t\tConstantly show cursor position\n" msgstr "" #: nano.c:323 +msgid " -h \t\t--help\t\t\tShow this message\n" +msgstr "" + +#: nano.c:325 +msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n" +msgstr "" + +#: nano.c:327 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n" msgstr "" -#: nano.c:326 +#: nano.c:330 msgid " -m \t\t--mouse\t\t\tEnable mouse\n" msgstr "" -#: nano.c:331 +#: nano.c:335 msgid "" " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n" msgstr "" -#: nano.c:333 +#: nano.c:337 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n" msgstr "" -#: nano.c:335 +#: nano.c:339 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n" msgstr "" -#: nano.c:337 +#: nano.c:341 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n" msgstr "" -#: nano.c:339 +#: nano.c:343 msgid " -v \t\t--view\t\t\tView (read only) mode\n" msgstr "" -#: nano.c:341 +#: nano.c:345 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n" msgstr "" -#: nano.c:343 +#: nano.c:347 msgid " -x \t\t--nohelp\t\tDon't show help window\n" msgstr "" -#: nano.c:345 +#: nano.c:349 msgid " -z \t\t--suspend\t\tEnable suspend\n" msgstr "" -#: nano.c:347 +#: nano.c:351 msgid " +LINE\t\t\t\t\tStart at line number LINE\n" msgstr "" -#: nano.c:349 +#: nano.c:353 msgid "" "Usage: nano [option] +LINE \n" "\n" msgstr "" -#: nano.c:350 +#: nano.c:354 msgid "Option\t\tMeaning\n" msgstr "" -#: nano.c:351 -msgid " -V \t\tPrint version information and exit\n" -msgstr "" - -#: nano.c:352 -msgid " -c \t\tConstantly show cursor position\n" -msgstr "" - -#: nano.c:353 -msgid " -h \t\tShow this message\n" -msgstr "" - -#: nano.c:354 -msgid " -i \t\tAutomatically indent new lines\n" -msgstr "" - -#: nano.c:356 -msgid " -l \t\tDon't follow symbolic links, overwrite.\n" +#: nano.c:357 +msgid " -T [num]\tSet width of a tab to num\n" msgstr "" #: nano.c:359 -msgid " -m \t\tEnable mouse\n" +msgid " -V \t\tPrint version information and exit\n" msgstr "" -#: nano.c:363 -msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" +#: nano.c:360 +msgid " -c \t\tConstantly show cursor position\n" +msgstr "" + +#: nano.c:361 +msgid " -h \t\tShow this message\n" +msgstr "" + +#: nano.c:362 +msgid " -i \t\tAutomatically indent new lines\n" msgstr "" #: nano.c:364 -msgid " -s [prog] \tEnable alternate speller\n" -msgstr "" - -#: nano.c:365 -msgid " -p \t\tMake bottom 2 lines more Pico-like\n" -msgstr "" - -#: nano.c:366 -msgid " -t \t\tAuto save on exit, don't prompt\n" +msgid " -l \t\tDon't follow symbolic links, overwrite.\n" msgstr "" #: nano.c:367 -msgid " -v \t\tView (read only) mode\n" -msgstr "" - -#: nano.c:368 -msgid " -w \t\tDon't wrap long lines\n" -msgstr "" - -#: nano.c:369 -msgid " -x \t\tDon't show help window\n" -msgstr "" - -#: nano.c:370 -msgid " -z \t\tEnable suspend\n" +msgid " -m \t\tEnable mouse\n" msgstr "" #: nano.c:371 -msgid " +LINE\t\tStart at line number LINE\n" +msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n" +msgstr "" + +#: nano.c:372 +msgid " -s [prog] \tEnable alternate speller\n" +msgstr "" + +#: nano.c:373 +msgid " -p \t\tMake bottom 2 lines more Pico-like\n" +msgstr "" + +#: nano.c:374 +msgid " -t \t\tAuto save on exit, don't prompt\n" +msgstr "" + +#: nano.c:375 +msgid " -v \t\tView (read only) mode\n" +msgstr "" + +#: nano.c:376 +msgid " -w \t\tDon't wrap long lines\n" +msgstr "" + +#: nano.c:377 +msgid " -x \t\tDon't show help window\n" msgstr "" #: nano.c:378 +msgid " -z \t\tEnable suspend\n" +msgstr "" + +#: nano.c:379 +msgid " +LINE\t\tStart at line number LINE\n" +msgstr "" + +#: nano.c:386 #, c-format msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr "" -#: nano.c:380 +#: nano.c:388 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n" msgstr "" -#: nano.c:405 +#: nano.c:413 msgid "Mark Set" msgstr "" -#: nano.c:410 +#: nano.c:418 msgid "Mark UNset" msgstr "" @@ -617,24 +625,24 @@ msgstr "" msgid "Cannot move bottom win" msgstr "" -#: nano.c:1727 +#: nano.c:1746 msgid "Main: set up windows\n" msgstr "" -#: nano.c:1749 +#: nano.c:1768 msgid "Main: bottom win\n" msgstr "" -#: nano.c:1755 +#: nano.c:1774 msgid "Main: open file\n" msgstr "" -#: nano.c:1823 +#: nano.c:1847 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "" -#: nano.c:1839 +#: nano.c:1863 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "" diff --git a/winio.c b/winio.c index 8bc33fa4..54c38087 100644 --- a/winio.c +++ b/winio.c @@ -72,9 +72,9 @@ int xpt(filestruct * fileptr, int index) tabs++; if (fileptr->data[i] == NANO_CONTROL_I) { - if (tabs % 8 == 0); + if (tabs % TABSIZE == 0); else - tabs += 8 - (tabs % 8); + tabs += TABSIZE - (tabs % TABSIZE); } else if (fileptr->data[i] & 0x80) /* Make 8 bit chars only 1 collumn! */ ; @@ -105,8 +105,8 @@ int actual_x_from_start(filestruct * fileptr, int xplus, int start) for (i = start; tot <= xplus && fileptr->data[i] != 0; i++,tot++) if (fileptr->data[i] == NANO_CONTROL_I) { - if (tot % 8 == 0) tot++; - else tot += 8 - (tot % 8); + if (tot % TABSIZE == 0) tot++; + else tot += TABSIZE - (tot % TABSIZE); } else if (fileptr->data[i] & 0x80) tot++; /* Make 8 bit chars only 1 column (again) */ else if (fileptr->data[i] < 32) @@ -136,9 +136,9 @@ int strlenpt(char *buf) tabs++; if (buf[i] == NANO_CONTROL_I) { - if (tabs % 8 == 0); + if (tabs % TABSIZE == 0); else - tabs += 8 - (tabs % 8); + tabs += TABSIZE - (tabs % TABSIZE); } else if (buf[i] & 0x80) /* Make 8 bit chars only 1 collumn! */ ; @@ -732,7 +732,7 @@ void update_line(filestruct * fileptr, int index) fileptr->data[pos++] = ' '; if(i < current_x) virt_cur_x++; if(i < mark_beginx) virt_mark_beginx++; - } while(pos % 8); + } while(pos % TABSIZE); /* must decrement once to account for tab-is-one-character */ if(i < current_x) virt_cur_x--; if(i < mark_beginx) virt_mark_beginx--;