diff -Nru kbd-1.15.3/COPYING kbd-1.15.5/COPYING --- kbd-1.15.3/COPYING 2011-05-01 23:27:13.000000000 +0000 +++ kbd-1.15.5/COPYING 2012-12-01 21:41:38.000000000 +0000 @@ -47,6 +47,11 @@ Authors: Seth Forshee Dustin Kirkland +The files + auth.c pam_auth.h pam.c parse.c screen.c username.c vlock.c vlock.h vt.c +is Copyright (C) 1994-1998 Michael K. Johnson + Copyright (C) 2002-2006 Dmitry V. Levin + All files in this package may be freely copied under the terms of the GNU General Public License (GPL), version 2, or at your option any later version - except possibly for the restrictions diff -Nru kbd-1.15.3/ChangeLog kbd-1.15.5/ChangeLog --- kbd-1.15.3/ChangeLog 2011-04-26 20:29:35.000000000 +0000 +++ kbd-1.15.5/ChangeLog 2012-12-03 06:56:58.000000000 +0000 @@ -1,3 +1,22 @@ +Changes for 1.15.5 (legion) + +o Build system: + - Fix various vlock build errors (Mike Frysinger) + - Fix loadkeys.analyze lex handling (Mike Frysinger) + - Fix msgstr in es.po (Dmitry V. Levin) + +Changes for 1.15.4 (legion) + +o Programs: + - vlock: New utility which locks one or more virtual consoles. + - loadkeys: Change the handling of -C option. + - loadkeys: Fix -d option. +o Keymaps: + - Add dvorak-es keymap. + - Add dvorak-uk keymap (Joe MacMahon). + - Add dvorak-sv-a1 and dvorak-sv-a5 keymaps . + - Add ruwin_alt_sh-UTF-8 keymap (Dmitriy Perlow). + Changes for 1.15.3 (legion) o Build system: diff -Nru kbd-1.15.3/Makefile.in kbd-1.15.5/Makefile.in --- kbd-1.15.3/Makefile.in 2011-05-07 20:34:44.000000000 +0000 +++ kbd-1.15.5/Makefile.in 2012-12-05 19:27:06.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -42,11 +59,12 @@ config/install-sh config/missing config/mkinstalldirs \ config/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -55,6 +73,12 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -64,6 +88,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -76,9 +105,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -107,9 +138,12 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -160,6 +194,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -231,7 +266,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -267,10 +302,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -452,13 +485,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -490,7 +520,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -498,7 +532,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -529,6 +563,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -538,7 +574,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -548,6 +584,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -576,8 +613,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -608,10 +653,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -698,17 +748,18 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am + dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru kbd-1.15.3/aclocal.m4 kbd-1.15.5/aclocal.m4 --- kbd-1.15.3/aclocal.m4 2011-05-07 20:32:56.000000000 +0000 +++ kbd-1.15.5/aclocal.m4 2012-12-05 19:26:48.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1a -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,18 +14,21 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1a], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1a])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -145,13 +151,13 @@ fi])]) # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010 Free Software Foundation, Inc. +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 11 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -548,12 +555,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -720,12 +730,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -748,13 +761,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -762,13 +776,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -844,12 +858,71 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -872,13 +945,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -887,13 +960,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -915,10 +988,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -987,6 +1061,7 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/attributes.m4]) m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) m4_include([m4/lib-ld.m4]) diff -Nru kbd-1.15.3/autogen.sh kbd-1.15.5/autogen.sh --- kbd-1.15.3/autogen.sh 2011-05-07 20:35:36.000000000 +0000 +++ kbd-1.15.5/autogen.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/bin/sh -efu - -OPT= -[ "${1-}" != '-f' ] || OPT=-f - -autoreconf -iv $OPT - -echo -echo "Now type '${0%/*}/configure' and 'make' to compile." -echo diff -Nru kbd-1.15.3/config/config.guess kbd-1.15.5/config/config.guess --- kbd-1.15.3/config/config.guess 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/config/config.guess 2012-12-01 22:58:09.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-08-14' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -202,6 +200,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -224,7 +226,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +272,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +301,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +400,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +486,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +500,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +557,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +600,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +736,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +775,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,30 +794,35 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -858,6 +868,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,7 +884,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,20 +896,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -934,7 +960,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -960,7 +986,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,14 +994,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1013,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1049,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1077,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1118,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1162,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1191,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1179,6 +1208,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1231,7 +1263,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1276,13 +1311,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,11 +1335,11 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru kbd-1.15.3/config/config.sub kbd-1.15.5/config/config.sub --- kbd-1.15.3/config/config.sub 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/config/config.sub 2012-12-01 22:58:09.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-31' +timestamp='2012-08-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -157,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -222,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -246,17 +255,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arm | armh | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -282,29 +296,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -314,6 +338,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,21 +367,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | arm-* | armh-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -368,25 +411,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -411,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -481,11 +528,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -517,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -675,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -733,9 +788,13 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -772,10 +831,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -840,6 +907,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -922,9 +995,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1018,6 +1092,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1074,20 +1151,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1157,6 +1222,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1254,11 +1322,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1288,14 +1356,15 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1342,7 +1411,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1391,7 +1460,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1436,8 +1505,8 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1460,10 +1529,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1475,8 +1544,20 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1496,14 +1577,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1530,7 +1608,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru kbd-1.15.3/config/depcomp kbd-1.15.5/config/depcomp --- kbd-1.15.3/config/depcomp 2011-05-07 20:34:44.000000000 +0000 +++ kbd-1.15.5/config/depcomp 2012-12-01 22:58:10.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +40,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +96,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +168,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +430,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +580,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru kbd-1.15.3/config/install-sh kbd-1.15.5/config/install-sh --- kbd-1.15.3/config/install-sh 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/config/install-sh 2012-12-01 22:58:09.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru kbd-1.15.3/config/missing kbd-1.15.5/config/missing --- kbd-1.15.3/config/missing 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/config/missing 2012-12-01 22:58:09.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru kbd-1.15.3/configure kbd-1.15.5/configure --- kbd-1.15.3/configure 2011-05-07 20:33:42.000000000 +0000 +++ kbd-1.15.5/configure 2012-12-05 19:27:03.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for kbd 1.15.3wip. +# Generated by GNU Autoconf 2.68 for kbd 1.15.5. # # Report bugs to . # @@ -91,6 +91,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -216,11 +217,18 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -319,7 +327,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +367,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +541,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -552,10 +560,10 @@ # Identity of this package. PACKAGE_NAME='kbd' PACKAGE_TARNAME='kbd' -PACKAGE_VERSION='1.15.3wip' -PACKAGE_STRING='kbd 1.15.3wip' +PACKAGE_VERSION='1.15.5' +PACKAGE_STRING='kbd 1.15.5' PACKAGE_BUGREPORT='gladkov.alexey@gmail.com' -PACKAGE_URL='' +PACKAGE_URL='http://kbd-project.org/' ac_unique_file="src/loadkeys.y" # Factoring default headers for most tests. @@ -597,6 +605,9 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +PAM_LIBS +VLOCK_FALSE +VLOCK_TRUE OPTIONAL_PROGS_FALSE OPTIONAL_PROGS_TRUE RESIZECONS_PROGS_FALSE @@ -651,6 +662,10 @@ LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -715,6 +730,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_nls with_gnu_ld @@ -722,6 +738,7 @@ with_libiconv_prefix with_libintl_prefix enable_optional_progs +enable_vlock ' ac_precious_vars='build_alias host_alias @@ -796,8 +813,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -842,7 +860,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -868,7 +886,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1072,7 +1090,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1088,7 +1106,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1118,8 +1136,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1127,7 +1145,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1137,7 +1155,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1145,13 +1163,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1174,7 +1192,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1188,8 +1206,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1204,9 +1222,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1245,11 +1263,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1275,7 +1293,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures kbd 1.15.3wip to adapt to many kinds of systems. +\`configure' configures kbd 1.15.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1289,7 +1307,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1345,7 +1363,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of kbd 1.15.3wip:";; + short | recursive ) echo "Configuration of kbd 1.15.5:";; esac cat <<\_ACEOF @@ -1353,11 +1371,14 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --enable-optional-progs Build and install a optional programs + --disable-vlock do not build vlock Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1376,8 +1397,9 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - YACC The `Yet Another C Compiler' implementation to use. Defaults to - the first program found out of: `bison -y', `byacc', `yacc'. + YACC The `Yet Another Compiler Compiler' implementation to use. + Defaults to the first program found out of: `bison -y', `byacc', + `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. @@ -1387,6 +1409,7 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to . +kbd home page: . _ACEOF ac_status=$? fi @@ -1449,8 +1472,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -kbd configure 1.15.3wip -generated by GNU Autoconf 2.65 +kbd configure 1.15.5 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1496,7 +1519,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1542,7 +1565,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1568,7 +1591,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1579,7 +1602,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1621,7 +1644,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1634,10 +1657,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1673,7 +1696,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1696,17 +1719,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## --------------------------------------- ## +( $as_echo "## --------------------------------------- ## ## Report this to gladkov.alexey@gmail.com ## -## --------------------------------------- ## -_ASBOX +## --------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1715,7 +1736,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1728,7 +1749,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1746,7 +1767,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1759,7 +1780,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1800,7 +1821,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -1812,7 +1833,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1896,15 +1917,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by kbd $as_me 1.15.3wip, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by kbd $as_me 1.15.5, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2014,11 +2035,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2052,11 +2071,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2069,11 +2086,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2087,11 +2102,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2146,7 +2159,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2161,7 +2179,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2237,7 +2259,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2270,7 +2292,7 @@ fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2303,7 +2325,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2390,11 +2412,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2416,7 +2438,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2426,7 +2448,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2480,7 +2502,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2520,7 +2542,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2573,7 +2595,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2624,7 +2646,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2664,7 +2686,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2672,7 +2694,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2706,7 +2728,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2722,7 +2744,7 @@ # Define the identity of the package. PACKAGE='kbd' - VERSION='1.15.3wip' + VERSION='1.15.5' cat >>confdefs.h <<_ACEOF @@ -2752,11 +2774,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2766,6 +2788,47 @@ ac_config_headers="$ac_config_headers config.h" + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2777,7 +2840,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2817,7 +2880,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2870,7 +2933,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2910,7 +2973,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2969,7 +3032,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3013,7 +3076,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3067,8 +3130,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3182,9 +3245,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3226,8 +3288,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3284,9 +3346,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3297,7 +3359,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3337,8 +3399,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3348,7 +3410,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3385,7 +3447,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3463,7 +3525,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3625,7 +3687,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3634,6 +3696,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3693,7 +3756,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -3757,7 +3820,7 @@ fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3880,7 +3943,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_YACC+set}" = set; then : +if ${ac_cv_prog_YACC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then @@ -3924,7 +3987,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LEX+set}" = set; then : +if ${ac_cv_prog_LEX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then @@ -3994,7 +4057,7 @@ test $ac_status = 0; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 $as_echo_n "checking lex output file root... " >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then : +if ${ac_cv_prog_lex_root+:} false; then : $as_echo_n "(cached) " >&6 else @@ -4003,7 +4066,7 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 @@ -4013,7 +4076,7 @@ if test -z "${LEXLIB+set}"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 $as_echo_n "checking lex library... " >&6; } -if test "${ac_cv_lib_lex+set}" = set; then : +if ${ac_cv_lib_lex+:} false; then : $as_echo_n "(cached) " >&6 else @@ -4043,7 +4106,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 $as_echo_n "checking whether yytext is a pointer... " >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then : +if ${ac_cv_prog_lex_yytext_pointer+:} false; then : $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the @@ -4054,7 +4117,8 @@ LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define YYTEXT_POINTER 1 + + #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4077,7 +4141,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4132,7 +4196,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -4160,7 +4224,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -4168,7 +4232,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -4189,27 +4253,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4227,14 +4291,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -4242,7 +4306,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4323,7 +4387,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -4363,7 +4427,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -4434,7 +4498,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -4505,7 +4569,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in @@ -4644,7 +4708,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${acl_cv_path_LD+set}" = set; then : +if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4678,10 +4742,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then : +if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -4700,7 +4764,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 $as_echo_n "checking for shared library run path origin... " >&6; } -if test "${acl_cv_rpath+set}" = set; then : +if ${acl_cv_rpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5156,7 +5220,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then : +if ${gt_cv_func_gnugettext1_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5217,7 +5281,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5670,7 +5734,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then : +if ${gt_cv_func_gnugettext1_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -5844,7 +5908,7 @@ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Header+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5871,8 +5935,7 @@ eval ac_res=\$$as_ac_Header { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF @@ -5885,7 +5948,7 @@ if test $ac_header_dirent = dirent.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 $as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -5919,11 +5982,11 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then : + if ${ac_cv_search_opendir+:} false; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : else ac_cv_search_opendir=no @@ -5942,7 +6005,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 $as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -5976,11 +6039,11 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then : + if ${ac_cv_search_opendir+:} false; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : else ac_cv_search_opendir=no @@ -6010,7 +6073,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6040,7 +6103,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6056,11 +6119,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -6099,7 +6162,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6115,18 +6178,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6138,7 +6201,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -6187,7 +6250,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -6201,7 +6264,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -6253,7 +6316,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -6268,7 +6331,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6380,7 +6443,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then : +if ${ac_cv_header_sys_wait_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6426,8 +6489,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6442,8 +6504,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6456,7 +6517,7 @@ # Checks for typedefs, structures, and compiler characteristics. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6536,7 +6597,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -6577,7 +6638,7 @@ esac ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : +if test "x$ac_cv_type_size_t" = xyes; then : else @@ -6589,7 +6650,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then : +if ${ac_cv_struct_tm+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6624,7 +6685,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 $as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then : +if ${ac_cv_type_uid_t+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6657,7 +6718,7 @@ for ac_header in unistd.h do : ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = x""yes; then : +if test "x$ac_cv_header_unistd_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_UNISTD_H 1 _ACEOF @@ -6668,7 +6729,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5 $as_echo_n "checking for working chown... " >&6; } -if test "${ac_cv_func_chown_works+set}" = set; then : +if ${ac_cv_func_chown_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -6721,7 +6782,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5 $as_echo_n "checking whether closedir returns void... " >&6; } -if test "${ac_cv_func_closedir_void+set}" = set; then : +if ${ac_cv_func_closedir_void+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -6762,7 +6823,7 @@ fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = x""yes; then : +if test "x$ac_cv_type_pid_t" = xyes; then : else @@ -6775,7 +6836,7 @@ for ac_header in vfork.h do : ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" -if test "x$ac_cv_header_vfork_h" = x""yes; then : +if test "x$ac_cv_header_vfork_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_VFORK_H 1 _ACEOF @@ -6788,8 +6849,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -6800,7 +6860,7 @@ if test "x$ac_cv_func_fork" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 $as_echo_n "checking for working fork... " >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then : +if ${ac_cv_func_fork_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -6853,7 +6913,7 @@ if test "x$ac_cv_func_vfork" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 $as_echo_n "checking for working vfork... " >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then : +if ${ac_cv_func_vfork_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -6989,7 +7049,7 @@ if test $ac_cv_c_compiler_gnu = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 $as_echo_n "checking whether $CC needs -traditional... " >&6; } -if test "${ac_cv_prog_gcc_traditional+set}" = set; then : +if ${ac_cv_prog_gcc_traditional+:} false; then : $as_echo_n "(cached) " >&6 else ac_pattern="Autoconf.*'x'" @@ -7030,7 +7090,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 $as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : +if ${ac_cv_type_signal+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7063,7 +7123,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : +if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file @@ -7125,7 +7185,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 $as_echo_n "checking whether stat accepts an empty string... " >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : +if ${ac_cv_func_stat_empty_string_bug+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -7174,8 +7234,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -7184,6 +7243,61 @@ done + + for flag in \ + -Wall \ + -Wextra \ + -Wmissing-noreturn \ + -Wdisabled-optimization \ + -Wcast-align \ + -Wshadow \ + -Wmissing-format-attribute \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wmissing-declarations; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5 +$as_echo_n "checking if $CC supports $flag flag... " >&6; } +if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + + if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int a; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + +fi + +fi +eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + CFLAGS="$CFLAGS $flag"; DEBUG_CFLAGS="$DEBUG_CFLAGS $flag"; +fi + + done + + case $host_cpu in m68*|sparc*) KEYCODES_PROGS=no ;; *) KEYCODES_PROGS=yes ;; @@ -7199,6 +7313,7 @@ case $host_cpu in i?86*) RESIZECONS_PROGS=yes ;; + x86_64*) RESIZECONS_PROGS=yes ;; *) RESIZECONS_PROGS=no ;; esac if test "$RESIZECONS_PROGS" = "yes"; then @@ -7226,7 +7341,127 @@ fi -ac_config_files="$ac_config_files Makefile data/Makefile man/Makefile man/man1/Makefile man/man1/dumpkeys.1 man/man1/loadkeys.1 man/man1misc/Makefile man/man5/Makefile man/man8/Makefile man/man8/loadunimap.8 man/man8/mapscrn.8 man/man8/setfont.8 man/man8misc/Makefile po/Makefile.in src/Makefile" +# Check whether --enable-vlock was given. +if test "${enable_vlock+set}" = set; then : + enableval=$enable_vlock; VLOCK_PROG=no +else + VLOCK_PROG=yes +fi + + if test "$VLOCK_PROG" = "yes"; then + VLOCK_TRUE= + VLOCK_FALSE='#' +else + VLOCK_TRUE='#' + VLOCK_FALSE= +fi + + +if test "$VLOCK_PROG" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 +$as_echo_n "checking for pam_start in -lpam... " >&6; } +if ${ac_cv_lib_pam_pam_start+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_start (); +int +main () +{ +return pam_start (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_start=yes +else + ac_cv_lib_pam_pam_start=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; } +if test "x$ac_cv_lib_pam_pam_start" = xyes; then : + + ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default" +if test "x$ac_cv_header_security_pam_appl_h" = xyes; then : + have_pam=1 +else + as_fn_error $? "Can't find required header files." "$LINENO" 5 +fi + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for misc_conv in -lpam_misc" >&5 +$as_echo_n "checking for misc_conv in -lpam_misc... " >&6; } +if ${ac_cv_lib_pam_misc_misc_conv+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam_misc $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char misc_conv (); +int +main () +{ +return misc_conv (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_misc_misc_conv=yes +else + ac_cv_lib_pam_misc_misc_conv=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_misc_misc_conv" >&5 +$as_echo "$ac_cv_lib_pam_misc_misc_conv" >&6; } +if test "x$ac_cv_lib_pam_misc_misc_conv" = xyes; then : + + ac_fn_c_check_header_mongrel "$LINENO" "security/pam_misc.h" "ac_cv_header_security_pam_misc_h" "$ac_includes_default" +if test "x$ac_cv_header_security_pam_misc_h" = xyes; then : + have_pam_misc=1 +else + as_fn_error $? "Can't find required header files." "$LINENO" 5 +fi + + +fi + + if test -z "$have_pam" -o -z "$have_pam_misc"; then + as_fn_error $? "libpam-devel required." "$LINENO" 5 + fi + PAM_LIBS="-lpam -lpam_misc" + +fi + +ac_config_files="$ac_config_files Makefile data/Makefile man/Makefile man/man1/Makefile man/man1/dumpkeys.1 man/man1/loadkeys.1 man/man1misc/Makefile man/man5/Makefile man/man8/Makefile man/man8/loadunimap.8 man/man8/mapscrn.8 man/man8/setfont.8 man/man8misc/Makefile po/Makefile.in src/Makefile src/vlock/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7292,10 +7527,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -7311,6 +7557,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -7334,27 +7581,31 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${KEYCODES_PROGS_TRUE}" && test -z "${KEYCODES_PROGS_FALSE}"; then - as_fn_error "conditional \"KEYCODES_PROGS\" was never defined. + as_fn_error $? "conditional \"KEYCODES_PROGS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${RESIZECONS_PROGS_TRUE}" && test -z "${RESIZECONS_PROGS_FALSE}"; then - as_fn_error "conditional \"RESIZECONS_PROGS\" was never defined. + as_fn_error $? "conditional \"RESIZECONS_PROGS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OPTIONAL_PROGS_TRUE}" && test -z "${OPTIONAL_PROGS_FALSE}"; then - as_fn_error "conditional \"OPTIONAL_PROGS\" was never defined. + as_fn_error $? "conditional \"OPTIONAL_PROGS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${VLOCK_TRUE}" && test -z "${VLOCK_FALSE}"; then + as_fn_error $? "conditional \"VLOCK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -7455,6 +7706,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7500,19 +7752,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -7708,7 +7960,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -7761,8 +8013,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by kbd $as_me 1.15.3wip, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by kbd $as_me 1.15.5, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7821,17 +8073,18 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to . +kbd home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -kbd config.status 1.15.3wip -configured by $0, generated by GNU Autoconf 2.65, +kbd config.status 1.15.5 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -7849,11 +8102,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -7875,6 +8133,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -7887,7 +8146,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -7896,7 +8155,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -7975,8 +8234,9 @@ "man/man8misc/Makefile") CONFIG_FILES="$CONFIG_FILES man/man8misc/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/vlock/Makefile") CONFIG_FILES="$CONFIG_FILES src/vlock/Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -7999,9 +8259,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -8010,7 +8271,8 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX")` && test -n "$tmp" && test -d "$tmp" -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -8032,7 +8294,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -8041,18 +8303,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8060,7 +8322,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -8108,7 +8370,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -8140,21 +8402,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -8166,7 +8436,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -8178,11 +8448,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8267,7 +8537,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -8280,7 +8550,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -8299,7 +8569,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -8308,8 +8578,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { as_fn_set_status 1 -as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -8335,8 +8604,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -8472,23 +8741,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -8497,21 +8767,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -8770,7 +9040,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -8798,3 +9068,38 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: + $PACKAGE $VERSION + ====== + + prefix: ${prefix} + libdir: ${libdir} + bindir: ${bindir} + datadir: ${datadir} + + compiler: ${CC} + cflags: ${CFLAGS} + + {get,set}keycodes: ${KEYCODES_PROGS} + resizecons: ${RESIZECONS_PROGS} + optional progs: ${OPTIONAL_PROGS} + vlock: ${VLOCK_PROG} +" >&5 +$as_echo " + $PACKAGE $VERSION + ====== + + prefix: ${prefix} + libdir: ${libdir} + bindir: ${bindir} + datadir: ${datadir} + + compiler: ${CC} + cflags: ${CFLAGS} + + {get,set}keycodes: ${KEYCODES_PROGS} + resizecons: ${RESIZECONS_PROGS} + optional progs: ${OPTIONAL_PROGS} + vlock: ${VLOCK_PROG} +" >&6; } diff -Nru kbd-1.15.3/configure.ac kbd-1.15.5/configure.ac --- kbd-1.15.3/configure.ac 2011-05-14 21:37:45.000000000 +0000 +++ kbd-1.15.5/configure.ac 2012-12-05 19:26:38.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(kbd, 1.15.3, gladkov.alexey@gmail.com) +AC_INIT(kbd, 1.15.5, gladkov.alexey@gmail.com,, http://kbd-project.org/) AC_PREREQ(2.60) @@ -11,6 +11,9 @@ AC_CONFIG_SRCDIR([src/loadkeys.y]) AC_CONFIG_HEADERS(config.h) +m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) +AM_SILENT_RULES([yes]) + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -52,6 +55,18 @@ AC_CHECK_FUNCS([alarm memset setlocale strcasecmp strchr strdup strerror \ strspn strstr strtol strtoul setpgrp malloc realloc]) +CC_CHECK_CFLAGS_APPEND([\ + -Wall \ + -Wextra \ + -Wmissing-noreturn \ + -Wdisabled-optimization \ + -Wcast-align \ + -Wshadow \ + -Wmissing-format-attribute \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wmissing-declarations]) + case $host_cpu in m68*|sparc*) KEYCODES_PROGS=no ;; *) KEYCODES_PROGS=yes ;; @@ -60,6 +75,7 @@ case $host_cpu in i?86*) RESIZECONS_PROGS=yes ;; + x86_64*) RESIZECONS_PROGS=yes ;; *) RESIZECONS_PROGS=no ;; esac AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes") @@ -69,6 +85,26 @@ [OPTIONAL_PROGS=$enableval],[OPTIONAL_PROGS=no]) AM_CONDITIONAL(OPTIONAL_PROGS, test "$OPTIONAL_PROGS" = "yes") +AC_ARG_ENABLE(vlock, + AS_HELP_STRING(--disable-vlock, [do not build vlock]), + [VLOCK_PROG=no],[VLOCK_PROG=yes]) +AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") + +if test "$VLOCK_PROG" = "yes"; then + AC_CHECK_LIB(pam, pam_start, [ + AC_CHECK_HEADER([security/pam_appl.h], + [have_pam=1], + AC_MSG_ERROR([Can't find required header files.]))]) + AC_CHECK_LIB(pam_misc, misc_conv, [ + AC_CHECK_HEADER([security/pam_misc.h], + [have_pam_misc=1], + AC_MSG_ERROR([Can't find required header files.]))]) + if test -z "$have_pam" -o -z "$have_pam_misc"; then + AC_MSG_ERROR([libpam-devel required.]) + fi + AC_SUBST(PAM_LIBS, "-lpam -lpam_misc") +fi + AC_CONFIG_FILES([Makefile data/Makefile man/Makefile @@ -83,5 +119,24 @@ man/man8/setfont.8 man/man8misc/Makefile po/Makefile.in - src/Makefile]) + src/Makefile + src/vlock/Makefile]) AC_OUTPUT + +AC_MSG_RESULT([ + $PACKAGE $VERSION + ====== + + prefix: ${prefix} + libdir: ${libdir} + bindir: ${bindir} + datadir: ${datadir} + + compiler: ${CC} + cflags: ${CFLAGS} + + {get,set}keycodes: ${KEYCODES_PROGS} + resizecons: ${RESIZECONS_PROGS} + optional progs: ${OPTIONAL_PROGS} + vlock: ${VLOCK_PROG} +]) diff -Nru kbd-1.15.3/data/Makefile.am kbd-1.15.5/data/Makefile.am --- kbd-1.15.3/data/Makefile.am 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/data/Makefile.am 2012-12-01 21:41:38.000000000 +0000 @@ -44,11 +44,13 @@ # compress data files - do not touch the distribution but copy first $(KEYMAPDIR)_Z: cp -r $(srcdir)/$(KEYMAPDIR) $(KEYMAPDIR)_Z + chmod -R u+w $(KEYMAPDIR)_Z cd $(KEYMAPDIR)_Z && $(MYGZIP) */*.map */*/*.map $(FONTDIR)_Z: cp -r $(srcdir)/$(FONTDIR) $(FONTDIR)_Z cp -r $(srcdir)/$(PARTIALDIR) $(PARTIALDIR)_Z + chmod -R u+w $(FONTDIR)_Z $(PARTIALDIR)_Z cd $(FONTDIR)_Z && $(MYGZIP) * && gunzip ERRORS* README* cd $(PARTIALDIR)_Z && $(MYGZIP) * # (not yet screenmaps - some other time) diff -Nru kbd-1.15.3/data/Makefile.in kbd-1.15.5/data/Makefile.in --- kbd-1.15.3/data/Makefile.in 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/data/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,22 +53,35 @@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -102,6 +132,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -264,10 +295,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -389,11 +425,13 @@ # compress data files - do not touch the distribution but copy first $(KEYMAPDIR)_Z: cp -r $(srcdir)/$(KEYMAPDIR) $(KEYMAPDIR)_Z + chmod -R u+w $(KEYMAPDIR)_Z cd $(KEYMAPDIR)_Z && $(MYGZIP) */*.map */*/*.map $(FONTDIR)_Z: cp -r $(srcdir)/$(FONTDIR) $(FONTDIR)_Z cp -r $(srcdir)/$(PARTIALDIR) $(PARTIALDIR)_Z + chmod -R u+w $(FONTDIR)_Z $(PARTIALDIR)_Z cd $(FONTDIR)_Z && $(MYGZIP) * && gunzip ERRORS* README* cd $(PARTIALDIR)_Z && $(MYGZIP) * # (not yet screenmaps - some other time) diff -Nru kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-ca-fr.map kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-ca-fr.map --- kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-ca-fr.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-ca-fr.map 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,97 @@ +# fr-dvorak.map - Canada - French Dvorak keyboard layout +# Copyright (C) 2011 Vitezslav Crhonek, +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +charset "ISO-8859-1" +keymaps 0-2,4-6,8-9,12 +include "linux-with-alt-and-altgr.inc" +alt_is_meta +strings as usual +compose as usual for "iso-8859-1" + +# Row 1 (Function keys) +keycode 1 = Escape + +# Row 2 +keycode 41 = numbersign bar backslash +keycode 2 = one exclam plusminus +keycode 3 = two quotedbl at +keycode 4 = three slash sterling +keycode 5 = four dollar cent +keycode 6 = five percent currency +keycode 7 = six question notsign +keycode 8 = seven ampersand brokenbar +keycode 9 = eight asterisk twosuperior +keycode 10 = nine parenleft threesuperior +keycode 11 = zero parenright onequarter +keycode 12 = dead_circumflex dead_circumflex bracketleft +keycode 13 = dead_cedilla dead_diaeresis bracketright +keycode 14 = Delete + +# Row 3 +keycode 15 = Tab +keycode 16 = dead_grave dead_grave braceleft +keycode 17 = comma apostrophe macron +keycode 18 = period period hyphen +keycode 19 = p P paragraph +keycode 20 = y +keycode 21 = f +keycode 22 = g +keycode 23 = c +keycode 24 = r +keycode 25 = l +keycode 26 = eacute Eacute dead_acute +keycode 27 = equal plus threequarters +keycode 28 = Return + +# Row 4 +keycode 58 = Caps_Lock +keycode 30 = a +keycode 31 = o O section +keycode 32 = e +keycode 33 = u +keycode 34 = i +keycode 35 = d +keycode 36 = h +keycode 37 = t +keycode 38 = n +keycode 39 = s +keycode 40 = minus underscore onehalf +keycode 43 = less greater braceright + +# Row 5 +keycode 42 = Shift +keycode 86 = guillemotleft guillemotright degree +keycode 44 = semicolon colon asciitilde +keycode 45 = q +keycode 46 = j +keycode 47 = k +keycode 48 = x +keycode 49 = b +keycode 50 = m M mu +keycode 51 = w +keycode 52 = v +keycode 53 = z +keycode 54 = Shift + +# Row 6 +keycode 29 = Control +keycode 56 = Alt +keycode 57 = space space nobreakspace +keycode 100 = AltGr +keycode 97 = Control + +# EOF diff -Nru kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-es.map kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map --- kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-es.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,139 @@ +# Spanish Dvorak Keyboard +# +# Diego Fernández Capitán + +keymaps 0-2,4,5,6,8-10,12,14 +include "linux-with-alt-and-altgr" +include "euro" +strings as usual + +keycode 1 = Escape + alt keycode 1 = Meta_Escape +keycode 2 = one exclam bar + alt keycode 2 = Meta_one + shift alt keycode 2 = Meta_exclam + altgr alt keycode 2 = Meta_bar +keycode 3 = two quotedbl at + control keycode 3 = nul + alt keycode 3 = Meta_two + shift alt keycode 3 = Meta_quotedbl + altgr alt keycode 3 = Meta_at +keycode 4 = three periodcentered numbersign + control keycode 4 = Escape + alt keycode 4 = Meta_three + shift alt keycode 4 = Meta_periodcentered + altgr alt keycode 4 = Meta_numbersign +keycode 5 = four dollar asciitilde + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + shift alt keycode 5 = Meta_dollar + altgr alt keycode 5 = Meta_asciitilde +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five + shift alt keycode 6 = Meta_percent +keycode 7 = six ampersand notsign + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six + shift alt keycode 7 = Meta_ampersand + altgr alt keycode 7 = Meta_notsign +keycode 8 = seven slash braceleft + control keycode 8 = Control_underscore + alt keycode 8 = Meta_seven + shift alt keycode 8 = Meta_slash +keycode 9 = eight parenleft bracketleft + control keycode 9 = Delete + alt keycode 9 = Meta_eight + shift alt keycode 9 = Meta_parenleft +keycode 10 = nine parenright bracketright + alt keycode 10 = Meta_nine + shift alt keycode 10 = Meta_parenright +keycode 11 = zero equal braceright + alt keycode 11 = Meta_zero + shift alt keycode 11 = Meta_equal +keycode 12 = apostrophe question backslash + control keycode 12 = Control_underscore + alt keycode 12 = Meta_apostrophe + shift alt keycode 12 = Meta_question +keycode 13 = exclamdown questiondown asciitilde + alt keycode 13 = Meta_exclamdown + shift alt keycode 13 =Meta_questiondown +keycode 14 = Delete + control keycode 14 = Control_underscore + alt keycode 14 = Meta_Delete +keycode 15 = Tab + alt keycode 15 = Meta_Tab +keycode 16 = period colon + alt keycode 52 = Meta_period +keycode 17 = comma semicolon + alt keycode 51 = Meta_comma +keycode 18 = +ntilde +Ntilde + alt keycode 39 = Meta_semicolon +keycode 19 = p +keycode 20 = y +keycode 21 = f +keycode 22 = g +keycode 23 = +c +C cent Control_c Control_c Control_c Meta_c Meta_C Meta_c Meta_Control_c Meta_Control_c +keycode 24 = h +keycode 25 = l +keycode 26 = dead_grave dead_circumflex bracketleft + altgr control keycode 26 = Escape + alt keycode 26 = Meta_grave + shift alt keycode 26 = Meta_asciicircum + altgr alt keycode 26 = Meta_bracketleft +keycode 27 = plus asterisk bracketright + altgr control keycode 27 = Control_bracketright + alt keycode 27 = Meta_plus + shift alt keycode 27 = Meta_asterisk +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 30 = a +keycode 31 = o +keycode 32 = +e +E euro Control_e Control_e Control_e Meta_e Meta_E Meta_e Meta_Control_e Meta_Control_e +keycode 33 = u +keycode 34 = i +keycode 35 = d +keycode 36 = r +keycode 37 = t +keycode 38 = n +keycode 39 = s +keycode 40 = dead_acute dead_diaeresis braceleft + control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +keycode 41 = masculine ordfeminine backslash + control keycode 41 = nul + altgr control keycode 41 = Control_backslash + alt keycode 41 = Meta_grave + altgr alt keycode 41 = Meta_backslash + altgr control alt keycode 41 = Meta_Control_backslash +keycode 42 = Shift +keycode 43 = +ccedilla +Ccedilla braceright + control keycode 43 = Control_backslash + alt keycode 43 = Meta_backslash + shift alt keycode 43 = Meta_asciitilde + altgr alt keycode 43 = Meta_braceright +keycode 44 = minus underscore + control keycode 53 = Delete + shift control keycode 53 = Control_underscore + alt keycode 53 = Meta_minus + shift alt keycode 53 = Meta_underscore +keycode 45 = q +keycode 46 = j +keycode 47 = k +keycode 48 = x +keycode 49 = b +keycode 50 = m +keycode 51 = w +keycode 52 = v +keycode 53 = z +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space + control keycode 57 = nul + alt keycode 57 = Meta_space +keycode 58 = Caps_Lock +keycode 86 = less greater + alt keycode 86 = Meta_less + shift alt keycode 86 = Meta_greater +keycode 97 = Control Binary files /tmp/RMOv60SIEm/kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-ru.map and /tmp/v6yKBU37hE/kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-ru.map differ diff -Nru kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-sv-a1.map kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-sv-a1.map --- kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-sv-a1.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-sv-a1.map 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,116 @@ +# dvorak-sv-a1.map - "Swedish version" of the Dvorak layout (Svorak) +# +# Author: xevz +# Keymap modificators: Shift and AltGr +# Url: http://aoeu.info/s/dvorak/svorak +# +# The A1 keeps the special symbols (like !"#¤%&/()=?) where they +# are on a normal Qwerty layout (the number keys with shift modifier), +# while A5 moves them to the keypad (with alt gr modifier). +# +charset "iso-8859-1" +keymaps 0-2,4-6,8,12 +alt_is_meta +include "linux-with-alt-and-altgr.inc" +strings as usual + +keycode 1 = Escape + alt keycode 1 = Meta_Escape +keycode 2 = one exclam + alt keycode 2 = Meta_one +keycode 3 = two quotedbl at + control keycode 3 = nul + alt keycode 3 = Meta_two +keycode 4 = three numbersign sterling + control keycode 4 = Escape + alt keycode 4 = Meta_three +keycode 5 = four ccedilla + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = dollar +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 7 = six ampersand notsign + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +keycode 8 = seven slash braceleft + control keycode 8 = Control_underscore + alt keycode 8 = Meta_seven +keycode 9 = eight parenleft bracketleft + control keycode 9 = Delete + alt keycode 9 = Meta_eight +keycode 10 = nine parenright bracketright + alt keycode 10 = Meta_nine +keycode 11 = zero equal braceright + alt keycode 11 = Meta_zero +keycode 12 = plus question backslash + control keycode 12 = Control_underscore + alt keycode 12 = Meta_minus +keycode 13 = dead_acute dead_grave + alt keycode 13 = Meta_equal +keycode 14 = Delete + alt keycode 14 = Meta_Delete +keycode 15 = Tab + alt keycode 15 = Meta_Tab +keycode 16 = +aring +Aring + control keycode 16 = Escape + alt keycode 16 = Meta_bracketleft +keycode 17 = +adiaeresis +Adiaeresis + control keycode 17 = Control_g + alt keycode 17 = Meta_apostrophe +keycode 18 = +odiaeresis +Odiaeresis + alt keycode 18 = Meta_semicolon +keycode 19 = p +keycode 20 = y +keycode 21 = f +keycode 22 = g +keycode 23 = c +keycode 24 = r +keycode 25 = l +keycode 26 = comma semicolon + alt keycode 26 = Meta_comma +keycode 27 = dead_diaeresis asciicircum asciitilde + control keycode 27 = Control_bracketright + alt keycode 27 = Meta_bracketright +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 30 = a +keycode 31 = o +keycode 32 = e +keycode 33 = u +keycode 34 = i +keycode 35 = d +keycode 36 = h +keycode 37 = t +keycode 38 = n +keycode 39 = s +keycode 40 = minus underscore + control keycode 40 = Delete + alt keycode 40 = Meta_slash + shift control keycode 40 = Control_underscore +keycode 41 = section degree + control keycode 41 = nul + alt keycode 41 = Meta_grave +keycode 42 = Shift +keycode 43 = apostrophe asterisk +keycode 44 = period colon + alt keycode 44 = Meta_period +keycode 45 = q +keycode 46 = j +keycode 47 = k +keycode 48 = x +keycode 49 = b +keycode 50 = m +keycode 51 = w +keycode 52 = v +keycode 53 = z +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space space + control keycode 57 = nul +keycode 58 = Caps_Lock +keycode 86 = less greater bar + alt keycode 86 = Meta_less +keycode 97 = Control diff -Nru kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-sv-a5.map kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-sv-a5.map --- kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-sv-a5.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-sv-a5.map 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,98 @@ +# dvorak-sv-a5.map - "Swedish version" of the Dvorak layout (Svorak) +# +# Author: Xerxes RÃ¥nby (nickname "Liket") +# Keymap modificators: Shift and AltGr +# Url: http://aoeu.info/s/dvorak/svorak +# +# The A1 keeps the special symbols (like !"#¤%&/()=?) where they +# are on a normal Qwerty layout (the number keys with shift modifier), +# while A5 moves them to the keypad (with alt gr modifier). +# +charset "iso-8859-1" +keymaps 0-2,4-6,8,12 +alt_is_meta +include "linux-with-alt-and-altgr.inc" +strings as usual + +keycode 1 = Escape +keycode 2 = one +keycode 3 = two +keycode 4 = three +keycode 5 = four +keycode 6 = five +keycode 7 = six +keycode 8 = seven +keycode 9 = eight +keycode 10 = nine +keycode 11 = zero +keycode 12 = plus +keycode 13 = dead_acute dead_grave +keycode 14 = Delete + alt keycode 14 = Meta_Delete +keycode 15 = Tab + alt keycode 15 = Meta_Tab +keycode 16 = +aring +Aring braceleft +keycode 17 = +adiaeresis +Adiaeresis braceright +keycode 18 = +odiaeresis +Odiaeresis bracketleft +keycode 19 = p + altgr keycode 19 = bracketright +keycode 20 = y + altgr keycode 20 = dollar +keycode 21 = f + altgr keycode 21 = quotedbl +keycode 22 = g + altgr keycode 22 = question +keycode 23 = c + altgr keycode 23 = ampersand +keycode 24 = r + altgr keycode 24 = less +keycode 25 = l + altgr keycode 25 = greater +keycode 26 = comma +keycode 27 = quotedbl asciicircum asciitilde +keycode 28 = Return +keycode 29 = Control +keycode 30 = a + altgr keycode 30 = semicolon +keycode 31 = o + altgr keycode 31 = slash +keycode 32 = e + altgr keycode 32 = parenleft +keycode 33 = u + altgr keycode 33 = parenright +keycode 34 = i + altgr keycode 34 = bar +keycode 35 = d + altgr keycode 35 = numbersign +keycode 36 = h +keycode 37 = t + altgr keycode 37 = numbersign +keycode 38 = n + altgr keycode 38 = quotedbl +keycode 39 = s +keycode 40 = minus underscore +keycode 41 = section degree +keycode 42 = Shift +keycode 43 = apostrophe asterisk +keycode 44 = period colon + altgr keycode 44 = colon +keycode 45 = q + altgr keycode 45 = equal +keycode 46 = j + altgr keycode 46 = at +keycode 47 = k + altgr keycode 47 = exclam +keycode 48 = x + altgr keycode 48 = backslash +keycode 49 = b + altgr keycode 49 = percent +keycode 50 = m +keycode 51 = w +keycode 52 = v +keycode 53 = z +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space space +keycode 58 = Caps_Lock +keycode 86 = nul +keycode 97 = Control diff -Nru kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-uk.map kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-uk.map --- kbd-1.15.3/data/keymaps/i386/dvorak/dvorak-uk.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-uk.map 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,79 @@ +# dvorak-uk.map +# Created by Joe MacMahon + +keymaps 0-2,4-6,8-9,12 +alt_is_meta +include "linux-with-alt-and-altgr.inc" +strings as usual + +keycode 1 = Escape +keycode 2 = one exclam +keycode 3 = two quotedbl at nul +keycode 4 = three sterling + control keycode 4 = Escape +keycode 5 = four dollar dollar Control_backslash +keycode 6 = five percent + control keycode 6 = Control_bracketright +keycode 7 = six asciicircum + control keycode 7 = Control_asciicircum +keycode 8 = seven ampersand braceleft Control_underscore +keycode 9 = eight asterisk bracketleft Delete +keycode 10 = nine parenleft bracketright +keycode 11 = zero parenright braceright +keycode 12 = bracketleft braceleft + control keycode 12 = Escape +keycode 13 = bracketright braceright asciitilde Control_bracketright +keycode 14 = Delete + control keycode 14 = Control_underscore +keycode 15 = Tab + shift keycode 15 = Meta_Tab +keycode 16 = apostrophe at + control keycode 16 = Control_g + shift control keycode 16 = nul +keycode 17 = comma less +keycode 18 = period greater +keycode 19 = p +keycode 20 = y +keycode 21 = f +keycode 22 = g +keycode 23 = c +keycode 24 = r +keycode 25 = l +keycode 26 = slash question + control keycode 26 = Delete +keycode 27 = equal plus +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 30 = a +keycode 31 = o +keycode 32 = e +keycode 33 = u +keycode 34 = i +keycode 35 = d +keycode 36 = h +keycode 37 = t +keycode 38 = n +keycode 39 = s +keycode 40 = minus underscore backslash Control_underscore +keycode 41 = grave notsign +keycode 42 = Shift +keycode 43 = numbersign asciitilde + control keycode 43 = Control_backslash +keycode 44 = semicolon colon +keycode 45 = q +keycode 46 = j +keycode 47 = k +keycode 48 = x +keycode 49 = b +keycode 50 = m +keycode 51 = w +keycode 52 = v +keycode 53 = z +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space + control keycode 57 = nul +keycode 58 = Caps_Lock +keycode 86 = backslash bar bar Control_backslash +keycode 97 = Control diff -Nru kbd-1.15.3/data/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map kbd-1.15.5/data/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map --- kbd-1.15.3/data/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/data/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,484 @@ +# This keymap is a result of a convertion done by a script. +# Cyril Slobin's encoding tables from +# console-tools-cyrillic-0.8 package were used. + +# being converted from/to encoding: +# koi8-r utf-8 +# ruwin_ct_sh.map is a Russian keymap for a ms(105 keys) keyboard, prepared by +# IPLabs Linux Team (www.iplabs.ru/Linux and www.logic.ru) +# from (ru1.map) by Eugene Crosser's (ru.map): +# by Alexey Vovenko . +# +# changed by imz@altlinux.ru to be left/right insensitive +# +# Right+Shift is used to change rus/lat +# +# Changed by Dmitriy A. Perlow +# in order to use Alt+Shift to switch languages. + +include "qwerty-layout" + + keycode 0 = + keycode 1 = Escape Escape Escape Escape + alt keycode 1 = Meta_Escape +altgr alt keycode 1 = Meta_Escape + keycode 2 = one exclam one exclam + alt keycode 2 = Meta_one +altgr alt keycode 2 = Meta_one + shift alt keycode 2 = Meta_exclam +altgr shift alt keycode 2 = Meta_exclam + keycode 3 = two at two quotedbl + control keycode 3 = nul +altgr control keycode 3 = nul + alt keycode 3 = Meta_two +altgr alt keycode 3 = Meta_two + shift alt keycode 3 = Meta_at +altgr shift alt keycode 3 = Meta_at + keycode 4 = three numbersign three numbersign + control keycode 4 = Escape +altgr control keycode 4 = Escape + alt keycode 4 = Meta_three +altgr alt keycode 4 = Meta_three + shift alt keycode 4 = Meta_numbersign +altgr shift alt keycode 4 = Meta_numbersign + keycode 5 = four dollar four semicolon + control keycode 5 = Control_backslash +altgr control keycode 5 = Control_backslash + alt keycode 5 = Meta_four +altgr alt keycode 5 = Meta_four + shift alt keycode 5 = Meta_dollar +altgr shift alt keycode 5 = Meta_dollar + keycode 6 = five percent five percent + control keycode 6 = Control_bracketright +altgr control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +altgr alt keycode 6 = Meta_five + shift alt keycode 6 = Meta_percent +altgr shift alt keycode 6 = Meta_percent + keycode 7 = six asciicircum six colon + control keycode 7 = Control_asciicircum +altgr control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +altgr alt keycode 7 = Meta_six + shift alt keycode 7 = Meta_asciicircum +altgr shift alt keycode 7 = Meta_asciicircum + keycode 8 = seven ampersand seven question + control keycode 8 = Control_underscore +altgr control keycode 8 = Control_underscore + alt keycode 8 = Meta_seven +altgr alt keycode 8 = Meta_seven + shift alt keycode 8 = Meta_ampersand +altgr shift alt keycode 8 = Meta_ampersand + keycode 9 = eight asterisk eight asterisk + control keycode 9 = Delete +altgr control keycode 9 = Delete + alt keycode 9 = Meta_eight +altgr alt keycode 9 = Meta_eight + shift alt keycode 9 = Meta_asterisk +altgr shift alt keycode 9 = Meta_asterisk + keycode 10 = nine parenleft nine parenleft + alt keycode 10 = Meta_nine +altgr alt keycode 10 = Meta_nine + shift alt keycode 10 = Meta_parenleft +altgr shift alt keycode 10 = Meta_parenleft + keycode 11 = zero parenright zero parenright + alt keycode 11 = Meta_zero +altgr alt keycode 11 = Meta_zero + shift alt keycode 11 = Meta_parenright +altgr shift alt keycode 11 = Meta_parenright + keycode 12 = minus underscore minus underscore + control keycode 12 = Control_underscore +altgr control keycode 12 = Control_underscore + alt keycode 12 = Meta_minus +altgr alt keycode 12 = Meta_minus + shift alt keycode 12 = Meta_underscore +altgr shift alt keycode 12 = Meta_underscore + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +altgr alt keycode 13 = Meta_equal + shift alt keycode 13 = Meta_plus +altgr shift alt keycode 13 = Meta_plus + keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete +altgr alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +altgr alt keycode 15 = Meta_Tab + +altgr keycode 16 = U+0439 +altgr shift keycode 16 = U+0419 + +altgr keycode 17 = U+0446 +altgr shift keycode 17 = U+0426 + +altgr keycode 18 = U+0443 +altgr shift keycode 18 = U+0423 + +altgr keycode 19 = U+043A +altgr shift keycode 19 = U+041A + +altgr keycode 20 = U+0435 +altgr shift keycode 20 = U+0415 + +altgr keycode 21 = U+043D +altgr shift keycode 21 = U+041D + +altgr keycode 22 = U+0433 +altgr shift keycode 22 = U+0413 + +altgr keycode 23 = U+0448 +altgr shift keycode 23 = U+0428 + +altgr keycode 24 = U+0449 +altgr shift keycode 24 = U+0429 + +altgr keycode 25 = U+0437 +altgr shift keycode 25 = U+0417 + keycode 26 = bracketleft braceleft +altgr keycode 26 = U+0445 +altgr shift keycode 26 = U+0425 + control keycode 26 = Escape +altgr control keycode 26 = Escape + alt keycode 26 = Meta_bracketleft +altgr alt keycode 26 = Meta_bracketleft + keycode 27 = bracketright braceright bracketleft bracketright + +# The keycode "0xFF" is too dangerous for many programs (including emacs). +# So let it be bracket instead of Hard Sign. +altgr keycode 27 = U+044A +altgr shift keycode 27 = U+042A + control keycode 27 = Control_bracketright +altgr control keycode 27 = Control_bracketright + alt keycode 27 = Meta_bracketright +altgr alt keycode 27 = Meta_bracketright + keycode 28 = Return + alt keycode 28 = 0x080d +altgr alt keycode 28 = 0x080d + control keycode 28 = Linefeed +altgr control keycode 28 = Linefeed + keycode 29 = Control + +altgr keycode 30 = U+0444 +altgr shift keycode 30 = U+0424 + +altgr keycode 31 = U+044B +altgr shift keycode 31 = U+042B + +altgr keycode 32 = U+0432 +altgr shift keycode 32 = U+0412 + +altgr keycode 33 = U+0430 +altgr shift keycode 33 = U+0410 + +altgr keycode 34 = U+043F +altgr shift keycode 34 = U+041F + +altgr keycode 35 = U+0440 +altgr shift keycode 35 = U+0420 + +altgr keycode 36 = U+043E +altgr shift keycode 36 = U+041E + +altgr keycode 37 = U+043B +altgr shift keycode 37 = U+041B + +altgr keycode 38 = U+0434 +altgr shift keycode 38 = U+0414 + keycode 39 = semicolon colon +altgr keycode 39 = U+0436 +altgr shift keycode 39 = U+0416 + alt keycode 39 = Meta_semicolon +altgr alt keycode 39 = Meta_semicolon + keycode 40 = apostrophe quotedbl + control keycode 40 = Control_g +altgr control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +altgr alt keycode 40 = Meta_apostrophe +altgr keycode 40 = U+044D +altgr shift keycode 40 = U+042D + keycode 41 = grave asciitilde U+0451 U+0401 + control keycode 41 = nul +altgr control keycode 41 = nul + alt keycode 41 = Meta_grave +altgr alt keycode 41 = Meta_grave + keycode 42 = Shift + alt keycode 42 = AltGr_Lock +altgr alt keycode 42 = AltGr_Lock + keycode 43 = backslash bar slash bar + control keycode 43 = Control_backslash +altgr control keycode 43 = Control_backslash + alt keycode 43 = Meta_backslash +altgr alt keycode 43 = Meta_backslash + shift alt keycode 43 = Meta_bar +altgr shift alt keycode 43 = Meta_bar + +altgr keycode 44 = U+044F +altgr shift keycode 44 = U+042F + +altgr keycode 45 = U+0447 +altgr shift keycode 45 = U+0427 + +altgr keycode 46 = U+0441 +altgr shift keycode 46 = U+0421 + +altgr keycode 47 = U+043C +altgr shift keycode 47 = U+041C + +altgr keycode 48 = U+0438 +altgr shift keycode 48 = U+0418 + +altgr keycode 49 = U+0442 +altgr shift keycode 49 = U+0422 + +altgr keycode 50 = U+044C +altgr shift keycode 50 = U+042C + keycode 51 = comma less + alt keycode 51 = Meta_comma +altgr alt keycode 51 = Meta_comma + alt shift keycode 51 = Meta_less +altgr alt shift keycode 51 = Meta_less +altgr keycode 51 = U+0431 +altgr shift keycode 51 = U+0411 + keycode 52 = period greater + alt keycode 52 = Meta_period +altgr alt keycode 52 = Meta_period + alt shift keycode 52 = Meta_greater +altgr alt shift keycode 52 = Meta_greater +altgr keycode 52 = U+044E +altgr shift keycode 52 = U+042E + +# Can you survive without "yuo" letter? If no put U+0451 and U+0401 for +# altgr keycode 53. + keycode 53 = slash question period comma + control keycode 53 = Delete +altgr control keycode 53 = Delete + alt keycode 53 = Meta_slash +altgr alt keycode 53 = Meta_slash + shift alt keycode 53 = Meta_question +altgr shift alt keycode 53 = Meta_question + keycode 54 = Shift + keycode 55 = KP_Multiply + keycode 56 = Alt + shift keycode 56 = AltGr_Lock +altgr shift keycode 56 = AltGr_Lock + keycode 57 = space space space space + control keycode 57 = nul +altgr control keycode 57 = nul + alt keycode 57 = Meta_space +altgr alt keycode 57 = Meta_space + keycode 58 = Caps_Lock + keycode 59 = F1 F11 F1 F11 + control keycode 59 = F1 +altgr control keycode 59 = F1 + alt keycode 59 = Console_1 +altgr alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +altgr control alt keycode 59 = Console_1 + keycode 60 = F2 F12 F2 F12 + control keycode 60 = F2 +altgr control keycode 60 = F2 + alt keycode 60 = Console_2 +altgr alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +altgr control alt keycode 60 = Console_2 + keycode 61 = F3 F13 F3 F13 + control keycode 61 = F3 +altgr control keycode 61 = F3 + alt keycode 61 = Console_3 +altgr alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +altgr control alt keycode 61 = Console_3 + keycode 62 = F4 F14 F4 F14 + control keycode 62 = F4 + altgr control keycode 62 = F4 + alt keycode 62 = Console_4 +altgr alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +altgr control alt keycode 62 = Console_4 + keycode 63 = F5 F15 F5 F15 + control keycode 63 = F5 +altgr control keycode 63 = F5 + alt keycode 63 = Console_5 +altgr alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +altgr control alt keycode 63 = Console_5 + keycode 64 = F6 F16 F6 F16 + control keycode 64 = F6 +altgr control keycode 64 = F6 + alt keycode 64 = Console_6 +altgr alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +altgr control alt keycode 64 = Console_6 + keycode 65 = F7 F17 F7 F17 + control keycode 65 = F7 +altgr control keycode 65 = F7 + alt keycode 65 = Console_7 +altgr alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +altgr control alt keycode 65 = Console_7 + keycode 66 = F8 F18 F8 F18 + control keycode 66 = F8 +altgr control keycode 66 = F8 + alt keycode 66 = Console_8 +altgr alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +altgr control alt keycode 66 = Console_8 + keycode 67 = F9 F19 F9 F19 + control keycode 67 = F9 +altgr control keycode 67 = F9 + alt keycode 67 = Console_9 +altgr alt keycode 67 = Console_9 + control alt keycode 67 = Console_9 +altgr control alt keycode 67 = Console_9 + keycode 68 = F10 F20 F10 F20 + control keycode 68 = F10 +altgr control keycode 68 = F10 + alt keycode 68 = Console_10 +altgr alt keycode 68 = Console_10 + control alt keycode 68 = Console_10 +altgr control alt keycode 68 = Console_10 + keycode 69 = Num_Lock + keycode 70 = Scroll_Lock Show_Memory Show_Registers + control keycode 70 = Show_State +altgr control keycode 70 = Show_State + alt keycode 70 = Scroll_Lock +altgr alt keycode 70 = Scroll_Lock + keycode 71 = KP_7 + alt keycode 71 = Ascii_7 +altgr alt keycode 71 = Ascii_7 + keycode 72 = KP_8 + alt keycode 72 = Ascii_8 +altgr alt keycode 72 = Ascii_8 + keycode 73 = KP_9 + alt keycode 73 = Ascii_9 +altgr alt keycode 73 = Ascii_9 + keycode 74 = KP_Subtract + keycode 75 = KP_4 + alt keycode 75 = Ascii_4 +altgr alt keycode 75 = Ascii_4 + keycode 76 = KP_5 + alt keycode 76 = Ascii_5 +altgr alt keycode 76 = Ascii_5 + keycode 77 = KP_6 + alt keycode 77 = Ascii_6 +altgr alt keycode 77 = Ascii_6 + keycode 78 = KP_Add + keycode 79 = KP_1 + alt keycode 79 = Ascii_1 +altgr alt keycode 79 = Ascii_1 + keycode 80 = KP_2 + alt keycode 80 = Ascii_2 +altgr alt keycode 80 = Ascii_2 + keycode 81 = KP_3 + alt keycode 81 = Ascii_3 +altgr alt keycode 81 = Ascii_3 + keycode 82 = KP_0 + alt keycode 82 = Ascii_0 +altgr alt keycode 82 = Ascii_0 + keycode 83 = KP_Period +altgr control keycode 83 = Boot +control alt keycode 83 = Boot +altgr control alt keycode 83 = Boot + keycode 84 = Last_Console + keycode 85 = + keycode 86 = less greater bar + alt keycode 86 = Meta_less +altgr alt keycode 86 = Meta_less + keycode 87 = F11 F11 F11 F11 + control keycode 87 = F11 +altgr control keycode 87 = F11 + alt keycode 87 = Console_11 +altgr alt keycode 87 = Console_11 + control alt keycode 87 = Console_11 +altgr control alt keycode 87 = Console_11 + keycode 88 = F12 F12 F12 F12 + control keycode 88 = F12 +altgr control keycode 88 = F12 + alt keycode 88 = Console_12 +altgr alt keycode 88 = Console_12 + control alt keycode 88 = Console_12 +altgr control alt keycode 88 = Console_12 + keycode 89 = + keycode 90 = + keycode 91 = + keycode 92 = + keycode 93 = + keycode 94 = + keycode 95 = + keycode 96 = KP_Enter +keycode 97 = Control + keycode 98 = KP_Divide + keycode 99 = Control_backslash + control keycode 99 = Control_backslash +altgr control keycode 99 = Control_backslash + alt keycode 99 = Control_backslash +altgr alt keycode 99 = Control_backslash + keycode 101 = Break + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior + shift keycode 104 = Scroll_Backward +altgr shift keycode 104 = Scroll_Backward + keycode 105 = Left + alt keycode 105 = Decr_Console + keycode 106 = Right + alt keycode 106 = Incr_Console + keycode 107 = Select + keycode 108 = Down + keycode 109 = Next + shift keycode 109 = Scroll_Forward +altgr shift keycode 109 = Scroll_Forward + keycode 110 = Insert + keycode 111 = Remove +altgr control keycode 111 = Boot +control alt keycode 111 = Boot +altgr control alt keycode 111 = Boot + keycode 112 = + keycode 113 = + keycode 114 = + keycode 115 = + keycode 116 = + keycode 117 = + keycode 118 = + keycode 119 = + keycode 120 = + keycode 121 = + keycode 122 = + keycode 123 = + keycode 124 = + keycode 125 = + keycode 126 = + keycode 127 = +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string F21 = "" +string F22 = "" +string F23 = "" +string F24 = "" +string F25 = "" +string F26 = "" + diff -Nru kbd-1.15.3/debian/changelog kbd-1.15.5/debian/changelog --- kbd-1.15.3/debian/changelog 2013-02-09 00:08:34.000000000 +0000 +++ kbd-1.15.5/debian/changelog 2013-02-18 13:25:56.000000000 +0000 @@ -1,3 +1,56 @@ +kbd (1.15.5-1ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add setfont, kbd_mode, and loadkeys to initramfs for console-setup. + - Use ckbcomp to get the keyboard layout if other data files are not + available. + - Depend on console-setup, and remove config file; we now only support + systems using console-setup and so it no longer serves a purpose. The + removed config file for console-screen has changed names from + /etc/init.d/console-screen.kbd.sh to /etc/init.d/kbd. + - Change loadkeys to find any console not in raw mode when invoked + without an explicit console parameter, in case the foreground console + is in raw mode. + - Simplify maintainer scripts for conffile removal, using new features + in debhelper 8.1.0. + - Add setvtrgb to kbd-udeb. + * Fix incorrect keymap sanity check in loadkeys_ckbcomp.diff. + + -- Colin Watson Mon, 18 Feb 2013 13:25:55 +0000 + +kbd (1.15.5-1) unstable; urgency=low + + * New upstream release. + - Drop the loadkeys_stdin patch introduced in 1.15.3-2 (included in this + version). + - The kbd tarball now ships with a basic implementation of vlock. This + program will not be included in the binary package. + - resizecons is now built and installed on amd64, closes: #692014. Also + amend the manpages patch to explain the program’s absence on + non-x86[_64] architectures in resizecons.8. + - Build the Spanish messages again (dropped in 1.15.3-1). + * Treat src/loadkeys.analyze.h (generated by flex, but also shipped in the + orig tarball) specially in debian/rules so the clean target functions + properly and the package can be built twice in a row. + * Use dh-autoreconf to regenerate config.guess and config.sub during the + build process, closes: #700119. This introduces new build-deps on + dh-autoreconf and autopoint and removes the explicit dependencies on + autoconf and automake. Thanks to Colin Watson for + the hint. + * Update the source URL and the years of publication in debian/copyright and + add a paragraph for the added vlock code. + * New patch loadkeys_flex_stack, taken from upstream Git: Fix a regression + in loadkeys.analyze.l which causes some keymap files to fail to load. + * New patch dead2 by Samuel Thibault to support + KT_DEAD2 diacritics in loadkeys and dumpkeys, closes: #694169. Thank you + for the patch, Samuel! + * Drop the “Skipping font and keymap setup†message from /etc/init.d/kbd + because it’s really somewhat silly to log what the script isn’t doing. + * Use a canonical URL for the Vcs-Git: field. + * Bump Standards-Version: to 3.9.4, no changes necessary. + + -- Michael Schutte Sun, 17 Feb 2013 19:37:26 +0100 + kbd (1.15.3-9ubuntu4) raring; urgency=low * Use autotools-dev to update config.guess and config.sub automatically. diff -Nru kbd-1.15.3/debian/control kbd-1.15.5/debian/control --- kbd-1.15.3/debian/control 2013-02-09 00:08:22.000000000 +0000 +++ kbd-1.15.5/debian/control 2013-02-18 12:05:20.000000000 +0000 @@ -4,9 +4,10 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Console utilities maintainers Uploaders: Michael Schutte , Anton Zinoviev -Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 9), autoconf, automake, linuxdoc-tools, gettext, flex, bison, autotools-dev (>= 20100122.1) -Standards-Version: 3.9.3 -Vcs-Git: git://anonscm.debian.org/git/pkg-kbd/kbd.git +Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 9), dh-autoreconf, + autopoint, linuxdoc-tools, gettext, flex, bison +Standards-Version: 3.9.4 +Vcs-Git: git://anonscm.debian.org/pkg-kbd/kbd.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kbd/kbd.git Package: kbd diff -Nru kbd-1.15.3/debian/copyright kbd-1.15.5/debian/copyright --- kbd-1.15.3/debian/copyright 2012-04-28 09:32:26.000000000 +0000 +++ kbd-1.15.5/debian/copyright 2013-02-16 17:33:37.000000000 +0000 @@ -1,11 +1,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: kbd Upstream-Contact: kbd@lists.altlinux.org, Alexey Gladkov -Source: http://ftp.kernel.org/pub/linux/utils/kbd/ +Source: http://ftp.altlinux.org/pub/people/legion/kbd/ Files: * -Copyright: © 1994–1999 Andries E. Brouwer, - © 2007–2011 Alexey Gladkov +Copyright: 1994–1999, Andries E. Brouwer, + 2007–2012, Alexey Gladkov License: GPL-2+ All files in this package may be freely copied under the terms of the GNU General Public License (GPL), version 2, or at your @@ -17,23 +17,23 @@ “/usr/share/common-licenses/GPL-2â€. Files: src/kbdrate.c -Copyright: © 1992 Rickard E. Faith +Copyright: 1992, Rickard E. Faith License: GPL-any Files: src/dumpkeys.c src/loadkeys.y src/analyzel src/ksyms.c src/ksyms.h src/showkey.c src/loadkeys.1 man/man1/dumpkeys.1 man/man1/showkey.1 man/man5/keymaps.5 -Copyright: © 1993 Risto Kankkunen +Copyright: 1993, Risto Kankkunen License: GPL-any Files: src/setfont.c man/man8/setfont.8 src/mapscrn.c man/man8/mapscrn.8 src/loadkeys.y -Copyright: © 1993 Eugene G. Crosser +Copyright: 1993, Eugene G. Crosser License: GPL-any Files: man/man1/psfaddtable.1 man/man1/psfgettable.1 man/man1/psfstriptable.1 -Copyright: © 1994 H. Peter Anvin +Copyright: 1994, H. Peter Anvin License: GPL-any Files: src/chvt.c src/clrunimap.c src/deallocvt.c src/fgconsole.c @@ -46,27 +46,33 @@ man/man1/setmetamode.1 man/man8/getkeycodes.8 man/man8/loadunimap.8 man/man8/resizecons.8 man/man8/setkeycodes.8 -Copyright: © 1994–1999 Andries E. Brouwer +Copyright: 1994–1999, Andries E. Brouwer License: GPL-any Files: man/man1misc/splitfont.1 man/man1/openvt.1 man/man8misc/setlogcons.8 man/man8misc/vcstime.8 -Copyright: © 2007–2008 Alexey Gladkov +Copyright: 2007–2008, Alexey Gladkov License: GPL-any Files: src/setvtrgb.c -Copyright: © 2011 Alexey Gladkov , - © 2011 Canonical Ltd (Seth Forshee +Copyright: 2011, Alexey Gladkov , + 2011, Canonical Ltd (Seth Forshee and Dustin Kirkland ) License: GPL-any +Files: src/vlock/* +Copyright: 1994–1998, Michael K. Johnson + 1997–1998, Juan Cespedes + 2002–2006, Dmitry V. Levin +License: GPL-2+ + Files: debian/* -Copyright: © 1991-2001 Yann Dirson , - © 2001 Alcove , - © 2004 Wartan Hachaturow , - © 2004–2006 Denis Barbier , - © 2007 Anton Zinoviev , - © 2008–2012 Michael Schutte +Copyright: 1991-2001, Yann Dirson , + 2001, Alcove , + 2004, Wartan Hachaturow , + 2004–2006, Denis Barbier , + 2007, Anton Zinoviev , + 2008–2013, Michael Schutte License: GPL-2+ License: GPL-any diff -Nru kbd-1.15.3/debian/patches/dead2.diff kbd-1.15.5/debian/patches/dead2.diff --- kbd-1.15.3/debian/patches/dead2.diff 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/debian/patches/dead2.diff 2013-02-16 17:33:37.000000000 +0000 @@ -0,0 +1,42 @@ +From: Samuel Thibault +Subject: Support KT_DEAD2 diacritics +Forwarded: no +Bug-Debian: http://bugs.debian.org/694169 + +Add support for KT_DEAD2 diacritics to loadkeys and dumpkeys using the +dead2_ prefix. + +--- +Index: devel/src/dumpkeys.c +=================================================================== +--- devel.orig/src/dumpkeys.c 2013-02-16 17:21:51.000000000 +0100 ++++ devel/src/dumpkeys.c 2013-02-16 17:21:51.000000000 +0100 +@@ -153,6 +153,9 @@ + else if (!numeric && t == KT_META && v < 128 && v < syms[0].size && + (p = syms[0].table[v])[0]) + printf("Meta_%-11s", p); ++ else if (!numeric && t == KT_DEAD2 && v < 256 && v < syms[0].size && ++ (p = syms[0].table[v])[0]) ++ printf("dead2_%-10s", p); + else + printf("0x%04x %s", code, plus ? "" : " "); + } +Index: devel/src/ksyms.c +=================================================================== +--- devel.orig/src/ksyms.c 2013-02-16 17:21:51.000000000 +0100 ++++ devel/src/ksyms.c 2013-02-16 17:21:51.000000000 +0100 +@@ -1788,6 +1788,14 @@ + /* fall through to error printf */ + } + ++ if (!strncmp(s, "dead2_", 6)) { ++ keycode = ksymtocode(s+6, TO_8BIT); ++ if (KTYP(keycode) == KT_LATIN) ++ return K(KT_DEAD2, KVAL(keycode)); ++ ++ /* fall through to error printf */ ++ } ++ + for (i = 0; i < syms_size; i++) { + jmax = ((i == 0 && direction == TO_UNICODE) ? 128 : syms[i].size); + for (j = 0; j < jmax; j++) diff -Nru kbd-1.15.3/debian/patches/loadkeys_ckbcomp.diff kbd-1.15.5/debian/patches/loadkeys_ckbcomp.diff --- kbd-1.15.3/debian/patches/loadkeys_ckbcomp.diff 2012-05-22 22:46:45.000000000 +0000 +++ kbd-1.15.5/debian/patches/loadkeys_ckbcomp.diff 2013-02-18 13:21:11.000000000 +0000 @@ -3,13 +3,13 @@ available. Author: Colin Watson Forwarded: no -Last-Update: 2012-04-27 +Last-Update: 2013-02-18 Index: b/src/loadkeys.y =================================================================== --- a/src/loadkeys.y +++ b/src/loadkeys.y -@@ -1194,8 +1194,52 @@ +@@ -1213,8 +1213,52 @@ strcpy(pathname, ""); } else if ((f = findfile(argv[i], dirpath, suffixes)) == NULL) { @@ -18,15 +18,15 @@ + /* Try ckbcomp, but only if the keymap name is sane. */ + int j; + -+ for (j = i; argv[j]; j++) -+ if (!isalpha((unsigned char) argv[j]) && -+ !isdigit((unsigned char) argv[j]) && ++ for (j = 0; argv[i][j]; j++) ++ if (!isalpha((unsigned char) argv[i][j]) && ++ !isdigit((unsigned char) argv[i][j]) && + /* - and _ in variant names; / in a layout + * name; : as separator */ -+ !strchr("-/_:", argv[j])) ++ !strchr("-/_:", argv[i][j])) + break; + -+ if (!argv[j]) { ++ if (!argv[i][j]) { + char *layout, *variant; + char *colon; + size_t cmdsize; @@ -63,4 +63,4 @@ + } } - gotf: + parse_keymap(f); diff -Nru kbd-1.15.3/debian/patches/loadkeys_find_usable_console.diff kbd-1.15.5/debian/patches/loadkeys_find_usable_console.diff --- kbd-1.15.3/debian/patches/loadkeys_find_usable_console.diff 2012-05-22 22:46:45.000000000 +0000 +++ kbd-1.15.5/debian/patches/loadkeys_find_usable_console.diff 2013-02-18 13:21:49.000000000 +0000 @@ -5,20 +5,21 @@ running. Author: Colin Watson Forwarded: no -Last-Update: 2012-04-27 +Last-Update: 2013-02-18 Index: b/src/getfd.c =================================================================== --- a/src/getfd.c +++ b/src/getfd.c -@@ -88,3 +88,61 @@ - _("Couldn't get a file descriptor referring to the console\n")); - exit(1); /* total failure */ +@@ -86,3 +86,56 @@ + /* total failure */ + exit(1); } + +static long +kbmode(int fd) { + long mode; ++ + if (ioctl(fd, KDGKBMODE, &mode) < 0) + return -1; + else @@ -29,13 +30,14 @@ + * raw mode will do - it doesn't have to be the foreground console - but we + * prefer Unicode if we can get it. + */ -+int getfd_keymap(void) { ++int ++getfd_keymap(void) { + int fd, bestfd = -1; + char ttyname[sizeof("/dev/ttyNN")] = "/dev/tty"; + int i; + +#define CHECK_FD_KEYMAP do { \ -+ if (fd >= 0) { \ ++ if (is_a_console(fd)) { \ + long mode = kbmode(fd); \ + if (mode == K_UNICODE) { \ + if (bestfd != -1) \ @@ -45,33 +47,26 @@ + bestfd = fd; \ + else \ + close(fd); \ -+ } \ ++ } else \ ++ close(fd); \ +} while (0) + -+ fd = open_a_console("/proc/self/fd/0"); -+ CHECK_FD_KEYMAP; -+ -+ fd = open_a_console("/dev/tty"); -+ CHECK_FD_KEYMAP; -+ -+ fd = open_a_console("/dev/tty0"); -+ CHECK_FD_KEYMAP; -+ -+ fd = open_a_console("/dev/vc/0"); -+ CHECK_FD_KEYMAP; -+ -+ fd = open_a_console("/dev/console"); -+ CHECK_FD_KEYMAP; ++ for (i = 0; conspath[i]; i++) { ++ if ((fd = open_a_console(conspath[i])) >= 0) ++ CHECK_FD_KEYMAP; ++ } + + for (i = 1; i <= 12; ++i) { + snprintf(ttyname + sizeof("/dev/tty") - 1, 3, "%d", i); -+ fd = open_a_console(ttyname); -+ CHECK_FD_KEYMAP; ++ if ((fd = open_a_console(ttyname)) >= 0) ++ CHECK_FD_KEYMAP; + } + + fprintf(stderr, + _("Couldn't get a file descriptor referring to the console\n")); -+ exit(1); /* total failure */ ++ ++ /* total failure */ ++ exit(1); +} Index: b/src/getfd.h =================================================================== @@ -88,24 +83,15 @@ =================================================================== --- a/src/loadkeys.y +++ b/src/loadkeys.y -@@ -577,7 +577,10 @@ - int fd; - int keyct, funcct, diacct = 0; +@@ -1149,7 +1149,10 @@ + } + /* get console */ - fd = getfd(console); + if (console) + fd = getfd(console); + else + fd = getfd_keymap(); - keyct = defkeys(fd, kbd_mode); - funcct = deffuncs(fd); - -@@ -1132,7 +1135,7 @@ if (!optm && !optb) { /* check whether the keyboard is in Unicode mode */ -- fd = getfd(console); -+ fd = getfd_keymap(); - - if (ioctl(fd, KDGKBMODE, &kbd_mode)) { - perror("KDGKBMODE"); diff -Nru kbd-1.15.3/debian/patches/loadkeys_flex_stack.diff kbd-1.15.5/debian/patches/loadkeys_flex_stack.diff --- kbd-1.15.3/debian/patches/loadkeys_flex_stack.diff 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/debian/patches/loadkeys_flex_stack.diff 2013-02-16 17:33:37.000000000 +0000 @@ -0,0 +1,23 @@ +From: Alexey Gladkov +Origin: commit:7e06e56157e8431d02e1377cdc44230944203d88 +Subject: Fix a regression in loadkeys.analyze.l +Forwarded: not-needed + +kbd 1.15.5 has introduced a bug in the lexical analysis part of loadkeys +which leads to errors when trying to load certain keymaps. The upstream +author has provided this patch to solve the problem. + +--- +Index: devel/src/loadkeys.analyze.l +=================================================================== +--- devel.orig/src/loadkeys.analyze.l 2013-02-16 16:35:33.000000000 +0100 ++++ devel/src/loadkeys.analyze.l 2013-02-16 16:36:00.000000000 +0100 +@@ -323,7 +323,7 @@ + } + {Eol} { + line_nr++; +- if (state_ptr > 0) { ++ while (state_ptr > 0) { + yy_pop_state(); + state_ptr--; + } diff -Nru kbd-1.15.3/debian/patches/loadkeys_stdin.diff kbd-1.15.5/debian/patches/loadkeys_stdin.diff --- kbd-1.15.3/debian/patches/loadkeys_stdin.diff 2011-11-11 22:49:46.000000000 +0000 +++ kbd-1.15.5/debian/patches/loadkeys_stdin.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -From: Alexey Gladkov -Subject: Fix important regression in loadkeys -Origin: commit:83f0743c1fed872d80a0dd31924575d9bf9c2770 - -loadkeys from 1.15.3 introduced a regression where it doesn’t default to -reading from stdin when started without a filename argument. This -behavior is widely used, even in /etc/init.d/kbd. - ---- - src/loadkeys.y | 33 +++++++++++++++++++++------------ - 1 files changed, 21 insertions(+), 12 deletions(-) - -Index: devel/src/loadkeys.y -=================================================================== ---- devel.orig/src/loadkeys.y 2011-07-22 19:06:52.000000000 +0200 -+++ devel/src/loadkeys.y 2011-07-22 19:07:10.000000000 +0200 -@@ -1035,6 +1035,22 @@ - ; - %% - -+static void parse_keymap(FILE *fd) { -+ if (!quiet && !optm) -+ fprintf(stdout, _("Loading %s\n"), pathname); -+ -+ stack_push(fd, 0, pathname); -+ -+ if (yyparse()) { -+ fprintf(stderr, _("syntax error in map file\n")); -+ -+ if (!optm) -+ fprintf(stderr, -+ _("key bindings not changed\n")); -+ exit(EXIT_FAILURE); -+ } -+} -+ - int main(int argc, char *argv[]) - { - const char *short_opts = "abcC:dhmsuqvV"; -@@ -1180,19 +1196,12 @@ - } - - gotf: -- if (!quiet && !optm) -- fprintf(stdout, _("Loading %s\n"), pathname); -- -- stack_push(f, 0, pathname); -- -- if (yyparse()) { -- fprintf(stderr, _("syntax error in map file\n")); -+ parse_keymap(f); -+ } - -- if (!optm) -- fprintf(stderr, -- _("key bindings not changed\n")); -- exit(EXIT_FAILURE); -- } -+ if (optind == argc) { -+ strcpy(pathname, ""); -+ parse_keymap(stdin); - } - - do_constant(); diff -Nru kbd-1.15.3/debian/patches/manpages.diff kbd-1.15.5/debian/patches/manpages.diff --- kbd-1.15.3/debian/patches/manpages.diff 2012-04-28 09:14:21.000000000 +0000 +++ kbd-1.15.5/debian/patches/manpages.diff 2013-02-17 18:37:00.000000000 +0000 @@ -31,8 +31,8 @@ Index: devel/man/man1/dumpkeys.1.in =================================================================== ---- devel.orig/man/man1/dumpkeys.1.in 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/dumpkeys.1.in 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/dumpkeys.1.in 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/dumpkeys.1.in 2013-02-17 19:36:47.000000000 +0100 @@ -11,7 +11,6 @@ .BI \-\-charset= charset ] @@ -43,8 +43,8 @@ writes, to the standard output, the current contents of the keyboard Index: devel/man/man1/kbd_mode.1 =================================================================== ---- devel.orig/man/man1/kbd_mode.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/kbd_mode.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/kbd_mode.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/kbd_mode.1 2013-02-17 19:36:47.000000000 +0100 @@ -10,7 +10,6 @@ .I -C CONSOLE ] @@ -55,8 +55,8 @@ .B kbd_mode Index: devel/man/man1/loadkeys.1.in =================================================================== ---- devel.orig/man/man1/loadkeys.1.in 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/loadkeys.1.in 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/loadkeys.1.in 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/loadkeys.1.in 2013-02-17 19:36:47.000000000 +0100 @@ -31,7 +31,6 @@ ] .LP @@ -67,8 +67,8 @@ .B loadkeys Index: devel/man/man1/openvt.1 =================================================================== ---- devel.orig/man/man1/openvt.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/openvt.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/openvt.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/openvt.1 2013-02-17 19:36:47.000000000 +0100 @@ -27,7 +27,14 @@ .I "\-e, \-\-exec" Directly execute the given command, without forking. @@ -87,8 +87,8 @@ Switch to the new VT when starting the command. The VT of the new command Index: devel/man/man1/psfaddtable.1 =================================================================== ---- devel.orig/man/man1/psfaddtable.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/psfaddtable.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/psfaddtable.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/psfaddtable.1 2013-02-17 19:36:47.000000000 +0100 @@ -6,7 +6,6 @@ .B psfaddtable .I fontfile tablefile outfile @@ -99,8 +99,8 @@ takes a console font in .psf format given by Index: devel/man/man1/psfgettable.1 =================================================================== ---- devel.orig/man/man1/psfgettable.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/psfgettable.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/psfgettable.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/psfgettable.1 2013-02-17 19:36:47.000000000 +0100 @@ -7,7 +7,6 @@ .I fontfile .RI [ outfile ] @@ -111,8 +111,8 @@ extracts the embedded Unicode character table from a .psf format Index: devel/man/man1/psfstriptable.1 =================================================================== ---- devel.orig/man/man1/psfstriptable.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/psfstriptable.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/psfstriptable.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/psfstriptable.1 2013-02-17 19:36:47.000000000 +0100 @@ -6,7 +6,6 @@ .B psfstriptable .I fontfile outfile @@ -123,8 +123,8 @@ reads a .psf format console font from Index: devel/man/man1/psfxtable.1 =================================================================== ---- devel.orig/man/man1/psfxtable.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/psfxtable.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/psfxtable.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/psfxtable.1 2013-02-17 19:36:47.000000000 +0100 @@ -14,7 +14,6 @@ .IR outtable ] .RB [ \-nt ] @@ -135,8 +135,8 @@ handles the embedded Unicode character table for .psf format Index: devel/man/man1/setleds.1 =================================================================== ---- devel.orig/man/man1/setleds.1 2012-04-28 11:13:35.000000000 +0200 -+++ devel/man/man1/setleds.1 2012-04-28 11:14:17.000000000 +0200 +--- devel.orig/man/man1/setleds.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/setleds.1 2013-02-17 19:36:47.000000000 +0100 @@ -7,7 +7,6 @@ .RI [ "-v" "] [" "-L" "] [" "-D" "] [" "-F" ] .RI [ {+|-}num "] [" {+|-}caps "] [" {+|-}scroll ] @@ -197,8 +197,8 @@ console output.) Index: devel/man/man1/setmetamode.1 =================================================================== ---- devel.orig/man/man1/setmetamode.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/setmetamode.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/setmetamode.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/setmetamode.1 2013-02-17 19:36:47.000000000 +0100 @@ -8,7 +8,6 @@ .I {meta|bit|metabit | esc|prefix|escprefix} ] @@ -209,8 +209,8 @@ .B setmetamode Index: devel/man/man1/showkey.1 =================================================================== ---- devel.orig/man/man1/showkey.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/showkey.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/showkey.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/showkey.1 2013-02-17 19:36:47.000000000 +0100 @@ -5,7 +5,6 @@ .SH SYNOPSIS showkey [\-h|\-\-help] [\-a|\-\-ascii] [\-s|\-\-scancodes] [\-k|\-\-keycodes] @@ -221,8 +221,8 @@ prints to standard output either the scan codes or the keycode Index: devel/man/man1/unicode_start.1 =================================================================== ---- devel.orig/man/man1/unicode_start.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/unicode_start.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/unicode_start.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/unicode_start.1 2013-02-17 19:36:47.000000000 +0100 @@ -6,7 +6,6 @@ .B unicode_start .RI [ font " [" umap ]] @@ -233,8 +233,8 @@ .B unicode_start Index: devel/man/man1/unicode_stop.1 =================================================================== ---- devel.orig/man/man1/unicode_stop.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1/unicode_stop.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1/unicode_stop.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1/unicode_stop.1 2013-02-17 19:36:47.000000000 +0100 @@ -5,7 +5,6 @@ .SH SYNOPSIS .B unicode_stop @@ -245,8 +245,8 @@ .B unicode_stop Index: devel/man/man1misc/splitfont.1 =================================================================== ---- devel.orig/man/man1misc/splitfont.1 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man1misc/splitfont.1 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man1misc/splitfont.1 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man1misc/splitfont.1 2013-02-17 19:36:47.000000000 +0100 @@ -11,7 +11,7 @@ .SH DESCRIPTION @@ -258,8 +258,8 @@ .P Index: devel/man/man5/keymaps.5 =================================================================== ---- devel.orig/man/man5/keymaps.5 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man5/keymaps.5 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man5/keymaps.5 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man5/keymaps.5 2013-02-17 19:36:47.000000000 +0100 @@ -5,11 +5,6 @@ .SH NAME keymaps \- keyboard table descriptions for loadkeys and dumpkeys @@ -274,8 +274,8 @@ .BR loadkeys (1) Index: devel/man/man8/setfont.8.in =================================================================== ---- devel.orig/man/man8/setfont.8.in 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man8/setfont.8.in 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man8/setfont.8.in 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man8/setfont.8.in 2013-02-17 19:36:47.000000000 +0100 @@ -12,7 +12,6 @@ .RI "[-C " "console" ] .RI "[-h" "H" ] @@ -286,8 +286,8 @@ .B setfont Index: devel/man/man8misc/mk_modmap.8 =================================================================== ---- devel.orig/man/man8misc/mk_modmap.8 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man8misc/mk_modmap.8 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man8misc/mk_modmap.8 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man8misc/mk_modmap.8 2013-02-17 19:36:47.000000000 +0100 @@ -26,7 +26,7 @@ (In Debian, these are in the "xlibs-dev" package). .SH NOTES @@ -306,8 +306,8 @@ +.\" Manpage by Alastair McKinstry, Index: devel/man/man8misc/setvesablank.8 =================================================================== ---- devel.orig/man/man8misc/setvesablank.8 2011-11-12 00:20:01.000000000 +0100 -+++ devel/man/man8misc/setvesablank.8 2012-04-28 11:13:47.000000000 +0200 +--- devel.orig/man/man8misc/setvesablank.8 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man8misc/setvesablank.8 2013-02-17 19:36:47.000000000 +0100 @@ -16,7 +16,6 @@ ] .LP @@ -316,3 +316,28 @@ .LP The program .B setvesablank +Index: devel/man/man8/resizecons.8 +=================================================================== +--- devel.orig/man/man8/resizecons.8 2013-02-17 19:36:47.000000000 +0100 ++++ devel/man/man8/resizecons.8 2013-02-17 19:36:58.000000000 +0100 +@@ -56,7 +56,11 @@ + + .SH BUGS + .I resizecons +-does not work on all hardware. ++does not work on all hardware. For example, it cannot be used on ++platforms other than x86 and x86_64. See the ++.BR fbset (1) ++program if you are looking for an alternative. ++ + This command used to be called + .I resize, + but was renamed to avoid conflict with another command with the same name. +@@ -66,5 +70,6 @@ + .BR stty (1), + .BR selection (1), + .BR restoretextmode (8), +-.BR disalloc (8) ++.BR disalloc (8), ++.BR fbset (1) + diff -Nru kbd-1.15.3/debian/patches/openvt.diff kbd-1.15.5/debian/patches/openvt.diff --- kbd-1.15.3/debian/patches/openvt.diff 2011-11-11 22:49:46.000000000 +0000 +++ kbd-1.15.5/debian/patches/openvt.diff 2013-02-16 17:33:37.000000000 +0000 @@ -22,9 +22,9 @@ Index: devel/src/openvt.c =================================================================== ---- devel.orig/src/openvt.c 2011-09-23 21:32:28.000000000 +0200 -+++ devel/src/openvt.c 2011-09-23 21:34:09.000000000 +0200 -@@ -260,10 +260,12 @@ +--- devel.orig/src/openvt.c 2013-02-13 17:26:22.000000000 +0100 ++++ devel/src/openvt.c 2013-02-13 17:26:22.000000000 +0100 +@@ -261,10 +261,12 @@ case 'V': print_version_and_exit(); break; @@ -38,7 +38,7 @@ } } -@@ -385,7 +387,8 @@ +@@ -386,7 +388,8 @@ close(0); close(1); close(2); @@ -48,7 +48,7 @@ if ((dup2(fd, 0) == -1) || (dup2(fd, 1) == -1) || (dup2(fd, 2) == -1)) openvt_fatal(1, errno, "dup"); -@@ -408,7 +411,6 @@ +@@ -409,7 +412,6 @@ if (do_wait) { int retval = 0; /* actual value returned form process */ @@ -56,7 +56,7 @@ waitpid(pid, &retval, 0); if (show) { /* Switch back... */ -@@ -425,7 +427,10 @@ +@@ -426,7 +428,10 @@ /* if all our stuff went right, we want to return the exit code of the command we ran super vital for scripting loops etc */ diff -Nru kbd-1.15.3/debian/patches/series kbd-1.15.5/debian/patches/series --- kbd-1.15.3/debian/patches/series 2012-05-22 22:46:45.000000000 +0000 +++ kbd-1.15.5/debian/patches/series 2013-02-18 12:05:34.000000000 +0000 @@ -2,6 +2,7 @@ manpages.diff openvt.diff unicode_start_breaks_X.diff -loadkeys_stdin.diff +loadkeys_flex_stack.diff +dead2.diff loadkeys_find_usable_console.diff loadkeys_ckbcomp.diff diff -Nru kbd-1.15.3/debian/rules kbd-1.15.5/debian/rules --- kbd-1.15.3/debian/rules 2013-02-09 00:08:00.000000000 +0000 +++ kbd-1.15.5/debian/rules 2013-02-18 12:05:20.000000000 +0000 @@ -24,25 +24,22 @@ endif %: - dh $@ --with autotools-dev + dh $@ --with autoreconf override_dh_auto_clean: dh_auto_clean [ ! -f Makefile ] || $(MAKE) clean cd src/ && rm -f $(EXTRA_BINARIES) *-udeb cd contrib/ && rm -f $(CONTRIB_BINARIES) - cd po/ && rm -f eo.gmo it.gmo ru.gmo rm -f po/gr.po # replaced by el.po - rm -f po/es.po # erroneous # force rebuilding of generated code - rm -f src/loadkeys.c src/loadkeys.h src/loadkeys.analyze.c + rm -f src/loadkeys.c src/loadkeys.h src/loadkeys.analyze.c src/loadkeys.analyze.h override_dh_auto_configure: - dh_auto_configure -- --enable-nls + dh_auto_configure -- --enable-nls --disable-vlock override_dh_auto_build: - $(MAKE) -C po/ eo.gmo it.gmo ru.gmo - $(MAKE) -C src/ CFLAGS="-Os -g" $(UDEB_BINARIES) + $(MAKE) -C src/ CFLAGS="-Os -g" loadkeys.analyze.h $(UDEB_BINARIES) cd src/ && for ITEM in $(UDEB_BINARIES); do mv $$ITEM $$ITEM-udeb; done $(MAKE) -C src/ clean $(MAKE) diff -Nru kbd-1.15.3/m4/attributes.m4 kbd-1.15.5/m4/attributes.m4 --- kbd-1.15.3/m4/attributes.m4 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/m4/attributes.m4 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,311 @@ +dnl Macros to check the presence of generic (non-typed) symbols. +dnl Copyright (c) 2006-2008 Diego Pettenò +dnl Copyright (c) 2006-2008 xine project +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2, or (at your option) +dnl any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +dnl 02110-1301, USA. +dnl +dnl As a special exception, the copyright owners of the +dnl macro gives unlimited permission to copy, distribute and modify the +dnl configure scripts that are the output of Autoconf when processing the +dnl Macro. You need not follow the terms of the GNU General Public +dnl License when using or distributing such scripts, even though portions +dnl of the text of the Macro appear in them. The GNU General Public +dnl License (GPL) does govern all other use of the material that +dnl constitutes the Autoconf Macro. +dnl +dnl This special exception to the GPL applies to versions of the +dnl Autoconf Macro released by this project. When you make and +dnl distribute a modified version of the Autoconf Macro, you may extend +dnl this special exception to the GPL to apply to your modified version as +dnl well. + +dnl Check if the flag is supported by compiler +dnl CC_CHECK_CFLAGS_SILENT([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ + AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a;])], + [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl Check if the flag is supported by compiler (cacheable) +dnl CC_CHECK_CFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_CFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_cflags_$1]), + CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! + ) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl CC_CHECK_CFLAG_APPEND(FLAG, [action-if-found], [action-if-not-found]) +dnl Check for CFLAG and appends them to CFLAGS if supported +AC_DEFUN([CC_CHECK_CFLAG_APPEND], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_cflags_$1]), + CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! + ) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [CFLAGS="$CFLAGS $1"; DEBUG_CFLAGS="$DEBUG_CFLAGS $1"; $2], [$3]) +]) + +dnl CC_CHECK_CFLAGS_APPEND([FLAG1 FLAG2], [action-if-found], [action-if-not]) +AC_DEFUN([CC_CHECK_CFLAGS_APPEND], [ + for flag in $1; do + CC_CHECK_CFLAG_APPEND($flag, [$2], [$3]) + done +]) + +dnl Check if the flag is supported by linker (cacheable) +dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_LDFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_ldflags_$1]), + [ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $1" + AC_LINK_IFELSE([int main() { return 1; }], + [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) + LDFLAGS="$ac_save_LDFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for +dnl the current linker to avoid undefined references in a shared object. +AC_DEFUN([CC_NOUNDEFINED], [ + dnl We check $host for which systems to enable this for. + AC_REQUIRE([AC_CANONICAL_HOST]) + + case $host in + dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads + dnl are requested, as different implementations are present; to avoid problems + dnl use -Wl,-z,defs only for those platform not behaving this way. + *-freebsd* | *-openbsd*) ;; + *) + dnl First of all check for the --no-undefined variant of GNU ld. This allows + dnl for a much more readable commandline, so that people can understand what + dnl it does without going to look for what the heck -z defs does. + for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do + CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) + break + done + ;; + esac + + AC_SUBST([LDFLAGS_NOUNDEFINED]) +]) + +dnl Check for a -Werror flag or equivalent. -Werror is the GCC +dnl and ICC flag that tells the compiler to treat all the warnings +dnl as fatal. We usually need this option to make sure that some +dnl constructs (like attributes) are not simply ignored. +dnl +dnl Other compilers don't support -Werror per se, but they support +dnl an equivalent flag: +dnl - Sun Studio compiler supports -errwarn=%all +AC_DEFUN([CC_CHECK_WERROR], [ + AC_CACHE_CHECK( + [for $CC way to treat warnings as errors], + [cc_cv_werror], + [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror], + [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])]) + ]) +]) + +AC_DEFUN([CC_CHECK_ATTRIBUTE], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], + AS_TR_SH([cc_cv_attribute_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], + [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], + [AC_DEFINE( + AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, + [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] + ) + $4], + [$5]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ + CC_CHECK_ATTRIBUTE( + [constructor],, + [void __attribute__((constructor)) ctor() { int a; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ + CC_CHECK_ATTRIBUTE( + [format], [format(printf, n, n)], + [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ + CC_CHECK_ATTRIBUTE( + [format_arg], [format_arg(printf)], + [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ + CC_CHECK_ATTRIBUTE( + [visibility_$1], [visibility("$1")], + [void __attribute__((visibility("$1"))) $1_function() { }], + [$2], [$3]) +]) + +AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ + CC_CHECK_ATTRIBUTE( + [nonnull], [nonnull()], + [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ + CC_CHECK_ATTRIBUTE( + [unused], , + [void some_function(void *foo, __attribute__((unused)) void *bar);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ + CC_CHECK_ATTRIBUTE( + [sentinel], , + [void some_function(void *foo, ...) __attribute__((sentinel));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ + CC_CHECK_ATTRIBUTE( + [deprecated], , + [void some_function(void *foo, ...) __attribute__((deprecated));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ + CC_CHECK_ATTRIBUTE( + [alias], [weak, alias], + [void other_function(void *foo) { } + void some_function(void *foo) __attribute__((weak, alias("other_function")));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ + CC_CHECK_ATTRIBUTE( + [malloc], , + [void * __attribute__((malloc)) my_alloc(int n);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_PACKED], [ + CC_CHECK_ATTRIBUTE( + [packed], , + [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONST], [ + CC_CHECK_ATTRIBUTE( + [const], , + [int __attribute__((const)) twopow(int n) { return 1 << n; } ], + [$1], [$2]) +]) + +AC_DEFUN([CC_FLAG_VISIBILITY], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports -fvisibility=hidden], + [cc_cv_flag_visibility], + [cc_flag_visibility_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], + cc_cv_flag_visibility='yes', + cc_cv_flag_visibility='no') + CFLAGS="$cc_flag_visibility_save_CFLAGS"]) + + AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], + [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, + [Define this if the compiler supports the -fvisibility flag]) + $1], + [$2]) +]) + +AC_DEFUN([CC_FUNC_EXPECT], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if compiler has __builtin_expect function], + [cc_cv_func_expect], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [int some_function() { + int a = 3; + return (int)__builtin_expect(a, 3); + }])], + [cc_cv_func_expect=yes], + [cc_cv_func_expect=no]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([test "x$cc_cv_func_expect" = "xyes"], + [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1, + [Define this if the compiler supports __builtin_expect() function]) + $1], + [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported], + [cc_cv_attribute_aligned], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + for cc_attribute_align_try in 64 32 16 8 4 2; do + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + int main() { + static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; + return c; + }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) + done + CFLAGS="$ac_save_CFLAGS" + ]) + + if test "x$cc_cv_attribute_aligned" != "x"; then + AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned], + [Define the highest alignment supported]) + fi +]) diff -Nru kbd-1.15.3/m4/codeset.m4 kbd-1.15.5/m4/codeset.m4 --- kbd-1.15.3/m4/codeset.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/codeset.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# codeset.m4 serial AM1 (gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -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 -]) diff -Nru kbd-1.15.3/m4/glibc21.m4 kbd-1.15.5/m4/glibc21.m4 --- kbd-1.15.3/m4/glibc21.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/glibc21.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# 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" - ] -) diff -Nru kbd-1.15.3/m4/intdiv0.m4 kbd-1.15.5/m4/intdiv0.m4 --- kbd-1.15.3/m4/intdiv0.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/intdiv0.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -# intdiv0.m4 serial 1 (gettext-0.11.3) -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([gt_INTDIV0], -[ - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], - gt_cv_int_divbyzero_sigfpe, - [ - AC_TRY_RUN([ -#include -#include - -static void -#ifdef __cplusplus -sigfpe_handler (int sig) -#else -sigfpe_handler (sig) int sig; -#endif -{ - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); -} - -int x = 1; -int y = 0; -int z; -int nan; - -int main () -{ - signal (SIGFPE, sigfpe_handler); -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); -#endif -/* Linux/SPARC yields signal SIGILL. */ -#if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); -#endif - - z = x / y; - nan = y / y; - exit (1); -} -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, - [ - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i[34567]86 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac - ]) - ]) - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, - [Define if integer division by zero raises signal SIGFPE.]) -]) diff -Nru kbd-1.15.3/m4/intmax.m4 kbd-1.15.5/m4/intmax.m4 --- kbd-1.15.3/m4/intmax.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/intmax.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# intmax.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether the system has the 'intmax_t' type, but don't attempt to -dnl find a replacement if it is lacking. - -AC_DEFUN([gt_TYPE_INTMAX_T], -[ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, - [AC_TRY_COMPILE([ -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) - if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, - [Define if you have the 'intmax_t' type in or .]) - fi -]) diff -Nru kbd-1.15.3/m4/inttypes-pri.m4 kbd-1.15.5/m4/inttypes-pri.m4 --- kbd-1.15.3/m4/inttypes-pri.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/inttypes-pri.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# inttypes-pri.m4 serial 1 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -# Define PRI_MACROS_BROKEN if exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_REQUIRE([gt_HEADER_INTTYPES_H]) - if test $gt_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - gt_cv_inttypes_pri_broken, - [ - AC_TRY_COMPILE([#include -#ifdef PRId32 -char *p = PRId32; -#endif -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, - [Define if exists and defines unusable PRI* macros.]) - fi -]) diff -Nru kbd-1.15.3/m4/inttypes.m4 kbd-1.15.5/m4/inttypes.m4 --- kbd-1.15.3/m4/inttypes.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/inttypes.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# inttypes.m4 serial 1 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H if exists and doesn't clash with -# . - -AC_DEFUN([gt_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, - [ - AC_TRY_COMPILE( - [#include -#include ], - [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) - ]) - if test $gt_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, - [Define if exists and doesn't clash with .]) - fi -]) diff -Nru kbd-1.15.3/m4/inttypes_h.m4 kbd-1.15.5/m4/inttypes_h.m4 --- kbd-1.15.3/m4/inttypes_h.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/inttypes_h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# inttypes_h.m4 serial 5 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1;], - jm_ac_cv_header_inttypes_h=yes, - jm_ac_cv_header_inttypes_h=no)]) - if test $jm_ac_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff -Nru kbd-1.15.3/m4/isc-posix.m4 kbd-1.15.5/m4/isc-posix.m4 --- kbd-1.15.3/m4/isc-posix.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/isc-posix.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# 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"]) - ] -) diff -Nru kbd-1.15.3/m4/lcmessage.m4 kbd-1.15.5/m4/lcmessage.m4 --- kbd-1.15.3/m4/lcmessage.m4 2010-04-07 06:41:09.000000000 +0000 +++ kbd-1.15.5/m4/lcmessage.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# lcmessage.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995. - -# Check whether LC_MESSAGES is available in . - -AC_DEFUN([AM_LC_MESSAGES], -[ - 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.]) - fi -]) diff -Nru kbd-1.15.3/m4/longdouble.m4 kbd-1.15.5/m4/longdouble.m4 --- kbd-1.15.3/m4/longdouble.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/longdouble.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# longdouble.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether the compiler supports the 'long double' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_LONGDOUBLE], -[ - AC_CACHE_CHECK([for long double], gt_cv_c_long_double, - [if test "$GCC" = yes; then - gt_cv_c_long_double=yes - else - AC_TRY_COMPILE([ - /* The Stardent Vistra knows sizeof(long double), but does not support it. */ - long double foo = 0.0; - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ - int array [2*(sizeof(long double) >= sizeof(double)) - 1]; - ], , - gt_cv_c_long_double=yes, gt_cv_c_long_double=no) - fi]) - if test $gt_cv_c_long_double = yes; then - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) - fi -]) diff -Nru kbd-1.15.3/m4/longlong.m4 kbd-1.15.5/m4/longlong.m4 --- kbd-1.15.3/m4/longlong.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/longlong.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# longlong.m4 serial 4 -dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_LONG_LONG if 'long long' works. - -AC_DEFUN([jm_AC_TYPE_LONG_LONG], -[ - AC_CACHE_CHECK([for long long], ac_cv_type_long_long, - [AC_TRY_LINK([long long ll = 1LL; int i = 63;], - [long long llmax = (long long) -1; - return ll << i | ll >> i | llmax / ll | llmax % ll;], - ac_cv_type_long_long=yes, - ac_cv_type_long_long=no)]) - if test $ac_cv_type_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG, 1, - [Define if you have the 'long long' type.]) - fi -]) diff -Nru kbd-1.15.3/m4/printf-posix.m4 kbd-1.15.5/m4/printf-posix.m4 --- kbd-1.15.3/m4/printf-posix.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/printf-posix.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# printf-posix.m4 serial 2 (gettext-0.13.1) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether the printf() function supports POSIX/XSI format strings with -dnl positions. - -AC_DEFUN([gt_PRINTF_POSIX], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], - gt_cv_func_printf_posix, - [ - AC_TRY_RUN([ -#include -#include -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, - [ - AC_EGREP_CPP(notposix, [ -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - ], gt_cv_func_printf_posix="guessing no", - gt_cv_func_printf_posix="guessing yes") - ]) - ]) - case $gt_cv_func_printf_posix in - *yes) - AC_DEFINE(HAVE_POSIX_PRINTF, 1, - [Define if your printf() function supports format strings with positions.]) - ;; - esac -]) diff -Nru kbd-1.15.3/m4/signed.m4 kbd-1.15.5/m4/signed.m4 --- kbd-1.15.3/m4/signed.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/signed.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# signed.m4 serial 1 (gettext-0.10.40) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([bh_C_SIGNED], -[ - AC_CACHE_CHECK([for signed], bh_cv_c_signed, - [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) - if test $bh_cv_c_signed = no; then - AC_DEFINE(signed, , - [Define to empty if the C compiler doesn't support this keyword.]) - fi -]) diff -Nru kbd-1.15.3/m4/size_max.m4 kbd-1.15.5/m4/size_max.m4 --- kbd-1.15.3/m4/size_max.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/size_max.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -# size_max.m4 serial 2 -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([gl_SIZE_MAX], -[ - AC_CHECK_HEADERS(stdint.h) - dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - result= - AC_EGREP_CPP([Found it], [ -#include -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif -], result=yes) - if test -z "$result"; then - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider - dnl than the type 'unsigned long'. - dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', - dnl which is guaranteed to work from LONG_MIN to LONG_MAX. - _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, - [#include ], result=?) - _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, - [#include ], result=?) - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, - [#include ], result=?) - if test "$fits_in_uint" = 1; then - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. - AC_TRY_COMPILE([#include - extern size_t foo; - extern unsigned long foo; - ], [], fits_in_uint=0) - fi - if test -z "$result"; then - if test "$fits_in_uint" = 1; then - result="$res_hi$res_lo"U - else - result="$res_hi$res_lo"UL - fi - else - dnl Shouldn't happen, but who knows... - result='~(size_t)0' - fi - fi - AC_MSG_RESULT([$result]) - if test "$result" != yes; then - AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) - fi -]) diff -Nru kbd-1.15.3/m4/stdint_h.m4 kbd-1.15.5/m4/stdint_h.m4 --- kbd-1.15.3/m4/stdint_h.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/stdint_h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# stdint_h.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([jm_AC_HEADER_STDINT_H], -[ - AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1;], - jm_ac_cv_header_stdint_h=yes, - jm_ac_cv_header_stdint_h=no)]) - if test $jm_ac_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff -Nru kbd-1.15.3/m4/uintmax_t.m4 kbd-1.15.5/m4/uintmax_t.m4 --- kbd-1.15.3/m4/uintmax_t.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/uintmax_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# uintmax_t.m4 serial 7 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -AC_PREREQ(2.13) - -# Define uintmax_t to 'unsigned long' or 'unsigned long long' -# if it is not already defined in or . - -AC_DEFUN([jm_AC_TYPE_UINTMAX_T], -[ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) - test $ac_cv_type_unsigned_long_long = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if and don't define.]) - else - AC_DEFINE(HAVE_UINTMAX_T, 1, - [Define if you have the 'uintmax_t' type in or .]) - fi -]) diff -Nru kbd-1.15.3/m4/ulonglong.m4 kbd-1.15.5/m4/ulonglong.m4 --- kbd-1.15.3/m4/ulonglong.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/ulonglong.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# ulonglong.m4 serial 3 -dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. - -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -[ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], - [unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull;], - ac_cv_type_unsigned_long_long=yes, - ac_cv_type_unsigned_long_long=no)]) - if test $ac_cv_type_unsigned_long_long = yes; then - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, - [Define if you have the 'unsigned long long' type.]) - fi -]) diff -Nru kbd-1.15.3/m4/wchar_t.m4 kbd-1.15.5/m4/wchar_t.m4 --- kbd-1.15.3/m4/wchar_t.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/wchar_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# wchar_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether has the 'wchar_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WCHAR_T], -[ - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, - [AC_TRY_COMPILE([#include - wchar_t foo = (wchar_t)'\0';], , - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) - if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) - fi -]) diff -Nru kbd-1.15.3/m4/wint_t.m4 kbd-1.15.5/m4/wint_t.m4 --- kbd-1.15.3/m4/wint_t.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/wint_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# wint_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether has the 'wint_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WINT_T], -[ - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, - [AC_TRY_COMPILE([#include - wint_t foo = (wchar_t)'\0';], , - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) - fi -]) diff -Nru kbd-1.15.3/m4/xsize.m4 kbd-1.15.5/m4/xsize.m4 --- kbd-1.15.3/m4/xsize.m4 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/m4/xsize.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# xsize.m4 serial 2 -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -AC_DEFUN([gl_XSIZE], -[ - dnl Prerequisites of lib/xsize.h. - AC_REQUIRE([gl_SIZE_MAX]) - AC_CHECK_HEADERS(stdint.h) -]) diff -Nru kbd-1.15.3/man/Makefile.in kbd-1.15.5/man/Makefile.in --- kbd-1.15.3/man/Makefile.in 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/man/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,17 +54,24 @@ subdir = man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -57,6 +81,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -93,6 +122,7 @@ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -143,6 +173,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -406,13 +437,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -447,10 +475,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru kbd-1.15.3/man/man1/Makefile.am kbd-1.15.5/man/man1/Makefile.am --- kbd-1.15.3/man/man1/Makefile.am 2009-06-07 19:48:42.000000000 +0000 +++ kbd-1.15.5/man/man1/Makefile.am 2012-12-01 21:41:38.000000000 +0000 @@ -4,6 +4,10 @@ setleds.1 setmetamode.1 showkey.1 unicode_start.1 unicode_stop.1 \ $(gen_MANS) +if VLOCK +dist_man_MANS += vlock.1 +endif + install-data-hook: cd $(DESTDIR)$(mandir)/man1 && \ for f in $(gen_MANS); do \ diff -Nru kbd-1.15.3/man/man1/Makefile.in kbd-1.15.5/man/man1/Makefile.in --- kbd-1.15.3/man/man1/Makefile.in 2011-05-07 20:34:42.000000000 +0000 +++ kbd-1.15.5/man/man1/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,24 +50,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@VLOCK_TRUE@am__append_1 = vlock.1 subdir = man/man1 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/dumpkeys.1.in \ $(srcdir)/loadkeys.1.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = dumpkeys.1 loadkeys.1 CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -72,6 +102,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff @@ -79,6 +115,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -129,6 +166,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -192,10 +230,9 @@ top_srcdir = @top_srcdir@ gen_MANS = dumpkeys.1 loadkeys.1 dist_man_MANS = chvt.1 deallocvt.1 fgconsole.1 kbd_mode.1 openvt.1 \ - psfaddtable.1 psfgettable.1 psfstriptable.1 psfxtable.1 \ - setleds.1 setmetamode.1 showkey.1 unicode_start.1 unicode_stop.1 \ - $(gen_MANS) - + psfaddtable.1 psfgettable.1 psfstriptable.1 psfxtable.1 \ + setleds.1 setmetamode.1 showkey.1 unicode_start.1 \ + unicode_stop.1 $(gen_MANS) $(am__append_1) all: all-am .SUFFIXES: @@ -235,11 +272,18 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -268,9 +312,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -338,10 +380,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru kbd-1.15.3/man/man1/dumpkeys.1 kbd-1.15.5/man/man1/dumpkeys.1 --- kbd-1.15.3/man/man1/dumpkeys.1 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/man/man1/dumpkeys.1 2012-12-05 19:28:59.000000000 +0000 @@ -0,0 +1,209 @@ +.\" @(#)loadkeys.1 1.0 93/09/1 RK +.TH DUMPKEYS 1 "1 Sep 1993" +.SH NAME +dumpkeys \- dump keyboard translation tables +.SH SYNOPSIS +.B dumpkeys +[ +.B \-hilfn +.BI \-c charset +.B \-\-help \-\-short\-info \-\-long\-info \-\-numeric \-\-full\-table \-\-funcs\-only \-\-keys\-only \-\-compose\-only +.BI \-\-charset= charset +] +.SH DESCRIPTION +.IX "dumpkeys command" "" "\fLdumpkeys\fR command" +.LP +.B dumpkeys +writes, to the standard output, the current contents of the keyboard +driver's translation tables, in the format specified by +.BR keymaps (5). +.LP +Using the various options, the format of the output can be controlled +and also other information from the kernel and the programs +.BR dumpkeys (1) +and +.BR loadkeys (1) +can be obtained. +.SH OPTIONS +.TP +.B \-h \-\-help +Prints the program's version number and a short usage message to the +program's standard error output and exits. +.TP +.B \-i \-\-short-info +Prints some characteristics of the kernel's keyboard driver. The items +shown are: +.LP +.RS +Keycode range supported by the kernel +.LP +.RS +This tells what values can be used after the +.B keycode +keyword in keytable files. See +.BR keymaps (5) +for more information and the syntax of these files. +.RE +.LP +Number of actions bindable to a key +.LP +.RS +This tells how many different actions a single key can output using +various modifier keys. If the value is 16 for example, you can define up +to 16 different actions to a key combined with modifiers. When the value +is 16, the kernel probably knows about four modifier keys, which you can +press in different combinations with the key to access all the bound +actions. +.RE +.LP +Ranges of action codes supported by the kernel +.LP +.RS +This item contains a list of action code ranges in hexadecimal notation. +These are the values that can be used in the right hand side of a key +definition, ie. the +.IR vv 's +in a line +.LP +.RS +.B keycode +.I xx += +.I vv vv vv vv +.RE +.LP +(see +.BR keymaps (5) +for more information about the format of key definition lines). +.BR dumpkeys (1) +and +.BR loadkeys (1) +support a symbolic notation, which is preferable to the numeric one, as +the action codes may vary from kernel to kernel while the symbolic names +usually remain the same. However, the list of action code ranges can be +used to determine, if the kernel actually supports all the symbols +.BR loadkeys (1) +knows, or are there maybe some actions supported by the kernel that +have no symbolic name in your +.BR loadkeys (1) +program. To see this, you compare the range list with the action symbol +list, see option +.B --long-info +below. +.RE +.LP +Number of function keys supported by kernel +.LP +.RS +This tells the number of action codes that can be used to output +strings of characters. These action codes are traditionally bound to +the various function and editing keys of the keyboard and are defined +to send standard escape sequences. However, you can redefine these to +send common command lines, email addresses or whatever you like. +Especially if the number of this item is greater than the number of +function and editing keys in your keyboard, you may have some "spare" +action codes that you can bind to AltGr-letter combinations, for example, +to send some useful strings. See +.BR loadkeys (1) +for more details. +.RE +.LP +Function strings +.LP +.RS +You can see you current function key definitions with the command +.LP +.RS +.B dumpkeys --funcs-only +.RE +.LP +.RE +.RE +.LP +.TP +.B \-l \-\-long-info +This option instructs +.B dumpkeys +to print a long information listing. The output is the same as with the +.B --short-info +appended with the list of action symbols supported by +.BR loadkeys (1) +and +.BR dumpkeys (1), +along with the symbols' numeric values. +.LP +.TP +.B \-n \-\-numeric +This option causes +.B dumpkeys +to by-pass the conversion of action code values to symbolic notation and +to print the in hexadecimal format instead. +.LP +.TP +.B \-f \-\-full-table +This makes +.B dumpkeys +skip all the short-hand heuristics (see +.BR keymaps (5)) +and output the key bindings in the canonical form. First a keymaps +line describing the currently defined modifier combinations +is printed. Then for each key a row with a column for each +modifier combination is printed. For +example, if the current keymap in use uses seven modifiers, +every row will have seven action code columns. This format +can be useful for example to programs that post-process the +output of +.BR dumpkeys . +.LP +.TP +.B \-\-funcs-only +When this option is given, +.B dumpkeys +prints only the function key string definitions. Normally +.B dumpkeys +prints both the key bindings and the string definitions. +.LP +.TP +.B \-\-keys-only +When this option is given, +.B dumpkeys +prints only the key bindings. Normally +.B dumpkeys +prints both the key bindings and the string definitions. +.LP +.TP +.B \-\-compose-only +When this option is given, +.B dumpkeys +prints only the compose key combinations. +This option is available only if your kernel has compose key support. +.LP +.TP +.BI \-c charset " " " " \-\-charset= charset +This instructs +.B dumpkeys +to interpret character code values according to the specified character +set. This affects only the translation of character code values to +symbolic names. Valid values for +.I charset +currently are +.BR iso-8859-X , +Where X is a digit in 1-9. If no +.I charset +is specified, +.B iso-8859-1 +is used as a default. +This option produces an output line `charset "iso-8859-X"', telling +loadkeys how to interpret the keymap. (For example, "division" is +0xf7 in iso-8859-1 but 0xba in iso-8859-8.) +.LP +.SH FILES +.PD 0 +.TP 20 +.BI @DATADIR@/keymaps +recommended directory for keytable files +.PD +.SH "SEE ALSO" +.BR loadkeys (1), +.BR keymaps (5) + diff -Nru kbd-1.15.3/man/man1/loadkeys.1 kbd-1.15.5/man/man1/loadkeys.1 --- kbd-1.15.3/man/man1/loadkeys.1 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/man/man1/loadkeys.1 2012-12-05 19:28:59.000000000 +0000 @@ -0,0 +1,212 @@ +.\" @(#)loadkeys.1 +.TH LOADKEYS 1 "6 Feb 1994" +.SH NAME +loadkeys \- load keyboard translation tables +.SH SYNOPSIS +.B loadkeys +[ +.I -b --bkeymap +] [ +.I -c --clearcompose +] [ +.I -C '' +| +.I --console= +] [ +.I -d --default +] [ +.I -h --help +] [ +.I -m --mktable +] [ +.I -q --quiet +] [ +.I -s --clearstrings +] [ +.I -u --unicode +] [ +.I -v --verbose +] [ +.I filename... +] +.LP +.SH DESCRIPTION +.IX "loadkeys command" "" "\fLloadkeys\fR command" +.LP +The program +.B loadkeys +reads the file or files specified by +.IR filename... . +Its main purpose is to load the kernel keymap for the console. +You can specify console device by the +.I -C +(or +.I --console +) option. +.SH "RESET TO DEFAULT" +If the +.I -d +(or +.I --default +) option is given, +.B loadkeys +loads a default keymap, probably the file +.I defkeymap.map +either in +.I @DATADIR@/keymaps +or in +.IR /usr/src/linux/drivers/char . +(Probably the former was user-defined, while the latter +is a qwerty keyboard map for PCs - maybe not what was desired.) +Sometimes, with a strange keymap loaded (with the minus on +some obscure unknown modifier combination) it is easier to +type `loadkeys defkeymap'. +.SH "LOAD KERNEL KEYMAP" +The main function of +.B loadkeys +is to load or modify the keyboard driver's translation tables. +When specifying the file names, standard input can be denoted +by dash (-). If no file is specified, the data is read from +the standard input. +.LP +For many countries and keyboard types appropriate keymaps +are available already, and a command like `loadkeys uk' might +do what you want. On the other hand, it is easy to construct +one's own keymap. The user has to tell what symbols belong +to each key. She can find the keycode for a key by use of +.BR showkey (1), +while the keymap format is given in +.BR keymaps (5) +and can also be seen from the output of +.BR dumpkeys (1). +.SH "LOAD KERNEL ACCENT TABLE" +If the input file does not contain any compose key definitions, +the kernel accent table is left unchanged, unless the +.I -c +(or +.I --clearcompose +) option is given, in which case the kernel accent table is emptied. +If the input file does contain compose key definitions, then all +old definitions are removed, and replaced by the specified new entries. +The kernel accent table is a sequence of (by default 68) entries +describing how dead diacritical signs and compose keys behave. +For example, a line +.LP +.RS +compose ',' 'c' to ccedilla +.RE +.LP +means that <,> must be combined to . +The current content of this table can be see +using `dumpkeys \-\-compose\-only'. +.SH "LOAD KERNEL STRING TABLE" +The option +.I -s +(or +.I --clearstrings +) clears the kernel string table. If this option is not given, +.B loadkeys +will only add or replace strings, not remove them. +(Thus, the option \-s is required to reach a well-defined state.) +The kernel string table is a sequence of strings +with names like F31. One can make function key F5 (on +an ordinary PC keyboard) produce the text `Hello!', +and Shift+F5 `Goodbye!' using lines +.LP +.RS +keycode 63 = F70 F71 +.br +string F70 = "Hello!" +.br +string F71 = "Goodbye!" +.RE +.LP +in the keymap. +The default bindings for the function keys are certain +escape sequences mostly inspired by the VT100 terminal. +.SH "CREATE KERNEL SOURCE TABLE" +If the +.I -m +(or +.I --mktable +) option is given +.B loadkeys +prints to the standard output a file that may be used as +.I /usr/src/linux\%/drivers\%/char\%/defkeymap.c, +specifying the default key bindings for a kernel +(and does not modify the current keymap). +.SH "CREATE BINARY KEYMAP" +If the +.I -b +(or +.I --bkeymap +) option is given +.B loadkeys +prints to the standard output a file that may be used as a binary +keymap as expected by Busybox +.B loadkmap +command (and does not modify the current keymap). +.SH "UNICODE MODE" +.B loadkeys +automatically detects whether the console is in Unicode or +ASCII (XLATE) mode. When a keymap is loaded, literal +keysyms (such as +.BR section ) +are resolved accordingly; numerical keysyms are converted to +fit the current console mode, regardless of the way they are +specified (decimal, octal, hexadecimal or Unicode). +.LP +The +.I -u +(or +.IR --unicode ) +switch forces +.B loadkeys +to convert all keymaps to Unicode. If the keyboard is in a +non-Unicode mode, such as XLATE, +.B loadkeys +will change it to Unicode for the time of its execution. A +warning message will be printed in this case. +.LP +It is recommended to run +.BR kbd_mode (1) +before +.B loadkeys +instead of using the +.I -u +option. +.SH "OTHER OPTIONS" +.TP +.B \-h \-\-help +.B loadkeys +prints its version number and a short usage message to the programs +standard error output and exits. +.TP +.B \-q \-\-quiet +.B loadkeys +suppresses all normal output. +.SH WARNING +Note that anyone having read access to +.B /dev/console +can run +.B loadkeys +and thus change the keyboard layout, possibly making it unusable. Note +that the keyboard translation table is common for all the virtual +consoles, so any changes to the keyboard bindings affect all the virtual +consoles simultaneously. +.LP +Note that because the changes affect all the virtual consoles, they also +outlive your session. This means that even at the login prompt the key +bindings may not be what the user expects. +.SH FILES +.TP +.BI @DATADIR@/keymaps +default directory for keymaps +.LP +.TP +.BI /usr/src/linux/drivers/char/defkeymap.map +default kernel keymap +.SH "SEE ALSO" +.BR dumpkeys (1), +.BR keymaps (5) + diff -Nru kbd-1.15.3/man/man1/loadkeys.1.in kbd-1.15.5/man/man1/loadkeys.1.in --- kbd-1.15.3/man/man1/loadkeys.1.in 2010-04-07 06:41:10.000000000 +0000 +++ kbd-1.15.5/man/man1/loadkeys.1.in 2012-12-01 21:41:38.000000000 +0000 @@ -9,9 +9,9 @@ ] [ .I -c --clearcompose ] [ -.I -C '' +.I -C '' | -.I --console=cons1,cons2,... +.I --console= ] [ .I -d --default ] [ @@ -38,11 +38,11 @@ reads the file or files specified by .IR filename... . Its main purpose is to load the kernel keymap for the console. -The affected console device or devices can be specified using the +You can specify console device by the .I -C (or .I --console -) option. This option supports a list of device names +) option. .SH "RESET TO DEFAULT" If the .I -d diff -Nru kbd-1.15.3/man/man1/vlock.1 kbd-1.15.5/man/man1/vlock.1 --- kbd-1.15.3/man/man1/vlock.1 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/man/man1/vlock.1 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,49 @@ +.TH VLOCK 1 "16 May 1996" "Linux User's Manual" +.SH NAME +vlock \- Virtual Console lock program +.SH SYNOPSIS +.B vlock +.PP +.B vlock [ -a,--all ] [ -c,--current ] [ -h,--help ] [ -v,--version ] +.SH DESCRIPTION +.B vlock +is a program to lock one or more sessions on the Linux console. This is +especially useful for Linux machines which have multiple users with access +to the console. One user may lock his or her session(s) while still allowing +other users to use the system on other virtual consoles. If desired, the +entire console may be locked and virtual console switching disabled. +.PP +By default, only the current VC (virtual console) is locked. With the +\fB-a,-all\fR option all VCs are locked. The locked VCs cannot be unlocked +without the invoker's password. And, for the paranoid, +vlock makes it a trying experience for those attempting to guess the +password, so unauthorized access to session(s) is highly unlikely. +.PP +Please note that it is entirely possible to completely lock yourself out of +the console with the \fB-a,--all\fR option if you cannot remember your +password! Unless you are able to kill vlock by logging in remotely via a +serial terminal or network, a hard reset is the only method of ``unlocking'' +the display. +.PP +\fBvlock\fR works for console sessions primarily. However, there is +support for trying to lock non-console sessions as well, but that +support has not been well tested. +.SH OPTIONS +.B -a,--all +.IP +Lock all console sessions and disable VC switching. +.PP +.B -c,--current +.IP +Lock the current session (this is the default). +.PP +.B -h,--help +.IP +Print a brief help message. +.PP +.B -v,--version +.IP +Print the version number of \fBvlock\fR. +.PP +.SH AUTHOR +Michael K. Johnson diff -Nru kbd-1.15.3/man/man1misc/Makefile.in kbd-1.15.5/man/man1misc/Makefile.in --- kbd-1.15.3/man/man1misc/Makefile.in 2011-05-07 20:34:43.000000000 +0000 +++ kbd-1.15.5/man/man1misc/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,19 +54,31 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -71,6 +100,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff @@ -78,6 +113,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -128,6 +164,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -225,11 +262,18 @@ $(am__aclocal_m4_deps): install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -258,9 +302,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -328,10 +370,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru kbd-1.15.3/man/man5/Makefile.in kbd-1.15.5/man/man5/Makefile.in --- kbd-1.15.3/man/man5/Makefile.in 2011-05-07 20:34:43.000000000 +0000 +++ kbd-1.15.5/man/man5/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,19 +54,31 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -71,6 +100,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man5dir = $(mandir)/man5 am__installdirs = "$(DESTDIR)$(man5dir)" NROFF = nroff @@ -78,6 +113,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -128,6 +164,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -225,11 +262,18 @@ $(am__aclocal_m4_deps): install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list=''; test -n "$(man5dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man5dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.5[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -258,9 +302,7 @@ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -328,10 +370,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru kbd-1.15.3/man/man8/Makefile.in kbd-1.15.5/man/man8/Makefile.in --- kbd-1.15.3/man/man8/Makefile.in 2011-05-07 20:34:43.000000000 +0000 +++ kbd-1.15.5/man/man8/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,19 +55,31 @@ $(srcdir)/Makefile.in $(srcdir)/loadunimap.8.in \ $(srcdir)/mapscrn.8.in $(srcdir)/setfont.8.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = loadunimap.8 mapscrn.8 setfont.8 CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -72,6 +101,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" NROFF = nroff @@ -79,6 +114,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -129,6 +165,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -235,11 +272,18 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -268,9 +312,7 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -338,10 +380,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru kbd-1.15.3/man/man8/loadunimap.8 kbd-1.15.5/man/man8/loadunimap.8 --- kbd-1.15.3/man/man8/loadunimap.8 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/man/man8/loadunimap.8 2012-12-05 19:28:59.000000000 +0000 @@ -0,0 +1,51 @@ +.\" @(#)loadunimap.8 1.0 970317 aeb +.TH LOADUNIMAP 8 "2004-01-01" +.SH NAME +loadunimap \- load the kernel unicode-to-font mapping table +.SH SYNOPSIS +.B loadunimap +[ +.B \-C +.I console +] [ +.B \-o +.I oldmap +] [ +.I map +] +.SH DESCRIPTION +The +.B loadunimap +command is obsolete - its function is now built-in into setfont. +However, for backwards compatibility it is still available +as a separate command. +.LP +The program +.B loadunimap +loads the specified map in the kernel unicode-to-font mapping table. +If no map is given +.I def +is assumed. +The default extension (that can be omitted) is +.IR .uni . +.LP +If the +.B -o +.I oldmap +option is given, the old map is saved in the file specified. +.LP +On Linux 2.6.1 and later one can specify the console device using the +.B \-C +option. +.LP +Usually one does not call +.B loadunimap +directly - its function is also built into +.BR setfont . +.SH FILES +.I @DATADIR@/unimaps +is the default directory for unicode mappings. +.SH "SEE ALSO" +.BR mapscrn (8), +.BR setfont (8) + diff -Nru kbd-1.15.3/man/man8/mapscrn.8 kbd-1.15.5/man/man8/mapscrn.8 --- kbd-1.15.3/man/man8/mapscrn.8 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/man/man8/mapscrn.8 2012-12-05 19:28:59.000000000 +0000 @@ -0,0 +1,109 @@ +.\" @(#)man/man8/mapscrn.8 1.0 3/19/93 17:04:00 +.TH MAPSCRN 8 "20 March 1993" "Local" "International Support" +.SH NAME +mapscrn \- load screen output mapping table +.SH SYNOPSIS +.BR mapscrn " [" -v "] [" -o +.IR map.orig ] +.I mapfile +.SH DESCRIPTION +The +.B mapscrn +command is obsolete - its function is now built-in into setfont. +However, for backwards compatibility it is still available +as a separate command. +.LP +The +.I mapscrn +command loads a user defined output character mapping table into the +console driver. The console driver may be later put into +.B use user-defined mapping table +mode by outputting a special escape sequence to the console device. +This sequence is +.I (K +for the +.B G0 +character set and +.I )K +for the +.B G1 +character set. +When the +.I -o +option is given, the old map is saved in +.I map.orig. +.SH USE +There are two kinds of mapping tables: direct-to-font tables, +that give a font position for each user byte value, and user-to-unicode +tables that give a unicode value for each user byte. The corresponding +glyph is now found using the unicode index of the font. +The command +.RS +mapscrn trivial +.RE +sets up a one-to-one direct-to-font table where user bytes +directly address the font. This is useful for fonts that are +in the same order as the character set one uses. +A command like +.RS +mapscrn 8859-2 +.RE +sets up a user-to-unicode table that assumes that the user +uses ISO 8859-2. +.SH "INPUT FORMAT" +The +.I mapscrn +command can read the map in either of two formats: +.br +1. 256 or 512 bytes binary data +.br +2. two-column text file +.br +Format (1) is a direct image of the translation +.I table. The 256-bytes tables are direct-to-font, +the 512-bytes tables are user-to-unicode tables. +Format (2) is used to fill the +.I table +as follows: cell with offset mentioned in the first column is filled +with the value mentioned in the second column. +When values larger than 255 occur, or values are written using +the U+xxxx notation, the table is assumed to be a user-to-unicode +table, otherwise it is a direct-to-font table. +.PP +Values in the file may be specified in one of several +.B formats: +.br +.B 1. Decimal: +String of decimal digits not starting with '0' +.br +.B 2. Octal: +String of octal digits beginning with '0'. +.br +.B 3. Hexadecimal: +String of hexadecimal digits preceded by "0x". +.br +.B 4. Unicode: +String of four hexadecimal digits preceded by "U+". +.br +.B 5. Character: +Single character enclosed in single quotes. (And the binary value is used.) +Note that blank, comma, tab character and '#' cannot be specified +with this format. +.br +.B 6. UTF-8 Character: +Single (possibly multi-byte) UTF-8 character, enclosed in single quotes. +.PP +Note that control characters (with codes < 32) cannot be re-mapped with +.I mapscrn +because they have special meaning for the driver. +.SH FILES +.I @DATADIR@/consoletrans +is the default directory for screen mappings. +.SH "SEE ALSO" +.IR setfont (8) +.SH AUTHOR +Copyright (C) 1993 Eugene G. Crosser +.br + +.br +This software and documentation may be distributed freely. diff -Nru kbd-1.15.3/man/man8/setfont.8 kbd-1.15.5/man/man8/setfont.8 --- kbd-1.15.3/man/man8/setfont.8 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/man/man8/setfont.8 2012-12-05 19:28:59.000000000 +0000 @@ -0,0 +1,247 @@ +.TH SETFONT 8 "11 Feb 2001" "" "International Support" +.SH NAME +setfont \- load EGA/VGA console screen font +.SH SYNOPSIS +.B setfont +.RI "[-O " "font+umap.orig" "] [-o " "font.orig" ] +.RI "[-om " "cmap.orig" ] +.RI "[-ou " "umap.orig" ] +.RI "[-" "N" "] [" "font.new ..." ] +.RI "[-m " "cmap" ] +.RI "[-u " "umap" ] +.RI "[-C " "console" ] +.RI "[-h" "H" ] +.RI "[-v] [-V]" +.IX "setfont command" "" "\fLsetfont\fR command" +.SH DESCRIPTION +The +.B setfont +command reads a font from the file +.I font.new +and loads it into the EGA/VGA character generator, +and optionally outputs the previous font. +It can also load various mapping tables +and output the previous versions. +.LP +If no args are given (or only the option +.RI \- N +for some number +.IR N ), +then a default +.RI (8x N ) +font is loaded (see below). +One may give several small fonts, all containing +a Unicode table, and +.B setfont +will combine them and load the union. +Typical use: +.TP +.B setfont +Load a default font. +.TP +.B "setfont drdos8x16" +Load a given font (here the 448-glyph drdos font). +.TP +.B "setfont cybercafe -u cybercafe" +Load a given font that does not have a Unicode map +and provide one explicitly. +.TP +.B "setfont LatArCyrHeb-19 -m 8859-2" +Load a given font (here a 512-glyph font combining several +character sets) and indicate that one's local character set +is ISO 8859-2. +.LP +Note: if a font has more than 256 glyphs, only 8 out of 16 colors +can be used simultaneously. It can make console perception worse +(loss of intensity and even some colors). + +.SH "FONT FORMATS" +The standard Linux font format is the PSF font. +It has a header describing font properties like character size, +followed by the glyph bitmaps, optionally followed by a Unicode mapping +table giving the Unicode value for each glyph. +Several other (obsolete) font formats are recognized. +If the input file has code page format (probably with suffix .cp), +containing three fonts with sizes e.g. 8x8, 8x14 and 8x16, then one of +the options \-8 or \-14 or \-16 must be used to select one. +Raw font files are binary files of size +.RI 256* N +bytes, containing bit images for each of 256 characters, +one byte per scan line, and +.I N +bytes per character (0 < +.I N +<= 32). +Most fonts have a width of 8 bits, but with the framebuffer device (fb) +other widths can be used. + +.SH "FONT HEIGHT" +The program +.B setfont +has no built-in knowledge of VGA video modes, but just asks +the kernel to load the character ROM of the video card with +certain bitmaps. However, since Linux 1.3.1 the kernel knows +enough about EGA/VGA video modes to select a different line +distance. The default character height will be the number +.I N +inferred from the font or specified by option. However, the +user can specify a different character height +.I H +using the +.I "\-h" +option. + +.SH "CONSOLE MAPS" +Several mappings are involved in the path from user program +output to console display. If the console is in utf8 mode (see +.BR unicode_start (1)) +then the kernel expects that user program output is coded as UTF-8 (see +.BR utf-8 (7)), +and converts that to Unicode (ucs2). +Otherwise, a translation table is used from the 8-bit program output +to 16-bit Unicode values. Such a translation table is called a +.IR "Unicode console map" . +There are four of them: three built into the kernel, the fourth +settable using the +.I "\-m" +option of +.BR setfont . +An escape sequence chooses between these four tables; after loading a +.IR cmap , +.B setfont +will output the escape sequence Esc ( K that makes it the active translation. +.LP +Suitable arguments for the +.I "\-m" +option are for example +.IR 8859-1 , +.IR 8859-2 ", ...," +.IR 8859-15 , +.IR cp437 ", ...," +.IR cp1250 . +.LP +Given the Unicode value of the symbol to be displayed, the kernel +finds the right glyph in the font using the Unicode mapping info +of the font and displays it. +.LP +Old fonts do not have Unicode mapping info, and in order to handle +them there are direct-to-font maps (also loaded using +.IR "\-m" ) +that give a correspondence between user bytes and font positions. +The most common correspondence is the one given in the file +.I trivial +(where user byte values are used directly as font positions). +Other correspondences are sometimes preferable since the +PC video hardware expects line drawing characters in certain +font positions. +.LP +Giving a +.I "\-m none" +argument inhibits the loading and activation of a mapping table. +The previous console map can be saved to a file using the +.I "\-om file" +option. +These options of setfont render +.BR mapscrn (8) +obsolete. (However, it may be useful to read that man page.) + +.SH "UNICODE FONT MAPS" +The correspondence between the glyphs in the font and +Unicode values is described by a Unicode mapping table. +Many fonts have a Unicode mapping table included in +the font file, and an explicit table can be indicated using +the +.I "\-u" +option. The program +.B setfont +will load such a Unicode mapping table, unless a +.I "\-u none" +argument is given. The previous Unicode mapping table +will be saved as part of the saved font file when the \-O +option is used. It can be saved to a separate file using the +.I "\-ou file" +option. +These options of setfont render +.BR loadunimap (8) +obsolete. +.LP +The Unicode mapping table should assign some glyph to +the `missing character' value U+fffd, otherwise missing +characters are not translated, giving a usually very confusing +result. + +Usually no mapping table is needed, and a Unicode mapping table +is already contained in the font (sometimes this is indicated +by the .psfu extension), so that most users need not worry +about the precise meaning and functioning of these mapping tables. + +One may add a Unicode mapping table to a psf font using +.BR psfaddtable (1). + +.SH OPTIONS +.TP +.BI "\-h " H +Override font height. +.TP +.BI "\-m " file +Load console map or Unicode console map from +.IR file . +.TP +.BI "\-o " file +Save previous font in +.IR file . +.TP +.BI "\-O " file +Save previous font and Unicode map in +.IR file . +.TP +.BI "\-om " file +Store console map in +.IR file . +.TP +.BI "\-ou " file +Save previous Unicode map in +.IR file . +.TP +.BI "\-u " file +Load Unicode table describing the font from +.IR file . +.TP +.BI "\-C " console +Set the font for the indicated console. (May require root permissions.) +.TP +.B \-v +Be verbose. +.TP +.B \-V +Print version and exit. + +.SH NOTE +PC video hardware allows one to use the "intensity" bit +either to indicate brightness, or to address 512 (instead of 256) +glyphs in the font. So, if the font has more than 256 glyphs, +the console will be reduced to 8 (instead of 16) colors. + +.SH FILES +.I @DATADIR@/consolefonts +is the default font directory. +.I @DATADIR@/unimaps +is the default directory for Unicode maps. +.I @DATADIR@/consoletrans +is the default directory for screen mappings. +The default font is a file +.I default +(or +.IR default8x N +if the \-N option was given for some number N) +perhaps with suitable extension (like .psf). +.SH "SEE ALSO" +.BR psfaddtable (1), +.BR unicode_start (1), +.BR loadunimap (8), +.BR utf-8 (7), +.BR mapscrn (8) +.\" .SH "AUTHORS" +.\" Eugene G. Crosser (crosser@pccross.msk.su) +.\" .br +.\" Andries E. Brouwer (aeb@cwi.nl) diff -Nru kbd-1.15.3/man/man8misc/Makefile.in kbd-1.15.5/man/man8misc/Makefile.in --- kbd-1.15.3/man/man8misc/Makefile.in 2011-05-07 20:34:43.000000000 +0000 +++ kbd-1.15.5/man/man8misc/Makefile.in 2012-12-05 19:27:05.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,19 +54,31 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -71,6 +100,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" NROFF = nroff @@ -78,6 +113,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -128,6 +164,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -225,11 +262,18 @@ $(am__aclocal_m4_deps): install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -258,9 +302,7 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -328,10 +370,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru kbd-1.15.3/po/Makevars.template kbd-1.15.5/po/Makevars.template --- kbd-1.15.3/po/Makevars.template 2010-04-10 21:34:12.000000000 +0000 +++ kbd-1.15.5/po/Makevars.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = Free Software Foundation, Inc. - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff -Nru kbd-1.15.3/po/POTFILES.in kbd-1.15.5/po/POTFILES.in --- kbd-1.15.3/po/POTFILES.in 2011-04-26 20:29:35.000000000 +0000 +++ kbd-1.15.5/po/POTFILES.in 2012-12-01 21:41:38.000000000 +0000 @@ -41,6 +41,13 @@ src/spawn_login.c src/totextmode.c src/utf8.c +src/version.h +src/vlock/auth.c +src/vlock/pam.c +src/vlock/parse.c +src/vlock/screen.c +src/vlock/username.c +src/vlock/vlock.c +src/vlock/vt.c src/wctomb.c src/xmalloc.c -src/version.h Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/cs.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/cs.gmo differ diff -Nru kbd-1.15.3/po/cs.po kbd-1.15.5/po/cs.po --- kbd-1.15.3/po/cs.po 2011-05-14 21:14:24.000000000 +0000 +++ kbd-1.15.5/po/cs.po 2012-12-01 22:13:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kbd 1.14.1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2008-04-06 13:50+0200\n" "Last-Translator: Miloslav TrmaÄ \n" "Language-Team: Czech \n" @@ -242,12 +242,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: Varování: řádek příliÅ¡ dlouhý\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "Nemohu otevřít %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Nemohu získat deskriptor souboru odkazující na konzolu\n" @@ -434,36 +434,36 @@ msgid "unknown keysym '%s'\n" msgstr "neznámý symbol klávesy '%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, fuzzy, c-format msgid "cannot open include file %s" msgstr "Nemohu otevřít soubor písma %s\n" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: Varování: řádek příliÅ¡ dlouhý\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -475,8 +475,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -486,238 +486,238 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: nemohu dealokovat konzolu %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "kód klávesy %3d %s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, fuzzy, c-format msgid "failed to bind key %d to value %d\n" msgstr "nemohu nastavit scankód %x na kód klávesy %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, fuzzy, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: nemohu dealokovat konzolu %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, fuzzy, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: nemohu dealokovat konzolu %d\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: chyba pÅ™i nastavování režimu klávesnice\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, fuzzy, c-format msgid "failed to clear string %s\n" msgstr "nemohu obnovit původní unimap\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, fuzzy, c-format msgid "too many compose definitions\n" msgstr "maximální poÄet definic compose: %d\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, fuzzy, c-format msgid "(No change in compose definitions.)\n" msgstr "maximální poÄet definic compose: %d\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Chyba pÅ™i zápisu mapy do souboru\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, fuzzy, c-format msgid "too many (%d) entries on one line" msgstr "PříliÅ¡ mnoho souborů pro kombinování\n" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, fuzzy, c-format +msgid "Loading %s\n" +msgstr "Chyba pÅ™i Ätení %s\n" + +#: loadkeys.y:1062 +#, fuzzy, c-format +msgid "syntax error in map file\n" +msgstr "Chyba pÅ™i zápisu mapy do souboru\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: chyba pÅ™i nastavování režimu klávesnice\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "chyba pÅ™i spouÅ¡tÄ›ní %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Nemohu najít písmo %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Nemohu otevřít soubor písma %s\n" -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "Chyba pÅ™i Ätení %s\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "Chyba pÅ™i zápisu mapy do souboru\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -749,8 +749,12 @@ #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Rozsah Unicode U+%x-U+%x není stejné délky jako rozsah pozic písma 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Rozsah Unicode U+%x-U+%x není stejné délky jako rozsah pozic písma 0x" +"%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -853,6 +857,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -864,74 +869,74 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: neplatné Äíslo vt\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: jen root může používat pÅ™epínaÄ -u.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" msgstr "Nemohu získat deskriptor souboru odkazující na konzolu\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: nemohu najít volný vt\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: nemohu zkontrolovat, jestli vt %d je volný\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d se používá; příkaz pÅ™eruÅ¡en\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: Nemohu nastavit nové sezení (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Nemohu otevřít %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: používám VT %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Nemohu otevřít %s pro Ätení i zápis (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: nemohu dealokovat konzolu %d\n" @@ -1038,7 +1043,9 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" msgstr "%s: MÄ›l by existovat rozsah Unicode odpovídající rozsahu pozic písma\n" #: src/psfxtable.c:257 @@ -1120,19 +1127,23 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: nezapomeňte zmÄ›nit TERM (možná na con%dx%d nebo linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: nezapomeňte zmÄ›nit TERM (možná na con%dx%d nebo linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "volání je: resizecons SLOUPCÅ®xŘÃDKÅ® nebo: resizecons SLOUPCÅ® ŘÃDKÅ®\n" -"nebo: resizecons -lines ŘÃDKÅ®, ke ŘÃDKÅ® je jedno z 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"nebo: resizecons -lines ŘÃDKÅ®, ke ŘÃDKÅ® je jedno z 25, 28, 30, 34, 36, 40, " +"44, 50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1172,7 +1183,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1196,10 +1208,12 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Použití: setfont [pÅ™ep-z] [-] [novépísmo..] [-m mapakonzoly] [-u mapaunicode]\n" +"Použití: setfont [pÅ™ep-z] [-] [novépísmo..] [-m mapakonzoly] [-u " +"mapaunicode]\n" " pÅ™ep-z (mají vliv pÅ™ed naÄítáním souboru):\n" " -o \tZapsat aktuální písmo do \n" -" -O \tZapsat aktuální písmo a mapu unicode do \n" +" -O \tZapsat aktuální písmo a mapu unicode do " +"\n" " -om \tZapsat aktuální mapu konzoly do \n" " -ou \tZapsat aktuální mapu unicode do \n" "Není-li zadáno novépísmo ani pÅ™epínaÄ -[o|O|om|ou|m|u],\n" @@ -1208,7 +1222,8 @@ " setfont - NaÄíst písmo \"default8x[.gz]\"\n" "PÅ™epínaÄ - vybírá písmo z codepage, která obsahuje tÅ™i písma:\n" " setfont -{8|14|16} codepage.cp[.gz] NaÄíst písmo 8× z codepage.cp\n" -"ExplicitnÄ› (pomocí -m nebo -u) nebo implicitnÄ› (v souboru písma) daná mapování\n" +"ExplicitnÄ› (pomocí -m nebo -u) nebo implicitnÄ› (v souboru písma) daná " +"mapování\n" "budou naÄtena a v případÄ› map konzoly aktivována.\n" " -h (bez mezery) Vnutit výšku písma.\n" " -m NaÄíst mapu obrazovky konzoly.\n" @@ -1227,8 +1242,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: nemohu zároveň obnovovat z ROM znaků a ze souboru. Písmo nezmÄ›nÄ›no.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: nemohu zároveň obnovovat z ROM znaků a ze souboru. Písmo " +"nezmÄ›nÄ›no.\n" #: src/setfont.c:259 #, c-format @@ -1441,8 +1460,10 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Chyba pÅ™i Ätení aktuálního nastavení příznaku. Možná nejste na konzole?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Chyba pÅ™i Ätení aktuálního nastavení příznaku. Možná nejste na konzole?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1647,7 +1668,8 @@ "Platné pÅ™epínaÄe jsou:\n" " -C tty Zařízení, ze kterého Äíst písmo. ImplicitnÄ› aktuální tty.\n" " -v Být podrobnÄ›jší.\n" -" -i Nevypisovat tabulku písma, jen zobrazit ŘÃDKÅ®xSLOUPCÅ®xPOÄŒET a skonÄit.\n" +" -i Nevypisovat tabulku písma, jen zobrazit ŘÃDKÅ®xSLOUPCÅ®xPOÄŒET a " +"skonÄit.\n" #: src/showconsolefont.c:170 #, fuzzy, c-format @@ -1733,7 +1755,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "stisknÄ›te libovolnou klávesu (program skonÄí 10 s po posledním stisku klávesy)...\n" +msgstr "" +"stisknÄ›te libovolnou klávesu (program skonÄí 10 s po posledním stisku " +"klávesy)...\n" #: src/showkey.c:250 msgid "release" @@ -1758,6 +1782,67 @@ msgid "%s from %s\n" msgstr "%s z %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"nerozpoznaný argument: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 je konzole a nemůže být dealokován\n" + #~ msgid "plus before %s ignored\n" #~ msgstr "plus pÅ™ed %s ignorováno\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/da.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/da.gmo differ diff -Nru kbd-1.15.3/po/da.po kbd-1.15.5/po/da.po --- kbd-1.15.3/po/da.po 2011-05-14 21:14:16.000000000 +0000 +++ kbd-1.15.5/po/da.po 2012-12-01 21:41:38.000000000 +0000 @@ -5,10 +5,10 @@ # Keld Simonsen , 2002, 2008. msgid "" msgstr "" -"Project-Id-Version: kbd-1.15.2\n" +"Project-Id-Version: kbd-1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2011-01-09 07:01+0100\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2011-06-03 22:01+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -241,16 +241,16 @@ msgstr "fejl ved eksekvering af %s\n" #: src/findfile.c:157 -#, fuzzy, c-format +#, c-format msgid "Warning: path too long: %s/%s\n" -msgstr "%s: Advarsel: linjen er for lang\n" +msgstr "Advarsel: stien er for lang: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Kunne ikke åbne %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Kunne ikke få en filidentifikator der referere til konsollen\n" @@ -268,7 +268,8 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 er en fejl, for 1-88 (0x01-0x58) er aflæsningskoden lig med tastekoden\n" +msgstr "" +"0 er en fejl, for 1-88 (0x01-0x58) er aflæsningskoden lig med tastekoden\n" #: src/getkeycodes.c:62 #, c-format @@ -308,18 +309,20 @@ " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" msgstr "" +"Brug: %1$s [-C ENHED] getmode [text|graphics]\n" +" eller: %1$s [-C ENHED] gkbmode [raw|xlate|mediumraw|unicode]\n" +" eller: %1$s [-C ENHED] gkbmeta [metabit|escprefix]\n" +" eller: %1$s [-C ENHED] gkbled [scrolllock|numlock|capslock]\n" #: src/kbdinfo.c:65 #, c-format msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "Fejl: Ikke nok argumenter.\n" #: src/kbdinfo.c:124 -#, fuzzy, c-format +#, c-format msgid "Error: Unrecognized action: %s\n" -msgstr "" -"ukendt argument: _%s_\n" -"\n" +msgstr "Fejl: Ukendt handling: %s\n" #: src/kbd_mode.c:20 #, c-format @@ -393,7 +396,7 @@ #: src/kdmapop.c:159 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "mærkeligt... ct ændredes fra %d til %d\n" #: src/kdmapop.c:185 #, c-format @@ -401,6 +404,8 @@ "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"Det ser ud til at denne kerne er ældre end 1.1.92\n" +"Ingen UCS-tabel indlæst.\n" #: src/ksyms.c:1713 #, c-format @@ -437,36 +442,35 @@ msgid "unknown keysym '%s'\n" msgstr "ukendt tegnsymbol \"%s\"\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "includes er i for dybe nveauer" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "skifter til %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "Kan ikke åbne inkluderingsfilen %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" -msgstr "" +msgstr "forventede filnavn i anførselstegn" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" -msgstr "" +msgstr "UCS keysym uden for område: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 -#, fuzzy +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" -msgstr "%s: Advarsel: linjen er for lang\n" +msgstr "strengen er for lang" -#: loadkeys.y:90 +#: loadkeys.y:93 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -478,8 +482,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -494,6 +498,7 @@ "\n" "Gyldige tilvalg er:\n" "\n" +" -a --ascii gennemtving konvertering til ASCII\n" " -b --bkeymap udskriv en binær keymap til standardud\n" " -c --clearcompose nulstil kernens kompositionstabel\n" " -C --console=\n" @@ -506,120 +511,120 @@ " -u --unicode gennemtving konvertering til UCS\n" " -v --verbose udskriv ændringerne\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap kaldt ,ed dårligt indeks %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "tilføjelse af tabel %d strider mod eksplicit keymaps-linje" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey kaldt med dårligt indeks %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey kaldt med dårlig tabel %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey kaldt med dårlig keycode %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey kaldt med dårligt indeks %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey kaldt med dårlig tabel %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc kaldt med dårlig func %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: overløb i func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "overløb i kompositionstabel\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: kunne ikke skifte til UCS-tilstand\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Keymap %d: Tilladelse nægtet\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "keycode %d, tabel %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " MISLYKKEDES" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "kunne ikke binde tast %d til værdien %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "deallokér keymap %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: kunne ikke deallokere keymap %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: kan ikke deallokere eller nulstille keymap\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: kunne ikke gå tilbage til oprindelig tastatyrtilstand\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "mislykkedes med at binde stren '%s' til funktion %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "mislykkedes med at nulstille streng %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "for mange kompositionsdefinitioner\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "umulig fejl i do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -628,84 +633,99 @@ "\n" "Ændrede %d %s og %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "tast" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "taster" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "streng" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "strenge" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Indlæste %d kompositionér %s\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "definition" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "definitioner" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Ingen ændringer i kompositionsdefinitioner)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: véd ikke hvordan at kompositionere for %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Fejl ved skrivning af tabel til fil\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' er ikke et symbol for en funktionstast" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "For mange (%d) indgange på én linje" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "for mane definitioner for taster på én linje" -#: loadkeys.y:1110 +#: loadkeys.y:1057 #, c-format -msgid "%s: Options --unicode and --ascii are mutually exclusive\n" -msgstr "" +msgid "Loading %s\n" +msgstr "Indlæser %s\n" -#: loadkeys.y:1123 +#: loadkeys.y:1062 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: fejl ved læsning af tastaturstilstand\n" +msgid "syntax error in map file\n" +msgstr "Syntaksfejl i tabelfil\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "tastebininger ikke ændret\n" -#: loadkeys.y:1131 +#: loadkeys.y:1146 +#, c-format +msgid "%s: Options --unicode and --ascii are mutually exclusive\n" +msgstr "%s: Tilvalg --unicode og --ascii er gensidigt udelukkende\n" + +#: loadkeys.y:1158 #, fuzzy, c-format +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: fejl ved læsning af tastaturstilstand\n" + +#: loadkeys.y:1166 +#, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -"%s: advarsel: indlæser UCS keymap på ikke-UCS konsol\n" -" (måske vil du gerne lave 'kbd_mode -u'?)\n" +"%s: advarsel: indlæser ikke-UCS keymap på UCS konsol\n" +" (måske vil du gerne lave 'kbd_mode -a'?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -714,36 +734,21 @@ "%s: advarsel: indlæser UCS keymap på ikke-UCS konsol\n" " (måske vil du gerne lave 'kbd_mode -u'?)\n" -#: loadkeys.y:1157 -#, fuzzy, c-format +#: loadkeys.y:1187 +#, c-format msgid "Searching in %s\n" -msgstr "skifter til %s\n" +msgstr "Søger i %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Kan ikke finde %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "Kan ikke åbne fil %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Indlæser %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "Syntaksfejl i tabelfil\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "tastebininger ikke ændret\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -771,12 +776,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Fejlagtigt UCS-interval som modsvarer skrifttypepositionsinterval 0x%x-0x%x\n" +msgstr "" +"%s: Fejlagtigt UCS-interval som modsvarer skrifttypepositionsinterval 0x%x-0x" +"%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: UCS-interval U+%x-U+%x er ikke af samme længde som skrifttypespositionsinterval 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: UCS-interval U+%x-U+%x er ikke af samme længde som " +"skrifttypespositionsinterval 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -871,7 +882,7 @@ msgstr "Gemte skærmtabel i \"%s\"\n" #: src/openvt.c:44 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" "\n" @@ -879,6 +890,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -889,84 +901,90 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"Brug: %s [TILVALG] -- kommando\n" +"\n" +"Dette program hjælper dig med at starte et program på en ny virtuel terminal " +"(VT).\n" +"\n" +"Tilvalg:\n" +" -c, --console=NUM brug det angivne VT-nummer;\n" +" -f, --force gennemtving åbning af en VT uden at tjekke;\n" +" -l, --login gør kommandoen til en login-skál;\n" +" -u, --user find ejeren på den aktuelle VT;\n" +" -s, --switch skift til den nye VT;\n" +" -w, --wait vent på at kommandoen bliver færdig;\n" +" -v, --verbose udskriv en besked for hver handling;\n" +" -V, --version udskriv programversion og afslut;\n" +" -h, --help udskriv en kort hjælpetekst.\n" +"\n" -#: src/openvt.c:162 -#, fuzzy +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" -msgstr "Kunne ikke finde ejer af aktuel tty!\n" +msgstr "Kunne ikke finde ejer af aktuel tty!" -#: src/openvt.c:230 -#, fuzzy, c-format +#: src/openvt.c:231 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt: %s: ugyldigt vt-nummer\n" +msgstr "%s: Ugyldigt vt-nummer" -#: src/openvt.c:256 -#, fuzzy +#: src/openvt.c:257 msgid "Only root can use the -u flag." -msgstr "openvt: kun root kan bruge flaget -u.\n" +msgstr "Kun root kan bruge flaget -u." -#: src/openvt.c:278 -#, fuzzy +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" -msgstr "Kunne ikke få en filidentifikator der referere til konsollen\n" +msgstr "Kunne ikke få en filidentifikator der refererer til konsollen" -#: src/openvt.c:285 -#, fuzzy +#: src/openvt.c:286 msgid "Cannot find a free vt" -msgstr "openvt: kan ikke finde en ledig vt\n" +msgstr "Kan ikke finde en ledig vt" -#: src/openvt.c:289 -#, fuzzy, c-format +#: src/openvt.c:290 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt: kan ikke undersøge om vt %d er ledig\n" +msgstr "Kan ikke undersøge om vt %d er ledig, brug '%s -f' at gennemtvinge." -#: src/openvt.c:293 -#, fuzzy, c-format +#: src/openvt.c:294 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt: vt %d bruges, kommandoen afbrudt\n" +msgstr "vt %d er i brug, kommandoen afbrudt, brug '%s -f' at gennemtvinge." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." -msgstr "" +msgstr "Kunne ikke finde kommando" -#: src/openvt.c:335 -#, fuzzy +#: src/openvt.c:336 msgid "Unable to set new session" -msgstr "openvt: Kan ikke sætte ny session (%s)\n" +msgstr "Kan ikke sætte ny session" -#: src/openvt.c:359 -#, fuzzy, c-format +#: src/openvt.c:360 +#, c-format msgid "Unable to open %s" -msgstr "openvt: Kan ikke åbne %s: %s\n" +msgstr "Kan ikke åbne %s" -#: src/openvt.c:363 -#, fuzzy, c-format +#: src/openvt.c:364 +#, c-format msgid "Using VT %s" -msgstr "openvt: bruger VT %s\n" +msgstr "Bruger VT %s" -#: src/openvt.c:369 -#, fuzzy, c-format +#: src/openvt.c:370 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt: Kan ikke åbne %s for læsning/skrivning (%s)\n" +msgstr "Kan ikke åbne %s for læsning/skrivning" -#: src/openvt.c:380 -#, fuzzy, c-format +#: src/openvt.c:381 +#, c-format msgid "Couldn't activate vt %d" -msgstr "" -"\n" -"openvt: kunne ikke aktivere vt %d (%s)\n" +msgstr "Kunne ikke aktivere vt %d" -#: src/openvt.c:383 -#, fuzzy +#: src/openvt.c:384 msgid "Activation interrupted?" -msgstr "" -"\n" -"openvt: aktivering afbrudt? (%s)\n" +msgstr "Aktivering afbrudt?" -#: src/openvt.c:423 -#, fuzzy, c-format +#: src/openvt.c:424 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s: kunne ikke deallokere konsol %d\n" +msgstr "Kunne ikke deallokere konsol %d" #: src/psffontop.c:69 #, c-format @@ -1070,8 +1088,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Til et modsvarende interval af skrifttypespositioner burde der findes et UCS-interval\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Til et modsvarende interval af skrifttypespositioner burde der findes et " +"UCS-interval\n" #: src/psfxtable.c:257 #, c-format @@ -1107,7 +1129,8 @@ "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" msgstr "" "Brug:\n" -"\t%s [-i inddataskrifttype] [-o uddataskrifttype] [-it indtabel] [-ot udtabel] [-nt]\n" +"\t%s [-i inddataskrifttype] [-o uddataskrifttype] [-it indtabel] [-ot " +"udtabel] [-nt]\n" #: src/psfxtable.c:360 #, c-format @@ -1142,7 +1165,8 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Gammelt antal skanlinjer: %d Nyt antal skanlinjer: %d Tegnhøjde: %d\n" +msgstr "" +"Gammelt antal skanlinjer: %d Nyt antal skanlinjer: %d Tegnhøjde: %d\n" #: src/resizecons.c:252 #, c-format @@ -1151,19 +1175,23 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: glem ikke at ændre TERM (måske til con%dx%d eller linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: glem ikke at ændre TERM (måske til con%dx%d eller linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "kald: resizecons KOLONNERxLINJER eller: resizecons KOLONNER LINJER\n" -"eller: resizecons -lines LINJER, hvor LINJER er en af 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"eller: resizecons -lines LINJER, hvor LINJER er en af 25, 28, 30, 34, 36, " +"40, 44, 50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1203,7 +1231,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1227,7 +1256,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Brug: setfont [skriveflag] [-] [nyskrifttype..] [-m konsoltabel] [-u UCS-tabel]\n" +"Brug: setfont [skriveflag] [-] [nyskrifttype..] [-m konsoltabel] [-u UCS-" +"tabel]\n" " skriveflag (sker før filer læses):\n" " -o \tSkriv nuværende skrifttype til \n" " -O \tSkriv nuværende skrifttype og UCS-tabel til \n" @@ -1237,9 +1267,12 @@ "indlæses en standardskrifttype:\n" " setfont Indlæs skrifttype \"default[.gz]\"\n" " setfont - Indlæs skrifttype \"default8x[.gz]\"\n" -"--flaget vælger en skrifttype fra en tegntabel som indeholder tre skrifttyper:\n" -" setfont -{8|14|16} codepage.cp[.gz] Indlæs 8×-skrifttypen fra codepage.cp\n" -"Eksplicit (med -m eller -u) eller implicit (i skrifttypefilen) givne tabeller\n" +"--flaget vælger en skrifttype fra en tegntabel som indeholder tre " +"skrifttyper:\n" +" setfont -{8|14|16} codepage.cp[.gz] Indlæs 8×-skrifttypen fra " +"codepage.cp\n" +"Eksplicit (med -m eller -u) eller implicit (i skrifttypefilen) givne " +"tabeller\n" "vil blive læst ind og, hvis det er konsoltabeller, aktiveres.\n" " -h (intet blanktegn) tilsidesæt skrifttypehøjde.\n" " -m Indlæs konsolskærmstabel.\n" @@ -1258,8 +1291,11 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: kan ikke både genskabe fra tegn-ROM og fra fil. Fonten uændret.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: kan ikke både genskabe fra tegn-ROM og fra fil. Fonten uændret.\n" #: src/setfont.c:259 #, c-format @@ -1324,7 +1360,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Når flere skrifttyper læses ind skal alle være psf-skrifttyper - %s er det ikke\n" +msgstr "" +"Når flere skrifttyper læses ind skal alle være psf-skrifttyper - %s er det " +"ikke\n" #: src/setfont.c:435 #, c-format @@ -1388,7 +1426,8 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Du bad om skrifttypesstørrelsen %d, men kun 8, 14 og 16 er mulige her.\n" +msgstr "" +"Du bad om skrifttypesstørrelsen %d, men kun 8, 14 og 16 er mulige her.\n" #: src/setfont.c:673 #, c-format @@ -1468,12 +1507,17 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Fejl ved læsning af nuværende indstilling. Standard ind er måske ikke en VT?\n" +msgstr "" +"Fejl ved læsning af nuværende indstilling. Standard ind er måske ikke en " +"VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Fejl ved læsning af nuværende flagindstilling. Du er måske ikke på konsollen?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Fejl ved læsning af nuværende flagindstilling. Du er måske ikke på " +"konsollen?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1586,7 +1630,9 @@ #: src/setmetamode.c:78 #, c-format msgid "Error reading current setting. Maybe stdin is not a VT?\n" -msgstr "Fejl ved læsning af nuværende indstilling. Standard ind er måske ikke en VT?\n" +msgstr "" +"Fejl ved læsning af nuværende indstilling. Standard ind er måske ikke en " +"VT?\n" #: src/setmetamode.c:98 #, c-format @@ -1617,26 +1663,36 @@ "and then edit the values in FILE.\n" "\n" msgstr "" +"Brug: %s vga|FIL|-\n" +"\n" +"Hvis du bruger FIL-parametren, bør FIL være nøjagtig 3 linjer med\n" +"komma-separerede decimale værdier for RØD, GRØN og BLÅ.\n" +"\n" +"For at starte en gyldig FIL:\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > FIL\n" +"\n" +"og redigér så værdierne i FIL.\n" +"\n" #: src/setvtrgb.c:85 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "Fejl: %s: Ugyldig værdi i felt %u i linje %u." #: src/setvtrgb.c:92 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "Fejl: %s: Utilstrækkeligt antal felter i linje %u." #: src/setvtrgb.c:98 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "Fejl: %s: linje %u afsluttedes uventet.\n" #: src/setvtrgb.c:102 -#, fuzzy, c-format +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s: %s: Advarsel: linjen er for lang\n" +msgstr "Fejl: %s: linje %u er for lang.\n" #: src/showconsolefont.c:33 #, c-format @@ -1676,7 +1732,8 @@ "(formentligt efter at have indlæst en skrifttype med `setfont font')\n" "\n" "Gyldige tilvalg er:\n" -" -C tty Enhed du vil læse skrifttypen fra. Standard: Aktuel Konsol-enhed (tty).\n" +" -C tty Enhed du vil læse skrifttypen fra. Standard: Aktuel Konsol-enhed " +"(tty).\n" " -v Vær mere snaksaglig.\n" " -i Udskriv ikke skrifttypetabellen, bare vis\n" " RÆKKERxKOLONNExANTAL og afslut.\n" @@ -1767,7 +1824,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "tryk en vilkårlig tast (programmet afsluttes 10 s efter sidste tastetrykning)...\n" +msgstr "" +"tryk en vilkårlig tast (programmet afsluttes 10 s efter sidste " +"tastetrykning)...\n" #: src/showkey.c:250 msgid "release" @@ -1783,30 +1842,72 @@ msgstr "tastekode %3d %s\n" #: src/totextmode.c:29 -#, fuzzy, c-format +#, c-format msgid "usage: totextmode\n" -msgstr "brug: getkeycodes\n" +msgstr "brug: totextmode\n" #: src/version.h:20 #, c-format msgid "%s from %s\n" msgstr "%s fra %s\n" -#~ msgid " use `openvt -f' to force.\n" -#~ msgstr " brug \"openvt -f\" til at gennemtvinge.\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" -#~ msgid "" -#~ "\n" -#~ "openvt: could not open %s R/W (%s)\n" -#~ msgstr "" -#~ "\n" -#~ "openvt: kunne ikke åbne %s for læsning/skrivning (%s)\n" +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" -#~ msgid "openvt: could not deallocate console %d\n" -#~ msgstr "openvt: kunne ikke deallokere konsol %d\n" +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Brug: openvt [-c vtnummer] [-f] [-l] [-u] [-s] [-v] [-w] -- kommando_linje\n" +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"ukendt argument: _%s_\n" +"\n" -#~ msgid "plus before %s ignored\n" -#~ msgstr "plus før %s ignoreret\n" +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 er konsollen og kan ikke deallokeres\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/de.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/de.gmo differ diff -Nru kbd-1.15.3/po/de.po kbd-1.15.5/po/de.po --- kbd-1.15.3/po/de.po 2011-05-14 21:13:41.000000000 +0000 +++ kbd-1.15.5/po/de.po 2012-12-01 21:41:38.000000000 +0000 @@ -3,7 +3,7 @@ # (C) 2008 Michael Schutte # This file is distributed under the same license as the kbd package. # Nils Naumann , 2002, 2004. -# Michael Schutte , 2008, 2009. +# Michael Schutte , 2008, 2009, 2011. # # Anmerkungen zur Ãœbersetzung: # - “Keymapsâ€, “Flags†und “Fonts†bleiben, wie sie sind. @@ -13,10 +13,10 @@ # - “File descriptor†wird zu „Dateideskriptor“. msgid "" msgstr "" -"Project-Id-Version: kbd 1.15.1\n" +"Project-Id-Version: kbd 1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2009-09-26 20:18+0200\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2011-05-25 19:43+0200\n" "Last-Translator: Michael Schutte \n" "Language-Team: German \n" "Language: de\n" @@ -67,7 +67,8 @@ #: src/dumpkeys.c:84 #, c-format msgid "%s: plain map not allocated? very strange ...\n" -msgstr "%s: Eine einfache Tastaturtabelle wurde nicht zugeteilt. Eigenartig ...\n" +msgstr "" +"%s: Eine einfache Tastaturtabelle wurde nicht zugeteilt. Eigenartig ...\n" #: src/dumpkeys.c:118 #, c-format @@ -247,16 +248,16 @@ msgstr "Fehler beim Ausführen von %s.\n" #: src/findfile.c:157 -#, fuzzy, c-format +#, c-format msgid "Warning: path too long: %s/%s\n" -msgstr "%s: Warnung: Die Zeile ist zu lang.\n" +msgstr "Warnung: Pfad zu lang: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Kann %s nicht öffnen.\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Konnte keinen Dateideskriptor finden, der auf die Konsole verweist.\n" @@ -274,12 +275,14 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 ist ein Fehler; für 1-88 (0x01-0x58) ist Scancode gleich Tastencode\n" +msgstr "" +"0 ist ein Fehler; für 1-88 (0x01-0x58) ist Scancode gleich Tastencode\n" #: src/getkeycodes.c:62 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "0 ist ein Fehler; für 1-%d (0x01-0x%02x) ist Scancode gleich Tastencode\n" +msgstr "" +"0 ist ein Fehler; für 1-%d (0x01-0x%02x) ist Scancode gleich Tastencode\n" #: src/getkeycodes.c:68 #, c-format @@ -314,18 +317,20 @@ " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" msgstr "" +"Verwendung: %1$s [-C GERÄT] getmode [text|graphics]\n" +" oder: %1$s [-C GERÄT] gkbmode [raw|xlate|mediumraw|unicode]\n" +" oder: %1$s [-C GERÄT] gkbmeta [metabit|escprefix]\n" +" oder: %1$s [-C GERÄT] gkbled [scrolllock|numlock|capslock]\n" #: src/kbdinfo.c:65 #, c-format msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "Fehler: Nicht genügend Argumente.\n" #: src/kbdinfo.c:124 -#, fuzzy, c-format +#, c-format msgid "Error: Unrecognized action: %s\n" -msgstr "" -"Unbekanntes Argument: _%s_\n" -"\n" +msgstr "Fehler: Unbekannte Aktion: %s\n" #: src/kbd_mode.c:20 #, c-format @@ -370,7 +375,8 @@ #: src/kbdrate.c:156 src/kbdrate.c:175 src/kbdrate.c:339 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" -msgstr "Die Wiederholrate ist auf %.1f Zeichen/s gesetzt (Verzögerung = %d ms).\n" +msgstr "" +"Die Wiederholrate ist auf %.1f Zeichen/s gesetzt (Verzögerung = %d ms).\n" #: src/kbdrate.c:267 #, c-format @@ -399,7 +405,7 @@ #: src/kdmapop.c:159 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "Seltsam... ct hat sich von %d auf %d geändert\n" #: src/kdmapop.c:185 #, c-format @@ -407,6 +413,8 @@ "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"Der Kernel scheint älter als 1.1.92 zu sein.\n" +"Es wurde keine Unicode-Tabelle geladen.\n" #: src/ksyms.c:1713 #, c-format @@ -443,36 +451,35 @@ msgid "unknown keysym '%s'\n" msgstr "Unbekanntes Tastensymbol '%s'.\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "Include-Dateien zu tief verschachtelt." -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "Wechsle zu %s.\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "Kann Include-Datei %s nicht öffnen." -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" -msgstr "" +msgstr "Dateiname zwischen Anführungszeichen erwartet" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" -msgstr "" +msgstr "Unicode-Tastensymbol nicht im zulässigen Bereich: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 -#, fuzzy +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" -msgstr "%s: Warnung: Die Zeile ist zu lang.\n" +msgstr "String zu lang" -#: loadkeys.y:90 +#: loadkeys.y:93 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -484,8 +491,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -500,6 +507,7 @@ "\n" "Gültige Optionen sind:\n" "\n" +" -a --ascii forciert Konvertierung zu ASCII\n" " -b --bkeymap schreibt eine binäre Keymap auf die Standardausgabe\n" " -c --clearcompose leert die Compose-Tabelle des Kernels\n" " -C --console=\n" @@ -507,124 +515,125 @@ " -d --default lädt \"%s\"\n" " -h --help gibt diese Hilfe aus\n" " -m --mktable schreibt eine \"defkeymap.c\" auf die Standardausgabe\n" +" -q --quiet unterdrückt die Ausgabe von Meldungen\n" " -s --clearstrings leert die String-Tabelle des Kernels\n" " -u --unicode forciert Konvertierung zu Unicode\n" " -v --verbose berichtet ausführlicher über vorgenommene Änderungen\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap mit ungültigem Index %d aufgerufen." -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "Hinzufügen von Map %d verletzt explizite keymaps-Zeile." -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey mit ungültigem Index %d aufgerufen." -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey mit ungültiger Tabelle %d aufgerufen." -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey mit ungültigem Tastencode %d aufgerufen." -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey mit ungültigem Index %d aufgerufen." -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey mit ungültiger Tabelle %d aufgerufen." -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc mit ungültiger Funktion %d aufgerufen.\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: Ãœberlauf von func_buf.\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "Ãœberlauf der Compose-Tabelle\n" -#: loadkeys.y:317 -#, fuzzy, c-format +#: loadkeys.y:320 +#, c-format msgid "%s: could not switch to Unicode mode\n" -msgstr "%s: Konnte die Konsole %d nicht freigeben.\n" +msgstr "%s: Konnte nicht in den Unicode-Modus wechseln\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Keymap %d: Zugriff verweigert.\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "Tastencode %d, Tabelle %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " FEHLGESCHLAGEN" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "Konnte der Taste %d nicht den Wert %d zuordnen.\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "Keymap %d freigeben\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: Konnte die Keymap %d nicht freigeben.\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: Kann die Keymap nicht freigeben oder leeren.\n" -#: loadkeys.y:400 -#, fuzzy, c-format +#: loadkeys.y:401 +#, c-format msgid "%s: could not return to original keyboard mode\n" -msgstr "%s: Fehler beim Einstellen des Tastaturmodus\n" +msgstr "%s: Konnte den ursprünglichen Tastaturmodus nicht wiederherstellen\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "Konnte den String '%s' nicht der Funktion %s zuordnen.\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "Das Leeren des Strings %s ist fehlgeschlagen.\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "Zu viele Compose-Definitionen.\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "Unmöglicher Fehler in do_constant." -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -633,118 +642,123 @@ "\n" "%d %s und %d %s geändert.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "Taste" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "Tasten" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "String" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "Strings" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "%d Compose-%s geladen.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "Definition" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "Definitionen" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Compose-Definitionen nicht geändert.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: Weiß nicht, wie Compose für %s funktionieren soll.\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Fehler beim Schreiben der Tabelle in die Datei.\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' ist kein Funktionstastensymbol." -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "Zu viele (%d) Einträge in einer Zeile." -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "Zu viele Tastendefinitionen in einer Zeile." -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Lade %s.\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "Syntaxfehler in Map-Datei.\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "Tastenbelegungen nicht geändert.\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" +"%s: Die Optionen --unicode und --ascii schließen sich gegenseitig aus\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: Fehler beim Einstellen des Tastaturmodus\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: Konnte Tastaturmodus nicht erkennen\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" +"%s: Warnung: lade Nicht-Unicode-Tastaturbelegung auf Unicode-Konsole\n" +" (vielleicht möchten Sie zuvor \"kbd_mode -a\" ausführen?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" +"%s: Warnung: lade Unicode-Tastaturbelegung auf Nicht-Unicode-Konsole\n" +" (vielleicht möchten Sie zuvor \"kbd_mode -u\" ausführen?)\n" -#: loadkeys.y:1157 -#, fuzzy, c-format +#: loadkeys.y:1187 +#, c-format msgid "Searching in %s\n" -msgstr "Wechsle zu %s.\n" +msgstr "Suche in %s.\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Kann %s nicht finden.\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "Kann Datei %s nicht öffnen.\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Lade %s.\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "Syntaxfehler in Map-Datei.\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "Tastenbelegungen nicht geändert.\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -776,8 +790,12 @@ #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Der Unicode-Bereich U+%x-U+%x ist nicht gleich lang wie der Font-Bereich 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Der Unicode-Bereich U+%x-U+%x ist nicht gleich lang wie der Font-Bereich " +"0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -872,7 +890,7 @@ msgstr "Speichere Bildschirmtabelle in `%s'.\n" #: src/openvt.c:44 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" "\n" @@ -880,6 +898,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -890,84 +909,90 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"Usage: %s [OPTIONEN] -- KOMMANDO\n" +"\n" +"Dieses Werkzeug erlaubt, ein Kommando auf einem neuen virtuellen Terminal\n" +"(kurz VT) auszuführen.\n" +"\n" +"Optionen:\n" +" -c, --console=NUM verwendet die angegebene VT-Nummer;\n" +" -f, --force überspringt die Verfügbarkeitsprüfung;\n" +" -l, --login macht das Kommando zu einer Login-Shell;\n" +" -u, --user übernimmt den Eigentümer des aktuellen VT;\n" +" -s, --switch wechselt zum neuen VT;\n" +" -w, --wait wartet auf die Beendigung des Kommandos;\n" +" -v, --verbose gibt ausführliche Meldungen aus;\n" +" -V, --version gibt die Programmversion aus und beendet;\n" +" -h, --help zeigt diesen Hilfetext.\n" +"\n" -#: src/openvt.c:162 -#, fuzzy +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" -msgstr "Konnte Eigentümer des aktuellen Terminals nicht finden!\n" +msgstr "Konnte Eigentümer des aktuellen Terminals nicht finden!" -#: src/openvt.c:230 -#, fuzzy, c-format +#: src/openvt.c:231 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt: %s: Ungültige VT-Nummer.\n" +msgstr "%s: Ungültige VT-Nummer" -#: src/openvt.c:256 -#, fuzzy +#: src/openvt.c:257 msgid "Only root can use the -u flag." -msgstr "openvt: Nur root darf die Option -u benutzen.\n" +msgstr "Nur root darf die Option -u benutzen." -#: src/openvt.c:278 -#, fuzzy +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" -msgstr "Konnte keinen Dateideskriptor finden, der auf die Konsole verweist.\n" +msgstr "Konnte keinen Dateideskriptor finden, der auf die Konsole verweist" -#: src/openvt.c:285 -#, fuzzy +#: src/openvt.c:286 msgid "Cannot find a free vt" -msgstr "openvt: Kann kein freies VT finden.\n" +msgstr "Kann kein freies VT finden" -#: src/openvt.c:289 -#, fuzzy, c-format +#: src/openvt.c:290 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt: Kann die Verfügbarkeit des VT %d nicht überprüfen.\n" +msgstr "Kann die Verfügbarkeit des VT %d nicht überprüfen; \"%s -f\" erzwingt." -#: src/openvt.c:293 -#, fuzzy, c-format +#: src/openvt.c:294 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt: VT %d wird bereits benutzt; das Kommando wurde abgebrochen.\n" +msgstr "VT %d wird bereits benutzt, Abbruch; \"%s -f\" erzwingt." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." -msgstr "" +msgstr "Konnte Kommando nicht finden." -#: src/openvt.c:335 -#, fuzzy +#: src/openvt.c:336 msgid "Unable to set new session" -msgstr "openvt: Kann keine neue Sitzung erzeugen (%s).\n" +msgstr "Kann keine neue Sitzung erzeugen" -#: src/openvt.c:359 -#, fuzzy, c-format +#: src/openvt.c:360 +#, c-format msgid "Unable to open %s" -msgstr "openvt: Kann %s nicht öffnen: %s\n" +msgstr "Kann %s nicht öffnen" -#: src/openvt.c:363 -#, fuzzy, c-format +#: src/openvt.c:364 +#, c-format msgid "Using VT %s" -msgstr "openvt: Benutze VT %s.\n" +msgstr "Benutze VT %s" -#: src/openvt.c:369 -#, fuzzy, c-format +#: src/openvt.c:370 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt: Kann %s nicht zum Schreiben und Lesen öffnen (%s).\n" +msgstr "Kann %s nicht zum Schreiben und Lesen öffnen" -#: src/openvt.c:380 -#, fuzzy, c-format +#: src/openvt.c:381 +#, c-format msgid "Couldn't activate vt %d" -msgstr "" -"\n" -"openvt: Kann VT %d (%s) nicht aktivieren.\n" +msgstr "Kann VT %d nicht aktivieren" -#: src/openvt.c:383 -#, fuzzy +#: src/openvt.c:384 msgid "Activation interrupted?" -msgstr "" -"\n" -"openvt: Aktivierungsvorgang unterbrochen? (%s)\n" +msgstr "Aktivierungsvorgang unterbrochen?" -#: src/openvt.c:423 -#, fuzzy, c-format +#: src/openvt.c:424 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s: Konnte die Konsole %d nicht freigeben.\n" +msgstr "Konnte die Konsole %d nicht freigeben" #: src/psffontop.c:69 #, c-format @@ -1071,8 +1096,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Zu einem Bereich von Font-Positionen sollte auch ein Unicode-Bereich existieren.\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Zu einem Bereich von Font-Positionen sollte auch ein Unicode-Bereich " +"existieren.\n" #: src/psfxtable.c:257 #, c-format @@ -1153,15 +1182,19 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: Vergessen Sie nicht, TERM zu ändern (z.B. zu con%dx%d oder linux-%dx%d).\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: Vergessen Sie nicht, TERM zu ändern (z.B. zu con%dx%d oder linux-" +"%dx%d).\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "Verwendung: resizecons SPALTENxZEILEN\n" @@ -1207,7 +1240,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1231,7 +1265,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Verwendung: setfont [Schreib-Optionen] [-] [neuer_font..] [-m Konsolen-Map] [-u Unicode-Map]\n" +"Verwendung: setfont [Schreib-Optionen] [-] [neuer_font..] [-m Konsolen-" +"Map] [-u Unicode-Map]\n" " Schreib-Optionen (werden vor dem Laden von Dateien aktiviert):\n" " -o \tSchreibe den aktuellen Font nach .\n" " -O \tSchreibe zusätzlich die Unicode-Map nach .\n" @@ -1243,7 +1278,8 @@ " setfont - Lade Font \"default8x[.gz]\"\n" "Die Option - wählt einen Font aus einer Codepage die drei Fonts enthält:\n" " setfont -{8|14|16} codepage.cp[.gz] Lade 8x Font aus codepage.cp\n" -"Explizit (mit -m or -u) oder implizit (in der Fontdatei) gegebene Zuordnungen\n" +"Explizit (mit -m or -u) oder implizit (in der Fontdatei) gegebene " +"Zuordnungen\n" "werden geladen und, im Fall von Konsolen-Maps, aktiviert.\n" " -h (ohne Leerzeichen) Ãœberschreibe Fonthöhe.\n" " -m Lade Konsolen-Map.\n" @@ -1262,8 +1298,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: Kann den Font nicht zugleich von ROM und Datei wiederherstellen. Vorgang abgebrochen.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: Kann den Font nicht zugleich von ROM und Datei wiederherstellen. " +"Vorgang abgebrochen.\n" #: src/setfont.c:259 #, c-format @@ -1328,7 +1368,8 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Gleichzeitig geladene Fonts müssen im PSF Format sein - %s ist es nicht.\n" +msgstr "" +"Gleichzeitig geladene Fonts müssen im PSF Format sein - %s ist es nicht.\n" #: src/setfont.c:435 #, c-format @@ -1338,12 +1379,14 @@ #: src/setfont.c:441 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Wenn mehrere Fonts geladen werden, müssen sie die gleiche Höhe haben.\n" +msgstr "" +"Wenn mehrere Fonts geladen werden, müssen sie die gleiche Höhe haben.\n" #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Wenn mehrere Fonts geladen werden, müssen alle die gleiche Breite haben.\n" +msgstr "" +"Wenn mehrere Fonts geladen werden, müssen alle die gleiche Breite haben.\n" #: src/setfont.c:487 #, c-format @@ -1392,7 +1435,9 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Die Zeichengröße %d wurde verlangt, es sind aber nur 8, 14 und 16 verfügbar.\n" +msgstr "" +"Die Zeichengröße %d wurde verlangt, es sind aber nur 8, 14 und 16 " +"verfügbar.\n" #: src/setfont.c:673 #, c-format @@ -1479,8 +1524,10 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Fehler beim Lesen der Flags. Befinden Sie sich wirklich auf der Konsole?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Fehler beim Lesen der Flags. Befinden Sie sich wirklich auf der Konsole?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1626,31 +1673,43 @@ "and then edit the values in FILE.\n" "\n" msgstr "" +"Verwendung: %s vga|DATEI|-\n" +"\n" +"Wenn Sie eine DATEI angeben, sollte sie aus genau drei Zeilen mit\n" +"Komma-getrennten Werten für ROT, GRÃœN und BLAU bestehen.\n" +"\n" +"Um eine Vorlage für eine solche Datei zu erhalten:\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > DATEI\n" +"\n" +"Dann können Sie DATEI nach Ihren Vorstellungen bearbeiten.\n" +"\n" #: src/setvtrgb.c:85 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "Fehler: %s: Ungültiger Wert im Feld %u in Zeile %u." #: src/setvtrgb.c:92 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "Fehler: %s: Nicht genügend Felder in Zeile %u." #: src/setvtrgb.c:98 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "Fehler: %s: Zeile %u endet unerwartet.\n" #: src/setvtrgb.c:102 -#, fuzzy, c-format +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s: %s: Warnung: Die Zeile ist zu lang.\n" +msgstr "Fehler: %s: Die Zeile %u ist zu lang.\n" #: src/showconsolefont.c:33 #, c-format msgid "failed to restore original translation table\n" -msgstr "Das Wiederherstellen der ursprünglichen Ãœbersetzungstabelle ist fehlgeschlagen.\n" +msgstr "" +"Das Wiederherstellen der ursprünglichen Ãœbersetzungstabelle ist " +"fehlgeschlagen.\n" #: src/showconsolefont.c:38 #, c-format @@ -1778,7 +1837,8 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "Drücken Sie eine Taste (Programmende 10 s nach dem letzten Tastendruck)...\n" +msgstr "" +"Drücken Sie eine Taste (Programmende 10 s nach dem letzten Tastendruck)...\n" #: src/showkey.c:250 msgid "release" @@ -1794,30 +1854,72 @@ msgstr "Tastencode %3d %s\n" #: src/totextmode.c:29 -#, fuzzy, c-format +#, c-format msgid "usage: totextmode\n" -msgstr "Verwendung: getkeycodes\n" +msgstr "Verwendung: totextmode\n" #: src/version.h:20 #, c-format msgid "%s from %s\n" msgstr "%s von %s\n" -#~ msgid "loadkeys: error reading keyboard mode\n" -#~ msgstr "loadkeys: Fehler beim Lesen des Tastaturmodus.\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" -#~ msgid " use `openvt -f' to force.\n" -#~ msgstr " Benutzen Sie \"openvt -f\", um die Aktion zu erzwingen.\n" +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" -#~ msgid "" -#~ "\n" -#~ "openvt: could not open %s R/W (%s)\n" -#~ msgstr "" -#~ "\n" -#~ "openvt: Kann %s nicht mit Schreib- und Leserecht öffnen (%s).\n" +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" -#~ msgid "openvt: could not deallocate console %d\n" -#~ msgstr "openvt: Kann die Konsole %d nicht freigeben.\n" +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"Unbekanntes Argument: _%s_\n" +"\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Verwendung: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- Kommandozeile\n" +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 ist die Konsole und kann deshalb nicht freigegeben werden.\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/el.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/el.gmo differ diff -Nru kbd-1.15.3/po/el.po kbd-1.15.5/po/el.po --- kbd-1.15.3/po/el.po 2011-05-14 21:13:33.000000000 +0000 +++ kbd-1.15.5/po/el.po 2012-12-01 21:41:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kbd-1.15\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2008-11-29 22:07+0300\n" "Last-Translator: Lefteris Dimitroulakis \n" "Language-Team: Greek \n" @@ -69,7 +69,9 @@ #: src/dumpkeys.c:272 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" -msgstr "πεÏιοχή των κωδικών πλήκτÏων που υποστηÏίζεται απο τον πυÏήνα: 1 - %d\n" +msgstr "" +"πεÏιοχή των κωδικών πλήκτÏων που υποστηÏίζεται απο τον πυÏήνα: 1 - " +"%d\n" #: src/dumpkeys.c:274 #, c-format @@ -191,9 +193,11 @@ "\t-l --long-info\t εμφάνιση των παÏαπάνω πληÏοφοÏιών\n" " και συμβόλων γνωστών στο loadkeys\n" "\t-n --numeric\t εμφάνιση keytable σε δεκαεξαδική μοÏφή\n" -"\t-f --full-table\t μη χÏήση συντομογÏαφίας αλλά μιάς αÏάδας ανά κωδικό πλήκτÏου\n" +"\t-f --full-table\t μη χÏήση συντομογÏαφίας αλλά μιάς αÏάδας ανά κωδικό " +"πλήκτÏου\n" "\t-1 --separate-lines μία γÏαμμή ανά ζεÏγος (μετατÏοπέα, κωδικό πλήκτÏου)\n" -"\t --funcs-only\t εμφάνιση μόνο των συμβολοσειÏών των πλήκτÏων λειτουÏγιών\n" +"\t --funcs-only\t εμφάνιση μόνο των συμβολοσειÏών των πλήκτÏων " +"λειτουÏγιών\n" "\t --keys-only\t εμφάνιση μόνο συνδέσμων των πλήκτÏων\n" "\t --compose-only εμφάνιση μόνο των συνδιασμών compose των πλήκτÏων\n" "\t-c --charset=" @@ -244,12 +248,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: ΠÏοειδοποίηση: γÏαμμή Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î·\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Αδυνατώ ν' ανοίξω το %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Δέν μποÏÏŽ να λάβω πεÏιγÏαφέα αÏχείου Ï€Î¿Ï Î±Ï†Î¿Ïά την κονσόλα\n" @@ -262,17 +266,21 @@ #: src/getkeycodes.c:56 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" -msgstr "Απλοί κωδικοί σάÏωσης xx (hex) και οι αντίστοιχοι κωδικοί πλήκτÏων (dec)\n" +msgstr "" +"Απλοί κωδικοί σάÏωσης xx (hex) και οι αντίστοιχοι κωδικοί πλήκτÏων (dec)\n" #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 είναι ένα σφάλμα, γιά 1-88 (0x01-0x58) ο κωδικός σάÏωσης ισοÏται με τον κωδικό πλήκτÏου\n" +msgstr "" +"0 είναι ένα σφάλμα, γιά 1-88 (0x01-0x58) ο κωδικός σάÏωσης ισοÏται με τον " +"κωδικό πλήκτÏου\n" #: src/getkeycodes.c:62 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "για 1-%d (0x01-0x%02x) ο κωδικός σάÏωσης ισοÏται με τον κωδικό πλήκτÏου\n" +msgstr "" +"για 1-%d (0x01-0x%02x) ο κωδικός σάÏωσης ισοÏται με τον κωδικό πλήκτÏου\n" #: src/getkeycodes.c:68 #, c-format @@ -436,36 +444,36 @@ msgid "unknown keysym '%s'\n" msgstr "άγνωστο keysym «%s»\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "τα includes είναι πάÏα Ï€Î¿Î»Ï Î²Î±Î¸Î¹Î¬ φωλιασμένα" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "αλλαγή σε %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "αδυναμία ανοίγματος του αÏχείου include %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: ΠÏοειδοποίηση: γÏαμμή Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î·\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -477,8 +485,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -504,120 +512,120 @@ " -u --unicode μετατÏοπή σε Unicode\n" " -v --verbose αναφέÏει τις αλλαγές\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "η addmap κλήθηκε με λάθος index %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "η Ï€Ïοσθήκη map %d παÏαβιάζει υπάÏχουσα σαφή αντιστοίχιση πλήκτÏων" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "η killkey κλήθηκε με λάθος index %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "η killkey κλήθηκε με λάθος πίνακα %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "η addkey κλήθηκε με λάθος κωδικό πλήκτÏου %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "η addkey κλήθηκε με λάθος index %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "η addkey κλήθηκε με λάθος πίνακα %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s:η addfunc κλήθηκε με λάθος %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc:Ï…Ï€Ïχείλιση func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "υπεÏχείλιση πίνακα compose\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Keymap %d: ΆÏνηση αδείας\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "κωδικός πλήκτÏου %d, πίνακας %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " FAILED" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "αποτυχία απόδωσης στο πλήκτÏο %d της τιμής %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "αποδέσμευση keymap %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: αδυναμία αποδέσμευσης keymap %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: αδυναμία αποδέσμευσης ή καθαÏÎ¹ÏƒÎ¼Î¿Ï keymap\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: αποτυχία αποκατάστασης keyboard mode\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "αποτυχία σÏνδεσης συμβολοσειÏάς «%s» με τη συνάÏτηση %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "αποτυχία καθαÏÎ¹ÏƒÎ¼Î¿Ï ÏƒÏ…Î¼Î²Î¿Î»Î¿ÏƒÎµÎ¹Ïάς %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "πάÏα πολλοί οÏισμοί compose\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "αδÏνατο σφάλμα σε do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -626,122 +634,124 @@ "\n" "Άλλαξαν %d %s και %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "πλήκτÏο" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "πλήκτÏα" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "συμβολοσειÏά" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "συμβολοσειÏές" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "ΦοÏτώθηκε %d compose %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "οÏισμός" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "οÏισμοί" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Ουδεμία αλλαγή στους οÏισμοÏÏ‚ compose.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: δεν ξέÏω πώς να κάνω compose για το %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Σφάλμα εγγÏαφής του πίνακα απεικόνισης στο αÏχείο\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "«%s» δεν αποτελεί σÏμβολο πλήκτÏου Fn" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "πάÏα πολλά (%d) δεδομένα σε μια μόνο γÏαμμή" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "πάÏα πολλοί οÏισμοί πλήκτÏου σε μια γÏαμμή" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "ΦόÏτωση %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "συντακτικό σφάλμα στο αÏχείο map\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "η αντιστοίχηση πλήκτÏων δεν άλλαξε\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: σφάλμα κατά τον οÏισμό της κατάστασης πληκτÏολογίου\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, fuzzy, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -"%s: Ï€Ïοειδοποίηση: αυτή εδώ η αντιστοίχηση χÏησιμοποιεί σÏμβολα Unicode, %s mode=%d\n" +"%s: Ï€Ïοειδοποίηση: αυτή εδώ η αντιστοίχηση χÏησιμοποιεί σÏμβολα Unicode, %s " +"mode=%d\n" " (μήπως θέλεις να δώσεις `kbd_mode -u';)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, fuzzy, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -"%s: Ï€Ïοειδοποίηση: αυτή εδώ η αντιστοίχηση χÏησιμοποιεί σÏμβολα Unicode, %s mode=%d\n" +"%s: Ï€Ïοειδοποίηση: αυτή εδώ η αντιστοίχηση χÏησιμοποιεί σÏμβολα Unicode, %s " +"mode=%d\n" " (μήπως θέλεις να δώσεις `kbd_mode -u';)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "αλλαγή σε %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Αδυναμία εÏÏεσης %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "Αδυνατώ ν' ανοίξω το αÏχείο %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "ΦόÏτωση %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "συντακτικό σφάλμα στο αÏχείο map\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "η αντιστοίχηση πλήκτÏων δεν άλλαξε\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -759,7 +769,8 @@ #: src/loadunimap.c:195 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s: ΑÏιθμός γλÏφου (0x%x) μεγαλÏτεÏος απ' το μήκος της γÏαμματοσειÏάς\n" +msgstr "" +"%s: ΑÏιθμός γλÏφου (0x%x) μεγαλÏτεÏος απ' το μήκος της γÏαμματοσειÏάς\n" #: src/loadunimap.c:201 #, c-format @@ -769,12 +780,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Εσφαλμένη πεÏιοχή Unicode Ï€Î¿Ï Î±Î½Ï„Î¹ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯ στη πεÏιοχή θέσεων 0x%x-0x%xτης γÏαμματοσειÏάς.\n" +msgstr "" +"%s: Εσφαλμένη πεÏιοχή Unicode Ï€Î¿Ï Î±Î½Ï„Î¹ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯ στη πεÏιοχή θέσεων 0x%x-0x" +"%xτης γÏαμματοσειÏάς.\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: πεÏιοχή Unicode U+%x-U+%x όχι του ιδίου μήκους με την πεÏιοχή θέσεων 0x%x-0x%x της γÏαμματοσειÏάς\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: πεÏιοχή Unicode U+%x-U+%x όχι του ιδίου μήκους με την πεÏιοχή θέσεων 0x" +"%x-0x%x της γÏαμματοσειÏάς\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -836,7 +853,9 @@ #: src/mapscrn.c:144 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "ΦόÏτωση δυαδικής απεικόνισης της οθόνης απευθείας-στη-γÏαμματοσειÏά από το αÏχείο %s\n" +msgstr "" +"ΦόÏτωση δυαδικής απεικόνισης της οθόνης απευθείας-στη-γÏαμματοσειÏά από το " +"αÏχείο %s\n" #: src/mapscrn.c:149 src/mapscrn.c:160 #, c-format @@ -856,7 +875,9 @@ #: src/mapscrn.c:171 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" -msgstr "Σφάλμα κατά τη γÏαμματοσυντακτική ανάλυσητου πίνακα απεικόνισης συμβόλων από «%s», γÏαμμή %d\n" +msgstr "" +"Σφάλμα κατά τη γÏαμματοσυντακτική ανάλυσητου πίνακα απεικόνισης συμβόλων από " +"«%s», γÏαμμή %d\n" #: src/mapscrn.c:284 #, c-format @@ -877,6 +898,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -888,80 +910,80 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 #, fuzzy msgid "Couldn't find owner of current tty!" msgstr "Δεν μπόÏεσα να βÏω τον ιδιοκτήτη του Ï„Ïέχοντος tty!\n" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: παÏάτυπος αÏιθμός vt\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: μόνο ο root μποÏεί να χÏησιμοποιήσει τη σημαία -u.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" msgstr "Δέν μποÏÏŽ να λάβω πεÏιγÏαφέα αÏχείου Ï€Î¿Ï Î±Ï†Î¿Ïά την κονσόλα\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: δεν μποÏÏŽ να βÏÏŽ ένα ελεÏθεÏο vt\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: αδÏνατος ο έλεγχος άν vt %d ειναι ελεÏθεÏο\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d εν χÏήσει, εκτέλεση διαταγής ματαιώθηκε\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: ΑδÏνατον το άνοιγμα νέας συνόδου (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Δεν μποÏÏŽ ν' ανοίξω το %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: χÏησιμοποίηση VT %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Δεν μποÏÏŽ ν' ανοίξω το %s σε ανάγνωση/εγγÏαφή (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, fuzzy, c-format msgid "Couldn't activate vt %d" msgstr "" "\n" "openvt: αδυναμία ενεÏγοποίησης vt %d (%s)\n" -#: src/openvt.c:383 +#: src/openvt.c:384 #, fuzzy msgid "Activation interrupted?" msgstr "" "\n" "openvt: η ενεÏγοποίηση διακόπηκε; (%s)\n" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" @@ -1068,8 +1090,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Θα Ï€Ïέπει να υπάÏχει μιά πεÏιοχή UnicodeÏ€Î¿Ï Î½Î± αντιστοιχεί στη πεÏιοχή θέσεων της γÏαμματοσειÏάς\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Θα Ï€Ïέπει να υπάÏχει μιά πεÏιοχή UnicodeÏ€Î¿Ï Î½Î± αντιστοιχεί στη πεÏιοχή " +"θέσεων της γÏαμματοσειÏάς\n" #: src/psfxtable.c:257 #, c-format @@ -1149,19 +1175,23 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: μή ξεχνάτε την αλλαγή του TERM (ίσως σε con%dx%d ή linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: μή ξεχνάτε την αλλαγή του TERM (ίσως σε con%dx%d ή linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "η κλήση είναι: resizecons COLSxROWS ή: resizecons COLS ROWS\n" -"ή: resizecons -lines ROWS, με ROWS μία από 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"ή: resizecons -lines ROWS, με ROWS μία από 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" #: src/resizecons.c:376 #, c-format @@ -1181,7 +1211,8 @@ #: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" -msgstr "αδυναμία ανάγνωσης του %s, και δεν μποÏÏŽ να το εμφανίσω με την ioctl()\n" +msgstr "" +"αδυναμία ανάγνωσης του %s, και δεν μποÏÏŽ να το εμφανίσω με την ioctl()\n" #: src/screendump.c:133 #, c-format @@ -1201,7 +1232,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1225,10 +1257,12 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"ΧÏήση: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"ΧÏήση: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " Οι επιλογές-εγγÏαφής (Ï€ÏοηγοÏνται της φόÏτωσης του αÏχείου):\n" " -o <αÏχείο> ΕγγÏαφή Ï„Ïέχουσας γÏαμμ/σειÏάς στο <αÏχείο>\n" -" -O <αÏχείο> ΕγγÏαφή Ï„Ïέχουσας γÏαμμ/σειÏάς καί unicode map στο <αÏχείο>\n" +" -O <αÏχείο> ΕγγÏαφή Ï„Ïέχουσας γÏαμμ/σειÏάς καί unicode map στο " +"<αÏχείο>\n" " -om <αÏχείο> ΕγγÏαφή Ï„Ïέχουσας consolemap στο <αÏχείο>\n" " -ou <αÏχείο> ΕγγÏαφή Ï„Ïέχουσας unicodemap στο <αÏχείο>\n" "Αν δεν δίνεται νέα γÏαμμ/σειÏά και ουδεμία επιλογή -[o|O|om|ou|m|u],\n" @@ -1237,8 +1271,10 @@ " setfont - ΦόÏτωση γÏαμμ/σειÏάς \"default8x[.gz]\"\n" "Η - επιλογή επιλέγει μιά γÏαμμ/σειÏά από μιά κωδικοσελίδα\n" "Ï€Î¿Ï Ï€ÎµÏιέχει Ï„Ïείς γÏαμμ/σειÏές:\n" -" setfont -{8|14|16} codepage.cp[.gz] ΦόÏτωση γÏαμμ/σειÏάς 8x από την codepage.cp\n" -"Ρητώς (με -m ή -u) ή εμμέσως (στο αÏχείο γÏαμμ/σειÏάς) οι δεδομένες απεικονίσεις\n" +" setfont -{8|14|16} codepage.cp[.gz] ΦόÏτωση γÏαμμ/σειÏάς 8x από την " +"codepage.cp\n" +"Ρητώς (με -m ή -u) ή εμμέσως (στο αÏχείο γÏαμμ/σειÏάς) οι δεδομένες " +"απεικονίσεις\n" "θα φοÏτωθοÏν και, στη πεÏίπτωση των consolemaps, θα ενεÏγοποιηθοÏν.\n" " -h (χωÏίς διάστημα) ΠαÏάκαμψη Ïψους γÏαμμ/σειÏάς.\n" " -m ΦόÏτωση screen map της κονσόλας.\n" @@ -1257,8 +1293,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: αδÏνατη επαναφοÏά από τη ROM χαÏακτήÏων και απο αÏχείο συγχÏόνως. Η γÏαμματοσειÏά παÏαμένει αμετάβλητη.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: αδÏνατη επαναφοÏά από τη ROM χαÏακτήÏων και απο αÏχείο συγχÏόνως. Η " +"γÏαμματοσειÏά παÏαμένει αμετάβλητη.\n" #: src/setfont.c:259 #, c-format @@ -1323,7 +1363,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Κατά τη φόÏτωση διαφόÏων γÏαμμ/σειÏών, όλες Ï€Ïέπει να είναι psf - %s δεν είναι\n" +msgstr "" +"Κατά τη φόÏτωση διαφόÏων γÏαμμ/σειÏών, όλες Ï€Ïέπει να είναι psf - %s δεν " +"είναι\n" #: src/setfont.c:435 #, c-format @@ -1333,12 +1375,14 @@ #: src/setfont.c:441 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Κατά τη φόÏτωση πολλών γÏαμματοσειÏών, όλες Ï€Ïέπει να έχουν το ίδιο Ïψος\n" +msgstr "" +"Κατά τη φόÏτωση πολλών γÏαμματοσειÏών, όλες Ï€Ïέπει να έχουν το ίδιο Ïψος\n" #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Κατά τη φόÏτωση πολλών γÏαμματοσειÏών, όλες Ï€Ïέπει να έχουν ίδιο πλάτος\n" +msgstr "" +"Κατά τη φόÏτωση πολλών γÏαμματοσειÏών, όλες Ï€Ïέπει να έχουν ίδιο πλάτος\n" #: src/setfont.c:487 #, c-format @@ -1474,8 +1518,10 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Σφάλμα ανάγνωσης Ï„Ïέχουσας ÏÏθμισης σημαιών. Μήπως δεν είστε στην κονσόλα;\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Σφάλμα ανάγνωσης Ï„Ïέχουσας ÏÏθμισης σημαιών. Μήπως δεν είστε στην κονσόλα;\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1678,7 +1724,8 @@ "(πιθανώς μετά από φόÏτωμα γÏαμματοσειÏάς με `setfont font')\n" "\n" "ΈγκυÏες επιλογές είναι:\n" -" -C tty Συσκευή από την οποία διαβάζεται η γÏαμ/Ïα. ΠÏοεπιλογή: Ï„Ïέχον tty.\n" +" -C tty Συσκευή από την οποία διαβάζεται η γÏαμ/Ïα. ΠÏοεπιλογή: Ï„Ïέχον " +"tty.\n" " -v Με πεÏισσότεÏα λόγια.\n" " -i Don't print out the font table, just show\n" " ROWSxCOLSxCOUNT κι έξοδος.\n" @@ -1753,7 +1800,8 @@ "\t-h --help\tεμφάνιση Î±Ï…Ï„Î¿Ï ÎµÎ´ÏŽ του κειμένου βοήθειας\n" "\t-a --ascii\tεμφάνιση δεκαδικών/οκταδικών/εξαδικών τιμών των πλήκτÏων\n" "\t-s --scancodes\tεμφάνιση μόνον των ακατέÏγαστων κωδικών σάÏωσης\n" -"\t-k --keycodes\tεμφάνιση μόνον των διεÏμηνευμένων κωδικών πλήκτÏων (Ï€Ïοεπιλογή)\n" +"\t-k --keycodes\tεμφάνιση μόνον των διεÏμηνευμένων κωδικών πλήκτÏων " +"(Ï€Ïοεπιλογή)\n" #: src/showkey.c:157 #, c-format @@ -1769,7 +1817,8 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "πατήστε ένα πλήκτÏο (το Ï€ÏόγÏαμμα τεÏματίζεται 10s μετά τελευταίο πάτημα)..\n" +msgstr "" +"πατήστε ένα πλήκτÏο (το Ï€ÏόγÏαμμα τεÏματίζεται 10s μετά τελευταίο πάτημα)..\n" #: src/showkey.c:250 msgid "release" @@ -1794,6 +1843,67 @@ msgid "%s from %s\n" msgstr "%s από %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"μη αναγνωÏισμένα ÏŒÏισμα: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 είναι η κονσόλα και δεν μποÏεί ν' αποδεσμευτεί\n" + #~ msgid "plus before %s ignored\n" #~ msgstr "σÏν Ï€Ïίν το %s αγνοήθηκε\n" @@ -1810,5 +1920,9 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: δεν μποÏÏŽ ν' αποδεσμεÏσω την κονσόλα %d\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "ΧÏήση: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" +#~ msgstr "" +#~ "ΧÏήση: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/eo.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/eo.gmo differ diff -Nru kbd-1.15.3/po/eo.po kbd-1.15.5/po/eo.po --- kbd-1.15.3/po/eo.po 2011-05-14 21:06:22.000000000 +0000 +++ kbd-1.15.5/po/eo.po 2012-12-01 21:41:38.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kbd 1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2011-05-11 21:02-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -189,7 +189,8 @@ "\n" "\t-h --help\t montri tiun ĉi helpo-tekston\n" "\t-i --short-info\t montri informon pri la klavar-pelilo\n" -"\t-l --long-info\t montri --short-info plus simbolojn konatajn de loadkeys\n" +"\t-l --long-info\t montri --short-info plus simbolojn konatajn de " +"loadkeys\n" "\t-n --numeric\t montri klavtabelon laÅ­ sesdekuma nombrosistemo\n" "\t-f --full-table\t ne uzi mallongigojn, po unu linio por klavkodo\n" "\t-1 --separate-lines po unu linio por (modifilo,klavkodo) paro\n" @@ -244,12 +245,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "Averto: vojo tro longa: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Ni ne povis malfermi %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Ni ne povis preni dosier-priskriblon rilatanta al la konzolo\n" @@ -440,36 +441,36 @@ msgid "unknown keysym '%s'\n" msgstr "nekonata klavsimbolo '%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "inkluzivoj estas ingitaj tro profunde" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "Åaltado al %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "ne malfermeblas la inkluziv-dosiero %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "atendite dosiernomo inter citiloj" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "unikoda klavsimbolo for de rango: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" msgstr "ĉeno tro longa" -#: loadkeys.y:90 -#, c-format +#: loadkeys.y:93 +#, fuzzy, c-format msgid "" "loadkeys version %s\n" "\n" @@ -480,8 +481,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -509,120 +510,120 @@ " -u --unicode devigi konvertadon al Unikodo\n" " -v --verbose listigi la ÅanÄojn\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap vokita kun malÄusta indico %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "aldonado de la mapo %d malrespektas linion de keymaps" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey vokita kun malÄusta indico %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey vokita kun malÄusta tabelo %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey vokita kun malÄusta klavkodo %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey vokita kun malÄusta indico %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey vokita kun malÄusta tabelo %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc vokita kun malÄusta func %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: func_buf troiÄo\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "troiÄo en kunmeta tabelo\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: ne povis Åalti al Unikoda reÄimo\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Klavmapo %d: Permeso neita\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "klavkodo %d, tabelo %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " MALSUKCESIS" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "malsukcesis ligi klavon %d al valoro %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "liberigi klavmapon %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: ne povis liberigi klavmapon %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: ne povas liberigi aÅ­ forviÅi klavmapon\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: ne povis retroiri al la originala klavar-reÄimo\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "malsukcesis ligi ĉenon '%s' al funkcio %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "malsukcesis forviÅi ĉenon %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "tro da kunmetaj difinoj\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "malebla eraro en do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -631,75 +632,90 @@ "\n" "ÅœanÄis %d %s kaj %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "klavo" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "klavoj" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "ĉeno" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "ĉenoj" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Åœargite %d kunmetaj %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "difino" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "difinoj" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Neniu ÅanÄo en kunmetaj difinoj.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: ne scias kiel kunmeti, por %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Eraro dum skribo de mapo al dosiero\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' ne estas simbolo de funkcia klavo" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "tro da (%d) enigoj en unu linio" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "tro da klav-difinoj en unu linio" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Åœargado je %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "sintaksa eraro en map-dosiero\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "klav-ligoj ne ÅanÄitaj\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Elektoj --unicode kaj --ascii estas reciproke malkunigeblaj\n" -#: loadkeys.y:1123 -#, c-format -msgid "%s: error reading keyboard mode\n" +#: loadkeys.y:1158 +#, fuzzy, c-format +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: eraro dum legado de la klavar-reÄimo\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -708,7 +724,7 @@ "%s: averto: Åargado je ne-Unikoda klavmapo ĉe Unikoda konzolo\n" " (eble vi volas fari `kbd_mode -a'?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -717,36 +733,21 @@ "%s: averto: Åargado je Unikoda klavmapo al ne-Unikoda konzolo\n" " (eble vi volas fari `kbd_mode -u'?)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, c-format msgid "Searching in %s\n" msgstr "Serĉanta en %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Ni ne povas trovi %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "ne malfermeblas la dosiero %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Åœargado je %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "sintaksa eraro en map-dosiero\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "klav-ligoj ne ÅanÄitaj\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -774,12 +775,17 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: MalÄusta Unikoda rango koresponda al pozicia rango de tiparo 0x%x-0x%x\n" +msgstr "" +"%s: MalÄusta Unikoda rango koresponda al pozicia rango de tiparo 0x%x-0x%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Unikoda rango U+%x-U+%x ne longas same ol pozicia rango de fonto 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Unikoda rango U+%x-U+%x ne longas same ol pozicia rango de fonto 0x%x-0x" +"%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -874,7 +880,7 @@ msgstr "Ekran-mapo konservita en '%s'\n" #: src/openvt.c:44 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" "\n" @@ -882,6 +888,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -908,70 +915,70 @@ " -h, --help eligi mallongan help-mesaÄon.\n" "\n" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "Ne povis trovi la posedanton de la aktuala tty!" -#: src/openvt.c:230 +#: src/openvt.c:231 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Malpermesata numero de vt" -#: src/openvt.c:256 +#: src/openvt.c:257 msgid "Only root can use the -u flag." msgstr "Nur root povas uzi la flagon -u." -#: src/openvt.c:278 +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" msgstr "Ni ne povis preni dosier-priskribilon rilatanta al la konzolo" -#: src/openvt.c:285 +#: src/openvt.c:286 msgid "Cannot find a free vt" msgstr "Ne povas trovi liberan vt" -#: src/openvt.c:289 +#: src/openvt.c:290 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "Ne povas kontroli ĉu vt %d estas libera; uzu '%s - f' por perforti." -#: src/openvt.c:293 +#: src/openvt.c:294 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "vt %d estas uzata; komando ĉesigita; uzu '%s -f' por perforti." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "Ne eblas trovi la komandon." -#: src/openvt.c:335 +#: src/openvt.c:336 msgid "Unable to set new session" msgstr "Ne eblas ekigi novan seancon" -#: src/openvt.c:359 +#: src/openvt.c:360 #, c-format msgid "Unable to open %s" msgstr "Ne eblas malfermi %s" -#: src/openvt.c:363 +#: src/openvt.c:364 #, c-format msgid "Using VT %s" msgstr "Ni uzadas VT %s" -#: src/openvt.c:369 +#: src/openvt.c:370 #, c-format msgid "Cannot open %s read/write" msgstr "Ne povas malfermi %s lege/skribe" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "Ne povis aktivigi vt %d" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "Ĉu aktivigo interrompita?" -#: src/openvt.c:423 +#: src/openvt.c:424 #, c-format msgid "Couldn't deallocate console %d" msgstr "Ni ne povis liberigi la konzolon %d" @@ -1078,7 +1085,9 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" msgstr "%s: Korespone al rango de tipar-pozicioj, devus esti Unikoda rango\n" #: src/psfxtable.c:257 @@ -1159,7 +1168,8 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" msgstr "resizecons: ne forgesu ÅanÄi TERM (eble al con%dx%d aÅ­ linux-%dx%d)\n" #: src/resizecons.c:338 @@ -1167,11 +1177,13 @@ msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "alvoko estas: resizecons KOLxLIN aÅ­: resizecons KOL LIN\n" -"aÅ­: resizecons -lines LIN, kie LIN estu unu el 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"aÅ­: resizecons -lines LIN, kie LIN estu unu el 25, 28, 30, 34, 36, 40, 44, " +"50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1211,7 +1223,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1235,10 +1248,12 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Uzado: setfont [skrib-elektebloj] [-] [novtiparo..] [-m konzolmapo] [-u unikodmapo]\n" +"Uzado: setfont [skrib-elektebloj] [-] [novtiparo..] [-m konzolmapo] [-u " +"unikodmapo]\n" " skrib-elektebloj (okazas antaÅ­ ol Åargado je dosiero):\n" " -o Skribi aktualan tiparon al \n" -" -O Skribi aktualan tiparon kaj unikod-mapon al \n" +" -O Skribi aktualan tiparon kaj unikod-mapon al " +"\n" " -om Skribi aktualan konzol-mapon al \n" " -ou Skribi aktualan unikod-mapon al \n" "Se neniu novtiparo kaj neniu elekteblo -[o|O|om|ou|m|u] estos indikitaj,\n" @@ -1246,7 +1261,8 @@ " setfont Åœargi je tiparo \"default[.gz]\"\n" " setfont - Åœargi je tiparo \"default8x[.gz]\"\n" "La elekteblon - prenas tiparon el kodpaÄo, kiu enhavas tri tiparojn:\n" -" setfont -{8|14|16} codepage.cp[.gz] Åœargi je tiparo 8x el codepage.cp\n" +" setfont -{8|14|16} codepage.cp[.gz] Åœargi je tiparo 8x el codepage." +"cp\n" "Malimplice (kun -m aÅ­ -u) aÅ­ implice (en la tipardosiero) indikitaj mapigoj\n" "estos Åargataj kaj, okaze de konzolmapoj, aktivataj.\n" " -h (sen spaco) Preterpasi tiparan alton.\n" @@ -1266,8 +1282,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: ne povas kaj restarigi el signeca ROM kaj el dosiero. Tiparo neÅanÄita.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: ne povas kaj restarigi el signeca ROM kaj el dosiero. Tiparo " +"neÅanÄita.\n" #: src/setfont.c:259 #, c-format @@ -1480,7 +1500,8 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" msgstr "Eraro dum legado de aktuala flag-stato. Eble vi ne estas ĉe konzolo?\n" #: src/setleds.c:125 src/setleds.c:146 @@ -1810,6 +1831,67 @@ msgid "%s from %s\n" msgstr "%s el %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"nerekonita argumento: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 estas la konzolo kaj ne povas esti liberigata\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " uzu `openvt -f' por devigi.\n" @@ -1823,5 +1905,9 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: ne povis liberigi konzolon %d\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Uzado: openvt [-c vtnumero] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" +#~ msgstr "" +#~ "Uzado: openvt [-c vtnumero] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/es.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/es.gmo differ diff -Nru kbd-1.15.3/po/es.po kbd-1.15.5/po/es.po --- kbd-1.15.3/po/es.po 2011-05-14 21:12:49.000000000 +0000 +++ kbd-1.15.5/po/es.po 2012-12-03 06:35:17.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd-1.14.1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2008-05-14 23:48+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Spanish \n" @@ -30,7 +30,8 @@ #: src/deallocvt.c:45 #, c-format msgid "%s: deallocating all unused consoles failed\n" -msgstr "%s: fallo en el proceso de liberación de todas las consolas no usadas\n" +msgstr "" +"%s: fallo en el proceso de liberación de todas las consolas no usadas\n" #: src/deallocvt.c:53 #, c-format @@ -191,7 +192,8 @@ " -i --short-info mostrar información sobre el controlador de teclado\n" " -l --long-info mostrar además los símbolos que loadkeys reconoce\n" " -n --numeric mostrar la tabla de teclas en notación hexadecimal\n" -" -f --full-table no usar notación abreviada, una fila por código de tecla\n" +" -f --full-table no usar notación abreviada, una fila por código de " +"tecla\n" " -1 --separate-lines una línea por par (modificador, código de tecla)\n" " --funcs-only mostrar sólo la cadenas de las teclas de función\n" " --keys-only mostrar sólo las asociaciones de teclas\n" @@ -228,7 +230,8 @@ "\n" " -h --help mostrar este texto de ayuda\n" " -V --version mostrar la versión del programa\n" -" -n --next-available mostrar el número de la próxima terminal virtual libre\n" +" -n --next-available mostrar el número de la próxima terminal virtual " +"libre\n" #: src/fgconsole.c:66 msgid "Couldn't read VTNO: " @@ -244,15 +247,16 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: Advertencia: línea demasiado larga\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "No se pudo abrir %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "No se pudo conseguir un descriptor de fichero que refiera a la consola\n" +msgstr "" +"No se pudo conseguir un descriptor de fichero que refiera a la consola\n" #: src/getkeycodes.c:18 #, c-format @@ -267,12 +271,15 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 es un error; para 1-88 (0x01-0x58) los códigos de rastreo son iguales que los de tecla\n" +msgstr "" +"0 es un error; para 1-88 (0x01-0x58) los códigos de rastreo son iguales que " +"los de tecla\n" #: src/getkeycodes.c:62 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "para 1-%d (0x01-0x%02x) el código de rastreo es igual que el de tecla\n" +msgstr "" +"para 1-%d (0x01-0x%02x) el código de rastreo es igual que el de tecla\n" #: src/getkeycodes.c:68 #, c-format @@ -361,7 +368,9 @@ #: src/kbdrate.c:156 src/kbdrate.c:175 src/kbdrate.c:339 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" -msgstr "Cadencia de repetición automática de tecla fijada a %.1f cps (retraso = %d ms)\n" +msgstr "" +"Cadencia de repetición automática de tecla fijada a %.1f cps (retraso = %d " +"ms)\n" #: src/kbdrate.c:267 #, c-format @@ -434,36 +443,36 @@ msgid "unknown keysym '%s'\n" msgstr "keysym '%s' desconocida\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, fuzzy, c-format msgid "cannot open include file %s" msgstr "No se pudo abrir el fichero de tipo de letra %s\n" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: Advertencia: línea demasiado larga\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -475,8 +484,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -486,238 +495,238 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: no se pudo liberar la consola %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "código de tecla %3d %s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, fuzzy, c-format msgid "failed to bind key %d to value %d\n" msgstr "no se pudo asignar el código de rastreo %x al código de tecla %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, fuzzy, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: no se pudo liberar la consola %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, fuzzy, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: no se pudo liberar la consola %d\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: error al establecer el modo de teclado\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, fuzzy, c-format msgid "failed to clear string %s\n" msgstr "error al restaurar la tabla asociativa unimap original\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, fuzzy, c-format msgid "too many compose definitions\n" msgstr "número máximo de definiciones de composición: %d\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, fuzzy, c-format msgid "(No change in compose definitions.)\n" msgstr "número máximo de definiciones de composición: %d\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Error al escribir la tabla asociativa en el fichero\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, fuzzy, c-format msgid "too many (%d) entries on one line" msgstr "Demasiados ficheros que combinar\n" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, fuzzy, c-format +msgid "Loading %s\n" +msgstr "Error al leer %s\n" + +#: loadkeys.y:1062 +#, fuzzy, c-format +msgid "syntax error in map file\n" +msgstr "Error al escribir la tabla asociativa en el fichero\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: error al establecer el modo de teclado\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "error al ejecutar %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "No se encontró el tipo %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "No se pudo abrir el fichero de tipo de letra %s\n" -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "Error al leer %s\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "Error al escribir la tabla asociativa en el fichero\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -733,7 +742,8 @@ #: src/loadunimap.c:195 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s: el número de glifo (0x%x) es mayor que la longitud del tipo de letra\n" +msgstr "" +"%s: el número de glifo (0x%x) es mayor que la longitud del tipo de letra\n" #: src/loadunimap.c:201 #, c-format @@ -743,12 +753,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: rango Unicode correspondiente al rango de posición de tipo de letra 0x%x-0x%x incorrecto\n" +msgstr "" +"%s: rango Unicode correspondiente al rango de posición de tipo de letra 0x" +"%x-0x%x incorrecto\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: el rango Unicode U+%x-U+%x no es de la misma longitud que el rango de posición 0x%x-0x%x en el tipo de letra\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: el rango Unicode U+%x-U+%x no es de la misma longitud que el rango de " +"posición 0x%x-0x%x en el tipo de letra\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -810,7 +826,9 @@ #: src/mapscrn.c:144 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "Cargando tabla asociativa de pantalla binaria directa-a-tipo de letra desde el fichero %s\n" +msgstr "" +"Cargando tabla asociativa de pantalla binaria directa-a-tipo de letra desde " +"el fichero %s\n" #: src/mapscrn.c:149 src/mapscrn.c:160 #, c-format @@ -851,6 +869,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -862,74 +881,75 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: número de term. virt. erróneo\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: sólo root puede usar el indicador -u.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" -msgstr "No se pudo conseguir un descriptor de fichero que refiera a la consola\n" +msgstr "" +"No se pudo conseguir un descriptor de fichero que refiera a la consola\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: no se encuentra ninguna term. virt. libre\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: no se puede comprobar si la term. virt. %d está disponible\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: la term. virt. %d está siendo utilizada; orden abortada\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: No se puede establecer nueva sesión (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: No se pudo abrir %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: usando la terminal virtual %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: No se puede abrir %s para lectura/escritura (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: no se pudo liberar la consola %d\n" @@ -1036,15 +1056,20 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Correspondiendo a un rango de posiciones de tipo, debería haber un rango Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Correspondiendo a un rango de posiciones de tipo, debería haber un rango " +"Unicode\n" #: src/psfxtable.c:257 #, c-format msgid "" "Usage:\n" "\t%s infont intable outfont\n" -msgstr "Uso: %s: tipo-de-letra-de-entrada tabla-de-entrada tipo-de-letra-de-salida\n" +msgstr "" +"Uso: %s: tipo-de-letra-de-entrada tabla-de-entrada tipo-de-letra-de-salida\n" #: src/psfxtable.c:266 #, c-format @@ -1065,7 +1090,9 @@ msgid "" "Usage:\n" "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" -msgstr "Uso: %s [-i tipo-de-letra-de-entrada] [-o tipo-de-letra-de-salida] [-it tabla-de-entrada] [-ot tabla-de-salida] [-nt]\n" +msgstr "" +"Uso: %s [-i tipo-de-letra-de-entrada] [-o tipo-de-letra-de-salida] [-it " +"tabla-de-entrada] [-ot tabla-de-salida] [-nt]\n" #: src/psfxtable.c:360 #, c-format @@ -1100,7 +1127,9 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Antes Num._Códigos_de_Rastreo: %d Ahora Num._Códigos_de_Rastreo: %d Altura del carácter: %d\n" +msgstr "" +"Antes Num._Códigos_de_Rastreo: %d Ahora Num._Códigos_de_Rastreo: %d Altura " +"del carácter: %d\n" #: src/resizecons.c:252 #, c-format @@ -1109,19 +1138,23 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: no olvide cambiar TERM (quizás a con%dx%d o a linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: no olvide cambiar TERM (quizás a con%dx%d o a linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "la llamada es: resizecons COLSxFILAS o: resizecons COLS FILAS\n" -"o: resizecons -lines FILAS, donde FILAS es 25, 28, 30, 34, 36, 40, 44, 50, o 60\n" +"o: resizecons -lines FILAS, donde FILAS es 25, 28, 30, 34, 36, 40, 44, 50, o " +"60\n" #: src/resizecons.c:376 #, c-format @@ -1161,7 +1194,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1189,24 +1223,33 @@ " [-m mapa-de-consola] [-u mapa-unicode]\n" "\n" "Opciones-de-escritura (previas a la carga del fichero):\n" -" -o Escribir el tipo actual en \n" -" -O Escribir el tipo y la tabla asociativa unicode actuales en \n" -" -om Escribir la tabla asociativa de consola actual en \n" -" -ou Escribir la tabla asociativa unicode actual en \n" -"Si no se proporcionan nuevo-tipo ni ninguna de las opciones -[o|O|om|ou|m|u],\n" +" -o Escribir el tipo actual en \n" +" -O Escribir el tipo y la tabla asociativa unicode " +"actuales en \n" +" -om Escribir la tabla asociativa de consola actual " +"en \n" +" -ou Escribir la tabla asociativa unicode actual en " +"\n" +"Si no se proporcionan nuevo-tipo ni ninguna de las opciones -[o|O|om|ou|m|" +"u],\n" "se carga un tipo de letra predefinido:\n" " setfont Carga tipo \"default[.gz]\"\n" " setfont - Carga tipo \"default8x[.gz]\"\n" -"La opción - selecciona un tipo de una página de código que contiene tres tipos:\n" -" setfont -{8|14|16} página-de-código.cp[.gz] Carga el tipo 8x de página-de-código.cp\n" +"La opción - selecciona un tipo de una página de código que contiene tres " +"tipos:\n" +" setfont -{8|14|16} página-de-código.cp[.gz] Carga el tipo 8x de " +"página-de-código.cp\n" "\n" "Se cargarán las correspondencias dadas de forma explícita (con -m o -u)\n" -"o implícita (en el fichero de tipo) y, en el caso de las tablas asociativas de consola, se activarán.\n" +"o implícita (en el fichero de tipo) y, en el caso de las tablas asociativas " +"de consola, se activarán.\n" "\n" " -h (sin espacios) Modificar la altura del tipo.\n" " -m Cargar una tabla asociativa de pantalla de la consola.\n" " -u Cargar una tabla asociativa unicode del tipo.\n" -" -m none Suprimir la carga y activación de la tabla asociativa de pantalla.\n" +" -m none Suprimir la carga y activación de la tabla asociativa de " +"pantalla.\n" " -u none Suprimir la carga de una tabla asociativa unicode.\n" " -v Modo verboso.\n" " -C Indicar qué dispositivo de consola va a utilizarse.\n" @@ -1221,8 +1264,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: no se puede recuperar a la vez de la ROM de caracteres y de archivo. No se ha modificado el tipo.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: no se puede recuperar a la vez de la ROM de caracteres y de " +"archivo. No se ha modificado el tipo.\n" #: src/setfont.c:259 #, c-format @@ -1289,7 +1336,8 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Cuando se cargan varios tipos, todos deben ser ficheros psf - %s no lo es\n" +msgstr "" +"Cuando se cargan varios tipos, todos deben ser ficheros psf - %s no lo es\n" #: src/setfont.c:435 #, c-format @@ -1334,7 +1382,8 @@ #: src/setfont.c:576 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Hmm - ¿un tipo derivado de un restorefont? Usaremos la primera mitad.\n" +msgstr "" +"Hmm - ¿un tipo derivado de un restorefont? Usaremos la primera mitad.\n" #: src/setfont.c:593 #, c-format @@ -1363,7 +1412,8 @@ #: src/setfont.c:682 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" -msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" +msgstr "" +"Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %4$s\n" #: src/setkeycodes.c:21 #, c-format @@ -1414,13 +1464,17 @@ "De manera que,\n" " setleds +caps -num\n" "activará CapsLock, desactivará NumLock y no hará nada con ScrollLock.\n" -"Con la opción -v o cuando no se solicita ningún cambio, se informa de su estado\n" +"Con la opción -v o cuando no se solicita ningún cambio, se informa de su " +"estado\n" "antes y, de producirse, después del cambio.\n" "Normalmente, setleds influye en el estado de los indicadores de la terminal\n" "virtual (y estos normalmente se reflejan en los LEDs).\n" -"Con -L, setleds sólo modifica los LEDs, sin afectar a los indicadores (flags).\n" -"Con -D, setleds modifica tanto los indicadores como los indicadores predetermi-\n" -"nados, de forma que una reinicialización posterior no cambie los indicadores.\n" +"Con -L, setleds sólo modifica los LEDs, sin afectar a los indicadores " +"(flags).\n" +"Con -D, setleds modifica tanto los indicadores como los indicadores " +"predetermi-\n" +"nados, de forma que una reinicialización posterior no cambie los " +"indicadores.\n" #: src/setleds.c:43 msgid "on " @@ -1433,12 +1487,17 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Error al leer el estado actual de los leds. ¿Quizás stdin no es una terminal virtual?\n" +msgstr "" +"Error al leer el estado actual de los leds. ¿Quizás stdin no es una terminal " +"virtual?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Error al leer el estado actual de los indicadores. ¿Quizás no se esté en una consola?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Error al leer el estado actual de los indicadores. ¿Quizás no se esté en una " +"consola?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1551,7 +1610,8 @@ #: src/setmetamode.c:78 #, c-format msgid "Error reading current setting. Maybe stdin is not a VT?\n" -msgstr "Error al leer el estado actual. ¿Quizás stdin no es una terminal virtual?\n" +msgstr "" +"Error al leer el estado actual. ¿Quizás stdin no es una terminal virtual?\n" #: src/setmetamode.c:98 #, c-format @@ -1641,7 +1701,8 @@ "(probablemente tras cargar un tipo con `setfont tipo')\n" "\n" "Las opciones válidas son:\n" -" -C tty De cuál dispositivo mostrar el tipo (predeterminado: consola actual).\n" +" -C tty De cuál dispositivo mostrar el tipo (predeterminado: consola " +"actual).\n" " -v Modo verboso.\n" " -i No mostrar la tabla del tipo, sino sólo FILASxCOLUMNASxCANTIDAD.\n" @@ -1713,7 +1774,8 @@ " -h --help mostrar este texto de ayuda\n" " -a --ascii mostrar los valores decimal/octal/hex de las teclas\n" " -s --scancodes mostrar únicamente los códigos de rastreo en bruto\n" -" -k --keycodes mostrar únicamente los códigos de teclado interpretados (predeterminado)\n" +" -k --keycodes mostrar únicamente los códigos de teclado interpretados " +"(predeterminado)\n" #: src/showkey.c:157 #, c-format @@ -1756,6 +1818,67 @@ msgid "%s from %s\n" msgstr "%s de %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"argumento desconocido: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: la terminal virtual 1 es la consola y no puede liberarse\n" + #~ msgid "plus before %s ignored\n" #~ msgstr "se ignora el signo '+' delante %s\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/fr.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/fr.gmo differ diff -Nru kbd-1.15.3/po/fr.po kbd-1.15.5/po/fr.po --- kbd-1.15.3/po/fr.po 2011-05-14 21:13:49.000000000 +0000 +++ kbd-1.15.5/po/fr.po 2012-12-01 21:41:38.000000000 +0000 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU kbd 1.14.1\n" +"Project-Id-Version: GNU kbd 1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2008-04-25 18:51+0100\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2011-05-25 00:44+0100\n" "Last-Translator: Jean-Baka Domelevo Entfellner \n" "Language-Team: French \n" "Language: fr\n" @@ -61,7 +61,9 @@ #: src/dumpkeys.c:84 #, c-format msgid "%s: plain map not allocated? very strange ...\n" -msgstr "%s : une configuration de clavier basique n'a pas été allouée ? Vraiment étrange...\n" +msgstr "" +"%s : une configuration de clavier basique n'a pas été allouée ? Vraiment " +"étrange...\n" #: src/dumpkeys.c:118 #, c-format @@ -71,17 +73,21 @@ #: src/dumpkeys.c:272 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" -msgstr "étendue des codes clavier pris en charge par le noyau : 1 - %d\n" +msgstr "" +"étendue des codes clavier pris en charge par le noyau : 1 - %d\n" #: src/dumpkeys.c:274 #, c-format msgid "max number of actions bindable to a key: %d\n" -msgstr "nombre maximum d'actions pouvant être associées à une touche : %d\n" +msgstr "" +"nombre maximum d'actions pouvant être associées à une touche : %d\n" #: src/dumpkeys.c:277 #, c-format msgid "number of keymaps in actual use: %d\n" -msgstr "nombre de configurations de clavier actuellement en usage : %d\n" +msgstr "" +"nombre de configurations de clavier actuellement en usage : " +"%d\n" #: src/dumpkeys.c:280 #, c-format @@ -106,7 +112,8 @@ #: src/dumpkeys.c:291 #, c-format msgid "nr of compose definitions in actual use: %d\n" -msgstr "nombre de définitions de combinaisons de touches actuellement en usage : %d\n" +msgstr "" +"nombre de définitions de combinaisons de touches actuellement en usage : %d\n" #: src/dumpkeys.c:316 #, c-format @@ -147,7 +154,9 @@ #: src/dumpkeys.c:398 #, c-format msgid "# not alt_is_meta: on keymap %d key %d is bound to" -msgstr "# n'est pas \"alt=meta\" : sur la configuration de clavier %d la touche %d est liée à" +msgstr "" +"# n'est pas \"alt=meta\" : sur la configuration de clavier %d la touche %d " +"est liée à" #: src/dumpkeys.c:475 #, c-format @@ -189,13 +198,16 @@ "Les options valides sont :\n" "\n" " -h --help affiche l'aide et quitter\n" -" -i --short-info affiche les informations au sujet du pilote de clavier\n" +" -i --short-info affiche les informations au sujet du pilote de " +"clavier\n" " -l --long-info affiche les informations précédentes et\n" " les symboles connus de loadkeys\n" " -n --numeric affiche la table des touches en hexadécimal\n" -" -f --full-table n'utilise pas de notation abrégée, une rangée par code clavier\n" +" -f --full-table n'utilise pas de notation abrégée, une rangée par " +"code clavier\n" " -1 --separate-lines une ligne par paire (modificateur, code de touche)\n" -" --funcs-only affiche seulement les chaînes de touches de fonction\n" +" --funcs-only affiche seulement les chaînes de touches de " +"fonction\n" " --keys-only affiche seulement les touches simples\n" " --compose-only affiche seulement les combinaisons de touches\n" " -c --charset=" @@ -210,7 +222,7 @@ "\t\t\t du jeu de caractères spécifié\n" #: src/fgconsole.c:17 -#, fuzzy, c-format +#, c-format msgid "" "%s version %s\n" "\n" @@ -229,8 +241,9 @@ "Les options valides sont :\n" "\n" "\t-h --help affiche ce message d'aide\n" -"\t-V --version affiche le numéro de version\n" -"\t-n --next-available affiche le prochain terminal virtuel disponible\n" +"\t-V --version affiche le numéro de version du programme\n" +"\t-n --next-available affiche le numéro du prochain terminal virtuel " +"disponible\n" #: src/fgconsole.c:66 msgid "Couldn't read VTNO: " @@ -242,19 +255,21 @@ msgstr "erreur lors de l'exécution de %s\n" #: src/findfile.c:157 -#, fuzzy, c-format +#, c-format msgid "Warning: path too long: %s/%s\n" -msgstr "%s : AVERTISSEMENT : ligne trop longue\n" +msgstr "Attention ! Chemin trop long : %s/%s\n" -#: src/getfd.c:59 -#, fuzzy, c-format +#: src/getfd.c:67 +#, c-format msgid "Couldn't open %s\n" -msgstr "Ne peut ouvrir %s\n" +msgstr "Impossible d'ouvrir %s\n" -#: src/getfd.c:88 -#, fuzzy, c-format +#: src/getfd.c:84 +#, c-format msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "Ne peut obtenir le descripteur de fichier faisant référence à la console\n" +msgstr "" +"Impossible d'obtenir le descripteur de fichier faisant référence à la " +"console\n" #: src/getkeycodes.c:18 #, c-format @@ -269,7 +284,9 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 est une erreur ; les scancodes de 1 à 88 (0x01-0x58) sont égaux aux codes clavier\n" +msgstr "" +"0 est une erreur ; les scancodes de 1 à 88 (0x01-0x58) sont égaux aux codes " +"clavier\n" #: src/getkeycodes.c:62 #, c-format @@ -309,18 +326,20 @@ " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" msgstr "" +"Syntaxe : %1$s [-C DEVICE] getmode [text|graphics]\n" +" ou : %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" +" ou : %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" +" ou : %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" #: src/kbdinfo.c:65 #, c-format msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "Erreur : pas assez d'arguments !\n" #: src/kbdinfo.c:124 -#, fuzzy, c-format +#, c-format msgid "Error: Unrecognized action: %s\n" -msgstr "" -"argument non reconnu : _%s_\n" -"\n" +msgstr "Erreur ! Action non reconnue : %s\n" #: src/kbd_mode.c:20 #, c-format @@ -384,7 +403,9 @@ #: src/kdfontop.c:201 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" -msgstr "bug : l'utilisation de GIO_FONT avec getfont nécessite la mise en mémoire tampon.\n" +msgstr "" +"bug : l'utilisation de GIO_FONT avec getfont nécessite la mise en mémoire " +"tampon.\n" #: src/kdfontop.c:258 src/kdmapop.c:150 src/xmalloc.c:15 #, c-format @@ -394,7 +415,7 @@ #: src/kdmapop.c:159 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "étrange... le terminal courant est passé de %d à %d.\n" #: src/kdmapop.c:185 #, c-format @@ -402,6 +423,8 @@ "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"Ce noyau semble antérieur à la version 1.1.92.\n" +"Pas de table Unicode chargée.\n" #: src/ksyms.c:1713 #, c-format @@ -438,37 +461,36 @@ msgid "unknown keysym '%s'\n" msgstr "keysym inconnu « %s »\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" -msgstr "" +msgstr "Les inclusions sont imbriquées trop profondément." -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" -msgstr "" +msgstr "bascule vers %s\n" -#: loadkeys.analyze.l:238 -#, fuzzy, c-format +#: loadkeys.analyze.l:242 +#, c-format msgid "cannot open include file %s" -msgstr "Ne peut ouvrir le fichier de fonte %s\n" +msgstr "Impossible d'ouvrir le fichier d'inclusions %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" -msgstr "" +msgstr "on attend un nom de fichier entre guillemets" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" -msgstr "" +msgstr "keysym Unicode en dehors de la plage de validité : %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 -#, fuzzy +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" -msgstr "%s : AVERTISSEMENT : ligne trop longue\n" +msgstr "ligne trop longue" -#: loadkeys.y:90 -#, c-format +#: loadkeys.y:93 +#, fuzzy, c-format msgid "" "loadkeys version %s\n" "\n" @@ -479,6 +501,26 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" +" -C --console=file\n" +" the console device to be used\n" +" -d --default load \"%s\"\n" +" -h --help display this help text\n" +" -m --mktable output a \"defkeymap.c\" to stdout\n" +" -q --quiet suppress all normal output\n" +" -s --clearstrings clear kernel string table\n" +" -u --unicode force conversion to Unicode\n" +" -v --verbose report the changes\n" +msgstr "" +"loadkeys version %s\n" +"\n" +"Syntaxe : loadkeys [option...] [fichier de mappe...]\n" +"\n" +"Les options valides sont :\n" +"\n" +" -a --ascii force la conversion vers l'ASCII\n" +" -b --bkeymap produit sur la sortie standard une mappe de clavier " +"binaire\n" +" -c --clearcompose efface la table de composition du noyau\n" " -C --console=\n" " the console device(s) to be used\n" " -d --default load \"%s\"\n" @@ -488,239 +530,245 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" -msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" -msgstr "" +msgstr "addmap a été appelé avec l'index erroné %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" -msgstr "" +msgstr "l'ajout de la mappe %d viole une ligne de keymaps explicite" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" -msgstr "" +msgstr "killkey a été appelé avec l'index erroné %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" -msgstr "" +msgstr "killkey a été appelé avec la table invalide %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" -msgstr "" +msgstr "addkey a été appelé avec le keycode erroné %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" -msgstr "" +msgstr "addkey a été appelé avec l'index invalide %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" -msgstr "" +msgstr "addkey a été appelé avec la table invalide %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" -msgstr "" +msgstr "%s : addfunc a été appelé avec la fonction invalide %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" -msgstr "" +msgstr "%s : addfunc : dépassement de tampon\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" -msgstr "" +msgstr "dépassement de capacité de la table des compositions\n" -#: loadkeys.y:317 -#, fuzzy, c-format +#: loadkeys.y:320 +#, c-format msgid "%s: could not switch to Unicode mode\n" -msgstr "%s : ne peut désallouer la console %d\n" +msgstr "%s : impossible de basculer en mode Unicode\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" -msgstr "" +msgstr "Mappe de caractères %d : permission refusée\n" -#: loadkeys.y:345 -#, fuzzy, c-format +#: loadkeys.y:348 +#, c-format msgid "keycode %d, table %d = %d%s\n" -msgstr "code clavier %3d %s\n" +msgstr "code clavier %d, table %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" -msgstr "" +msgstr " ÉCHEC" -#: loadkeys.y:351 -#, fuzzy, c-format +#: loadkeys.y:354 +#, c-format msgid "failed to bind key %d to value %d\n" -msgstr "échec d'initialisation du scancode %x au keycode %d\n" +msgstr "échec lors de la liaison de la touche %d à la valeur %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" -msgstr "" +msgstr "désalloue la mappe de caractères %d\n" -#: loadkeys.y:371 -#, fuzzy, c-format +#: loadkeys.y:372 +#, c-format msgid "%s: could not deallocate keymap %d\n" -msgstr "%s : ne peut désallouer la console %d\n" +msgstr "%s : impossible de désallouer la mappe de clavier %d\n" -#: loadkeys.y:388 -#, fuzzy, c-format +#: loadkeys.y:389 +#, c-format msgid "%s: cannot deallocate or clear keymap\n" -msgstr "%s : ne peut désallouer la console %d\n" +msgstr "%s : impossible de désallouer ou d'effacer la mappe de clavier\n" -#: loadkeys.y:400 -#, fuzzy, c-format +#: loadkeys.y:401 +#, c-format msgid "%s: could not return to original keyboard mode\n" -msgstr "%s : erreur lors de la définition du mode du clavier\n" +msgstr "%s : impossible de revenir au mode d'origine du clavier\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" +"échec lors de la tentative de liaison de la chaîne « %s » à la fonction %s\n" -#: loadkeys.y:455 -#, fuzzy, c-format +#: loadkeys.y:467 +#, c-format msgid "failed to clear string %s\n" -msgstr "échec de restauration de la map unimap originale\n" +msgstr "échec lors de l'effacement de la chaîne %s\n" -#: loadkeys.y:475 -#, fuzzy, c-format +#: loadkeys.y:488 +#, c-format msgid "too many compose definitions\n" -msgstr "nombre maximal de définitions de combinaisons de touches : %d\n" +msgstr "trop de définitions de combinaisons de touches\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" -msgstr "" +msgstr "erreur impossible dans do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" +"\n" +"A changé %d %s et %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" -msgstr "" +msgstr "touche" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" -msgstr "" +msgstr "touches" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" -msgstr "" +msgstr "chaîne" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" -msgstr "" +msgstr "chaînes" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" -msgstr "" +msgstr "Chargé %d compose %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" -msgstr "" +msgstr "définition" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" -msgstr "" +msgstr "définitions" -#: loadkeys.y:599 -#, fuzzy, c-format +#: loadkeys.y:610 +#, c-format msgid "(No change in compose definitions.)\n" -msgstr "nombre maximal de définitions de combinaisons de touches : %d\n" +msgstr "(Aucun changement dans les définitions de combinaisons de touches.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" -msgstr "" +msgstr "loadkeys : ne sait pas comment composer pour obtenir %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" -msgstr "Erreur d'écriture de la map dans le fichier\n" +msgstr "Erreur d'écriture de la mappe dans le fichier\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" -msgstr "" +msgstr "« %s » n'est pas le symbole d'une touche de fonction" -#: loadkeys.y:1011 -#, fuzzy, c-format +#: loadkeys.y:1028 +#, c-format msgid "too many (%d) entries on one line" -msgstr "Trop de fichiers à combiner\n" +msgstr "Trop d'entrées (%d) sur la même ligne" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" -msgstr "" +msgstr "trop de définitions de touches sur la même ligne" + +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Chargement de %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "Erreur de syntaxe dans le fichier de mappe\n" -#: loadkeys.y:1110 +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "affectations de touches inchangées\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" -msgstr "" +msgstr "%s : Les options --unicode et --ascii s'excluent mutuellement\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s : erreur lors de la définition du mode du clavier\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s : erreur lors de la lecture du mode du clavier\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" +"%s : attention ! Chargement d'une mappe non Unicode sur une console Unicode\n" +" (peut-être voudrez-vous faire un `kbd_mode -a' ?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" +"%s : attention ! Chargement d'une mappe Unicode sur une console non Unicode\n" +" (peut-être voudrez-vous faire un `kbd_mode -u' ?)\n" -#: loadkeys.y:1157 -#, fuzzy, c-format +#: loadkeys.y:1187 +#, c-format msgid "Searching in %s\n" -msgstr "erreur lors de l'exécution de %s\n" +msgstr "Recherche dans %s\n" -#: loadkeys.y:1167 -#, fuzzy, c-format +#: loadkeys.y:1197 +#, c-format msgid "Cannot find %s\n" -msgstr "Ne peut repérer la fonte %s\n" +msgstr "Impossible de trouver %s\n" -#: loadkeys.y:1178 -#, fuzzy, c-format -msgid "cannot open file %s\n" -msgstr "Ne peut ouvrir le fichier de fonte %s\n" - -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "Erreur de lecture sur %s\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "Erreur d'écriture de la map dans le fichier\n" - -#: loadkeys.y:1193 +#: loadkeys.y:1213 #, c-format -msgid "key bindings not changed\n" -msgstr "" +msgid "cannot open file %s\n" +msgstr "Impossible d'ouvrir le fichier %s\n" #: src/loadunimap.c:43 #, c-format @@ -729,7 +777,7 @@ "\t%s [-C console] [-o map.orig]\n" msgstr "" "Syntaxe:\n" -"\t%s [-C console] [-o map.orig]\n" +"\t%s [-C console] [-o mappe.orig]\n" #: src/loadunimap.c:175 src/loadunimap.c:186 #, c-format @@ -739,7 +787,8 @@ #: src/loadunimap.c:195 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s : le numéro de glyphe (0x%x) est plus grand que la longueur de la fonte\n" +msgstr "" +"%s : le numéro de glyphe (0x%x) est plus grand que la longueur de la fonte\n" #: src/loadunimap.c:201 #, c-format @@ -749,12 +798,17 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s : plage Unicode erronée correspondant aux fontes en position 0x%x à 0x%x\n" +msgstr "" +"%s : plage Unicode erronée correspondant aux fontes en position 0x%x à 0x%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s : la plage Unicode U+%x-U+%x n'a pas la même longueur que la plage des fontes allant de 0x%x à 0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s : la plage Unicode U+%x-U+%x n'a pas la même longueur que la plage des " +"fontes allant de 0x%x à 0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -796,12 +850,12 @@ #: src/loadunimap.c:373 #, c-format msgid "Appended Unicode map\n" -msgstr "map Unicode concaténée\n" +msgstr "Mappe Unicode concaténée\n" #: src/mapscrn.c:68 #, c-format msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "syntaxe : %s [-v] [-o map.orig] fichier-map\n" +msgstr "syntaxe : %s [-v] [-o mappe.orig] fichier-map\n" #: src/mapscrn.c:133 #, c-format @@ -816,40 +870,43 @@ #: src/mapscrn.c:144 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "Chargement de la map d'écran direct-à-la-fonte à partir du fichier %s\n" +msgstr "" +"Chargement de la mappe d'écran direct-à-la-fonte à partir du fichier %s\n" #: src/mapscrn.c:149 src/mapscrn.c:160 #, c-format msgid "Error reading map from file `%s'\n" -msgstr "Erreur de lecture de la map à partir du fichier « %s »\n" +msgstr "Erreur de lecture de la mappe à partir du fichier « %s »\n" #: src/mapscrn.c:155 #, c-format msgid "Loading binary unicode screen map from file %s\n" -msgstr "Chargement de la map d'écran unicode à partir du fichier %s\n" +msgstr "Chargement de la mappe d'écran Unicode à partir du fichier %s\n" #: src/mapscrn.c:167 #, c-format msgid "Loading symbolic screen map from file %s\n" -msgstr "Chargement de la map symbolique d'écran à partir du fichier %s\n" +msgstr "Chargement de la mappe symbolique d'écran à partir du fichier %s\n" #: src/mapscrn.c:171 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" -msgstr "Erreur d'analyse syntaxique de la map symbolique à partir de « %s », ligne %d\n" +msgstr "" +"Erreur d'analyse syntaxique de la mappe symbolique à partir de « %s », ligne " +"%d\n" #: src/mapscrn.c:284 #, c-format msgid "Cannot read console map\n" -msgstr "Ne peut lire la map de la console\n" +msgstr "Ne peut lire la mappe de la console\n" #: src/mapscrn.c:290 #, c-format msgid "Saved screen map in `%s'\n" -msgstr "La map d'écran a été sauvegardée dans « %s »\n" +msgstr "La mappe d'écran a été sauvegardée dans « %s »\n" #: src/openvt.c:44 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" "\n" @@ -857,6 +914,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -867,78 +925,96 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"Syntaxe : %s [OPTIONS] -- commande\n" +"\n" +"Cet utilitaire vous permet de démarrer un programme sur un nouveau terminal " +"virtuel (VT).\n" +"\n" +"Options :\n" +" -c, --console=NUM utiliser le numéro de terminal virtuel fourni;\n" +" -f, --force force l'ouverture d'un VT sans vérification;\n" +" -l, --login fait de la commande un shell de connexion;\n" +" -u, --user détermine le propriétaire du terminal virtuel " +"courant;\n" +" -s, --switch bascule vers le nouveau VT;\n" +" -w, --wait attend que la comande ait terminé;\n" +" -v, --verbose affiche un message pour chaque action;\n" +" -V, --version affiche la version du programme et quitte;\n" +" -h, --help affiche un bref message d'aide.\n" +"\n" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" -msgstr "" +msgstr "Impossible de déterminer le propriétaire du terminal courant !" -#: src/openvt.c:230 -#, fuzzy, c-format +#: src/openvt.c:231 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt : %s : numéro de terminal virtuel illégal\n" +msgstr "%s : numéro de terminal virtuel invalide" -#: src/openvt.c:256 -#, fuzzy +#: src/openvt.c:257 msgid "Only root can use the -u flag." -msgstr "openvt : seul le superutilisateur peut utiliser l'option -u.\n" +msgstr "Le commutateur -u est réservé à l'usage du superutilisateur." -#: src/openvt.c:278 -#, fuzzy +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" -msgstr "Ne peut obtenir le descripteur de fichier faisant référence à la console\n" +msgstr "" +"Impossible d'obtenir un descripteur de fichier faisant référence à la console" -#: src/openvt.c:285 -#, fuzzy +#: src/openvt.c:286 msgid "Cannot find a free vt" -msgstr "openvt : pas de terminal virtuel libre\n" +msgstr "Pas de terminal virtuel libre" -#: src/openvt.c:289 -#, fuzzy, c-format +#: src/openvt.c:290 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt : ne peut vérifier si le terminal virtuel %d est libre\n" +msgstr "" +"Impossible de vérifier si le terminal virtuel %d est libre ; utiliser « %s -" +"f » pour forcer." -#: src/openvt.c:293 -#, fuzzy, c-format +#: src/openvt.c:294 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt : le terminal virtuel %d est déjà utilisé ; commande ignorée\n" +msgstr "" +"Le terminal virtuel %d est déjà utilisé ; commande interrompue ; utiliser « " +"%s -f » pour forcer." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." -msgstr "" +msgstr "Impossible de trouver la commande." -#: src/openvt.c:335 -#, fuzzy +#: src/openvt.c:336 msgid "Unable to set new session" -msgstr "openvt : impossible d'ouvrir une nouvelle session (%s)\n" +msgstr "Impossible de mettre en place une nouvelle session" -#: src/openvt.c:359 -#, fuzzy, c-format +#: src/openvt.c:360 +#, c-format msgid "Unable to open %s" -msgstr "openvt : incapable d'ouvrir %s : %s\n" +msgstr "Impossible d'ouvrir %s" -#: src/openvt.c:363 -#, fuzzy, c-format +#: src/openvt.c:364 +#, c-format msgid "Using VT %s" -msgstr "openvt : utilisation du terminal virtuel %s\n" +msgstr "Utilisation du terminal virtuel %s" -#: src/openvt.c:369 -#, fuzzy, c-format +#: src/openvt.c:370 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt : impossible d'ouvrir %s en lecture/écriture (%s)\n" +msgstr "Impossible d'ouvrir %s en lecture/écriture" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" -msgstr "" +msgstr "Impossible d'activer le terminal virtuel %d" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" -msgstr "" +msgstr "Activation interrompue ?" -#: src/openvt.c:423 -#, fuzzy, c-format +#: src/openvt.c:424 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s : ne peut désallouer la console %d\n" +msgstr "Impossible de désallouer la console %d" #: src/psffontop.c:69 #, c-format @@ -1042,8 +1118,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s : en correspondance avec une plage de positions de fontes, il devrait y avoir une plage Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s : en correspondance avec une plage de positions de fontes, il devrait y " +"avoir une plage Unicode\n" #: src/psfxtable.c:257 #, c-format @@ -1079,7 +1159,8 @@ "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" msgstr "" "Usage :\n" -"\t%s [-i fonte_entree] [-o fonte_sortie] [-it table_entree] [-ot table_sortie] [-nt]\n" +"\t%s [-i fonte_entree] [-o fonte_sortie] [-it table_entree] [-ot " +"table_sortie] [-nt]\n" #: src/psfxtable.c:360 #, c-format @@ -1114,7 +1195,8 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Ancien #scanlines: %d Nouveau #scanlines: %d Hauteur des caractères: %d\n" +msgstr "" +"Ancien #scanlines: %d Nouveau #scanlines: %d Hauteur des caractères: %d\n" #: src/resizecons.c:252 #, c-format @@ -1123,19 +1205,23 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: ne pas oublier de changer TERM (soit con%dx%d ou linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: ne pas oublier de changer TERM (soit con%dx%d ou linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "l'appel est resizecons COLSxLIGNES ou resizecons COLS LIGNES\n" -"ou resizecons -lines LIGNES où LIGNES vaut 25, 28, 30, 34, 36, 40, 44, 50 ou 60\n" +"ou resizecons -lines LIGNES où LIGNES vaut 25, 28, 30, 34, 36, 40, 44, 50 ou " +"60\n" #: src/resizecons.c:376 #, c-format @@ -1175,7 +1261,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1199,24 +1286,31 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Syntaxe : setfont [options-d-écriture] [-] [nouvelle-fonte..] [-m consolemap] [-u unicodemap]\n" -"Options d'écriture (elles sont prises en compte avant tout chargement de fichiers) :\n" +"Syntaxe : setfont [options-d-écriture] [-] [nouvelle-fonte..] [-m " +"consolemap] [-u unicodemap]\n" +"Options d'écriture (elles sont prises en compte avant tout chargement de " +"fichiers) :\n" " -o écrire la fonte courante dans \n" -" -O écrire la fonte courante et la map unicode dans \n" +" -O écrire la fonte courante et la map unicode dans " +"\n" " -om écrire la consolemap courante dans \n" " -ou écrire la unicodemap courante dans \n" -"Si aucune nouvelle fonte et si aucune des options -[o|O|om|ou|m|u] n'est fournie, la fonte par défaut est chargée:\n" +"Si aucune nouvelle fonte et si aucune des options -[o|O|om|ou|m|u] n'est " +"fournie, la fonte par défaut est chargée:\n" " setfont charger la fonte \"default[.gz]\"\n" " setfont - charger la fonte \"default8x[.gz]\"\n" -"L'option - sélectionne une fonte à partir d'un codepage qui contient 3 fontes:\n" +"L'option - sélectionne une fonte à partir d'un codepage qui contient 3 " +"fontes:\n" " setfont -{8|14|16} codepage.cp[.gz]\n" " charger la fonte 8x à partir du codepage.cp\n" -"Explicitement (avec -m ou -u) ou implicitement (dans le fichier de fonte) la map donnée\n" +"Explicitement (avec -m ou -u) ou implicitement (dans le fichier de fonte) la " +"map donnée\n" "sera chargée et, dans le cas d'une consolemaps, sera activée.\n" " -h (sans espace) écrase la hauteur de fonte.\n" " -m charge la map d'écran de la console.\n" " -u charge la map de fonte unicode.\n" -" -m none supprime le chargement et l'activation de la map d'écran.\n" +" -m none supprime le chargement et l'activation de la map " +"d'écran.\n" " -u none supprime le chargement de la map unicode.\n" " -v travaille en mode verbeux.\n" " -C indique la console à utiliser.\n" @@ -1230,8 +1324,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: ne peut restaurer les caractères de la ROM et du fichier. Fonte inchangée.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: ne peut restaurer les caractères de la ROM et du fichier. Fonte " +"inchangée.\n" #: src/setfont.c:259 #, c-format @@ -1271,7 +1369,8 @@ #: src/setfont.c:316 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" -msgstr "Chargement de %d carac. de la fonte %dx%d (%d) à partir du fichier %s\n" +msgstr "" +"Chargement de %d carac. de la fonte %dx%d (%d) à partir du fichier %s\n" #: src/setfont.c:319 #, c-format @@ -1296,7 +1395,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Lors du chargement de plusieurs fontes, elles doivent toutes être des fontes psf - %s ne l'est pas\n" +msgstr "" +"Lors du chargement de plusieurs fontes, elles doivent toutes être des fontes " +"psf - %s ne l'est pas\n" #: src/setfont.c:435 #, c-format @@ -1306,12 +1407,16 @@ #: src/setfont.c:441 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Lors du chargement de plusieurs fontes, elles doivent toutes avoir la même hauteur\n" +msgstr "" +"Lors du chargement de plusieurs fontes, elles doivent toutes avoir la même " +"hauteur\n" #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Lors du chargement de plusieurs fontes, elles doivent toutes avoir la même largeur\n" +msgstr "" +"Lors du chargement de plusieurs fontes, elles doivent toutes avoir la même " +"largeur\n" #: src/setfont.c:487 #, c-format @@ -1341,7 +1446,9 @@ #: src/setfont.c:576 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Euh - une police à partir d'un restorefont ? On utilisera la première moitié.\n" +msgstr "" +"Euh - une police à partir d'un restorefont ? On utilisera la première " +"moitié.\n" #: src/setfont.c:593 #, c-format @@ -1360,7 +1467,9 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Vous avez demandé une taille de fonte %d, mais seul 8, 14, 16 est possible ici.\n" +msgstr "" +"Vous avez demandé une taille de fonte %d, mais seul 8, 14, 16 est possible " +"ici.\n" #: src/setfont.c:673 #, c-format @@ -1422,11 +1531,14 @@ " setleds +caps -num\n" "initialisera CapsLock, libérera NumLock et laissera ScrollLock inchangé.\n" "Les paramètres avant et après modification (s'il y en a) seront rapportés\n" -"lorsque l'option -v est fournie ou lorsque qu'aucune modification n'est demandée.\n" -"Normalement, setleds a un effet sur le paramétrage des fanions du terminal virtuel\n" +"lorsque l'option -v est fournie ou lorsque qu'aucune modification n'est " +"demandée.\n" +"Normalement, setleds a un effet sur le paramétrage des fanions du terminal " +"virtuel\n" "(et ceux-ci sont habituellement équivalents à la luminosité des leds).\n" "Avec -L, les leds sont modifiées sans affecter les fanions.\n" -"Avec -D, les fanions et les fanions par défaut sont affectés, de telle sorte\n" +"Avec -D, les fanions et les fanions par défaut sont affectés, de telle " +"sorte\n" "qu'une réinitialisation subséquente n'affectera par les fanions.\n" #: src/setleds.c:43 @@ -1440,17 +1552,23 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Erreur de lectrure des paramètres courant des leds. Peut-être stdin n'est pas un terminal virtuel ?\n" +msgstr "" +"Erreur de lectrure des paramètres courant des leds. Peut-être stdin n'est " +"pas un terminal virtuel ?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Erreur de lecture des paramètres courants de fanions. Peut-être n'êtes vous pas sur la console ?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Erreur de lecture des paramètres courants de fanions. Peut-être n'êtes vous " +"pas sur la console ?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format msgid "Error reading current led setting from /dev/kbd.\n" -msgstr "Erreur de lecture des paramètres courants des leds à partir de /dev/kbd.\n" +msgstr "" +"Erreur de lecture des paramètres courants des leds à partir de /dev/kbd.\n" #: src/setleds.c:129 #, c-format @@ -1558,7 +1676,9 @@ #: src/setmetamode.c:78 #, c-format msgid "Error reading current setting. Maybe stdin is not a VT?\n" -msgstr "Erreur de lecture des paramètres courants. Peut-être stdin n'est-il pas un terminal virtuel ?\n" +msgstr "" +"Erreur de lecture des paramètres courants. Peut-être stdin n'est-il pas un " +"terminal virtuel ?\n" #: src/setmetamode.c:98 #, c-format @@ -1589,26 +1709,38 @@ "and then edit the values in FILE.\n" "\n" msgstr "" +"Syntaxe : %s vga|FICHIER|-\n" +"\n" +"Si vous utilisez le paramètre FICHIER, alors ce dernier doit contenir " +"exactement 3 lignes de\n" +"valeurs décimales séparées par des virgules pour le ROUGE, le VERT et le " +"BLEU.\n" +"\n" +"Pour voir un exemple de FICHIER valide :\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > FICHIER\n" +"\n" +"puis éditez les valeurs dans FICHIER.\n" +"\n" #: src/setvtrgb.c:85 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "Erreur : %s : valeur invalide dans le champ %u à la ligne %u." #: src/setvtrgb.c:92 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "Erreur : %s : pas assez de champs sur la ligne %u." #: src/setvtrgb.c:98 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "Erreur : %s : la ligne %u se termine prématurément.\n" #: src/setvtrgb.c:102 -#, fuzzy, c-format +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s : %s : AVERTISSEMENT: ligne trop longue\n" +msgstr "Erreur ! %s : la ligne %u est trop longue.\n" #: src/showconsolefont.c:33 #, c-format @@ -1618,7 +1750,7 @@ #: src/showconsolefont.c:38 #, c-format msgid "failed to restore original unimap\n" -msgstr "échec de restauration de la map unimap originale\n" +msgstr "échec de restauration de la mappe unimap originale\n" #: src/showconsolefont.c:56 #, c-format @@ -1648,32 +1780,35 @@ "(en général après avoir chargé une fonte avec `setfont fonte')\n" "\n" "Les options valides sont :\n" -" -C tty Périphérique à partir duquel lire la fonte. Par défaut, c'est la console courante.\n" +" -C tty Périphérique à partir duquel lire la fonte. Par défaut, c'est la " +"console courante.\n" " -v Sortie verbeuse.\n" " -i Ne pas imprimer la table de fonte, afficher simplement\n" " LIGNESxCOLSxCOMPTEUR et quitter.\n" #: src/showconsolefont.c:170 -#, fuzzy, c-format +#, c-format msgid "Character count: %d\n" -msgstr "Largeur de caractère erronée %d\n" +msgstr "Décompte des caractères : %d\n" #: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" -msgstr "" +msgstr "Largeur de fonte : %d\n" #: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" -msgstr "" +msgstr "Hauteur de fonte : %d\n" #: src/showconsolefont.c:184 -#, fuzzy, c-format +#, c-format msgid "" "Showing %d-char font\n" "\n" -msgstr "Chargement de %d carac. de la fonte %dx%d\n" +msgstr "" +"Montre la fonte %d-char\n" +"\n" #: src/showkey.c:42 msgid "?UNKNOWN?" @@ -1719,9 +1854,11 @@ "valid options are:\n" "\n" " -h --help affiche l'aide et quitter\n" -" -a --ascii affiche les touches en valeurs décimales/octales/hexadécimales\n" +" -a --ascii affiche les touches en valeurs décimales/octales/" +"hexadécimales\n" " -s --scancodes affiche seulement les scancodes bruts\n" -" -k --keycodes affiche seulement les codes clavier interprétés (comportement par défaut)\n" +" -k --keycodes affiche seulement les codes clavier interprétés " +"(comportement par défaut)\n" #: src/showkey.c:157 #, c-format @@ -1737,7 +1874,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "appuyer sur n'importe quelle touche (le programme terminera 10s après la dernière touche enfoncée)...\n" +msgstr "" +"appuyer sur n'importe quelle touche (le programme terminera 10s après la " +"dernière touche enfoncée)...\n" #: src/showkey.c:250 msgid "release" @@ -1753,15 +1892,76 @@ msgstr "code clavier %3d %s\n" #: src/totextmode.c:29 -#, fuzzy, c-format +#, c-format msgid "usage: totextmode\n" -msgstr "syntaxe : getkeycodes\n" +msgstr "Syntaxe : totextmode\n" #: src/version.h:20 #, c-format msgid "%s from %s\n" msgstr "%s à partir de %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"argument non reconnu : _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s : le terminal virtuel 1 est la console et ne peut être désalloué\n" + #~ msgid "plus before %s ignored\n" #~ msgstr "plus avant %s est ignoré\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/gr.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/gr.gmo differ diff -Nru kbd-1.15.3/po/gr.po kbd-1.15.5/po/gr.po --- kbd-1.15.3/po/gr.po 2011-04-26 20:29:35.000000000 +0000 +++ kbd-1.15.5/po/gr.po 2012-12-01 21:41:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd 1.08\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-04-12 15:14+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2003-02-16 20:56+0200\n" "Last-Translator: Lefteris Dimitroulakis \n" "Language-Team: Greek \n" @@ -240,12 +240,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: ΠÏοειδοποίηση: Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· γÏαμμή\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "αδÏνατη ανάγνωση %s\n" -#: src/getfd.c:88 src/openvt.c:121 +#: src/getfd.c:84 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Δε μποÏÏŽ να λάβω πεÏιγÏαφέα αÏχείου που αφοÏά την κονσόλα\n" @@ -437,36 +437,36 @@ msgid "unknown keysym '%s'\n" msgstr "άγνωστο keysym '%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, fuzzy, c-format msgid "cannot open include file %s" msgstr "ΑδÏνατο το άνοιγμα του αÏχείου γÏαμματοσειÏάς %s\n" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: ΠÏοειδοποίηση: Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· γÏαμμή\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -478,8 +478,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -489,238 +489,238 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "κωδικός πλήκτÏου %3d %s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, fuzzy, c-format msgid "failed to bind key %d to value %d\n" msgstr "αποτυχία απόδοσης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÏƒÎ¬Ïωσης %x στον κωδικό πλήκτÏου %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, fuzzy, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, fuzzy, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: σφάλμα κατά τον οÏισμό της κατάστασης πληκτÏολογίου\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, fuzzy, c-format msgid "failed to clear string %s\n" msgstr "αποτυχία αποκατάστασης αÏÏ‡Î¹ÎºÎ¿Ï unimap\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, fuzzy, c-format msgid "too many compose definitions\n" msgstr "μέγιστος αÏιθμός συνθέτων Ï€ÏοσδιοÏισμών: %d\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, fuzzy, c-format msgid "(No change in compose definitions.)\n" msgstr "μέγιστος αÏιθμός συνθέτων Ï€ÏοσδιοÏισμών: %d\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Σφάλμα εγγÏαφής της απεικόνισης στο αÏχείο\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, fuzzy, c-format msgid "too many (%d) entries on one line" msgstr "ΠάÏα πολλά αÏχεία για συνδιασμό\n" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, fuzzy, c-format +msgid "Loading %s\n" +msgstr "Σφάλμα ανάγνωσης %s\n" + +#: loadkeys.y:1062 +#, fuzzy, c-format +msgid "syntax error in map file\n" +msgstr "Σφάλμα εγγÏαφής της απεικόνισης στο αÏχείο\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: σφάλμα κατά τον οÏισμό της κατάστασης πληκτÏολογίου\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "σφάλμα κατά την εκτέλεση %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Αδυνατώ να βÏω τη γÏαμματοσειÏά %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "ΑδÏνατο το άνοιγμα του αÏχείου γÏαμματοσειÏάς %s\n" -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "Σφάλμα ανάγνωσης %s\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "Σφάλμα εγγÏαφής της απεικόνισης στο αÏχείο\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "" - #: src/loadunimap.c:43 #, fuzzy, c-format msgid "" @@ -856,97 +856,101 @@ msgid "Saved screen map in `%s'\n" msgstr "Η απεικόνιση της οθόνης αποθηκεÏθηκε στο `%s'\n" -#: src/openvt.c:73 +#: src/openvt.c:44 #, c-format -msgid "openvt: %s: illegal vt number\n" +msgid "" +"Usage: %s [OPTIONS] -- command\n" +"\n" +"This utility help you to start a program on a new virtual terminal (VT).\n" +"\n" +"Options:\n" +" -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" +" -f, --force force opening a VT without checking;\n" +" -l, --login make the command a login shell;\n" +" -u, --user figure out the owner of the current VT;\n" +" -s, --switch switch to the new VT;\n" +" -w, --wait wait for command to complete;\n" +" -v, --verbose print a message for each action;\n" +" -V, --version print program version and exit;\n" +" -h, --help output a brief help message.\n" +"\n" +msgstr "" + +#: src/openvt.c:163 +msgid "Couldn't find owner of current tty!" +msgstr "" + +#: src/openvt.c:231 +#, fuzzy, c-format +msgid "%s: Illegal vt number" msgstr "openvt: %s: παÏάτυπος αÏιθμός vt\n" -#: src/openvt.c:100 -#, c-format -msgid "openvt: only root can use the -u flag.\n" +#: src/openvt.c:257 +#, fuzzy +msgid "Only root can use the -u flag." msgstr "" "openvt: μόνο ο διαχειÏιστής (root) μποÏεί να χÏησιμοποιήσει τη σημαία -u.\n" -#: src/openvt.c:133 -#, c-format -msgid "openvt: cannot find a free vt\n" +#: src/openvt.c:279 +#, fuzzy +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Δε μποÏÏŽ να λάβω πεÏιγÏαφέα αÏχείου που αφοÏά την κονσόλα\n" + +#: src/openvt.c:286 +#, fuzzy +msgid "Cannot find a free vt" msgstr "openvt: δε μποÏÏŽ να βÏω ένα ελεÏθεÏο vt\n" -#: src/openvt.c:138 -#, c-format -msgid "openvt: cannot check whether vt %d is free\n" +#: src/openvt.c:290 +#, fuzzy, c-format +msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: αδÏνατος ο έλεγχος αν το vt %d είναι ελεÏθεÏο\n" -#: src/openvt.c:139 src/openvt.c:144 -#, c-format -msgid " use `openvt -f' to force.\n" -msgstr " χÏησιμοποιείστε `openvt -f' Ï€Ïος εξαναγκασμό.\n" - -#: src/openvt.c:143 -#, c-format -msgid "openvt: vt %d is in use; command aborted\n" +#: src/openvt.c:294 +#, fuzzy, c-format +msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d εν χÏήσει εκτέλεση διαταγής ματαιώθηκε\n" -#: src/openvt.c:170 -#, c-format -msgid "openvt: Unable to open %s: %s\n" -msgstr "openvt: Δε μποÏÏŽ ν' ανοίξω το %s: %s\n" +#: src/openvt.c:304 +msgid "Unable to find command." +msgstr "" -#: src/openvt.c:181 -#, c-format -msgid "openvt: Cannot open %s read/write (%s)\n" -msgstr "openvt: Δε μποÏÏŽ ν' ανοίξω το %s για ανάγνωση/εγγÏαφή (%s)\n" +#: src/openvt.c:336 +#, fuzzy +msgid "Unable to set new session" +msgstr "openvt: ΑδÏνατον το άνοιγμα νέας συνόδου (%s)\n" -#: src/openvt.c:222 -#, c-format -msgid "openvt: using VT %s\n" -msgstr "openvt: χÏησιμοποίηση VT %s\n" +#: src/openvt.c:360 +#, fuzzy, c-format +msgid "Unable to open %s" +msgstr "openvt: Δε μποÏÏŽ ν' ανοίξω το %s: %s\n" -#: src/openvt.c:239 -#, c-format -msgid "openvt: Unable to set new session (%s)\n" -msgstr "openvt: ΑδÏνατον το άνοιγμα νέας συνόδου (%s)\n" +#: src/openvt.c:364 +#, fuzzy, c-format +msgid "Using VT %s" +msgstr "openvt: χÏησιμοποίηση VT %s\n" -#: src/openvt.c:247 -#, c-format -msgid "" -"\n" -"openvt: could not open %s R/W (%s)\n" -msgstr "" -"\n" -"openvt: αδÏνατον το άνοιγμα του %s σε Α/Ε (%s)\n" +#: src/openvt.c:370 +#, fuzzy, c-format +msgid "Cannot open %s read/write" +msgstr "openvt: Δε μποÏÏŽ ν' ανοίξω το %s για ανάγνωση/εγγÏαφή (%s)\n" -#: src/openvt.c:255 +#: src/openvt.c:381 #, fuzzy, c-format -msgid "" -"\n" -"openvt: could not activate vt %d (%s)\n" +msgid "Couldn't activate vt %d" msgstr "" "\n" "openvt: αδÏνατον το άνοιγμα του %s σε Α/Ε (%s)\n" -#: src/openvt.c:262 -#, c-format -msgid "" -"\n" -"openvt: activation interrupted? (%s)\n" +#: src/openvt.c:384 +msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:320 -#, c-format -msgid "openvt: could not deallocate console %d\n" -msgstr "openvt: δε μποÏÏŽ ν' αποδεσμεÏσω την κονσόλα %d\n" - -#: src/openvt.c:339 -#, c-format -msgid "" -"Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -msgstr "" - -#: src/openvt.c:421 -#, c-format -msgid "Couldn't find owner of current tty!\n" -msgstr "" +#: src/openvt.c:424 +#, fuzzy, c-format +msgid "Couldn't deallocate console %d" +msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" #: src/psffontop.c:69 #, c-format @@ -1790,11 +1794,85 @@ msgid "usage: totextmode\n" msgstr "χÏήση: getkeycodes\n" -#: src/version.h:18 +#: src/version.h:20 #, c-format msgid "%s from %s\n" msgstr "%s από %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"μη αναγνωÏισμένα οÏίσματα: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 είναι η κονσόλα και δε μποÏεί ν' αποδεσμευτεί\n" + +#~ msgid " use `openvt -f' to force.\n" +#~ msgstr " χÏησιμοποιείστε `openvt -f' Ï€Ïος εξαναγκασμό.\n" + +#~ msgid "" +#~ "\n" +#~ "openvt: could not open %s R/W (%s)\n" +#~ msgstr "" +#~ "\n" +#~ "openvt: αδÏνατον το άνοιγμα του %s σε Α/Ε (%s)\n" + +#~ msgid "openvt: could not deallocate console %d\n" +#~ msgstr "openvt: δε μποÏÏŽ ν' αποδεσμεÏσω την κονσόλα %d\n" + #, fuzzy #~ msgid "loadkeys: error reading keyboard mode\n" #~ msgstr "kbd_mode: σφάλμα ανάγνωσης καταστάσεως πληκτÏολογίου\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/id.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/id.gmo differ diff -Nru kbd-1.15.3/po/id.po kbd-1.15.5/po/id.po --- kbd-1.15.3/po/id.po 2011-05-14 21:13:26.000000000 +0000 +++ kbd-1.15.5/po/id.po 2012-12-01 21:41:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd 1.15.2\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2010-07-07 23:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -190,8 +190,10 @@ "\t-i --short-info\t tampilkan informasi mengenai driver papan ketik\n" "\t-l --long-info\t tampilkan diatas dan simbol yang diketahui ke loadkeys\n" "\t-n --numeric\t tampilkan tabel tombol dalam notasi heksa desimal\n" -"\t-f --full-table\t jangan gunakan notasi singkatan, satu baris setiap kode tombol\n" -"\t-1 --separate-lines satu baris setiap (pemodifikasi, kode tombol) pasangan\n" +"\t-f --full-table\t jangan gunakan notasi singkatan, satu baris setiap " +"kode tombol\n" +"\t-1 --separate-lines satu baris setiap (pemodifikasi, kode tombol) " +"pasangan\n" "\t --funcs-only\t tampilkan hanya string kunci string\n" "\t --key-only\t tampilkan hanya pengikatan tombol\n" "\t --compose-only tampilkan hanya kombinasi tombol compose\n" @@ -243,15 +245,16 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: Peringatan: baris terlalu panjang\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Tidak dapat membuka %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "Tidak dapat memperoleh deskripsi berkas yang mereferensikan ke konsole\n" +msgstr "" +"Tidak dapat memperoleh deskripsi berkas yang mereferensikan ke konsole\n" #: src/getkeycodes.c:18 #, c-format @@ -266,7 +269,8 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 adalah sebuah error; untuk 1-88 (0x01-0x58) scancode sama dengan keycode\n" +msgstr "" +"0 adalah sebuah error; untuk 1-88 (0x01-0x58) scancode sama dengan keycode\n" #: src/getkeycodes.c:62 #, c-format @@ -435,36 +439,36 @@ msgid "unknown keysym '%s'\n" msgstr "keysym '%s' tidak diketahui\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "includes nested terlalu dalam" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "berubah ke %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "tidak dapat membuka berkas include %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: Peringatan: baris terlalu panjang\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -476,8 +480,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -504,120 +508,120 @@ " -u --unicode konversi implisit ke Unicode\n" " -v --verbose laporkan perubahan\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap dipanggil dengan indeks %d buruk" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "menambahkan peta %d melanggar baris peta-kunci eksplisit" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey dipanggil dengan indeks %d buruk" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey dipanggil dengan tabel %d buruk" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey dipanggil dengan kode tombol %d buruk" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey dipanggil dengan indeks %d buruk" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey dipanggil dengan tabel %d buruk" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc dipanggil dengan func %d buruk\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: func_buf overflow\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "tabel compose overflow\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: tidak dapat mengubah ke mode Unicode\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Peta-tombol %d: Ijin ditolak\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "kode-tombol %d, tabel %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " GAGAL" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "gagal untuk mengikat tombol %d ke nilai %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "dealokasi peta tombol %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: tidak dapat dealokasikan peta-tombol %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: tidak dapat dealokasikan atau menghapus peta-tombol\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: tidak dapat kembali ke mode keyboard asli\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "gagal untuk mengikat string '%s' ke fungsi %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "gagal untuk menghapus string %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "terlalu banyak definisi compose\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "tidak mungkin error dalam do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -626,75 +630,90 @@ "\n" "Diubah %d %s dan %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "tombol" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "tombol" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "string" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "string" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Dimuat %d compose %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "definisi" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "definisi" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Tidak ada perubahan dalam definisi compose.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: tidak tahu bagaimana compose untuk %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Error menulis peta ke berkas\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' adalah sebuah tombol fungsi simbol" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "terlalu banyak (%d) masukan dalam satu baris" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "terlalu banyak definisi tombol dalam satu baris" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Memuat %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "sintaks error dalam berkas peta\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "pengikatan tombol tidak berubah\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 -#, c-format -msgid "%s: error reading keyboard mode\n" +#: loadkeys.y:1158 +#, fuzzy, c-format +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: error membaca mode keyboard\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, fuzzy, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -703,7 +722,7 @@ "%s: peringatan: memuat peta-kunci Unicode dalam console tidak-Unicode\n" " (mungkin anda ingin melakukan `kbd_mode -u'?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -712,36 +731,21 @@ "%s: peringatan: memuat peta-kunci Unicode dalam console tidak-Unicode\n" " (mungkin anda ingin melakukan `kbd_mode -u'?)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "berubah ke %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Tidak dapat menemukan %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "tidak dapat membuka berkas %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Memuat %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "sintaks error dalam berkas peta\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "pengikatan tombol tidak berubah\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -769,12 +773,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Jangkauan unicode yang berhubungan ke posisi font dalam daerah 0x%x-0x%x buruk\n" +msgstr "" +"%s: Jangkauan unicode yang berhubungan ke posisi font dalam daerah 0x%x-0x%x " +"buruk\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Daerah unicoe U+%x-U+%x tidak dari panjang yang sama seperti posisi font daerah 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Daerah unicoe U+%x-U+%x tidak dari panjang yang sama seperti posisi font " +"daerah 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -877,6 +887,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -888,80 +899,81 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 #, fuzzy msgid "Couldn't find owner of current tty!" msgstr "Tidak dapat menemukan pemilik dari tty sekarang!\n" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: nomor vt tidak legal\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: hanya root yang dapat menggunakan pilihan -u.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" -msgstr "Tidak dapat memperoleh deskripsi berkas yang mereferensikan ke konsole\n" +msgstr "" +"Tidak dapat memperoleh deskripsi berkas yang mereferensikan ke konsole\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: tidak dapat menemukan sebuah free vt\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: tidak dapat memeriksa apakah vt %d bebas\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d sedang digunakan; perintah dibatalkan\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: Tidak dapat menset sesi baru (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Tidak dapat membuka %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: menggunakan VT %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Tidak dapat membuka %s baca/tulis (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, fuzzy, c-format msgid "Couldn't activate vt %d" msgstr "" "\n" "openvt: tidak dapat mengaktifkan vt %d (%s)\n" -#: src/openvt.c:383 +#: src/openvt.c:384 #, fuzzy msgid "Activation interrupted?" msgstr "" "\n" "openvt: aktivasi terinterupsi? (%s)\n" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: tidak dapat didealokasikan console %d\n" @@ -1068,8 +1080,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Sebuah daerah dari posisi font yang berkorespondensi, seharusnya sebuah jangkauan Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Sebuah daerah dari posisi font yang berkorespondensi, seharusnya sebuah " +"jangkauan Unicode\n" #: src/psfxtable.c:257 #, c-format @@ -1105,7 +1121,8 @@ "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" msgstr "" "Penggunaan:\n" -"\t%s [-i font-masukan] [-o font-keluaran] [-it tabel-masukan] [-ot tabel-keluaran] [-nt]\n" +"\t%s [-i font-masukan] [-o font-keluaran] [-it tabel-masukan] [-ot tabel-" +"keluaran] [-nt]\n" #: src/psfxtable.c:360 #, c-format @@ -1149,19 +1166,24 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: jangan lupa untuk mengubah TERM (mungkin ke con%dx%d atau linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: jangan lupa untuk mengubah TERM (mungkin ke con%dx%d atau linux-" +"%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "panggilan adalah: resizecons COLSxROWS atau: resizecons COLS ROWS\n" -"atau: resizecons -lines ROWS, dengan ROWS satu dari 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"atau: resizecons -lines ROWS, dengan ROWS satu dari 25, 28, 30, 34, 36, 40, " +"44, 50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1201,7 +1223,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1225,7 +1248,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Penggunaan: setfont [pilihan-tulis] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Penggunaan: setfont [pilihan-tulis] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " pilihan-tulis (mengambil tempat sebelum berkas meload):\n" " -o Tulis font sekarang ke \n" " -O Tulis font sekarang dan peta unicode ke \n" @@ -1235,9 +1259,11 @@ "sebuah font baku diload:\n" " setfont Load font \"default[.gz]\"\n" " setfont Load font \"default8x[.gz]\"\n" -"Pilihan - memilih sebuah font dari sebuah kode halaman yang berisi tiga font:\n" +"Pilihan - memilih sebuah font dari sebuah kode halaman yang berisi tiga " +"font:\n" " setfont -{8|14|16} codepage.cp[.gz] Load 8x font dari codepage.cp\n" -"Secara eksplisit (dengan -m atau -u) atau secara implisit (dalam berkas font) diberikan pemetaan\n" +"Secara eksplisit (dengan -m atau -u) atau secara implisit (dalam berkas " +"font) diberikan pemetaan\n" "yang akan diload dan, dalam kasus consolemaps, diaktivasikan.\n" " -h (tidak ada spasi) Override tinggi font.\n" " -m Load console screen map.\n" @@ -1256,8 +1282,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: tidak dapat baik mengembalikan dari karakter ROM dan dari berkas.Font tidak berubah.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: tidak dapat baik mengembalikan dari karakter ROM dan dari berkas." +"Font tidak berubah.\n" #: src/setfont.c:259 #, c-format @@ -1367,7 +1397,9 @@ #: src/setfont.c:576 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Hmm - sebuah font dari restorefont? Menggunakan potongan setengah yang pertama.\n" +msgstr "" +"Hmm - sebuah font dari restorefont? Menggunakan potongan setengah yang " +"pertama.\n" #: src/setfont.c:593 #, c-format @@ -1381,12 +1413,15 @@ "using an option -8 or -14 or -16 which one you want loaded.\n" msgstr "" "File ini berisi 3 fonts: 8x8, 8x14, dan 8x16. Mohon indikasikan\n" -"dengan menggunakan sebuah pilihan -8 atau -14 atau -16 mana yang anda ingin load.\n" +"dengan menggunakan sebuah pilihan -8 atau -14 atau -16 mana yang anda ingin " +"load.\n" #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Anda bertanya untuk ukuran font %d, tetapi hanya 8, 14, 16 yang memungkinkan disini.\n" +msgstr "" +"Anda bertanya untuk ukuran font %d, tetapi hanya 8, 14, 16 yang memungkinkan " +"disini.\n" #: src/setfont.c:673 #, c-format @@ -1446,7 +1481,8 @@ "\tsetleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" "Jadi,\n" "\tsetleds +caps -num\n" -"akan menset CapsLock, menhapus NumLock dan meninggalkan ScrollLock tidak berubah.\n" +"akan menset CapsLock, menhapus NumLock dan meninggalkan ScrollLock tidak " +"berubah.\n" "Konfigurasi sebelum dan setelah perubahan (jika ada) akan dilaporkan\n" "ketika pilihan -v diberikan atau ketika tidak ada perubahan diminta.\n" "Secara normal, setleds mempengaruhi konfigurasi pilihan vt\n" @@ -1466,12 +1502,16 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Error membaca konfigurasi led sekarang. Mungkin stdin bukan sebuah VT?\n" +msgstr "" +"Error membaca konfigurasi led sekarang. Mungkin stdin bukan sebuah VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Error membaca konfigurasi pilihan sekarang. Mungkin anda tidak berada di konsole?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Error membaca konfigurasi pilihan sekarang. Mungkin anda tidak berada di " +"konsole?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1765,7 +1805,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "tekan tombol apapun (aplikasi akan berakhir setelah 10 detik dari penekanan tombol terakhir)...\n" +msgstr "" +"tekan tombol apapun (aplikasi akan berakhir setelah 10 detik dari penekanan " +"tombol terakhir)...\n" #: src/showkey.c:250 msgid "release" @@ -1790,6 +1832,67 @@ msgid "%s from %s\n" msgstr "%s dari %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"argumen tidak diketahui: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 adalah konsole dan tidak dapat didealokasikan\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " gunakan `openvt -f' untuk memaksa.\n" @@ -1803,8 +1906,12 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: tidak dapat mendealokasikan konsole %d\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Penggunaan: openvt [-c nomor-vt] [-f] [-l] [-u] [-s] [-v] [-w] -- baris_perintah\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" +#~ msgstr "" +#~ "Penggunaan: openvt [-c nomor-vt] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "baris_perintah\n" #~ msgid "loadkeys: error reading keyboard mode\n" #~ msgstr "loadkeys: error membaca mode keyboard\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/it.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/it.gmo differ diff -Nru kbd-1.15.3/po/it.po kbd-1.15.5/po/it.po --- kbd-1.15.3/po/it.po 2011-05-14 21:13:16.000000000 +0000 +++ kbd-1.15.5/po/it.po 2012-12-01 21:41:38.000000000 +0000 @@ -1,14 +1,14 @@ # Italian translation of kbd # Copyright (C) 2010 Alexey Gladkov # This file is distributed under the same license as the kbd package. -# Sergio Zanchetta , 2010. +# Sergio Zanchetta , 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: kbd-1.15.2\n" +"Project-Id-Version: kbd-1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2010-12-08 15:45+0100\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2011-06-13 00:36+0200\n" "Last-Translator: Sergio Zanchetta \n" "Language-Team: Italian \n" "Language: it\n" @@ -189,7 +189,8 @@ "\n" "\t-h --help\t Visualizza questo aiuto testuale\n" "\t-i --short-info\t Visualizza le informazioni sul driver della tastiera\n" -"\t-l --long-info\t Visualizza come sopra compresi i simboli noti a loadkeys\n" +"\t-l --long-info\t Visualizza come sopra compresi i simboli noti a " +"loadkeys\n" "\t-n --numeric\t Visualizza la tabella tasti in notazione esadecimale\n" "\t-f --full-table\t Non usa notazioni brevi, una riga per codice tasto\n" "\t-1 --separate-lines Una riga per coppia di (modificatore,codice tasto)\n" @@ -228,7 +229,8 @@ "\n" "\t-h --help Mostra questo aiuto testuale\n" "\t-V --version Mostra la versione del programma\n" -"\t-n --next-available Mostra il numero di terminale virtuale non allocato successivo\n" +"\t-n --next-available Mostra il numero di terminale virtuale non allocato " +"successivo\n" #: src/fgconsole.c:66 msgid "Couldn't read VTNO: " @@ -240,19 +242,20 @@ msgstr "errore nell'esecuzione di %s\n" #: src/findfile.c:157 -#, fuzzy, c-format +#, c-format msgid "Warning: path too long: %s/%s\n" -msgstr "%s: attenzione: riga troppo lunga\n" +msgstr "Attenzione, percorso troppo lungo: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Impossibile aprire %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "Impossibile ottenere un descrittore di file che si riferisce alla console\n" +msgstr "" +"Impossibile ottenere un descrittore di file che si riferisce alla console\n" #: src/getkeycodes.c:18 #, c-format @@ -267,12 +270,15 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 eÌ€ un errore; per 1-88 (0x01-0x58) il codice di scansione eÌ€ uguale al codice di tasto\n" +msgstr "" +"0 eÌ€ un errore; per 1-88 (0x01-0x58) il codice di scansione eÌ€ uguale al " +"codice di tasto\n" #: src/getkeycodes.c:62 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "per 1-%d (0x01-0x%02x) il codice di scansione eÌ€ uguale al codice di tasto\n" +msgstr "" +"per 1-%d (0x01-0x%02x) il codice di scansione eÌ€ uguale al codice di tasto\n" #: src/getkeycodes.c:68 #, c-format @@ -288,7 +294,8 @@ #: src/getkeycodes.c:93 #, c-format msgid "failed to get keycode for scancode 0x%x\n" -msgstr "recupero del codice di tasto per il codice di scansione 0x%x non riuscito\n" +msgstr "" +"recupero del codice di tasto per il codice di scansione 0x%x non riuscito\n" #: src/getunimap.c:29 #, c-format @@ -307,17 +314,21 @@ " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" msgstr "" +"Uso: %1$s [-C DEVICE] getmode [text|graphics]\n" +" o: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" +" o: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" +" o: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" #: src/kbdinfo.c:65 #, c-format msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "Errore: argomenti non sufficienti.\n" #: src/kbdinfo.c:124 -#, fuzzy, c-format +#, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" -"argomento non riconosciuto: _%s_\n" +"Errore, azione non riconosciuta: %s\n" "\n" #: src/kbd_mode.c:20 @@ -392,7 +403,7 @@ #: src/kdmapop.c:159 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "strano... ct è cambiato da %d a %d\n" #: src/kdmapop.c:185 #, c-format @@ -400,11 +411,14 @@ "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"Sembra che questo kernel sia antecedente al 1.1.92\n" +"Nessuna tabella di mappatura Unicode caricata.\n" #: src/ksyms.c:1713 #, c-format msgid "unknown charset %s - ignoring charset request\n" -msgstr "set di caratteri %s sconosciuto - richiesta del set di caratteri ignorata\n" +msgstr "" +"set di caratteri %s sconosciuto - richiesta del set di caratteri ignorata\n" #: src/ksyms.c:1819 #, c-format @@ -436,36 +450,35 @@ msgid "unknown keysym '%s'\n" msgstr "simbolo di tasto \"%s\" sconosciuto\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "gli include sono nidificati troppo in profondità" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "passaggio a %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "impossibile aprire il file include %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" -msgstr "" +msgstr "atteso un nome di file tra virgolette" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" -msgstr "" +msgstr "simbolo di tasto unicode fuori dall'intervallo: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 -#, fuzzy +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" -msgstr "%s: attenzione: riga troppo lunga\n" +msgstr "stringa troppo lunga" -#: loadkeys.y:90 +#: loadkeys.y:93 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -477,8 +490,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -493,132 +506,133 @@ "\n" "Opzioni valide sono:\n" "\n" -" -b --bkeymap Invia una mappatura binaria sullo standard output\n" +" -a --ascii Forza la conversione ad ASCII\n" +" -b --bkeymap Invia una mappatura binaria allo standard output\n" " -c --clearcompose Cancella la tabella compose del kernel\n" " -C --console=\n" " I device della console da usare\n" " -d --default Carica \"%s\"\n" " -h --help Mostra questo aiuto testuale\n" -" -m --mktable Invia un \"defkeymap.c\" sullo standard output\n" +" -m --mktable Invia un \"defkeymap.c\" allo standard output\n" " -q --quiet Elimina tutto il consueto output\n" " -s --clearstrings Cancella la tabella stringhe del kernel\n" " -u --unicode Forza la conversione a Unicode\n" " -v --verbose Riporta le modifiche\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap chiamata con indice %d errato" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "l'aggiunta della mappa %d vìola la riga delle mappature esplicite" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey chiamata con indice %d errato" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey chiamata con tabella %d errata" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey chiamata con codice di tasto %d errato" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey chiamata con indice %d errato" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey chiamata con tabella %d errata" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc chiamata con funzione %d errata\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: overflow di func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "overflow della tabella compose\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: impossibile passare alla modalità Unicode\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Mappatura %d: permesso negato\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "codice tasto %d, tabella %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " ERRORE" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "associazione del tasto %d al valore %d non riuscita\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "deallocazione della mappatura %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: impossibile deallocare la mappatura %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: impossibile deallocare o cancellare la mappatura\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: impossibile ripristinare la modalità originaria della tastiera\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "associazione della stringa \"%s\" alla funzione %s non riuscita\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "cancellazione della stringa %s non riuscita\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "troppe definizioni compose\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "errore impossibile in do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -627,122 +641,122 @@ "\n" "Cambiato %d %s e %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "tasto" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "tasti" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "stringa" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "stringhe" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Effettuato il caricamento di %d %s compose.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "definizione" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "definizioni" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Nessuna modifica nelle definizioni compose.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: non si sa come gestire la composizione per %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Errore nella scrittura della mappa sul file\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "\"%s\" non è un simbolo di tasto funzione" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "troppe (%d) voci su una riga" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "troppe definizioni di tasto su una riga" -#: loadkeys.y:1110 +#: loadkeys.y:1057 #, c-format -msgid "%s: Options --unicode and --ascii are mutually exclusive\n" -msgstr "" +msgid "Loading %s\n" +msgstr "Caricamento di %s\n" -#: loadkeys.y:1123 +#: loadkeys.y:1062 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: errore nella lettura della modalità di tastiera\n" +msgid "syntax error in map file\n" +msgstr "errore di sintassi nel file di mappa\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "associazioni di tasti non modificate\n" -#: loadkeys.y:1131 +#: loadkeys.y:1146 +#, c-format +msgid "%s: Options --unicode and --ascii are mutually exclusive\n" +msgstr "%s: le opzioni --unicode e --ascii sono mutuamente esclusive\n" + +#: loadkeys.y:1158 #, fuzzy, c-format +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: errore nella lettura della modalità di tastiera\n" + +#: loadkeys.y:1166 +#, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -"%s: attenzione: caricata una mappatura Unicode su una console non Unicode\n" -" (forse si vuole eseguire \"kbd_mode -u\")\n" +"%s: attenzione, caricata una mappatura non Unicode su una console Unicode\n" +" (forse si vuole eseguire \"kbd_mode -a\")\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -"%s: attenzione: caricata una mappatura Unicode su una console non Unicode\n" +"%s: attenzione, caricata una mappatura Unicode su una console non Unicode\n" " (forse si vuole eseguire \"kbd_mode -u\")\n" -#: loadkeys.y:1157 -#, fuzzy, c-format +#: loadkeys.y:1187 +#, c-format msgid "Searching in %s\n" -msgstr "passaggio a %s\n" +msgstr "Ricerca in %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Impossibile trovare %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "impossibile aprire il file %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Caricamento di %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "errore di sintassi nel file di mappa\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "associazioni di tasti non modificate\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -760,7 +774,8 @@ #: src/loadunimap.c:195 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s: numero di glifo (0x%x) più grande della lunghezza del tipo di carattere\n" +msgstr "" +"%s: numero di glifo (0x%x) più grande della lunghezza del tipo di carattere\n" #: src/loadunimap.c:201 #, c-format @@ -770,12 +785,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: intervallo Unicode errato in corrispondenza dell'intervallo di posizione del carattere 0x%x-0x%x\n" +msgstr "" +"%s: intervallo Unicode errato in corrispondenza dell'intervallo di posizione " +"del carattere 0x%x-0x%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: l'intervallo Unicode U+%x-U+%x non ha la stessa lunghezza dell'intervallo di posizione del carattere 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: l'intervallo Unicode U+%x-U+%x non ha la stessa lunghezza " +"dell'intervallo di posizione del carattere 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -870,7 +891,7 @@ msgstr "Mappa schermo salvata in \"%s\"\n" #: src/openvt.c:44 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" "\n" @@ -878,6 +899,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -888,84 +910,95 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"Uso: %s [OPZIONI] -- comando\n" +"\n" +"Questa utilità aiuta ad avviare un programma in un nuovo terminale virtuale " +"(TV).\n" +"\n" +"Opzioni:\n" +" -c, --console=NUM Usa il numero di TV fornito;\n" +" -f, --force Forza l'apertura di un TV senza verifiche;\n" +" -l, --login Rende il comando una shell di login;\n" +" -u, --user Trova il proprietario del TV corrente;\n" +" -s, --switch Passa al nuovo TV;\n" +" -w, --wait Attende il termine del comando;\n" +" -v, --verbose Stampa un messaggio per ciascuna azione;\n" +" -V, --version Stampa la versione del programma ed esce;\n" +" -h, --help Mostra un breve messaggio di aiuto.\n" +"\n" -#: src/openvt.c:162 -#, fuzzy +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" -msgstr "Impossibile trovare il proprietario del tty corrente.\n" +msgstr "Impossibile trovare il proprietario del tty corrente." -#: src/openvt.c:230 -#, fuzzy, c-format +#: src/openvt.c:231 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt: %s: numero di terminale virtuale non consentito\n" +msgstr "%s: numero di terminale virtuale non consentito" -#: src/openvt.c:256 -#, fuzzy +#: src/openvt.c:257 msgid "Only root can use the -u flag." -msgstr "openvt: solo root può usare l'opzione -u.\n" +msgstr "Solo root può usare l'opzione -u." -#: src/openvt.c:278 -#, fuzzy +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" -msgstr "Impossibile ottenere un descrittore di file che si riferisce alla console\n" +msgstr "" +"Impossibile ottenere un descrittore di file che si riferisca alla console" -#: src/openvt.c:285 -#, fuzzy +#: src/openvt.c:286 msgid "Cannot find a free vt" -msgstr "openvt: impossibile trovare un terminale virtuale libero\n" +msgstr "Impossibile trovare un terminale virtuale libero" -#: src/openvt.c:289 -#, fuzzy, c-format +#: src/openvt.c:290 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt: impossibile verificare se il terminale virtuale %d è libero\n" +msgstr "" +"Impossibile verificare se il terminale virtuale %d sia libero; usare \"%s -f" +"\" per forzarlo." -#: src/openvt.c:293 -#, fuzzy, c-format +#: src/openvt.c:294 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt: il terminale virtuale %d è in uso; comando interrotto\n" +msgstr "" +"Il terminale virtuale %d è in uso, comando interrotto; usare \"%s -f\" per " +"forzarlo." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." -msgstr "" +msgstr "Impossibile trovare il comando." -#: src/openvt.c:335 -#, fuzzy +#: src/openvt.c:336 msgid "Unable to set new session" -msgstr "openvt: impossibile impostare una nuova sessione (%s)\n" +msgstr "Impossibile impostare una nuova sessione" -#: src/openvt.c:359 -#, fuzzy, c-format +#: src/openvt.c:360 +#, c-format msgid "Unable to open %s" -msgstr "openvt: impossibile aprire %s: %s\n" +msgstr "Impossibile aprire %s" -#: src/openvt.c:363 -#, fuzzy, c-format +#: src/openvt.c:364 +#, c-format msgid "Using VT %s" -msgstr "openvt: usato il terminale virtuale %s\n" +msgstr "Viene usato il terminale virtuale %s" -#: src/openvt.c:369 -#, fuzzy, c-format +#: src/openvt.c:370 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt: impossibile aprire %s in lettura/scrittura (%s)\n" +msgstr "Impossibile aprire %s in lettura/scrittura" -#: src/openvt.c:380 -#, fuzzy, c-format +#: src/openvt.c:381 +#, c-format msgid "Couldn't activate vt %d" -msgstr "" -"\n" -"openvt: impossibile attivare il terminale virtuale %d (%s)\n" +msgstr "Impossibile attivare il terminale virtuale %d" -#: src/openvt.c:383 -#, fuzzy +#: src/openvt.c:384 msgid "Activation interrupted?" -msgstr "" -"\n" -"openvt: forse l'attivazione è stata interrotta (%s)\n" +msgstr "Forse l'attivazione è stata interrotta" -#: src/openvt.c:423 -#, fuzzy, c-format +#: src/openvt.c:424 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s: impossibile deallocare la console %d\n" +msgstr "Impossibile deallocare la console %d" #: src/psffontop.c:69 #, c-format @@ -1069,8 +1102,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: in corrispondenza di un intervallo di posizioni carattere dovrebbe esserci un intervallo Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: in corrispondenza di un intervallo di posizioni carattere dovrebbe " +"esserci un intervallo Unicode\n" #: src/psfxtable.c:257 #, c-format @@ -1106,7 +1143,8 @@ "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" msgstr "" "Uso:\n" -"\t%s [-i caratterein] [-o carattereout] [-it tabellain] [-ot tabellaout] [-nt]\n" +"\t%s [-i caratterein] [-o carattereout] [-it tabellain] [-ot tabellaout] [-" +"nt]\n" #: src/psfxtable.c:360 #, c-format @@ -1150,19 +1188,24 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: non dimenticarsi di cambiare TERM (forse in con%dx%d o linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: non dimenticarsi di cambiare TERM (forse in con%dx%d o linux-%dx" +"%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "uso: resizecons COLONNExRIGHE o: resizecons COLONNE RIGHE\n" -"o: resizecons -lines RIGHE, con RIGHE uno tra 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"o: resizecons -lines RIGHE, con RIGHE uno tra 25, 28, 30, 34, 36, 40, 44, " +"50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1202,7 +1245,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1226,19 +1270,25 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Uso: setfont [opzioni-scrittura] [-] [nuovotipocarattere..] [-m mappaconsole] [-u mappaunicode]\n" +"Uso: setfont [opzioni-scrittura] [-] [nuovotipocarattere..] [-m " +"mappaconsole] [-u mappaunicode]\n" " opzioni-scrittura (operano prima del caricamente del file):\n" " -o Scrive il tipo di carattere corrente in \n" -" -O Scrive il tipo di carattere corrente e la mappa Unicode in \n" +" -O Scrive il tipo di carattere corrente e la mappa Unicode " +"in \n" " -om Scrive la mappa console corrente in \n" " -ou Scrive la mappa Unicode corrente in \n" -"Se non è fornito né alcun tipo di carattere nuovo né alcuna opzione -[o|O|om|ou|m|u],\n" +"Se non è fornito né alcun tipo di carattere nuovo né alcuna opzione -[o|O|om|" +"ou|m|u],\n" "viene caricato un tipo di carattere predefinito:\n" " setfont Carica il tipo di carattere \"default[.gz]\"\n" " setfont - Carica il tipo di carattere \"default8x[.gz]\"\n" -"L'opzione - seleziona un tipo di carattere da una pagina codici che ne contiene tre:\n" -" setfont -{8|14|16} codepage.cp[.gz] Carica il tipo di carattere 8x da codepage.cp\n" -"Le mappature esplicitamente (con -m o -u) o implicitamente (nel file carattere) fornite\n" +"L'opzione - seleziona un tipo di carattere da una pagina codici che ne " +"contiene tre:\n" +" setfont -{8|14|16} codepage.cp[.gz] Carica il tipo di carattere 8x " +"da codepage.cp\n" +"Le mappature esplicitamente (con -m o -u) o implicitamente (nel file " +"carattere) fornite\n" "verranno caricate e, in caso di mappe console, attivate.\n" " -h (nessuno spazio) Sovrascrive l'altezza dei caratteri.\n" " -m Carica la mappa schermo della console.\n" @@ -1257,8 +1307,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: impossibile ripristinare sia dalla ROM caratteri che dal file. Carattere non modificato.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: impossibile ripristinare sia dalla ROM caratteri che dal file. " +"Carattere non modificato.\n" #: src/setfont.c:259 #, c-format @@ -1283,27 +1337,27 @@ #: src/setfont.c:300 #, c-format msgid "%s: background will look funny\n" -msgstr "%s: lo sfondo sarà simpatico\n" +msgstr "%s: lo sfondo sarà strano\n" #: src/setfont.c:310 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" -msgstr "Caricamento dei caratteri di tipo %d-char %dx%d dal file %s\n" +msgstr "Caricamento del tipo di carattere %d-char %dx%d dal file %s\n" #: src/setfont.c:313 #, c-format msgid "Loading %d-char %dx%d font\n" -msgstr "Caricamento dei caratteri di tipo %d-char %dx%d\n" +msgstr "Caricamento del tipo di carattere %d-char %dx%d\n" #: src/setfont.c:316 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" -msgstr "Caricamento dei caratteri di tipo %d-char %dx%d (%d) dal file %s\n" +msgstr "Caricamento del tipo di carattere %d-char %dx%d (%d) dal file %s\n" #: src/setfont.c:319 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" -msgstr "Caricamento dei caratteri di tipo %d-char %dx%d (%d)\n" +msgstr "Caricamento del tipo di carattere %d-char %dx%d (%d)\n" #: src/setfont.c:372 #, c-format @@ -1323,22 +1377,28 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Quando vengono caricati diversi tipi di carattere, devono essere tutti di tipo psf - %s non lo è\n" +msgstr "" +"Quando vengono caricati diversi tipi di carattere, devono essere tutti di " +"tipo psf - %s non lo è\n" #: src/setfont.c:435 #, c-format msgid "Read %d-char %dx%d font from file %s\n" -msgstr "Lettura dei caratteri di tipo %d-char %dx%d dal file %s\n" +msgstr "Lettura del tipo di carattere %d-char %dx%d dal file %s\n" #: src/setfont.c:441 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Quando vengono aperti diversi tipi di carattere, devono avere tutti la stessa altezza\n" +msgstr "" +"Quando vengono aperti diversi tipi di carattere, devono avere tutti la " +"stessa altezza\n" #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Quando vengono aperti diversi tipi di carattere, devono avere tutti la stessa larghezza\n" +msgstr "" +"Quando vengono aperti diversi tipi di carattere, devono avere tutti la " +"stessa larghezza\n" #: src/setfont.c:487 #, c-format @@ -1368,7 +1428,8 @@ #: src/setfont.c:576 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Hmm - un tipo di carattere da restorefont. Ne viene usata la prima metà.\n" +msgstr "" +"Hmm - un tipo di carattere da restorefont. Ne viene usata la prima metà.\n" #: src/setfont.c:593 #, c-format @@ -1387,7 +1448,9 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "È stato richiesto %d come dimensione di carattere, ma i valori possibili sono solo 8, 14 e 16.\n" +msgstr "" +"È stato richiesto %d come dimensione di carattere, ma i valori possibili " +"sono solo 8, 14 e 16.\n" #: src/setfont.c:673 #, c-format @@ -1425,7 +1488,8 @@ #: src/setkeycodes.c:68 #, c-format msgid "failed to set scancode %x to keycode %d\n" -msgstr "impostazione del codice di scansione %x al codice di tasto %d non riuscita\n" +msgstr "" +"impostazione del codice di scansione %x al codice di tasto %d non riuscita\n" #: src/setleds.c:21 #, c-format @@ -1448,9 +1512,11 @@ "Perciò,\n" "\tsetleds +caps -num\n" "imposta il BlocMaiusc, libera il BlocNum e lascia invariato il BlocScorr.\n" -"Le impostazioni precedenti e successive alla modifica (se presente) sono riportate\n" +"Le impostazioni precedenti e successive alla modifica (se presenti) sono " +"riportate\n" "quando viene fornita l'opzione -v o quando non è richiesta alcuna modifica.\n" -"Normalmente setleds influenza le impostazioni dei flag del terminale virtuale\n" +"Normalmente setleds influenza le impostazioni dei flag del terminale " +"virtuale\n" "(che di solito si riflettono nei led).\n" "Con -L, setleds imposta solo i led e lascia invariati i flag.\n" "Con -D, setleds imposta sia i flag che i flag predefiniti, in modo\n" @@ -1467,17 +1533,22 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Errore nella lettura dell'impostazione corrente dei led. Forse lo standard input non è un terminale virtuale.\n" +msgstr "" +"Errore nella lettura dell'impostazione corrente del led. Forse lo standard " +"input non è un terminale virtuale.\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Errore nella lettura dell'impostazione corrente dei flag. Forse non ci si trova su una console.\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Errore nella lettura dell'impostazione corrente dei flag. Forse non ci si " +"trova su una console.\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format msgid "Error reading current led setting from /dev/kbd.\n" -msgstr "Errore nella lettura dell'impostazione del led corrente da /dev/kbd.\n" +msgstr "Errore nella lettura dell'impostazione corrente del led da /dev/kbd.\n" #: src/setleds.c:129 #, c-format @@ -1585,7 +1656,9 @@ #: src/setmetamode.c:78 #, c-format msgid "Error reading current setting. Maybe stdin is not a VT?\n" -msgstr "Errore nella lettura delle impostazioni correnti. Forse lo stdin non è un terminale virtuale.\n" +msgstr "" +"Errore nella lettura delle impostazioni correnti. Forse lo stdin non è un " +"terminale virtuale.\n" #: src/setmetamode.c:98 #, c-format @@ -1616,26 +1689,36 @@ "and then edit the values in FILE.\n" "\n" msgstr "" +"Uso: %s vga|FILE|-\n" +"\n" +"Se viene usato il parametro FILE, dovrebbe essere composto da valori\n" +"decimali per ROSSO, VERDE e BLU separati da una virgola su 3 righe.\n" +"\n" +"Per ottenere un FILE valido:\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > FILE\n" +"\n" +"e quindi modificare i valori nel FILE.\n" +"\n" #: src/setvtrgb.c:85 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "Errore: %s, valore non valido nel campo %u riga %u." #: src/setvtrgb.c:92 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "Errore: %s, numero insufficiente di campi nella riga %u." #: src/setvtrgb.c:98 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "Errore: %s, la riga %u è terminata in modo inatteso.\n" #: src/setvtrgb.c:102 -#, fuzzy, c-format +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s: %s: attenzione: riga troppo lunga\n" +msgstr "Errore: %s, la riga %u è troppo lunga.\n" #: src/showconsolefont.c:33 #, c-format @@ -1672,10 +1755,12 @@ msgstr "" "uso: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" -"(probabilmente dopo il caricamento di un carattere con \"setfont tipo-carattere\")\n" +"(probabilmente dopo il caricamento di un carattere con \"setfont tipo-" +"carattere\")\n" "\n" "Opzioni valide sono:\n" -" -C tty Il device dal quale leggere il tipo di carattere. Predefinito: tty corrente.\n" +" -C tty Il device dal quale leggere il tipo di carattere. Predefinito: tty " +"corrente.\n" " -v Modalità più prolissa.\n" " -i Non stampa la tabella caratteri, mostra solo\n" " RIGHExCOLONNExCONTATORE ed esce.\n" @@ -1701,7 +1786,7 @@ "Showing %d-char font\n" "\n" msgstr "" -"Caratteri di tipo %d-char\n" +"Tipo di carattere %d-char\n" "\n" #: src/showkey.c:42 @@ -1766,7 +1851,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "premere un tasto (il programma terminerà 10s dopo l'ultima pressione del tasto)...\n" +msgstr "" +"premere un tasto (il programma terminerà 10s dopo l'ultima pressione del " +"tasto)...\n" #: src/showkey.c:250 msgid "release" @@ -1782,27 +1869,72 @@ msgstr "codice tasto %3d %s\n" #: src/totextmode.c:29 -#, fuzzy, c-format +#, c-format msgid "usage: totextmode\n" -msgstr "uso: getkeycodes\n" +msgstr "uso: totextmode\n" #: src/version.h:20 #, c-format msgid "%s from %s\n" msgstr "%s da %s\n" -#~ msgid " use `openvt -f' to force.\n" -#~ msgstr " usare \"openvt -f\" per forzare.\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"argomento non riconosciuto: _%s_\n" +"\n" -#~ msgid "" -#~ "\n" -#~ "openvt: could not open %s R/W (%s)\n" -#~ msgstr "" -#~ "\n" -#~ "openvt: impossibile aprire %s in lettura/scrittura (%s)\n" +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" -#~ msgid "openvt: could not deallocate console %d\n" -#~ msgstr "openvt: impossibile deallocare la console %d\n" +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Uso: openvt [-c numero-termvirt] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: il terminale virtuale 1 eÌ€ la console e non puoÌ€ essere deallocata\n" diff -Nru kbd-1.15.3/po/kbd.pot kbd-1.15.5/po/kbd.pot --- kbd-1.15.3/po/kbd.pot 2011-05-07 21:06:55.000000000 +0000 +++ kbd-1.15.5/po/kbd.pot 2012-12-01 21:41:38.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -210,12 +210,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "" @@ -395,35 +395,35 @@ msgid "unknown keysym '%s'\n" msgstr "" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" msgstr "" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -435,8 +435,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -446,236 +446,236 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 #, c-format -msgid "%s: Options --unicode and --ascii are mutually exclusive\n" +msgid "Loading %s\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1062 #, c-format -msgid "%s: error reading keyboard mode\n" +msgid "syntax error in map file\n" msgstr "" -#: loadkeys.y:1131 +#: loadkeys.y:1066 #, c-format -msgid "" -"%s: warning: loading non-Unicode keymap on Unicode console\n" -" (perhaps you want to do `kbd_mode -a'?)\n" +msgid "key bindings not changed\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1146 #, c-format -msgid "" -"%s: warning: loading Unicode keymap on non-Unicode console\n" -" (perhaps you want to do `kbd_mode -u'?)\n" +msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1158 #, c-format -msgid "Searching in %s\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "" -#: loadkeys.y:1167 +#: loadkeys.y:1166 #, c-format -msgid "Cannot find %s\n" +msgid "" +"%s: warning: loading non-Unicode keymap on Unicode console\n" +" (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" #: loadkeys.y:1178 #, c-format -msgid "cannot open file %s\n" +msgid "" +"%s: warning: loading Unicode keymap on non-Unicode console\n" +" (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1184 +#: loadkeys.y:1187 #, c-format -msgid "Loading %s\n" +msgid "Searching in %s\n" msgstr "" -#: loadkeys.y:1189 +#: loadkeys.y:1197 #, c-format -msgid "syntax error in map file\n" +msgid "Cannot find %s\n" msgstr "" -#: loadkeys.y:1193 +#: loadkeys.y:1213 #, c-format -msgid "key bindings not changed\n" +msgid "cannot open file %s\n" msgstr "" #: src/loadunimap.c:43 @@ -811,6 +811,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -822,70 +823,70 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:230 +#: src/openvt.c:231 #, c-format msgid "%s: Illegal vt number" msgstr "" -#: src/openvt.c:256 +#: src/openvt.c:257 msgid "Only root can use the -u flag." msgstr "" -#: src/openvt.c:278 +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" msgstr "" -#: src/openvt.c:285 +#: src/openvt.c:286 msgid "Cannot find a free vt" msgstr "" -#: src/openvt.c:289 +#: src/openvt.c:290 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" -#: src/openvt.c:293 +#: src/openvt.c:294 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 msgid "Unable to set new session" msgstr "" -#: src/openvt.c:359 +#: src/openvt.c:360 #, c-format msgid "Unable to open %s" msgstr "" -#: src/openvt.c:363 +#: src/openvt.c:364 #, c-format msgid "Using VT %s" msgstr "" -#: src/openvt.c:369 +#: src/openvt.c:370 #, c-format msgid "Cannot open %s read/write" msgstr "" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:423 +#: src/openvt.c:424 #, c-format msgid "Couldn't deallocate console %d" msgstr "" @@ -1636,3 +1637,61 @@ #, c-format msgid "%s from %s\n" msgstr "" + +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +msgid "unrecognized user" +msgstr "" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/nl.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/nl.gmo differ diff -Nru kbd-1.15.3/po/nl.po kbd-1.15.5/po/nl.po --- kbd-1.15.3/po/nl.po 2011-05-14 21:06:10.000000000 +0000 +++ kbd-1.15.5/po/nl.po 2012-12-03 06:35:17.000000000 +0000 @@ -2,15 +2,17 @@ # Copyright (C) Miloslav Trmac , 2003, 2004, 2007, 2008. # This file is distributed under the same license as the kbd package. # -# Elros Cyriatan , 2003, 2004. +# In fur and black, eyes over cream. +# +# Benno Schulenberg , 2005, 2007, 2008, 2010, 2011, 2012. # Erwin Poeze , 2009. -# Benno Schulenberg , 2005, 2007, 2008, 2010, 2011. +# Elros Cyriatan , 2003, 2004. msgid "" msgstr "" -"Project-Id-Version: kbd-1.15.3-rc1\n" +"Project-Id-Version: kbd-1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2011-05-12 10:23+0200\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2012-11-26 20:18+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -188,27 +190,30 @@ "\t-c --charset=" msgstr "" "\n" -"Gebruik: dumpkeys [opties...]\n" +"Gebruik: dumpkeys [OPTIE...]\n" "\n" " Geldige opties zijn:\n" "\n" -" -h --help deze hulptekst tonen\n" -" -i --short-info informatie over toetsenbordstuurprogramma tonen\n" -" -l --long-info het bovenstaande plus de symbolen bekend bij 'loadkeys'\n" -" -n --numeric toetsentabel in hexadecimale notatie weergeven\n" -" -f --full-table geen korte notaties gebruiken, één regel per toetscode\n" -" -1 --separate-lines één regel per (optietoets,toetscode)-paar\n" -" --funcs-only alleen de functietoetsteksten tonen\n" -" --keys-only alleen de toetsbindingen tonen\n" -" --compose-only alleen de samenstellingstoetscombinaties tonen\n" -" -c --charset=" +" -h, --help deze hulptekst tonen\n" +" -i, --short-info informatie over toetsenbordstuurprogramma tonen\n" +" -l, --long-info het bovenstaande plus de symbolen bekend bij " +"'loadkeys'\n" +" -n, --numeric toetsentabel in hexadecimale notatie weergeven\n" +" -f, --full-table geen korte notaties gebruiken, één regel per " +"toetscode\n" +" -1, --separate-lines één regel per (optietoets,toetscode)-paar\n" +" --funcs-only alleen de functietoetsteksten tonen\n" +" --keys-only alleen de toetsbindingen tonen\n" +" --compose-only alleen de samenstellingstoetscombinaties tonen\n" +" -c, --charset=" #: src/dumpkeys.c:570 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" "\t\t\t specified character set\n" -msgstr " tekenactiecodes via deze tekenset interpreteren\n" +msgstr "" +" tekenactiecodes via deze tekenset interpreteren\n" #: src/fgconsole.c:17 #, c-format @@ -225,13 +230,13 @@ msgstr "" "%s, versie %s\n" "\n" -"Gebruik: %s [opties]\n" +"Gebruik: %s [OPTIE...]\n" "\n" " Geldige opties zijn:\n" "\n" -" -h --help deze hulptekst tonen\n" -" -n --next-available nummer van eerste ongebruikte VT tonen\n" -" -V --version programmaversie tonen\n" +" -h, --help deze hulptekst tonen\n" +" -n, --next-available nummer van eerste ongebruikte VT tonen\n" +" -V, --version programmaversie tonen\n" #: src/fgconsole.c:66 msgid "Couldn't read VTNO: " @@ -247,12 +252,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "Waarschuwing: pad is te lang: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Kan %s niet openen\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Kan geen bestandsdescriptor verkrijgen die verwijst naar de console\n" @@ -270,7 +275,8 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 is een fout; voor 1-88 (0x01-0x58) is de scancode gelijk aan de toetscode\n" +msgstr "" +"0 is een fout; voor 1-88 (0x01-0x58) is de scancode gelijk aan de toetscode\n" #: src/getkeycodes.c:62 #, c-format @@ -366,7 +372,8 @@ #: src/kbdrate.c:156 src/kbdrate.c:175 src/kbdrate.c:339 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" -msgstr "Toetssnelheid is ingesteld op %.1f tekens per seconde (vertraging = %d ms)\n" +msgstr "" +"Toetssnelheid is ingesteld op %.1f tekens per seconde (vertraging = %d ms)\n" #: src/kbdrate.c:267 #, c-format @@ -441,35 +448,35 @@ msgid "unknown keysym '%s'\n" msgstr "onbekende toetsnaam '%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "invoegingen zijn te diep genest" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "overschakelen naar %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "Kan invoegbestand %s niet openen" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "verwachtte een bestandsnaam tussen aanhalingstekens" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "Unicode-toetssymbool %s valt buiten toegestaan bereik" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" msgstr "tekenreeks is te lang" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -481,8 +488,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -493,137 +500,137 @@ msgstr "" "loadkeys, versie %s\n" "\n" -"Gebruik: loadkeys [optie...] [kaartbestand...]\n" +"Gebruik: loadkeys [OPTIE...] [KAARTBESTAND...]\n" "\n" -"Geldige opties zijn:\n" +" Geldige opties zijn:\n" "\n" -" -a --ascii conversie naar ASCII afdwingen\n" -" -b --bkeymap een binaire toetsbordkaart naar standaarduitvoer schrijven\n" -" -c --clearcompose de samenstellingentabel van de kernel leegmaken\n" -" -C --console=\n" -" te gebruiken console-apparaat of -apparaten\n" -" -d --default '%s' laden\n" -" -h --help deze hulptekst tonen\n" -" -m --mktable een 'defkeymap.c' naar standaarduitvoer schrijven\n" -" -q --quiet alle gewone uitvoer onderdrukken\n" -" -s --clearstrings functietoetstekenreeksentabel van kernel leegmaken\n" -" -u --unicode conversie naar Unicode afdwingen\n" -" -v --verbose de veranderingen tonen\n" +" -a, --ascii conversie naar ASCII afdwingen\n" +" -b, --bkeymap binaire toetsenbordkaart naar standaarduitvoer " +"schrijven\n" +" -c, --clearcompose de samenstellingentabel van de kernel leegmaken\n" +" -C, --console=APPARAAT te gebruiken console-apparaat\n" +" -d, --default '%s' laden\n" +" -h, --help deze hulptekst tonen\n" +" -m, --mktable een 'defkeymap.c' naar standaarduitvoer schrijven\n" +" -q, --quiet alle gewone uitvoer onderdrukken\n" +" -s, --clearstrings functietoetstekenreeksentabel van kernel leegmaken\n" +" -u, --unicode conversie naar Unicode afdwingen\n" +" -v, --verbose de veranderingen tonen\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap() is aangeroepen met onjuiste positie %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "toevoegen van kaart %d schendt expliciete toetsenkaartregel" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey() is aangeroepen met onjuiste positie %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey() is aangeroepen met onjuiste tabel %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey() is aangeroepen met onjuiste toetscode %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey() is aangeroepen met onjuiste positie %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey() is aangeroepen met onjuiste tabel %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc() is aangeroepen met onjuiste functie %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: func_buf overloop\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "overloop in samenstellingentabel\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: kan niet overschakelen naar Unicode-modus\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Toetsenkaart %d: toegang geweigerd\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "toetscode %d, tabel %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " Mislukt" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "verbinden van toets %d met waarde %d is mislukt\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "vrijgeven van toetsenkaart %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: kan toetsenkaart %d niet vrijgeven\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: kan toetsenkaart niet vrijgeven of wissen\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: kan niet terugkeren naar oorspronkelijke toetsenbordmodus\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "verbinden van tekenreeks '%s' met functie %s is mislukt\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "wissen van tekenreeks %s is mislukt\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "te veel samenstellingsdefinities\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "onmogelijke fout in do_constant()" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -632,122 +639,124 @@ "\n" "%d %s en %d %s zijn veranderd.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "toets" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "toetsen" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "tekenreeks" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "tekenreeksen" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Er zijn %d samenstellings%s geladen.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "definitie" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "definities" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Geen verandering in samenstellingsdefinities.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: weet niet hoe %s samen te stellen\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Fout tijdens schrijven van toetsenkaart naar bestand\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' is geen functietoetssymbool" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "Te veel items (%d) op één regel" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "Te veel toetsdefinities op één regel" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Laden van %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "syntaxfout in toetsenkaartbestand\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "toetsbindingen zijn niet veranderd\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: de opties '--unicode' en '--ascii' gaan niet samen\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: fout tijdens lezen van toetsenbordmodus\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: fout tijdens lezen van toetsenbordmodus: %m\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -"%s: Waarschuwing: niet-Unicode-toetsenkaart wordt geladen op Unicode terminal\n" +"%s: Waarschuwing: niet-Unicode-toetsenkaart wordt geladen op Unicode " +"terminal\n" " (wilt u misschien 'kbd_mode -a' doen?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -"%s: Waarschuwing: Unicode-toetsenkaart wordt geladen op niet-Unicode terminal\n" +"%s: Waarschuwing: Unicode-toetsenkaart wordt geladen op niet-Unicode " +"terminal\n" " (wilt u misschien 'kbd_mode -u' doen?)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, c-format msgid "Searching in %s\n" msgstr "Zoeken in %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Kan %s niet vinden\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "Kan bestand %s niet openen\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Laden van %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "syntaxfout in toetsenkaartbestand\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "toetsbindingen zijn niet veranderd\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -773,12 +782,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Ongeldig Unicode-bereik corresponderend met lettertype-positiebereik 0x%x-0x%x\n" +msgstr "" +"%s: Ongeldig Unicode-bereik corresponderend met lettertype-positiebereik 0x" +"%x-0x%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Unicodebereik U+%x-U+%x is niet van dezelfde lengte als lettertype-positiebereik 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Unicodebereik U+%x-U+%x is niet van dezelfde lengte als lettertype-" +"positiebereik 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -881,6 +896,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -891,12 +907,13 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" -"Gebruik: %s [OPTIES] -- OPDRACHT\n" +"Gebruik: %s [OPTIE...] -- OPDRACHT\n" "\n" "Start programma OPDRACHT op een nieuwe virtuele terminal (VT).\n" "\n" "Opties:\n" " -c, --console=NR de VT met dit nummer gebruiken;\n" +" -e, --exec OPDRACHT uitvoeren zonder nieuw proces te starten;\n" " -f, --force openen van VT afdwingen zonder controle;\n" " -l, --login van de gegeven opdracht een login shell maken;\n" " -u, --user de eigenaar van de huidige VT bepalen;\n" @@ -907,70 +924,74 @@ " -h, --help deze hulptekst tonen en stoppen.\n" "\n" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "Kan eigenaar van huidige tty niet vinden!" -#: src/openvt.c:230 +#: src/openvt.c:231 #, c-format msgid "%s: Illegal vt number" msgstr "%s: ongeldig VT-nummer" -#: src/openvt.c:256 +#: src/openvt.c:257 msgid "Only root can use the -u flag." msgstr "Alleen root kan de optie '-u' gebruiken." -#: src/openvt.c:278 +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" msgstr "Kan geen bestandsdescriptor verkrijgen die verwijst naar de console" -#: src/openvt.c:285 +#: src/openvt.c:286 msgid "Cannot find a free vt" msgstr "kan geen vrije VT vinden" -#: src/openvt.c:289 +#: src/openvt.c:290 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "kan niet controleren of VT-%d vrij is; gebruik '%s -f' om gebruik af te dwingen" +msgstr "" +"kan niet controleren of VT-%d vrij is; gebruik '%s -f' om gebruik af te " +"dwingen" -#: src/openvt.c:293 +#: src/openvt.c:294 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "VT-%d is in gebruik; opdracht is afgebroken; gebruik '%s -f' om gebruik af te dwingen" +msgstr "" +"VT-%d is in gebruik; opdracht is afgebroken; gebruik '%s -f' om gebruik af " +"te dwingen" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "Kan gegeven opdracht niet vinden." -#: src/openvt.c:335 +#: src/openvt.c:336 msgid "Unable to set new session" msgstr "Kan geen nieuwe sessie instellen" -#: src/openvt.c:359 +#: src/openvt.c:360 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" -#: src/openvt.c:363 +#: src/openvt.c:364 #, c-format msgid "Using VT %s" msgstr "VT-%s wordt gebruikt" -#: src/openvt.c:369 +#: src/openvt.c:370 #, c-format msgid "Cannot open %s read/write" msgstr "Kan %s niet openen voor lezen-en-schrijven" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "Kan VT %d niet activeren" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "Activatie onderbroken?" -#: src/openvt.c:423 +#: src/openvt.c:424 #, c-format msgid "Couldn't deallocate console %d" msgstr "Kan console %d niet vrijgeven" @@ -1077,8 +1098,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Met het bereik van lettertype-posities dient een Unicodebereik te corresponderen\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Met het bereik van lettertype-posities dient een Unicodebereik te " +"corresponderen\n" #: src/psfxtable.c:257 #, c-format @@ -1143,7 +1168,8 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Oud aantal scanregels: %d Nieuw aantal scanregels: %d Tekenhoogte: %d\n" +msgstr "" +"Oud aantal scanregels: %d Nieuw aantal scanregels: %d Tekenhoogte: %d\n" #: src/resizecons.c:252 #, c-format @@ -1152,15 +1178,19 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: vergeet niet TERM te veranderen (mogelijk naar con%dx%d of linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: vergeet niet TERM te veranderen (mogelijk naar con%dx%d of linux-" +"%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "Gebruik: resizecons KOLOMMENxRIJEN\n" " of: resizecons KOLOMMEN RIJEN\n" @@ -1205,7 +1235,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1234,7 +1265,8 @@ "\n" "Schrijfopties (uitgevoerd voor het laden van nieuw lettertype):\n" " -o huidig lettertype naar schrijven\n" -" -O huidig lettertype plus Unicodekaart naar \n" +" -O huidig lettertype plus Unicodekaart naar " +"\n" " -om huidige consolekaart naar schrijven\n" " -ou huidige Unicodekaart naar schrijven\n" "\n" @@ -1248,7 +1280,8 @@ " setfont -{8|14|16} codepagina.cp[.gz] het 8x-lettertype laden uit\n" " codepagina.cp\n" "\n" -"Expliciet (met -m of -u) of impliciet (in lettertypebestand) gegeven kaarten\n" +"Expliciet (met -m of -u) of impliciet (in lettertypebestand) gegeven " +"kaarten\n" "worden geladen en, in het geval van consolekaarten, geactiveerd.\n" "\n" " -h deze letterhoogte afdwingen (zonder spatie)\n" @@ -1269,8 +1302,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: kan niet herstellen uit zowel teken-ROM als bestand -- lettertype is onveranderd\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: kan niet herstellen uit zowel teken-ROM als bestand -- lettertype " +"is onveranderd\n" #: src/setfont.c:259 #, c-format @@ -1335,7 +1372,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Bij het laden van meerdere lettertypen moeten ze allemaal psf-lettertypen zijn -- %s is dat niet\n" +msgstr "" +"Bij het laden van meerdere lettertypen moeten ze allemaal psf-lettertypen " +"zijn -- %s is dat niet\n" #: src/setfont.c:435 #, c-format @@ -1345,12 +1384,16 @@ #: src/setfont.c:441 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Bij het laden van meerdere lettertypen moeten ze allemaal dezelfde hoogte hebben\n" +msgstr "" +"Bij het laden van meerdere lettertypen moeten ze allemaal dezelfde hoogte " +"hebben\n" #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Bij het laden van meerdere lettertypen moeten ze allemaal dezelfde breedte hebben\n" +msgstr "" +"Bij het laden van meerdere lettertypen moeten ze allemaal dezelfde breedte " +"hebben\n" #: src/setfont.c:487 #, c-format @@ -1380,7 +1423,9 @@ #: src/setfont.c:576 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Hmm... een lettertype van 'restorefont'? Alleen eerste helft wordt gebruikt.\n" +msgstr "" +"Hmm... een lettertype van 'restorefont'? Alleen eerste helft wordt " +"gebruikt.\n" #: src/setfont.c:593 #, c-format @@ -1399,7 +1444,8 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "U vroeg om lettergrootte %d, maar alleen 8, 14 en 16 zijn hier mogelijk.\n" +msgstr "" +"U vroeg om lettergrootte %d, maar alleen 8, 14 en 16 zijn hier mogelijk.\n" #: src/setfont.c:673 #, c-format @@ -1464,8 +1510,10 @@ "\n" "Normaalgesproken beïnvloedt 'setleds' de VT-optie-instellingen\n" "(en deze uiten zich meestal in de leds).\n" -"Met '-L' stelt 'setleds' alleen de leds in, en laat het de opties onveranderd.\n" -"Met '-D' stelt 'setleds' zowel de opties als de standaardopties in, zodat de\n" +"Met '-L' stelt 'setleds' alleen de leds in, en laat het de opties " +"onveranderd.\n" +"Met '-D' stelt 'setleds' zowel de opties als de standaardopties in, zodat " +"de\n" "opties niet zullen veranderen na een reset.\n" #: src/setleds.c:43 @@ -1485,7 +1533,8 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" msgstr "" "Fout tijdens lezen van huidige instelling.\n" "Mogelijk werkt u niet op de console?\n" @@ -1702,7 +1751,7 @@ "\n" " Geldige opties zijn:\n" "\n" -" -C tty apparaat waarvan het lettertype getoond moet worden\n" +" -C TTY apparaat waarvan het lettertype getoond moet worden\n" " (standaard de huidige terminal)\n" " -i niet de lettertypetabel maar alleen RIJENxKOLOMMENxAANTAL tonen\n" " -v uitgebreidere uitvoer produceren\n" @@ -1768,14 +1817,16 @@ msgstr "" "showkey, versie %s\n" "\n" -"Gebruik: showkey [opties...]\n" +"Gebruik: showkey [OPTIE...]\n" "\n" " Geldige opties zijn:\n" "\n" -" -h --help deze hulptekst tonen en stoppen\n" -" -a --ascii decimale/octale/hexadecimale waarden van de toetsen weergeven\n" -" -k --keycodes alleen de geïnterpreteerde toetscodes weergeven (standaard)\n" -" -s --scancodes alleen de ruwe scancodes weergeven\n" +" -h, --help deze hulptekst tonen en stoppen\n" +" -a, --ascii decimale/octale/hexadecimale waarden van de toetsen " +"weergeven\n" +" -k, --keycodes alleen de geïnterpreteerde toetscodes weergeven " +"(standaard)\n" +" -s, --scancodes alleen de ruwe scancodes weergeven\n" #: src/showkey.c:157 #, c-format @@ -1818,6 +1869,83 @@ msgid "%s from %s\n" msgstr "%s (%s)\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" +"Probeer het later nog eens.\n" +"\n" +"\n" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "Het gehele console-scherm is nu volledig vergrendeld door %s.\n" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "Het %s is nu vergrendeld door %s.\n" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" +"Gebruik Alt+functietoetsen om naar andere virtuele consoles over te " +"schakelen." + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Typ '%s --help' voor meer informatie.\n" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" +"Gebruik: %s [OPTIE...]\n" +"\n" +"Het programma %s vergrendelt virtuele consoles en slaat uw sessies op.\n" +"\n" +" Geldige opties zijn:\n" +"\n" +" -c, --current alleen de huidige virtuele console vergrendelen; de " +"gebruiker\n" +" toestaan naar een andere over te schakelen\n" +" -a, --all alle virtuele consoles vergrendelen, door te verhinderen " +"dat\n" +" andere gebruikers naar andere consoles overschakelen\n" +" -v, --version programmaversie tonen en stoppen\n" +" -h, --help deze hulptekst tonen en stoppen\n" + +#: src/vlock/username.c:57 +msgid "unrecognized user" +msgstr "niet-herkende gebruiker" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "standaardinvoer is geen terminal" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "Huidige terminal (%s) is geen virtuele console.\n" + +#: src/vlock/vt.c:160 +#, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "Het gehele console-scherm kan niet vergrendeld worden.\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " gebruik 'openvt -f' om het af te dwingen\n" @@ -1831,8 +1959,12 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: kan console %d niet vrijgeven\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Gebruik: openvt [-c VT-nummer] [-f] [-l] [-u] [-s] [-v] [-w] -- opdrachtregel\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" +#~ msgstr "" +#~ "Gebruik: openvt [-c VT-nummer] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "opdrachtregel\n" #~ msgid "loadkeys: error reading keyboard mode\n" #~ msgstr "loadkeys: fout tijdens lezen van toetsenbordmodus\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/pl.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/pl.gmo differ diff -Nru kbd-1.15.3/po/pl.po kbd-1.15.5/po/pl.po --- kbd-1.15.3/po/pl.po 2011-05-14 21:07:50.000000000 +0000 +++ kbd-1.15.5/po/pl.po 2012-12-03 06:35:17.000000000 +0000 @@ -1,13 +1,13 @@ # Polish translations for kbd. # This file is distributed under the same license as the kbd package. -# Jakub Bogusz , 2002-2011. +# Jakub Bogusz , 2002-2012. # msgid "" msgstr "" -"Project-Id-Version: kbd 1.15.3-rc1\n" +"Project-Id-Version: kbd 1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2011-05-09 16:10+0200\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2012-11-26 19:34+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -191,7 +191,8 @@ "\t-n --numeric\t wy¶wietlenie tablicy klawiatury w notacji szesnastkowej\n" "\t-f --full-table\t nie u¿ywanie notacji skróconych, jeden wiersz na kod\n" "\t-1 --separate-lines jedna linia na parê (modyfikator,kod)\n" -"\t --funcs-only\t wy¶wietlenie tylko ³añcuchów dla klawiszy funkcyjnych\n" +"\t --funcs-only\t wy¶wietlenie tylko ³añcuchów dla klawiszy " +"funkcyjnych\n" "\t --keys-only\t wy¶wietlenie tylko przypisañ klawiszy\n" "\t --compose-only wy¶wietlenie tylko kombinacji compose\n" "\t-c --charset=" @@ -242,12 +243,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "Uwaga: ¶cie¿ka zbyt d³uga: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Nie uda³o siê otworzyæ %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Nie uda³o siê uzyskaæ deskryptora pliku wskazuj±cego na konsolê\n" @@ -265,7 +266,8 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 jest b³êdem; dla 1-88 (0x01-0x58) skankod jest równy kodowi klawisza\n" +msgstr "" +"0 jest b³êdem; dla 1-88 (0x01-0x58) skankod jest równy kodowi klawisza\n" #: src/getkeycodes.c:62 #, c-format @@ -363,7 +365,8 @@ #: src/kbdrate.c:156 src/kbdrate.c:175 src/kbdrate.c:339 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" -msgstr "Czêstotliwo¶æ powtarzania ustawiono na %.1f zn/sek (opó¼nienie = %d ms)\n" +msgstr "" +"Czêstotliwo¶æ powtarzania ustawiono na %.1f zn/sek (opó¼nienie = %d ms)\n" #: src/kbdrate.c:267 #, c-format @@ -438,35 +441,35 @@ msgid "unknown keysym '%s'\n" msgstr "nieznany symbol '%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "pliki do³±czane zbyt g³êboko" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "prze³±czanie na %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "nie mo¿na otworzyæ pliku %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "oczekiwano nazwy pliku w cudzys³owach" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "unikodowy symbol spoza zakresu: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" msgstr "³añcuch zbyt d³ugi" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -478,8 +481,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -495,10 +498,10 @@ "Poprawne opcje to:\n" "\n" " -a --ascii wymuszenie konwersji do ASCII\n" -" -b --bkeymap wypisanie binarnej mapy klawiszy na standardowe wyj¶cie\n" +" -b --bkeymap wypisanie binarnej mapy klawiszy na standardowe " +"wyj¶cie\n" " -c --clearcompose wyczyszczenie tabeli compose w j±drze\n" -" -C --console=\n" -" urz±dzenia konsol do u¿ycia\n" +" -C --console=PLIK urz±dzenie konsoli do u¿ycia\n" " -d --default wczytanie \"%s\"\n" " -h --help wypisanie tego opisu\n" " -m --mktable wypisanie \"defkeymap.c\" na standardowe wyj¶cie\n" @@ -507,121 +510,121 @@ " -u --unicode wymuszenie konwersji do Unikodu\n" " -v --verbose informowanie o zmianach\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap wywo³ano z b³êdnym indeksem %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "dodanie mapy %d narusza jawn± liniê mapy klawiszy" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey wywo³ano z b³êdnym indeksem %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey wywo³ano ze z³± tablic± %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey wywo³ano z b³êdnym kodem klawisza %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey wywo³ano z b³êdnym indeksem %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey wywo³ano z b³êdn± tablic± %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc wywo³ano z b³êdn± funkcj± %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: przepe³nienie func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "przepe³nienie tablicy compose\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: nie uda³o siê prze³±czyæ na tryb Unicode\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Mapa klawiszy %d: brak uprawnieñ\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "kod klawisza %d, tablica %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " B£¡D" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "nie uda³o siê przypisaæ klawisza %d do warto¶ci %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "zwalnianie mapy klawiszy %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: nie uda³o siê zwolniæ mapy klawiszy %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: nie uda³o siê zwolniæ lub wyczy¶ciæ mapy klawiszy\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: nie uda³o siê wróciæ do pierwotnego trybu klawiatury\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "nie uda³o siê przypisaæ ³añcucha '%s' do funkcji %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "nie uda³o siê wyczy¶ciæ ³añcucha %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "zbyt du¿o definicji compose\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "niemo¿liwy b³±d w do_constant" # XXX: ngettext should be used for the following five messages -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -630,76 +633,91 @@ "\n" "Zmienionych klawiszy: %d%s ³añcuchów: %d%s\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "," -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "," -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "." -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "." # XXX: ngettext should be used for the following three messages -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Wczytanych definicji compose: %d%s\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "." -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "." -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Brak zmian w definicjach compose)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: brak informacji o compose dla %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "B³±d podczas zapisu mapy do pliku\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' nie jest symbolem klawisza funkcyjnego" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "zbyt du¿o wpisów (%d) w jednej linii" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "zbyt du¿o definicji klawiszy w jednej linii" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Wczytywanie %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "b³±d sk³adni w pliku mapy\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "przypisania klawiszy nie zmienione\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Opcje --unicode i --ascii wykluczaj± siê wzajemnie\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: b³±d podczas odczytu trybu klawiatury\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: b³±d podczas odczytu trybu klawiatury: %m\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -708,7 +726,7 @@ "%s: uwaga: wczytywanie nieunikodowej mapy klawiszy na nieunikodowej konsoli\n" " (byæ mo¿e powinno byæ jeszcze `kbd_mode -a'?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -717,36 +735,21 @@ "%s: uwaga: wczytywanie unikodowej mapy klawiszy na nieunikodowej konsoli\n" " (byæ mo¿e powinno byæ jeszcze `kbd_mode -u'?)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, c-format msgid "Searching in %s\n" msgstr "Wyszukiwanie w %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Nie mo¿na odnale¼æ %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "nie mo¿na otworzyæ pliku %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Wczytywanie %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "b³±d sk³adni w pliku mapy\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "przypisania klawiszy nie zmienione\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -774,12 +777,17 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: B³êdny przedzia³ Unikodu odpowiadaj±cy przedzia³owi 0x%x-0x%x w foncie\n" +msgstr "" +"%s: B³êdny przedzia³ Unikodu odpowiadaj±cy przedzia³owi 0x%x-0x%x w foncie\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Przedzia³ Unikodu U+%x-U+%x nie jest tej samej d³ugo¶ci co 0x%x-0x%x w foncie\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Przedzia³ Unikodu U+%x-U+%x nie jest tej samej d³ugo¶ci co 0x%x-0x%x w " +"foncie\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -882,6 +890,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -898,6 +907,7 @@ "\n" "Opcje:\n" " -c, --console=NUM u¿ycie VT o podanym NUMerze\n" +" -e, --exec uruchomienie polecenia bez wykonywania fork\n" " -f, --force wymuszenie otwarcia VT bez sprawdzania\n" " -l, --login uczynienie polecenia pow³ok± logowania\n" " -u, --user sprawdzenie w³a¶ciciela obecnego VT\n" @@ -908,70 +918,74 @@ " -h, --help wy¶wietlenie krótkiego opisu u¿ycia\n" "\n" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "Nie uda³o siê odnale¼æ w³a¶ciciela bie¿±cego tty!" -#: src/openvt.c:230 +#: src/openvt.c:231 #, c-format msgid "%s: Illegal vt number" msgstr "%s: B³êdny numer vt" -#: src/openvt.c:256 +#: src/openvt.c:257 msgid "Only root can use the -u flag." msgstr "Tylko root mo¿e u¿yæ flagi -u." -#: src/openvt.c:278 +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" msgstr "Nie uda³o siê uzyskaæ deskryptora pliku wskazuj±cego na konsolê" -#: src/openvt.c:285 +#: src/openvt.c:286 msgid "Cannot find a free vt" msgstr "Nie mo¿na znale¼æ wolnego vt" -#: src/openvt.c:289 +#: src/openvt.c:290 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "Nie mo¿na sprawdziæ, czy vt %d jest wolny; mo¿na u¿yæ `%s -f' w celu wymuszenia." +msgstr "" +"Nie mo¿na sprawdziæ, czy vt %d jest wolny; mo¿na u¿yæ `%s -f' w celu " +"wymuszenia." -#: src/openvt.c:293 +#: src/openvt.c:294 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "vt %d jest u¿ywany, polecenie przerwano; mo¿na u¿yæ `%s -f' w celu wymuszenia." +msgstr "" +"vt %d jest u¿ywany, polecenie przerwano; mo¿na u¿yæ `%s -f' w celu " +"wymuszenia." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "Nie uda³o siê odnale¼æ polecenia." -#: src/openvt.c:335 +#: src/openvt.c:336 msgid "Unable to set new session" msgstr "Nie mo¿na ustanowiæ nowej sesji" -#: src/openvt.c:359 +#: src/openvt.c:360 #, c-format msgid "Unable to open %s" msgstr "Nie mo¿na otworzyæ %s" -#: src/openvt.c:363 +#: src/openvt.c:364 #, c-format msgid "Using VT %s" msgstr "U¿ycie VT %s" -#: src/openvt.c:369 +#: src/openvt.c:370 #, c-format msgid "Cannot open %s read/write" msgstr "Nie mo¿na otworzyæ %s do odczytu i zapisu" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "Nie uda³o siê uaktywniæ vt %d" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "Uaktywnianie przerwane?" -#: src/openvt.c:423 +#: src/openvt.c:424 #, c-format msgid "Couldn't deallocate console %d" msgstr "Nie uda³o siê zwolniæ konsoli %d" @@ -1078,7 +1092,9 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" msgstr "%s: przedzia³owi w foncie powinien odpowiadaæ przedzia³ Unikodu\n" #: src/psfxtable.c:257 @@ -1159,7 +1175,8 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" msgstr "resizecons: trzeba zmieniæ TERM (mo¿e na con%dx%d lub linux-%dx%d)\n" #: src/resizecons.c:338 @@ -1167,7 +1184,8 @@ msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "sk³adnia: resizecons KOLUMNYxWIERSZE lub resizecons KOLUMNY WIERSZE\n" @@ -1212,7 +1230,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1236,7 +1255,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Sk³adnia: setfont [opcje-zapisu] [-] [nowyfont...] [-m mapakon] [-u unimapa]\n" +"Sk³adnia: setfont [opcje-zapisu] [-] [nowyfont...] [-m mapakon] [-u " +"unimapa]\n" " opcje-zapisu (uwzglêdniane przed wczytywaniem pliku):\n" " -o Zapisanie aktualnego fontu do \n" " -O Zapisanie aktualnego fontu i unimapy do \n" @@ -1247,7 +1267,8 @@ " setfont Wczytanie fontu \"default[.gz]\"\n" " setfont - Wczytanie fontu \"default8x[.gz]\"\n" "Opcja - wybiera font ze strony kodowej zawieraj±cej trzy fonty:\n" -" setfont -{8|14|16} strona.cp[.gz] Wczytanie fontu 8x ze strona.cp\n" +" setfont -{8|14|16} strona.cp[.gz] Wczytanie fontu 8x ze strona." +"cp\n" "Bezpo¶rednio (przez -m lub -u) lub po¶rednio (w pliku fontu) podane\n" "odwzorowania s± wczytywane i, w przypadku map konsolowych, uaktywniane.\n" " -h (bez spacji) Wymuszenie wysoko¶ci fontu.\n" @@ -1267,8 +1288,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: nie mo¿na jednocze¶nie odtworzyæ z ROM-u i z pliku. Font nie zmieniony.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: nie mo¿na jednocze¶nie odtworzyæ z ROM-u i z pliku. Font nie " +"zmieniony.\n" #: src/setfont.c:259 #, c-format @@ -1348,7 +1373,8 @@ #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Przy wczytywaniu kilku fontów, wszystkie musz± mieæ tê sam± szeroko¶æ\n" +msgstr "" +"Przy wczytywaniu kilku fontów, wszystkie musz± mieæ tê sam± szeroko¶æ\n" #: src/setfont.c:487 #, c-format @@ -1477,12 +1503,16 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "B³±d podczas odczytu aktualnych ustawieñ diod. Mo¿e stdin nie jest VT?\n" +msgstr "" +"B³±d podczas odczytu aktualnych ustawieñ diod. Mo¿e stdin nie jest VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "B³±d podczas odczytu aktualnych ustawieñ flag. Mo¿e wywo³anie nie na konsoli?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"B³±d podczas odczytu aktualnych ustawieñ flag. Mo¿e wywo³anie nie na " +"konsoli?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1629,7 +1659,8 @@ "Sk³adnia: %s vga|PLIK|-\n" "\n" "W przypadku u¿ycia parametru PLIK, PLIK powinien mieæ dok³adnie 3 linie\n" -"oddzielonych przecinkami warto¶ci dziesiêtnych CZERWIENI, ZIELENI i B£ÊKITU.\n" +"oddzielonych przecinkami warto¶ci dziesiêtnych CZERWIENI, ZIELENI i " +"B£ÊKITU.\n" "\n" "Aby utworzyæ poprawny PLIK mo¿na wykonaæ:\n" " cat /sys/module/vt/parameters/default_{red,grn,blu} > PLIK\n" @@ -1786,7 +1817,8 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "proszê nacisn±æ dowolny klawisz (program zakoñczy siê 10s po ostatnim)...\n" +msgstr "" +"proszê nacisn±æ dowolny klawisz (program zakoñczy siê 10s po ostatnim)...\n" #: src/showkey.c:250 msgid "release" @@ -1810,3 +1842,75 @@ #, c-format msgid "%s from %s\n" msgstr "%s z %s\n" + +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" +"Proszê spróbowaæ pó¼niej.\n" +"\n" +"\n" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "Ca³o¶æ konsoli jest ca³kowicie zablokowana przez u¿ytkownika %s.\n" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "Terminal %s jest zablokowany przez u¿ytkownika %s.\n" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" +"Mo¿na u¿yæ kombinacji Alt-klawisz funkcyjny do prze³±czenia na inne konsole " +"wirtualne." + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Polecenie `%s --help' poda wiêcej informacji.\n" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" +"%s: blokowanie konsol wirtualnych z zachowaniem bie¿±cej sesji.\n" +"Sk³adnia: %s [opcje]\n" +" gdzie [opcje] to dowolne z:\n" +"-c lub --current: zablokowanie tylko tej konsoli wirtualnej,\n" +" pozwalaj±c u¿ytkownikowi prze³±czyæ siê na inne konsole.\n" +"-a lub --all: zablokowanie wszystkich konsol wirtualnych,\n" +" uniemo¿liwiaj±c prze³±czanie konsol.\n" +"-v lub --version: wypisanie wersji vlocka i zakoñczenie.\n" +"-h lub --help: wy¶wietlenie tego opisu i zakoñczenie.\n" + +#: src/vlock/username.c:57 +msgid "unrecognized user" +msgstr "nieznany u¿ytkownik" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "stdin nie jest terminalem" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "Ten terminal (%s) nie jest konsol± wirtualn±.\n" + +#: src/vlock/vt.c:160 +#, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "Nie mo¿na zablokowaæ ca³o¶ci konsoli.\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/ro.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/ro.gmo differ diff -Nru kbd-1.15.3/po/ro.po kbd-1.15.5/po/ro.po --- kbd-1.15.3/po/ro.po 2011-05-14 21:13:04.000000000 +0000 +++ kbd-1.15.5/po/ro.po 2012-12-01 21:41:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kbd 1.08\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2003-11-20 17:33+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -144,7 +144,8 @@ #: src/dumpkeys.c:398 #, c-format msgid "# not alt_is_meta: on keymap %d key %d is bound to" -msgstr "# diferit de alt_is_meta: în maparea de taste %d tasta %d este legatã de" +msgstr "" +"# diferit de alt_is_meta: în maparea de taste %d tasta %d este legatã de" #: src/dumpkeys.c:475 #, c-format @@ -187,7 +188,8 @@ "\n" "\t-h --help\t afiºeazã acest text de ajutor\n" "\t-i --short-info\t afiºeazã informaþii despre driverul de tastaturã\n" -"\t-l --long-info\t afiºeazã cele de mai sus ºi simbolurile cunoscute loadkeys\n" +"\t-l --long-info\t afiºeazã cele de mai sus ºi simbolurile cunoscute " +"loadkeys\n" "\t-n --numeric\t afiºeazã tabela de taste în notare hexazecimalã\n" "\t-f --full-table\t nu foloseºte notaþii scurte, ci un rând pe cod_tastã\n" "\t-1 --separate-lines o linie pe (modificator,cod_tastã) pereche\n" @@ -202,7 +204,8 @@ "\t\t\t interpret character action codes to be from the\n" "\t\t\t specified character set\n" msgstr "" -"\t\t\t interpreteazã codurile de acþiune ale caracterelor ce vor fi luate\n" +"\t\t\t interpreteazã codurile de acþiune ale caracterelor ce vor fi " +"luate\n" "\t\t\t din setul de caractere specificat\n" #: src/fgconsole.c:17 @@ -234,15 +237,17 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: Avertisment: linie prea lungã\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "nu s-a putut citi %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "Nu am putut gãsi un descriptor de fiºier care sã se refere la aceastã consolã\n" +msgstr "" +"Nu am putut gãsi un descriptor de fiºier care sã se refere la aceastã " +"consolã\n" #: src/getkeycodes.c:18 #, c-format @@ -257,12 +262,16 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 este eroare; pentru 1-88 (0x01-0x58) codul de scan(scancode) egal codul tastei\n" +msgstr "" +"0 este eroare; pentru 1-88 (0x01-0x58) codul de scan(scancode) egal codul " +"tastei\n" #: src/getkeycodes.c:62 #, fuzzy, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "0 este eroare; pentru 1-88 (0x01-0x58) codul de scan(scancode) egal codul tastei\n" +msgstr "" +"0 este eroare; pentru 1-88 (0x01-0x58) codul de scan(scancode) egal codul " +"tastei\n" #: src/getkeycodes.c:68 #, c-format @@ -278,7 +287,9 @@ #: src/getkeycodes.c:93 #, c-format msgid "failed to get keycode for scancode 0x%x\n" -msgstr "eroare în primirea codului de tastã(keycode) pentru codul de scan(scancode) 0x%x\n" +msgstr "" +"eroare în primirea codului de tastã(keycode) pentru codul de scan(scancode) " +"0x%x\n" #: src/getunimap.c:29 #, fuzzy, c-format @@ -394,7 +405,8 @@ #: src/ksyms.c:1713 #, c-format msgid "unknown charset %s - ignoring charset request\n" -msgstr "set de caractere %s necunoscut - se ignorã cererea de set de caractere\n" +msgstr "" +"set de caractere %s necunoscut - se ignorã cererea de set de caractere\n" #: src/ksyms.c:1819 #, c-format @@ -426,36 +438,36 @@ msgid "unknown keysym '%s'\n" msgstr "keysym '%s' necunoscut\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, fuzzy, c-format msgid "cannot open include file %s" msgstr "Nu se poate deschide fiºierul de font %s\n" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: Avertisment: linie prea lungã\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -467,8 +479,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -478,238 +490,238 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "cod tastã %3d %s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, fuzzy, c-format msgid "failed to bind key %d to value %d\n" msgstr "eroare în setarea scancode %x în keycode %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, fuzzy, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, fuzzy, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: eroare în setarea modului tastaturii\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, fuzzy, c-format msgid "failed to clear string %s\n" msgstr "eroare în restaurarea unimap-ului original\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, fuzzy, c-format msgid "too many compose definitions\n" msgstr "nr max de definiþii compuse: %d\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, fuzzy, c-format msgid "(No change in compose definitions.)\n" msgstr "nr max de definiþii compuse: %d\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Eroare în scrierea mapãrii în fiºier\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, fuzzy, c-format msgid "too many (%d) entries on one line" msgstr "Prea multe fiºiere de combinat\n" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, fuzzy, c-format +msgid "Loading %s\n" +msgstr "Eroare în citirea %s\n" + +#: loadkeys.y:1062 +#, fuzzy, c-format +msgid "syntax error in map file\n" +msgstr "Eroare în scrierea mapãrii în fiºier\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: eroare în setarea modului tastaturii\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "eroare în executarea %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Nu se poate gãsi fontul %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Nu se poate deschide fiºierul de font %s\n" -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "Eroare în citirea %s\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "Eroare în scrierea mapãrii în fiºier\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "" - #: src/loadunimap.c:43 #, fuzzy, c-format msgid "" @@ -735,12 +747,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Interval Unicode greºit corespunzãtor intervalului de poziþie font 0x%x-0x%x\n" +msgstr "" +"%s: Interval Unicode greºit corespunzãtor intervalului de poziþie font 0x" +"%x-0x%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Intervalul Unicode U+%x-U+%x nu are aceeaºi mãrime ca intervalul de poziþie al fontului 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Intervalul Unicode U+%x-U+%x nu are aceeaºi mãrime ca intervalul de " +"poziþie al fontului 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -843,6 +861,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -854,74 +873,76 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: numãr vt ilegal\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: doar root-ul poate folosi marcajul(flag) -u.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" -msgstr "Nu am putut gãsi un descriptor de fiºier care sã se refere la aceastã consolã\n" +msgstr "" +"Nu am putut gãsi un descriptor de fiºier care sã se refere la aceastã " +"consolã\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: nu pot gãsi un vt liber\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: nu pot verifica dacã vt %d este liber\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d este în uz; se renunþã la comandã\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: nu se poate seta sesiune nouã (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Nu se poate deschide %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: se foloseºte VT %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Nu se poate deschide %s citire/scriere (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" @@ -1019,7 +1040,8 @@ #: src/psfxtable.c:142 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" -msgstr "%s: Numãrul reprezentãrii(glyph) (0x%lx) a depãºit sfârºitul fontului\n" +msgstr "" +"%s: Numãrul reprezentãrii(glyph) (0x%lx) a depãºit sfârºitul fontului\n" #: src/psfxtable.c:147 #, c-format @@ -1028,8 +1050,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Corespunzãtor unui interval de poziþii de fonturi, ar trebui sã fie un interval (range) Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Corespunzãtor unui interval de poziþii de fonturi, ar trebui sã fie un " +"interval (range) Unicode\n" #: src/psfxtable.c:257 #, c-format @@ -1109,15 +1135,19 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: nu uitaþi sã schimbaþi TERM (poate în con%dx%d sau în linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: nu uitaþi sã schimbaþi TERM (poate în con%dx%d sau în linux-%dx" +"%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "apelarea este: resizecons COLOANExRÂNDURI sau: resizecons COLOANEx\n" @@ -1163,7 +1193,8 @@ #: src/setfont.c:74 #, fuzzy, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1187,19 +1218,24 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Folosire: setfont [opþiuni-scriere] [-] [fontnou..] [-m mapare_consolã] [-u mapare_unicode]\n" +"Folosire: setfont [opþiuni-scriere] [-] [fontnou..] [-m mapare_consolã] [-" +"u mapare_unicode]\n" " opþiuni-scriere (are loc înainte de încãrcarea fiºierului):\n" " -o \tScrie fontul curent în \n" -" -O \tScrie fontul curent ºi maparea unicode în \n" +" -O \tScrie fontul curent ºi maparea unicode în " +"\n" " -om \tScrie maparea curentã a consolei în \n" " -ou \tScrie maparea curentã unicode în \n" "Dacã nici un fontnou ºi nici o opþiune-[o|O|om|ou|m|u] nu sunt specificate,\n" "va fi încãrcat un font nou:\n" " setfont Încarcã fontul \"default[.gz]\"\n" " setfont - Încarcã fontul \"default8x[.gz]\"\n" -"Opþiunea - selecteazã un font dintr-un cod de paginã care conþine trei fonturi:\n" -" setfont -{8|14|16} codepage.cp[.gz] Încarcã fontul 8x din codepage.cp\n" -"Explicit (cu -m sau -u) sau implicit (în fiºierul de font) mapãrile furnizate\n" +"Opþiunea - selecteazã un font dintr-un cod de paginã care conþine trei " +"fonturi:\n" +" setfont -{8|14|16} codepage.cp[.gz] Încarcã fontul 8x din codepage." +"cp\n" +"Explicit (cu -m sau -u) sau implicit (în fiºierul de font) mapãrile " +"furnizate\n" "vor fi încãrcate, sau în cazul mapãrilor de consolã, activate.\n" " -h (fãrã spaþiu) Suprascrie(override) înãlþimea fontului.\n" " -m Se încarcã maparea de ecran a consolei.\n" @@ -1217,8 +1253,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: nu se poate reveni(restore) ºi din caracterul ROM ºi din fiºier. Font neschimbat.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: nu se poate reveni(restore) ºi din caracterul ROM ºi din fiºier. " +"Font neschimbat.\n" #: src/setfont.c:259 #, c-format @@ -1283,7 +1323,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Când se încarcã mai multe fonturi, toate trebuie sã fie fonturi psf. - %s nu este\n" +msgstr "" +"Când se încarcã mai multe fonturi, toate trebuie sã fie fonturi psf. - %s nu " +"este\n" #: src/setfont.c:435 #, c-format @@ -1293,12 +1335,14 @@ #: src/setfont.c:441 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Când se încarcã mai multe fonturi, toate trebuie sã aibã aceeaºi înãlþime\n" +msgstr "" +"Când se încarcã mai multe fonturi, toate trebuie sã aibã aceeaºi înãlþime\n" #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Când se încarcã mai multe fonturi, toate trebuie sã aibã aceeaºi lãþime\n" +msgstr "" +"Când se încarcã mai multe fonturi, toate trebuie sã aibã aceeaºi lãþime\n" #: src/setfont.c:487 #, c-format @@ -1347,7 +1391,8 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Aþi cerut o mãrime de font %d, dar doar 8, 14, 16 sunt posibile aici.\n" +msgstr "" +"Aþi cerut o mãrime de font %d, dar doar 8, 14, 16 sunt posibile aici.\n" #: src/setfont.c:673 #, c-format @@ -1427,12 +1472,17 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Eroare în citirea setãrilor curente ale ledului. E posibil ca stdin sã nu fie un VT?\n" +msgstr "" +"Eroare în citirea setãrilor curente ale ledului. E posibil ca stdin sã nu " +"fie un VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Eroare în citirea setãrilor marcajelor(flags) curente. Poate nu sunteþi în consolã?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Eroare în citirea setãrilor marcajelor(flags) curente. Poate nu sunteþi în " +"consolã?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1545,7 +1595,8 @@ #: src/setmetamode.c:78 #, c-format msgid "Error reading current setting. Maybe stdin is not a VT?\n" -msgstr "Eroare în citirea setãrii curente. E posibil ca stdin sã nu fie un VT?\n" +msgstr "" +"Eroare în citirea setãrii curente. E posibil ca stdin sã nu fie un VT?\n" #: src/setmetamode.c:98 #, c-format @@ -1715,7 +1766,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "aspãsaþi orice tastã (programul se terminã la 10s dupã ultima apãsare de tastã)...\n" +msgstr "" +"aspãsaþi orice tastã (programul se terminã la 10s dupã ultima apãsare de " +"tastã)...\n" #: src/showkey.c:250 msgid "release" @@ -1740,6 +1793,67 @@ msgid "%s from %s\n" msgstr "%s din %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"argument necunoscut: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 este consola ºi nu poate fi dealocatã\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " folosiþi `openvt -f' pentru a forþa.\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/ru.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/ru.gmo differ diff -Nru kbd-1.15.3/po/ru.po kbd-1.15.5/po/ru.po --- kbd-1.15.3/po/ru.po 2011-05-14 21:08:16.000000000 +0000 +++ kbd-1.15.5/po/ru.po 2012-12-03 06:35:17.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the kbd package. # # QingLong , 1999. -# Yuri Kozlov , 2010, 2011. +# Yuri Kozlov , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: kbd 1.15.3-rc1\n" +"Project-Id-Version: kbd 1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2011-05-09 12:34+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2012-11-26 21:28+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 1.4\n" #: src/chvt.c:28 #, c-format @@ -77,7 +78,8 @@ #: src/dumpkeys.c:274 #, c-format msgid "max number of actions bindable to a key: %d\n" -msgstr "макÑимальное количеÑтво дейÑтвий, которые можно назначить клавише: %d\n" +msgstr "" +"макÑимальное количеÑтво дейÑтвий, которые можно назначить клавише: %d\n" #: src/dumpkeys.c:277 #, c-format @@ -192,7 +194,8 @@ "\t-h --help\t показать Ñту Ñправку\n" "\t-i --short-info\t показать информацию о драйвере клавиатуры\n" "\t-l --long-info\t показать что и выше и Ñимволы извеÑтные loadkeys\n" -"\t-n --numeric\t показать таблицу клавиш в шеÑтнадцатеричном предÑтавлении\n" +"\t-n --numeric\t показать таблицу клавиш в шеÑтнадцатеричном " +"предÑтавлении\n" "\t-f --full-table\t не иÑпользовать Ñокращённое предÑтавление,\n" "\t\t\t по одной Ñтроке на код клавиши\n" "\t-1 --separate-lines одна Ñтрока на пару (модификатор, код клавиши)\n" @@ -247,12 +250,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "Предупреждение: Ñлишком длинный путь: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Ðе удалоÑÑŒ открыть %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Ðе удалоÑÑŒ получить файловый деÑкриптор, указывающий на конÑоль\n" @@ -443,35 +446,35 @@ msgid "unknown keysym '%s'\n" msgstr "неизвеÑтный keysym «%s»\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð²Ð»Ð¾Ð¶ÐµÐ½Ñ‹ одно в другое Ñлишком глубоко" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "переключение на %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "не удалоÑÑŒ открыть включаемый файл %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "ожидаетÑÑ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в кавычках" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "юникодный keysym вне диапазона: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" msgstr "Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ñтрока" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -483,8 +486,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -495,137 +498,137 @@ msgstr "" "loadkeys, верÑÐ¸Ñ %s\n" "\n" -"ИÑпользование: loadkeys [параметр...] [файл_карты...]\n" +"ИÑпользование: loadkeys [параметр…] [файл_карты…]\n" "\n" "ДопуÑтимые параметры:\n" "\n" " -a --ascii принудительно преобразовать в ASCII\n" " -b --bkeymap выдать двоичную карту клавиш в Ñтандартный вывод\n" " -c --clearcompose очиÑтить таблицу ÑоÑтавлений Ñдра\n" -" -C --console=\n" -" иÑпользуемые уÑтройÑтва конÑолей\n" +" -C --console=файл\n" +" иÑпользуемое уÑтройÑтво конÑоли\n" " -d --default загрузить «%s»\n" " -h --help показать Ñту Ñправку\n" -" -m --mktable выдать defkeymap.c в Ñтандартный вывод\n" +" -m --mktable выдать «defkeymap.c» в Ñтандартный вывод\n" " -q --quiet не показывать вÑе обычные ÑообщениÑ\n" " -s --clearstrings очиÑтить таблицу Ñтрок Ñдра\n" " -u --unicode принудительно преобразовать в Юникод\n" " -v --verbose Ñообщить об изменениÑÑ…\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap вызвана Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ индекÑом %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "добавление карты %d противоречит Ñвному указанию в Ñтроке keymaps" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey вызвана Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ индекÑом %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey вызвана Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ таблицей %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey вызвана Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ кодом клавиши %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey вызван Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ индекÑом %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey вызвана Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ таблицей %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc вызвана Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ функцией %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: переполнение func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "переполнение ÑоÑтавной таблицы\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: не удалоÑÑŒ переключитьÑÑ Ð² режим Юникода\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "РаÑкладка %d: недоÑтаточно прав\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "код клавиши %d, таблица %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " ÐЕ ВЫПОЛÐЕÐО" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "не удалоÑÑŒ ÑопоÑтавить клавише %d значение %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "оÑвобождена раÑкладка %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: не удалоÑÑŒ оÑвободить раÑкладку %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: не удалоÑÑŒ оÑвободить или вычиÑтить раÑкладку\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: не удалоÑÑŒ вернутьÑÑ Ðº первоначальному режиму клавиатуры\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "не удалоÑÑŒ назначить Ñтроку «%s» на функцию %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "не удалоÑÑŒ очиÑтить Ñтроку %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "Ñлишком много ÑоÑтавных определений\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -634,122 +637,124 @@ "\n" "Изменены %d %s и %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "клавиша" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "клавиш" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "Ñтрока" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "Ñтрок" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Загружено %d ÑоÑтавных %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "определение" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "определений" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(СоÑтавные Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð½Ðµ изменилиÑÑŒ.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: непонÑтно как выполнить ÑоÑтавление Ð´Ð»Ñ %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Ошибка запиÑи карты в файл\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "«%s» не ÑвлÑетÑÑ Ñимволом функциональной клавиши" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "Ñлишком много (%d) Ñлементов в одной Ñтроке" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "Ñлишком много определений клавиш в одной Ñтроке" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "ЗагружаетÑÑ %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "ÑинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в файле карты\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "клавишные Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð½Ðµ изменилиÑÑŒ\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: параметры --unicode и --ascii взаимно иÑключают друг друга\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° клавиатуры\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° клавиатуры: %m\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -"%s: предупреждение: загружаетÑÑ Ð½Ðµ ÑŽÐ½Ð¸ÐºÐ¾Ð´Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° клавиш в юникодную конÑоль\n" +"%s: предупреждение: загружаетÑÑ Ð½Ðµ ÑŽÐ½Ð¸ÐºÐ¾Ð´Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° клавиш в юникодную " +"конÑоль\n" " (возможно, вы хотите выполнить «kbd_mode -u»?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -"%s: предупреждение: загружаетÑÑ ÑŽÐ½Ð¸ÐºÐ¾Ð´Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° клавиш в не юникодную конÑоль\n" +"%s: предупреждение: загружаетÑÑ ÑŽÐ½Ð¸ÐºÐ¾Ð´Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° клавиш в не юникодную " +"конÑоль\n" " (возможно, вы хотите выполнить «kbd_mode -u»?)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, c-format msgid "Searching in %s\n" msgstr "ПоиÑк в %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Ðе удалоÑÑŒ найти %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "не удалоÑÑŒ открыть файл %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "ЗагружаетÑÑ %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "ÑинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в файле карты\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "клавишные Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð½Ðµ изменилиÑÑŒ\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -767,7 +772,8 @@ #: src/loadunimap.c:195 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s: Ðомер образа Ñимвола (0x%x) больше количеÑтва знаков в Ñтом шрифте\n" +msgstr "" +"%s: Ðомер образа Ñимвола (0x%x) больше количеÑтва знаков в Ñтом шрифте\n" #: src/loadunimap.c:201 #, c-format @@ -777,12 +783,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: ÐедопуÑтимый диапазон Юникода, ÑоответÑтвующий диапазону шрифта 0x%x-0x%x\n" +msgstr "" +"%s: ÐедопуÑтимый диапазон Юникода, ÑоответÑтвующий диапазону шрифта 0x%x-0x" +"%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Диапазон Юникода U+%x-U+%x отличаетÑÑ Ð´Ð»Ð¸Ð½Ð¾Ð¹ от диапазона шрифта 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Диапазон Юникода U+%x-U+%x отличаетÑÑ Ð´Ð»Ð¸Ð½Ð¾Ð¹ от диапазона шрифта 0x%x-0x" +"%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -844,7 +856,9 @@ #: src/mapscrn.c:144 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "ЗагружаетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð°Ñ ÑÐºÑ€Ð°Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° прÑмого ÑоответÑÑ‚Ð²Ð¸Ñ ÑˆÑ€Ð¸Ñ„Ñ‚Ð¾Ð² из файла %s\n" +msgstr "" +"ЗагружаетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð°Ñ ÑÐºÑ€Ð°Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° прÑмого ÑоответÑÑ‚Ð²Ð¸Ñ ÑˆÑ€Ð¸Ñ„Ñ‚Ð¾Ð² из файла " +"%s\n" #: src/mapscrn.c:149 src/mapscrn.c:160 #, c-format @@ -885,6 +899,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -897,10 +912,12 @@ msgstr "" "ИÑпользование: %s [ПÐРÐМЕТРЫ] — команда\n" "\n" -"Эта утилита помогает запуÑтить программу на новом виртуальном терминале (VT).\n" +"Эта утилита помогает запуÑтить программу на новом виртуальном терминале " +"(VT).\n" "\n" "Параметры:\n" " -c, --console=ÐОМ иÑпользовать указанной номер VT;\n" +" -e, --exec выполнить команду без ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ процеÑÑа;\n" " -f, --force открыть VT без проверки;\n" " -l, --login запуÑтить команду как региÑтрационную оболочку;\n" " -u, --user выÑÑнить владельца текущего VT;\n" @@ -911,70 +928,74 @@ " -h, --help показать краткую Ñправку.\n" "\n" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "Ðе удалоÑÑŒ определить владельца текущего tty!" -#: src/openvt.c:230 +#: src/openvt.c:231 #, c-format msgid "%s: Illegal vt number" msgstr "%s: недопуÑтимый номер vt" -#: src/openvt.c:256 +#: src/openvt.c:257 msgid "Only root can use the -u flag." msgstr "Только Ñуперпользователь может иÑпользовать параметр -u." -#: src/openvt.c:278 +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" msgstr "Ðе удалоÑÑŒ получить файловый деÑкриптор, указывающий на конÑоль" -#: src/openvt.c:285 +#: src/openvt.c:286 msgid "Cannot find a free vt" msgstr "Ðе удалоÑÑŒ найти Ñвободный vt" -#: src/openvt.c:289 +#: src/openvt.c:290 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "Ðе удалоÑÑŒ проверить Ñвободен ли vt %d; иÑпользуйте «%s -f» Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ запуÑка." +msgstr "" +"Ðе удалоÑÑŒ проверить Ñвободен ли vt %d; иÑпользуйте «%s -f» Ð´Ð»Ñ " +"принудительного запуÑка." -#: src/openvt.c:293 +#: src/openvt.c:294 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "vt %d иÑпользуетÑÑ; команда прервана; иÑпользуйте «%s -f» Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ запуÑка." +msgstr "" +"vt %d иÑпользуетÑÑ; команда прервана; иÑпользуйте «%s -f» Ð´Ð»Ñ " +"принудительного запуÑка." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "Ðе удалоÑÑŒ найти команду." -#: src/openvt.c:335 +#: src/openvt.c:336 msgid "Unable to set new session" msgstr "Ðе удалоÑÑŒ уÑтановить новый ÑеанÑ" -#: src/openvt.c:359 +#: src/openvt.c:360 #, c-format msgid "Unable to open %s" msgstr "Ðе удалоÑÑŒ открыть %s" -#: src/openvt.c:363 +#: src/openvt.c:364 #, c-format msgid "Using VT %s" msgstr "ИÑпользуетÑÑ VT %s" -#: src/openvt.c:369 +#: src/openvt.c:370 #, c-format msgid "Cannot open %s read/write" msgstr "Ðе удалоÑÑŒ открыть %s на чтение/запиÑÑŒ" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "Ðе удалоÑÑŒ активировать vt %d" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð°?" -#: src/openvt.c:423 +#: src/openvt.c:424 #, c-format msgid "Couldn't deallocate console %d" msgstr "Ðе удалоÑÑŒ оÑвободить конÑоль %d" @@ -1072,7 +1093,8 @@ #: src/psfxtable.c:142 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" -msgstr "%s: Ðомер образа Ñимвола (0x%lx) больше количеÑтва знаков в Ñтом шрифте\n" +msgstr "" +"%s: Ðомер образа Ñимвола (0x%lx) больше количеÑтва знаков в Ñтом шрифте\n" #: src/psfxtable.c:147 #, c-format @@ -1081,8 +1103,11 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: диапазону позиций шрифта должен ÑоответÑтвовать некий диапазон Юникода\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: диапазону позиций шрифта должен ÑоответÑтвовать некий диапазон Юникода\n" #: src/psfxtable.c:257 #, c-format @@ -1153,7 +1178,9 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Строк развёртки в прежнем режиме: %d Строк развёртки в новом режиме: %d Ð’Ñ‹Ñота шрифта: %d\n" +msgstr "" +"Строк развёртки в прежнем режиме: %d Строк развёртки в новом режиме: %d " +"Ð’Ñ‹Ñота шрифта: %d\n" #: src/resizecons.c:252 #, c-format @@ -1162,15 +1189,19 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: не забудьте Ñменить TERM (возможно, на con%dx%d или linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: не забудьте Ñменить TERM (возможно, на con%dx%d или linux-%dx" +"%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "вызов:\tresizecons СТОЛБЦОВxСТРОК или: resizecons СТОЛБЦОВ СТРОК\n" @@ -1215,7 +1246,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1239,7 +1271,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"ИÑпользование: setfont [параметры_запиÑи] [-] [новый_шрифт..] [-m consolemap] [-u unicodemap]\n" +"ИÑпользование: setfont [параметры_запиÑи] [-] [новый_шрифт..] [-m " +"consolemap] [-u unicodemap]\n" " параметры_запиÑи (применÑÑŽÑ‚ÑÑ Ð¿ÐµÑ€ÐµÐ´ загрузкой файла):\n" " -o <имÑФайла> ЗапиÑать текущий шрифт в <имÑФайла>\n" " -O <имÑФайла> ЗапиÑать текущий шрифт и карту Юникода в <имÑФайла>\n" @@ -1249,8 +1282,10 @@ "то загружаетÑÑ ÑˆÑ€Ð¸Ñ„Ñ‚ по умолчанию:\n" " setfont Загрузить шрифт default[.gz]\n" " setfont - Загрузить шрифт «default8x[.gz]»\n" -"Параметр - выбирает шрифт из кодовой Ñтраницы, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñодержит три шрифта:\n" -" setfont -{8|14|16} codepage.cp[.gz] Загрузить шрифт 8x из codepage.cp\n" +"Параметр - выбирает шрифт из кодовой Ñтраницы, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñодержит три " +"шрифта:\n" +" setfont -{8|14|16} codepage.cp[.gz] Загрузить шрифт 8x из codepage." +"cp\n" "Будут загружены указанные Ñвно (-m or -u) или неÑвно (в файле шрифта)\n" "Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¸ в Ñлучае consolemaps, активированы.\n" " -h (без пробела) Заменить выÑоту шрифта.\n" @@ -1270,8 +1305,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: не удалоÑÑŒ воÑÑтановить Ñразу из Ñимвольного ПЗУ и из файла. Шрифт не изменён.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: не удалоÑÑŒ воÑÑтановить Ñразу из Ñимвольного ПЗУ и из файла. Шрифт " +"не изменён.\n" #: src/setfont.c:259 #, c-format @@ -1336,7 +1375,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "При загрузке неÑкольких шрифтов вÑе должны быть в формате psf: %s таковым не ÑвлÑетÑÑ\n" +msgstr "" +"При загрузке неÑкольких шрифтов вÑе должны быть в формате psf: %s таковым не " +"ÑвлÑетÑÑ\n" #: src/setfont.c:435 #, c-format @@ -1461,7 +1502,8 @@ "\tsetleds [-v] [-L] [-D] [-F] [[+|-][num|caps|scroll %s]]\n" "Ðапример,\n" "\tsetleds +caps -num\n" -"включит CapsLock, выключит NumLock и оÑтавит ScrollLock в прежнем ÑоÑтоÑнии.\n" +"включит CapsLock, выключит NumLock и оÑтавит ScrollLock в прежнем " +"ÑоÑтоÑнии.\n" "До и поÑле Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (еÑли они проиÑходили) выводÑÑ‚ÑÑ Ð½Ð°Ñтройки,\n" "еÑли указан параметр -v, или когда никаких изменений не запрошено.\n" "Обычно, setleds воздейÑтвует на ÑоÑтоÑние флагов vt\n" @@ -1483,12 +1525,16 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑоÑтоÑÐ½Ð¸Ñ Ð¸Ð½Ð´Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð². Возможно, stdin не ÑвлÑетÑÑ VT?\n" +msgstr "" +"Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑоÑтоÑÐ½Ð¸Ñ Ð¸Ð½Ð´Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð². Возможно, stdin не ÑвлÑетÑÑ " +"VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑоÑтоÑÐ½Ð¸Ñ Ð¸Ð½Ð´Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð². Возможно, вы не в конÑоли?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ ÑоÑтоÑÐ½Ð¸Ñ Ð¸Ð½Ð´Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð². Возможно, вы не в конÑоли?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1701,7 +1747,8 @@ "(вероÑтно, поÑле загрузки шрифта Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «setfont шрифт»)\n" "\n" "ДопуÑтимые параметры:\n" -" -C tty УÑтройÑтво, из которого читаетÑÑ ÑˆÑ€Ð¸Ñ„Ñ‚. По умолчанию: текущий tty.\n" +" -C tty УÑтройÑтво, из которого читаетÑÑ ÑˆÑ€Ð¸Ñ„Ñ‚. По умолчанию: текущий " +"tty.\n" " -v Выводить подробноÑти выполнениÑ.\n" " -i Ðе выводить таблицу шрифта, проÑто показать.\n" " СТРОКxСТОЛБЦОВxКОЛИЧЕСТВО и выйти.\n" @@ -1793,7 +1840,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "нажмите любую клавишу (программа завершаетÑÑ Ñ‡ÐµÑ€ÐµÐ· 10 Ñекунд поÑле поÑледнего Ð½Ð°Ð¶Ð°Ñ‚Ð¸Ñ Ð½Ð° клавиатуре)...\n" +msgstr "" +"нажмите любую клавишу (программа завершаетÑÑ Ñ‡ÐµÑ€ÐµÐ· 10 Ñекунд поÑле " +"поÑледнего Ð½Ð°Ð¶Ð°Ñ‚Ð¸Ñ Ð½Ð° клавиатуре)...\n" #: src/showkey.c:250 msgid "release" @@ -1818,6 +1867,78 @@ msgid "%s from %s\n" msgstr "%s из %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" +"Через некоторое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ещё раз.\n" +"\n" +"\n" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "Теперь вывод на конÑоль полноÑтью заблокирован %s.\n" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "Блокировка %s уÑтановлена %s.\n" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" +"ИÑпользуйте Alt-функциональные клавиши Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° в другие виртуальные " +"конÑоли." + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð´Ð¾Ñтупна по команде «%s --help».\n" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" +"%s: блокирует виртуальные конÑоли, ÑохранÑÑ Ð²Ð°Ñˆ текущий ÑеанÑ.\n" +"ИÑпользование: %s [параметры]\n" +" Параметры:\n" +"-c или --current: заблокировать только Ñту виртуальную конÑоль, позволÑÑ\n" +" пользователю переключитьÑÑ Ð½Ð° другие виртуальные конÑоли.\n" +"-a или --all: заблокировать вÑе виртуальные конÑоли, не Ð´Ð°Ð²Ð°Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти\n" +" другим пользователÑм переключитьÑÑ Ð½Ð° другие виртуальные конÑоли.\n" +"-v или --version: Показать номер верÑии vlock и выйти.\n" +"-h или --help: Показать Ñто Ñообщений и выйти.\n" + +#: src/vlock/username.c:57 +msgid "unrecognized user" +msgstr "неопознанный пользователь" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "Ñтандартный ввод не ÑвлÑетÑÑ ÑƒÑтройÑтвом tty" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "Данное уÑтройÑтво tty (%s) не ÑвлÑетÑÑ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð¹ конÑолью.\n" + +#: src/vlock/vt.c:160 +#, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "Экран конÑоли не может быть быть заблокирован целиком.\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " иÑпользуйте `openvt -f' Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ работы.\n" @@ -1831,5 +1952,9 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: не удалоÑÑŒ оÑвободить конÑоль %d\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "ИÑпользование: openvt [-c vt_номер] [-f] [-l] [-u] [-s] [-v] [-w] -- команднаÑ_Ñтрока\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" +#~ msgstr "" +#~ "ИÑпользование: openvt [-c vt_номер] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "команднаÑ_Ñтрока\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/sv.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/sv.gmo differ diff -Nru kbd-1.15.3/po/sv.po kbd-1.15.5/po/sv.po --- kbd-1.15.3/po/sv.po 2011-05-14 21:12:42.000000000 +0000 +++ kbd-1.15.5/po/sv.po 2012-12-01 21:41:38.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kbd 1.12\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2007-12-19 11:50+0100\n" "Last-Translator: Christer Andersson \n" "Language-Team: Swedish \n" @@ -234,12 +234,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: Varning: raden är för lång\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "Kunde inte öppna %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Kunde inte få en filidentifierare för konsollen\n" @@ -257,7 +257,8 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 är ett fel, för 1-88 (0x01-0x58) är avläsningskoden lika med tangentkoden\n" +msgstr "" +"0 är ett fel, för 1-88 (0x01-0x58) är avläsningskoden lika med tangentkoden\n" #: src/getkeycodes.c:62 #, c-format @@ -426,36 +427,36 @@ msgid "unknown keysym '%s'\n" msgstr "okänd teckensymbol \"%s\"\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, fuzzy, c-format msgid "cannot open include file %s" msgstr "Kan inte öppna typsnittsfilen %s\n" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: Varning: raden är för lång\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -467,8 +468,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -478,238 +479,238 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: kunde inte avallokera konsoll %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "tangentkod %3d %s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, fuzzy, c-format msgid "failed to bind key %d to value %d\n" msgstr "kunde inte sätta avläsningskoden %x till tangentkoden %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, fuzzy, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: kunde inte avallokera konsoll %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, fuzzy, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: kunde inte avallokera konsoll %d\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: fel när tangentbordsläge sattes\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, fuzzy, c-format msgid "failed to clear string %s\n" msgstr "misslyckades med att återställa originalunitabell\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, fuzzy, c-format msgid "too many compose definitions\n" msgstr "största antal kompositionsdefinitioner: %d\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, fuzzy, c-format msgid "(No change in compose definitions.)\n" msgstr "största antal kompositionsdefinitioner: %d\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Fel vid skrivning av tabell till fil\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, fuzzy, c-format msgid "too many (%d) entries on one line" msgstr "För många filer att kombinera\n" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, fuzzy, c-format +msgid "Loading %s\n" +msgstr "Fel vid läsning av %s\n" + +#: loadkeys.y:1062 +#, fuzzy, c-format +msgid "syntax error in map file\n" +msgstr "Fel vid skrivning av tabell till fil\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: fel när tangentbordsläge sattes\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "fel vid exekvering av %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Hittar inte typsnittet %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Kan inte öppna typsnittsfilen %s\n" -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "Fel vid läsning av %s\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "Fel vid skrivning av tabell till fil\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -737,12 +738,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Felaktigt Unicodeintervall som motsvarar typsnittspositionsintervall 0x%x-0x%x\n" +msgstr "" +"%s: Felaktigt Unicodeintervall som motsvarar typsnittspositionsintervall 0x" +"%x-0x%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Unicodeintervall U+%x-U+%x är inte av samma längd som typsnittspositionsintervall 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Unicodeintervall U+%x-U+%x är inte av samma längd som " +"typsnittspositionsintervall 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -845,6 +852,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -856,74 +864,74 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: otillåtet vt-nummer\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: endast root kan använda flaggan -u.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" msgstr "Kunde inte få en filidentifierare för konsollen\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: kan inte hitta en ledig vt\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: kan inte undersöka huruvida vt %d är ledig\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d används, kommandot avbrutet\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: Kan inte sätta ny session (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Kan inte öppna %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: använder VT %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Kan inte öppna %s för läsning/skrivning (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: kunde inte avallokera konsoll %d\n" @@ -1030,8 +1038,12 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Till ett motsvarande intervall av typsnittspositioner borde det finnas ett Unicodeintervall\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Till ett motsvarande intervall av typsnittspositioner borde det finnas " +"ett Unicodeintervall\n" #: src/psfxtable.c:257 #, c-format @@ -1102,7 +1114,8 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Gammalt antal skannlinjer: %d Nytt antal skannlinjer: %d Teckenhöjd: %d\n" +msgstr "" +"Gammalt antal skannlinjer: %d Nytt antal skannlinjer: %d Teckenhöjd: %d\n" #: src/resizecons.c:252 #, c-format @@ -1111,19 +1124,23 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: glöm inte ändra TERM (kanske till con%dx%d eller linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: glöm inte ändra TERM (kanske till con%dx%d eller linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "anrop: resizecons KOLUMNERxRADER eller: resizecons KOLUMNER RADER\n" -"eller: resizecons -lines RADER, där RADER är en av 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"eller: resizecons -lines RADER, där RADER är en av 25, 28, 30, 34, 36, 40, " +"44, 50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1163,7 +1180,8 @@ #: src/setfont.c:74 #, fuzzy, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1187,7 +1205,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Användning: setfont [skrivflaggor] [-] [nyttypsnitt..] [-m konsolltabell] [-u unicodetabell]\n" +"Användning: setfont [skrivflaggor] [-] [nyttypsnitt..] [-m konsolltabell] " +"[-u unicodetabell]\n" " skrivflaggor (händer före filer läses):\n" " -o Skriv nuvarande typsnitt till \n" " -O Skriv nuvarande typsnitt och unicodetabell till \n" @@ -1197,8 +1216,10 @@ "läses ett standardtypsnitt in:\n" " setfont Läs in typsnitt \"default[.gz]\"\n" " setfont - Läs in typsnitt \"default8x[.gz]\"\n" -"--flaggan väljer ett typsnitt från en teckentabell som innehåller tre typsnitt:\n" -" setfont -{8|14|16} codepage.cp[.gz] Läs in 8×-typsnitt från codepage.cp\n" +"--flaggan väljer ett typsnitt från en teckentabell som innehåller tre " +"typsnitt:\n" +" setfont -{8|14|16} codepage.cp[.gz] Läs in 8×-typsnitt från " +"codepage.cp\n" "Explicit (med -m eller -u) eller implicit (i typsnittsfilen) givna tabeller\n" "kommer läsas in och, om det gäller konsolltabeller, aktiveras.\n" " -h (inget blanktecken) åsidosätt typsnittshöjd.\n" @@ -1217,8 +1238,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: kan inte både återställa från tecken-ROM och från fil. Fonten oförändrad.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: kan inte både återställa från tecken-ROM och från fil. Fonten " +"oförändrad.\n" #: src/setfont.c:259 #, c-format @@ -1283,7 +1308,8 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "När flera typsnitt läses in måste alla vara psf-typsnitt - %s är inte det\n" +msgstr "" +"När flera typsnitt läses in måste alla vara psf-typsnitt - %s är inte det\n" #: src/setfont.c:435 #, c-format @@ -1347,7 +1373,8 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Du bad om typsnittsstorleken %d, men bara 8, 14 och 16 är möjliga här.\n" +msgstr "" +"Du bad om typsnittsstorleken %d, men bara 8, 14 och 16 är möjliga här.\n" #: src/setfont.c:673 #, c-format @@ -1427,12 +1454,16 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Fel vid läsning av nuvarande inställning. Standard in kanske inte är en VT?\n" +msgstr "" +"Fel vid läsning av nuvarande inställning. Standard in kanske inte är en VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Fel vid läsning av nuvarande flagginställning. Du kanske inte är på konsollen?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Fel vid läsning av nuvarande flagginställning. Du kanske inte är på " +"konsollen?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1545,7 +1576,8 @@ #: src/setmetamode.c:78 #, c-format msgid "Error reading current setting. Maybe stdin is not a VT?\n" -msgstr "Fel vid läsning av nuvarande inställning. Standard in kanske inte är en VT?\n" +msgstr "" +"Fel vid läsning av nuvarande inställning. Standard in kanske inte är en VT?\n" #: src/setmetamode.c:98 #, c-format @@ -1715,7 +1747,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "tryck någon tangent (programmet avslutas 10 s efter sista tangenttryckning)...\n" +msgstr "" +"tryck någon tangent (programmet avslutas 10 s efter sista " +"tangenttryckning)...\n" #: src/showkey.c:250 msgid "release" @@ -1740,6 +1774,67 @@ msgid "%s from %s\n" msgstr "%s från %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"okänt argument: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 är konsollen och kan inte avallokeras\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " använd \"openvt -f\" för att framtvinga.\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/tr.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/tr.gmo differ diff -Nru kbd-1.15.3/po/tr.po kbd-1.15.5/po/tr.po --- kbd-1.15.3/po/tr.po 2011-05-14 21:12:32.000000000 +0000 +++ kbd-1.15.5/po/tr.po 2012-12-01 21:41:38.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kbd 1.10\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2004-01-21 06:15+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -234,12 +234,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: Uyari: satir cok uzun\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "%s acilamadi\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Konsolu hedef alan bir dosya betimleyici (fd) alinamadi\n" @@ -257,12 +257,16 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 bir hatadir; 1-88 (0x01-0x58) tarama kodlari tu$ kodlariyla ayni oldugu icin\n" +msgstr "" +"0 bir hatadir; 1-88 (0x01-0x58) tarama kodlari tu$ kodlariyla ayni oldugu " +"icin\n" #: src/getkeycodes.c:62 #, fuzzy, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "0 bir hatadir; 1-88 (0x01-0x58) tarama kodlari tu$ kodlariyla ayni oldugu icin\n" +msgstr "" +"0 bir hatadir; 1-88 (0x01-0x58) tarama kodlari tu$ kodlariyla ayni oldugu " +"icin\n" #: src/getkeycodes.c:68 #, c-format @@ -426,36 +430,36 @@ msgid "unknown keysym '%s'\n" msgstr "'%s' sembolu bilinmiyor\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, fuzzy, c-format msgid "cannot open include file %s" msgstr "%s yazitipi dosyasi acilamiyor\n" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: Uyari: satir cok uzun\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -467,8 +471,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -478,238 +482,238 @@ " -v --verbose report the changes\n" msgstr "" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: %d konsolu kaldirilamadi\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "" -#: loadkeys.y:345 +#: loadkeys.y:348 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "tu$ kodu %3d %s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr "" -#: loadkeys.y:351 +#: loadkeys.y:354 #, fuzzy, c-format msgid "failed to bind key %d to value %d\n" msgstr "tarama kodu %x tu$ kodu %d ile e$le$tirilirken hata olu$tu\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "" -#: loadkeys.y:371 +#: loadkeys.y:372 #, fuzzy, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: %d konsolu kaldirilamadi\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, fuzzy, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: %d konsolu kaldirilamadi\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: klavye kipi ayarlanirken hata\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "" -#: loadkeys.y:455 +#: loadkeys.y:467 #, fuzzy, c-format msgid "failed to clear string %s\n" msgstr "ozgun unicode e$lem yerine konamadi\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, fuzzy, c-format msgid "too many compose definitions\n" msgstr "en fazla dizgi tanimi sayisi: %d\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" "Changed %d %s and %d %s.\n" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "" -#: loadkeys.y:599 +#: loadkeys.y:610 #, fuzzy, c-format msgid "(No change in compose definitions.)\n" msgstr "en fazla dizgi tanimi sayisi: %d\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "E$lem dosyaya yazilirken hata\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, fuzzy, c-format msgid "too many (%d) entries on one line" msgstr "Birle$tirilecek dosya sayisi cok fazla\n" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, fuzzy, c-format +msgid "Loading %s\n" +msgstr "%s okunurken hata\n" + +#: loadkeys.y:1062 +#, fuzzy, c-format +msgid "syntax error in map file\n" +msgstr "E$lem dosyaya yazilirken hata\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: klavye kipi ayarlanirken hata\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "%s icra edilirken hata\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "%s yazitipi bulunamiyor\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "%s yazitipi dosyasi acilamiyor\n" -#: loadkeys.y:1184 -#, fuzzy, c-format -msgid "Loading %s\n" -msgstr "%s okunurken hata\n" - -#: loadkeys.y:1189 -#, fuzzy, c-format -msgid "syntax error in map file\n" -msgstr "E$lem dosyaya yazilirken hata\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -737,11 +741,15 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Unicode araliginin 0x%x-0x%x yazitipi konumlari araligi ile ili$kilendirilmesi hatali\n" +msgstr "" +"%s: Unicode araliginin 0x%x-0x%x yazitipi konumlari araligi ile ili" +"$kilendirilmesi hatali\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" msgstr "" "%s: Unicode araligi U+%x-U+%x,\n" "yazitipi konumlari araligi 0x%x-0x%x\n" @@ -848,6 +856,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -859,77 +868,77 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "" # Dikkat: utf-8 ve iso kiplerde karakter kaybina ugramadan # iletilerin duzgun okunabilmesi icin sadece bu pakette # Turkce'ye ozgu karakterlerden kacinilmi$tir. -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: kuraldisi sanal terminal (vt) numarasi\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: -u bayragini sadece root kullanabilir.\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" msgstr "Konsolu hedef alan bir dosya betimleyici (fd) alinamadi\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: serbest bir sanal terminal (vt) bulunamiyor\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: sanal terminal (vt) %d serbest mi denetlenemiyor\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: sanal terminal (vt) %d kullanimda; komut iptal edildi\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: yeni oturum (%s) ayarlanamiyor\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: %s acilamiyor: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: VT %s kullanarak\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: %s oku/yaz kipinde acilamiyor (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: %d konsolu kaldirilamadi\n" @@ -1036,7 +1045,9 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" msgstr "" "%s: Bir yazitipi konumlari araligi ile ili$kilendirilen\n" "bir Unicode araligi olmaliydi.\n" @@ -1123,7 +1134,8 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" msgstr "" "resizecons: TERM cevre degi$kenini degi$tirmeyi unutmayin\n" "(con%dx%d veya linux-%dx%d olabilir)\n" @@ -1133,7 +1145,8 @@ msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "kullanimi: resizecons SUTUN-SAYISIxSATIR-SAYISI\n" @@ -1179,7 +1192,8 @@ #: src/setfont.c:74 #, fuzzy, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1215,8 +1229,10 @@ " setfont \"default[.gz]\" yazitipi yuklenir\n" " setfont - \"default8x[.gz]\" yazitipi yuklenir\n" "- ile uc yazitipi iceren bir karakter kumesinden bir yazitipi secilir:\n" -" setfont -{8|14|16} codepage.cp[.gz] codepage.cp'den 8x yazitipi yuklenir\n" -"Dogrudan (-m veya -u ile) ya da dolayli olarak (yazitipi dosyasindaki) verilen\n" +" setfont -{8|14|16} codepage.cp[.gz] codepage.cp'den 8x yazitipi " +"yuklenir\n" +"Dogrudan (-m veya -u ile) ya da dolayli olarak (yazitipi dosyasindaki) " +"verilen\n" "e$lemler yuklenir ve konsol e$lemi kapsaminda etkinle$tirilir.\n" " -h (bo$luk birakmadan) yazitipi yuksekligine zorlar.\n" " -m DOSYA belirtilen konsol ekran e$lemini yukler.\n" @@ -1235,8 +1251,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: hem ekran kartindan hem de dosyadan yuklenemez. Yazitipi degi$medi.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: hem ekran kartindan hem de dosyadan yuklenemez. Yazitipi degi" +"$medi.\n" #: src/setfont.c:259 #, c-format @@ -1301,7 +1321,8 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Ayri ayri yazitipleri yuklenirken tumu psf yazitipi olmali - %s degil\n" +msgstr "" +"Ayri ayri yazitipleri yuklenirken tumu psf yazitipi olmali - %s degil\n" #: src/setfont.c:435 #, c-format @@ -1447,12 +1468,16 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "$u anki led durumlari okunurken hata olu$tu. Standard girdi bir VT olmayabilir mi?\n" +msgstr "" +"$u anki led durumlari okunurken hata olu$tu. Standard girdi bir VT " +"olmayabilir mi?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Mevcut bayraklar okunurken hata olu$tu. Konsolda olmayabilir misiniz?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Mevcut bayraklar okunurken hata olu$tu. Konsolda olmayabilir misiniz?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1772,6 +1797,67 @@ msgid "%s from %s\n" msgstr "%s (%s den)\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"bilinmeyen arguman: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 konsolun kendisi ve kaldirilamaz\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " sorunu a$mak icin `openvt -f' kullanin.\n" @@ -1793,7 +1879,8 @@ #~ "(probably after loading a font with `setfont font')\n" #~ msgstr "" #~ "kullanimi: showconsolefont [-v|-V]\n" -#~ "(Genelde `setfont yazitipi' ile bir yazitipini yukledikten sonra kullanilir)\n" +#~ "(Genelde `setfont yazitipi' ile bir yazitipini yukledikten sonra " +#~ "kullanilir)\n" #~ msgid "usage: %s [-o map.orig] [map-file]\n" #~ msgstr "kullanimi: %s [-o e$lem.ozgun] [e$lem-dosyasi]\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/uk.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/uk.gmo differ diff -Nru kbd-1.15.3/po/uk.po kbd-1.15.5/po/uk.po --- kbd-1.15.3/po/uk.po 2011-05-14 21:08:00.000000000 +0000 +++ kbd-1.15.5/po/uk.po 2012-12-03 06:35:17.000000000 +0000 @@ -2,20 +2,20 @@ # This file is distributed under the same license as the kbd package. # # Maxim V. Dziumanenko , 2006. -# Yuri Chornoivan , 2011. +# Yuri Chornoivan , 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: kbd 1.15.3-rc1\n" +"Project-Id-Version: kbd 1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2011-05-09 11:56+0300\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2012-11-26 11:27+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" #: src/chvt.c:28 @@ -192,7 +192,8 @@ "\t-i --short-info\t вивеÑти інформацію про драйвер клавіатури\n" "\t-l --long-info\t вивеÑти вказане вище та Ñимволи, що відомі loadkeys\n" "\t-n --numeric\t вивеÑти таблицю клавіш к шіÑтнадцÑтковому виглÑді\n" -"\t-f --full-table\t не вживати короткі нотації, один Ñ€Ñдок на код клавіші\n" +"\t-f --full-table\t не вживати короткі нотації, один Ñ€Ñдок на код " +"клавіші\n" "\t-1 --separate-lines одна Ð»Ñ–Ð½Ñ–Ñ Ð½Ð° пару (модифікатор, код клавіші)\n" "\t --funcs-only\t вивеÑти лише Ñ€Ñдки функцій клавіш\n" "\t --keys-only\t вивеÑти лише прив'Ñзки клавіш\n" @@ -245,12 +246,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "ПопередженнÑ: надто довгий шлÑÑ…: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ файловий деÑкриптор, що відповідає конÑолі\n" @@ -346,12 +347,14 @@ #: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" -msgstr "Клавіатура знаходитьÑÑ Ñƒ звичайному режимі (надÑилає ASCII-коди знаків)\n" +msgstr "" +"Клавіатура знаходитьÑÑ Ñƒ звичайному режимі (надÑилає ASCII-коди знаків)\n" #: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" -msgstr "Клавіатура знаходитьÑÑ Ñƒ режимі Unicode (надÑилає коди знаків у UTF-8)\n" +msgstr "" +"Клавіатура знаходитьÑÑ Ñƒ режимі Unicode (надÑилає коди знаків у UTF-8)\n" #: src/kbd_mode.c:97 #, c-format @@ -441,35 +444,35 @@ msgid "unknown keysym '%s'\n" msgstr "невідомий keysym `%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "занадто виÑокий рівень вкладеноÑÑ‚Ñ– включеннÑ" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð½Ð° %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ включений файл %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "мало бути вказано назву файла у лапках" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "номер Ñимволу unicode поза межами діапазону: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" msgstr "надто довгий Ñ€Ñдок" -#: loadkeys.y:90 +#: loadkeys.y:93 #, c-format msgid "" "loadkeys version %s\n" @@ -481,8 +484,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -500,8 +503,8 @@ " -a --ascii примуÑове Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ ASCII\n" " -b --bkeymap вивеÑти бінарні дані розкладки до stdout\n" " -c --clearcompose Ñпорожнити таблицю ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñдра\n" -" -C --console=\n" -" приÑтрої конÑолі, Ñкі має бути викориÑтано\n" +" -C --console=файл\n" +" приÑтрій конÑолі, ÑкийB має бути викориÑтано\n" " -d --default завантажити «%s»\n" " -h --help показати цю довідкову інформацію\n" " -m --mktable вивеÑти \"defkeymap.c\" до stdout\n" @@ -510,120 +513,120 @@ " -u --unicode примуÑове Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ Unicode\n" " -v --verbose повідомити про внеÑені зміни\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap викликано з помилковим значеннÑм індекÑу %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ÐºÐ¸ %d Ñуперечить Ñ€Ñдку Ñвного Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ÐºÐ¸" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey викликано з помилковим значеннÑм індекÑу %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey викликано з помилковим значеннÑм таблиці %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey викликано з помилковим значеннÑм коду клавіші %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey викликано з помилковим значеннÑм індекÑу %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey викликано з помилковим номером таблиці %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc викликано з помилковим значеннÑм func %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– Ñполучень\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐºÐ½ÑƒÑ‚Ð¸ÑÑ Ñƒ режим Unicode\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "Розкладка %d: відмовлено у доÑтупі\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "клавіша %d, Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " ПОМИЛКÐ" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "не вдалоÑÑ Ð¿Ñ€Ð¸Ð²â€™Ñзати клавішу %d до Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "вилучити розкладку %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: не вдалоÑÑ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ розкладку %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: не вдалоÑÑ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ або Ñпорожнити розкладку\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: не вдалоÑÑ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ початкового режиму роботи клавіатури\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "не вдалоÑÑ Ð¿Ð¾Ð²â€™Ñзати Ñ€Ñдок «%s» з функцією %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "не вдалоÑÑ Ñпорожнити Ñ€Ñдок %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "занадто багато визначень Ñполучень\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "неможливо виконати do_constant" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -632,75 +635,90 @@ "\n" "Змінено %d %s та %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "клавішу" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "клавіш" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "Ñ€Ñдок" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "Ñ€Ñдків" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Завантажено %d Ñполучень %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "визначеннÑ" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "визначеннÑ" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(Ðемає змін у визначеннÑÑ… Ñполучених клавіш.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: невідомий ÑпоÑіб ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑÐ¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "Помилка запиÑу у файл\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "«%s» не Ñ” Ñимволом функціональної клавіші" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "занадто багато запиÑів (%d) у одному Ñ€Ñдку" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "занадто багато визначень клавіш у одному Ñ€Ñдку" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "ÑинтакÑична помилка у файлі розкладки\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "прив’Ñзку клавіш не змінено\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: параметри --unicode Ñ– --ascii не можна викориÑтовувати одночаÑно\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: помилка під Ñ‡Ð°Ñ Ñпроби Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ñƒ роботи клавіатури\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: помилка під Ñ‡Ð°Ñ Ñпроби Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ñƒ роботи клавіатури: %m\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -709,7 +727,7 @@ "%s: попередженнÑ: Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ-Unicode-розкладки до конÑолі Unicode\n" " (можливо, вам варто виконати «kbd_mode -a»?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -718,36 +736,21 @@ "%s: попередженнÑ: Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Unicode-розкладки до не-Unicode-конÑолі\n" " (можливо, вам варто виконати «kbd_mode -u»?)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, c-format msgid "Searching in %s\n" msgstr "Пошук у %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "ÑинтакÑична помилка у файлі розкладки\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "прив’Ñзку клавіш не змінено\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -775,12 +778,18 @@ #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: ÐеприпуÑтимий Unicode-діапазон, що відповідає діапазону шрифту 0x%x--0x%x\n" +msgstr "" +"%s: ÐеприпуÑтимий Unicode-діапазон, що відповідає діапазону шрифту 0x%x--0x" +"%x\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Довжина Unicode-діапазону U+%x-U+%x відрізнÑєтьÑÑ Ð²Ñ–Ð´ довжини діапазону шрифту 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Довжина Unicode-діапазону U+%x-U+%x відрізнÑєтьÑÑ Ð²Ñ–Ð´ довжини діапазону " +"шрифту 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -883,6 +892,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -895,84 +905,91 @@ msgstr "" "ВикориÑтаннÑ: %s [ПÐРÐМЕТРИ] -- command\n" "\n" -"За допомогою цієї програми можна запуÑтити програму на новому віртуальному терміналі (VT).\n" +"За допомогою цієї програми можна запуÑтити програму на новому віртуальному " +"терміналі (VT).\n" "\n" "Параметри:\n" " -c, --console=ÐОМЕР викориÑтати VT з вказаним номером;\n" +" -e, --exec виконати команду без ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð³Ð°Ð»ÑƒÐ¶ÐµÐ½Ð½Ñ;\n" " -f, --force відкрити VT у примуÑовому режимі без перевірки;\n" " -l, --login зробити команду оболонкою входу;\n" " -u, --user визначити влаÑника поточного VT;\n" " -s, --switch перемкнутиÑÑ Ð½Ð° новий VT;\n" " -w, --wait зачекати на Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸;\n" " -v, --verbose повідомлÑти про кожну дію;\n" -" -V, --version показати дані щодо верÑÑ–Ñ— програми Ñ– завершити роботу;\n" +" -V, --version показати дані щодо верÑÑ–Ñ— програми Ñ– завершити " +"роботу;\n" " -h, --help показати коротке довідкове повідомленнÑ.\n" "\n" -#: src/openvt.c:162 +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ влаÑника поточного tty!" -#: src/openvt.c:230 +#: src/openvt.c:231 #, c-format msgid "%s: Illegal vt number" msgstr "%s: некоректний номер VT" -#: src/openvt.c:256 +#: src/openvt.c:257 msgid "Only root can use the -u flag." msgstr "параметри -u може вказувати лише адмініÑтратор (root)." -#: src/openvt.c:278 +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ файловий деÑкриптор, що відповідає конÑолі" -#: src/openvt.c:285 +#: src/openvt.c:286 msgid "Cannot find a free vt" msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ вільний VT" -#: src/openvt.c:289 +#: src/openvt.c:290 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸, чи вільний VT %d; ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ «%s -f» Ð´Ð»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ примуÑовому режимі." +msgstr "" +"не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸, чи вільний VT %d; ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ «%s -f» Ð´Ð»Ñ " +"вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ примуÑовому режимі." -#: src/openvt.c:293 +#: src/openvt.c:294 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "vt %d вже викориÑтовуєтьÑÑ; Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ перервано; ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ «%s -f» Ð´Ð»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ примуÑовому режимі." +msgstr "" +"vt %d вже викориÑтовуєтьÑÑ; Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ перервано; ÑкориÑтайтеÑÑ " +"командою «%s -f» Ð´Ð»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ примуÑовому режимі." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ команду." -#: src/openvt.c:335 +#: src/openvt.c:336 msgid "Unable to set new session" msgstr "Ðе вдалоÑÑ Ð²Ñтановити новий ÑеанÑ" -#: src/openvt.c:359 +#: src/openvt.c:360 #, c-format msgid "Unable to open %s" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s" -#: src/openvt.c:363 +#: src/openvt.c:364 #, c-format msgid "Using VT %s" msgstr "ВикориÑтовуєтьÑÑ VT %s" -#: src/openvt.c:369 +#: src/openvt.c:370 #, c-format msgid "Cannot open %s read/write" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ запиÑу" -#: src/openvt.c:380 +#: src/openvt.c:381 #, c-format msgid "Couldn't activate vt %d" msgstr "Ðе вдалоÑÑ Ð°ÐºÑ‚Ð¸Ð²ÑƒÐ²Ð°Ñ‚Ð¸ VT %d" -#: src/openvt.c:383 +#: src/openvt.c:384 msgid "Activation interrupted?" msgstr "Ðктивацію перервано?" -#: src/openvt.c:423 +#: src/openvt.c:424 #, c-format msgid "Couldn't deallocate console %d" msgstr "не вдалоÑÑ Ð·Ð²Ñ–Ð»ÑŒÐ½Ð¸Ñ‚Ð¸ конÑоль %d" @@ -1079,8 +1096,11 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Діапазону позицій шрифту має відповідати певний діапазон у Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Діапазону позицій шрифту має відповідати певний діапазон у Unicode\n" #: src/psfxtable.c:257 #, c-format @@ -1151,7 +1171,9 @@ #: src/resizecons.c:241 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "РÑдків розгортки у попередньому режимі: %d У новому: %d ВиÑота шрифту: %d\n" +msgstr "" +"РÑдків розгортки у попередньому режимі: %d У новому: %d ВиÑота шрифту: " +"%d\n" #: src/resizecons.c:252 #, c-format @@ -1160,15 +1182,18 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: не забудьте змінити TERM (можливо, на con%dx%d або linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: не забудьте змінити TERM (можливо, на con%dx%d або linux-%dx%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "виклик: resizecons СТОВПЧИКІВxРЯДКІВ або: resizecons СТОВПЧИКІВ РЯДКІВ\n" @@ -1213,7 +1238,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1237,10 +1263,12 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"ВикориÑтаннÑ: setfont [параметри-запиÑу] [-] [новий_шрифт..] [-m consolemap] [-u unicodemap]\n" +"ВикориÑтаннÑ: setfont [параметри-запиÑу] [-] [новий_шрифт..] [-m " +"consolemap] [-u unicodemap]\n" " параметри запиÑу (заÑтоÑовуютьÑÑ Ð¿ÐµÑ€ÐµÐ´ завантаженнÑм):\n" " -o <файл> ЗапиÑати поточний шрифт у \n" -" -O <файл> ЗапиÑати поточний шрифт та Ñхему Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Unicode у <файл>\n" +" -O <файл> ЗапиÑати поточний шрифт та Ñхему Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Unicode у " +"<файл>\n" " -om <файл> ЗапиÑати поточну Ñхему показу конÑолі у <файл>\n" " -ou <файл> ЗапиÑати поточну Ñхему показу unicode у <файл>\n" "Якщо не вказано новий_шрифт та не вказано параметр -[o|O|om|ou|m|u],\n" @@ -1248,7 +1276,8 @@ " setfont Завантажити шрифт \"default[.gz]\"\n" " setfont - Завантажити шрифт \"default8x[.gz]\"\n" "Параметр - вибирає шрифт з кодової Ñторінки, Ñка міÑтить три шрифти:\n" -" setfont -{8|14|16} codepage.cp[.gz] Завантажити шрифт 8x з codepage.cp\n" +" setfont -{8|14|16} codepage.cp[.gz] Завантажити шрифт 8x з codepage." +"cp\n" "Явно (викориÑтовуючи -m чи -u) або неÑвно (у fontfile) вказані Ñхеми\n" "будуть завантажені та, у випадку consolemaps, активовані.\n" " -h (без пробілу) Перевизначити виÑоту шрифту.\n" @@ -1268,8 +1297,12 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: не вдалоÑÑ Ñтавити шрифт одразу з ПЗУ, та з файлу. Шрифт ÐЕ змінено.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: не вдалоÑÑ Ñтавити шрифт одразу з ПЗУ, та з файлу. Шрифт ÐЕ " +"змінено.\n" #: src/setfont.c:259 #, c-format @@ -1334,7 +1367,9 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "При завантаженні кількох шрифтів, уÑÑ– мають бути psf-шрифтами - %s не Ñ” таким\n" +msgstr "" +"При завантаженні кількох шрифтів, уÑÑ– мають бути psf-шрифтами - %s не Ñ” " +"таким\n" #: src/setfont.c:435 #, c-format @@ -1349,7 +1384,8 @@ #: src/setfont.c:448 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "При завантаженні кількох шрифті, уÑÑ– повинні мати однакову ширину Ñимволів\n" +msgstr "" +"При завантаженні кількох шрифті, уÑÑ– повинні мати однакову ширину Ñимволів\n" #: src/setfont.c:487 #, c-format @@ -1483,7 +1519,8 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" msgstr "Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñтану ознак. Можливо Ñдро заÑтаре?\n" #: src/setleds.c:125 src/setleds.c:146 @@ -1791,7 +1828,9 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "натиÑніть будь-Ñку клавішу (програма завершитьÑÑ Ñ‡ÐµÑ€ÐµÐ· 10 Ñекунд піÑÐ»Ñ Ð¾Ñтаннього натиÑÐºÐ°Ð½Ð½Ñ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ–)\n" +msgstr "" +"натиÑніть будь-Ñку клавішу (програма завершитьÑÑ Ñ‡ÐµÑ€ÐµÐ· 10 Ñекунд піÑÐ»Ñ " +"оÑтаннього натиÑÐºÐ°Ð½Ð½Ñ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ–)\n" #: src/showkey.c:250 msgid "release" @@ -1816,6 +1855,78 @@ msgid "%s from %s\n" msgstr "%s з %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" +"Будь лаÑка, повторіть Ñпробу пізніше.\n" +"\n" +"\n" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "Показ даних у конÑолі тепер повніÑÑ‚ÑŽ заблоковано %s.\n" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "%s тепер заблоковано %s.\n" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" +"СкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ–Ñ”ÑŽ Alt-функціональна клавіша Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð½Ð° інші " +"віртуальні конÑолі." + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Віддайте команду «%s --help», щоб дізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ.\n" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" +"%s: блокує віртуальну конÑоль, зберігаючи ваш поточний ÑеанÑ.\n" +"ВикориÑтаннÑ: %s [параметри]\n" +" Де значеннÑм [параметри] може бути один з таких виразів:\n" +"-c або --current: заблокувати лише цю віртуальну конÑоль, дозволивши\n" +" кориÑтувачам перемикатиÑÑ Ð½Ð° інші конÑолі.\n" +"-a або --all: заблокувати вÑÑ– віртуальні конÑолі, запобігши\n" +" можливоÑÑ‚Ñ– Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð½Ð° інші конÑолі.\n" +"-v або --version: вивеÑти дані щодо верÑÑ–Ñ— vlock Ñ– вийти.\n" +"-h або --help: вивеÑти це довідкове Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ– вийти.\n" + +#: src/vlock/username.c:57 +msgid "unrecognized user" +msgstr "невідомий кориÑтувач" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "Ñтандартне джерело даних не Ñ” приÑтроєм tty" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "Цей приÑтрій tty (%s) не Ñ” віртуальною конÑоллю.\n" + +#: src/vlock/vt.c:160 +#, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "Показ даних у конÑолі не може бути повніÑÑ‚ÑŽ заблоковано.\n" + #~ msgid " use `openvt -f' to force.\n" #~ msgstr " Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÑƒÑового режиму вкажіть `openvt -f'.\n" diff -Nru kbd-1.15.3/po/update-potfiles kbd-1.15.5/po/update-potfiles --- kbd-1.15.3/po/update-potfiles 2009-06-07 19:48:42.000000000 +0000 +++ kbd-1.15.5/po/update-potfiles 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#!/bin/sh -# -# - -> POTFILES -> .null -> POTFILES.in - -for x in ../*/*.c ../src/version.h; do -echo "$x \\" >> POTFILES -done -echo .null >> POTFILES - -cd .. -for x in */*.c src/version.h; do -echo "$x" >> po/POTFILES.in -done -cd po Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/vi.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/vi.gmo differ diff -Nru kbd-1.15.3/po/vi.po kbd-1.15.5/po/vi.po --- kbd-1.15.3/po/vi.po 2011-05-14 21:12:15.000000000 +0000 +++ kbd-1.15.5/po/vi.po 2012-12-05 19:02:12.000000000 +0000 @@ -1,33 +1,35 @@ # Vietnamese translation for KBD. -# Copyright © 2010 Free Software Foundation, Inc. +# Copyright © 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the kbd package. # Phan Vinh Thinh , 2005. # Clytie Siddall , 2008-2010. +# Trần Ngá»c Quân , 2012. # msgid "" msgstr "" -"Project-Id-Version: kbd 1.15.2\n" +"Project-Id-Version: kbd-1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" -"PO-Revision-Date: 2010-10-03 18:45+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" +"PO-Revision-Date: 2012-12-03 13:53+0700\n" +"Last-Translator: Trần Ngá»c Quân \n" +"Language-Team: Vietnamese \n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" +"X-Poedit-SourceCharset: UTF-8\n" #: src/chvt.c:28 #, c-format msgid "usage: chvt N\n" -msgstr "sá»­ dụng: chvt N\n" +msgstr "cách dùng: chvt N\n" #: src/deallocvt.c:33 #, c-format msgid "%s: unknown option\n" -msgstr "%s: tùy chá»n không rõ\n" +msgstr "%s: không hiểu tùy chá»n\n" #: src/deallocvt.c:45 #, c-format @@ -57,12 +59,12 @@ #: src/dumpkeys.c:79 #, c-format msgid "%s: cannot find any keymaps?\n" -msgstr "%s: không tìm thấy sÆ¡ đồ bàn phím (keymap) nào?\n" +msgstr "%s: không tìm thấy ánh xạ bàn phím (keymap) nào?\n" #: src/dumpkeys.c:84 #, c-format msgid "%s: plain map not allocated? very strange ...\n" -msgstr "%s: sÆ¡ đồ Ä‘Æ¡n giản chÆ°a được phân phối? rất kỳ lạ ...\n" +msgstr "%s: ánh xạ Ä‘Æ¡n giản chÆ°a được cấp phát? rất kỳ lạ ...\n" #: src/dumpkeys.c:118 #, c-format @@ -72,17 +74,17 @@ #: src/dumpkeys.c:272 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" -msgstr "phạm vi mã phím (keycode) được nhân há»— trợ: 1 - %d\n" +msgstr "vùng mã phím (keycode) được nhân há»— trợ: 1 - %d\n" #: src/dumpkeys.c:274 #, c-format msgid "max number of actions bindable to a key: %d\n" -msgstr "số hành Ä‘á»™ng lá»›n nhất mà má»™t phím chấp nhận: %d\n" +msgstr "số hành Ä‘á»™ng lá»›n nhất mà má»™t phím chấp nhận: %d\n" #: src/dumpkeys.c:277 #, c-format msgid "number of keymaps in actual use: %d\n" -msgstr "số sÆ¡ đồ bàn phím (keymap) sá»­ dụng trên thá»±c tế: %d\n" +msgstr "số ánh xạ bàn phím (keymap) sá»­ dụng trên thá»±c tế: %d\n" #: src/dumpkeys.c:280 #, c-format @@ -148,7 +150,8 @@ #: src/dumpkeys.c:398 #, c-format msgid "# not alt_is_meta: on keymap %d key %d is bound to" -msgstr "# không alt_is_meta: trên sÆ¡ đồ phím (keymap) %d phím %d được ràng buá»™c tá»›i" +msgstr "" +"# không alt_is_meta: trên ánh xạ phím (keymap) %d phím %d được ràng buá»™c tá»›i" #: src/dumpkeys.c:475 #, c-format @@ -185,15 +188,17 @@ "\t-c --charset=" msgstr "" "\n" -"sá»­ dụng: dumpkeys [tùy chá»n...]\n" +"cách dùng: dumpkeys [tùy chá»n...]\n" "\n" "Tùy chá»n có thể sá»­ dụng:\n" "\n" "\t-h --help\t hiển thị trợ giúp này\n" "\t-i --short-info\t hiển thị thôngtin vá» driver bàn phím\n" -"\t-l --long-info\t hiển thị thông tin ở trên và những ký tá»± loadkeys biết đến\n" +"\t-l --long-info\t hiển thị thông tin ở trên và những ký tá»± loadkeys biết " +"đến\n" "\t-n --numeric\t hiển thị bảng phím (keytable) trong mã mÆ°á»i sáu\n" -"\t-f --full-table\t không sá»­ dụng ký hiệu \"tay ngắn\" (short-hand), má»™t hàng cho má»—i mã phím\n" +"\t-f --full-table\t không sá»­ dụng ký hiệu \"tay ngắn\" (short-hand), má»™t " +"hàng cho má»—i mã phím\n" "\t-1 --separate-lines má»™t dòng cho má»—i cặp (modifier, mã phím)\n" "\t --funcs-only\t chỉ hiển thị chuá»—i của phím chức năng\n" "\t --keys-only\t chỉ hiện thị phím ràng buá»™c\n" @@ -242,16 +247,16 @@ msgstr "lá»—i thá»±c hiện %s\n" #: src/findfile.c:157 -#, fuzzy, c-format +#, c-format msgid "Warning: path too long: %s/%s\n" -msgstr "%s: Cảnh báo: dòng quá dài\n" +msgstr "Cảnh báo: Ä‘Æ°á»ng dẫn quá dài: %s/%s\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "Không thể mở %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Không thể lấy trình mô tả tập tin mà chỉ đến kênh giao tác\n" @@ -259,7 +264,7 @@ #: src/getkeycodes.c:18 #, c-format msgid "usage: getkeycodes\n" -msgstr "sá»­ dụng: getkeycodes\n" +msgstr "cách dùng: getkeycodes\n" #: src/getkeycodes.c:56 #, c-format @@ -269,7 +274,9 @@ #: src/getkeycodes.c:59 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "0 là má»™t lá»—i; đối vá»›i 1-88 (0x01-0x58) mã quét (scancode) bằng mã phím (keycode)\n" +msgstr "" +"0 là má»™t lá»—i; đối vá»›i 1-88 (0x01-0x58) mã quét (scancode) bằng mã phím " +"(keycode)\n" #: src/getkeycodes.c:62 #, c-format @@ -285,7 +292,7 @@ msgstr "" "\n" "\n" -"Mã quét (scancode) thoát e0 xx (hệ mÆ°á»i sáu)\n" +"Mã quét (scancode) thoát e0xx (hệ bát phân)\n" #: src/getkeycodes.c:93 #, c-format @@ -309,23 +316,25 @@ " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" msgstr "" +"Cách dùng: %1$s [-C THIẾT-BỊ] getmode [text|graphics]\n" +" hoặc: %1$s [-C THIẾT-BỊ] gkbmode [raw|xlate|mediumraw|unicode]\n" +" hoặc: %1$s [-C THIẾT-BỊ] gkbmeta [metabit|escprefix]\n" +" hoặc: %1$s [-C THIẾT-BỊ] gkbled [scrolllock|numlock|capslock]\n" #: src/kbdinfo.c:65 #, c-format msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "Lá»—i: không có đủ đối số.\n" #: src/kbdinfo.c:124 -#, fuzzy, c-format +#, c-format msgid "Error: Unrecognized action: %s\n" -msgstr "" -"tham số không nhận ra: _%s_\n" -"\n" +msgstr "Lá»—i: Tác Ä‘á»™ng không được chấp nhận: %s\n" #: src/kbd_mode.c:20 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" -msgstr "sá»­ dụng: kbd_mode [-a|-u|-k|-s] [-C thiết_bị]\n" +msgstr "cách dùng: kbd_mode [-a|-u|-k|-s] [-C thiết_bị]\n" #: src/kbd_mode.c:80 #, c-format @@ -340,22 +349,22 @@ #: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" -msgstr "Bạn phím ở trong chế Ä‘á»™ thô trung bình (keycode)\n" +msgstr "Bàn phím ở trong chế Ä‘á»™ thô trung bình (keycode)\n" #: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" -msgstr "Bạn phím ở trong chế Ä‘á»™ mặc định (ASCII)\n" +msgstr "Bàn phím ở trong chế Ä‘á»™ mặc định (ASCII)\n" #: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" -msgstr "Bạn phím ở trong chế Ä‘á»™ Unicode (UTF-8)\n" +msgstr "Bàn phím ở trong chế Ä‘á»™ Unicode (UTF-8)\n" #: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in some unknown mode\n" -msgstr "Bàn phím ở trong má»™t chế Ä‘á»™ không biết đến\n" +msgstr "Bàn phím ở trong má»™t chế Ä‘á»™ chÆ°a được biết đến\n" #: src/kbd_mode.c:104 #, c-format @@ -370,7 +379,7 @@ #: src/kbdrate.c:267 #, c-format msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Sá»­ dụng: kbdrate [-V] [-s] [-r rate] [-d trì hoãn]\n" +msgstr "Cách dùng: kbdrate [-V] [-s] [-r rate] [-d trì hoãn]\n" #: src/kbdrate.c:297 msgid "Cannot open /dev/port" @@ -379,7 +388,7 @@ #: src/kdfontop.c:197 #, c-format msgid "bug: getfont called with count<256\n" -msgstr "lá»—i (bug): getfont gá»i vá»›i số đếm <256\n" +msgstr "lá»—i (bug): getfont gá»i vá»›i số lượng <256\n" #: src/kdfontop.c:201 #, c-format @@ -394,7 +403,7 @@ #: src/kdmapop.c:159 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "lạ thật... ct bị thay đổi từ %d thành %d\n" #: src/kdmapop.c:185 #, c-format @@ -402,6 +411,8 @@ "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"Hình nhÆ° là nhân (kernel) có phiên bản cÅ© hÆ¡n là 1.1.92\n" +"Không có bảng ánh xạ Unicode được tải lên.\n" #: src/ksyms.c:1713 #, c-format @@ -431,44 +442,43 @@ #: src/ksyms.c:1847 #, c-format msgid "assuming iso-8859-4 %s\n" -msgstr "coi nhÆ° iso-8859-1 %s\n" +msgstr "coi nhÆ° iso-8859-4 %s\n" #: src/ksyms.c:1852 #, c-format msgid "unknown keysym '%s'\n" -msgstr "không rõ ký tá»± phím (keysym) '%s'\n" +msgstr "không rõ ký tá»± phím (keysym) “%sâ€\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "những tập tin bao gồm lồng nhau quá sâu" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "Ä‘ang chuyển đổi sang %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "không thể mở tập tin bao gồm %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" -msgstr "" +msgstr "cần tên tập tin ở giữa cặp dấu nháy kép" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" -msgstr "" +msgstr "“unicode keysym†nằm ngoài phạm vi: %s" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 -#, fuzzy +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 msgid "string too long" -msgstr "%s: Cảnh báo: dòng quá dài\n" +msgstr "chuá»—i quá dài" -#: loadkeys.y:90 -#, fuzzy, c-format +#: loadkeys.y:93 +#, c-format msgid "" "loadkeys version %s\n" "\n" @@ -479,8 +489,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -489,138 +499,139 @@ " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" msgstr "" -"loadkeys phiên bản %s\n" +"phiên bản loadkeys %s\n" "\n" -"Sá»­ dụng: loadkeys [tùy_chá»n...] [tập_tin_sÆ¡_đồ...]\n" +"Cách dùng: loadkeys [tùy_chá»n...] [tập_tin_ánh_xạ...]\n" "\n" "Tùy chá»n hợp lệ:\n" "\n" -" -b --bkeymap xuất má»™t sÆ¡ đồ phím ra đầu ra tiêu chuẩn\n" -" -c --clearcompose xoá sạch bảng cấu tạo hạt nhân\n" -" -C --console=\n" -" những thiết bị bàn giao tiếp cần dùng\n" +" -a --ascii ép buá»™c chuyển đổi thành ASCII\n" +" -b --bkeymap xuất ánh xạ phím ra đầu ra tiêu chuẩn stdout\n" +" -c --clearcompose xoá sạch bảng sắp chữ hạt nhân (kernel)\n" +" -C --console=TẬP-TIN\n" +" những thiết bị bảng giao tiếp được dùng\n" " -d --default nạp \"%s\"\n" " -h --help hiển thị trợ giúp này\n" -" -m --mktable xuất má»™t \"defkeymap.c\" ra đầu ra tiêu chuẩn\n" -" -q --quiet thu hồi tất cả kết xuất bình thÆ°á»ng\n" +" -m --mktable xuất má»™t \"defkeymap.c\" ra đầu ra tiêu chuẩn stdout\n" +" -q --quiet thu hồi tất cả kết xuất thông thÆ°á»ng\n" " -s --clearstrings xoá sạch bảng chuá»—i hạt nhân\n" " -u --unicode chuyển đổi dứt khoát sang Unicode\n" " -v --verbose thông báo các thay đổi\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "addmap được gá»i vá»›i chỉ mục sai %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" -msgstr "việc thêm sÆ¡ đồ %d thì vi phạm dòng sÆ¡ đồ phím dứt khoát" +msgstr "việc thêm ánh xạ %d thì vi phạm dòng ánh xạ phím dứt khoát" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "killkey được gá»i vá»›i chỉ mục sai %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "killkey được gá»i vá»›i bảng sai %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "addkey được gá»i vá»›i mã phím sai %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "addkey được gá»i vá»›i chỉ mục sai %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "addkey được gá»i vá»›i bảng sai %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: addfunc được gá»i vá»›i hàm sai %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: tràn func_buf\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "tràn bảng cấu tạo\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: không thể chuyển đổi sang chế Ä‘á»™ Unicode\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" -msgstr "SÆ¡ đồ phím %d: không đủ quyá»n\n" +msgstr "Ãnh xạ phím %d: Không đủ quyá»n\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "mã phím %d, bảng %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" -msgstr " Lá»–I" +msgstr " GẶP-Lá»–I" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "lá»—i tổ hợp phím %d vá»›i giá trị %d\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" -msgstr "giải cấp phát sÆ¡ đồ phím %d\n" +msgstr "giải cấp phát ánh xạ phím %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" -msgstr "%s: không thể giải cấp phát sÆ¡ đồ phím %d\n" +msgstr "%s: không thể giải cấp phát ánh xạ phím %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" -msgstr "%s: không thể giải cấp phát hay xoá sạch sÆ¡ đồ phím\n" +msgstr "%s: không thể giải cấp phát hay xoá sạch ánh xạ phím\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: không thể trở vá» chế Ä‘á»™ bàn phím gốc\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" -msgstr "lá»—i tổ hợp chuá»—i « %s » vá»›i hàm %s\n" +msgstr "lá»—i tổ hợp chuá»—i “%s†vá»›i hàm %s\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "lá»—i xoá sạch chuá»—i %s\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "quá nhiá»u lá»i xác định cấu tạo\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "do_constant chứa má»™t lá»—i không thể phục hồi" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -629,135 +640,138 @@ "\n" "Äã sá»­a đổi %d %s và %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "phím" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "phím" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "chuá»—i" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "chuá»—i" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "Äã nạp %d cấu tạo %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" -msgstr "lá»i xác định" +msgstr "định nghÄ©a" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" -msgstr "lá»i xác định" +msgstr "định nghÄ©a" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(ChÆ°a sá»­a đổi lá»i xác định cấu tạo.)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: không biết cách cấu tạo cho %s\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" -msgstr "Lá»—i ghi nhá»› sÆ¡ đồ vào tập tin\n" +msgstr "Lá»—i ghi nhá»› ánh xạ vào tập tin\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" -msgstr "« %s » không phải là má»™t ký hiệu phím chức năng" +msgstr "“%s†không phải là má»™t ký hiệu phím chức năng" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "quá nhiá»u (%d) mục nhập trên cùng má»™t dòng" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "quá nhiá»u lá»i xác định trên cùng má»™t dòng" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "Äang nạp %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "lá»—i cú pháp trong tập tin ánh xạ\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "chÆ°a thay đổi tổ hợp phím\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" +"%s: Hai tùy chá»n --unicode và --ascii xung Ä‘á»™t vá»›i nhau, chỉ được dùng má»™t\n" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, c-format -msgid "%s: error reading keyboard mode\n" -msgstr "%s: gặp lá»—i khi Ä‘á»c chế Ä‘á»™ bàn phím\n" +msgid "%s: error reading keyboard mode: %m\n" +msgstr "%s: gặp lá»—i khi Ä‘á»c chế Ä‘á»™ bàn phím: %m\n" -#: loadkeys.y:1131 -#, fuzzy, c-format +#: loadkeys.y:1166 +#, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -"%s: cảnh báo : Ä‘ang nạp má»™t sÆ¡ đồ phím Unicode trên má»™t bàn giao tiếp không phải Unicode\n" -" (bạn dá»± định làm « kbd_mode -u » ?)\n" +"%s: cảnh báo: Ä‘ang nạp má»™t ánh xạ phím non-Unicode trên má»™t bàn giao tiếp " +"Unicode\n" +" (có lẽ bạn dá»± định làm “kbd_mode -a†?)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -"%s: cảnh báo : Ä‘ang nạp má»™t sÆ¡ đồ phím Unicode trên má»™t bàn giao tiếp không phải Unicode\n" -" (bạn dá»± định làm « kbd_mode -u » ?)\n" +"%s: cảnh báo: Ä‘ang nạp má»™t ánh xạ phím Unicode trên má»™t bàn giao tiếp không " +"phải Unicode\n" +" (bạn dá»± định làm “kbd_mode -u†?)\n" -#: loadkeys.y:1157 -#, fuzzy, c-format +#: loadkeys.y:1187 +#, c-format msgid "Searching in %s\n" -msgstr "Ä‘ang chuyển đổi sang %s\n" +msgstr "Äang tìm kiếm trong %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "Không tìm thấy %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "không mở được tập tin %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "Äang nạp %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "lá»—i cú pháp trong tập tin sÆ¡ đồ\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "chÆ°a thay đổi tổ hợp phím\n" - #: src/loadunimap.c:43 #, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "" -"Sá»­ dụng:\n" +"Cách dùng:\n" "\t%s [-C kênh giao tác] [-o map.orig]\n" #: src/loadunimap.c:175 src/loadunimap.c:186 #, c-format msgid "Bad input line: %s\n" -msgstr "Dòng nhập vào xấu: %s\n" +msgstr "Dòng nhập vào sai: %s\n" #: src/loadunimap.c:195 #, c-format @@ -767,17 +781,22 @@ #: src/loadunimap.c:201 #, c-format msgid "%s: Bad end of range (0x%x)\n" -msgstr "%s: Kết thúc của phạm vi xấu (0x%x)\n" +msgstr "%s: Kết thúc của phạm vi sai (0x%x)\n" #: src/loadunimap.c:231 src/psfxtable.c:175 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" -msgstr "%s: Phạm vi Unicode tÆ°Æ¡ng ứng vá»›i phạm vi vị trí phông chữ 0x%x-0x%x xấu\n" +msgstr "" +"%s: Phạm vi Unicode tÆ°Æ¡ng ứng vá»›i phạm vi vị trí phông chữ 0x%x-0x%x sai\n" #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Phạm vi Unicode U+%x-U+%x không có cÅ©ng chiá»u dài vá»›i phạm vi vị trí phông chữ 0x%x-0x%x\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Phạm vi Unicode U+%x-U+%x không có cÅ©ng chiá»u dài vá»›i phạm vi vị trí " +"phông chữ 0x%x-0x%x\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -787,7 +806,7 @@ #: src/loadunimap.c:274 #, c-format msgid "Loading unicode map from file %s\n" -msgstr "Nạp sÆ¡ đồ unicode từ tập tin %s\n" +msgstr "Nạp ánh xạ unicode từ tập tin %s\n" #: src/loadunimap.c:280 #, c-format @@ -800,7 +819,7 @@ "%s: not loading empty unimap\n" "(if you insist: use option -f to override)\n" msgstr "" -"%s: không nạp sÆ¡ đồ unicode (unimap) rá»—ng\n" +"%s: không nạp ánh xạ unicode (unimap) rá»—ng\n" "(nếu bạn nhất định muốn: hãy sá»­ dụng tùy chá»n -f để thá»a mãn)\n" #: src/loadunimap.c:311 @@ -814,22 +833,22 @@ #: src/loadunimap.c:337 #, c-format msgid "Saved unicode map on `%s'\n" -msgstr "Ghi sÆ¡ đồ unicode trên `%s'\n" +msgstr "Ghi ánh xạ unicode trên “%sâ€\n" #: src/loadunimap.c:373 #, c-format msgid "Appended Unicode map\n" -msgstr "Nhập thêm sÆ¡ đồ Unicode\n" +msgstr "Nhập thêm ánh xạ Unicode\n" #: src/mapscrn.c:68 #, c-format msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "Sá»­ dụng: %s [-v] [-o map.orig] tập-tin-sÆ¡-đồ\n" +msgstr "Cách dùng: %s [-v] [-o map.orig] tập-tin-sÆ¡-đồ\n" #: src/mapscrn.c:133 #, c-format msgid "mapscrn: cannot open map file _%s_\n" -msgstr "mapscrn: không thể mở tập tin sÆ¡ đồ _%s_\n" +msgstr "mapscrn: không thể mở tập tin ánh xạ _%s_\n" #: src/mapscrn.c:139 #, c-format @@ -839,37 +858,39 @@ #: src/mapscrn.c:144 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "Nạp sÆ¡ đồ màn hình (screen map) nhị phân thẳng tá»›i phông (direct-to-font) từ tập tin %s\n" +msgstr "" +"Nạp ánh xạ màn hình (screen map) nhị phân thẳng tá»›i phông (direct-to-font) " +"từ tập tin %s\n" #: src/mapscrn.c:149 src/mapscrn.c:160 #, c-format msgid "Error reading map from file `%s'\n" -msgstr "Lá»—i Ä‘á»c sÆ¡ đồ từ tập tin `%s'\n" +msgstr "Lá»—i Ä‘á»c ánh xạ từ tập tin “%sâ€\n" #: src/mapscrn.c:155 #, c-format msgid "Loading binary unicode screen map from file %s\n" -msgstr "Nạp sÆ¡ đồ màn hình (screen map) unicode nhị phân từ tập tin %s\n" +msgstr "Nạp ánh xạ màn hình (screen map) unicode nhị phân từ tập tin %s\n" #: src/mapscrn.c:167 #, c-format msgid "Loading symbolic screen map from file %s\n" -msgstr "Nạp sÆ¡ đồ màn hình (screen map) tượng trÆ°ng từ tập tin %s\n" +msgstr "Nạp ánh xạ màn hình (screen map) tượng trÆ°ng từ tập tin %s\n" #: src/mapscrn.c:171 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" -msgstr "Lá»—i phân tích sÆ¡ đồ tượng trÆ°ng từ `%s', dòng %d\n" +msgstr "Lá»—i phân tích ánh xạ tượng trÆ°ng từ “%sâ€, dòng %d\n" #: src/mapscrn.c:284 #, c-format msgid "Cannot read console map\n" -msgstr "Không Ä‘á»c được sÆ¡ đồ kênh giao tác (console map)\n" +msgstr "Không Ä‘á»c được ánh xạ kênh giao tác (console map)\n" #: src/mapscrn.c:290 #, c-format msgid "Saved screen map in `%s'\n" -msgstr "Ghi nhá»› sÆ¡ đồ màn hình (screen map) trong `%s'\n" +msgstr "Ghi nhá»› ánh xạ màn hình (screen map) trong “%sâ€\n" #: src/openvt.c:44 #, c-format @@ -880,6 +901,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -890,84 +912,95 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"Cách dùng: %s [CÃC_TÙY_CHỌN] -- lệnh\n" +"\n" +"Tiện ích này giúp bạn khởi Ä‘á»™ng má»™t ứng dụng trên má»™t thiết bị cuối ảo " +"(VT).\n" +"\n" +"Các tùy chá»n:\n" +" -c, --console=Sá» sá»­ dụng số VT;\n" +" -e, --exec thá»±c thi lệnh, không rẽ nhánh tiến trình;\n" +" -f, --force ép buá»™c mở má»™t VT không cần kiểm tra;\n" +" -l, --login làm má»™t lệnh cần đăng nhập;\n" +" -u, --user tính ra chủ sở hữu của VT hiện tại;\n" +" -s, --switch chuyển sang VT má»›i;\n" +" -w, --wait chá» cho lệnh hoàn tất;\n" +" -v, --verbose hiển thị thông tin cho từng hành Ä‘á»™ng;\n" +" -V, --version hiển thị phiên bản của chÆ°Æ¡ng trình rồi thoát;\n" +" -h, --help hiển thị thông tin trợ giúp ở dạng ngắn gá»n.\n" +"\n" -#: src/openvt.c:162 -#, fuzzy +#: src/openvt.c:163 msgid "Couldn't find owner of current tty!" -msgstr "Không tìm thấy ngÆ°á»i sở hữu tty Ä‘ang dùng !\n" +msgstr "không tìm thấy ngÆ°á»i sở hữu tty Ä‘ang dùng!" -#: src/openvt.c:230 -#, fuzzy, c-format +#: src/openvt.c:231 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt: %s: số thứ tá»± vt không hợp lệ\n" +msgstr "%s: Số vt không hợp lệ" -#: src/openvt.c:256 -#, fuzzy +#: src/openvt.c:257 msgid "Only root can use the -u flag." -msgstr "openvt: chỉ có root má»›i có thể sá»­ dụng cá» -u.\n" +msgstr "Chỉ có root má»›i có thể dùng -u flag." -#: src/openvt.c:278 -#, fuzzy +#: src/openvt.c:279 msgid "Couldn't get a file descriptor referring to the console" -msgstr "Không thể lấy trình mô tả tập tin mà chỉ đến kênh giao tác\n" +msgstr "Không thể lấy mô tả tập tin mà chỉ đến console (bàn Ä‘iá»u khiển)" -#: src/openvt.c:285 -#, fuzzy +#: src/openvt.c:286 msgid "Cannot find a free vt" -msgstr "openvt: không tìm thấy má»™t vt trống\n" +msgstr "Không tìm thấy vt nào còn rảnh rá»—i" -#: src/openvt.c:289 -#, fuzzy, c-format +#: src/openvt.c:290 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt: không thể kiểm tra vt %d là tá»± do hay không\n" +msgstr "" +"Không thể kiểm tra xem vt %d là tá»± do hay không; sá»­ dụng “%s -f†để ép buá»™c " +"thá»±c hiện." -#: src/openvt.c:293 -#, fuzzy, c-format +#: src/openvt.c:294 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt: vt %d Ä‘ang được sá»­ dụng; câu lệnh bị gián Ä‘oạn\n" +msgstr "" +"vt %d Ä‘ang được sá»­ dụng; lệnh bị bãi bá»; sá»­ dụng “%s -f†để ép buá»™c thá»±c " +"hiện." -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." -msgstr "" +msgstr "Không thể tìm thấy lệnh." -#: src/openvt.c:335 -#, fuzzy +#: src/openvt.c:336 msgid "Unable to set new session" -msgstr "openvt: Không thể đặt má»™t cá»­a sổ má»›i (%s)\n" +msgstr "Không thể đặt phiên làm việc má»›i" -#: src/openvt.c:359 -#, fuzzy, c-format +#: src/openvt.c:360 +#, c-format msgid "Unable to open %s" -msgstr "openvt: Không thể mở %s: %s\n" +msgstr "Không mở được %s" -#: src/openvt.c:363 -#, fuzzy, c-format +#: src/openvt.c:364 +#, c-format msgid "Using VT %s" -msgstr "openvt: sá»­ dụng VT %s\n" +msgstr "Äang sá»­ dụng VT %s" -#: src/openvt.c:369 -#, fuzzy, c-format +#: src/openvt.c:370 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt: Không thể mở %s để Ä‘á»c/ghi nhá»› (%s)\n" +msgstr "không thể mở %s để Ä‘á»c/viết" -#: src/openvt.c:380 -#, fuzzy, c-format +#: src/openvt.c:381 +#, c-format msgid "Couldn't activate vt %d" -msgstr "" -"\n" -"openvt: không thể kích hoạt vt %d (%s)\n" +msgstr "Không thể kích hoạt vt %d" -#: src/openvt.c:383 -#, fuzzy +#: src/openvt.c:384 msgid "Activation interrupted?" -msgstr "" -"\n" -"openvt: việc kích hoạt bị giản Ä‘oạn ? (%s)\n" +msgstr "Kích hoạt bị ngắt phải không?" -#: src/openvt.c:423 -#, fuzzy, c-format +#: src/openvt.c:424 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s: không thể bá» phân phối kênh giao tác %d\n" +msgstr "Không thể cấp phát lại console (thiết bị Ä‘iá»u khiển) %d" #: src/psffontop.c:69 #, c-format @@ -982,7 +1015,7 @@ #: src/psffontop.c:93 #, c-format msgid "%s: bad utf8\n" -msgstr "%s: utf xấu\n" +msgstr "%s: utf sai\n" #: src/psffontop.c:96 #, c-format @@ -1002,7 +1035,7 @@ #: src/psffontop.c:220 #, c-format msgid "%s: Bad call of readpsffont\n" -msgstr "%s: Lá»i gá»i readpsffont xấu\n" +msgstr "%s: Lá»i gá»i readpsffont sai\n" #: src/psffontop.c:235 #, c-format @@ -1027,7 +1060,7 @@ #: src/psffontop.c:280 #, c-format msgid "%s: Input file: bad input length (%d)\n" -msgstr "%s: Tập tin nhập vào: chiá»u dài nhập vào xấu (%d)\n" +msgstr "%s: Tập tin nhập vào: chiá»u dài nhập vào sai (%d)\n" #: src/psffontop.c:312 #, c-format @@ -1047,7 +1080,7 @@ #: src/psffontop.c:469 src/setfont.c:677 #, c-format msgid "Cannot write font file" -msgstr "Không thể ghi nhá»› tập tin phông chữ" +msgstr "Không thể ghi tập tin phông chữ" #: src/psfxtable.c:109 #, c-format @@ -1057,7 +1090,7 @@ #: src/psfxtable.c:123 src/psfxtable.c:133 #, c-format msgid "%s: Bad input line: %s\n" -msgstr "%s: Dòng nhập vào xấu: %s\n" +msgstr "%s: Dòng nhập vào sai: %s\n" #: src/psfxtable.c:142 #, c-format @@ -1067,12 +1100,16 @@ #: src/psfxtable.c:147 #, c-format msgid "%s: Bad end of range (0x%lx)\n" -msgstr "%s: Kết thúc của phạm vi (0x%lx) xấu\n" +msgstr "%s: Kết thúc của phạm vi (0x%lx) sai\n" #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" -msgstr "%s: Äể tÆ°Æ¡ng ứng vá»›i má»™t phạm vi của vị trí phông chữ, phải có má»™t phạm vi Unicode\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" +msgstr "" +"%s: Äể tÆ°Æ¡ng ứng vá»›i má»™t phạm vi của vị trí phông chữ, phải có má»™t phạm vi " +"Unicode\n" #: src/psfxtable.c:257 #, c-format @@ -1089,7 +1126,7 @@ "Usage:\n" "\t%s infont [outtable]\n" msgstr "" -"Sá»­ dụng:\n" +"Cách dùng:\n" "\t%s infont [outtable]\n" #: src/psfxtable.c:275 @@ -1113,7 +1150,7 @@ #: src/psfxtable.c:360 #, c-format msgid "%s: Bad magic number on %s\n" -msgstr "%s: Số màu nhiệm (magic) xấu trên %s\n" +msgstr "%s: Số màu nhiệm (magic) sai trên %s\n" #: src/psfxtable.c:379 #, c-format @@ -1148,23 +1185,28 @@ #: src/resizecons.c:252 #, c-format msgid "resizecons: the command `%s' failed\n" -msgstr "resizecons: câu lệnh `%s' bị lá»—i\n" +msgstr "resizecons: câu lệnh “%s†bị lá»—i\n" #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "resizecons: đừng quên thay đổi TERM (có thể thành con%dx%d hoặc linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgstr "" +"resizecons: đừng quên thay đổi TERM (có thể thành con%dx%d hoặc linux-%dx" +"%d)\n" #: src/resizecons.c:338 #, c-format msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" -"lá»i gá»i là: resizecons COLSxROWS hoặc: resizecons COLS ROWS\n" -"hoặc: resizecons -lines ROWS, vá»›i ROWS là má»™t trong số 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"lệnh: resizecons COLSxROWS hoặc: resizecons COLS ROWS\n" +"hoặc: resizecons -lines ROWS, vá»›i ROWS là má»™t trong số 25, 28, 30, 34, 36, " +"40, 44, 50, 60\n" #: src/resizecons.c:376 #, c-format @@ -1174,7 +1216,7 @@ #: src/screendump.c:49 #, c-format msgid "usage: screendump [n]\n" -msgstr "sá»­ dụng: screendump [n]\n" +msgstr "cách dùng: screendump [n]\n" #: src/screendump.c:79 #, c-format @@ -1204,7 +1246,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1228,25 +1271,28 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Sá»­ dụng: setfont [tùy-chá»n-ghi] [-] [phông-má»›i..] [-m sÆ¡-đồ-bàn-giao-tiếp] [-u sÆ¡-đồ-Unicode]\n" +"Sá»­ dụng: setfont [tùy-chá»n-ghi] [-] [phông-má»›i..] [-m sÆ¡-đồ-bàn-giao-" +"tiếp] [-u sÆ¡-đồ-Unicode]\n" " tùy chá»n ghi nhá»› (được đặt trÆ°á»›c khi nạp tập tin):\n" " -o Ghi nhá»› phông hiện thá»i vào \n" -" -O Ghi nhá»› phông hiện thá»i và sÆ¡ đồ unicode vào \n" +" -O Ghi nhá»› phông hiện thá»i và ánh xạ unicode vào " +"\n" " -om Ghi nhá»› consolemap hiện thá»i vào \n" " -ou Ghi nhá»› unicodemap hiện thá»i vào \n" "Nếu không Ä‘Æ°a ra tùy chá»n phông-má»›i và -[o|O|om|ou|m|u],\n" "còn phông chữ mặc định được nạp:\n" " setfont nạp phông chữ \"default[.gz]\"\n" " setfont - nạp phông chữ \"default8x[.gz]\"\n" -"Tùy chá»n - chá»n môjt phông chữ vá»›i trang mã (codepage) chứa ba phông chữ:\n" +"Tùy chá»n - chá»n môjt phông chữ vá»›i trang mã (codepage) chứa ba phông " +"chữ:\n" " setfont -{8|14|16} codepage.cp[.gz] Nạp phông 8x từ codepage.cp\n" "Ãnh xạ hiện (vá»›i -m hoặc -u) hoặc ẩnh (trong tập tin phông) \n" "sẽ được nạp và trong trÆ°á»ng hợp của consolemap, được kích hoạt.\n" " -h (không có khoảng trắng) Ghi chèn lên chiá»u cao phông.\n" -" -m Nạp sÆ¡ đồ màn hình kênh giao tác.\n" -" -u Nạp sÆ¡ đồ phông chữ unicode.\n" -" -m none Chặn việc nạp và kích hoạt má»™t sÆ¡ đồ màn hình.\n" -" -u none Chặn việc nạp má»™t sÆ¡ đồ unicode.\n" +" -m Nạp ánh xạ màn hình kênh giao tác.\n" +" -u Nạp ánh xạ phông chữ unicode.\n" +" -m none Chặn việc nạp và kích hoạt má»™t ánh xạ màn hình.\n" +" -u none Chặn việc nạp má»™t ánh xạ unicode.\n" " -v Nhiá»u thông báo.\n" " -C Chỉ ra thiết bị kênh giao tác sá»­ dụng.\n" " -V In ra số hiệu phiên bản và thoát.\n" @@ -1259,18 +1305,22 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" -msgstr "setfont: không thể đồng thá»i phục hồi từ ký tá»± ROM và từ tập tin. Phông chữ không thay đổi.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" +msgstr "" +"setfont: không thể đồng thá»i phục hồi từ ký tá»± ROM và từ tập tin. Phông chữ " +"không thay đổi.\n" #: src/setfont.c:259 #, c-format msgid "Bad character height %d\n" -msgstr "Chiá»u cao ký tá»± %d xấu\n" +msgstr "Chiá»u cao ký tá»± %d sai\n" #: src/setfont.c:263 #, c-format msgid "Bad character width %d\n" -msgstr "Chiá»u rá»™ng ký tá»± %d xấu\n" +msgstr "Chiá»u rá»™ng ký tá»± %d sai\n" #: src/setfont.c:288 #, c-format @@ -1325,7 +1375,8 @@ #: src/setfont.c:425 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "Khi nạp vài phông chữ, tất cả phải là phông psf - nhÆ°ng %s không phải\n" +msgstr "" +"Khi nạp vài phông chữ, tất cả phải là phông psf - nhÆ°ng %s không phải\n" #: src/setfont.c:435 #, c-format @@ -1375,7 +1426,7 @@ #: src/setfont.c:593 #, c-format msgid "Bad input file size\n" -msgstr "Kích thÆ°á»›c tập tin nhập vào xấu\n" +msgstr "Kích thÆ°á»›c tập tin nhập vào sai\n" #: src/setfont.c:614 #, c-format @@ -1389,7 +1440,8 @@ #: src/setfont.c:628 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "Bạn yêu cầu kích thÆ°á»›c phông chữ %d, nhÆ°ng chỉ có kích thÆ°á»›c 8, 14 và 16.\n" +msgstr "" +"Bạn yêu cầu kích thÆ°á»›c phông chữ %d, nhÆ°ng chỉ có kích thÆ°á»›c 8, 14 và 16.\n" #: src/setfont.c:673 #, c-format @@ -1451,7 +1503,8 @@ "\tsetleds +caps -num\n" "Sẽ bật CapsLock, tắt NumLock và không thay đổi ScrollLock.\n" "Thiết lập trÆ°á»›c và sau sá»± thay đổi (nếu có) được báo cáo\n" -"khi có tùy chá»n -v hoặc khi không yêu cầu thay đổi (không có tham số nào Ä‘Æ°a ra).\n" +"khi có tùy chá»n -v hoặc khi không yêu cầu thay đổi (không có tham số nào Ä‘Æ°a " +"ra).\n" "Thông thÆ°á»ng, setleds ảnh hưởng đến thiết lập cá» của vt\n" "(và thÆ°á»ng phải ánh qua đèn báo).\n" "Vá»›i -L, setleds chỉ bật các đèn và giữ nguyên các cá».\n" @@ -1469,12 +1522,15 @@ #: src/setleds.c:86 #, c-format msgid "Error reading current led setting. Maybe stdin is not a VT?\n" -msgstr "Lá»—i Ä‘á»c thiết lập đèn báo hiện thá»i. Có thể stdin không phải là má»™t VT?\n" +msgstr "" +"Lá»—i Ä‘á»c thiết lập đèn báo hiện thá»i. Có thể stdin không phải là má»™t VT?\n" #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" -msgstr "Lá»—i Ä‘á»c thiết lập cá» hiện thá»i. Có thể bạn Ä‘ang ở ngoài kênh giao tác?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" +msgstr "" +"Lá»—i Ä‘á»c thiết lập cá» hiện thá»i. Có thể bạn Ä‘ang ở ngoài kênh giao tác?\n" #: src/setleds.c:125 src/setleds.c:146 #, c-format @@ -1509,12 +1565,12 @@ #: src/setleds.c:222 #, c-format msgid "Current flags: " -msgstr "Cá» hiện thá»i: " +msgstr "Cá» hiện thá»i: " #: src/setleds.c:226 #, c-format msgid "Current leds: " -msgstr "Äèn báo hiện thá»i: " +msgstr "Äèn báo hiện thá»i: " #: src/setleds.c:262 src/setmetamode.c:94 #, c-format @@ -1528,27 +1584,27 @@ #: src/setleds.c:271 #, c-format msgid "Old default flags: " -msgstr "Cá» mặc định cÅ©: " +msgstr "Cá» mặc định cÅ©: " #: src/setleds.c:273 #, c-format msgid "New default flags: " -msgstr "Cá» mặc định má»›i: " +msgstr "Cá» mặc định má»›i: " #: src/setleds.c:280 #, c-format msgid "Old flags: " -msgstr "Cá» cÅ©: " +msgstr "Cá» cÅ©: " #: src/setleds.c:282 #, c-format msgid "New flags: " -msgstr "Cá» má»›i: " +msgstr "Cá» má»›i: " #: src/setleds.c:296 src/setleds.c:305 #, c-format msgid "Old leds: " -msgstr "Äèn báo cÅ©: " +msgstr "Äèn báo cÅ©: " #: src/setleds.c:298 src/setleds.c:307 #, c-format @@ -1592,17 +1648,17 @@ #: src/setmetamode.c:98 #, c-format msgid "old state: " -msgstr "trạng thái cÅ©: " +msgstr "trạng thái cÅ©: " #: src/setmetamode.c:104 #, c-format msgid "new state: " -msgstr "trạng thái má»›i: " +msgstr "trạng thái má»›i: " #: src/setvesablank.c:23 #, c-format msgid "usage: %s\n" -msgstr "sá»­ dụng: %s\n" +msgstr "cách dùng: %s\n" #: src/setvtrgb.c:42 #, c-format @@ -1618,26 +1674,37 @@ "and then edit the values in FILE.\n" "\n" msgstr "" +"Cách dùng: %s vga|TẬP-TIN|-\n" +"\n" +"Nếu bạn sá»­ dụng đối số TẬP-TIN, TẬP-TIN có chính xách 3 dòng\n" +"chứa các giá trị dạng thập phân ngăn cách bởi dấu phẩy, cho ÄỎ, LỤC và " +"XANH.\n" +"\n" +"Äể tạo ra TẬP-TIN hợp lệ ta dùng lệnh:\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > TẬP-TIN\n" +"\n" +"và sau đó sá»­a giá trị trong TẬP-TIN.\n" +"\n" #: src/setvtrgb.c:85 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "Lá»—i: %s: Giá trị không hợp lện trong trÆ°á»ng %u tại dòng %u." #: src/setvtrgb.c:92 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "Lá»—i: %s: Số lượng trÆ°á»ng bị thiếu tại dòng %u." #: src/setvtrgb.c:98 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "Lá»—i: %s: Dòng %u bị chấm dứt không nhÆ° mong đợi.\n" #: src/setvtrgb.c:102 -#, fuzzy, c-format +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s: %s: Cảnh báo: dòng quá dài\n" +msgstr "Lá»—i: %s: Dòng %u quá đài.\n" #: src/showconsolefont.c:33 #, c-format @@ -1647,7 +1714,7 @@ #: src/showconsolefont.c:38 #, c-format msgid "failed to restore original unimap\n" -msgstr "phục hồi sÆ¡ đồ unicode (unimap) không thành công\n" +msgstr "phục hồi ánh xạ unicode (unimap) không thành công\n" #: src/showconsolefont.c:56 #, c-format @@ -1672,9 +1739,9 @@ " -i Don't print out the font table, just show\n" " ROWSxCOLSxCOUNT and exit.\n" msgstr "" -"sá»­ dụng: showconsolefont -V|--version\n" +"cách dùng: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" -"(rất có thể sau khi nạp phông chữ vá»›i « setfont phông »)\n" +"(rất có thể sau khi nạp phông chữ vá»›i “setfont phôngâ€)\n" "\n" "Tùy chá»n hợp lệ:\n" " -C tty Thiết bị từ đó cần Ä‘á»c phông. Mặc định: tty hiện thá»i.\n" @@ -1685,7 +1752,7 @@ #: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" -msgstr "Äếm ký tá»± : %d\n" +msgstr "Äếm ký tá»±: %d\n" #: src/showconsolefont.c:171 #, c-format @@ -1695,7 +1762,7 @@ #: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" -msgstr "Äồ cao phông chữ : %d\n" +msgstr "Äá»™ cao phông chữ : %d\n" #: src/showconsolefont.c:184 #, c-format @@ -1745,7 +1812,7 @@ msgstr "" "showkey phiên bản %s\n" "\n" -"sá»­ dụng: showkey [tùy-chá»n...]\n" +"cách dùng: showkey [tùy-chá»n...]\n" "\n" "Tùy chá»n có thể dùng:\n" "\n" @@ -1768,11 +1835,12 @@ #: src/showkey.c:226 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "nhấn phím bất kỳ (chÆ°Æ¡ng trình sẽ tá»± dừng sau 10 giây không nhấn phím)...\n" +msgstr "" +"nhấn phím bất kỳ (chÆ°Æ¡ng trình sẽ tá»± dừng sau 10 giây không nhấn phím)...\n" #: src/showkey.c:250 msgid "release" -msgstr "phát hành" +msgstr "nhả" #: src/showkey.c:250 msgid "press" @@ -1784,17 +1852,89 @@ msgstr "mã phím (keycode) %3d %s\n" #: src/totextmode.c:29 -#, fuzzy, c-format +#, c-format msgid "usage: totextmode\n" -msgstr "sá»­ dụng: getkeycodes\n" +msgstr "cách dùng: totextmode\n" #: src/version.h:20 #, c-format msgid "%s from %s\n" msgstr "%s từ %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" +"Xin hãy thá»­ lại sau.\n" +"\n" +"\n" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" +"Bá»™ hiển thị toàn bá»™ bảng Ä‘iá»u khiển hiện nay được khóa hoàn toàn bởi %s.\n" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "“%s†bị khoá bởi %s.\n" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "Dùng các phím Alt-function để chuyển bảng Ä‘iá»u khiển ảo khác." + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Hãy thá»­ lệnh “%s --help†để xem thông tin thêm.\n" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" +"%s: khóa các bảng Ä‘iá»u khiển ảo, ghi lại phiên hiện hành của bạn.\n" +"Cách dùng: %s [các-tùy-chá»n]\n" +" Vá»›i [các-tùy-chá»n] là:\n" +"-c hay --current: chỉ khóa bảng Ä‘iá»u khiển ảo này, cho phép ngÆ°á»i dùng\n" +" chuyển sang bảng Ä‘iá»u khiển khác.\n" +"-a hay --all: khóa tất cả các bảng Ä‘iá»u khiển ảo để ngăn cản những ngÆ°á»i " +"khác\n" +" from switching virtual consoles.\n" +"-v hay --version: Hiển thị số phiên bản của vlock rồi thoát.\n" +"-h hay --help: Hiển thị trợ giúp này rồi thoát.\n" + +#: src/vlock/username.c:57 +msgid "unrecognized user" +msgstr "không nhận ra ngÆ°á»i dùng" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "stdin không phải là má»™t tty" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "tty này (%s) không phải là bảng Ä‘iá»u khiển ảo.\n" + +#: src/vlock/vt.c:160 +#, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "bá»™ trình bày toàn bá»™ bảng Ä‘iá»u khiển không thể bị khóa.\n" + #~ msgid " use `openvt -f' to force.\n" -#~ msgstr " sá»­ dụng `openvt -f' để bắt buá»™c.\n" +#~ msgstr " sá»­ dụng “openvt -f†để ép buá»™c.\n" #~ msgid "" #~ "\n" @@ -1806,5 +1946,8 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: không thể bá» phân phối kênh giao tác %d\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" -#~ msgstr "Sá»­ dụng: openvt [-c số_vt] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" +#~ msgstr "" +#~ "Sá»­ dụng: openvt [-c số_vt] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" Binary files /tmp/RMOv60SIEm/kbd-1.15.3/po/zh_CN.gmo and /tmp/v6yKBU37hE/kbd-1.15.5/po/zh_CN.gmo differ diff -Nru kbd-1.15.3/po/zh_CN.po kbd-1.15.5/po/zh_CN.po --- kbd-1.15.3/po/zh_CN.po 2011-05-14 21:14:33.000000000 +0000 +++ kbd-1.15.5/po/zh_CN.po 2012-12-01 21:41:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd-1.15\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2011-05-08 01:06+0400\n" +"POT-Creation-Date: 2012-11-16 00:52+0400\n" "PO-Revision-Date: 2008-12-10 23:24+0800\n" "Last-Translator: Jarod Wang \n" "Language-Team: Chinese (simplified) \n" @@ -243,12 +243,12 @@ msgid "Warning: path too long: %s/%s\n" msgstr "%s: 警告: 行太长\n" -#: src/getfd.c:59 +#: src/getfd.c:67 #, c-format msgid "Couldn't open %s\n" msgstr "无法打开 %s\n" -#: src/getfd.c:88 +#: src/getfd.c:84 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "无法获å–指å‘控制å°çš„文件æ述符\n" @@ -435,36 +435,36 @@ msgid "unknown keysym '%s'\n" msgstr "未知的 keysym '%s'\n" -#: loadkeys.analyze.l:47 +#: loadkeys.analyze.l:51 msgid "includes are nested too deeply" msgstr "包å«æ–‡ä»¶åµŒå¥—太深" -#: loadkeys.analyze.l:234 +#: loadkeys.analyze.l:238 #, c-format msgid "switching to %s\n" msgstr "切æ¢åˆ° %s\n" -#: loadkeys.analyze.l:238 +#: loadkeys.analyze.l:242 #, c-format msgid "cannot open include file %s" msgstr "无法打开包å«æ–‡ä»¶ %s" -#: loadkeys.analyze.l:308 +#: loadkeys.analyze.l:314 msgid "expected filename between quotes" msgstr "" -#: loadkeys.analyze.l:342 +#: loadkeys.analyze.l:353 #, c-format msgid "unicode keysym out of range: %s" msgstr "" -#: loadkeys.analyze.l:392 loadkeys.analyze.l:397 loadkeys.analyze.l:402 -#: loadkeys.analyze.l:407 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:404 loadkeys.analyze.l:409 loadkeys.analyze.l:414 +#: loadkeys.analyze.l:419 loadkeys.analyze.l:426 #, fuzzy msgid "string too long" msgstr "%s: 警告: 行太长\n" -#: loadkeys.y:90 +#: loadkeys.y:93 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -476,8 +476,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" -" -C --console=\n" -" the console device(s) to be used\n" +" -C --console=file\n" +" the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -503,120 +503,120 @@ " -u --unicode éšå¼è½¬æ¢ä¸º Unicode\n" " -v --verbose 报告任何改å˜\n" -#: loadkeys.y:149 +#: loadkeys.y:152 #, c-format msgid "addmap called with bad index %d" msgstr "调用 addmap 时使用了错误的索引 %d" -#: loadkeys.y:153 +#: loadkeys.y:156 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "添加映射 %d è¿å了显å¼é”®æ˜ å°„è¡Œ" -#: loadkeys.y:167 +#: loadkeys.y:170 #, c-format msgid "killkey called with bad index %d" msgstr "调用 killkey 时使用了错误的索引 %d" -#: loadkeys.y:170 +#: loadkeys.y:173 #, c-format msgid "killkey called with bad table %d" msgstr "调用 killkey 时使用了错误的表 %d" -#: loadkeys.y:186 +#: loadkeys.y:189 #, c-format msgid "addkey called with bad keycode %d" msgstr "调用 addkey æ—¶ä½¿ç”¨äº†é”™è¯¯çš„é”®ç  %d" -#: loadkeys.y:189 +#: loadkeys.y:192 #, c-format msgid "addkey called with bad index %d" msgstr "调用 addkey 时使用了错误的索引 %d" -#: loadkeys.y:192 +#: loadkeys.y:195 #, c-format msgid "addkey called with bad table %d" msgstr "调用 addkey 时使用了错误的表 %d" -#: loadkeys.y:238 +#: loadkeys.y:241 #, c-format msgid "%s: addfunc called with bad func %d\n" msgstr "%s: 调用 addfunc 时使用了错误的函数 %d\n" -#: loadkeys.y:269 +#: loadkeys.y:272 #, c-format msgid "%s: addfunc: func_buf overflow\n" msgstr "%s: addfunc: func_buf 溢出\n" -#: loadkeys.y:297 +#: loadkeys.y:300 #, c-format msgid "compose table overflow\n" msgstr "组åˆè¡¨æº¢å‡º\n" -#: loadkeys.y:317 +#: loadkeys.y:320 #, fuzzy, c-format msgid "%s: could not switch to Unicode mode\n" msgstr "%s: æ— æ³•å›žæ”¶æŽ§åˆ¶å° %d\n" -#: loadkeys.y:336 +#: loadkeys.y:339 #, c-format msgid "Keymap %d: Permission denied\n" msgstr "键映射 %d: æƒé™ä¸è¶³\n" -#: loadkeys.y:345 +#: loadkeys.y:348 #, c-format msgid "keycode %d, table %d = %d%s\n" msgstr "é”®ç  %d, 表 %d = %d%s\n" -#: loadkeys.y:347 +#: loadkeys.y:350 msgid " FAILED" msgstr " 失败" -#: loadkeys.y:351 +#: loadkeys.y:354 #, c-format msgid "failed to bind key %d to value %d\n" msgstr "将键 %d 绑定到值 %d 失败\n" -#: loadkeys.y:365 +#: loadkeys.y:366 #, c-format msgid "deallocate keymap %d\n" msgstr "回收键映射 %d\n" -#: loadkeys.y:371 +#: loadkeys.y:372 #, c-format msgid "%s: could not deallocate keymap %d\n" msgstr "%s: 无法回收键映射 %d\n" -#: loadkeys.y:388 +#: loadkeys.y:389 #, c-format msgid "%s: cannot deallocate or clear keymap\n" msgstr "%s: 无法回收或清除键映射\n" -#: loadkeys.y:400 +#: loadkeys.y:401 #, fuzzy, c-format msgid "%s: could not return to original keyboard mode\n" msgstr "%s: æ¢å¤é”®ç›˜æ¨¡å¼å¤±è´¥\n" -#: loadkeys.y:447 +#: loadkeys.y:458 #, c-format msgid "failed to bind string '%s' to function %s\n" msgstr "将字符串 '%s' 绑定到函数 %s 失败\n" -#: loadkeys.y:455 +#: loadkeys.y:467 #, c-format msgid "failed to clear string %s\n" msgstr "清除字符串 %s 失败\n" -#: loadkeys.y:475 +#: loadkeys.y:488 #, c-format msgid "too many compose definitions\n" msgstr "太多组åˆå®šä¹‰\n" -#: loadkeys.y:567 +#: loadkeys.y:580 msgid "impossible error in do_constant" msgstr "do_constant 中å‘生ä¸å¯èƒ½çš„错误" -#: loadkeys.y:585 +#: loadkeys.y:596 #, c-format msgid "" "\n" @@ -625,75 +625,90 @@ "\n" "已修改 %d %s å’Œ %d %s.\n" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "key" msgstr "个键" -#: loadkeys.y:586 +#: loadkeys.y:597 msgid "keys" msgstr "个键" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "string" msgstr "个字符串" -#: loadkeys.y:587 +#: loadkeys.y:598 msgid "strings" msgstr "个字符串" -#: loadkeys.y:594 +#: loadkeys.y:605 #, c-format msgid "Loaded %d compose %s.\n" msgstr "已加载 %d ä¸ªç»„åˆ %s.\n" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definition" msgstr "定义" -#: loadkeys.y:595 +#: loadkeys.y:606 msgid "definitions" msgstr "定义" -#: loadkeys.y:599 +#: loadkeys.y:610 #, c-format msgid "(No change in compose definitions.)\n" msgstr "(组åˆå®šä¹‰æ²¡æœ‰æ”¹å˜ã€‚)\n" -#: loadkeys.y:637 +#: loadkeys.y:650 #, c-format msgid "loadkeys: don't know how to compose for %s\n" msgstr "loadkeys: ä¸çŸ¥é“如何为 %s 进行组åˆ\n" -#: loadkeys.y:870 src/mapscrn.c:275 src/mapscrn.c:280 +#: loadkeys.y:886 src/mapscrn.c:275 src/mapscrn.c:280 #, c-format msgid "Error writing map to file\n" msgstr "将映射写入文件失败\n" -#: loadkeys.y:937 +#: loadkeys.y:954 #, c-format msgid "'%s' is not a function key symbol" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªåŠŸèƒ½é”®æ ‡å¿—" -#: loadkeys.y:1011 +#: loadkeys.y:1028 #, c-format msgid "too many (%d) entries on one line" msgstr "一行上存在太多的 ( %d 个) æ¡ç›®" -#: loadkeys.y:1025 +#: loadkeys.y:1042 msgid "too many key definitions on one line" msgstr "一行上存在太多的键定义" -#: loadkeys.y:1110 +#: loadkeys.y:1057 +#, c-format +msgid "Loading %s\n" +msgstr "正在加载 %s\n" + +#: loadkeys.y:1062 +#, c-format +msgid "syntax error in map file\n" +msgstr "映射文件中存在语法错误\n" + +#: loadkeys.y:1066 +#, c-format +msgid "key bindings not changed\n" +msgstr "键绑定未被改å˜\n" + +#: loadkeys.y:1146 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: loadkeys.y:1123 +#: loadkeys.y:1158 #, fuzzy, c-format -msgid "%s: error reading keyboard mode\n" +msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: 设置键盘模å¼å‡ºé”™\n" -#: loadkeys.y:1131 +#: loadkeys.y:1166 #, fuzzy, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -702,7 +717,7 @@ "%s: 警告:映射使用了 Unicode 标志，%s 模å¼=%d\n" " (或许你想 `kbd_mode -u'？)\n" -#: loadkeys.y:1143 +#: loadkeys.y:1178 #, fuzzy, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -711,36 +726,21 @@ "%s: 警告:映射使用了 Unicode 标志，%s 模å¼=%d\n" " (或许你想 `kbd_mode -u'？)\n" -#: loadkeys.y:1157 +#: loadkeys.y:1187 #, fuzzy, c-format msgid "Searching in %s\n" msgstr "切æ¢åˆ° %s\n" -#: loadkeys.y:1167 +#: loadkeys.y:1197 #, c-format msgid "Cannot find %s\n" msgstr "无法找到 %s\n" -#: loadkeys.y:1178 +#: loadkeys.y:1213 #, c-format msgid "cannot open file %s\n" msgstr "无法打开文件 %s\n" -#: loadkeys.y:1184 -#, c-format -msgid "Loading %s\n" -msgstr "正在加载 %s\n" - -#: loadkeys.y:1189 -#, c-format -msgid "syntax error in map file\n" -msgstr "映射文件中存在语法错误\n" - -#: loadkeys.y:1193 -#, c-format -msgid "key bindings not changed\n" -msgstr "键绑定未被改å˜\n" - #: src/loadunimap.c:43 #, c-format msgid "" @@ -772,8 +772,11 @@ #: src/loadunimap.c:238 src/psfxtable.c:182 #, c-format -msgid "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x%x-0x%x\n" -msgstr "%s: Unicode 范围 U+%x-U+%x 的长度和字体ä½ç½®èŒƒå›´ 0x%x-0x%x 的长度ä¸ä¸€è‡´\n" +msgid "" +"%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" +"%x-0x%x\n" +msgstr "" +"%s: Unicode 范围 U+%x-U+%x 的长度和字体ä½ç½®èŒƒå›´ 0x%x-0x%x 的长度ä¸ä¸€è‡´\n" #: src/loadunimap.c:257 src/psfxtable.c:203 #, c-format @@ -876,6 +879,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" +" -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" @@ -887,80 +891,80 @@ "\n" msgstr "" -#: src/openvt.c:162 +#: src/openvt.c:163 #, fuzzy msgid "Couldn't find owner of current tty!" msgstr "æ— æ³•æ‰¾åˆ°å½“å‰ tty 的所有者ï¼\n" -#: src/openvt.c:230 +#: src/openvt.c:231 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: éžæ³•çš„ VT å·\n" -#: src/openvt.c:256 +#: src/openvt.c:257 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: åªæœ‰ root 用户å¯ä»¥ä½¿ç”¨ -u 标志。\n" -#: src/openvt.c:278 +#: src/openvt.c:279 #, fuzzy msgid "Couldn't get a file descriptor referring to the console" msgstr "无法获å–指å‘控制å°çš„文件æ述符\n" -#: src/openvt.c:285 +#: src/openvt.c:286 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: 无法找到一个空闲的 VT\n" -#: src/openvt.c:289 +#: src/openvt.c:290 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: 无法检查 VT %d 是å¦ç©ºé—²\n" -#: src/openvt.c:293 +#: src/openvt.c:294 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: VT %d 正在使用中；命令中止\n" -#: src/openvt.c:303 +#: src/openvt.c:304 msgid "Unable to find command." msgstr "" -#: src/openvt.c:335 +#: src/openvt.c:336 #, fuzzy msgid "Unable to set new session" msgstr "openvt: æ— æ³•è®¾ç½®æ–°çš„ä¼šè¯ (%s)\n" -#: src/openvt.c:359 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: 无法打开 %s: %s\n" -#: src/openvt.c:363 +#: src/openvt.c:364 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: 正在使用 VT %s\n" -#: src/openvt.c:369 +#: src/openvt.c:370 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: 无法打开 %s 进行读/写 (%s)\n" -#: src/openvt.c:380 +#: src/openvt.c:381 #, fuzzy, c-format msgid "Couldn't activate vt %d" msgstr "" "\n" "openvt: 无法激活 VT %d (%s)\n" -#: src/openvt.c:383 +#: src/openvt.c:384 #, fuzzy msgid "Activation interrupted?" msgstr "" "\n" "openvt: 激活被中断？(%s)\n" -#: src/openvt.c:423 +#: src/openvt.c:424 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: æ— æ³•å›žæ”¶æŽ§åˆ¶å° %d\n" @@ -1067,7 +1071,9 @@ #: src/psfxtable.c:166 #, c-format -msgid "%s: Corresponding to a range of font positions, there should be a Unicode range\n" +msgid "" +"%s: Corresponding to a range of font positions, there should be a Unicode " +"range\n" msgstr "%s: 对应于一个字体ä½ç½®çš„范围，应该存在一个 Unicode 范围\n" #: src/psfxtable.c:257 @@ -1148,7 +1154,8 @@ #: src/resizecons.c:325 #, c-format -msgid "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" +msgid "" +"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" msgstr "resizecons: ä¸è¦å¿˜è®°ä¿®æ”¹ TERM (也许修改为 con%dx%d 或 linux-%dx%d)\n" #: src/resizecons.c:338 @@ -1156,11 +1163,13 @@ msgid "" "resizecons:\n" "call is: resizecons COLSxROWS or: resizecons COLS ROWS\n" -"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, 60\n" +"or: resizecons -lines ROWS, with ROWS one of 25, 28, 30, 34, 36, 40, 44, 50, " +"60\n" msgstr "" "resizecons:\n" "调用方法为: resizecons COLSxROWS 或: resizecons COLS ROWS\n" -"或: resizecons -lines ROWS, 其中 ROWS 为 25, 28, 30, 34, 36, 40, 44, 50, 60 中的一个\n" +"或: resizecons -lines ROWS, 其中 ROWS 为 25, 28, 30, 34, 36, 40, 44, 50, 60 " +"中的一个\n" #: src/resizecons.c:376 #, c-format @@ -1200,7 +1209,8 @@ #: src/setfont.c:74 #, c-format msgid "" -"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u unicodemap]\n" +"Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " +"unicodemap]\n" " write-options (take place before file loading):\n" " -o Write current font to \n" " -O Write current font and unicode map to \n" @@ -1224,7 +1234,8 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"用法; setfont [写入选项] [-] [新字体..] [-m 控制å°æ˜ å°„] [-u unicode 映射]\n" +"用法; setfont [写入选项] [-] [新字体..] [-m 控制å°æ˜ å°„] [-u unicode 映" +"å°„]\n" " write-options (在文件加载之å‰è¿›è¡Œ):\n" " -o <文件å> 将当å‰å­—体写入<文件å>\n" " -O <文件å> 将当å‰å­—体和 unicode 映射写入<文件å>\n" @@ -1255,7 +1266,9 @@ #: src/setfont.c:185 #, c-format -msgid "setfont: cannot both restore from character ROM and from file. Font unchanged.\n" +msgid "" +"setfont: cannot both restore from character ROM and from file. Font " +"unchanged.\n" msgstr "setfont: 无法既从字符 ROM 进行æ¢å¤åˆä»Žæ–‡ä»¶è¿›è¡Œæ¢å¤ã€‚字体ä¸å˜ã€‚\n" #: src/setfont.c:259 @@ -1469,7 +1482,8 @@ #: src/setleds.c:105 #, c-format -msgid "Error reading current flags setting. Maybe you are not on the console?\n" +msgid "" +"Error reading current flags setting. Maybe you are not on the console?\n" msgstr "读å–当å‰æ ‡å¿—设置出错。也许你ä¸æ˜¯åœ¨æŽ§åˆ¶å°ä¸Šï¼Ÿ\n" #: src/setleds.c:125 src/setleds.c:146 @@ -1789,6 +1803,67 @@ msgid "%s from %s\n" msgstr "%s æ¥è‡ª %s\n" +#: src/vlock/auth.c:58 +msgid "" +"Please try again later.\n" +"\n" +"\n" +msgstr "" + +#: src/vlock/auth.c:67 +#, c-format +msgid "The entire console display is now completely locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:71 +#, c-format +msgid "The %s is now locked by %s.\n" +msgstr "" + +#: src/vlock/auth.c:74 +msgid "Use Alt-function keys to switch to other virtual consoles." +msgstr "" + +#: src/vlock/parse.c:50 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "" + +#: src/vlock/parse.c:58 +#, c-format +msgid "" +"%s: locks virtual consoles, saving your current session.\n" +"Usage: %s [options]\n" +" Where [options] are any of:\n" +"-c or --current: lock only this virtual console, allowing user to\n" +" switch to other virtual consoles.\n" +"-a or --all: lock all virtual consoles by preventing other users\n" +" from switching virtual consoles.\n" +"-v or --version: Print the version number of vlock and exit.\n" +"-h or --help: Print this help message and exit.\n" +msgstr "" + +#: src/vlock/username.c:57 +#, fuzzy +msgid "unrecognized user" +msgstr "" +"无法识别的å‚æ•°: _%s_\n" +"\n" + +#: src/vlock/vlock.c:56 +msgid "stdin is not a tty" +msgstr "" + +#: src/vlock/vt.c:152 +#, c-format +msgid "This tty (%s) is not a virtual console.\n" +msgstr "" + +#: src/vlock/vt.c:160 +#, fuzzy, c-format +msgid "The entire console display cannot be locked.\n" +msgstr "%s: VT 1 是控制å°å¹¶ä¸”无法被回收\n" + #~ msgid "plus before %s ignored\n" #~ msgstr "%s å‰é¢çš„加å·å·²è¢«å¿½ç•¥\n" @@ -1805,5 +1880,7 @@ #~ msgid "openvt: could not deallocate console %d\n" #~ msgstr "openvt: æ— æ³•å›žæ”¶æŽ§åˆ¶å° %d\n" -#~ msgid "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- command_line\n" +#~ msgid "" +#~ "Usage: openvt [-c vtnumber] [-f] [-l] [-u] [-s] [-v] [-w] -- " +#~ "command_line\n" #~ msgstr "用法: openvt [-c VT å·] [-f] [-l] [-u] [-s] [-v] [-w] -- 命令行\n" diff -Nru kbd-1.15.3/src/Makefile.am kbd-1.15.5/src/Makefile.am --- kbd-1.15.3/src/Makefile.am 2011-05-07 20:21:09.000000000 +0000 +++ kbd-1.15.5/src/Makefile.am 2012-12-03 06:34:39.000000000 +0000 @@ -1,10 +1,8 @@ -WARNINGS = -Wall -Wextra -Wmissing-noreturn -Wdisabled-optimization \ - -Wcast-align -Wshadow -Wmissing-format-attribute -Wmissing-prototypes \ - -Wstrict-prototypes -Wmissing-declarations - -AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(WARNINGS) \ +AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" \ -funit-at-a-time +SUBDIRS = vlock + OLDPROGS = mapscrn loadunimap PROGS = \ dumpkeys loadkeys showkey setfont showconsolefont \ @@ -29,8 +27,8 @@ bin_PROGRAMS = $(OLDPROGS) $(PROGS) EXTRA_DIST = \ - analyze.c analyze.l wctomb.c totextmode.c \ - README.cad README.init README.openvt \ + loadkeys.analyze.c loadkeys.analyze.h loadkeys.analyze.l wctomb.c \ + totextmode.c README.cad README.init README.openvt \ cad ALL_S = modifiers.h nls.h paths.h version.h kbd.h @@ -71,8 +69,10 @@ loadunimap_CFLAGS = -DMAIN AM_YFLAGS = -d -BUILT_SOURCES = loadkeys.c loadkeys.analyze.c loadkeys.h +AM_LFLAGS = --header-file=$(CURDIR)/loadkeys.analyze.h +BUILT_SOURCES = loadkeys.c loadkeys.analyze.c loadkeys.h loadkeys.analyze.h loadkeys_SOURCES = loadkeys.y loadkeys.analyze.l $(GETFD_S) $(KSYMS_S) $(XMAL_S) $(FIND_S) +loadkeys.analyze.h: loadkeys.analyze.c ; @true install-exec-hook: for i in psfaddtable psfgettable psfstriptable; do \ diff -Nru kbd-1.15.3/src/Makefile.in kbd-1.15.5/src/Makefile.in --- kbd-1.15.3/src/Makefile.in 2011-05-07 20:34:44.000000000 +0000 +++ kbd-1.15.5/src/Makefile.in 2012-12-05 19:27:06.000000000 +0000 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.11.1a from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software # Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,11 +63,12 @@ DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in loadkeys.analyze.c loadkeys.c loadkeys.h ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -242,18 +260,45 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS = $(dist_bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS) +AM_V_LEX = $(am__v_LEX_@AM_V@) +am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@) +am__v_LEX_0 = @echo " LEX " $@; YLWRAP = $(top_srcdir)/config/ylwrap -YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) +YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS) +AM_V_YACC = $(am__v_YACC_@AM_V@) +am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) +am__v_YACC_0 = @echo " YACC " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(chvt_SOURCES) $(clrunimap_SOURCES) $(deallocvt_SOURCES) \ $(dumpkeys_SOURCES) $(fgconsole_SOURCES) \ $(getkeycodes_SOURCES) $(getunimap_SOURCES) \ @@ -276,11 +321,55 @@ setmetamode.c $(setpalette_SOURCES) $(setvesablank_SOURCES) \ $(setvtrgb_SOURCES) $(showconsolefont_SOURCES) \ $(showkey_SOURCES) spawn_console.c spawn_login.c +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -331,6 +420,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ SED = @SED@ @@ -392,13 +482,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -WARNINGS = -Wall -Wextra -Wmissing-noreturn -Wdisabled-optimization \ - -Wcast-align -Wshadow -Wmissing-format-attribute -Wmissing-prototypes \ - -Wstrict-prototypes -Wmissing-declarations - -AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(WARNINGS) \ +AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" \ -funit-at-a-time +SUBDIRS = vlock OLDPROGS = mapscrn loadunimap PROGS = dumpkeys loadkeys showkey setfont showconsolefont setleds \ setmetamode kbd_mode psfxtable fgconsole kbdrate chvt \ @@ -406,8 +493,8 @@ $(am__append_2) $(am__append_3) dist_bin_SCRIPTS = unicode_start unicode_stop EXTRA_DIST = \ - analyze.c analyze.l wctomb.c totextmode.c \ - README.cad README.init README.openvt \ + loadkeys.analyze.c loadkeys.analyze.h loadkeys.analyze.l wctomb.c \ + totextmode.c README.cad README.init README.openvt \ cad ALL_S = modifiers.h nls.h paths.h version.h kbd.h @@ -445,10 +532,11 @@ mapscrn_CFLAGS = -DMAIN loadunimap_CFLAGS = -DMAIN AM_YFLAGS = -d -BUILT_SOURCES = loadkeys.c loadkeys.analyze.c loadkeys.h +AM_LFLAGS = --header-file=$(CURDIR)/loadkeys.analyze.h +BUILT_SOURCES = loadkeys.c loadkeys.analyze.c loadkeys.h loadkeys.analyze.h loadkeys_SOURCES = loadkeys.y loadkeys.analyze.l $(GETFD_S) $(KSYMS_S) $(XMAL_S) $(FIND_S) all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .c .l .o .obj .y @@ -484,8 +572,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -519,105 +610,106 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -chvt$(EXEEXT): $(chvt_OBJECTS) $(chvt_DEPENDENCIES) +chvt$(EXEEXT): $(chvt_OBJECTS) $(chvt_DEPENDENCIES) $(EXTRA_chvt_DEPENDENCIES) @rm -f chvt$(EXEEXT) - $(LINK) $(chvt_OBJECTS) $(chvt_LDADD) $(LIBS) -clrunimap$(EXEEXT): $(clrunimap_OBJECTS) $(clrunimap_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(chvt_OBJECTS) $(chvt_LDADD) $(LIBS) +clrunimap$(EXEEXT): $(clrunimap_OBJECTS) $(clrunimap_DEPENDENCIES) $(EXTRA_clrunimap_DEPENDENCIES) @rm -f clrunimap$(EXEEXT) - $(LINK) $(clrunimap_OBJECTS) $(clrunimap_LDADD) $(LIBS) -deallocvt$(EXEEXT): $(deallocvt_OBJECTS) $(deallocvt_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(clrunimap_OBJECTS) $(clrunimap_LDADD) $(LIBS) +deallocvt$(EXEEXT): $(deallocvt_OBJECTS) $(deallocvt_DEPENDENCIES) $(EXTRA_deallocvt_DEPENDENCIES) @rm -f deallocvt$(EXEEXT) - $(LINK) $(deallocvt_OBJECTS) $(deallocvt_LDADD) $(LIBS) -dumpkeys$(EXEEXT): $(dumpkeys_OBJECTS) $(dumpkeys_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(deallocvt_OBJECTS) $(deallocvt_LDADD) $(LIBS) +dumpkeys$(EXEEXT): $(dumpkeys_OBJECTS) $(dumpkeys_DEPENDENCIES) $(EXTRA_dumpkeys_DEPENDENCIES) @rm -f dumpkeys$(EXEEXT) - $(LINK) $(dumpkeys_OBJECTS) $(dumpkeys_LDADD) $(LIBS) -fgconsole$(EXEEXT): $(fgconsole_OBJECTS) $(fgconsole_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(dumpkeys_OBJECTS) $(dumpkeys_LDADD) $(LIBS) +fgconsole$(EXEEXT): $(fgconsole_OBJECTS) $(fgconsole_DEPENDENCIES) $(EXTRA_fgconsole_DEPENDENCIES) @rm -f fgconsole$(EXEEXT) - $(LINK) $(fgconsole_OBJECTS) $(fgconsole_LDADD) $(LIBS) -getkeycodes$(EXEEXT): $(getkeycodes_OBJECTS) $(getkeycodes_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(fgconsole_OBJECTS) $(fgconsole_LDADD) $(LIBS) +getkeycodes$(EXEEXT): $(getkeycodes_OBJECTS) $(getkeycodes_DEPENDENCIES) $(EXTRA_getkeycodes_DEPENDENCIES) @rm -f getkeycodes$(EXEEXT) - $(LINK) $(getkeycodes_OBJECTS) $(getkeycodes_LDADD) $(LIBS) -getunimap$(EXEEXT): $(getunimap_OBJECTS) $(getunimap_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(getkeycodes_OBJECTS) $(getkeycodes_LDADD) $(LIBS) +getunimap$(EXEEXT): $(getunimap_OBJECTS) $(getunimap_DEPENDENCIES) $(EXTRA_getunimap_DEPENDENCIES) @rm -f getunimap$(EXEEXT) - $(LINK) $(getunimap_OBJECTS) $(getunimap_LDADD) $(LIBS) -kbd_mode$(EXEEXT): $(kbd_mode_OBJECTS) $(kbd_mode_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(getunimap_OBJECTS) $(getunimap_LDADD) $(LIBS) +kbd_mode$(EXEEXT): $(kbd_mode_OBJECTS) $(kbd_mode_DEPENDENCIES) $(EXTRA_kbd_mode_DEPENDENCIES) @rm -f kbd_mode$(EXEEXT) - $(LINK) $(kbd_mode_OBJECTS) $(kbd_mode_LDADD) $(LIBS) -kbdinfo$(EXEEXT): $(kbdinfo_OBJECTS) $(kbdinfo_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(kbd_mode_OBJECTS) $(kbd_mode_LDADD) $(LIBS) +kbdinfo$(EXEEXT): $(kbdinfo_OBJECTS) $(kbdinfo_DEPENDENCIES) $(EXTRA_kbdinfo_DEPENDENCIES) @rm -f kbdinfo$(EXEEXT) - $(LINK) $(kbdinfo_OBJECTS) $(kbdinfo_LDADD) $(LIBS) -kbdrate$(EXEEXT): $(kbdrate_OBJECTS) $(kbdrate_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(kbdinfo_OBJECTS) $(kbdinfo_LDADD) $(LIBS) +kbdrate$(EXEEXT): $(kbdrate_OBJECTS) $(kbdrate_DEPENDENCIES) $(EXTRA_kbdrate_DEPENDENCIES) @rm -f kbdrate$(EXEEXT) - $(LINK) $(kbdrate_OBJECTS) $(kbdrate_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(kbdrate_OBJECTS) $(kbdrate_LDADD) $(LIBS) loadkeys.h: loadkeys.c - @if test ! -f $@; then \ - rm -f loadkeys.c; \ - $(MAKE) $(AM_MAKEFLAGS) loadkeys.c; \ - else :; fi -loadkeys$(EXEEXT): $(loadkeys_OBJECTS) $(loadkeys_DEPENDENCIES) + @if test ! -f $@; then rm -f loadkeys.c; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) loadkeys.c; else :; fi +loadkeys$(EXEEXT): $(loadkeys_OBJECTS) $(loadkeys_DEPENDENCIES) $(EXTRA_loadkeys_DEPENDENCIES) @rm -f loadkeys$(EXEEXT) - $(LINK) $(loadkeys_OBJECTS) $(loadkeys_LDADD) $(LIBS) -loadunimap$(EXEEXT): $(loadunimap_OBJECTS) $(loadunimap_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(loadkeys_OBJECTS) $(loadkeys_LDADD) $(LIBS) +loadunimap$(EXEEXT): $(loadunimap_OBJECTS) $(loadunimap_DEPENDENCIES) $(EXTRA_loadunimap_DEPENDENCIES) @rm -f loadunimap$(EXEEXT) - $(loadunimap_LINK) $(loadunimap_OBJECTS) $(loadunimap_LDADD) $(LIBS) -mapscrn$(EXEEXT): $(mapscrn_OBJECTS) $(mapscrn_DEPENDENCIES) + $(AM_V_CCLD)$(loadunimap_LINK) $(loadunimap_OBJECTS) $(loadunimap_LDADD) $(LIBS) +mapscrn$(EXEEXT): $(mapscrn_OBJECTS) $(mapscrn_DEPENDENCIES) $(EXTRA_mapscrn_DEPENDENCIES) @rm -f mapscrn$(EXEEXT) - $(mapscrn_LINK) $(mapscrn_OBJECTS) $(mapscrn_LDADD) $(LIBS) -openvt$(EXEEXT): $(openvt_OBJECTS) $(openvt_DEPENDENCIES) + $(AM_V_CCLD)$(mapscrn_LINK) $(mapscrn_OBJECTS) $(mapscrn_LDADD) $(LIBS) +openvt$(EXEEXT): $(openvt_OBJECTS) $(openvt_DEPENDENCIES) $(EXTRA_openvt_DEPENDENCIES) @rm -f openvt$(EXEEXT) - $(LINK) $(openvt_OBJECTS) $(openvt_LDADD) $(LIBS) -outpsfheader$(EXEEXT): $(outpsfheader_OBJECTS) $(outpsfheader_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(openvt_OBJECTS) $(openvt_LDADD) $(LIBS) +outpsfheader$(EXEEXT): $(outpsfheader_OBJECTS) $(outpsfheader_DEPENDENCIES) $(EXTRA_outpsfheader_DEPENDENCIES) @rm -f outpsfheader$(EXEEXT) - $(LINK) $(outpsfheader_OBJECTS) $(outpsfheader_LDADD) $(LIBS) -psfxtable$(EXEEXT): $(psfxtable_OBJECTS) $(psfxtable_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(outpsfheader_OBJECTS) $(outpsfheader_LDADD) $(LIBS) +psfxtable$(EXEEXT): $(psfxtable_OBJECTS) $(psfxtable_DEPENDENCIES) $(EXTRA_psfxtable_DEPENDENCIES) @rm -f psfxtable$(EXEEXT) - $(LINK) $(psfxtable_OBJECTS) $(psfxtable_LDADD) $(LIBS) -resizecons$(EXEEXT): $(resizecons_OBJECTS) $(resizecons_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(psfxtable_OBJECTS) $(psfxtable_LDADD) $(LIBS) +resizecons$(EXEEXT): $(resizecons_OBJECTS) $(resizecons_DEPENDENCIES) $(EXTRA_resizecons_DEPENDENCIES) @rm -f resizecons$(EXEEXT) - $(LINK) $(resizecons_OBJECTS) $(resizecons_LDADD) $(LIBS) -screendump$(EXEEXT): $(screendump_OBJECTS) $(screendump_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(resizecons_OBJECTS) $(resizecons_LDADD) $(LIBS) +screendump$(EXEEXT): $(screendump_OBJECTS) $(screendump_DEPENDENCIES) $(EXTRA_screendump_DEPENDENCIES) @rm -f screendump$(EXEEXT) - $(LINK) $(screendump_OBJECTS) $(screendump_LDADD) $(LIBS) -setfont$(EXEEXT): $(setfont_OBJECTS) $(setfont_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(screendump_OBJECTS) $(screendump_LDADD) $(LIBS) +setfont$(EXEEXT): $(setfont_OBJECTS) $(setfont_DEPENDENCIES) $(EXTRA_setfont_DEPENDENCIES) @rm -f setfont$(EXEEXT) - $(LINK) $(setfont_OBJECTS) $(setfont_LDADD) $(LIBS) -setkeycodes$(EXEEXT): $(setkeycodes_OBJECTS) $(setkeycodes_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setfont_OBJECTS) $(setfont_LDADD) $(LIBS) +setkeycodes$(EXEEXT): $(setkeycodes_OBJECTS) $(setkeycodes_DEPENDENCIES) $(EXTRA_setkeycodes_DEPENDENCIES) @rm -f setkeycodes$(EXEEXT) - $(LINK) $(setkeycodes_OBJECTS) $(setkeycodes_LDADD) $(LIBS) -setleds$(EXEEXT): $(setleds_OBJECTS) $(setleds_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setkeycodes_OBJECTS) $(setkeycodes_LDADD) $(LIBS) +setleds$(EXEEXT): $(setleds_OBJECTS) $(setleds_DEPENDENCIES) $(EXTRA_setleds_DEPENDENCIES) @rm -f setleds$(EXEEXT) - $(LINK) $(setleds_OBJECTS) $(setleds_LDADD) $(LIBS) -setlogcons$(EXEEXT): $(setlogcons_OBJECTS) $(setlogcons_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setleds_OBJECTS) $(setleds_LDADD) $(LIBS) +setlogcons$(EXEEXT): $(setlogcons_OBJECTS) $(setlogcons_DEPENDENCIES) $(EXTRA_setlogcons_DEPENDENCIES) @rm -f setlogcons$(EXEEXT) - $(LINK) $(setlogcons_OBJECTS) $(setlogcons_LDADD) $(LIBS) -setmetamode$(EXEEXT): $(setmetamode_OBJECTS) $(setmetamode_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setlogcons_OBJECTS) $(setlogcons_LDADD) $(LIBS) +setmetamode$(EXEEXT): $(setmetamode_OBJECTS) $(setmetamode_DEPENDENCIES) $(EXTRA_setmetamode_DEPENDENCIES) @rm -f setmetamode$(EXEEXT) - $(LINK) $(setmetamode_OBJECTS) $(setmetamode_LDADD) $(LIBS) -setpalette$(EXEEXT): $(setpalette_OBJECTS) $(setpalette_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setmetamode_OBJECTS) $(setmetamode_LDADD) $(LIBS) +setpalette$(EXEEXT): $(setpalette_OBJECTS) $(setpalette_DEPENDENCIES) $(EXTRA_setpalette_DEPENDENCIES) @rm -f setpalette$(EXEEXT) - $(LINK) $(setpalette_OBJECTS) $(setpalette_LDADD) $(LIBS) -setvesablank$(EXEEXT): $(setvesablank_OBJECTS) $(setvesablank_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setpalette_OBJECTS) $(setpalette_LDADD) $(LIBS) +setvesablank$(EXEEXT): $(setvesablank_OBJECTS) $(setvesablank_DEPENDENCIES) $(EXTRA_setvesablank_DEPENDENCIES) @rm -f setvesablank$(EXEEXT) - $(LINK) $(setvesablank_OBJECTS) $(setvesablank_LDADD) $(LIBS) -setvtrgb$(EXEEXT): $(setvtrgb_OBJECTS) $(setvtrgb_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setvesablank_OBJECTS) $(setvesablank_LDADD) $(LIBS) +setvtrgb$(EXEEXT): $(setvtrgb_OBJECTS) $(setvtrgb_DEPENDENCIES) $(EXTRA_setvtrgb_DEPENDENCIES) @rm -f setvtrgb$(EXEEXT) - $(LINK) $(setvtrgb_OBJECTS) $(setvtrgb_LDADD) $(LIBS) -showconsolefont$(EXEEXT): $(showconsolefont_OBJECTS) $(showconsolefont_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(setvtrgb_OBJECTS) $(setvtrgb_LDADD) $(LIBS) +showconsolefont$(EXEEXT): $(showconsolefont_OBJECTS) $(showconsolefont_DEPENDENCIES) $(EXTRA_showconsolefont_DEPENDENCIES) @rm -f showconsolefont$(EXEEXT) - $(LINK) $(showconsolefont_OBJECTS) $(showconsolefont_LDADD) $(LIBS) -showkey$(EXEEXT): $(showkey_OBJECTS) $(showkey_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(showconsolefont_OBJECTS) $(showconsolefont_LDADD) $(LIBS) +showkey$(EXEEXT): $(showkey_OBJECTS) $(showkey_DEPENDENCIES) $(EXTRA_showkey_DEPENDENCIES) @rm -f showkey$(EXEEXT) - $(LINK) $(showkey_OBJECTS) $(showkey_LDADD) $(LIBS) -spawn_console$(EXEEXT): $(spawn_console_OBJECTS) $(spawn_console_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(showkey_OBJECTS) $(showkey_LDADD) $(LIBS) +spawn_console$(EXEEXT): $(spawn_console_OBJECTS) $(spawn_console_DEPENDENCIES) $(EXTRA_spawn_console_DEPENDENCIES) @rm -f spawn_console$(EXEEXT) - $(LINK) $(spawn_console_OBJECTS) $(spawn_console_LDADD) $(LIBS) -spawn_login$(EXEEXT): $(spawn_login_OBJECTS) $(spawn_login_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(spawn_console_OBJECTS) $(spawn_console_LDADD) $(LIBS) +spawn_login$(EXEEXT): $(spawn_login_OBJECTS) $(spawn_login_DEPENDENCIES) $(EXTRA_spawn_login_DEPENDENCIES) @rm -f spawn_login$(EXEEXT) - $(LINK) $(spawn_login_OBJECTS) $(spawn_login_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(spawn_login_OBJECTS) $(spawn_login_LDADD) $(LIBS) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -645,9 +737,7 @@ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -709,206 +799,276 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` loadunimap-loadunimap.o: loadunimap.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-loadunimap.o -MD -MP -MF $(DEPDIR)/loadunimap-loadunimap.Tpo -c -o loadunimap-loadunimap.o `test -f 'loadunimap.c' || echo '$(srcdir)/'`loadunimap.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-loadunimap.Tpo $(DEPDIR)/loadunimap-loadunimap.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loadunimap.c' object='loadunimap-loadunimap.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-loadunimap.o -MD -MP -MF $(DEPDIR)/loadunimap-loadunimap.Tpo -c -o loadunimap-loadunimap.o `test -f 'loadunimap.c' || echo '$(srcdir)/'`loadunimap.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-loadunimap.Tpo $(DEPDIR)/loadunimap-loadunimap.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loadunimap.c' object='loadunimap-loadunimap.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-loadunimap.o `test -f 'loadunimap.c' || echo '$(srcdir)/'`loadunimap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-loadunimap.o `test -f 'loadunimap.c' || echo '$(srcdir)/'`loadunimap.c loadunimap-loadunimap.obj: loadunimap.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-loadunimap.obj -MD -MP -MF $(DEPDIR)/loadunimap-loadunimap.Tpo -c -o loadunimap-loadunimap.obj `if test -f 'loadunimap.c'; then $(CYGPATH_W) 'loadunimap.c'; else $(CYGPATH_W) '$(srcdir)/loadunimap.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-loadunimap.Tpo $(DEPDIR)/loadunimap-loadunimap.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='loadunimap.c' object='loadunimap-loadunimap.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-loadunimap.obj -MD -MP -MF $(DEPDIR)/loadunimap-loadunimap.Tpo -c -o loadunimap-loadunimap.obj `if test -f 'loadunimap.c'; then $(CYGPATH_W) 'loadunimap.c'; else $(CYGPATH_W) '$(srcdir)/loadunimap.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-loadunimap.Tpo $(DEPDIR)/loadunimap-loadunimap.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='loadunimap.c' object='loadunimap-loadunimap.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-loadunimap.obj `if test -f 'loadunimap.c'; then $(CYGPATH_W) 'loadunimap.c'; else $(CYGPATH_W) '$(srcdir)/loadunimap.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-loadunimap.obj `if test -f 'loadunimap.c'; then $(CYGPATH_W) 'loadunimap.c'; else $(CYGPATH_W) '$(srcdir)/loadunimap.c'; fi` loadunimap-findfile.o: findfile.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-findfile.o -MD -MP -MF $(DEPDIR)/loadunimap-findfile.Tpo -c -o loadunimap-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-findfile.Tpo $(DEPDIR)/loadunimap-findfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='findfile.c' object='loadunimap-findfile.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-findfile.o -MD -MP -MF $(DEPDIR)/loadunimap-findfile.Tpo -c -o loadunimap-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-findfile.Tpo $(DEPDIR)/loadunimap-findfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='findfile.c' object='loadunimap-findfile.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c loadunimap-findfile.obj: findfile.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-findfile.obj -MD -MP -MF $(DEPDIR)/loadunimap-findfile.Tpo -c -o loadunimap-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-findfile.Tpo $(DEPDIR)/loadunimap-findfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='findfile.c' object='loadunimap-findfile.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-findfile.obj -MD -MP -MF $(DEPDIR)/loadunimap-findfile.Tpo -c -o loadunimap-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-findfile.Tpo $(DEPDIR)/loadunimap-findfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='findfile.c' object='loadunimap-findfile.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` loadunimap-psffontop.o: psffontop.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-psffontop.o -MD -MP -MF $(DEPDIR)/loadunimap-psffontop.Tpo -c -o loadunimap-psffontop.o `test -f 'psffontop.c' || echo '$(srcdir)/'`psffontop.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-psffontop.Tpo $(DEPDIR)/loadunimap-psffontop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='psffontop.c' object='loadunimap-psffontop.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-psffontop.o -MD -MP -MF $(DEPDIR)/loadunimap-psffontop.Tpo -c -o loadunimap-psffontop.o `test -f 'psffontop.c' || echo '$(srcdir)/'`psffontop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-psffontop.Tpo $(DEPDIR)/loadunimap-psffontop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psffontop.c' object='loadunimap-psffontop.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-psffontop.o `test -f 'psffontop.c' || echo '$(srcdir)/'`psffontop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-psffontop.o `test -f 'psffontop.c' || echo '$(srcdir)/'`psffontop.c loadunimap-psffontop.obj: psffontop.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-psffontop.obj -MD -MP -MF $(DEPDIR)/loadunimap-psffontop.Tpo -c -o loadunimap-psffontop.obj `if test -f 'psffontop.c'; then $(CYGPATH_W) 'psffontop.c'; else $(CYGPATH_W) '$(srcdir)/psffontop.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-psffontop.Tpo $(DEPDIR)/loadunimap-psffontop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='psffontop.c' object='loadunimap-psffontop.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-psffontop.obj -MD -MP -MF $(DEPDIR)/loadunimap-psffontop.Tpo -c -o loadunimap-psffontop.obj `if test -f 'psffontop.c'; then $(CYGPATH_W) 'psffontop.c'; else $(CYGPATH_W) '$(srcdir)/psffontop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-psffontop.Tpo $(DEPDIR)/loadunimap-psffontop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psffontop.c' object='loadunimap-psffontop.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-psffontop.obj `if test -f 'psffontop.c'; then $(CYGPATH_W) 'psffontop.c'; else $(CYGPATH_W) '$(srcdir)/psffontop.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-psffontop.obj `if test -f 'psffontop.c'; then $(CYGPATH_W) 'psffontop.c'; else $(CYGPATH_W) '$(srcdir)/psffontop.c'; fi` loadunimap-utf8.o: utf8.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-utf8.o -MD -MP -MF $(DEPDIR)/loadunimap-utf8.Tpo -c -o loadunimap-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-utf8.Tpo $(DEPDIR)/loadunimap-utf8.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utf8.c' object='loadunimap-utf8.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-utf8.o -MD -MP -MF $(DEPDIR)/loadunimap-utf8.Tpo -c -o loadunimap-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-utf8.Tpo $(DEPDIR)/loadunimap-utf8.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8.c' object='loadunimap-utf8.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c loadunimap-utf8.obj: utf8.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-utf8.obj -MD -MP -MF $(DEPDIR)/loadunimap-utf8.Tpo -c -o loadunimap-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-utf8.Tpo $(DEPDIR)/loadunimap-utf8.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utf8.c' object='loadunimap-utf8.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-utf8.obj -MD -MP -MF $(DEPDIR)/loadunimap-utf8.Tpo -c -o loadunimap-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-utf8.Tpo $(DEPDIR)/loadunimap-utf8.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8.c' object='loadunimap-utf8.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` loadunimap-xmalloc.o: xmalloc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-xmalloc.o -MD -MP -MF $(DEPDIR)/loadunimap-xmalloc.Tpo -c -o loadunimap-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-xmalloc.Tpo $(DEPDIR)/loadunimap-xmalloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='loadunimap-xmalloc.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-xmalloc.o -MD -MP -MF $(DEPDIR)/loadunimap-xmalloc.Tpo -c -o loadunimap-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-xmalloc.Tpo $(DEPDIR)/loadunimap-xmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmalloc.c' object='loadunimap-xmalloc.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c loadunimap-xmalloc.obj: xmalloc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-xmalloc.obj -MD -MP -MF $(DEPDIR)/loadunimap-xmalloc.Tpo -c -o loadunimap-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-xmalloc.Tpo $(DEPDIR)/loadunimap-xmalloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='loadunimap-xmalloc.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-xmalloc.obj -MD -MP -MF $(DEPDIR)/loadunimap-xmalloc.Tpo -c -o loadunimap-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-xmalloc.Tpo $(DEPDIR)/loadunimap-xmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmalloc.c' object='loadunimap-xmalloc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` loadunimap-getfd.o: getfd.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-getfd.o -MD -MP -MF $(DEPDIR)/loadunimap-getfd.Tpo -c -o loadunimap-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-getfd.Tpo $(DEPDIR)/loadunimap-getfd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getfd.c' object='loadunimap-getfd.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-getfd.o -MD -MP -MF $(DEPDIR)/loadunimap-getfd.Tpo -c -o loadunimap-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-getfd.Tpo $(DEPDIR)/loadunimap-getfd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getfd.c' object='loadunimap-getfd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c loadunimap-getfd.obj: getfd.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-getfd.obj -MD -MP -MF $(DEPDIR)/loadunimap-getfd.Tpo -c -o loadunimap-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-getfd.Tpo $(DEPDIR)/loadunimap-getfd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getfd.c' object='loadunimap-getfd.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-getfd.obj -MD -MP -MF $(DEPDIR)/loadunimap-getfd.Tpo -c -o loadunimap-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-getfd.Tpo $(DEPDIR)/loadunimap-getfd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getfd.c' object='loadunimap-getfd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` loadunimap-kdmapop.o: kdmapop.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-kdmapop.o -MD -MP -MF $(DEPDIR)/loadunimap-kdmapop.Tpo -c -o loadunimap-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-kdmapop.Tpo $(DEPDIR)/loadunimap-kdmapop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdmapop.c' object='loadunimap-kdmapop.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-kdmapop.o -MD -MP -MF $(DEPDIR)/loadunimap-kdmapop.Tpo -c -o loadunimap-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-kdmapop.Tpo $(DEPDIR)/loadunimap-kdmapop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kdmapop.c' object='loadunimap-kdmapop.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c loadunimap-kdmapop.obj: kdmapop.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-kdmapop.obj -MD -MP -MF $(DEPDIR)/loadunimap-kdmapop.Tpo -c -o loadunimap-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadunimap-kdmapop.Tpo $(DEPDIR)/loadunimap-kdmapop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdmapop.c' object='loadunimap-kdmapop.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -MT loadunimap-kdmapop.obj -MD -MP -MF $(DEPDIR)/loadunimap-kdmapop.Tpo -c -o loadunimap-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadunimap-kdmapop.Tpo $(DEPDIR)/loadunimap-kdmapop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kdmapop.c' object='loadunimap-kdmapop.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadunimap_CFLAGS) $(CFLAGS) -c -o loadunimap-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` mapscrn-mapscrn.o: mapscrn.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-mapscrn.o -MD -MP -MF $(DEPDIR)/mapscrn-mapscrn.Tpo -c -o mapscrn-mapscrn.o `test -f 'mapscrn.c' || echo '$(srcdir)/'`mapscrn.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-mapscrn.Tpo $(DEPDIR)/mapscrn-mapscrn.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mapscrn.c' object='mapscrn-mapscrn.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-mapscrn.o -MD -MP -MF $(DEPDIR)/mapscrn-mapscrn.Tpo -c -o mapscrn-mapscrn.o `test -f 'mapscrn.c' || echo '$(srcdir)/'`mapscrn.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-mapscrn.Tpo $(DEPDIR)/mapscrn-mapscrn.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapscrn.c' object='mapscrn-mapscrn.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-mapscrn.o `test -f 'mapscrn.c' || echo '$(srcdir)/'`mapscrn.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-mapscrn.o `test -f 'mapscrn.c' || echo '$(srcdir)/'`mapscrn.c mapscrn-mapscrn.obj: mapscrn.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-mapscrn.obj -MD -MP -MF $(DEPDIR)/mapscrn-mapscrn.Tpo -c -o mapscrn-mapscrn.obj `if test -f 'mapscrn.c'; then $(CYGPATH_W) 'mapscrn.c'; else $(CYGPATH_W) '$(srcdir)/mapscrn.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-mapscrn.Tpo $(DEPDIR)/mapscrn-mapscrn.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mapscrn.c' object='mapscrn-mapscrn.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-mapscrn.obj -MD -MP -MF $(DEPDIR)/mapscrn-mapscrn.Tpo -c -o mapscrn-mapscrn.obj `if test -f 'mapscrn.c'; then $(CYGPATH_W) 'mapscrn.c'; else $(CYGPATH_W) '$(srcdir)/mapscrn.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-mapscrn.Tpo $(DEPDIR)/mapscrn-mapscrn.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapscrn.c' object='mapscrn-mapscrn.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-mapscrn.obj `if test -f 'mapscrn.c'; then $(CYGPATH_W) 'mapscrn.c'; else $(CYGPATH_W) '$(srcdir)/mapscrn.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-mapscrn.obj `if test -f 'mapscrn.c'; then $(CYGPATH_W) 'mapscrn.c'; else $(CYGPATH_W) '$(srcdir)/mapscrn.c'; fi` mapscrn-findfile.o: findfile.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-findfile.o -MD -MP -MF $(DEPDIR)/mapscrn-findfile.Tpo -c -o mapscrn-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-findfile.Tpo $(DEPDIR)/mapscrn-findfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='findfile.c' object='mapscrn-findfile.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-findfile.o -MD -MP -MF $(DEPDIR)/mapscrn-findfile.Tpo -c -o mapscrn-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-findfile.Tpo $(DEPDIR)/mapscrn-findfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='findfile.c' object='mapscrn-findfile.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-findfile.o `test -f 'findfile.c' || echo '$(srcdir)/'`findfile.c mapscrn-findfile.obj: findfile.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-findfile.obj -MD -MP -MF $(DEPDIR)/mapscrn-findfile.Tpo -c -o mapscrn-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-findfile.Tpo $(DEPDIR)/mapscrn-findfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='findfile.c' object='mapscrn-findfile.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-findfile.obj -MD -MP -MF $(DEPDIR)/mapscrn-findfile.Tpo -c -o mapscrn-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-findfile.Tpo $(DEPDIR)/mapscrn-findfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='findfile.c' object='mapscrn-findfile.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-findfile.obj `if test -f 'findfile.c'; then $(CYGPATH_W) 'findfile.c'; else $(CYGPATH_W) '$(srcdir)/findfile.c'; fi` mapscrn-utf8.o: utf8.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-utf8.o -MD -MP -MF $(DEPDIR)/mapscrn-utf8.Tpo -c -o mapscrn-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-utf8.Tpo $(DEPDIR)/mapscrn-utf8.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utf8.c' object='mapscrn-utf8.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-utf8.o -MD -MP -MF $(DEPDIR)/mapscrn-utf8.Tpo -c -o mapscrn-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-utf8.Tpo $(DEPDIR)/mapscrn-utf8.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8.c' object='mapscrn-utf8.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c mapscrn-utf8.obj: utf8.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-utf8.obj -MD -MP -MF $(DEPDIR)/mapscrn-utf8.Tpo -c -o mapscrn-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-utf8.Tpo $(DEPDIR)/mapscrn-utf8.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utf8.c' object='mapscrn-utf8.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-utf8.obj -MD -MP -MF $(DEPDIR)/mapscrn-utf8.Tpo -c -o mapscrn-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-utf8.Tpo $(DEPDIR)/mapscrn-utf8.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utf8.c' object='mapscrn-utf8.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` mapscrn-xmalloc.o: xmalloc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-xmalloc.o -MD -MP -MF $(DEPDIR)/mapscrn-xmalloc.Tpo -c -o mapscrn-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-xmalloc.Tpo $(DEPDIR)/mapscrn-xmalloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='mapscrn-xmalloc.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-xmalloc.o -MD -MP -MF $(DEPDIR)/mapscrn-xmalloc.Tpo -c -o mapscrn-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-xmalloc.Tpo $(DEPDIR)/mapscrn-xmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmalloc.c' object='mapscrn-xmalloc.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c mapscrn-xmalloc.obj: xmalloc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-xmalloc.obj -MD -MP -MF $(DEPDIR)/mapscrn-xmalloc.Tpo -c -o mapscrn-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-xmalloc.Tpo $(DEPDIR)/mapscrn-xmalloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmalloc.c' object='mapscrn-xmalloc.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-xmalloc.obj -MD -MP -MF $(DEPDIR)/mapscrn-xmalloc.Tpo -c -o mapscrn-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-xmalloc.Tpo $(DEPDIR)/mapscrn-xmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmalloc.c' object='mapscrn-xmalloc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` mapscrn-getfd.o: getfd.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-getfd.o -MD -MP -MF $(DEPDIR)/mapscrn-getfd.Tpo -c -o mapscrn-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-getfd.Tpo $(DEPDIR)/mapscrn-getfd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getfd.c' object='mapscrn-getfd.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-getfd.o -MD -MP -MF $(DEPDIR)/mapscrn-getfd.Tpo -c -o mapscrn-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-getfd.Tpo $(DEPDIR)/mapscrn-getfd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getfd.c' object='mapscrn-getfd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-getfd.o `test -f 'getfd.c' || echo '$(srcdir)/'`getfd.c mapscrn-getfd.obj: getfd.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-getfd.obj -MD -MP -MF $(DEPDIR)/mapscrn-getfd.Tpo -c -o mapscrn-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-getfd.Tpo $(DEPDIR)/mapscrn-getfd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getfd.c' object='mapscrn-getfd.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-getfd.obj -MD -MP -MF $(DEPDIR)/mapscrn-getfd.Tpo -c -o mapscrn-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-getfd.Tpo $(DEPDIR)/mapscrn-getfd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getfd.c' object='mapscrn-getfd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-getfd.obj `if test -f 'getfd.c'; then $(CYGPATH_W) 'getfd.c'; else $(CYGPATH_W) '$(srcdir)/getfd.c'; fi` mapscrn-kdmapop.o: kdmapop.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-kdmapop.o -MD -MP -MF $(DEPDIR)/mapscrn-kdmapop.Tpo -c -o mapscrn-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-kdmapop.Tpo $(DEPDIR)/mapscrn-kdmapop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdmapop.c' object='mapscrn-kdmapop.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-kdmapop.o -MD -MP -MF $(DEPDIR)/mapscrn-kdmapop.Tpo -c -o mapscrn-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-kdmapop.Tpo $(DEPDIR)/mapscrn-kdmapop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kdmapop.c' object='mapscrn-kdmapop.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-kdmapop.o `test -f 'kdmapop.c' || echo '$(srcdir)/'`kdmapop.c mapscrn-kdmapop.obj: kdmapop.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-kdmapop.obj -MD -MP -MF $(DEPDIR)/mapscrn-kdmapop.Tpo -c -o mapscrn-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mapscrn-kdmapop.Tpo $(DEPDIR)/mapscrn-kdmapop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kdmapop.c' object='mapscrn-kdmapop.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -MT mapscrn-kdmapop.obj -MD -MP -MF $(DEPDIR)/mapscrn-kdmapop.Tpo -c -o mapscrn-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mapscrn-kdmapop.Tpo $(DEPDIR)/mapscrn-kdmapop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kdmapop.c' object='mapscrn-kdmapop.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapscrn_CFLAGS) $(CFLAGS) -c -o mapscrn-kdmapop.obj `if test -f 'kdmapop.c'; then $(CYGPATH_W) 'kdmapop.c'; else $(CYGPATH_W) '$(srcdir)/kdmapop.c'; fi` .l.c: - $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) + $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) .y.c: - $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) + $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -920,10 +1080,23 @@ mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -942,7 +1115,7 @@ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -992,29 +1165,60 @@ || exit 1; \ fi; \ done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(PROGRAMS) $(SCRIPTS) -installdirs: +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am + $(MAKE) $(AM_MAKEFLAGS) install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1030,92 +1234,97 @@ -rm -f loadkeys.c -rm -f loadkeys.h -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am +clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: install-data-am: -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS -.MAKE: all check install install-am install-exec-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dist_binSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-exec-hook install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-dist_binSCRIPTS +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ + ctags-recursive install install-am install-exec-am \ + install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am \ + install-dist_binSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-dist_binSCRIPTS +loadkeys.analyze.h: loadkeys.analyze.c ; @true install-exec-hook: for i in psfaddtable psfgettable psfstriptable; do \ diff -Nru kbd-1.15.3/src/getfd.c kbd-1.15.5/src/getfd.c --- kbd-1.15.3/src/getfd.c 2011-03-05 14:41:20.000000000 +0000 +++ kbd-1.15.5/src/getfd.c 2012-12-01 21:41:38.000000000 +0000 @@ -8,6 +8,16 @@ #include "nls.h" #include "getfd.h" +static char *conspath[] = { + "/proc/self/fd/0", + "/dev/tty", + "/dev/tty0", + "/dev/vc/0", + "/dev/systty", + "/dev/console", + NULL +}; + /* * getfd.c * @@ -41,44 +51,30 @@ fd = open(fnam, O_RDONLY); if (fd < 0) return -1; - if (!is_a_console(fd)) { - close(fd); - return -1; - } return fd; } -int getfd(const char *fnam) { - int fd; +int +getfd(const char *fnam) { + int fd, i; if (fnam) { - fd = open_a_console(fnam); - if (fd >= 0) - return fd; - fprintf(stderr, - _("Couldn't open %s\n"), fnam); + if ((fd = open_a_console(fnam)) >= 0) { + if (is_a_console(fd)) + return fd; + close(fd); + } + fprintf(stderr, _("Couldn't open %s\n"), fnam); exit(1); } - fd = open_a_console("/proc/self/fd/0"); - if (fd >= 0) - return fd; - - fd = open_a_console("/dev/tty"); - if (fd >= 0) - return fd; - - fd = open_a_console("/dev/tty0"); - if (fd >= 0) - return fd; - - fd = open_a_console("/dev/vc/0"); - if (fd >= 0) - return fd; - - fd = open_a_console("/dev/console"); - if (fd >= 0) - return fd; + for (i = 0; conspath[i]; i++) { + if ((fd = open_a_console(conspath[i])) >= 0) { + if (is_a_console(fd)) + return fd; + close(fd); + } + } for (fd = 0; fd < 3; fd++) if (is_a_console(fd)) @@ -86,5 +82,7 @@ fprintf(stderr, _("Couldn't get a file descriptor referring to the console\n")); - exit(1); /* total failure */ + + /* total failure */ + exit(1); } diff -Nru kbd-1.15.3/src/loadkeys.analyze.c kbd-1.15.5/src/loadkeys.analyze.c --- kbd-1.15.3/src/loadkeys.analyze.c 2011-04-27 12:24:02.000000000 +0000 +++ kbd-1.15.5/src/loadkeys.analyze.c 2012-12-02 17:10:54.000000000 +0000 @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_SUBMINOR_VERSION 37 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -118,6 +118,22 @@ */ #define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#ifndef YY_GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_MINOR__ +# define YY_GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define YY_GNUC_PREREQ(maj, min) 0 +# endif +# if YY_GNUC_PREREQ(2, 5) +# define YY_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_NORETURN /* __attribute__ ((__noreturn__)) */ +# define YY_ATTRIBUTE_UNUSED /* __attribute__ ((__unused__)) */ +# endif +#endif + /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. @@ -153,7 +169,12 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int yyleng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; extern FILE *yyin, *yyout; @@ -179,11 +200,6 @@ #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -201,7 +217,7 @@ /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -271,8 +287,8 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -300,7 +316,7 @@ YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -332,7 +348,7 @@ /* Begin user sect3 */ -#define yywrap(n) 1 +#define yywrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -351,11 +367,7 @@ static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static int yy_get_next_buffer (void ); -#ifdef __GNUC__ -static void yy_fatal_error (yyconst char msg[] ) __attribute__((noreturn)); -#else -static void yy_fatal_error (yyconst char msg[] ); -#endif +static void yy_fatal_error (yyconst char msg[] ) YY_ATTRIBUTE_NORETURN; /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -796,7 +808,7 @@ char *yytext; #line 1 "loadkeys.analyze.l" #define YY_NO_INPUT 1 -#line 5 "loadkeys.analyze.l" +#line 7 "loadkeys.analyze.l" #define YY_NO_INPUT 1 #include @@ -835,7 +847,9 @@ char *filename = NULL; int line_nr = 1; -static int infile_stack_ptr = -1; + +static int infile_stack_ptr = -1; +static int state_ptr = 0; void stack_push(FILE *fd, int is_pipe, char *fname) { if (infile_stack_ptr >= MAX_INCLUDE_DEPTH) @@ -1040,7 +1054,7 @@ -#line 1044 "loadkeys.analyze.c" +#line 1058 "loadkeys.analyze.c" #define INITIAL 0 #define RVALUE 1 @@ -1082,7 +1096,7 @@ void yyset_out (FILE * out_str ); -int yyget_leng (void ); +yy_size_t yyget_leng (void ); char *yyget_text (void ); @@ -1120,6 +1134,14 @@ #endif + static int yy_start_stack_ptr = 0; + static int yy_start_stack_depth = 0; + static int *yy_start_stack = NULL; + + static void yy_push_state (int new_state ); + + static void yy_pop_state (void ); + /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE #define YY_READ_BUF_SIZE 8192 @@ -1223,7 +1245,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 283 "loadkeys.analyze.l" +#line 287 "loadkeys.analyze.l" /* To protect from wrong code in the higher level parser (loadkeys.y), @@ -1239,7 +1261,7 @@ yylval = YYLVAL_UNDEF; -#line 1243 "loadkeys.analyze.c" +#line 1265 "loadkeys.analyze.c" if ( !(yy_init) ) { @@ -1283,7 +1305,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1324,35 +1346,36 @@ case 1: YY_RULE_SETUP -#line 298 "loadkeys.analyze.l" +#line 302 "loadkeys.analyze.l" { - BEGIN(INCLSTR); + yy_push_state(INCLSTR); + state_ptr++; } YY_BREAK case 2: YY_RULE_SETUP -#line 301 "loadkeys.analyze.l" +#line 306 "loadkeys.analyze.l" { char *s = xstrndup(yytext+1, strlen(yytext)-2); /* use static pathname to store *s ? */ open_include(s); - BEGIN(0); + yy_pop_state(); + state_ptr--; } YY_BREAK case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 307 "loadkeys.analyze.l" +#line 313 "loadkeys.analyze.l" { yyerror(_("expected filename between quotes")); - BEGIN(0); } YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(RVALUE): case YY_STATE_EOF(STR): case YY_STATE_EOF(INCLSTR): -#line 311 "loadkeys.analyze.l" +#line 316 "loadkeys.analyze.l" { stack_pop(); if (!YY_CURRENT_BUFFER) @@ -1362,7 +1385,7 @@ case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 316 "loadkeys.analyze.l" +#line 321 "loadkeys.analyze.l" { line_nr++; } @@ -1370,16 +1393,19 @@ case 5: /* rule 5 can match eol */ YY_RULE_SETUP -#line 319 "loadkeys.analyze.l" +#line 324 "loadkeys.analyze.l" { line_nr++; - BEGIN(0); + if (state_ptr > 0) { + yy_pop_state(); + state_ptr--; + } return(EOL); } YY_BREAK case 6: YY_RULE_SETUP -#line 324 "loadkeys.analyze.l" +#line 332 "loadkeys.analyze.l" ; /* do nothing */ YY_BREAK case 7: @@ -1388,37 +1414,40 @@ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 325 "loadkeys.analyze.l" +#line 333 "loadkeys.analyze.l" ; /* do nothing */ YY_BREAK case 8: YY_RULE_SETUP -#line 326 "loadkeys.analyze.l" +#line 334 "loadkeys.analyze.l" { - BEGIN(RVALUE); + yy_push_state(RVALUE); + state_ptr++; rvalct = 0; return(EQUALS); } YY_BREAK case 9: YY_RULE_SETUP -#line 331 "loadkeys.analyze.l" +#line 340 "loadkeys.analyze.l" { - BEGIN(RVALUE); + yy_push_state(RVALUE); + state_ptr++; return(STRING); } YY_BREAK case 10: YY_RULE_SETUP -#line 335 "loadkeys.analyze.l" +#line 345 "loadkeys.analyze.l" { - BEGIN(RVALUE); + yy_push_state(RVALUE); + state_ptr++; return(TO); } YY_BREAK case 11: YY_RULE_SETUP -#line 339 "loadkeys.analyze.l" +#line 350 "loadkeys.analyze.l" { yylval = strtol(yytext + 1, NULL, 16); if (yylval >= 0xf000) @@ -1428,7 +1457,7 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 345 "loadkeys.analyze.l" +#line 356 "loadkeys.analyze.l" { yylval = strtol(yytext, NULL, 0); return(NUMBER); @@ -1436,127 +1465,127 @@ YY_BREAK case 13: YY_RULE_SETUP -#line 349 "loadkeys.analyze.l" +#line 360 "loadkeys.analyze.l" { return((yylval = ksymtocode(yytext, TO_AUTO)) == -1 ? ERROR : LITERAL); } YY_BREAK case 14: YY_RULE_SETUP -#line 350 "loadkeys.analyze.l" +#line 361 "loadkeys.analyze.l" { return(DASH); } YY_BREAK case 15: YY_RULE_SETUP -#line 351 "loadkeys.analyze.l" +#line 362 "loadkeys.analyze.l" { return(COMMA); } YY_BREAK case 16: YY_RULE_SETUP -#line 352 "loadkeys.analyze.l" +#line 363 "loadkeys.analyze.l" { return(PLUS); } YY_BREAK case 17: YY_RULE_SETUP -#line 353 "loadkeys.analyze.l" +#line 364 "loadkeys.analyze.l" { return(CHARSET); } YY_BREAK case 18: YY_RULE_SETUP -#line 354 "loadkeys.analyze.l" +#line 365 "loadkeys.analyze.l" { return(KEYMAPS); } YY_BREAK case 19: YY_RULE_SETUP -#line 355 "loadkeys.analyze.l" +#line 366 "loadkeys.analyze.l" { return(KEYCODE); } YY_BREAK case 20: YY_RULE_SETUP -#line 356 "loadkeys.analyze.l" +#line 367 "loadkeys.analyze.l" { return(PLAIN); } YY_BREAK case 21: YY_RULE_SETUP -#line 357 "loadkeys.analyze.l" +#line 368 "loadkeys.analyze.l" { return(SHIFT); } YY_BREAK case 22: YY_RULE_SETUP -#line 358 "loadkeys.analyze.l" +#line 369 "loadkeys.analyze.l" { return(CONTROL); } YY_BREAK case 23: YY_RULE_SETUP -#line 359 "loadkeys.analyze.l" +#line 370 "loadkeys.analyze.l" { return(ALT); } YY_BREAK case 24: YY_RULE_SETUP -#line 360 "loadkeys.analyze.l" +#line 371 "loadkeys.analyze.l" { return(ALTGR); } YY_BREAK case 25: YY_RULE_SETUP -#line 361 "loadkeys.analyze.l" +#line 372 "loadkeys.analyze.l" { return(SHIFTL); } YY_BREAK case 26: YY_RULE_SETUP -#line 362 "loadkeys.analyze.l" +#line 373 "loadkeys.analyze.l" { return(SHIFTR); } YY_BREAK case 27: YY_RULE_SETUP -#line 363 "loadkeys.analyze.l" +#line 374 "loadkeys.analyze.l" { return(CTRLL); } YY_BREAK case 28: YY_RULE_SETUP -#line 364 "loadkeys.analyze.l" +#line 375 "loadkeys.analyze.l" { return(CTRLR); } YY_BREAK case 29: YY_RULE_SETUP -#line 365 "loadkeys.analyze.l" +#line 376 "loadkeys.analyze.l" { return(CAPSSHIFT); } YY_BREAK case 30: YY_RULE_SETUP -#line 366 "loadkeys.analyze.l" +#line 377 "loadkeys.analyze.l" { return(ALT_IS_META); } YY_BREAK case 31: YY_RULE_SETUP -#line 367 "loadkeys.analyze.l" +#line 378 "loadkeys.analyze.l" { return(STRINGS); } YY_BREAK case 32: YY_RULE_SETUP -#line 368 "loadkeys.analyze.l" +#line 379 "loadkeys.analyze.l" { return(COMPOSE); } YY_BREAK case 33: YY_RULE_SETUP -#line 369 "loadkeys.analyze.l" +#line 380 "loadkeys.analyze.l" { return(AS); } YY_BREAK case 34: YY_RULE_SETUP -#line 370 "loadkeys.analyze.l" +#line 381 "loadkeys.analyze.l" { return(USUAL); } YY_BREAK case 35: YY_RULE_SETUP -#line 371 "loadkeys.analyze.l" +#line 382 "loadkeys.analyze.l" { return(ON); } YY_BREAK case 36: YY_RULE_SETUP -#line 372 "loadkeys.analyze.l" +#line 383 "loadkeys.analyze.l" { return(FOR); } YY_BREAK case 37: YY_RULE_SETUP -#line 373 "loadkeys.analyze.l" +#line 384 "loadkeys.analyze.l" { yylval = strtol(yytext + 2, NULL, 8); return(CCHAR); @@ -1564,7 +1593,7 @@ YY_BREAK case 38: YY_RULE_SETUP -#line 377 "loadkeys.analyze.l" +#line 388 "loadkeys.analyze.l" { yylval = (unsigned char) yytext[2]; return(CCHAR); @@ -1572,7 +1601,7 @@ YY_BREAK case 39: YY_RULE_SETUP -#line 381 "loadkeys.analyze.l" +#line 392 "loadkeys.analyze.l" { yylval = (unsigned char) yytext[1]; return(CCHAR); @@ -1580,16 +1609,17 @@ YY_BREAK case 40: YY_RULE_SETUP -#line 385 "loadkeys.analyze.l" +#line 396 "loadkeys.analyze.l" { p = (char *) kbs_buf.kb_string; pmax = p + sizeof(kbs_buf.kb_string) - 1; - BEGIN(STR); + yy_push_state(STR); + state_ptr++; } YY_BREAK case 41: YY_RULE_SETUP -#line 390 "loadkeys.analyze.l" +#line 402 "loadkeys.analyze.l" { if (p >= pmax) lkfatal(_("string too long")); @@ -1598,7 +1628,7 @@ YY_BREAK case 42: YY_RULE_SETUP -#line 395 "loadkeys.analyze.l" +#line 407 "loadkeys.analyze.l" { if (p >= pmax) lkfatal(_("string too long")); @@ -1607,7 +1637,7 @@ YY_BREAK case 43: YY_RULE_SETUP -#line 400 "loadkeys.analyze.l" +#line 412 "loadkeys.analyze.l" { if (p >= pmax) lkfatal(_("string too long")); @@ -1616,7 +1646,7 @@ YY_BREAK case 44: YY_RULE_SETUP -#line 405 "loadkeys.analyze.l" +#line 417 "loadkeys.analyze.l" { if (p >= pmax) lkfatal(_("string too long")); @@ -1626,7 +1656,7 @@ case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 410 "loadkeys.analyze.l" +#line 422 "loadkeys.analyze.l" { char *ptmp = p; p += strlen(yytext); @@ -1637,26 +1667,27 @@ YY_BREAK case 46: YY_RULE_SETUP -#line 417 "loadkeys.analyze.l" +#line 429 "loadkeys.analyze.l" { *p = '\0'; - BEGIN(0); + yy_pop_state(); + state_ptr--; return(STRLITERAL); } YY_BREAK case 47: YY_RULE_SETUP -#line 422 "loadkeys.analyze.l" +#line 435 "loadkeys.analyze.l" { return(ERROR); /* report any unknown characters */ } YY_BREAK case 48: YY_RULE_SETUP -#line 425 "loadkeys.analyze.l" +#line 438 "loadkeys.analyze.l" ECHO; YY_BREAK -#line 1660 "loadkeys.analyze.c" +#line 1691 "loadkeys.analyze.c" case YY_END_OF_BUFFER: { @@ -1840,21 +1871,21 @@ else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1885,7 +1916,7 @@ /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1980,7 +2011,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 503); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } #ifndef YY_NO_INPUT @@ -2007,7 +2038,7 @@ else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2167,10 +2198,6 @@ yyfree((void *) b ); } -#if defined(YY_NO_UNISTD_H) && !defined(__cplusplus) -extern int isatty (int ); -#endif /* YY_NO_UNISTD_H && !__cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -2283,7 +2310,7 @@ */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -2380,12 +2407,12 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -2410,13 +2437,45 @@ return b; } + static void yy_push_state (int new_state ) +{ + if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) ) + { + yy_size_t new_size; + + (yy_start_stack_depth) += YY_START_STACK_INCR; + new_size = (yy_start_stack_depth) * sizeof( int ); + + if ( ! (yy_start_stack) ) + (yy_start_stack) = (int *) yyalloc(new_size ); + + else + (yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size ); + + if ( ! (yy_start_stack) ) + YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); + } + + (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; + + BEGIN(new_state); +} + + static void yy_pop_state (void) +{ + if ( --(yy_start_stack_ptr) < 0 ) + YY_FATAL_ERROR( "start-condition stack underflow" ); + + BEGIN((yy_start_stack)[(yy_start_stack_ptr)]); +} + #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yy_fatal_error (yyconst char* msg YY_ATTRIBUTE_UNUSED) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2467,7 +2526,7 @@ /** Get the length of the current token. * */ -int yyget_leng (void) +yy_size_t yyget_leng (void) { return yyleng; } @@ -2530,6 +2589,10 @@ (yy_init) = 0; (yy_start) = 0; + (yy_start_stack_ptr) = 0; + (yy_start_stack_depth) = 0; + (yy_start_stack) = NULL; + /* Defined in main.c */ #ifdef YY_STDINIT yyin = stdin; @@ -2560,6 +2623,10 @@ yyfree((yy_buffer_stack) ); (yy_buffer_stack) = NULL; + /* Destroy the start condition stack. */ + yyfree((yy_start_stack) ); + (yy_start_stack) = NULL; + /* Reset the globals. This is important in a non-reentrant scanner so the next time * yylex() is called, initialization will occur. */ yy_init_globals( ); @@ -2572,7 +2639,7 @@ */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n YY_ATTRIBUTE_UNUSED) { register int i; for ( i = 0; i < n; ++i ) @@ -2581,7 +2648,7 @@ #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (yyconst char * s YY_ATTRIBUTE_UNUSED) { register int n; for ( n = 0; s[n]; ++n ) @@ -2591,12 +2658,12 @@ } #endif -void *yyalloc (yy_size_t size ) +void *yyalloc (yy_size_t size YY_ATTRIBUTE_UNUSED) { return (void *) malloc( size ); } -void *yyrealloc (void * ptr, yy_size_t size ) +void *yyrealloc (void * ptr, yy_size_t size YY_ATTRIBUTE_UNUSED) { /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those @@ -2608,14 +2675,14 @@ return (void *) realloc( (char *) ptr, size ); } -void yyfree (void * ptr ) +void yyfree (void * ptr YY_ATTRIBUTE_UNUSED) { free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 425 "loadkeys.analyze.l" +#line 438 "loadkeys.analyze.l" diff -Nru kbd-1.15.3/src/loadkeys.analyze.h kbd-1.15.5/src/loadkeys.analyze.h --- kbd-1.15.3/src/loadkeys.analyze.h 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/loadkeys.analyze.h 2012-12-02 17:10:54.000000000 +0000 @@ -0,0 +1,339 @@ +#ifndef yyHEADER_H +#define yyHEADER_H 1 +#define yyIN_HEADER 1 + +#line 6 "/tmp/kbd-1.15.4/src/loadkeys.analyze.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 37 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +#ifndef YY_GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_MINOR__ +# define YY_GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define YY_GNUC_PREREQ(maj, min) 0 +# endif +# if YY_GNUC_PREREQ(2, 5) +# define YY_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_NORETURN /* __attribute__ ((__noreturn__)) */ +# define YY_ATTRIBUTE_UNUSED /* __attribute__ ((__unused__)) */ +# endif +#endif + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; + +extern FILE *yyin, *yyout; + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); + +/* Begin user sect3 */ + +#define yywrap() 1 +#define YY_SKIP_YYWRAP + +extern int yylineno; + +extern char *yytext; +#define yytext_ptr yytext + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define RVALUE 1 +#define STR 2 +#define INCLSTR 3 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (void ); + +int yyget_debug (void ); + +void yyset_debug (int debug_flag ); + +YY_EXTRA_TYPE yyget_extra (void ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *yyget_in (void ); + +void yyset_in (FILE * in_str ); + +FILE *yyget_out (void ); + +void yyset_out (FILE * out_str ); + +yy_size_t yyget_leng (void ); + +char *yyget_text (void ); + +int yyget_lineno (void ); + +void yyset_lineno (int line_number ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (void ); +#else +extern int yywrap (void ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#line 438 "/tmp/kbd-1.15.4/src/loadkeys.analyze.l" + + +#line 338 "/tmp/kbd-1.15.4/src/loadkeys.analyze.h" +#undef yyIN_HEADER +#endif /* yyHEADER_H */ diff -Nru kbd-1.15.3/src/loadkeys.analyze.l kbd-1.15.5/src/loadkeys.analyze.l --- kbd-1.15.3/src/loadkeys.analyze.l 2011-04-26 20:29:35.000000000 +0000 +++ kbd-1.15.5/src/loadkeys.analyze.l 2012-12-01 21:41:38.000000000 +0000 @@ -1,3 +1,5 @@ +%option stack +%option noyy_top_state %option noyywrap %option nounput %option noinput @@ -40,7 +42,9 @@ char *filename = NULL; int line_nr = 1; -static int infile_stack_ptr = -1; + +static int infile_stack_ptr = -1; +static int state_ptr = 0; void stack_push(FILE *fd, int is_pipe, char *fname) { if (infile_stack_ptr >= MAX_INCLUDE_DEPTH) @@ -296,17 +300,18 @@ %} {Include} { - BEGIN(INCLSTR); + yy_push_state(INCLSTR); + state_ptr++; } \"[^\"\n]+\" { char *s = xstrndup(yytext+1, strlen(yytext)-2); /* use static pathname to store *s ? */ open_include(s); - BEGIN(0); + yy_pop_state(); + state_ptr--; } [^"]|\"\"|\"[^"\n]*{Eol} { yyerror(_("expected filename between quotes")); - BEGIN(0); } <> { stack_pop(); @@ -318,22 +323,28 @@ } {Eol} { line_nr++; - BEGIN(0); + if (state_ptr > 0) { + yy_pop_state(); + state_ptr--; + } return(EOL); } {Blank}+ ; /* do nothing */ {Comment}.*/{Eol} ; /* do nothing */ {Equals} { - BEGIN(RVALUE); + yy_push_state(RVALUE); + state_ptr++; rvalct = 0; return(EQUALS); } {String} { - BEGIN(RVALUE); + yy_push_state(RVALUE); + state_ptr++; return(STRING); } {To} { - BEGIN(RVALUE); + yy_push_state(RVALUE); + state_ptr++; return(TO); } {Unicode} { @@ -385,7 +396,8 @@ \" { p = (char *) kbs_buf.kb_string; pmax = p + sizeof(kbs_buf.kb_string) - 1; - BEGIN(STR); + yy_push_state(STR); + state_ptr++; } \\{Octa} { if (p >= pmax) @@ -416,7 +428,8 @@ } \" { *p = '\0'; - BEGIN(0); + yy_pop_state(); + state_ptr--; return(STRLITERAL); } . { diff -Nru kbd-1.15.3/src/loadkeys.c kbd-1.15.5/src/loadkeys.c --- kbd-1.15.3/src/loadkeys.c 2011-05-01 23:22:35.000000000 +0000 +++ kbd-1.15.5/src/loadkeys.c 2012-12-02 17:10:54.000000000 +0000 @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.3. */ +/* A Bison parser, made by GNU Bison 2.6.4. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.3" +#define YYBISON_VERSION "2.6.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -59,16 +58,15 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Copy the first part of user declarations. */ - -/* Line 189 of yacc.c */ +/* Line 358 of yacc.c */ #line 12 "loadkeys.y" +#define YY_HEADER_EXPORT_START_CONDITIONS 1 + #include #include #include @@ -92,6 +90,8 @@ #include "nls.h" #include "version.h" +#include "loadkeys.analyze.h" + #define U(x) ((x) ^ 0xf000) #ifdef KDSKBDIACRUC @@ -142,7 +142,6 @@ extern int prefer_unicode; #include "ksyms.h" -int yylex(void); static void attr_noreturn usage(void) { @@ -155,8 +154,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" - " -C --console=\n" - " the console device(s) to be used\n" + " -C --console=file\n" + " the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -411,8 +410,6 @@ j, (key_map[i])[j]); } } - xfree(key_map[i]); - xfree(keymap_was_set[i]); } else if (keymaps_line_seen && !defining[i]) { /* deallocate keymap */ @@ -464,6 +461,15 @@ return ct; } +static void freekeys(void) +{ + int i; + for (i = 0; i < MAX_NR_KEYMAPS; i++) { + xfree(keymap_was_set[i]); + xfree(key_map[i]); + } +} + static char *ostr(char *s) { int lth = strlen(s); @@ -494,27 +500,30 @@ static int deffuncs(int fd) { int i, ct = 0; - char *ptr; + char *ptr, *s; for (i = 0; i < MAX_NR_FUNC; i++) { kbs_buf.kb_func = i; if ((ptr = func_table[i])) { strcpy((char *)kbs_buf.kb_string, ptr); - if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) + if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) { + s = ostr((char *)kbs_buf.kb_string); fprintf(stderr, _("failed to bind string '%s' to function %s\n"), - ostr((char *)kbs_buf.kb_string), - syms[KT_FN].table[kbs_buf.kb_func]); - else + s, syms[KT_FN].table[kbs_buf.kb_func]); + xfree(s); + } else { ct++; + } } else if (opts) { kbs_buf.kb_string[0] = 0; - if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) + if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) { fprintf(stderr, _("failed to clear string %s\n"), syms[KT_FN].table[kbs_buf.kb_func]); - else + } else { ct++; + } } } return ct; @@ -631,12 +640,10 @@ } } -static void loadkeys(char *console, int kbd_mode) +static void loadkeys(int fd, int kbd_mode) { - int fd; int keyct, funcct, diacct = 0; - fd = getfd(console); keyct = defkeys(fd, kbd_mode); funcct = deffuncs(fd); @@ -657,6 +664,8 @@ } else if (verbose) { printf(_("(No change in compose definitions.)\n")); } + + freekeys(); } static void strings_as_usual(void) @@ -897,6 +906,8 @@ } printf("unsigned int accent_table_size = %d;\n", accent_table_size); + freekeys(); + exit(0); } @@ -924,21 +935,25 @@ } } } + freekeys(); exit(0); fail: fprintf(stderr, _("Error writing map to file\n")); + freekeys(); exit(1); } +/* Line 358 of yacc.c */ +#line 949 "loadkeys.c" -/* Line 189 of yacc.c */ -#line 937 "loadkeys.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -948,11 +963,17 @@ # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_Y_TAB_H_INCLUDED +# define YY_YY_Y_TAB_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; #endif - /* Tokens. */ #ifndef YYTOKENTYPE @@ -1032,7 +1053,6 @@ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 @@ -1040,12 +1060,28 @@ # define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; -/* Copy the second part of user declarations. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + +#endif /* !YY_YY_Y_TAB_H_INCLUDED */ +/* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ -#line 1049 "loadkeys.c" +/* Line 377 of yacc.c */ +#line 1085 "loadkeys.c" #ifdef short # undef short @@ -1098,24 +1134,24 @@ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -1148,11 +1184,12 @@ # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -1175,24 +1212,24 @@ # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -1221,23 +1258,7 @@ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of @@ -1257,6 +1278,26 @@ #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ @@ -1350,16 +1391,16 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 877, 877, 878, 880, 881, 882, 883, 884, 885, - 886, 887, 888, 889, 891, 896, 901, 906, 910, 915, - 920, 921, 923, 929, 934, 943, 947, 952, 953, 955, - 955, 962, 967, 968, 970, 971, 972, 973, 974, 975, - 976, 977, 978, 980, 1019, 1020, 1022, 1029, 1030, 1031, - 1032, 1033, 1034 + 0, 894, 894, 895, 897, 898, 899, 900, 901, 902, + 903, 904, 905, 906, 908, 913, 918, 923, 927, 932, + 937, 938, 940, 946, 951, 960, 964, 969, 970, 972, + 972, 979, 984, 985, 987, 988, 989, 990, 991, 992, + 993, 994, 995, 997, 1036, 1037, 1039, 1046, 1047, 1048, + 1049, 1050, 1051 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -1372,7 +1413,7 @@ "$accept", "keytable", "line", "charsetline", "altismetaline", "usualstringsline", "usualcomposeline", "keymapline", "range", "range0", "strline", "compline", "compsym", "singleline", "$@1", "modifiers", - "modifier", "fullline", "rvalue0", "rvalue1", "rvalue", 0 + "modifier", "fullline", "rvalue0", "rvalue1", "rvalue", YY_NULL }; #endif @@ -1410,8 +1451,8 @@ 2, 1, 2 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ static const yytype_uint8 yydefact[] = { @@ -1462,8 +1503,7 @@ /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ + number is the opposite. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { @@ -1478,6 +1518,12 @@ 86, 89, 90, 92, 58, 79, 60 }; +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-49))) + +#define yytable_value_is_error(Yytable_value) \ + YYID (0) + static const yytype_uint8 yycheck[] = { 33, 3, 23, 4, 0, 4, 5, 3, 3, 3, @@ -1534,18 +1580,18 @@ #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ @@ -1555,46 +1601,38 @@ #define YYTERROR 1 #define YYERRCODE 256 - /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ while (YYID (0)) #endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ + + +/* This macro is provided for backward compatibility. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif @@ -1649,6 +1687,8 @@ YYSTYPE const * const yyvaluep; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT @@ -1786,7 +1826,6 @@ # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -1889,115 +1928,142 @@ } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) { - int yyn = yypact[yystate]; + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULL; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) + { + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + switch (yycount) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -2030,25 +2096,21 @@ } } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ + /* The lookahead symbol. */ int yychar; + +#ifndef YYLVAL_INITIALIZE +# define YYLVAL_INITIALIZE() +#endif +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif + /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; @@ -2056,10 +2118,9 @@ int yynerrs; - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -2083,8 +2144,6 @@ #endif #endif { - - int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; @@ -2093,7 +2152,7 @@ `yyss': related to states. `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -2111,7 +2170,7 @@ int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -2129,7 +2188,6 @@ Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; yyss = yyssa; yyvs = yyvsa; yystacksize = YYINITDEPTH; @@ -2148,6 +2206,7 @@ yyssp = yyss; yyvsp = yyvs; + YYLVAL_INITIALIZE (); goto yysetstate; /*------------------------------------------------------------. @@ -2239,7 +2298,7 @@ /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -2270,8 +2329,8 @@ yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -2288,7 +2347,9 @@ yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -2325,63 +2386,56 @@ switch (yyn) { case 14: - -/* Line 1464 of yacc.c */ -#line 892 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 909 "loadkeys.y" { set_charset((char *) kbs_buf.kb_string); } break; case 15: - -/* Line 1464 of yacc.c */ -#line 897 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 914 "loadkeys.y" { alt_is_meta = 1; } break; case 16: - -/* Line 1464 of yacc.c */ -#line 902 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 919 "loadkeys.y" { strings_as_usual(); } break; case 17: - -/* Line 1464 of yacc.c */ -#line 907 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 924 "loadkeys.y" { compose_as_usual((char *) kbs_buf.kb_string); } break; case 18: - -/* Line 1464 of yacc.c */ -#line 911 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 928 "loadkeys.y" { compose_as_usual(0); } break; case 19: - -/* Line 1464 of yacc.c */ -#line 916 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 933 "loadkeys.y" { keymaps_line_seen = 1; } break; case 22: - -/* Line 1464 of yacc.c */ -#line 924 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 941 "loadkeys.y" { int i; for (i = (yyvsp[(1) - (3)]); i <= (yyvsp[(3) - (3)]); i++) @@ -2390,18 +2444,16 @@ break; case 23: - -/* Line 1464 of yacc.c */ -#line 930 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 947 "loadkeys.y" { addmap((yyvsp[(1) - (1)]),1); } break; case 24: - -/* Line 1464 of yacc.c */ -#line 935 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 952 "loadkeys.y" { if (KTYP((yyvsp[(2) - (5)])) != KT_FN) lkfatal(_("'%s' is not a function key symbol"), @@ -2412,131 +2464,114 @@ break; case 25: - -/* Line 1464 of yacc.c */ -#line 944 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 961 "loadkeys.y" { compose((yyvsp[(2) - (6)]), (yyvsp[(3) - (6)]), (yyvsp[(5) - (6)])); } break; case 26: - -/* Line 1464 of yacc.c */ -#line 948 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 965 "loadkeys.y" { compose((yyvsp[(2) - (6)]), (yyvsp[(3) - (6)]), (yyvsp[(5) - (6)])); } break; case 27: - -/* Line 1464 of yacc.c */ -#line 952 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 969 "loadkeys.y" { (yyval) = (yyvsp[(1) - (1)]); } break; case 28: - -/* Line 1464 of yacc.c */ -#line 953 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 970 "loadkeys.y" { (yyval) = (yyvsp[(1) - (1)]) ^ 0xf000; } break; case 29: - -/* Line 1464 of yacc.c */ -#line 955 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 972 "loadkeys.y" { mod = 0; } break; case 30: - -/* Line 1464 of yacc.c */ -#line 959 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 976 "loadkeys.y" { addkey((yyvsp[(4) - (7)]), mod, (yyvsp[(6) - (7)])); } break; case 31: - -/* Line 1464 of yacc.c */ -#line 963 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 980 "loadkeys.y" { addkey((yyvsp[(3) - (6)]), 0, (yyvsp[(5) - (6)])); } break; case 34: - -/* Line 1464 of yacc.c */ -#line 970 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 987 "loadkeys.y" { mod |= M_SHIFT; } break; case 35: - -/* Line 1464 of yacc.c */ -#line 971 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 988 "loadkeys.y" { mod |= M_CTRL; } break; case 36: - -/* Line 1464 of yacc.c */ -#line 972 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 989 "loadkeys.y" { mod |= M_ALT; } break; case 37: - -/* Line 1464 of yacc.c */ -#line 973 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 990 "loadkeys.y" { mod |= M_ALTGR; } break; case 38: - -/* Line 1464 of yacc.c */ -#line 974 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 991 "loadkeys.y" { mod |= M_SHIFTL; } break; case 39: - -/* Line 1464 of yacc.c */ -#line 975 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 992 "loadkeys.y" { mod |= M_SHIFTR; } break; case 40: - -/* Line 1464 of yacc.c */ -#line 976 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 993 "loadkeys.y" { mod |= M_CTRLL; } break; case 41: - -/* Line 1464 of yacc.c */ -#line 977 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 994 "loadkeys.y" { mod |= M_CTRLR; } break; case 42: - -/* Line 1464 of yacc.c */ -#line 978 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 995 "loadkeys.y" { mod |= M_CAPSSHIFT; } break; case 43: - -/* Line 1464 of yacc.c */ -#line 981 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 998 "loadkeys.y" { int i, j; @@ -2576,9 +2611,8 @@ break; case 46: - -/* Line 1464 of yacc.c */ -#line 1023 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1040 "loadkeys.y" { if (rvalct >= MAX_NR_KEYMAPS) lkfatal(_("too many key definitions on one line")); @@ -2587,53 +2621,57 @@ break; case 47: - -/* Line 1464 of yacc.c */ -#line 1029 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1046 "loadkeys.y" { (yyval) = convert_code((yyvsp[(1) - (1)]), TO_AUTO); } break; case 48: - -/* Line 1464 of yacc.c */ -#line 1030 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1047 "loadkeys.y" { (yyval) = add_capslock((yyvsp[(2) - (2)])); } break; case 49: - -/* Line 1464 of yacc.c */ -#line 1031 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1048 "loadkeys.y" { (yyval) = convert_code((yyvsp[(1) - (1)])^0xf000, TO_AUTO); } break; case 50: - -/* Line 1464 of yacc.c */ -#line 1032 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1049 "loadkeys.y" { (yyval) = add_capslock((yyvsp[(2) - (2)])^0xf000); } break; case 51: - -/* Line 1464 of yacc.c */ -#line 1033 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1050 "loadkeys.y" { (yyval) = (yyvsp[(1) - (1)]); } break; case 52: - -/* Line 1464 of yacc.c */ -#line 1034 "loadkeys.y" +/* Line 1813 of yacc.c */ +#line 1051 "loadkeys.y" { (yyval) = add_capslock((yyvsp[(2) - (2)])); } break; - -/* Line 1464 of yacc.c */ -#line 2635 "loadkeys.c" +/* Line 1813 of yacc.c */ +#line 2662 "loadkeys.c" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -2661,6 +2699,10 @@ | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -2668,37 +2710,36 @@ #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } @@ -2757,7 +2798,7 @@ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -2780,7 +2821,9 @@ YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -2804,7 +2847,7 @@ yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2816,8 +2859,13 @@ yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2841,10 +2889,25 @@ } +/* Line 2076 of yacc.c */ +#line 1053 "loadkeys.y" + -/* Line 1684 of yacc.c */ -#line 1036 "loadkeys.y" +static void parse_keymap(FILE *fd) { + if (!quiet && !optm) + fprintf(stdout, _("Loading %s\n"), pathname); + stack_push(fd, 0, pathname); + + if (yyparse()) { + fprintf(stderr, _("syntax error in map file\n")); + + if (!optm) + fprintf(stderr, + _("key bindings not changed\n")); + exit(EXIT_FAILURE); + } +} int main(int argc, char *argv[]) { @@ -2869,6 +2932,8 @@ int kbd_mode; int kd_mode; char *console = NULL; + char *ev; + FILE *f; set_progname(argv[0]); @@ -2901,6 +2966,7 @@ break; case 'u': optu = 1; + prefer_unicode = 1; break; case 'q': quiet = 1; @@ -2923,15 +2989,14 @@ exit(EXIT_FAILURE); } - prefer_unicode = optu; + /* get console */ + fd = getfd(console); if (!optm && !optb) { /* check whether the keyboard is in Unicode mode */ - fd = getfd(console); - - if (ioctl(fd, KDGKBMODE, &kbd_mode)) { - perror("KDGKBMODE"); - fprintf(stderr, _("%s: error reading keyboard mode\n"), + if (ioctl(fd, KDGKBMODE, &kbd_mode) || + ioctl(fd, KDGETMODE, &kd_mode)) { + fprintf(stderr, _("%s: error reading keyboard mode: %m\n"), progname); exit(EXIT_FAILURE); } @@ -2948,39 +3013,39 @@ /* reset -u option if keyboard is in K_UNICODE anyway */ optu = 0; - } else if (optu - && (ioctl(fd, KDGETMODE, &kd_mode) || (kd_mode != KD_GRAPHICS))) + + } else if (optu && kd_mode != KD_GRAPHICS) { fprintf(stderr, _("%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n"), progname); + } + } + + dirpath = dirpath1; + if ((ev = getenv("LOADKEYS_KEYMAP_PATH")) != NULL) { + if (!quiet && !optm) + fprintf(stdout, _("Searching in %s\n"), ev); - close(fd); + dirpath2[0] = ev; + dirpath = dirpath2; } - for (i = optind; argv[i]; i++) { - FILE *f; - char *ev; + if (optd) { + /* first read default map - search starts in . */ - dirpath = dirpath1; - if ((ev = getenv("LOADKEYS_KEYMAP_PATH")) != NULL) { - if (!quiet && !optm) - fprintf(stdout, _("Searching in %s\n"), ev); - - dirpath2[0] = ev; - dirpath = dirpath2; - } - - if (optd) { - /* first read default map - search starts in . */ - optd = 0; - if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) { - fprintf(stderr, _("Cannot find %s\n"), DEFMAP); - exit(EXIT_FAILURE); - } - goto gotf; + if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) { + fprintf(stderr, _("Cannot find %s\n"), DEFMAP); + exit(EXIT_FAILURE); } + parse_keymap(f); + } else if (optind == argc) { + strcpy(pathname, ""); + parse_keymap(stdin); + } + + for (i = optind; argv[i]; i++) { if (!strcmp(argv[i], "-")) { f = stdin; strcpy(pathname, ""); @@ -2990,57 +3055,20 @@ exit(EXIT_FAILURE); } - gotf: - if (!quiet && !optm) - fprintf(stdout, _("Loading %s\n"), pathname); - - stack_push(f, 0, pathname); - - if (yyparse()) { - fprintf(stderr, _("syntax error in map file\n")); - - if (!optm) - fprintf(stderr, - _("key bindings not changed\n")); - exit(EXIT_FAILURE); - } + parse_keymap(f); } do_constant(); - if (optb) { + if (optb) bkeymap(); - } else if (optm) { + if (optm) mktable(); - } else if (console) { - char *buf = strdup(console); /* make writable */ - char *e, *s = buf; - while (*s) { - char ch; - - while (*s == ' ' || *s == '\t' || *s == ',') - s++; - e = s; - while (*e && *e != ' ' && *e != '\t' && *e != ',') - e++; - ch = *e; - *e = '\0'; - - if (verbose) - printf("%s\n", s); - - loadkeys(s, kbd_mode); + loadkeys(fd, kbd_mode); - *e = ch; - s = e; - } - free(buf); + close(fd); - } else { - loadkeys(NULL, kbd_mode); - } exit(EXIT_SUCCESS); } - diff -Nru kbd-1.15.3/src/loadkeys.h kbd-1.15.5/src/loadkeys.h --- kbd-1.15.3/src/loadkeys.h 2011-04-26 20:29:35.000000000 +0000 +++ kbd-1.15.5/src/loadkeys.h 2012-12-02 17:10:54.000000000 +0000 @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.4.3. */ +/* A Bison parser, made by GNU Bison 2.6.4. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,6 +30,15 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +#ifndef YY_YY_LOADKEYS_H_INCLUDED +# define YY_YY_LOADKEYS_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif /* Tokens. */ #ifndef YYTOKENTYPE @@ -110,7 +118,6 @@ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 @@ -120,4 +127,18 @@ extern YYSTYPE yylval; +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ +#endif /* !YY_YY_LOADKEYS_H_INCLUDED */ diff -Nru kbd-1.15.3/src/loadkeys.y kbd-1.15.5/src/loadkeys.y --- kbd-1.15.3/src/loadkeys.y 2011-05-01 23:19:11.000000000 +0000 +++ kbd-1.15.5/src/loadkeys.y 2012-12-01 21:41:38.000000000 +0000 @@ -10,6 +10,8 @@ %token UNUMBER ALT_IS_META STRINGS AS USUAL ON FOR %{ +#define YY_HEADER_EXPORT_START_CONDITIONS 1 + #include #include #include @@ -33,6 +35,8 @@ #include "nls.h" #include "version.h" +#include "loadkeys.analyze.h" + #define U(x) ((x) ^ 0xf000) #ifdef KDSKBDIACRUC @@ -83,7 +87,6 @@ extern int prefer_unicode; #include "ksyms.h" -int yylex(void); static void attr_noreturn usage(void) { @@ -96,8 +99,8 @@ " -a --ascii force conversion to ASCII\n" " -b --bkeymap output a binary keymap to stdout\n" " -c --clearcompose clear kernel compose table\n" - " -C --console=\n" - " the console device(s) to be used\n" + " -C --console=file\n" + " the console device to be used\n" " -d --default load \"%s\"\n" " -h --help display this help text\n" " -m --mktable output a \"defkeymap.c\" to stdout\n" @@ -352,8 +355,6 @@ j, (key_map[i])[j]); } } - xfree(key_map[i]); - xfree(keymap_was_set[i]); } else if (keymaps_line_seen && !defining[i]) { /* deallocate keymap */ @@ -405,6 +406,15 @@ return ct; } +static void freekeys(void) +{ + int i; + for (i = 0; i < MAX_NR_KEYMAPS; i++) { + xfree(keymap_was_set[i]); + xfree(key_map[i]); + } +} + static char *ostr(char *s) { int lth = strlen(s); @@ -435,27 +445,30 @@ static int deffuncs(int fd) { int i, ct = 0; - char *ptr; + char *ptr, *s; for (i = 0; i < MAX_NR_FUNC; i++) { kbs_buf.kb_func = i; if ((ptr = func_table[i])) { strcpy((char *)kbs_buf.kb_string, ptr); - if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) + if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) { + s = ostr((char *)kbs_buf.kb_string); fprintf(stderr, _("failed to bind string '%s' to function %s\n"), - ostr((char *)kbs_buf.kb_string), - syms[KT_FN].table[kbs_buf.kb_func]); - else + s, syms[KT_FN].table[kbs_buf.kb_func]); + xfree(s); + } else { ct++; + } } else if (opts) { kbs_buf.kb_string[0] = 0; - if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) + if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf)) { fprintf(stderr, _("failed to clear string %s\n"), syms[KT_FN].table[kbs_buf.kb_func]); - else + } else { ct++; + } } } return ct; @@ -572,12 +585,10 @@ } } -static void loadkeys(char *console, int kbd_mode) +static void loadkeys(int fd, int kbd_mode) { - int fd; int keyct, funcct, diacct = 0; - fd = getfd(console); keyct = defkeys(fd, kbd_mode); funcct = deffuncs(fd); @@ -598,6 +609,8 @@ } else if (verbose) { printf(_("(No change in compose definitions.)\n")); } + + freekeys(); } static void strings_as_usual(void) @@ -838,6 +851,8 @@ } printf("unsigned int accent_table_size = %d;\n", accent_table_size); + freekeys(); + exit(0); } @@ -865,9 +880,11 @@ } } } + freekeys(); exit(0); fail: fprintf(stderr, _("Error writing map to file\n")); + freekeys(); exit(1); } @@ -1035,6 +1052,22 @@ ; %% +static void parse_keymap(FILE *fd) { + if (!quiet && !optm) + fprintf(stdout, _("Loading %s\n"), pathname); + + stack_push(fd, 0, pathname); + + if (yyparse()) { + fprintf(stderr, _("syntax error in map file\n")); + + if (!optm) + fprintf(stderr, + _("key bindings not changed\n")); + exit(EXIT_FAILURE); + } +} + int main(int argc, char *argv[]) { const char *short_opts = "abcC:dhmsuqvV"; @@ -1058,6 +1091,8 @@ int kbd_mode; int kd_mode; char *console = NULL; + char *ev; + FILE *f; set_progname(argv[0]); @@ -1090,6 +1125,7 @@ break; case 'u': optu = 1; + prefer_unicode = 1; break; case 'q': quiet = 1; @@ -1112,15 +1148,14 @@ exit(EXIT_FAILURE); } - prefer_unicode = optu; + /* get console */ + fd = getfd(console); if (!optm && !optb) { /* check whether the keyboard is in Unicode mode */ - fd = getfd(console); - - if (ioctl(fd, KDGKBMODE, &kbd_mode)) { - perror("KDGKBMODE"); - fprintf(stderr, _("%s: error reading keyboard mode\n"), + if (ioctl(fd, KDGKBMODE, &kbd_mode) || + ioctl(fd, KDGETMODE, &kd_mode)) { + fprintf(stderr, _("%s: error reading keyboard mode: %m\n"), progname); exit(EXIT_FAILURE); } @@ -1137,39 +1172,39 @@ /* reset -u option if keyboard is in K_UNICODE anyway */ optu = 0; - } else if (optu - && (ioctl(fd, KDGETMODE, &kd_mode) || (kd_mode != KD_GRAPHICS))) + + } else if (optu && kd_mode != KD_GRAPHICS) { fprintf(stderr, _("%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n"), progname); + } + } - close(fd); + dirpath = dirpath1; + if ((ev = getenv("LOADKEYS_KEYMAP_PATH")) != NULL) { + if (!quiet && !optm) + fprintf(stdout, _("Searching in %s\n"), ev); + + dirpath2[0] = ev; + dirpath = dirpath2; } - for (i = optind; argv[i]; i++) { - FILE *f; - char *ev; + if (optd) { + /* first read default map - search starts in . */ - dirpath = dirpath1; - if ((ev = getenv("LOADKEYS_KEYMAP_PATH")) != NULL) { - if (!quiet && !optm) - fprintf(stdout, _("Searching in %s\n"), ev); - - dirpath2[0] = ev; - dirpath = dirpath2; - } - - if (optd) { - /* first read default map - search starts in . */ - optd = 0; - if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) { - fprintf(stderr, _("Cannot find %s\n"), DEFMAP); - exit(EXIT_FAILURE); - } - goto gotf; + if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) { + fprintf(stderr, _("Cannot find %s\n"), DEFMAP); + exit(EXIT_FAILURE); } + parse_keymap(f); + + } else if (optind == argc) { + strcpy(pathname, ""); + parse_keymap(stdin); + } + for (i = optind; argv[i]; i++) { if (!strcmp(argv[i], "-")) { f = stdin; strcpy(pathname, ""); @@ -1179,56 +1214,20 @@ exit(EXIT_FAILURE); } - gotf: - if (!quiet && !optm) - fprintf(stdout, _("Loading %s\n"), pathname); - - stack_push(f, 0, pathname); - - if (yyparse()) { - fprintf(stderr, _("syntax error in map file\n")); - - if (!optm) - fprintf(stderr, - _("key bindings not changed\n")); - exit(EXIT_FAILURE); - } + parse_keymap(f); } do_constant(); - if (optb) { + if (optb) bkeymap(); - } else if (optm) { + if (optm) mktable(); - } else if (console) { - char *buf = strdup(console); /* make writable */ - char *e, *s = buf; - while (*s) { - char ch; - - while (*s == ' ' || *s == '\t' || *s == ',') - s++; - e = s; - while (*e && *e != ' ' && *e != '\t' && *e != ',') - e++; - ch = *e; - *e = '\0'; - - if (verbose) - printf("%s\n", s); - - loadkeys(s, kbd_mode); + loadkeys(fd, kbd_mode); - *e = ch; - s = e; - } - free(buf); + close(fd); - } else { - loadkeys(NULL, kbd_mode); - } exit(EXIT_SUCCESS); } diff -Nru kbd-1.15.3/src/openvt.c kbd-1.15.5/src/openvt.c --- kbd-1.15.3/src/openvt.c 2011-05-01 23:27:13.000000000 +0000 +++ kbd-1.15.5/src/openvt.c 2012-12-01 21:41:38.000000000 +0000 @@ -47,6 +47,7 @@ "\n" "Options:\n" " -c, --console=NUM use the given VT number;\n" + " -e, --exec execute the command, without forking;\n" " -f, --force force opening a VT without checking;\n" " -l, --login make the command a login shell;\n" " -u, --user figure out the owner of the current VT;\n" diff -Nru kbd-1.15.3/src/paths.h kbd-1.15.5/src/paths.h --- kbd-1.15.3/src/paths.h 2011-04-26 20:29:35.000000000 +0000 +++ kbd-1.15.5/src/paths.h 2012-12-01 21:41:38.000000000 +0000 @@ -18,11 +18,11 @@ * Default keymap, and where the kernel copy of it lives. */ #ifdef __sparc__ -# define DEFMAP "sunkeymap.kmap" +# define DEFMAP "sunkeymap.map" # define KERNDIR "/usr/src/linux/drivers/sbus/char" #else -# define DEFMAP "defkeymap.kmap" -# define KERNDIR "/usr/src/linux/drivers/char" +# define DEFMAP "defkeymap.map" +# define KERNDIR "/usr/src/linux/drivers/tty/vt" #endif #include "findfile.h" diff -Nru kbd-1.15.3/src/vlock/Makefile.am kbd-1.15.5/src/vlock/Makefile.am --- kbd-1.15.3/src/vlock/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/Makefile.am 2012-12-03 06:34:36.000000000 +0000 @@ -0,0 +1,20 @@ +AM_CPPFLAGS = -I$(srcdir)/.. -I$(builddir)/.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" + +EXTRA_DIST = README.vlock + +if VLOCK +bin_PROGRAMS = vlock +endif + +vlock_SOURCES = \ + auth.c \ + pam_auth.h \ + pam.c \ + parse.c \ + screen.c \ + username.c \ + vlock.c \ + vlock.h \ + vt.c + +vlock_LDADD = @PAM_LIBS@ diff -Nru kbd-1.15.3/src/vlock/Makefile.in kbd-1.15.5/src/vlock/Makefile.in --- kbd-1.15.3/src/vlock/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/Makefile.in 2012-12-05 19:27:06.000000000 +0000 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@VLOCK_TRUE@bin_PROGRAMS = vlock$(EXEEXT) +subdir = src/vlock +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am_vlock_OBJECTS = auth.$(OBJEXT) pam.$(OBJEXT) parse.$(OBJEXT) \ + screen.$(OBJEXT) username.$(OBJEXT) vlock.$(OBJEXT) \ + vt.$(OBJEXT) +vlock_OBJECTS = $(am_vlock_OBJECTS) +vlock_DEPENDENCIES = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(vlock_SOURCES) +DIST_SOURCES = $(vlock_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = -I$(srcdir)/.. -I$(builddir)/.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" +EXTRA_DIST = README.vlock +vlock_SOURCES = \ + auth.c \ + pam_auth.h \ + pam.c \ + parse.c \ + screen.c \ + username.c \ + vlock.c \ + vlock.h \ + vt.c + +vlock_LDADD = @PAM_LIBS@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vlock/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/vlock/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +vlock$(EXEEXT): $(vlock_OBJECTS) $(vlock_DEPENDENCIES) $(EXTRA_vlock_DEPENDENCIES) + @rm -f vlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(vlock_OBJECTS) $(vlock_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/username.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vlock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vt.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru kbd-1.15.3/src/vlock/README.vlock kbd-1.15.5/src/vlock/README.vlock --- kbd-1.15.3/src/vlock/README.vlock 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/README.vlock 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,89 @@ + + + VV VV LL OOO CCCCC KK KK + VV VV LL OO OO CC KK KK written by + VV VV LL OO OO CC KK Michael K. Johnson + VV VV LL OO OO CC KK KK for Linux Journal + VVV LLLLLLLL OOO CCCCC KK KK + + +This is vlock, the Linux _V_irtual Console locking program. It +allows you to lock one or all of the sessions of your Linux console +display. + +Usage is very simple; by default, vlock locks the single console +you are on. The -a or --all flags cause it to lock the console +completely, so that users cannot switch to another virtual +console. + +If you are working on a shared Linux computer, and want to lock +a console session as you left it, but want to allow other users +to log onto other sessions, simply run vlock when you leave the +computer. + +If you want to lock the console so that no one else can log onto +any of the virtual consoles (perhaps because you have login sessions +running on several other virtual consoles at the same time), you +use the -a or --all flag to cause vlock to not allow any user +to switch to any console without typing your password. + + WARNING: If you lock all the consoles, they will be *really* + locked. Unless you have a serial terminal, or can log in + remotely via a network to kill vlock, you *will not* be able + to get back to your terminal session without entering the + correct password. While I was developing this program, a few + small bugs forced me to do *hard resets*. If you loose data + because you have to reset your computer because of vlock -a, + it is your own problem, not mine. I warned you. + +If anyone else can log in as you, they can send a +SIGKILL to vlock, which *will* kill it. + +The vlock binary can be installed wherever you like, with +whatever name you like. + +"vlock -h" or "vlock --help" will get you a help message. + +If you have the "open" program, try doing `open vlock -a' to +run vlock on a new VC. This will keep your current VC from getting +obscured by silly password messages... + +*** Features: *** +Currently, vlock doesn't have very many features. It locks the +console, and now will even try to lock other sessions as well. +I hope that non-VC sessions will be locked securely, but I +don't know for sure. + +vlock supports no other authentication methods but PAM authentication. + +*** Bugs fixed: *** +Quits if the tty is closed (not applicable to VCs). +Asks for password on non-PAM systems. March 12, 1998. + +Moved to new PAM conversationg function conventions. October 10, 1997. + +Shadow support was minimal. Fixed May 16, 1996. +Used /dev/console instead of /dev/tty. Fixed May 16, 1996. + +Ctrl-Break was able to kill vlock. Fixed July 3, 1994. + +With vlock -a, after guessing the password wrong once, it was +possible to switch VC's. Fixed July 3, 1994. + +Root was not allowed to lock his tty because I took my +password reading program from GNU su, for which it is +appropriate for root not to be asked to enter a password... +This was fixed March 21, 1994. + +Message said to use Control-function key, not Alt-function key. +This was fixed March 23, 1994. + +SIGQUIT could break out of vlock in some cases. +This was fixed March 23, 1994. + + +Please email me any comments you have about vlock: johnsonm@redhat.com + +I wrote this code as a demonstration of the VT ioctls for Linux +Journal. Subscription information is available on the web at +http://www.ssc.com/lj and via email through info@ssc.com diff -Nru kbd-1.15.3/src/vlock/auth.c kbd-1.15.5/src/vlock/auth.c --- kbd-1.15.3/src/vlock/auth.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/auth.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,131 @@ + +/* + + PAM authentication routine for vlock, the VT locking program for linux. + + Copyright (C) 1994-1998 Michael K. Johnson + Copyright (C) 2002, 2005 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include +#include +#include +#include + +#include "pam_auth.h" +#include "vlock.h" +#include "nls.h" + +/* Unrecognized PAM error timeout. */ +#define ERROR_TIMEOUT 10 + +int +get_password (pam_handle_t * pamh, const char *username, const char *tty) +{ + uid_t uid = getuid (); + + for (;;) + { + int rc; + const char *msg; + + if (!pamh) + { + pamh = init_pam (username, tty, 1); + if (!pamh) + { + /* Log the fact of failure. */ + syslog (LOG_WARNING, + "Authentication problems on %s for %s by (uid=%u)", + tty, username, uid); + puts (_("Please try again later.\n\n\n")); + fflush (stdout); + sleep (ERROR_TIMEOUT); + continue; + } + } + + if (o_lock_all) + { + printf (_("The entire console display is now completely locked by %s.\n"), + username); + } else + { + printf (_("The %s is now locked by %s.\n"), tty, + username); + if (is_vt) + puts (_("Use Alt-function keys to switch to other virtual consoles.")); + } + fflush (stdout); + + /* + * No need to request a delay on failure via pam_fail_delay(3): + * authentication module should do it for us. + */ + rc = pam_authenticate (pamh, 0); + + switch (rc) + { + case PAM_SUCCESS: + pam_end (pamh, rc); + /* Log the fact of console unlocking. */ + syslog (LOG_NOTICE, + "Unlocked %s on %s for %s by (uid=%u)", + locked_name (), tty, username, uid); + return EXIT_SUCCESS; + + case PAM_INCOMPLETE: + /* + * EOF encountered on read? + * If not on VT, check stdin. + */ + if (is_vt || isatty (STDIN_FILENO)) + { + /* Ignore error. */ + sleep (1); + break; + } + + /* Cancel locking. */ + pam_end (pamh, rc); + syslog (LOG_NOTICE, + "Cancelled lock of %s on %s for %s by (uid=%u)", + locked_name (), tty, username, uid); + return EXIT_FAILURE; + + case PAM_MAXTRIES: + case PAM_ABORT: + msg = pam_strerror (pamh, rc); + /* Log the fact of failure. */ + syslog (LOG_WARNING, "%s", msg); + printf ("%s.\n\n\n", msg); + fflush (stdout); + msg = 0; + pam_end (pamh, rc); + pamh = 0; + sleep (ERROR_TIMEOUT); + break; + + default: + printf ("%s.\n\n\n", pam_strerror (pamh, rc)); + fflush (stdout); + } + } +} diff -Nru kbd-1.15.3/src/vlock/pam.c kbd-1.15.5/src/vlock/pam.c --- kbd-1.15.3/src/vlock/pam.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/pam.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,69 @@ + +/* + + PAM initialization routine for vlock, the VT locking program for linux. + + Copyright (C) 2002, 2005 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include +#include + +#include + +#include "pam_auth.h" +#include "vlock.h" + +static struct pam_conv conv = { + &misc_conv, + NULL +}; + +pam_handle_t * +init_pam (const char *username, const char *tty, int log) +{ + pam_handle_t *pamh = 0; + int rc = pam_start ("vlock", username, &conv, &pamh); + + if (rc != PAM_SUCCESS) + { + /* pam_strerror is not available atm. */ + if (log) + syslog (LOG_WARNING, "pam_start failed: %m"); + else + error (EXIT_SUCCESS, errno, "pam_start"); + return 0; + } + + rc = pam_set_item (pamh, PAM_TTY, tty); + if (rc != PAM_SUCCESS) + { + if (log) + syslog (LOG_WARNING, "pam_set_item: %s", + pam_strerror (pamh, rc)); + else + error (EXIT_SUCCESS, 0, "pam_set_item: %s", + pam_strerror (pamh, rc)); + pam_end (pamh, rc); + return 0; + } + + return pamh; +} diff -Nru kbd-1.15.3/src/vlock/pam_auth.h kbd-1.15.5/src/vlock/pam_auth.h --- kbd-1.15.3/src/vlock/pam_auth.h 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/pam_auth.h 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,27 @@ + +/* + + PAM authentication header for vlock, the VT locking program for linux. + + Copyright (C) 2002 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include + +pam_handle_t *init_pam (const char *username, const char *tty, int log); +int get_password (pam_handle_t * pamh, const char *username, + const char *tty); diff -Nru kbd-1.15.3/src/vlock/parse.c kbd-1.15.5/src/vlock/parse.c --- kbd-1.15.3/src/vlock/parse.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/parse.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,105 @@ + +/* + + Parse command line options for vlock, the VT locking program for linux. + + Copyright (C) 1994-1998 Michael K. Johnson + Copyright (C) 2002, 2005 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include + +#include "vlock.h" +#include "config.h" +#include "nls.h" + +/* + * This determines whether the default behavior is to lock only the + * current VT or all of them. + * 0 means current, 1 means all. + */ +int o_lock_all; + +const char * +locked_name (void) +{ + return o_lock_all ? "console" : (is_vt ? "VC" : "tty"); +} + +static void __attribute__ ((__noreturn__)) +show_usage(void) +{ + fprintf(stderr, + _("Try `%s --help' for more information.\n"), + program_invocation_short_name); + exit(1); +} + +static void __attribute__ ((__noreturn__)) +show_help(void) +{ + printf(_("%s: locks virtual consoles, saving your current session.\n" + "Usage: %s [options]\n" + " Where [options] are any of:\n" + "-c or --current: lock only this virtual console, allowing user to\n" + " switch to other virtual consoles.\n" + "-a or --all: lock all virtual consoles by preventing other users\n" + " from switching virtual consoles.\n" + "-v or --version: Print the version number of vlock and exit.\n" + "-h or --help: Print this help message and exit.\n"), + program_invocation_short_name, program_invocation_short_name); + exit(0); +} + +void +parse (int ac, char *const av[]) +{ + static struct option long_options[] = { + {"current", 0, 0, 'c'}, + {"all", 0, 0, 'a'}, + {"version", 0, 0, 'v'}, + {"help", 0, 0, 'h'}, + {0, 0, 0, 0}, + }; + int c; + + while ((c = getopt_long(ac, av, "acvh", long_options, 0)) != -1) + { + switch (c) + { + case 'c': + o_lock_all = 0; + break; + case 'a': + o_lock_all = 1; + break; + case 'v': + fprintf(stderr, "%s\n", VERSION); + exit(EXIT_SUCCESS); + break; + case 'h': + show_help(); + break; + default: + show_usage(); + break; + } + } +} diff -Nru kbd-1.15.3/src/vlock/screen.c kbd-1.15.5/src/vlock/screen.c --- kbd-1.15.3/src/vlock/screen.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/screen.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,116 @@ + +/* + + Set and restore VC screen for vlock, the VT locking program for linux. + + Copyright (C) 1997-1998 Juan Cespedes + Copyright (C) 2002, 2004, 2006 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include +#include +#include +#include +#include + +#include "vlock.h" + +static unsigned char lines, columns; +static void *screen_buf = 0; +static int vcs = -1; + +void +init_screen(void) +{ + int failed = 1; + const char clear_str[] = "\33[3J\33[H\33[J"; + + vcs = -1; + do + { + struct stat st; + unsigned i, size; + char path[16]; + + if (fstat(STDIN_FILENO, &st) == -1) + break; + + if (!S_ISCHR(st.st_mode)) + break; + + if ((st.st_rdev >> 8) != 4) + break; + + i = st.st_rdev & 0xff; + sprintf(path, "/dev/vcsa%u", i); + vcs = open(path, O_RDWR); + if (vcs < 0) + break; + + if (read(vcs, &columns, 1) != 1) + break; + + if (read(vcs, &lines, 1) != 1) + break; + + size = 2 * lines * columns + 2; + screen_buf = malloc(size); + if (!screen_buf) + break; + + if (read(vcs, screen_buf, size) != (int) size) + { + free(screen_buf); + screen_buf = NULL; + break; + } + + failed = 0; + } while (0); + + if (failed && vcs >= 0) + { + close(vcs); + vcs = -1; + } + + /* There's no need to use ncurses */ + if (write(STDOUT_FILENO, clear_str, sizeof(clear_str) - 1) != + sizeof(clear_str) - 1) + return; +} + +void +restore_screen(void) +{ + if (screen_buf) + { + do + { + if (lseek(vcs, 0, SEEK_SET)) + break; + if (write(vcs, &columns, 1) != 1) + break; + if (write(vcs, &lines, 1) != 1) + break; + if (write(vcs, screen_buf, 2 * lines * columns + 2) != + 2 * lines * columns + 2) + break; + } while (0); + close(vcs); + } +} diff -Nru kbd-1.15.3/src/vlock/username.c kbd-1.15.5/src/vlock/username.c --- kbd-1.15.3/src/vlock/username.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/username.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,65 @@ + +/* + + Find out login name for vlock, the VT locking program for linux. + + Copyright (C) 2002 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include +#include +#include +#include + +#include "vlock.h" +#include "nls.h" + +/* + * Try to find out proper login name. + */ +const char * +get_username (void) +{ + const char *name; + struct passwd *pw = 0; + uid_t uid = getuid (); + + char *logname = getenv ("LOGNAME"); + + if (logname) + { + pw = getpwnam (logname); + /* Ensure uid is same as current. */ + if (pw && pw->pw_uid != uid) + pw = 0; + } + if (!pw) + pw = getpwuid (uid); + + if (!pw) + error (EXIT_FAILURE, 0, _("unrecognized user")); + + name = strdup (pw->pw_name); + if (!name) + error (EXIT_FAILURE, errno, "strdup"); + + endpwent (); + return name; +} diff -Nru kbd-1.15.3/src/vlock/vlock.c kbd-1.15.5/src/vlock/vlock.c --- kbd-1.15.3/src/vlock/vlock.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/vlock.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,87 @@ + +/* + + Main routine for vlock, the VT locking program for linux. + + Copyright (C) 1994-1998 Michael K. Johnson + Copyright (C) 2002, 2005 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "pam_auth.h" +#include "vlock.h" +#include "nls.h" + +int +main (int ac, char *const av[]) +{ + int rc; + const char dev_prefix[] = "/dev/"; + const char *username, *tty; + pam_handle_t *pamh; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + textdomain(PACKAGE_NAME); + + /* 1st, parse command line arguments. */ + parse (ac, av); + + /* 2nd, find out tty name... */ + tty = ttyname (STDIN_FILENO); + if (!tty) + /* stdin is not a tty, so no need to try. */ + error (EXIT_FAILURE, 0, _("stdin is not a tty")); + + /* ... and strip its /dev/ prefix. */ + if (!strncmp (tty, dev_prefix, sizeof (dev_prefix) - 1)) + tty += sizeof (dev_prefix) - 1; + + /* 3rd, get username for PAM. */ + username = get_username (); + + /* 4th, initialize system logger. */ + openlog ("vlock", LOG_PID, LOG_AUTH); + + /* 5th, initialize PAM. */ + if (!(pamh = init_pam (username, tty, 0))) + exit (EXIT_FAILURE); + + /* 6th, initialize VT, tty and screen. */ + if (!init_vt (tty)) + { + pam_end (pamh, PAM_SUCCESS); + exit (EXIT_FAILURE); + } + + /* 7th, Log the fact of console locking. */ + syslog (LOG_NOTICE, "Locked %s on %s for %s by (uid=%u)", + locked_name (), tty, username, getuid ()); + + rc = get_password (pamh, username, tty); + restore_vt (); + + return rc; +} diff -Nru kbd-1.15.3/src/vlock/vlock.h kbd-1.15.5/src/vlock/vlock.h --- kbd-1.15.3/src/vlock/vlock.h 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/vlock.h 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,44 @@ + +/* + + Main header for vlock, the VT locking program for linux. + + Copyright (C) 1994-1998 Michael K. Johnson + Copyright (C) 2002, 2005 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +int init_vt (const char *tty); +void restore_vt (void); + +void init_screen (void); +void restore_screen (void); + +const char *get_username (void); + +void parse (int ac, char *const av[]); + +const char *locked_name (void); + +/* + * This determines whether the default behavior is to lock only the + * current VT or all of them. + * 0 means current, 1 means all. + */ +extern int o_lock_all; + +/* Copy of the VT mode when the program was started. */ +extern int is_vt; diff -Nru kbd-1.15.3/src/vlock/vt.c kbd-1.15.5/src/vlock/vt.c --- kbd-1.15.3/src/vlock/vt.c 1970-01-01 00:00:00.000000000 +0000 +++ kbd-1.15.5/src/vlock/vt.c 2012-12-01 21:41:38.000000000 +0000 @@ -0,0 +1,217 @@ + +/* + + VT code and signal handling for vlock, the VT locking program for linux. + + Copyright (C) 1994-1998 Michael K. Johnson + Copyright (C) 2002, 2004, 2005 Dmitry V. Levin + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "vlock.h" +#include "nls.h" + +/* Saved VT mode. */ +struct vt_mode ovtm; + +/* VT descriptor. */ +static int vfd = -1; + +/* Copy of the VT mode when the program was started. */ +int is_vt; + +/* + * This is called by a signal whenever a user tries to change + * the VC (with a ALT-Fn key or via VT_ACTIVATE). + */ +static void +release_vt (__attribute__ ((unused)) int signo) +{ + /* + * Kernel is not allowed to switch. + * Return code is silently ignored. + */ + ioctl (vfd, VT_RELDISP, 0); +} + +/* This is called whenever a user switches to that VC. */ +static void +acquire_vt (__attribute__ ((unused)) int signo) +{ + /* + * This call is not currently required under Linux, + * but it won't hurt, either. + * Return code is silently ignored. + */ + ioctl (vfd, VT_RELDISP, VT_ACKACQ); +} + +/* Set the signal masks and handlers. */ +static void +mask_signals (void) +{ + + static sigset_t sig; + static struct sigaction sa; + + memset (&sa, 0, sizeof sa); + sigemptyset (&(sa.sa_mask)); + sa.sa_flags = SA_RESTART; + + if (o_lock_all) + { + /* handle SIGUSR{1,2}... */ + sa.sa_handler = release_vt; + sigaction (SIGUSR1, &sa, 0); + sa.sa_handler = acquire_vt; + sigaction (SIGUSR2, &sa, 0); + + /* ... and ensure they are unblocked. */ + sigemptyset (&sig); + sigaddset (&sig, SIGUSR1); + sigaddset (&sig, SIGUSR2); + sigprocmask (SIG_UNBLOCK, &sig, 0); + } + + /* Ignore all the rest. */ + sa.sa_handler = SIG_IGN; + if (!o_lock_all) + { + sigaction (SIGUSR1, &sa, 0); + sigaction (SIGUSR2, &sa, 0); + } + sigaction (SIGHUP, &sa, 0); + sigaction (SIGINT, &sa, 0); + sigaction (SIGQUIT, &sa, 0); + sigaction (SIGPIPE, &sa, 0); + sigaction (SIGALRM, &sa, 0); + sigaction (SIGTERM, &sa, 0); + sigaction (SIGTSTP, &sa, 0); + sigaction (SIGTTIN, &sa, 0); + sigaction (SIGTTOU, &sa, 0); + sigaction (SIGURG, &sa, 0); + sigaction (SIGVTALRM, &sa, 0); + sigaction (SIGIO, &sa, 0); + sigaction (SIGPWR, &sa, 0); + + /* + * Also block SIGCHLD. + * Not really needed; just make sleep(3) more easy. + */ + sigemptyset (&sig); + sigaddset (&sig, SIGCHLD); + sigprocmask (SIG_BLOCK, &sig, 0); +} + +int +init_vt (const char *tty) +{ + const char dev_tty[] = "/dev/tty"; + + vfd = open (dev_tty, O_RDWR); + if (vfd < 0) + { + error (EXIT_SUCCESS, errno, "could not open %s", dev_tty); + return 0; + } + + /* + * First we will set process control of VC switching. + * - If this fails, then we know that we aren't on a VC, + * and will print a warning message. + * - If it doesn't fail, it gets the current VT status. + */ + if (ioctl (vfd, VT_GETMODE, &ovtm) < 0) + { + is_vt = 0; + fprintf (stderr, _("This tty (%s) is not a virtual console.\n"), + tty); + if (o_lock_all) + { + o_lock_all = 0; + close (vfd); + vfd = -1; + fprintf (stderr, + _("The entire console display cannot be locked.\n")); + return 0; + } + fprintf (stderr, "\n\n"); + fflush (stderr); + } else + { + is_vt = 1; + } + + /* If we aren't going to lock console, we don't need VT descriptor. */ + if (!o_lock_all) + { + close (vfd); + vfd = -1; + } + + mask_signals (); + + if (o_lock_all) + { + struct vt_mode vtm = ovtm; + + vtm.mode = VT_PROCESS; /* Process controls switching. */ + vtm.relsig = SIGUSR1; /* Signal to raise on release request, handled by release_vt(). */ + vtm.acqsig = SIGUSR2; /* Signal to raise on acquisition, handled by acquire_vt(). */ + + /* Set mode of active vt. */ + if (ioctl (vfd, VT_SETMODE, &vtm) < 0) + { + error (EXIT_SUCCESS, errno, "ioctl VT_SETMODE"); + return 0; + } + } + + if (is_vt) + init_screen (); + + return 1; +} + +void +restore_vt (void) +{ + if (is_vt) + { + restore_screen (); + + if (o_lock_all) + { + /* + * Reset mode of active vt. + * Don't check return code - it won't help anyway. + */ + ioctl (vfd, VT_SETMODE, &ovtm); + } + } +}