diff -Nru kbd-2.0.3/config/config.guess kbd-2.0.4/config/config.guess --- kbd-2.0.3/config/config.guess 2013-01-21 00:46:15.000000000 +0000 +++ kbd-2.0.4/config/config.guess 2016-11-01 12:37:58.000000000 +0000 @@ -1,14 +1,12 @@ #! /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, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2012-08-14' +timestamp='2015-09-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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches to . + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) 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, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -153,20 +168,27 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -182,6 +204,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -192,13 +221,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -220,6 +249,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -306,7 +338,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -564,8 +596,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -811,7 +844,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -859,21 +892,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -886,59 +919,60 @@ EV68*) UNAME_MACHINE=alphaev68 ;; 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} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -957,54 +991,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1237,19 +1280,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1340,154 +1395,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ 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, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2015 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,7 +117,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,21 +252,25 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | armh | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | armh | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -287,26 +284,29 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | 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 \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -314,6 +314,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -328,7 +329,10 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -370,26 +374,29 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armh-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | 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-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -403,28 +410,33 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | 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-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -432,6 +444,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -508,6 +521,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -769,6 +785,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -788,7 +807,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; mingw64) @@ -796,7 +815,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -824,6 +843,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -832,7 +855,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1023,7 +1046,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1350,9 +1377,9 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1365,14 +1392,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1496,9 +1523,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1547,6 +1571,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff -Nru kbd-2.0.3/configure kbd-2.0.4/configure --- kbd-2.0.3/configure 2015-07-13 22:17:12.000000000 +0000 +++ kbd-2.0.4/configure 2017-01-08 18:49:39.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for kbd 2.0.3. +# Generated by GNU Autoconf 2.69 for kbd 2.0.4. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='kbd' PACKAGE_TARNAME='kbd' -PACKAGE_VERSION='2.0.3' -PACKAGE_STRING='kbd 2.0.3' +PACKAGE_VERSION='2.0.4' +PACKAGE_STRING='kbd 2.0.4' PACKAGE_BUGREPORT='gladkov.alexey@gmail.com' PACKAGE_URL='http://kbd-project.org/' @@ -718,6 +718,8 @@ AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +BUILD_TESTS_FALSE +BUILD_TESTS_TRUE CHECK_LIBS CHECK_CFLAGS PKG_CONFIG_LIBDIR @@ -787,6 +789,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_tests enable_silent_rules enable_dependency_tracking enable_shared @@ -1360,7 +1363,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 2.0.3 to adapt to many kinds of systems. +\`configure' configures kbd 2.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1433,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of kbd 2.0.3:";; + short | recursive ) echo "Configuration of kbd 2.0.4:";; esac cat <<\_ACEOF @@ -1438,6 +1441,7 @@ --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] + --disable-tests do not build tests --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 @@ -1558,7 +1562,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -kbd configure 2.0.3 +kbd configure 2.0.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2010,7 +2014,7 @@ 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 2.0.3, which was +It was created by kbd $as_me 2.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2832,7 +2836,7 @@ # Define the identity of the package. PACKAGE='kbd' - VERSION='2.0.3' + VERSION='2.0.4' cat >>confdefs.h <<_ACEOF @@ -2881,7 +2885,6 @@ - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -2996,6 +2999,15 @@ fi fi +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then : + enableval=$enable_tests; build_tests=$enableval +else + build_tests=auto +fi + +if test "$build_tests" != "no"; then + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 $as_echo_n "checking for CHECK... " >&6; } @@ -3052,40 +3064,39 @@ # Put the nasty error message in config.log where it belongs echo "$CHECK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (check >= 0.9.4) were not met: -$CHECK_PKG_ERRORS + if test "$build_tests" = "yes"; then + as_fn_error $? "tests requested, but check package is missing" "$LINENO" 5 + fi + build_tests="no" -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables CHECK_CFLAGS -and CHECK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables CHECK_CFLAGS -and CHECK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + if test "$build_tests" = "yes"; then + as_fn_error $? "tests requested, but check package is missing" "$LINENO" 5 + fi + build_tests="no" + else CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS CHECK_LIBS=$pkg_cv_CHECK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + build_tests="yes" +fi +fi + if test "$build_tests" != "no"; then + BUILD_TESTS_TRUE= + BUILD_TESTS_FALSE='#' +else + BUILD_TESTS_TRUE='#' + BUILD_TESTS_FALSE= fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -7107,7 +7118,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +aarch64*-*linux*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -14977,7 +14988,7 @@ case $host_cpu in - m68*|sparc*) KEYCODES_PROGS=no ;; + m68*) KEYCODES_PROGS=no ;; *) KEYCODES_PROGS=yes ;; esac if test "$KEYCODES_PROGS" = "yes"; then @@ -15321,6 +15332,10 @@ am__EXEEXT_FALSE= fi +if test -z "${BUILD_TESTS_TRUE}" && test -z "${BUILD_TESTS_FALSE}"; then + as_fn_error $? "conditional \"BUILD_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -15750,7 +15765,7 @@ # 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 2.0.3, which was +This file was extended by kbd $as_me 2.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15817,7 +15832,7 @@ 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 2.0.3 +kbd config.status 2.0.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru kbd-2.0.3/configure.ac kbd-2.0.4/configure.ac --- kbd-2.0.3/configure.ac 2015-07-13 22:17:05.000000000 +0000 +++ kbd-2.0.4/configure.ac 2017-01-08 18:41:07.000000000 +0000 @@ -1,17 +1,30 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(kbd, 2.0.3, gladkov.alexey@gmail.com,, http://kbd-project.org/) +AC_INIT(kbd, 2.0.4, gladkov.alexey@gmail.com,, http://kbd-project.org/) AC_PREREQ(2.60) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz]) +AM_INIT_AUTOMAKE([1.9 -Wall -Wno-portability color-tests dist-xz]) AC_CONFIG_SRCDIR([src/loadkeys.c]) AC_CONFIG_HEADERS(config.h) +PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) +AC_ARG_ENABLE(tests, + [AS_HELP_STRING([--disable-tests], [do not build tests])], + [build_tests=$enableval], [build_tests=auto]) +if test "$build_tests" != "no"; then + PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], + [build_tests="yes"], [ + if test "$build_tests" = "yes"; then + AC_MSG_ERROR([tests requested, but check package is missing]) + fi + build_tests="no" + ]) +fi +AM_CONDITIONAL(BUILD_TESTS, test "$build_tests" != "no") m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) AM_SILENT_RULES([yes]) @@ -74,7 +87,7 @@ -Wmissing-declarations]) case $host_cpu in - m68*|sparc*) KEYCODES_PROGS=no ;; + m68*) KEYCODES_PROGS=no ;; *) KEYCODES_PROGS=yes ;; esac AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes") diff -Nru kbd-2.0.3/contrib/codepage.c kbd-2.0.4/contrib/codepage.c --- kbd-2.0.3/contrib/codepage.c 2012-02-27 10:27:10.000000000 +0000 +++ kbd-2.0.4/contrib/codepage.c 2016-12-19 15:03:48.000000000 +0000 @@ -23,7 +23,7 @@ int handle_codepage(int); void handle_fontfile(void); -#define PACKED __attribute__ ((packed)) +#define PACKED __attribute__((packed)) /* Use this (instead of the above) to compile under MSDOS */ /*#define PACKED */ @@ -31,16 +31,16 @@ unsigned char id0 PACKED; unsigned char id[7] PACKED; unsigned char res[8] PACKED; - unsigned short pnum PACKED; /* number of pointers */ - unsigned char ptyp PACKED; /* type of pointers */ + unsigned short pnum PACKED; /* number of pointers */ + unsigned char ptyp PACKED; /* type of pointers */ unsigned long fih_offset PACKED; /* FontInfoHeader offset */ } FontFileHeader; int drfont = 0; -#define N 4 +#define N 4 struct { - unsigned char num_fonts PACKED; /* N = 4 fonts per code page*/ + unsigned char num_fonts PACKED; /* N = 4 fonts per code page*/ unsigned char font_height[N] PACKED; unsigned long dfd_offset[N] PACKED; /* DisplayFontData offset */ } DRDOS_ExtendedFontFileHeader; @@ -86,7 +86,8 @@ unsigned short codepage; -int main (int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ if (argc < 2) usage(); @@ -95,146 +96,147 @@ if (argc == 2) optl = 1; else - while(1) { - switch(getopt(argc, argv, "alLc")) { - case 'a': - opta = 1; - continue; - case 'c': - optc = 1; - continue; - case 'L': - optL = 1; - continue; - case 'l': - optl = 1; - continue; - case '?': - default: - usage(); - case -1: - break; - } - break; - } + while (1) { + switch (getopt(argc, argv, "alLc")) { + case 'a': + opta = 1; + continue; + case 'c': + optc = 1; + continue; + case 'L': + optL = 1; + continue; + case 'l': + optl = 1; + continue; + case '?': + default: + usage(); + case -1: + break; + } + break; + } if (optind < argc) { - if ((in = fopen(argv[optind], "r")) == NULL) { - printf("\nUnable to open file %s.\n", argv[optind]); - exit(0); - } - optind++; - } else - usage(); - + if ((in = fopen(argv[optind], "r")) == NULL) { + printf("\nUnable to open file %s.\n", argv[optind]); + exit(0); + } + optind++; + } else + usage(); + if (optind != argc) { - if (optind != argc-1 || opta) - usage(); - codepage = atoi(argv[optind]); - optx = 1; + if (optind != argc - 1 || opta) + usage(); + codepage = atoi(argv[optind]); + optx = 1; } if (optc) - handle_codepage(0); + handle_codepage(0); else - handle_fontfile(); + handle_fontfile(); if (optx) { - printf("no page %d found\n", codepage); - exit(1); + printf("no page %d found\n", codepage); + exit(1); } fclose(in); return (0); } -void -handle_fontfile(){ +void handle_fontfile() +{ int i, j; j = fread(&FontFileHeader, 1, sizeof(FontFileHeader), in); if (j != sizeof(FontFileHeader)) { - printf("error reading FontFileHeader - got %d chars\n", j); - exit (1); + printf("error reading FontFileHeader - got %d chars\n", j); + exit(1); } if (optL) - printf("FontFileHeader: id=0x%x \"%7.7s\" res=%8.8s " - "num=%d typ=%d fih_offset=%ld\n\n", - FontFileHeader.id0, FontFileHeader.id, FontFileHeader.res, - FontFileHeader.pnum, FontFileHeader.ptyp, - FontFileHeader.fih_offset); + printf("FontFileHeader: id=0x%x \"%7.7s\" res=%8.8s " + "num=%d typ=%d fih_offset=%ld\n\n", + FontFileHeader.id0, FontFileHeader.id, FontFileHeader.res, + FontFileHeader.pnum, FontFileHeader.ptyp, + FontFileHeader.fih_offset); if (!strcmp(FontFileHeader.id, "DRFONT ")) { - drfont = 1; - j = fread(&DRDOS_ExtendedFontFileHeader, 1, - sizeof(DRDOS_ExtendedFontFileHeader), in); - if (j != sizeof(DRDOS_ExtendedFontFileHeader)) { - printf("error reading ExtendedFontFileHeader - " - "got %d chars\n", j); - exit (1); - } - if (DRDOS_ExtendedFontFileHeader.num_fonts != N) { - printf("found %d instead of 4 fonts in drfont\n", - DRDOS_ExtendedFontFileHeader.num_fonts); - exit (1); - } - if (optL) { - printf("ExtendedFontFileHeader:\n"); - for (j=0; j #include -int -main(void) +int main(void) { struct kbentry ke; diff -Nru kbd-2.0.3/contrib/gen_charset_syms.pl kbd-2.0.4/contrib/gen_charset_syms.pl --- kbd-2.0.3/contrib/gen_charset_syms.pl 1970-01-01 00:00:00.000000000 +0000 +++ kbd-2.0.4/contrib/gen_charset_syms.pl 2016-11-14 19:46:56.000000000 +0000 @@ -0,0 +1,145 @@ +#!/usr/bin/env perl +use strict; +use warnings; + +use Getopt::Std; + +my %options; +getopts("hs:n:", \%options); + +sub usage { + print STDERR "Usage: cat CHARSET_to_uni.trans | $0 -s START -n NAME\n"; + exit(1); +} + +usage() if $options{h} || !$options{s} || !$options{n}; +usage() if @ARGV; + +my $start = int($options{s}); +my $charset = $options{n}; + +my $keysyms = { + "undefined" => "", + + "cyrillic_small_letter_ukrainian_ie" => "ukrainian_cyrillic_small_letter_ie", + "cyrillic_small_letter_byelorussian_ukrainian_i" => "ukrainian_cyrillic_small_letter_i", + "cyrillic_small_letter_yi" => "ukrainian_cyrillic_small_letter_yi", + "cyrillic_capital_letter_ukrainian_ie" => "ukrainian_cyrillic_capital_letter_ie", + "cyrillic_capital_letter_byelorussian_ukrainian_i" => "ukrainian_cyrillic_capital_letter_i", + "cyrillic_capital_letter_yi" => "ukrainian_cyrillic_capital_letter_yi", + "cyrillic_capital_letter_dje" => "serbocroatian_cyrillic_capital_letter_dje", + "cyrillic_capital_letter_gje" => "macedonian_cyrillic_capital_letter_gje", + "cyrillic_capital_letter_dze" => "macedonian_cyrillic_capital_letter_dze", + "cyrillic_capital_letter_tshe" => "serbocroatian_cyrillic_capital_letter_chje", + "cyrillic_capital_letter_kje" => "macedonian_cyrillic_capital_letter_kje", + "cyrillic_capital_letter_short_u" => "bielorussian_cyrillic_capital_letter_short_u", + "cyrillic_small_letter_dje" => "serbocroatian_cyrillic_small_letter_dje", + "cyrillic_small_letter_gje" => "macedonian_cyrillic_small_letter_gje", + "cyrillic_small_letter_dze" => "macedonian_cyrillic_small_letter_dze", + "cyrillic_small_letter_tshe" => "serbocroatian_cyrillic_small_letter_chje", + "cyrillic_small_letter_kje" => "macedonian_cyrillic_small_letter_kje", + "cyrillic_small_letter_short_u" => "bielorussian_cyrillic_small_letter_short_u", + + "middle_dot" => "periodcentered", + "not" => "notsign", + "sharp_s" => "ssharp", + "Ostroke" => "Ooblique", + "ostroke" => "oslash", + "Tstroke" => "Tslash", + "tstroke" => "tslash", + "greek_tonos" => "accent", + "greek_dialytika_tonos" => "diaeresisaccent", + "Xi" => "Ksi", + "Chi" => "Khi", + "xi" => "ksi", + "chi" => "khi", + "finalsigma" => "terminalsigma", + "overline" => "overscore", + "double_low_line" => "doubleunderscore", + "no_break_space" => "nobreakspace", + "inverted_exclamation_mark" => "exclamdown", + "pound" => "sterling", + "broken_bar" => "brokenbar", + "feminine_ordinal_indicator" => "ordfeminine", + "left_pointing_double_angle_quotation_mark" => "guillemotleft", + "soft_hyphen" => "hyphen", + "plus_minus" => "plusminus", + "superscript_one" => "onesuperior", + "superscript_two" => "twosuperior", + "superscript_digit_two" => "twosuperior", + "superscript_three" => "threesuperior", + "micro" => "mu", + "pilcrow" => "paragraph", + "masculine_ordinal_indicator" => "masculine", + "right_pointing_double_angle_quotation_mark" => "guillemotright", + "inverted_question_mark" => "questiondown", + "multiplication" => "multiply", + "dotless_i" => "idotless", + "numero" => "number_acronym", + "horizontal_ellipsis" => "ellipsis", + "double_dagger" => "doubledagger", + "per_mille" => "permille", + "em_dash" => "emdash", + "en_dash" => "endash", + "trade_mark" => "trademark", + + # should be synonyms? + "cyrillic_small_letter_soft" => "cyrillic_small_soft_sign", + "cyrillic_small_letter_hard" => "cyrillic_small_hard_sign", + "cyrillic_capital_letter_soft" => "cyrillic_capital_soft_sign", + "cyrillic_capital_letter_hard" => "cyrillic_capital_hard_sign", +}; + +my $table = []; +while () { + if (my ($c, $uni, $name) = /^0x([0-9a-fA-F]{2})[ \t]+U\+([0-9a-fA-F]{4})[ \t]+#(.*)/) { + my $code = hex($c); + next if $code < $start; + + $uni =~ y/[A-F]/[a-f]/; + + $name =~ s/^[ \t]+//; + $name =~ s/[ \t]$//; + $name =~ y/[A-Z]/[a-z]/; + $name =~ s/[ -]+/_/g; + + $name =~ s/^latin_capital_(?:letter|ligature)_([a-z]+)/uc($1)/e; + $name =~ s/^latin_small_(?:letter|ligature)_//; + $name =~ s/^greek_capital_letter_([a-z])/uc($1)/e; + $name =~ s/^greek_small_letter_//; + $name =~ s/^hebrew_letter_//; + $name =~ s/_with_tonos$/_with_accent/; + $name =~ s/_with_dialytika$/_with_diaeresis/; + $name =~ s/_with_dialytika_and_tonos$/_with_diaeresisaccent/; + $name =~ s/^([A-Za-z]+)_with_/$1/; + $name =~ s/^vulgar_fraction_([a-z]+)_([a-z]+)$/$1$2/; + + $name =~ s/acute_accent$/acute/; + $name =~ s/dot_above$/abovedot/; + $name =~ s/double_acute$/doubleacute/; + $name =~ s/ring_above$/ring/; + $name =~ s/_single_quotation_mark$/quote/; + + $name =~ s/_sign$//; + $name =~ s/^final_/final/; + $name =~ s/_\(.*\)$//; + + $table->[$code-$start] = { uni => $uni, keysym => $keysyms->{$name} // $name }; + } else { + die "invalid line: $_"; + } +} + +print "static sym\n"; +print "const ${charset}[] = {\n"; +foreach my $r (@$table) { + if (!defined($r)) { + print "\t{ 0xfffd, \"\" },\n"; + } else { + print "\t{ 0x$r->{uni}, \"$r->{keysym}\" },\n"; + } +} +for (my $i = $start + scalar(@$table); $i < 256; $i++) { + print "\t{ 0xfffd, \"\" },\n"; +} +print "};\n"; diff -Nru kbd-2.0.3/contrib/splitfont.c kbd-2.0.4/contrib/splitfont.c --- kbd-2.0.3/contrib/splitfont.c 2012-02-27 10:27:10.000000000 +0000 +++ kbd-2.0.4/contrib/splitfont.c 2016-12-19 15:03:48.000000000 +0000 @@ -6,29 +6,29 @@ #include #include -void -dosplit (int from, int to, char *fontbuf, int size, char *fontfile) { - int itemsize = size/256; +void dosplit(int from, int to, char *fontbuf, int size, char *fontfile) +{ + int itemsize = size / 256; int i, fd; char *p, *q, s; char filename[4096]; if (from < 0 || from > 255 || to < 0 || to > 255) { fprintf(stderr, "splitfont: bad argument %s,%s\n", - from, to); + from, to); exit(1); } - if(strlen(fontfile) >= sizeof(filename)-4) { + if (strlen(fontfile) >= sizeof(filename) - 4) { fprintf(stderr, "splitfont: ridiculously long name\n"); exit(1); } while (from <= to) { sprintf(filename, "%s.%02x", fontfile, from); - if ((fd = open(filename, O_WRONLY|O_CREAT, 0666)) < 0) { + if ((fd = open(filename, O_WRONLY | O_CREAT, 0666)) < 0) { perror("splitfont"); fprintf(stderr, "cannot open %s for writing\n", filename); } - p = &fontbuf[from*itemsize]; + p = &fontbuf[from * itemsize]; if (write(fd, p, itemsize) != itemsize) { perror("splitfont"); fprintf(stderr, "error writing %s\n", filename); @@ -38,7 +38,8 @@ } } -int main(int argc, char **argv) { +int main(int argc, char **argv) +{ struct stat statbuf; char fontbuf[4096]; int fd; @@ -74,20 +75,20 @@ } p = argv[2]; - while(1) { - to = from = strtoul(p,&q,0); - if(*q == '-') { - p = q+1; - to = strtoul(p,&q,0); + while (1) { + to = from = strtoul(p, &q, 0); + if (*q == '-') { + p = q + 1; + to = strtoul(p, &q, 0); } - if(*q && *q != ',') { + if (*q && *q != ',') { fprintf(stderr, "splitfont: garbage in %s\n", p); exit(1); } dosplit(from, to, fontbuf, statbuf.st_size, argv[1]); if (!*q) break; - p = q+1; + p = q + 1; } return 0; } diff -Nru kbd-2.0.3/contrib/sti.c kbd-2.0.4/contrib/sti.c --- kbd-2.0.3/contrib/sti.c 2012-02-27 10:27:10.000000000 +0000 +++ kbd-2.0.4/contrib/sti.c 2016-12-19 15:03:48.000000000 +0000 @@ -8,29 +8,29 @@ #include #include -int -main(int argc, char **argv) { - int fd; - char *s; +int main(int argc, char **argv) +{ + int fd; + char *s; - if(argc != 3) { - fprintf(stderr, "call: sti tty text\n"); - exit(1); - } - fd = open(argv[1], O_RDONLY); - if(fd < 0) { - perror(argv[1]); - fprintf(stderr, "sti: could not open tty\n"); - exit(1); - } - s = argv[2]; - while(*s) { - if(ioctl(fd, TIOCSTI, s)) { - perror("TIOCSTI"); - fprintf(stderr, "sti: TIOCSTI ioctl failed\n"); - exit(1); - } - s++; - } - return 0; + if (argc != 3) { + fprintf(stderr, "call: sti tty text\n"); + exit(1); + } + fd = open(argv[1], O_RDONLY); + if (fd < 0) { + perror(argv[1]); + fprintf(stderr, "sti: could not open tty\n"); + exit(1); + } + s = argv[2]; + while (*s) { + if (ioctl(fd, TIOCSTI, s)) { + perror("TIOCSTI"); + fprintf(stderr, "sti: TIOCSTI ioctl failed\n"); + exit(1); + } + s++; + } + return 0; } diff -Nru kbd-2.0.3/contrib/vcstime.c kbd-2.0.4/contrib/vcstime.c --- kbd-2.0.3/contrib/vcstime.c 2012-02-27 10:27:10.000000000 +0000 +++ kbd-2.0.4/contrib/vcstime.c 2016-12-19 15:03:48.000000000 +0000 @@ -10,44 +10,42 @@ #include #include -void -fatal(char *s) { - perror(s); - exit(1); +void fatal(char *s) +{ + perror(s); + exit(1); } -int -number_of_columns() { - int fda; - unsigned char rc[2]; /* unsigned: Ranty@soon.com */ - - if((fda = open("/dev/vcsa", O_RDONLY)) < 0 - && (fda = open("/dev/vcsa0", O_RDONLY)) < 0) - fatal("/dev/vcsa"); - if(read(fda, rc, 2) != 2) - fatal("/dev/vcsa"); - close(fda); - return rc[1]; +int number_of_columns() +{ + int fda; + unsigned char rc[2]; /* unsigned: Ranty@soon.com */ + + if ((fda = open("/dev/vcsa", O_RDONLY)) < 0 && (fda = open("/dev/vcsa0", O_RDONLY)) < 0) + fatal("/dev/vcsa"); + if (read(fda, rc, 2) != 2) + fatal("/dev/vcsa"); + close(fda); + return rc[1]; } -int -main(){ - int fd; - int cols = number_of_columns(); - time_t tid; - struct tm *t; - char tijd[10]; - - if((fd = open("/dev/vcs", O_WRONLY)) < 0 - && (fd = open("/dev/vcs0", O_WRONLY)) < 0) - fatal("/dev/vcs"); - - while(1) { - lseek(fd, cols-10, 0); - tid = time(0); - t = localtime(&tid); - sprintf(tijd, " %02d:%02d:%02d", t->tm_hour, t->tm_min, t->tm_sec); - write(fd, tijd, 9); - usleep(500000L); /* or sleep(1); */ - } +int main() +{ + int fd; + int cols = number_of_columns(); + time_t tid; + struct tm *t; + char tijd[10]; + + if ((fd = open("/dev/vcs", O_WRONLY)) < 0 && (fd = open("/dev/vcs0", O_WRONLY)) < 0) + fatal("/dev/vcs"); + + while (1) { + lseek(fd, cols - 10, 0); + tid = time(0); + t = localtime(&tid); + sprintf(tijd, " %02d:%02d:%02d", t->tm_hour, t->tm_min, t->tm_sec); + write(fd, tijd, 9); + usleep(500000L); /* or sleep(1); */ + } } Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/data/consolefonts/eurlatgr.psfu and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/data/consolefonts/eurlatgr.psfu differ Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/data/consolefonts/pancyrillic.f16.psfu and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/data/consolefonts/pancyrillic.f16.psfu differ diff -Nru kbd-2.0.3/data/consolefonts/README.eurlatgr kbd-2.0.4/data/consolefonts/README.eurlatgr --- kbd-2.0.3/data/consolefonts/README.eurlatgr 2015-06-17 11:51:12.000000000 +0000 +++ kbd-2.0.4/data/consolefonts/README.eurlatgr 2016-11-18 11:42:28.000000000 +0000 @@ -65,6 +65,9 @@ CP10029 CP10079 CP10081 +Adobe Latin 1 +Adobe Latin 2 +Adobe Latin 3 Apple CELTIC Apple CENTEURO Apple CROATIAN @@ -90,7 +93,7 @@ Attached is also the complete list of glyphs supported by the font. By remapping identical or similar characters to same positions the number -of glyphs (664) is way over the 512 limit. In the character list the +of glyphs (666) is way over the 512 limit. In the character list the order shows remappings so when you see for example the following, it is possible to figure out what is being remapped to what (you can of course use psfgettable(1) to extract the exact mappings from the font file @@ -230,6 +233,7 @@ U+039A GREEK CAPITAL LETTER KAPPA Κ U+212A KELVIN SIGN K U+004C LATIN CAPITAL LETTER L L +U+2113 SCRIPT SMALL L ℓ U+004D LATIN CAPITAL LETTER M M U+039C GREEK CAPITAL LETTER MU Μ U+004E LATIN CAPITAL LETTER N N @@ -343,6 +347,7 @@ U+00DF LATIN SMALL LETTER SHARP S ß U+03B2 GREEK SMALL LETTER BETA β U+00A0 NO-BREAK SPACE   +U+202F NARROW NO-BREAK SPACE   U+2423 OPEN BOX ␣ U+0104 LATIN CAPITAL LETTER A WITH OGONEK Ą U+0138 LATIN SMALL LETTER KRA ĸ diff -Nru kbd-2.0.3/data/consolefonts/README.eurlatgr.mappings kbd-2.0.4/data/consolefonts/README.eurlatgr.mappings --- kbd-2.0.3/data/consolefonts/README.eurlatgr.mappings 2015-06-17 11:51:19.000000000 +0000 +++ kbd-2.0.4/data/consolefonts/README.eurlatgr.mappings 2016-11-16 22:35:28.000000000 +0000 @@ -77,7 +77,7 @@ 0x049 U+0049 U+0399 0x04a U+004a 0x04b U+004b U+039a U+212a -0x04c U+004c +0x04c U+004c U+2113 0x04d U+004d U+039c 0x04e U+004e U+039d 0x04f U+004f U+039f @@ -161,7 +161,7 @@ 0x09d U+0168 0x09e U+016a 0x09f U+00df U+03b2 -0x0a0 U+00a0 U+2423 +0x0a0 U+00a0 U+202f U+2423 0x0a1 U+0104 0x0a2 U+0138 U+03ba 0x0a3 U+0156 diff -Nru kbd-2.0.3/data/keymaps/i386/carpalx/carpalx-full.map kbd-2.0.4/data/keymaps/i386/carpalx/carpalx-full.map --- kbd-2.0.3/data/keymaps/i386/carpalx/carpalx-full.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-2.0.4/data/keymaps/i386/carpalx/carpalx-full.map 2016-10-31 15:56:02.000000000 +0000 @@ -0,0 +1,16 @@ +# carpalx-full.map +# Layout created by Martin Krzywinski, http://mkweb.bcgsc.ca/carpalx/ +# This keymap file created by Perry Thompson +include "carpalx.map" + +plain keycode 21 = b +shift keycode 21 = B + +plain keycode 22 = y +shift keycode 22 = Y + +plain keycode 24 = v +shift keycode 24 = V + +plain keycode 47 = f +shift keycode 47 = F diff -Nru kbd-2.0.3/data/keymaps/i386/carpalx/carpalx.map kbd-2.0.4/data/keymaps/i386/carpalx/carpalx.map --- kbd-2.0.3/data/keymaps/i386/carpalx/carpalx.map 1970-01-01 00:00:00.000000000 +0000 +++ kbd-2.0.4/data/keymaps/i386/carpalx/carpalx.map 2016-10-31 15:56:02.000000000 +0000 @@ -0,0 +1,78 @@ +# carpalx.map +# Layout created by Martin Krzywinski, http://mkweb.bcgsc.ca/carpalx/ +# This keymap file created by Perry Thompson +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 at at nul nul +keycode 4 = three numbersign + 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 = minus underscore backslash Control_underscore Control_underscore +keycode 13 = equal plus +keycode 14 = Delete +keycode 15 = Tab + shift keycode 15 = Meta_Tab +keycode 16 = q +keycode 17 = g +keycode 18 = m +keycode 19 = l +keycode 20 = w +keycode 21 = y +keycode 22 = f +keycode 23 = u +keycode 24 = b +keycode 25 = semicolon colon +keycode 26 = bracketleft braceleft + control keycode 26 = Escape +keycode 27 = bracketright braceright asciitilde Control_bracketright +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 30 = d +keycode 31 = s +keycode 32 = t +keycode 33 = n +keycode 34 = r +keycode 35 = i +keycode 36 = a +keycode 37 = e +keycode 38 = o +keycode 39 = h +keycode 40 = apostrophe quotedbl + control keycode 40 = Control_g +keycode 41 = grave asciitilde + control keycode 41 = nul +keycode 42 = Shift +keycode 43 = backslash bar + control keycode 43 = Control_backslash +keycode 44 = z +keycode 45 = x +keycode 46 = c +keycode 47 = v +keycode 48 = j +keycode 49 = k +keycode 50 = p +keycode 51 = comma less +keycode 52 = period greater +keycode 53 = slash question + control keycode 53 = Delete +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space + control keycode 57 = nul +keycode 58 = Caps_Lock +keycode 86 = less greater bar +keycode 97 = Control diff -Nru kbd-2.0.3/data/keymaps/i386/qwerty/trq.map kbd-2.0.4/data/keymaps/i386/qwerty/trq.map --- kbd-2.0.3/data/keymaps/i386/qwerty/trq.map 2012-02-27 10:27:11.000000000 +0000 +++ kbd-2.0.4/data/keymaps/i386/qwerty/trq.map 2016-10-31 15:56:02.000000000 +0000 @@ -51,7 +51,7 @@ alt shift keycode 12 = Meta_question alt altgr keycode 12 = Meta_backslash alt control altgr keycode 12 = Meta_Control_backslash -keycode 13 = minus underscore +keycode 13 = minus underscore bar control shift keycode 13 = Control_underscore alt keycode 13 = Meta_minus alt shift keycode 13 = Meta_underscore diff -Nru kbd-2.0.3/data/Makefile.am kbd-2.0.4/data/Makefile.am --- kbd-2.0.3/data/Makefile.am 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/data/Makefile.am 2016-10-31 15:56:02.000000000 +0000 @@ -11,7 +11,7 @@ KEYMAPSUBDIRS = include sun amiga atari i386/azerty i386/bepo i386/dvorak \ i386/fgGIod i386/qwerty i386/qwertz i386/include i386/olpc \ - i386/colemak mac/include mac/all + i386/colemak i386/carpalx mac/include mac/all # Do not use GZIP - it is interpreted by gzip MYGZIP = gzip -f -n -9 diff -Nru kbd-2.0.3/data/Makefile.in kbd-2.0.4/data/Makefile.in --- kbd-2.0.3/data/Makefile.in 2015-07-13 22:17:11.000000000 +0000 +++ kbd-2.0.4/data/Makefile.in 2017-01-08 18:49:38.000000000 +0000 @@ -231,7 +231,7 @@ TRANSDIR = consoletrans KEYMAPSUBDIRS = include sun amiga atari i386/azerty i386/bepo i386/dvorak \ i386/fgGIod i386/qwerty i386/qwertz i386/include i386/olpc \ - i386/colemak mac/include mac/all + i386/colemak i386/carpalx mac/include mac/all # Do not use GZIP - it is interpreted by gzip diff -Nru kbd-2.0.3/debian/changelog kbd-2.0.4/debian/changelog --- kbd-2.0.3/debian/changelog 2016-10-26 21:28:07.000000000 +0000 +++ kbd-2.0.4/debian/changelog 2018-01-22 13:49:48.000000000 +0000 @@ -1,3 +1,50 @@ +kbd (2.0.4-2ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. 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. + - 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. + - debian/control: Depend on console-setup | console-setup-mini, since + console-setup-mini also Depends on kbd now through console-setup-linux. + - Added initramfs hook to have setfont/loadkeys available in initramfs. + - debian/patches/loadkeys_find_usable_console.diff: fix wrong type argument + to ioctl(..., KDGKBMODE), which causes consoles to not be correctly + detected on 64-bit archs. LP: #1621824. + - debian/patches/loadkeys_ckbcomp.diff: Include xmalloc.h to avoid implicit + declaration causing crashes with newer gcc. LP: #1631504. + + -- Julian Andres Klode Mon, 22 Jan 2018 14:49:48 +0100 + +kbd (2.0.4-2) unstable; urgency=medium + + * Drop obsolete lsb-base dependency + * Bump to debhelper compat 10 (automatic dh-autoreconf, etc) + * Bump Standards-Version to 4.1.0 + * Remove myself from uploaders + + -- Andreas Henriksson Fri, 15 Sep 2017 10:33:29 +0200 + +kbd (2.0.4-1) unstable; urgency=medium + + * debian/gbp.conf: Add import-orig upstream-vcs-tag setting + * debian/watch: look for .xz tarballs + * New upstream release. + * Update patches to apply again + * Revert "Add debian/patches/0001-add-configure-flag-to-disable-tests.patch" + - now part of upstream release. + * debian/gbp.conf: switch deprecated section name gbp-pq to pq + * Bump Standards-Version to 4.0.0 + * Use recommended https urls for Vcs-* fields + + -- Andreas Henriksson Tue, 11 Jul 2017 02:43:37 +0200 + kbd (2.0.3-2ubuntu3) zesty; urgency=medium * debian/patches/loadkeys_ckbcomp.diff: Include xmalloc.h to avoid implicit diff -Nru kbd-2.0.3/debian/compat kbd-2.0.4/debian/compat --- kbd-2.0.3/debian/compat 2016-01-06 12:58:25.000000000 +0000 +++ kbd-2.0.4/debian/compat 2017-09-15 16:30:27.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru kbd-2.0.3/debian/control kbd-2.0.4/debian/control --- kbd-2.0.3/debian/control 2016-04-29 18:42:03.000000000 +0000 +++ kbd-2.0.4/debian/control 2018-01-22 13:45:35.000000000 +0000 @@ -3,18 +3,18 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Console utilities maintainers -Uploaders: Michael Schutte , Anton Zinoviev , Andreas Henriksson -Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 9), dh-autoreconf, - autopoint, linuxdoc-tools, gettext, flex, bison, pkg-config, check -Standards-Version: 3.9.6 +Uploaders: Michael Schutte , Anton Zinoviev +Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 10), + linuxdoc-tools, gettext, flex, bison, pkg-config, check +Standards-Version: 4.1.0 Homepage: http://www.kbd-project.org/ -Vcs-Git: git://anonscm.debian.org/pkg-kbd/kbd.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kbd/kbd.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kbd/kbd.git/ +Vcs-Browser: https://anonscm.debian.org/git/pkg-kbd/kbd.git Package: kbd Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, console-setup | console-setup-mini, lsb-base (>= 3.0-10) +Depends: ${shlibs:Depends}, ${misc:Depends}, console-setup | console-setup-mini Provides: console-utilities Conflicts: console-utilities Description: Linux console font and keytable utilities diff -Nru kbd-2.0.3/debian/gbp.conf kbd-2.0.4/debian/gbp.conf --- kbd-2.0.3/debian/gbp.conf 2016-01-05 16:57:01.000000000 +0000 +++ kbd-2.0.4/debian/gbp.conf 2017-09-15 16:30:26.000000000 +0000 @@ -7,5 +7,8 @@ export-dir = ../build-area/ sign-tags = True -[gbp-pq] +[pq] patch-numbers = False + +[import-orig] +upstream-vcs-tag = %(version)s diff -Nru kbd-2.0.3/debian/patches/add-configure-flag-to-disable-tests.patch kbd-2.0.4/debian/patches/add-configure-flag-to-disable-tests.patch --- kbd-2.0.3/debian/patches/add-configure-flag-to-disable-tests.patch 2016-01-05 16:57:01.000000000 +0000 +++ kbd-2.0.4/debian/patches/add-configure-flag-to-disable-tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -From: Mike Frysinger -Date: Mon, 13 Jul 2015 23:38:41 -0400 -Subject: add configure flag to disable tests - -The tests require the check package to be installed. There is a configure -test for this package (which is good), but it's unconditional (which is -bad) as it means you can't even build & install kbd w/out the check -package being installed. - -URL: https://bugs.gentoo.org/485116 -Reported-by: Arfrever Frehtes Taifersar Arahesis ---- - Makefile.am | 5 ++++- - configure.ac | 17 +++++++++++++++-- - 2 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 89c7e83..f855110 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,10 @@ EXTRA_DIST = \ - CREDITS \ - contrib docs rc - --SUBDIRS = src data po tests docs -+SUBDIRS = src data po docs -+if BUILD_TESTS -+SUBDIRS += tests -+endif - - kbd-$(VERSION).tar.xz: - make distcheck -diff --git a/configure.ac b/configure.ac -index d0b462b..f659758 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,8 +10,21 @@ AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz]) - AC_CONFIG_SRCDIR([src/loadkeys.c]) - AC_CONFIG_HEADERS(config.h) -- --PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -+PKG_PROG_PKG_CONFIG -+ -+AC_ARG_ENABLE(tests, -+ [AS_HELP_STRING([--disable-tests], [do not build tests])], -+ [build_tests=$enableval], [build_tests=auto]) -+if test "$build_tests" != "no"; then -+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], -+ [build_tests="yes"], [ -+ if test "$build_tests" = "yes"; then -+ AC_MSG_ERROR([tests requested, but check package is missing]) -+ fi -+ build_tests="no" -+ ]) -+fi -+AM_CONDITIONAL(BUILD_TESTS, test "$build_tests" != "no") - - m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) - AM_SILENT_RULES([yes]) diff -Nru kbd-2.0.3/debian/patches/Change-misleading-kbd_mode-message-for-XLATE-mode.patch kbd-2.0.4/debian/patches/Change-misleading-kbd_mode-message-for-XLATE-mode.patch --- kbd-2.0.3/debian/patches/Change-misleading-kbd_mode-message-for-XLATE-mode.patch 2016-01-05 16:57:01.000000000 +0000 +++ kbd-2.0.4/debian/patches/Change-misleading-kbd_mode-message-for-XLATE-mode.patch 2017-09-15 16:30:27.000000000 +0000 @@ -19,16 +19,14 @@ src/kbd_mode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/kbd_mode.c b/src/kbd_mode.c -index b45ffdf..f654d8e 100644 --- a/src/kbd_mode.c +++ b/src/kbd_mode.c -@@ -88,7 +88,7 @@ main(int argc, char *argv[]){ - printf(_("The keyboard is in mediumraw (keycode) mode\n")); - break; - case K_XLATE: -- printf(_("The keyboard is in the default (ASCII) mode\n")); -+ printf(_("The keyboard is in xlate (8-bit) mode\n")); - break; - case K_UNICODE: - printf(_("The keyboard is in Unicode (UTF-8) mode\n")); +@@ -91,7 +91,7 @@ + printf(_("The keyboard is in mediumraw (keycode) mode\n")); + break; + case K_XLATE: +- printf(_("The keyboard is in the default (ASCII) mode\n")); ++ printf(_("The keyboard is in xlate (8-bit) mode\n")); + break; + case K_UNICODE: + printf(_("The keyboard is in Unicode (UTF-8) mode\n")); diff -Nru kbd-2.0.3/debian/patches/loadkeys_ckbcomp.diff kbd-2.0.4/debian/patches/loadkeys_ckbcomp.diff --- kbd-2.0.3/debian/patches/loadkeys_ckbcomp.diff 2016-10-26 21:30:00.000000000 +0000 +++ kbd-2.0.4/debian/patches/loadkeys_ckbcomp.diff 2018-01-22 13:43:25.000000000 +0000 @@ -9,19 +9,17 @@ src/loadkeys.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) -Index: kbd-2.0.3/src/loadkeys.c -=================================================================== ---- kbd-2.0.3.orig/src/loadkeys.c -+++ kbd-2.0.3/src/loadkeys.c -@@ -22,6 +22,7 @@ - #include "kbd.h" +--- a/src/loadkeys.c ++++ b/src/loadkeys.c +@@ -23,6 +23,7 @@ #include "paths.h" #include "getfd.h" + #include "kbd_error.h" +#include "xmalloc.h" #include "keymap.h" -@@ -242,8 +243,53 @@ main(int argc, char *argv[]) +@@ -240,8 +241,53 @@ int main(int argc, char *argv[]) strcpy(f.pathname, ""); } else if (lk_findfile(argv[i], dirpath, suffixes, &f)) { diff -Nru kbd-2.0.3/debian/patches/loadkeys_find_usable_console.diff kbd-2.0.4/debian/patches/loadkeys_find_usable_console.diff --- kbd-2.0.3/debian/patches/loadkeys_find_usable_console.diff 2016-09-20 17:52:00.000000000 +0000 +++ kbd-2.0.4/debian/patches/loadkeys_find_usable_console.diff 2018-01-22 13:42:59.000000000 +0000 @@ -14,11 +14,9 @@ src/loadkeys.c | 5 ++++- 3 files changed, 58 insertions(+), 1 deletion(-) -Index: kbd-2.0.3/src/getfd.c -=================================================================== ---- kbd-2.0.3.orig/src/getfd.c -+++ kbd-2.0.3/src/getfd.c -@@ -86,3 +86,56 @@ +--- a/src/getfd.c ++++ b/src/getfd.c +@@ -88,3 +88,56 @@ int getfd(const char *fnam) /* total failure */ exit(1); } @@ -75,10 +73,8 @@ + /* total failure */ + exit(1); +} -Index: kbd-2.0.3/src/getfd.h -=================================================================== ---- kbd-2.0.3.orig/src/getfd.h -+++ kbd-2.0.3/src/getfd.h +--- a/src/getfd.h ++++ b/src/getfd.h @@ -2,5 +2,6 @@ #define _GETFD_H @@ -86,19 +82,14 @@ +extern int getfd_keymap(void); #endif /* _GETFD_H */ -Index: kbd-2.0.3/src/loadkeys.c -=================================================================== ---- kbd-2.0.3.orig/src/loadkeys.c -+++ kbd-2.0.3/src/loadkeys.c -@@ -173,7 +173,10 @@ - } - - /* get console */ -- fd = getfd(console); -+ if (console) -+ fd = getfd(console); -+ else -+ fd = getfd_keymap(); +--- a/src/loadkeys.c ++++ b/src/loadkeys.c +@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) if (!(options & OPT_M) && !(options & OPT_B)) { + /* get console */ +- if ((fd = getfd(console)) < 0) ++ if ((fd = console ? getfd(console) : getfd_keymap()) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); + /* check whether the keyboard is in Unicode mode */ diff -Nru kbd-2.0.3/debian/patches/Miscellaneous-manpage-corrections-and-additions.patch kbd-2.0.4/debian/patches/Miscellaneous-manpage-corrections-and-additions.patch --- kbd-2.0.3/debian/patches/Miscellaneous-manpage-corrections-and-additions.patch 2016-01-05 16:57:01.000000000 +0000 +++ kbd-2.0.4/debian/patches/Miscellaneous-manpage-corrections-and-additions.patch 2017-09-15 16:30:27.000000000 +0000 @@ -31,23 +31,19 @@ docs/man/man8misc/setvesablank.8 | 1 - 19 files changed, 24 insertions(+), 31 deletions(-) -diff --git a/docs/man/man1/dumpkeys.1.in b/docs/man/man1/dumpkeys.1.in -index 00f9e66..eef8edb 100644 --- a/docs/man/man1/dumpkeys.1.in +++ b/docs/man/man1/dumpkeys.1.in -@@ -11,7 +11,6 @@ dumpkeys \- dump keyboard translation tables - .BI \-\-charset= charset +@@ -16,7 +16,6 @@ + .B \-v \-\-verbose \-V \-\-version ] .SH DESCRIPTION -.IX "dumpkeys command" "" "\fLdumpkeys\fR command" .LP .B dumpkeys writes, to the standard output, the current contents of the keyboard -diff --git a/docs/man/man1/kbd_mode.1 b/docs/man/man1/kbd_mode.1 -index 960b36c..a3f061f 100644 --- a/docs/man/man1/kbd_mode.1 +++ b/docs/man/man1/kbd_mode.1 -@@ -10,7 +10,6 @@ kbd_mode \- report or set the keyboard mode +@@ -10,7 +10,6 @@ .I -C CONSOLE ] .SH DESCRIPTION @@ -55,11 +51,9 @@ .LP Without argument, .B kbd_mode -diff --git a/docs/man/man1/loadkeys.1.in b/docs/man/man1/loadkeys.1.in -index 95e141a..51e2d40 100644 --- a/docs/man/man1/loadkeys.1.in +++ b/docs/man/man1/loadkeys.1.in -@@ -31,7 +31,6 @@ loadkeys \- load keyboard translation tables +@@ -38,7 +38,6 @@ ] .LP .SH DESCRIPTION @@ -67,11 +61,9 @@ .LP The program .B loadkeys -diff --git a/docs/man/man1/openvt.1 b/docs/man/man1/openvt.1 -index 4712547..074a72e 100644 --- a/docs/man/man1/openvt.1 +++ b/docs/man/man1/openvt.1 -@@ -27,7 +27,14 @@ Force opening a VT without checking whether it is already in use; +@@ -27,7 +27,14 @@ .I "\-e, \-\-exec" Directly execute the given command, without forking. This option is meant for use in @@ -87,11 +79,9 @@ .TP .I "\-s, \-\-switch" Switch to the new VT when starting the command. The VT of the new command -diff --git a/docs/man/man1/psfaddtable.1 b/docs/man/man1/psfaddtable.1 -index ad5c844..611d9bb 100644 --- a/docs/man/man1/psfaddtable.1 +++ b/docs/man/man1/psfaddtable.1 -@@ -6,7 +6,6 @@ psfaddtable \- add a Unicode character table to a console font +@@ -6,7 +6,6 @@ .B psfaddtable .I fontfile tablefile outfile .SH DESCRIPTION @@ -99,11 +89,9 @@ .LP .B psfaddtable takes a console font in .psf format given by -diff --git a/docs/man/man1/psfgettable.1 b/docs/man/man1/psfgettable.1 -index 228be18..5d8e572 100644 --- a/docs/man/man1/psfgettable.1 +++ b/docs/man/man1/psfgettable.1 -@@ -7,7 +7,6 @@ psfgettable \- extract the embedded Unicode character table from a console font +@@ -7,7 +7,6 @@ .I fontfile .RI [ outfile ] .SH DESCRIPTION @@ -111,11 +99,9 @@ .LP .B psfgettable extracts the embedded Unicode character table from a .psf format -diff --git a/docs/man/man1/psfstriptable.1 b/docs/man/man1/psfstriptable.1 -index f7e059d..b11ed4d 100644 --- a/docs/man/man1/psfstriptable.1 +++ b/docs/man/man1/psfstriptable.1 -@@ -6,7 +6,6 @@ psfstriptable \- remove the embedded Unicode character table from a console font +@@ -6,7 +6,6 @@ .B psfstriptable .I fontfile outfile .SH DESCRIPTION @@ -123,11 +109,9 @@ .LP .B psfstriptable reads a .psf format console font from -diff --git a/docs/man/man1/psfxtable.1 b/docs/man/man1/psfxtable.1 -index adc3bc9..5cc89ad 100644 --- a/docs/man/man1/psfxtable.1 +++ b/docs/man/man1/psfxtable.1 -@@ -14,7 +14,6 @@ psfxtable \- handle Unicode character tables for console fonts +@@ -14,7 +14,6 @@ .IR outtable ] .RB [ \-nt ] .SH DESCRIPTION @@ -135,11 +119,9 @@ .LP .B psfxtable handles the embedded Unicode character table for .psf format -diff --git a/docs/man/man1/setleds.1 b/docs/man/man1/setleds.1 -index f484fa0..8909d87 100644 --- a/docs/man/man1/setleds.1 +++ b/docs/man/man1/setleds.1 -@@ -7,7 +7,6 @@ setleds \- set the keyboard leds +@@ -7,7 +7,6 @@ .RI [ "-v" "] [" "-L" "] [" "-D" "] [" "-F" ] .RI [ {+|-}num "] [" {+|-}caps "] [" {+|-}scroll ] .SH DESCRIPTION @@ -147,7 +129,7 @@ .LP .B Setleds reports and changes the led flag settings of a VT -@@ -16,7 +15,7 @@ Without arguments, +@@ -16,7 +15,7 @@ .B setleds prints the current settings. With arguments, it sets or clears the indicated flags @@ -156,7 +138,7 @@ and after the change are reported if the \-v flag is given. .LP The led flag settings are specific for each VT (and the VT -@@ -37,7 +36,7 @@ With option \-L, +@@ -37,7 +36,7 @@ .B setleds will not touch the VT flags, but only change the leds. From this moment on, the leds will no longer reflect the VT flags @@ -165,7 +147,7 @@ .B "setleds -L" (without further arguments) will restore the situation in which the leds reflect the VT flags. -@@ -45,7 +44,7 @@ the leds reflect the VT flags. +@@ -45,7 +44,7 @@ One might use .B setleds in /etc/rc to define the initial and default state of NumLock, @@ -174,7 +156,7 @@ .br .in +5m INITTY=/dev/tty[1-8] -@@ -60,19 +59,19 @@ done +@@ -60,19 +59,19 @@ .in -5m .SH OPTIONS .TP @@ -197,11 +179,9 @@ Clear or set ScrollLock. (At present, pressing the ScrollLock key (or ^S/^Q) stops/starts console output.) -diff --git a/docs/man/man1/setmetamode.1 b/docs/man/man1/setmetamode.1 -index 2a0dd81..fdad981 100644 --- a/docs/man/man1/setmetamode.1 +++ b/docs/man/man1/setmetamode.1 -@@ -8,7 +8,6 @@ setmetamode \- define the keyboard meta key handling +@@ -8,7 +8,6 @@ .I {meta|bit|metabit | esc|prefix|escprefix} ] .SH DESCRIPTION @@ -209,23 +189,19 @@ .LP Without argument, .B setmetamode -diff --git a/docs/man/man1/showkey.1 b/docs/man/man1/showkey.1 -index 654e019..ad63434 100644 --- a/docs/man/man1/showkey.1 +++ b/docs/man/man1/showkey.1 -@@ -5,7 +5,6 @@ showkey \- examine the codes sent by the keyboard +@@ -5,7 +5,6 @@ .SH SYNOPSIS - showkey [\-h|\-\-help] [\-a|\-\-ascii] [\-s|\-\-scancodes] [\-k|\-\-keycodes] + showkey [\-h|\-\-help] [\-a|\-\-ascii] [\-s|\-\-scancodes] [\-k|\-\-keycodes] [\-V|\-\-version] .SH DESCRIPTION -.IX "showkey command" "" "\fLshowkey\fR command" .LP .B showkey prints to standard output either the scan codes or the keycode -diff --git a/docs/man/man1/unicode_start.1 b/docs/man/man1/unicode_start.1 -index b76ccb3..59aae01 100644 --- a/docs/man/man1/unicode_start.1 +++ b/docs/man/man1/unicode_start.1 -@@ -6,7 +6,6 @@ unicode_start \- put keyboard and console in unicode mode +@@ -6,7 +6,6 @@ .B unicode_start .RI [ font " [" umap ]] .SH DESCRIPTION @@ -233,11 +209,9 @@ .LP The .B unicode_start -diff --git a/docs/man/man1/unicode_stop.1 b/docs/man/man1/unicode_stop.1 -index 2fa2015..367de9b 100644 --- a/docs/man/man1/unicode_stop.1 +++ b/docs/man/man1/unicode_stop.1 -@@ -5,7 +5,6 @@ unicode_stop \- revert keyboard and console from unicode mode +@@ -5,7 +5,6 @@ .SH SYNOPSIS .B unicode_stop .SH DESCRIPTION @@ -245,11 +219,9 @@ .LP The .B unicode_stop -diff --git a/docs/man/man1misc/splitfont.1 b/docs/man/man1misc/splitfont.1 -index 573bc3b..43a499c 100644 --- a/docs/man/man1misc/splitfont.1 +++ b/docs/man/man1misc/splitfont.1 -@@ -11,7 +11,7 @@ splitfont +@@ -11,7 +11,7 @@ .SH DESCRIPTION The command @@ -258,8 +230,6 @@ removes characters from a given font file; it removes all the specified characters from the named font file. .P -diff --git a/docs/man/man5/keymaps.5 b/docs/man/man5/keymaps.5 -index 4d9fe52..48aac27 100644 --- a/docs/man/man5/keymaps.5 +++ b/docs/man/man5/keymaps.5 @@ -5,11 +5,6 @@ @@ -274,11 +244,9 @@ .LP These files are used by .BR loadkeys (1) -diff --git a/docs/man/man8/resizecons.8 b/docs/man/man8/resizecons.8 -index 81efa6e..65e724c 100644 --- a/docs/man/man8/resizecons.8 +++ b/docs/man/man8/resizecons.8 -@@ -56,7 +56,11 @@ yourself afterwards. +@@ -56,7 +56,11 @@ .SH BUGS .I resizecons @@ -291,7 +259,7 @@ 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 @@ 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), @@ -299,11 +267,9 @@ +.BR disalloc (8), +.BR fbset (1) -diff --git a/docs/man/man8/setfont.8.in b/docs/man/man8/setfont.8.in -index 5ae63dd..645433b 100644 --- a/docs/man/man8/setfont.8.in +++ b/docs/man/man8/setfont.8.in -@@ -12,7 +12,6 @@ setfont \- load EGA/VGA console screen font +@@ -12,7 +12,6 @@ .RI "[-C " "console" ] .RI "[-h" "H" ] .RI "[-v] [-V]" @@ -311,11 +277,9 @@ .SH DESCRIPTION The .B setfont -diff --git a/docs/man/man8misc/mk_modmap.8 b/docs/man/man8misc/mk_modmap.8 -index 9db007f..782cb5f 100644 --- a/docs/man/man8misc/mk_modmap.8 +++ b/docs/man/man8misc/mk_modmap.8 -@@ -26,7 +26,7 @@ It requires the X header files to be installed. +@@ -26,7 +26,7 @@ (In Debian, these are in the "xlibs-dev" package). .SH NOTES Since XFree version 2.1, X initialises its keymap using the Linux @@ -324,18 +288,16 @@ .SH SEE ALSO .BR dumpkeys (1), -@@ -39,4 +39,4 @@ keymap, so xmodmap will often be superflous. +@@ -39,4 +39,4 @@ .\" .br .\" Pablo Saratxaga .\" .br -.\" Manpage by Alastair McKinstry, \ No newline at end of file +.\" Manpage by Alastair McKinstry, -diff --git a/docs/man/man8misc/setvesablank.8 b/docs/man/man8misc/setvesablank.8 -index 8a48867..9622aac 100644 --- a/docs/man/man8misc/setvesablank.8 +++ b/docs/man/man8misc/setvesablank.8 -@@ -16,7 +16,6 @@ setvesablank \- Turn VESA screen blanking on or off +@@ -16,7 +16,6 @@ ] .LP .SH DESCRIPTION diff -Nru kbd-2.0.3/debian/patches/series kbd-2.0.4/debian/patches/series --- kbd-2.0.3/debian/patches/series 2016-04-29 18:52:38.000000000 +0000 +++ kbd-2.0.4/debian/patches/series 2018-01-22 13:40:05.000000000 +0000 @@ -3,6 +3,5 @@ Various-fixes-to-the-openvt-utility.patch Check-for-X-in-kbd_mode.patch Support-KT_DEAD2-diacritics.patch -add-configure-flag-to-disable-tests.patch loadkeys_find_usable_console.diff loadkeys_ckbcomp.diff diff -Nru kbd-2.0.3/debian/patches/Support-KT_DEAD2-diacritics.patch kbd-2.0.4/debian/patches/Support-KT_DEAD2-diacritics.patch --- kbd-2.0.3/debian/patches/Support-KT_DEAD2-diacritics.patch 2016-01-05 16:57:01.000000000 +0000 +++ kbd-2.0.4/debian/patches/Support-KT_DEAD2-diacritics.patch 2017-09-15 16:30:27.000000000 +0000 @@ -14,13 +14,11 @@ src/libkeymap/ksyms.c | 8 ++++++++ 2 files changed, 11 insertions(+) -diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c -index f1ecbc6..697d78b 100644 --- a/src/libkeymap/dump.c +++ b/src/libkeymap/dump.c -@@ -377,6 +377,9 @@ print_keysym(struct lk_ctx *ctx, FILE *fd, int code, char numeric) +@@ -395,6 +395,9 @@ else if (!numeric && t == KT_META && v < 128 && v < get_sym_size(ctx, KT_LATIN) && - (p = get_sym(ctx, KT_LATIN, v))[0]) + (p = get_sym(ctx, KT_LATIN, v))[0]) fprintf(fd, "Meta_%-11s", p); + else if (!numeric && t == KT_DEAD2 && v < 256 && v < get_sym_size(ctx, KT_LATIN) && + (p = get_sym(ctx, KT_LATIN, v))[0]) @@ -28,11 +26,9 @@ else fprintf(fd, "0x%04x %s", code, plus ? "" : " "); } -diff --git a/src/libkeymap/ksyms.c b/src/libkeymap/ksyms.c -index 22b1336..a54a7aa 100644 --- a/src/libkeymap/ksyms.c +++ b/src/libkeymap/ksyms.c -@@ -302,6 +302,14 @@ ksymtocode(struct lk_ctx *ctx, const char *s, int direction) { +@@ -289,6 +289,14 @@ /* fall through to error printf */ } diff -Nru kbd-2.0.3/debian/patches/Various-fixes-to-the-openvt-utility.patch kbd-2.0.4/debian/patches/Various-fixes-to-the-openvt-utility.patch --- kbd-2.0.3/debian/patches/Various-fixes-to-the-openvt-utility.patch 2016-01-05 16:57:01.000000000 +0000 +++ kbd-2.0.4/debian/patches/Various-fixes-to-the-openvt-utility.patch 2017-09-15 16:30:27.000000000 +0000 @@ -21,11 +21,9 @@ src/openvt.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -diff --git a/src/openvt.c b/src/openvt.c -index 1ba8912..09bed94 100644 --- a/src/openvt.c +++ b/src/openvt.c -@@ -238,10 +238,12 @@ main(int argc, char *argv[]) +@@ -240,10 +240,12 @@ case 'V': print_version_and_exit(); break; @@ -39,7 +37,7 @@ } } -@@ -363,7 +365,8 @@ main(int argc, char *argv[]) +@@ -365,7 +367,8 @@ close(0); close(1); close(2); @@ -49,19 +47,19 @@ if ((dup2(fd, 0) == -1) || (dup2(fd, 1) == -1) || (dup2(fd, 2) == -1)) kbd_error(1, errno, "dup"); -@@ -386,7 +389,6 @@ main(int argc, char *argv[]) +@@ -388,7 +391,6 @@ if (do_wait) { int retval = 0; /* actual value returned form process */ - wait(NULL); waitpid(pid, &retval, 0); - if (show) { /* Switch back... */ -@@ -403,7 +405,10 @@ main(int argc, char *argv[]) + if (show) { /* Switch back... */ +@@ -405,7 +407,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 */ -- return(retval); +- return (retval); + if (WIFEXITED(retval)) + return WEXITSTATUS(retval); + else diff -Nru kbd-2.0.3/debian/rules kbd-2.0.4/debian/rules --- kbd-2.0.3/debian/rules 2016-04-29 21:25:11.000000000 +0000 +++ kbd-2.0.4/debian/rules 2017-09-15 16:30:26.000000000 +0000 @@ -24,7 +24,7 @@ endif %: - dh $@ --with autoreconf + dh $@ override_dh_auto_clean: dh_auto_clean diff -Nru kbd-2.0.3/debian/watch kbd-2.0.4/debian/watch --- kbd-2.0.3/debian/watch 2016-01-06 12:58:25.000000000 +0000 +++ kbd-2.0.4/debian/watch 2017-09-15 16:30:27.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.altlinux.org/pub/people/legion/kbd/kbd-([0-9.]+)\.tar\.gz +http://ftp.altlinux.org/pub/people/legion/kbd/kbd-([0-9.]+)\.tar\.xz diff -Nru kbd-2.0.3/docs/Makefile kbd-2.0.4/docs/Makefile --- kbd-2.0.3/docs/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -187,10 +187,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -203,7 +203,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -220,22 +220,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -248,7 +248,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/man/Makefile kbd-2.0.4/docs/man/Makefile --- kbd-2.0.3/docs/man/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu #am__append_1 = man1misc man8misc subdir = docs/man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -188,10 +188,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -204,7 +204,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -221,22 +221,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -249,7 +249,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/man/man1/dumpkeys.1 kbd-2.0.4/docs/man/man1/dumpkeys.1 --- kbd-2.0.3/docs/man/man1/dumpkeys.1 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/dumpkeys.1 2017-01-08 18:49:50.000000000 +0000 @@ -5,10 +5,15 @@ .SH SYNOPSIS .B dumpkeys [ -.B \-hilfn +.\".B \-1Vdfhiklnstv +.B \-h \-\-help \-i \-\-short\-info \-l \-s \-\-long\-info +.B \-n \-\-numeric \-f \-\-full\-table \-1 \-\-separate-lines +.BI \-S shape +.BI \-\-shape= shape +.B \-t \-\-funcs\-only \-k \-\-keys\-only \-d \-\-compose\-only .BI \-c charset -.B \-\-help \-\-short\-info \-\-long\-info \-\-numeric \-\-full\-table \-\-funcs\-only \-\-keys\-only \-\-compose\-only .BI \-\-charset= charset +.B \-v \-\-verbose \-V \-\-version ] .SH DESCRIPTION .IX "dumpkeys command" "" "\fLdumpkeys\fR command" @@ -121,7 +126,7 @@ .RE .LP .TP -.B \-l \-\-long-info +.B \-l \-s \-\-long-info This option instructs .B dumpkeys to print a long information listing. The output is the same as with the @@ -156,7 +161,10 @@ .BR dumpkeys . .LP .TP -.B \-\-funcs-only +.BI \-S shape " " " " \-\-shape= shape +.LP +.TP +.B \-t \-\-funcs-only When this option is given, .B dumpkeys prints only the function key string definitions. Normally @@ -164,7 +172,7 @@ prints both the key bindings and the string definitions. .LP .TP -.B \-\-keys-only +.B \-k \-\-keys-only When this option is given, .B dumpkeys prints only the key bindings. Normally @@ -172,7 +180,7 @@ prints both the key bindings and the string definitions. .LP .TP -.B \-\-compose-only +.B \-d \-\-compose-only When this option is given, .B dumpkeys prints only the compose key combinations. @@ -197,6 +205,13 @@ loadkeys how to interpret the keymap. (For example, "division" is 0xf7 in iso-8859-1 but 0xba in iso-8859-8.) .LP +.TP +.B \-v \-\-verbose +.LP +.TP +.B \-V \-\-version +Prints version number and exits. +.LP .SH FILES .PD 0 .TP 20 diff -Nru kbd-2.0.3/docs/man/man1/dumpkeys.1.in kbd-2.0.4/docs/man/man1/dumpkeys.1.in --- kbd-2.0.3/docs/man/man1/dumpkeys.1.in 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/dumpkeys.1.in 2016-10-31 15:56:02.000000000 +0000 @@ -5,10 +5,15 @@ .SH SYNOPSIS .B dumpkeys [ -.B \-hilfn +.\".B \-1Vdfhiklnstv +.B \-h \-\-help \-i \-\-short\-info \-l \-s \-\-long\-info +.B \-n \-\-numeric \-f \-\-full\-table \-1 \-\-separate-lines +.BI \-S shape +.BI \-\-shape= shape +.B \-t \-\-funcs\-only \-k \-\-keys\-only \-d \-\-compose\-only .BI \-c charset -.B \-\-help \-\-short\-info \-\-long\-info \-\-numeric \-\-full\-table \-\-funcs\-only \-\-keys\-only \-\-compose\-only .BI \-\-charset= charset +.B \-v \-\-verbose \-V \-\-version ] .SH DESCRIPTION .IX "dumpkeys command" "" "\fLdumpkeys\fR command" @@ -121,7 +126,7 @@ .RE .LP .TP -.B \-l \-\-long-info +.B \-l \-s \-\-long-info This option instructs .B dumpkeys to print a long information listing. The output is the same as with the @@ -156,7 +161,10 @@ .BR dumpkeys . .LP .TP -.B \-\-funcs-only +.BI \-S shape " " " " \-\-shape= shape +.LP +.TP +.B \-t \-\-funcs-only When this option is given, .B dumpkeys prints only the function key string definitions. Normally @@ -164,7 +172,7 @@ prints both the key bindings and the string definitions. .LP .TP -.B \-\-keys-only +.B \-k \-\-keys-only When this option is given, .B dumpkeys prints only the key bindings. Normally @@ -172,7 +180,7 @@ prints both the key bindings and the string definitions. .LP .TP -.B \-\-compose-only +.B \-d \-\-compose-only When this option is given, .B dumpkeys prints only the compose key combinations. @@ -197,6 +205,13 @@ loadkeys how to interpret the keymap. (For example, "division" is 0xf7 in iso-8859-1 but 0xba in iso-8859-8.) .LP +.TP +.B \-v \-\-verbose +.LP +.TP +.B \-V \-\-version +Prints version number and exits. +.LP .SH FILES .PD 0 .TP 20 diff -Nru kbd-2.0.3/docs/man/man1/fgconsole.1 kbd-2.0.4/docs/man/man1/fgconsole.1 --- kbd-2.0.3/docs/man/man1/fgconsole.1 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/fgconsole.1 2016-10-31 15:56:02.000000000 +0000 @@ -5,7 +5,13 @@ .SH SYNOPSIS .B fgconsole -.BI [ "--help" | "--version" | "--next-available" ] +.BI [ +\-h \-\-help +| +\-V \-\-version +| +\-n \-\-next-available +] .SH DESCRIPTION If the active Virtual Terminal is .IR /dev/ttyN , @@ -17,6 +23,12 @@ "serial" is printed instead. .TP +.I \-h \-\-help +Prints short usage message and exits. +.TP +.I \-V \-\-version +Prints version number and exits. +.TP .I \-\-next\-available Will show the next unallocated virtual terminal. Normally 6 virtual terminals are allocated, with number 7 used for X; this will return diff -Nru kbd-2.0.3/docs/man/man1/loadkeys.1 kbd-2.0.4/docs/man/man1/loadkeys.1 --- kbd-2.0.3/docs/man/man1/loadkeys.1 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/loadkeys.1 2017-01-08 18:49:50.000000000 +0000 @@ -5,6 +5,9 @@ .SH SYNOPSIS .B loadkeys [ +.I -a --ascii +] [ +[ .I -b --bkeymap ] [ .I -c --clearcompose @@ -19,6 +22,8 @@ ] [ .I -m --mktable ] [ +.I -p --parse +] [ .I -q --quiet ] [ .I -s --clearstrings @@ -27,6 +32,8 @@ ] [ .I -v --verbose ] [ +.I -V --version +] [ .I filename... ] .LP @@ -177,14 +184,25 @@ option. .SH "OTHER OPTIONS" .TP +.B \-a \-\-ascii +Force conversion to ASCII. +.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 \-p \-\-parse +.B loadkeys +searchs and parses keymap without action. +.TP .B \-q \-\-quiet .B loadkeys suppresses all normal output. +.TP +.B \-V \-\-version +.B loadkeys +prints version number and exits. .SH WARNING Note that anyone having read access to .B /dev/console diff -Nru kbd-2.0.3/docs/man/man1/loadkeys.1.in kbd-2.0.4/docs/man/man1/loadkeys.1.in --- kbd-2.0.3/docs/man/man1/loadkeys.1.in 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/loadkeys.1.in 2016-10-31 15:56:02.000000000 +0000 @@ -5,6 +5,9 @@ .SH SYNOPSIS .B loadkeys [ +.I -a --ascii +] [ +[ .I -b --bkeymap ] [ .I -c --clearcompose @@ -19,6 +22,8 @@ ] [ .I -m --mktable ] [ +.I -p --parse +] [ .I -q --quiet ] [ .I -s --clearstrings @@ -27,6 +32,8 @@ ] [ .I -v --verbose ] [ +.I -V --version +] [ .I filename... ] .LP @@ -177,14 +184,25 @@ option. .SH "OTHER OPTIONS" .TP +.B \-a \-\-ascii +Force conversion to ASCII. +.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 \-p \-\-parse +.B loadkeys +searchs and parses keymap without action. +.TP .B \-q \-\-quiet .B loadkeys suppresses all normal output. +.TP +.B \-V \-\-version +.B loadkeys +prints version number and exits. .SH WARNING Note that anyone having read access to .B /dev/console diff -Nru kbd-2.0.3/docs/man/man1/Makefile kbd-2.0.4/docs/man/man1/Makefile --- kbd-2.0.3/docs/man/man1/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu am__append_1 = vlock.1 subdir = docs/man/man1 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ @@ -181,10 +181,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -197,7 +197,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -214,22 +214,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -242,7 +242,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/man/man1/showkey.1 kbd-2.0.4/docs/man/man1/showkey.1 --- kbd-2.0.3/docs/man/man1/showkey.1 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man1/showkey.1 2016-10-31 15:56:02.000000000 +0000 @@ -3,7 +3,7 @@ .SH NAME showkey \- examine the codes sent by the keyboard .SH SYNOPSIS -showkey [\-h|\-\-help] [\-a|\-\-ascii] [\-s|\-\-scancodes] [\-k|\-\-keycodes] +showkey [\-h|\-\-help] [\-a|\-\-ascii] [\-s|\-\-scancodes] [\-k|\-\-keycodes] [\-V|\-\-version] .SH DESCRIPTION .IX "showkey command" "" "\fLshowkey\fR command" .LP @@ -66,6 +66,10 @@ Starts .B showkey in `ascii' dump mode. +.TP +\-V \-\-version +.B showkey +prints version number and exits. .SH "2.6 KERNELS" In 2.6 kernels key codes lie in the range 1-255, instead of 1-127. Key codes larger than 127 are returned as three bytes of which the diff -Nru kbd-2.0.3/docs/man/man1misc/Makefile kbd-2.0.4/docs/man/man1misc/Makefile --- kbd-2.0.3/docs/man/man1misc/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man1misc/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs/man/man1misc DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -179,10 +179,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -195,7 +195,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -212,22 +212,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -240,7 +240,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/man/man5/Makefile kbd-2.0.4/docs/man/man5/Makefile --- kbd-2.0.3/docs/man/man5/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man5/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs/man/man5 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -179,10 +179,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -195,7 +195,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -212,22 +212,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -240,7 +240,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/man/man8/kbdrate.8 kbd-2.0.4/docs/man/man8/kbdrate.8 --- kbd-2.0.3/docs/man/man8/kbdrate.8 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man8/kbdrate.8 2016-10-31 15:56:02.000000000 +0000 @@ -48,7 +48,7 @@ in 250 ms steps. For SPARC systems, possible values are between 10 ms and 1440 ms, in 10 ms steps. .TP -.B \-V +.B \-V \-\-version Display a version number and exit. .SH BUGS Not all keyboards support all rates. diff -Nru kbd-2.0.3/docs/man/man8/Makefile kbd-2.0.4/docs/man/man8/Makefile --- kbd-2.0.3/docs/man/man8/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man8/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs/man/man8 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/loadunimap.8.in \ @@ -180,10 +180,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -196,7 +196,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -213,22 +213,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -241,7 +241,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/man/man8/mapscrn.8 kbd-2.0.4/docs/man/man8/mapscrn.8 --- kbd-2.0.3/docs/man/man8/mapscrn.8 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man8/mapscrn.8 2017-01-08 18:49:50.000000000 +0000 @@ -3,7 +3,7 @@ .SH NAME mapscrn \- load screen output mapping table .SH SYNOPSIS -.BR mapscrn " [" -v "] [" -o +.BR mapscrn " [" -V "] [" -v "] [" -o .IR map.orig ] .I mapfile .SH DESCRIPTION @@ -96,6 +96,13 @@ Note that control characters (with codes < 32) cannot be re-mapped with .I mapscrn because they have special meaning for the driver. +.SH OTHER OPTIONS +.TP +.B \-V +Prints version number and exits. +.TP +.B \-v +Be verbose. .SH FILES .I @DATADIR@/consoletrans is the default directory for screen mappings. diff -Nru kbd-2.0.3/docs/man/man8/mapscrn.8.in kbd-2.0.4/docs/man/man8/mapscrn.8.in --- kbd-2.0.3/docs/man/man8/mapscrn.8.in 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man8/mapscrn.8.in 2016-10-31 15:56:02.000000000 +0000 @@ -3,7 +3,7 @@ .SH NAME mapscrn \- load screen output mapping table .SH SYNOPSIS -.BR mapscrn " [" -v "] [" -o +.BR mapscrn " [" -V "] [" -v "] [" -o .IR map.orig ] .I mapfile .SH DESCRIPTION @@ -96,6 +96,13 @@ Note that control characters (with codes < 32) cannot be re-mapped with .I mapscrn because they have special meaning for the driver. +.SH OTHER OPTIONS +.TP +.B \-V +Prints version number and exits. +.TP +.B \-v +Be verbose. .SH FILES .I @DATADIR@/consoletrans is the default directory for screen mappings. diff -Nru kbd-2.0.3/docs/man/man8/setvtrgb.8 kbd-2.0.4/docs/man/man8/setvtrgb.8 --- kbd-2.0.3/docs/man/man8/setvtrgb.8 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man8/setvtrgb.8 2016-10-31 15:56:02.000000000 +0000 @@ -4,7 +4,7 @@ setvtrgb \- set the virtual terminal RGB colors .SH SYNOPSIS .B setvtrgb -.I vga|FILE|\- +.I \-h|\-V|vga|FILE|\- .SH DESCRIPTION The .I setvtrgb @@ -30,6 +30,14 @@ And then edit the values in .B FILE +.SH OTHER OPTIONS +.TP +\-h +Prints usage message and exits. +.TP +\-V +Prints version number and exists. + .SH AUTHOR The utility is written by Alexey Gladkov, Seth Forshee, Dustin Kirkland. diff -Nru kbd-2.0.3/docs/man/man8/showconsolefont.8 kbd-2.0.4/docs/man/man8/showconsolefont.8 --- kbd-2.0.3/docs/man/man8/showconsolefont.8 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/docs/man/man8/showconsolefont.8 2016-10-31 15:56:02.000000000 +0000 @@ -6,10 +6,12 @@ .SH SYNOPSIS .B showconsolefont [ -.B \-V +.B \-V | \-\-version ] [ .B \-v ] [ +.B \-i +] [ .B \-C .I console ] @@ -20,6 +22,8 @@ command outputs the current console font to stdout. The option \-v prints additional information, while the option \-V prints the program version number. +The option \-i doesn't print out the font table, +just shows ROWSxCOLSxCOUNT and exits. On Linux 2.6.1 and later, the option \-C allows one to indicate the console involved. Its argument is a pathname. diff -Nru kbd-2.0.3/docs/man/man8misc/Makefile kbd-2.0.4/docs/man/man8misc/Makefile --- kbd-2.0.3/docs/man/man8misc/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/man/man8misc/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs/man/man8misc DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -179,10 +179,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -195,7 +195,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -212,22 +212,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -240,7 +240,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/reference/libkeymap/Doxyfile kbd-2.0.4/docs/reference/libkeymap/Doxyfile --- kbd-2.0.3/docs/reference/libkeymap/Doxyfile 2015-01-25 12:17:39.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/Doxyfile 2016-12-15 15:02:39.000000000 +0000 @@ -32,7 +32,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.0.2 +PROJECT_NUMBER = 2.0.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/annotated.html kbd-2.0.4/docs/reference/libkeymap/html/annotated.html --- kbd-2.0.3/docs/reference/libkeymap/html/annotated.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/annotated.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -66,7 +66,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/array_8h.html kbd-2.0.4/docs/reference/libkeymap/html/array_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/array_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/array_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -317,7 +317,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/array_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/array_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/array_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/array_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -84,7 +84,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/charset_8h.html kbd-2.0.4/docs/reference/libkeymap/html/charset_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/charset_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/charset_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -138,7 +138,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/charset_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/charset_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/charset_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/charset_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -70,7 +70,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/classes.html kbd-2.0.4/docs/reference/libkeymap/html/classes.html --- kbd-2.0.3/docs/reference/libkeymap/html/classes.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/classes.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -70,7 +70,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/common_8h.html kbd-2.0.4/docs/reference/libkeymap/html/common_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/common_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/common_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -290,7 +290,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/common_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/common_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/common_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/common_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -86,7 +86,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/context_8h.html kbd-2.0.4/docs/reference/libkeymap/html/context_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/context_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/context_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -166,7 +166,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/context_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/context_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/context_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/context_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -89,7 +89,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/Doxyheader.html kbd-2.0.4/docs/reference/libkeymap/html/Doxyheader.html --- kbd-2.0.3/docs/reference/libkeymap/html/Doxyheader.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/Doxyheader.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -59,7 +59,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/dump_8h.html kbd-2.0.4/docs/reference/libkeymap/html/dump_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/dump_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/dump_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -605,7 +605,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/dump_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/dump_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/dump_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/dump_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -111,7 +111,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/files.html kbd-2.0.4/docs/reference/libkeymap/html/files.html --- kbd-2.0.3/docs/reference/libkeymap/html/files.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/files.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -71,7 +71,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/findfile_8h.html kbd-2.0.4/docs/reference/libkeymap/html/findfile_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/findfile_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/findfile_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -177,7 +177,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/findfile_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/findfile_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/findfile_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/findfile_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -77,7 +77,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/functions.html kbd-2.0.4/docs/reference/libkeymap/html/functions.html --- kbd-2.0.3/docs/reference/libkeymap/html/functions.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/functions.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -121,7 +121,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/functions_vars.html kbd-2.0.4/docs/reference/libkeymap/html/functions_vars.html --- kbd-2.0.3/docs/reference/libkeymap/html/functions_vars.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/functions_vars.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -121,7 +121,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/globals_defs.html kbd-2.0.4/docs/reference/libkeymap/html/globals_defs.html --- kbd-2.0.3/docs/reference/libkeymap/html/globals_defs.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/globals_defs.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -82,7 +82,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/globals_enum.html kbd-2.0.4/docs/reference/libkeymap/html/globals_enum.html --- kbd-2.0.3/docs/reference/libkeymap/html/globals_enum.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/globals_enum.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -76,7 +76,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/globals_eval.html kbd-2.0.4/docs/reference/libkeymap/html/globals_eval.html --- kbd-2.0.3/docs/reference/libkeymap/html/globals_eval.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/globals_eval.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -103,7 +103,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/globals_func.html kbd-2.0.4/docs/reference/libkeymap/html/globals_func.html --- kbd-2.0.3/docs/reference/libkeymap/html/globals_func.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/globals_func.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -254,7 +254,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/globals.html kbd-2.0.4/docs/reference/libkeymap/html/globals.html --- kbd-2.0.3/docs/reference/libkeymap/html/globals.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/globals.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -337,7 +337,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/globals_type.html kbd-2.0.4/docs/reference/libkeymap/html/globals_type.html --- kbd-2.0.3/docs/reference/libkeymap/html/globals_type.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/globals_type.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -70,7 +70,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/index.html kbd-2.0.4/docs/reference/libkeymap/html/index.html --- kbd-2.0.3/docs/reference/libkeymap/html/index.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/index.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -63,7 +63,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/kernel_8h.html kbd-2.0.4/docs/reference/libkeymap/html/kernel_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/kernel_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/kernel_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -222,7 +222,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/kernel_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/kernel_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/kernel_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/kernel_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -74,7 +74,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/kmap_8h.html kbd-2.0.4/docs/reference/libkeymap/html/kmap_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/kmap_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/kmap_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -673,7 +673,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/kmap_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/kmap_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/kmap_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/kmap_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -96,7 +96,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/logging_8h.html kbd-2.0.4/docs/reference/libkeymap/html/logging_8h.html --- kbd-2.0.3/docs/reference/libkeymap/html/logging_8h.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/logging_8h.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -327,7 +327,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/logging_8h_source.html kbd-2.0.4/docs/reference/libkeymap/html/logging_8h_source.html --- kbd-2.0.3/docs/reference/libkeymap/html/logging_8h_source.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/logging_8h_source.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -85,7 +85,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/structkmapinfo.html kbd-2.0.4/docs/reference/libkeymap/html/structkmapinfo.html --- kbd-2.0.3/docs/reference/libkeymap/html/structkmapinfo.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/structkmapinfo.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -209,7 +209,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/structlk__array.html kbd-2.0.4/docs/reference/libkeymap/html/structlk__array.html --- kbd-2.0.3/docs/reference/libkeymap/html/structlk__array.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/structlk__array.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -138,7 +138,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/structlkfile.html kbd-2.0.4/docs/reference/libkeymap/html/structlkfile.html --- kbd-2.0.3/docs/reference/libkeymap/html/structlkfile.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/structlkfile.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -119,7 +119,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/html/structlk__kbdiacr.html kbd-2.0.4/docs/reference/libkeymap/html/structlk__kbdiacr.html --- kbd-2.0.3/docs/reference/libkeymap/html/structlk__kbdiacr.html 2015-05-31 19:20:14.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/html/structlk__kbdiacr.html 2016-12-15 15:02:39.000000000 +0000 @@ -23,7 +23,7 @@
libkeymap -  2.0.2 +  2.0.3
Library to manage the Linux keymaps
@@ -119,7 +119,7 @@
-Generated on Sun May 31 2015 22:20:14 for libkeymap by   +Generated on Thu Dec 15 2016 16:02:39 for libkeymap by   doxygen 1.7.6.1
diff -Nru kbd-2.0.3/docs/reference/libkeymap/Makefile kbd-2.0.4/docs/reference/libkeymap/Makefile --- kbd-2.0.3/docs/reference/libkeymap/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/reference/libkeymap/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -49,8 +49,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs/reference/libkeymap DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -177,10 +177,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -193,7 +193,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -210,22 +210,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = $(docdir)/html includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -238,7 +238,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -Nru kbd-2.0.3/docs/reference/Makefile kbd-2.0.4/docs/reference/Makefile --- kbd-2.0.3/docs/reference/Makefile 2015-07-13 22:17:18.000000000 +0000 +++ kbd-2.0.4/docs/reference/Makefile 2017-01-08 18:49:50.000000000 +0000 @@ -48,8 +48,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = docs/reference DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -187,10 +187,10 @@ PACKAGE = kbd PACKAGE_BUGREPORT = gladkov.alexey@gmail.com PACKAGE_NAME = kbd -PACKAGE_STRING = kbd 2.0.3 +PACKAGE_STRING = kbd 2.0.4 PACKAGE_TARNAME = kbd PACKAGE_URL = http://kbd-project.org/ -PACKAGE_VERSION = 2.0.3 +PACKAGE_VERSION = 2.0.4 PAM_LIBS = -lpam -lpam_misc PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config @@ -203,7 +203,7 @@ SHELL = /bin/sh STRIP = strip USE_NLS = yes -VERSION = 2.0.3 +VERSION = 2.0.4 XGETTEXT = /usr/bin/xgettext YACC = bison -y YFLAGS = @@ -220,22 +220,22 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info @@ -248,7 +248,7 @@ mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin @@ -259,7 +259,7 @@ top_build_prefix = ../../ top_builddir = ../.. top_srcdir = ../.. -SUBDIRS = libkeymap +#SUBDIRS = libkeymap all: all-recursive .SUFFIXES: diff -Nru kbd-2.0.3/m4/libtool.m4 kbd-2.0.4/m4/libtool.m4 --- kbd-2.0.3/m4/libtool.m4 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/m4/libtool.m4 2016-11-06 19:46:28.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +aarch64*-*linux*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext diff -Nru kbd-2.0.3/Makefile.am kbd-2.0.4/Makefile.am --- kbd-2.0.3/Makefile.am 2013-10-01 08:10:18.000000000 +0000 +++ kbd-2.0.4/Makefile.am 2016-10-31 15:56:01.000000000 +0000 @@ -8,7 +8,10 @@ CREDITS \ contrib docs rc -SUBDIRS = src data po tests docs +SUBDIRS = src data po docs +if BUILD_TESTS +SUBDIRS += tests +endif kbd-$(VERSION).tar.xz: make distcheck diff -Nru kbd-2.0.3/Makefile.in kbd-2.0.4/Makefile.in --- kbd-2.0.3/Makefile.in 2015-07-13 22:17:12.000000000 +0000 +++ kbd-2.0.4/Makefile.in 2017-01-08 18:49:38.000000000 +0000 @@ -50,6 +50,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@BUILD_TESTS_TRUE@am__append_1 = tests subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -102,7 +103,7 @@ distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = src data po docs tests DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -290,7 +291,7 @@ CREDITS \ contrib docs rc -SUBDIRS = src data po tests docs +SUBDIRS = src data po docs $(am__append_1) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -Nru kbd-2.0.3/NEWS kbd-2.0.4/NEWS --- kbd-2.0.3/NEWS 2012-02-27 10:27:10.000000000 +0000 +++ kbd-2.0.4/NEWS 2016-11-28 12:40:44.000000000 +0000 @@ -0,0 +1 @@ +See version control history. Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/cs.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/cs.gmo differ diff -Nru kbd-2.0.3/po/cs.po kbd-2.0.4/po/cs.po --- kbd-2.0.3/po/cs.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/cs.po 2017-01-08 18:38:45.000000000 +0000 @@ -1,53 +1,64 @@ # Czech translation of kbd. # This file is distributed under the same license as the kbd package. # Miloslav Trmac , 2003, 2004, 2007, 2008. -# Petr Pisar , 2012, 2014, 2015. +# Petr Pisar , 2012, 2014, 2015, 2016. # # keymap → mapa kláves # msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.3-rc1\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2015-07-02 20:56+0200\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-30 18:14+01:00\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "použití: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Nebylo možné získat deskriptor souboru odkazující na konzolu" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: neznámý přepínač\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "0: neplatné číslo VT\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "VT 1 je konzole a nemůže být dealokován\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "nelze dealokovat konzolu %d: IOCTL VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "verze dumpkeys %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -57,13 +68,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -73,16 +85,17 @@ "\n" "\t-h --help\t zobrazit tento text nápovědy\n" "\t-i --short-info\t zobrazit informace o ovladači klávesnice\n" -"\t-l --long-info\t zobrazit výše uvedené a symboly známé v loadkeys\n" +"\t-l -s --long-info\t zobrazit výše uvedené a symboly známé v loadkeys\n" "\t-n --numeric\t zobrazit tabulku kláves v šestnáctkovém zápisu\n" "\t-f --full-table\t nepoužívat zkratky, jeden řádek na kód klávesy\n" "\t-1 --separate-lines jeden řádek na dvojici (modifikátor,kód klávesy)\n" -"\t --funcs-only\t zobrazit jen řetězce funkčních kláves\n" -"\t --keys-only\t zobrazit jen přiřazení kláves\n" -"\t --compose-only zobrazit jen kombinace kláves compose\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t zobrazit jen řetězce funkčních kláves\n" +"\t-k --keys-only\t zobrazit jen přiřazení kláves\n" +"\t-d --compose-only zobrazit jen kombinace kláves compose\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -91,17 +104,26 @@ "\t\t\t interpretovat kódy akce znaků, že jsou z\n" "\t\t\t určené znakové sady\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t zobrazí číslo verze\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "neznámá znaková sada %s - ignoruji požadavek na znakovou sadu\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: chyba při čtení režimu klávesnice: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -112,7 +134,7 @@ "(číselná hodnota, symbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -135,41 +157,41 @@ "\t-V --version zobrazit verzi programu\n" "\t-n --next-available zobrazit číslo dalšího nealokovaného VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Nemohu číst VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Nebylo možné otevřít %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Nebylo možné získat deskriptor souboru odkazující na konzolu\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "použití: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Jednoduché scankódy xx (hex) versus kódy kláves (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "0 je chyba; pro 1-88 (0x01-0x58) se scankód rovná kódu klávesy\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "pro 1-%d (0x01-0x%02x) se scankód rovná kódu klávesy\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -180,12 +202,12 @@ "\n" "Uvozené scankódy e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "získání kódu klávesy pro scankód 0x%x selhalo: IOCTL KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -194,93 +216,99 @@ "Použití:\n" "\t%s [-s] [-C konzola]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Použití: %1$s [-C ZAŘÍZENÍ] getmode [text|graphics]\n" " nebo: %1$s [-C ZAŘÍZENÍ] gkbmode [raw|xlate|mediumraw|unicode]\n" " nebo: %1$s [-C ZAŘÍZENÍ] gkbmeta [metabit|escprefix]\n" " nebo: %1$s [-C ZAŘÍZENÍ] gkbled [scrolllock|numlock|capslock]\n" +"Další přepínače:\n" +" -h zobrazí tento návod na použití\n" +" -V zobrazí číslo verze\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Chyba: Málo argumentů.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Chyba: Nerozpoznaná akce: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "použití: kbd_mode [-a|-u|-k|-s] [-C zařízení]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Klávesnice je v přímém režimu (scankódy)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Klávesnice je v prostředně přímém režimu (kódy kláves)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Klávesnice je v implicitním režimu (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Klávesnice je v režimu Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Klávesnice je v nějakém neznámém režimu\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Rychlost opakování nastavena %.1f z/s (zpoždění = %d ms)\n" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Použití: kbdrate [-V] [-s] [-r rychlost] [-d zpoždění]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "Použití: kbdrate [-V | --version] [-s] [-r rychlost] [-d zpoždění]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Nemohu otevřít /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "chyba: getfont zavoláno s count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "bug: getfont pomocí GIO_FONT potřebuje buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: nedostatek paměti\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "divné… ct změněno z %d na %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -289,169 +317,169 @@ "Vypadá to, že toto jádro je starší než 1.1.92.\n" "Žádná tabulka mapování Unicodu nebyla zavedena.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "nedostatek paměti" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "nelze inicializovat pole: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Chyba při zápisu mapy do souboru" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "nemožné: není meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: chyba na indexu %d v tabulce %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: Nelze získat řetězec funkční klávesy" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: Nelze získat tabulku diakritik" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "nelze získat mapy kláves %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "odnastavení klávesy %d z tabulky %d selhalo" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key zavolán se špatným kódem klávesy %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "přidání mapy %d rozbije explicitní řádek s mapou kláves" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "navázání klávesy %d na tabulku %d selhalo" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "nemožná chyba v lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "symbol nelze získat podle chybného typu: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "symbol typu %d nelze získat podle chybného indexu: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "předpokládá se iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "předpokládá se iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "předpokládá se iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "předpokládá se iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "předpokládá se iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "neznámý symbol klávesy '%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: nebylo možné přepnout do režimu Unicode" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Mapa kláves %d: Povolení zamítnuto" # Last string is optional " FAILED" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "kód klávesy %d, tabulka %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " CHYBA" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "navázání klávesy %d na hodnotu %d selhalo" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "dealokace mapy kláves %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: mapu kláves %d nebylo možné dealokovat" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: mapu kláves nelze dealokovat nebo vyprázdnit" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "KDSKBMODE: %s: nebylo možné vrátit se do původního režimu klávesnice" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "navázání řetězce „%s“ na funkci %s selhalo" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "vyprázdnění řetězce %s selhalo" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "příliš mnoho definic skladby" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -469,7 +497,7 @@ "\n" "Změněno %d klíčů" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -477,7 +505,7 @@ msgstr[1] "Změněny %d řetězce" msgstr[2] "Změněno %d řetězců" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" @@ -485,51 +513,51 @@ msgstr[1] "Zavedeny %d definice skladby" msgstr[2] "Zavedeno %d definic skladby" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Žádná změna v definicích skladby)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "rozsah kódů kláves podporovaný jádrem: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "maximální počet akcí přiřaditelných klávese: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "počet skutečně používaných klávesových map: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "z nich %u dynamicky alokovaných\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "rozsahy kódů akce podporované jádrem:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "počet funkčních klávesa podporovaných jádrem: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "maximální počet definic compose: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "počet skutečně používaných definic compose: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -540,12 +568,12 @@ "Jsou rozpoznávána následující synonyma:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s znamená %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -554,7 +582,7 @@ "\n" "Rozpoznávané názvy modifikátorů a jejich čísla sloupců:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -576,6 +604,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys verze %s\n" "\n" @@ -596,18 +625,19 @@ " -s --clearstrings vyprázdní jadernou tabulku řetězců\n" " -u --unicode vynutí převod do Unicodu\n" " -v --verbose hlásí změny\n" +" -V --version zobrazí číslo verze\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s z %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Přepínače --unicode a --ascii se vzájemně vylučují\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -616,7 +646,7 @@ "%s: pozor: zavádí se neunikódová mapa kláves na unikódové konzoly\n" " (nechtěli jste snad „kbd_mode -a“?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -625,17 +655,17 @@ "%s: pozor: zavádí se unikódová mapa kláves na neunikódové konzoly\n" " (nechtěli jste snad „kbd_mode -u“?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "%s nelze nalézt\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "soubor%s nelze otevřít\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -644,27 +674,27 @@ "Použití:\n" "\t%s [-C konzola] [-o mapa.původní]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Špatný řádek vstupu: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Číslo glyphu (0x%x) větší než délka písma\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Špatný konec rozsahu (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" msgstr "%s: Špatný rozsah Unicode odpovídající rozsahu pozic písma 0x%x-0x%x\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -673,22 +703,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: smetí na konci (%s) ignorováno\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Načítám mapu unicode ze souboru %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Varování: řádek příliš dlouhý\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -697,80 +727,80 @@ "%s: nenačítám prázdnou unimap\n" "(pokud na tom trváte: použijte přepínač -f pro vnucení)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "položka" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "položek" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Uložena mapa unicode do `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Připojena mapa Unicode\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "použití: %s [-v] [-o mapa.původní] soubor-mapy\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "použití: %s [-V] [-v] [-o mapa.původní] soubor-mapy\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: nemohu otevřít soubor mapy _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Nemohu stat soubor mapy" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Načítám binární mapu obrazovky přímo do písma ze souboru %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Chyba při čtení mapy ze souboru `%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Načítám binární mapu obrazovky unicode ze souboru %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Načítám symbolickou mapu obrazovky ze souboru %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Chyba při zpracovávání symbolické mapy z `%s', řádek %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Chyba při zápisu mapy do souboru\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Nemohu číst mapu konzoly\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Mapa obrazovky uložena v `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -808,183 +838,179 @@ " -h, --help vypíše stručný návod na použití.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Vlastníka současného TTY nebylo možné zjistit!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Nedovolené číslo VT" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Jen superuživatel může používat přepínač -u." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Nebylo možné získat deskriptor souboru odkazující na konzolu" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Nebylo možné nalézt volný VT" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" "Nelze zkontrolovat, jestli VT %d je volný. Použijte „%s -f“ k vynucení." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "VT %d se používá; příkaz přerušen; použijte „%s -f“ pro vynucení." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Příkaz nelze nalézt." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Nelze nastavit novou relaci" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "%s nelze otevřít" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Použije se VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "%s nelze otevřít pro čtení i zápis" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "VT %d se nepodařilo aktivovat" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Aktivace přerušena?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Nebylo možné dealokovat konzolu %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: krátká tabulka unicode ucs2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: krátká tabulka unicode utf8\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: špatné utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: neznámá chyba utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: krátká tabulka unicode\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Chyba při čtení vstupního písma" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Špatné volání readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Nepodporovaný režim souboru psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Nepodporovaná verze psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: nulová délka vstupního písma?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: nulová velikost vstupního znaku?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Vstupní soubor: špatná délka vstupu (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Vstupní soubor: smetí na konci\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: neplatné unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Nemohu zapsat hlavičku souboru písma" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Nemohu zapsat soubor písma" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Varování: řádek příliš dlouhý\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Špatný řádek vstupu: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Číslo glyphu (0x%lx) za koncem písma\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Špatný konec rozsahu (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format 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 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -993,7 +1019,7 @@ "Použití:\n" "\t%s vstupnípísmo vstupnítabulka výstupnípísmo\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1002,7 +1028,7 @@ "Použití:\n" "\t%s vstupnípísmo [výstupnítabulka]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1011,7 +1037,7 @@ "Použití:\n" "\t%s vstupnípísmo výstupnípísmo\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1021,22 +1047,22 @@ "\t%s [-i vstupnípísmo] [-o výstupnípíso] [-it vstupnítabulka]\n" " [-ot výstupnítabulka] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Špatné magické číslo v %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: soubor psf s neznámým magickým číslem\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: vstupní písmo nemá index\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: nemohu najít soubor videorežimu %s\n" @@ -1045,29 +1071,29 @@ msgid "Invalid number of lines\n" msgstr "Neplatný počet řádků\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Starý režim: %d×%d New mode: %d×%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Starý počet #scanline: %d Nový #scanline: %d Výška znaku: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: příkaz `%s' selhal\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1080,41 +1106,41 @@ "nebo: resizecons -lines ŘÁDKŮ, ke ŘÁDKŮ je jedno z 25, 28, 30, 34, 36, 40, " "44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: nemohu získat oprávnění k I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "použití: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "Chyba při čtení %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "nemohu načíst %s a nemohu ioctl dump\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "nemohu načíst %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Divné ... obrazovka je zároveň %d×%d a %d×%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Chyba při zápisu zachycení obrazovky\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1169,12 +1195,12 @@ " -V\t\tVytisknout verzi a skončit.\n" "Soubory jsou načítány z aktuálního adresáře nebo %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: příliš mnoho vstupních souborů\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1183,122 +1209,122 @@ "setfont: nemohu zároveň obnovovat z ROM znaků a ze souboru. Písmo " "nezměněno.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Špatná výška znaku %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Špatná šířka znaku %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: pozice písma 32 je neprázdná\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: vymazal jsem ji\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: pozadí bude vypadat divně\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Načítám %d-znakové písmo %d×%d ze souboru %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Načítám %d-znakové písmo %d×%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Načítám %d-znakové písmo %d×%d (%d) ze souboru %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Načítám %d-znakové písmo %d×%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: chyba v do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Načítám mapovací tabulku Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Nemohu otevřít soubor písma %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "Při načítání více písem musí všechna být písma psf - %s není\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Načten %d-znakové písmo %d×%d ze souboru %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Při načítání více písem musí všechna míst stejnou výšku\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Při načítání více písem musí všechna míst stejnou šířku\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Nemohu najít implicitní písmo\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Nemohu najít písmo %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Čtu soubor písma %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Chybí koncový konec řádku v souboru combine\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Příliš mnoho souborů pro kombinování\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - písmo z restorefont? Používám první polovinu.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Špatná velikost vstupního souboru\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1307,22 +1333,22 @@ "Tento soubor obsahuje tři písma: 8×8, 8×14 a 8×16. Naznačte prosím\n" "pomocí přepínače -8 nebo -14 nebo -16, které chcete načíst.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "Požádali jste o velikost písma %d, ale tady je možné jen 8, 14, 16.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Nenalezeno nic k uložení\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Uložen %d-znakový soubor písma %d×%d do %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1333,24 +1359,24 @@ " (kde scankód je buď xx nebo e0xx, dáno šestnáctkově,\n" " a kód klávesy je dán desítkově)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "očekáván sudý počet argumentů" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "chyba při čtení scankódu" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "kód mimo hranice" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "nastavení scankódu %x na kód klávesy %d selhalo: IOCTL KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1387,14 +1413,14 @@ msgid "off" msgstr "vypnut " -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Chyba při čtení aktuálního nastavení LED. Možná stdin není VT?: IOCTL " "KDGETLED" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" @@ -1402,42 +1428,42 @@ "Chyba při čtení aktuálního nastavení příznaků. Možná nejste na konzole?: " "IOCTL KDGKBLED" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Chyba při čtení aktuálního nastavení LED z /dev/kbd: IOCTL KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED není k dispozici?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Chyba při čtení aktuálního nastavení led z /dev/kbd: IOCTL KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED není k dispozici?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Chyba při nulování ledmode\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Momentální implicitní příznaky: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Momentální příznaky: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Momentální led: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1446,37 +1472,37 @@ "nerozpoznaný argument: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Staré implicitní příznaky: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nové implicitní příznaky: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Staré příznaky: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nové příznaky: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Staré led: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Nové led: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1493,43 +1519,44 @@ "pro změnu nastavení na jiném vt.\n" "Nastavení před a po změně je vypsáno.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Klávesa meta nastavuje nejvyšší bit\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Klávesa meta dává předponu Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Divný režim klávesy meta?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Chyba při čtení aktuálního nastavení. Možná stdin není VT?: IOCTL KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "starý stav: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "nový stav: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "použití: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1539,8 +1566,13 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -"Použití: %s vga|SOUBOR|-\n" +"Použití: %s [-h] [-V]\n" +" %s vga|SOUBOR|-\n" "\n" "Použijete-li parametr SOUBOR, SOUBOR by měl obsahovat přesně 3 řádky\n" "čárkou oddělených desítkových hodnot pro ČERVENOU, ZELENOU a MODROU.\n" @@ -1550,40 +1582,44 @@ "\n" "a pak upravte hodnoty v SOUBORU.\n" "\n" +"Další přepínače:\n" +" -h zobrazí tento návod na použití\n" +" -V zobrazí číslo verze\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Chyba: %s: Neplatná hodnota v položce %u na řádku %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Chyba: %s: Nedostatečný počet položek na řádku %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Chyba: %s: Řádek %u neočekávaně skončil.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Chyba: %s: Řádek %u je příliš dlouhý.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "nemohu obnovit původní tabulku překladu\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "nemohu obnovit původní unimap\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "nemohu změnit tabulku překladu\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1591,37 +1627,39 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "použití: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [i]\n" "(pravděpodobně po načtení písma pomocí `setfont font')\n" "\n" "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" +" -V --version Zobrazí číslo verze a skončí.\n" +" -C TTY Zařízení, ze kterého načte písmo. Výchozí je aktuální TTY.\n" +" -v Bude podrobnější.\n" +" -i Nevypíše tabulku písma, jen zobrazí ŘÁDKŮxSLOUPCŮxPOČET\n" +" a skončí.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Počet znaků: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Šířka fontu: %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Výška fontu: %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1630,16 +1668,16 @@ "Zobrazuje se %d-znakový font\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?NEZNÁMÝ?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "režim klávesnice byl %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1648,12 +1686,12 @@ "[ pokud to zkoušíte pod X, možná to nebude fungovat,\n" "protože X server také čte /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "chytil jsem signál %d, uklízím...\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1666,6 +1704,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey verze %s\n" "\n" @@ -1673,12 +1712,13 @@ "\n" "platné přepínače jsou:\n" "\n" -"\t-h --help\tzobrazit tento text nápovědy\n" -"\t-a --ascii\tzobrazit desítkové/osmičkové/hex hodnoty kláves\n" -"\t-s --scancodes\tzobrazit jen přímé scan-kódy\n" -"\t-k --keycodes\tzobrazit jen interpretované kódy kláves (implicitní)\n" +"\t-h --help\tzobrazí tento text nápovědy\n" +"\t-a --ascii\tzobrazí desítkové/osmičkové/hex hodnoty kláves\n" +"\t-s --scancodes\tzobrazí jen přímé scan-kódy\n" +"\t-k --keycodes\tzobrazí jen interpretované kódy kláves (implicitní)\n" +"\t-V --version\tzobrazí číslo verze\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1689,31 +1729,31 @@ "Stiskněte libovolné klávesy - Ctrl-D ukončí tento program\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, 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" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "uvolnění" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "stisknutí" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "kód klávesy %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "použití: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1723,17 +1763,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "Celý displej konzole je nyní zcela uzamknut uživatelem %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "%s je nyní uzamknut uživatelem %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "Použijte Alt a funkční klávesy pro přepnutí na jiné virtuální konzoly." @@ -1774,12 +1814,12 @@ msgid "stdin is not a tty" msgstr "standardní vstup není TTY" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Tento TTY (%s) není virtuální konzola.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Nelze uzamknout celý displej konzole.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/da.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/da.gmo differ diff -Nru kbd-2.0.3/po/da.po kbd-2.0.4/po/da.po --- kbd-2.0.3/po/da.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/da.po 2017-01-08 18:38:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd-1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2011-06-03 22:01+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -15,41 +15,52 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "brug: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Kunne ikke f en filidentifikator der refererer til konsollen" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: ukendt flag\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: ugyldigt VT-nummer\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: VT 1 er konsollen og kan ikke deallokeres\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s: kunne ikke deallokere konsol %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys version %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -58,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -83,7 +95,7 @@ "\t --composeonly vis kun \"compose\"-tastekombinationer\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -92,17 +104,24 @@ "\t\t\t tolk tegnhandlingskoder som om de er fra det\n" "\t\t\t angivne tegnst\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "ukendt tegnst %s - ignorerer anmodning om tegnst\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: fejl ved lsning af tastaturstilstand\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -113,7 +132,7 @@ "(numerisk vrdi, symbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -136,42 +155,42 @@ "\t-V --version vis versionsnummer\n" "\t-n --next-available vis nummer p nste utildelte VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Kunne ikke lse VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Kunne ikke bne %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "brug: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Enkle aflsningskoder xx (hex) mod tastekoder (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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 aflsningskoden lig med tastekoden\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "for 1-%d (0x01-0x%02x) er aflsningskoden lig med tastekoden\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -182,12 +201,12 @@ "\n" "Udvidede aflsningskoder e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "mislykkedes med at hente tastekoden for aflsningskode 0x%x\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -196,93 +215,96 @@ "Brug:\n" "\t%s [-s] [-C console]\n" -#: src/kbdinfo.c:18 -#, c-format +#: src/kbdinfo.c:21 +#, fuzzy, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\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 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Fejl: Ikke nok argumenter.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Fejl: Ukendt handling: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "brug: kbd_mode [-a|-u|-k|-s] [-C enhed]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Tastaturet er i r (aflsningskode-)tilstand\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Tastaturet er i halvr (tastekode-)tilstand\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Tastaturet er i standardtilstand (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Tastaturet er i UCS-tilstand (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Tastaturet er i en ukendt tilstand\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Gentagelseshastighed sat til %.1f t/s (forsinkelse = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Brug: kbdrate [-V] [-s] [-r frekvens] [-d forsinkelse]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Kan ikke bne /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "fejl: getfont kaldt med count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "fejl: getfont med GIO_FONT behver buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: hukommelsen slut\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "mrkeligt... ct ndredes fra %d til %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -291,172 +313,172 @@ "Det ser ud til at denne kerne er ldre end 1.1.92\n" "Ingen UCS-tabel indlst.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: hukommelsen slut\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Fejl ved skrivning af tabel til fil\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "umuligt: ikke meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT-fejl ved indeks %d i tabel %d:\n" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, fuzzy, c-format msgid "unable to get keymap %d" msgstr "deallokr keymap %d\n" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "kunne ikke binde tast %d til vrdien %d\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, fuzzy, c-format msgid "lk_add_key called with bad keycode %d" msgstr "addkey kaldt med drlig keycode %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "tilfjelse af tabel %d strider mod eksplicit keymaps-linje" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "kunne ikke binde tast %d til vrdien %d\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 #, fuzzy msgid "impossible error in lk_add_constants" msgstr "umulig fejl i do_constant" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "antager iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "antager iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "antager iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "antager iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "antager iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "ukendt tegnsymbol \"%s\"\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "%s: kunne ikke skifte til UCS-tilstand\n" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, fuzzy, c-format msgid "Keymap %d: Permission denied" msgstr "Keymap %d: Tilladelse ngtet\n" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "keycode %d, tabel %d = %d%s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " MISLYKKEDES" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "kunne ikke binde tast %d til vrdien %d\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, fuzzy, c-format msgid "deallocate keymap %d" msgstr "deallokr keymap %d\n" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s: kunne ikke deallokere keymap %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, fuzzy, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "%s: kan ikke deallokere eller nulstille keymap\n" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "%s: kunne ikke g tilbage til oprindelig tastatyrtilstand\n" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, fuzzy, c-format msgid "failed to bind string '%s' to function %s" msgstr "mislykkedes med at binde stren '%s' til funktion %s\n" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, fuzzy, c-format msgid "failed to clear string %s" msgstr "mislykkedes med at nulstille streng %s\n" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "for mange kompositionsdefinitioner\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -467,7 +489,7 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, fuzzy, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -478,59 +500,59 @@ "\n" "ndrede %d %s og %d %s.\n" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "for mange kompositionsdefinitioner\n" msgstr[1] "for mange kompositionsdefinitioner\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "(Ingen ndringer i kompositionsdefinitioner)\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "tastekodeinterval som understttes af kernen: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "strste antal handlinger bindelige til en tast: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "antal tastetabeller som faktisk bruges: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "hvoraf %d er dynamisk allokerede\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "interval af handlingskoder som understttes af kernen:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "antal funktionstaster som understttes af kernen: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "strste antal kompositionsdefinitioner: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "antal kompositionsdefinitioner som faktisk bruges: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -541,12 +563,12 @@ "Flgende synonymer genkendes:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s for %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -555,7 +577,7 @@ "\n" "Genkendte ndrernavn og deres kolonnenummer:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -577,6 +599,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys version %s\n" "\n" @@ -597,17 +620,17 @@ " -u --unicode gennemtving konvertering til UCS\n" " -v --verbose udskriv ndringerne\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s fra %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Tilvalg --unicode og --ascii er gensidigt udelukkende\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -616,7 +639,7 @@ "%s: advarsel: indlser ikke-UCS keymap p UCS konsol\n" " (mske vil du gerne lave 'kbd_mode -a'?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -625,17 +648,17 @@ "%s: advarsel: indlser UCS keymap p ikke-UCS konsol\n" " (mske vil du gerne lave 'kbd_mode -u'?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Kan ikke finde %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "Kan ikke bne fil %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -644,29 +667,29 @@ "Brug:\n" "\t%s [-C konsol] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Fejlagtig inddatalinje: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Tegnnummer (0x%x) strre end skrifttypelngde\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Fejlagtigt slut p interval (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -675,22 +698,22 @@ "%s: UCS-interval U+%x-U+%x er ikke af samme lngde som " "skrifttypespositionsinterval 0x%x-0x%x\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: efterflgende snavs (%s) ignoreret\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Indlser UCS-tabel fra fil %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Advarsel: linjen er for lang\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -699,80 +722,80 @@ "%s: indlser ikke tom ucs-tabel\n" "(hvis du insisterer: brug flaget -f til at tilsidestte)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "post" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "poster" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Gemte ucs-tabel til \"%s\"\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Tilfjede UCS-tabel\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "brug: %s [-v] [-o originaltabel] tabelfil\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: kan ikke bne tabelfil _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Kan ikke tage status p tabelfil" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Indlser binr direkte-til-skrifttype-skrmtabel fra fil %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Fejl ved lsning af tabel fra fil \"%s\"\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Indlser binr UCS-skrmfil fra fil %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Indlser symbolsk skrmtabel fra fil %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Fejl ved tolkning af symbolsk tabel fra \"%s\", linje %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Fejl ved skrivning af tabel til fil\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Kan ikke lse konsoltabel\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Gemte skrmtabel i \"%s\"\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -809,175 +832,171 @@ " -h, --help udskriv en kort hjlpetekst.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Kunne ikke finde ejer af aktuel tty!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Ugyldigt vt-nummer" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Kun root kan bruge flaget -u." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Kunne ikke f en filidentifikator der refererer til konsollen" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Kan ikke finde en ledig vt" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "Kan ikke undersge om vt %d er ledig, brug '%s -f' at gennemtvinge." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "vt %d er i brug, kommandoen afbrudt, brug '%s -f' at gennemtvinge." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Kunne ikke finde kommando" -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Kan ikke stte ny session" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Kan ikke bne %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Bruger VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Kan ikke bne %s for lsning/skrivning" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Kunne ikke aktivere vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Aktivering afbrudt?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Kunne ikke deallokere konsol %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: kort ucs2-tabel\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: kort utf8-tabel\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: fejlagtig utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: ukendt utf8-fejl\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: kort UCS-tabel\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Fejl ved lsning af inddataskrifttype" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Fejlagtigt kald af readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: psf-filtilstand (%d) understttes ikke\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: psf-version (%d) understttes ikke\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: lngde af inddataskrifttype er nul?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: strrelse af inddatategn er nul?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Inddatafil: ugyldig inddatalngde (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Inddatafil: efterflgende snavs\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: ugyldig UCS %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Kan ikke skrive skrifttypefilhoved" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Kan ikke skrive til skrifttypefilen" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Advarsel: linjen er for lang\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Fejlagtig inddatalinje: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Glyfnummer (0x%lx) forbi slutningen af skrifttypen\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Fejlagtigt slut p interval (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -986,7 +1005,7 @@ "%s: Til et modsvarende interval af skrifttypespositioner burde der findes et " "UCS-interval\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -995,7 +1014,7 @@ "Brug:\n" "\t%s inddataskrifttype inddatatabel uddataskrifttype\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1004,7 +1023,7 @@ "Brug:\n" "\t%s inddataskrifttype [udtabel]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1013,7 +1032,7 @@ "Brug:\n" "\t%s inddataskrifttype uddataskrifttype\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1023,22 +1042,22 @@ "\t%s [-i inddataskrifttype] [-o uddataskrifttype] [-it indtabel] [-ot " "udtabel] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Fejlagtigt magisk nummer p %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: psf-fil med ukendt magisk nummer\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: inddataskrifttypen har ikke noget indeks\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: kan ikke finde videotilstandsfil %s\n" @@ -1047,30 +1066,30 @@ msgid "Invalid number of lines\n" msgstr "Ugyldigt antal linjer\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Gammel tilstand: %d%d Ny tilstand: %d%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "" "Gammelt antal skanlinjer: %d Nyt antal skanlinjer: %d Tegnhjde: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: kommandoen \"%s\" mislykkedes\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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 (mske til con%dx%d eller linux-%dx%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1083,41 +1102,41 @@ "eller: resizecons -lines LINJER, hvor LINJER er en af 25, 28, 30, 34, 36, " "40, 44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: kan ikke f I/O-rettigheder.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "brug: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Fejl ved lsning af %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "kunne ikke lse %s, og kan ikke kre \"ioctl dump\"\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "kunne ikke lse %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Mrkeligt ... skrmen er bde %d%d og %d%d??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Fejl ved skrivning af skrmdump\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1173,12 +1192,12 @@ " -V Udskriv version og afslut.\n" "Filer indlses fra det aktuelle katalog eller %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: for mange inddatafiler\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1186,124 +1205,124 @@ msgstr "" "setfont: kan ikke bde genskabe fra tegn-ROM og fra fil. Fonten undret.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Fejlagtig tegnhjde %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Fejlagtig tegnbredde %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: Skrifttypesposition 32 er ikke-blank\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: rensede det\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: baggrunden vil se mrkelig ud\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Indlser %d-tegns %d%d-skrifttype fra filen %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Indlser %d-tegns %d%d-skrifttype\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Indlser %d-tegns %d%d-skrifttype (%d) fra filen %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Indlser %d-tegns %d%d-skrifttype (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: fejl i do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Indlser UCS-konverteringsstabel...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Kan ikke bne skrifttypefilen %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "Nr flere skrifttyper lses ind skal alle vre psf-skrifttyper - %s er det " "ikke\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Lste %d-tegns %d%d-skrifttype fra filen %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Nr flere skrifttyper lses ind skal alle have samme hjde\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Nr flere skrifttyper lses ind skal alle have samme bredde\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Kan ikke finde standardskrifttypen\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Kan ikke finde skrifttypen %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Lser skrifttypefilen %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Intet endeligt nylinjestegn i kombinationsfilen\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "For mange filer at kombinere\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - en skrifttype fra restorefont? Bruger frste halvdel.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Fejlagtig strrelse p inddatafilen\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1312,23 +1331,23 @@ "Denne fil indeholder 3 skrifttyper: 88, 814 og 816. Vlg hvilken\n" "du vil indlse via et af flagene -8, -14 eller -16.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Du bad om skrifttypesstrrelsen %d, men kun 8, 14 og 16 er mulige her.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Fandt ikke noget at gemme\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Gemte %d-tegns %d%d-skrifttypefil til %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1339,24 +1358,24 @@ " (hvor aflsningskode er enten xx eller e0xx angivet heksadecimalt,\n" " og tastekode er angivet decimalt)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "lige antal argumenter forventedes" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "fejl ved lsning af aflsningskode" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "kode uden for grnserne" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "kunne ikke stte aflsningskoden %x til tastekoden %d\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1393,7 +1412,7 @@ msgid "off" msgstr "fra" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1401,7 +1420,7 @@ "Fejl ved lsning af nuvrende indstilling. Standard ind er mske ikke en " "VT?\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1410,44 +1429,44 @@ "Fejl ved lsning af nuvrende flagindstilling. Du er mske ikke p " "konsollen?\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Fejl ved lsning af nuvrende diodeindstilling fra /dev/kbd.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED ikke tilgngelig?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Fejl ved lsning af nuvrende diodeindstilling fra /dev/kbd.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED ikke tilgngelig?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Fejl ved nulstilling af diodetilstand\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Nuvrende standardflag: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Nuvrende flag: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Nuvrende dioder: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1456,37 +1475,37 @@ "ukendt argument: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Gamle standardflag: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nye standardflag: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Gamle flag: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nye flag: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Gamle dioder: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Nye dioder: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1503,19 +1522,19 @@ "for at ndre indstillingen for en anden vt.\n" "Indstillingen for og efter ndringen rapporteres.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Metatasten stter hjeste bit\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Metatasten giver esc-prfiks\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Mrkelig tilstand for Metatasten?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" @@ -1523,25 +1542,26 @@ "Fejl ved lsning af nuvrende indstilling. Standard ind er mske ikke en " "VT?\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "gammel tilstand: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "ny tilstand: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "brug: %s\n" -#: src/setvtrgb.c:42 -#, c-format +#: src/setvtrgb.c:44 +#, fuzzy, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1551,6 +1571,10 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" "Brug: %s vga|FIL|-\n" "\n" @@ -1563,50 +1587,51 @@ "og redigr s vrdierne i FIL.\n" "\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Fejl: %s: Ugyldig vrdi i felt %u i linje %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Fejl: %s: Utilstrkkeligt antal felter i linje %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Fejl: %s: linje %u afsluttedes uventet.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Fejl: %s: linje %u er for lang.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "mislykkedes med at genskabe originaloverstningstabellen\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "mislykkedes med at genskabe originalucstabel\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "kan ikke ndre overstningstabellen\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "brug: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1619,22 +1644,22 @@ " -i Udskriv ikke skrifttypetabellen, bare vis\n" " RKKERxKOLONNExANTAL og afslut.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Antal tegn: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Skrifttypebredde : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Skrifttypehjde : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1643,16 +1668,16 @@ "Viser %d-tegns skrifttype\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?UKENDT?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "tgb-tilstand var %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1661,13 +1686,13 @@ "[ hvis du gr dette i X s fungerer det mske ikke \n" "da X-serveren ogs lser /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "fik signalet %d, rydder op...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1679,6 +1704,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey version %s\n" "\n" @@ -1691,7 +1717,7 @@ "\t-s --scancodes\tvis kun de r skankoder\n" "\t-k --keycodes\tvis kun de tolkede tastekoder (standard)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1702,48 +1728,48 @@ "Tryk en vilkrlig tast - Ctrl-D vil afslutte programmet\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "tryk en vilkrlig tast (programmet afsluttes 10 s efter sidste " "tastetrykning)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "slip" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "tryk" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "tastekode %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "brug: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1777,12 +1803,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, 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/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/de.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/de.gmo differ diff -Nru kbd-2.0.3/po/de.po kbd-2.0.4/po/de.po --- kbd-2.0.3/po/de.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/de.po 2017-01-08 18:38:45.000000000 +0000 @@ -4,7 +4,7 @@ # This file is distributed under the same license as the kbd package. # Nils Naumann , 2002, 2004. # Michael Schutte , 2008, 2009, 2011. -# Mario Blättermann , 2014. +# Mario Blättermann , 2014-2016. # # Anmerkungen zur Übersetzung: # - “Keymaps”, “Flags” und “Fonts” bleiben, wie sie sind. @@ -14,50 +14,60 @@ # - “File descriptor” wird zu „Dateideskriptor“. msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.2-rc2\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2014-06-29 16:06+0100\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-28 12:59+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.11\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "Aufruf: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "" +"Dateideskriptor, der auf die Konsole verweist, konnte nicht gefunden werden" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: Unbekannte Option\n" -#: src/deallocvt.c:50 -#, fuzzy +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" -msgstr "%s: 0: Ungültige VT-Nummer.\n" +msgstr "0: Ungültige VT-Nummer.\n" -#: src/deallocvt.c:52 -#, fuzzy +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" -msgstr "%s: VT 1 ist die Konsole und kann deshalb nicht freigegeben werden.\n" +msgstr "VT 1 ist die Konsole und kann deshalb nicht freigegeben werden\n" -#: src/deallocvt.c:54 -#, fuzzy, c-format +#: src/deallocvt.c:58 +#, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" -msgstr "%s: Konsole %d konnte nicht freigegeben werden.\n" +msgstr "Konsole %d konnte nicht freigegeben werden.: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys Version %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -67,13 +77,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -83,16 +94,17 @@ "\n" "\t-h --help\t gibt diese Hilfe aus\n" "\t-i --short-info\t zeigt Informationen zum Tastaturtreiber an\n" -"\t-l --long-info\t short-info und die von loadkeys erkannten Symbole\n" +"\t-l -s --long-info short-info und die von loadkeys erkannten Symbole\n" "\t-n --numeric\t Tastaturtabelle in hexadezimaler Notierung\n" "\t-f --full-table\t ohne Abkürzungen, eine Zeile pro Tastencode\n" -"\t-1 --separate-lines eine Zeile für jedes (Wandler, Tastencode) Paar\n" -"\t --funcs-only\t zeigt nur die Funktionstastenbelegungen\n" -"\t --keys-only\t zeigt nur die Tastenbelegungen\n" -"\t --compose-only zeigt nur die Tastenfolgen an\n" +"\t-1 --separate-lines eine Zeile für jedes (Wandler,Tastencode)-Paar\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t zeigt nur die Funktionstastenbelegungen\n" +"\t-k --keys-only\t zeigt nur die Tastenbelegungen\n" +"\t-d --compose-only zeigt nur die Tastenfolgen an\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -101,17 +113,26 @@ "\t\t\t interpretiert Zeichencodes, als kämen sie aus dem\n" "\t\t\t angegebenen Zeichensatz.\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t zeigt die Versionsnummer an\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "Unbekannter Zeichensatz %s - Zeichensatzanforderung wird ignoriert.\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: Fehler beim Lesen des Tastaturmodus: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -122,7 +143,7 @@ "(Numerischer Wert, Symbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -145,45 +166,45 @@ "\t-V --version zeigt die Programmversion an\n" "\t-n --next-available zeigt die Nummer des nächsten unbenutzten VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "VT-Nummer konnte nicht gelesen werden: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "%s kann nicht geöffnet werden.\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "" "Dateideskriptor, der auf die Konsole verweist, konnte nicht gefunden " "werden.\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "Aufruf: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Einfache Scancodes xx (hexadezimal) und Tastencodes (dezimal):\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, 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" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -194,12 +215,14 @@ "\n" "Scancodes mit Escape e0 xx (hex):\n" -#: src/getkeycodes.c:90 -#, fuzzy, c-format +#: src/getkeycodes.c:95 +#, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" -msgstr "Tastencode für den Scancode 0x%x kann nicht erhalten werden.\n" +msgstr "" +"Tastencode für den Scancode 0x%x kann nicht erhalten werden.: ioctl " +"KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -208,94 +231,100 @@ "Aufruf:\n" "\t%s [-s] [-C Konsole]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Aufruf: %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" +"Weitere Optionen:\n" +" -h zeigt diese Hilfe an\n" +" -V zeigt die Versionsnummer an\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Fehler: Nicht genügend Argumente.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Fehler: Unbekannte Aktion: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "Aufruf: kbd_mode [-a|-u|-k|-s] [-C Gerät]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Die Tastatur ist im Urmodus (scancode).\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Die Tastatur ist im Tastencode-Modus (mediumraw).\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Die Tastatur ist im voreingestellten Modus (ASCII).\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Die Tastatur ist im Unicode-Modus (UTF-8).\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Der Tastaturmodus ist unbekannt.\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, 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" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Aufruf: kbdrate [-V] [-s] [-r Wert] [-d Verzögerung]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "Aufruf: kbdrate [-V | --version] [-s] [-r Wert] [-d Verzögerung]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "/dev/port kann nicht geöffnet werden." -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "Fehler: getfont wurde mit einer Anzahl < 256 aufgerufen.\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "Fehler: Bei Verwendung von GIO_FONT braucht getfont einen Puffer.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: Arbeitsspeicher erschöpft.\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "Seltsam... ct hat sich von %d auf %d geändert\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -304,171 +333,171 @@ "Der Kernel scheint älter als 1.1.92 zu sein.\n" "Es wurde keine Unicode-Tabelle geladen.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "Arbeitsspeicher erschöpft" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "Feld konnte nicht initialisiert werden: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Fehler beim Schreiben der Tabelle in die Datei." -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "unmöglich: Keine Meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: Fehler an Stelle %d in Tabelle %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: Funktionstasten-String konnte nicht erhalten werden" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: Akzenttabelle konnte nicht erhalten werden" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "Keymap %d konnte nicht erhalten werden" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "Taste %d konnte nicht aus Tabelle %d gelöst werden" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key mit ungültigem Tastencode %d aufgerufen" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "Hinzufügen von Map %d verletzt explizite keymaps-Zeile." -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "Taste %d konnte nicht für Tabelle %d gesetzt werden" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "Unmöglicher Fehler in lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "Symbol konnte durch falschen Typ nicht erhalten werden: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" "Symbol des Typs %d konnte durch falschen Index nicht erhalten werden: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "ISO-8859-1 %s wird angenommen" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "ISO-8859-15 %s wird angenommen" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "ISO-8859-2 %s wird angenommen" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "ISO-8859-3 %s wird angenommen" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "ISO-8859-4 %s wird angenommen" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "Unbekanntes Tastensymbol „%s“.\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: Wechsel in den Unicode-Modus war nicht möglich" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Keymap %d: Zugriff verweigert" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "Tastencode %d, Tabelle %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " FEHLGESCHLAGEN" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "Der Taste %d konnte nicht der Wert %d zugeordnet werden." -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "Keymap %d freigeben" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: Keymap %d konnte nicht freigegeben werden." -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: Keymap kann nicht freigegeben oder geleert werden." -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" "KDSKBMODE: %s: Ursprünglicher Tastaturmodus konnte nicht wiederhergestellt " "werden" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "String „%s“ konnte nicht der Funktion %s zugeordnet werden." -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "Das Leeren des Strings %s ist fehlgeschlagen." -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "Zu viele Compose-Definitionen" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -483,65 +512,65 @@ "\n" "%d Tasten wurden geändert." -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "%d Zeichenkette wurde geändert." msgstr[1] "%d Zeichenketten wurden geändert." -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "%d Compose-Definition wurde geladen." msgstr[1] "%d Compose-Definitionen wurden geladen." -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Compose-Definitionen nicht geändert.)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "Vom Kernel unterstützter Tastencodebereich: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "Maximale Anzahl von an eine Taste bindbaren Aktionen: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "Anzahl tatsächlich benutzter Keymaps: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "wovon %u dynamisch zugewiesen sind.\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "Bereich der vom Kernel unterstützten Aktionscodes:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "Anzahl der vom Kernel unterstützten Funktionstasten: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "Maximale Anzahl zusammengesetzter Tastendefinitionen: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "Anzahl der derzeit verwendeten Compose-Definitionen: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -552,12 +581,12 @@ "Die folgenden Synonyme werden erkannt:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s für %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -566,8 +595,8 @@ "\n" "Erkannte Wandlernamen und ihre Spaltennummern:\n" -#: src/loadkeys.c:35 -#, fuzzy, c-format +#: src/loadkeys.c:36 +#, c-format msgid "" "loadkeys version %s\n" "\n" @@ -588,10 +617,11 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys Version %s\n" "\n" -"Aufruf: %s loadkeys [OPTION...] [MAPDATEI...]\n" +"Aufruf: %s [OPTION...] [MAPDATEI...]\n" "\n" "Gültige Optionen sind:\n" "\n" @@ -603,23 +633,26 @@ " -d --default lädt „%s“\n" " -h --help gibt diese Hilfe aus\n" " -m --mktable schreibt eine „defkeymap.c“ auf die Standardausgabe\n" +" -p --parse durchsucht die Keymap und wertet sie aus,\n" +" aber ohne weitere Aktionen\n" " -q --quiet unterdrückt die Ausgabe von Meldungen\n" " -s --clearstrings leert die String-Tabelle des Kernels\n" " -u --unicode erzwingt Konvertierung zu Unicode\n" " -v --verbose berichtet ausführlicher über vorgenommene Änderungen\n" +" -V --version zeigt die Versionsnummer an\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s von %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, 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" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -628,7 +661,7 @@ "%s: Warnung: Nicht-Unicode-Tastaturbelegung wird auf Unicode-Konsole\n" " geladen (vielleicht möchten Sie zuvor „kbd_mode -a“ ausführen?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -637,17 +670,17 @@ "%s: Warnung: Unicode-Tastaturbelegung wird auf Nicht-Unicode-Konsole\n" " geladen (vielleicht möchten Sie zuvor „kbd_mode -u“ ausführen?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "%s kann nicht gefunden werden.\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "Datei %s kann nicht geöffnet werden.\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -656,27 +689,27 @@ "Aufruf:\n" "%s [-C Konsole] [-o Originaltabelle]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Ungültige Eingabezeile: %s.\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Glyphennummer (0x%x) größer als Font-Länge.\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Ungültiges Bereichsende (0x%x).\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" msgstr "%s: Ungültiger Unicode-Bereich zum Font-Bereich 0x%x-0x%x.\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -685,22 +718,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: Überflüssiger Müll (%s) wurde ignoriert.\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Unicode-Tabelle wird aus der Datei %s geladen.\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Warnung: Die Zeile ist zu lang.\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -709,80 +742,80 @@ "%s: Eine leere Unicode-Tabelle wird nicht geladen.\n" "Benutzen Sie die Option -f zum Erzwingen der Aktion.\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "Eintrag" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "Einträge" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Unicode-Tabelle in „%s“ gespeichert.\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Unicode-Tabelle angehängt.\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "Aufruf: %s [-v] [-o Originaltabelle] Tabellendatei\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "Aufruf: %s [-V] [-v] [-o Originaltabelle] Tabellendatei\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: Zuordnungsdatei _%s_ kann nicht geöffnet werden.\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Zuordnungsdatei kann nicht geöffnet werden." -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Binärer Font wird aus der Datei %s geladen.\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Fehler beim Lesen der Tabelle aus der Datei „%s“.\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Binäre Unicode-Tabelle wird aus der Datei %s geladen.\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Symboltabelle wird aus %s geladen.\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Fehler beim Verarbeiten der Symboltabelle „%s“, Zeile %d.\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Fehler beim Schreiben der Tabelle in die Datei.\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Konsolentabelle kann nicht gelesen werden.\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Bildschirmtabelle in „%s“ gespeichert.\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -820,177 +853,172 @@ " -h, --help zeigt diesen Hilfetext an.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Eigentümer des aktuellen Terminals konnte nicht gefunden werden!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Ungültige VT-Nummer" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Nur Root darf die Option -u benutzen." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "" -"Dateideskriptor, der auf die Konsole verweist, konnte nicht gefunden werden" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Freies VT kann nicht gefunden werden" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" "Verfügbarkeit des VT %d kann nicht überprüft werden; „%s -f“ erzwingt dies." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "VT %d wird bereits benutzt, Abbruch; „%s -f“ erzwingt dies." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Befehl konnte nicht gefunden werden." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Neue Sitzung kann nicht erzeugt werden." -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "%s kann nicht geöffnet werden" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "VT %s wird benutzt" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "%s kann nicht zum Schreiben und Lesen geöffnet werden" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "VT %d kann nicht aktiviert werden" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Aktivierungsvorgang unterbrochen?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Konsole %d konnte nicht freigegeben werden" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: Kurze UCS2-Unicode-Tabelle.\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: Kurze UTF8-Unicode-Tabelle.\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: Falsches UTF-8.\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: Unbekannter UTF-8-Fehler.\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: Kurze Unicode-Tabelle.\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Fehler beim Lesen des Fonts." -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Falscher Aufruf von readpsffont.\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Nicht unterstützer PSF-Dateimodus (%d).\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Nicht unterstützte PSF-Version (%d).\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: Leerer Font?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: Ist die Zeichengröße Null?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Eingabedatei: Falsche Länge (%d).\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Eingabedatei: Angehänger Zeichenmüll.\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: Ungültiges Unicode-Zeichen %u.\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Kopf der Font-Datei kann nicht geschrieben werden." -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Font-Datei kann nicht geschrieben werden." -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Warnung: Die Zeile ist zu lang.\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Falsche Eingabezeile: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Glyphennummer (0x%lx) nach dem Ende des Fonts.\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Falsches Bereichsende (0x%lx).\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -999,7 +1027,7 @@ "%s: Zu einem Bereich von Font-Positionen sollte auch ein Unicode-Bereich " "existieren.\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1008,7 +1036,7 @@ "Aufruf:\n" "\t%s Eingabe-Font Eingabetabelle Ausgabe-Font\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1017,7 +1045,7 @@ "Aufruf:\n" "\t%s Eingabe-Font [Ausgabetabelle]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1026,7 +1054,7 @@ "Aufruf:\n" "\t%s Eingabe-Font Ausgabe-Font\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1036,22 +1064,22 @@ "\t%s [-i Eingabe-Font] [-o Ausgabe-Font]\n" "\t\t[-it Eingabetabelle] [-ot Ausgabetabelle] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Falsche magische Nummer in %s.\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: PSF-Datei mit unbekannter magischer Zeichenkette.\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: Der Font hat keinen Index.\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: Videomodus-Datei %s kann nicht gefunden werden.\n" @@ -1060,22 +1088,22 @@ msgid "Invalid number of lines\n" msgstr "Ungültige Zeilenanzahl.\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Alter Modus: %dx%d Neuer Modus: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Zeilenzahl alt: %d Zeilenzahl neu: %d Zeichenhöhe: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: Der Befehl „%s“ ist fehlgeschlagen.\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1083,7 +1111,7 @@ "resizecons: Vergessen Sie nicht, TERM zu ändern (z.B. zu con%dx%d oder linux-" "%dx%d).\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1097,42 +1125,42 @@ "oder: resizecons -lines ZEILEN,\n" " mit ZEILEN in 25, 28, 30, 34, 36, 40, 44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: Ein-/Ausgabe-Erlaubnis kann nicht erhalten werden.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "Aufruf: screendump [n]\n" -#: src/screendump.c:80 -#, fuzzy, c-format +#: src/screendump.c:82 +#, c-format msgid "Error reading %s" -msgstr "Fehler beim Lesen von %s.\n" +msgstr "Fehler beim Lesen von %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "" "%s kann nicht gelesen und ioctl auf den Bildschirminhalt angewendet werden.\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "%s kann nicht gelesen werden.\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Seltsam ... der Bildschirm ist sowohl %dx%d als auch %dx%d?\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Fehler beim Schreiben des Bildschirminhalts.\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1187,12 +1215,12 @@ " -V Ausgabe der Versionsnummer und Beenden.\n" "Dateien werden im aktuellen Verzeichnis oder in %s/*/ gesucht.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: Zu viele Eingabedateien.\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1201,125 +1229,125 @@ "setfont: Font kann nicht zugleich von ROM und Datei wiederhergestellt " "werden. Vorgang abgebrochen.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Falsche Zeichenhöhe %d.\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Falsche Zeichenbreite %d.\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: Stelle 32 im Font ist kein Leerzeichen.\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: wurde gelöscht.\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: Der Hintergrund wird seltsam aussehen.\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "%d-Zeichen %dx%d wird aus der Datei %s geladen.\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "%d-Zeichen %dx%d wird geladen.\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "%d-Zeichen %dx%d (%d) wird aus Datei %s geladen.\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "%d-Zeichen %dx%d (%d) wird geladen.\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: Fehler in do_loadtable.\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Unicode-Tabelle wird geladen …\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Font-Datei %s kann nicht geöffnet werden.\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "%d-Zeichen %dx%d wird aus der Datei %s gelesen.\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, 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" -#: src/setfont.c:448 +#: src/setfont.c:456 #, 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" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Standard-Font kann nicht gefunden werden.\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Font %s kann nicht gefunden werden.\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Font-Datei %s wird gelesen.\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Kein abschließender Zeilenumbruch in zusammengefügter Datei.\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Zu viele Dateien zum Zusammenfassen.\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - ein Font von restorefont? Die erste Hälfte wird verwendet.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Falsche Eingabedateigröße.\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1328,24 +1356,24 @@ "Diese Datei enthält 3 Fonts: 8x8, 8x14 und 8x16. Wählen Sie bitte\n" "mit einer Option aus -8, -14 oder -16 den zu ladenden Font aus.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Nichts zum Speichern gefunden.\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-Zeichen %dx%d in Font-Datei %s gespeichert.\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1356,24 +1384,26 @@ " (Wobei Scancode entweder xx oder e0xx hexadezimal\n" " und der Tastencode dezimal angegeben wird.)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "Eine gerade Anzahl von Argumenten wird erwartet." -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "Fehler beim Lesen des Scancodes." -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "Scancode außerhalb der Grenzen." -#: src/setkeycodes.c:69 -#, fuzzy, c-format +#: src/setkeycodes.c:74 +#, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" -msgstr "Der Scancode %x konnte nicht für den Tastencode %d gesetzt werden.\n" +msgstr "" +"Der Scancode %x konnte nicht für den Tastencode %d gesetzt werden.: ioctl " +"KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1411,60 +1441,57 @@ msgid "off" msgstr "aus" -#: src/setleds.c:87 -#, fuzzy +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" -"Fehler beim Lesen der LED-Zustände.\n" -"Ist die Standardeingabe wirklich ein Terminal?\n" +"Fehler beim Lesen der LED-Zustände. Ist die Standardeingabe wirklich ein " +"Terminal?: ioctl KDGETLED" -#: src/setleds.c:105 -#, fuzzy +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" msgstr "" -"Fehler beim Lesen der Flags. Befinden Sie sich wirklich auf der Konsole?\n" +"Fehler beim Lesen der Flags. Befinden Sie sich wirklich auf der Konsole?: " +"ioctl KDGKBLED" -#: src/setleds.c:123 -#, fuzzy +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" -msgstr "Fehler beim Lesen der LED-Zustände von /dev/kbd.\n" +msgstr "Fehler beim Lesen der LED-Zustände von /dev/kbd: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "Ist KIOCGLED nicht verfügbar?\n" -#: src/setleds.c:141 -#, fuzzy +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" -msgstr "Fehler beim Lesen der LED-Zustände von /dev/kbd.\n" +msgstr "Fehler beim Lesen der LED-Zustände von /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "Ist KIOCSLED nicht verfügbar?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Fehler beim Setzen der LEDs.\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Aktuelle Standardeinstellungen: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Aktive Einstellungen: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Aktive LEDs: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1473,37 +1500,37 @@ "Unbekanntes Argument: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Alte Standardeinstellungen: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Neue Standardeinstellungen: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Alte Einstellungen: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Neue Einstellungen: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Alte LEDs: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Neue LEDs: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1520,45 +1547,45 @@ "kann dieses Bit für ein anderes VT geändert werden.\n" "Die Einstellungen vor und nach der Änderung werden ausgegeben.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Meta-Taste setzt das Bit mit dem höchsten Stellenwert.\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Meta-Taste erzeugt ein Umschaltpräfix.\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Merkwürdiger Modus für die Meta-Taste?\n" -#: src/setmetamode.c:79 -#, fuzzy +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" -"Die aktuellen Einstellungen sind nicht lesbar.\n" -"Ist die Standardeingabe wirklich ein Terminal?\n" +"Die aktuellen Einstellungen sind nicht lesbar. Ist die Standardeingabe " +"wirklich ein Terminal?: ioctl KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "Alter Status: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "Neuer Status: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "Aufruf: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1568,8 +1595,13 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -"Aufruf: %s vga|DATEI|-\n" +"Aufruf: %s [-h] [-V]\n" +" %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" @@ -1579,42 +1611,46 @@ "\n" "Dann können Sie die DATEI nach Ihren Vorstellungen bearbeiten.\n" "\n" +"Weitere Optionen:\n" +" -h zeigt diese Hilfe an\n" +" -V zeigt die Versionsnummer an\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Fehler: %s: Ungültiger Wert im Feld %u in Zeile %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Fehler: %s: Nicht genügend Felder in Zeile %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Fehler: %s: Zeile %u endet unerwartet.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Fehler: %s: Die Zeile %u ist zu lang.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "" "Das Wiederherstellen der ursprünglichen Übersetzungstabelle ist " "fehlgeschlagen.\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "Das Wiederherstellen der ursprünglichen Unimap ist fehlgeschlagen.\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "Die Übersetzungstabelle konnte nicht gewechselt werden.\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1622,39 +1658,40 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "Aufruf: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(möglicherweise nach dem Laden eines Fonts mit „setfont font“)\n" "\n" "Gültige Optionen sind:\n" -"\n" -" -C tty Gerät, von dem der Font gelesen werden soll. Standard ist\n" -" das aktive Terminal.\n" -" -v Ausführlichere Meldungen ausgeben.\n" -" -i Die Font-Tabelle nicht ausgeben, stattdessen\n" -" ZEILENxSPALTENxANZAHL anzeigen und beenden.\n" +" -V --version zeigt die Versionsnummer an und beendet das Programm.\n" +" -C tty Gerät, von dem der Font gelesen werden soll. Standard ist\n" +" das aktive Terminal.\n" +" -v gibt ausführlichere Meldungen aus.\n" +" -i gibt die Font-Tabelle nicht aus, zeigt stattdessen\n" +" ZEILENxSPALTENxANZAHL an und beendet das Programm.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Zeichenanzahl: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Font-Breite : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Font-Höhe : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1663,16 +1700,16 @@ "Font mit %d Zeichen wird angezeigt.\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?UNBEKANNT?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "KB-Modus war %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1681,12 +1718,12 @@ "[ Wenn Sie das unter X probieren, muss es nicht funktionieren, \n" " da der X Server ebenfalls von /dev/console liest. ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "Signal %d erhalten, wird aufgeräumt …\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1699,6 +1736,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey Version %s\n" "\n" @@ -1710,8 +1748,9 @@ "\t-a --ascii\tzeigt die dezimalen/oktalen/hexadezimalen Tastencodes\n" "\t-s --scancodes\tzeigt die originalen Tastaturcodes an\n" "\t-k --keycodes\tzeigt nur die übersetzten Tastaturcodes an (Vorgabe)\n" +"\t-V --version\tzeigt die Versionsnummer an\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1722,30 +1761,30 @@ "Drücken Sie eine Taste - Strg+D beendet das Programm\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, 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" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "losgelassen" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "gedrückt" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "Tastencode %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "Aufruf: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1755,17 +1794,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "Die gesamte Anzeige der Konsole ist nun durch %s gesperrt.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "Die %s ist nun durch %s gesperrt.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" "Verwenden Sie Alt+Funktionstasten, um auf andere virtuelle Konsolen zu " @@ -1807,12 +1846,12 @@ msgid "stdin is not a tty" msgstr "Standardeingabe ist keine tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Diese tty (%s) ist keine virtuelle Konsole.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Die gesamte Konsolenanzeige konnte nicht gesperrt werden.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/el.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/el.gmo differ diff -Nru kbd-2.0.3/po/el.po kbd-2.0.4/po/el.po --- kbd-2.0.3/po/el.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/el.po 2017-01-08 18:38:45.000000000 +0000 @@ -2,54 +2,63 @@ # This file is distributed under the same license as the kbd package. # # Lefteris Dimitroulakis , 2003, 2008. -# Lefteris Dimitroulakis , 2013, 2014. +# Lefteris Dimitroulakis , 2013, 2014, 2015. msgid "" msgstr "" -"Project-Id-Version: kbd-2.0.2-rc2\n" +"Project-Id-Version: kbd-2.0.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2014-11-28 23:34+0200\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2015-08-30 02:12+0300\n" "Last-Translator: Lefteris Dimitroulakis \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "χρήση: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Δέν μπορώ να λάβω περιγραφέα αρχείου πού αφορά την κονσόλα" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: άγνωστη επιλογή\n" -#: src/deallocvt.c:50 -#, fuzzy +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" -msgstr "%s: 0: παράτυπος αριθμός VT\n" +msgstr "0: παράτυπος αριθμός VT\n" -#: src/deallocvt.c:52 -#, fuzzy +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" -msgstr "%s: VT 1 είναι η κονσόλα και δεν μπορεί ν' αποδεσμευτεί\n" +msgstr "VT 1 είναι η κονσόλα και δεν μπορεί ν' αποδεσμευτεί\n" -#: src/deallocvt.c:54 -#, fuzzy, c-format +#: src/deallocvt.c:58 +#, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" -msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" +msgstr "αδυναμία αποδέσμευσης της κονσόλας %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys έκδοση %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -58,13 +67,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -86,7 +96,7 @@ "\t --compose-only εμφάνιση μόνο των συνδιασμών compose των πλήκτρων\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -95,17 +105,24 @@ "\t\t\t διερμηνεία κωδικών των χαρακτήρων ενέργειας\n" "\t\t\t από το προδιαγεγραμμένο σύνολο χαρακτήρων\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "άγνωστο σύνολο χαρακτήρων %s - η αίτηση αγνοήθηκε\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: σφάλμα ανάγνωσης keyboard mode: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -116,7 +133,7 @@ "(αριθμητική τιμή, σύμβολο)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -139,45 +156,45 @@ "\t-V --version εμφάνιση έκδοσης προγράμματος\n" "\t-n --next-available εμφάνιση αριθμού του επόμενου μη δεσμευμένου VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Δεν μπόρεσα να διαβάσω VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Αδυνατώ ν' ανοίξω το %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Δέν μπορώ να λάβω περιγραφέα αρχείου πού αφορά την κονσόλα\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "χρήση: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "" "Απλοί κωδικοί σάρωσης xx (hex) και οι αντίστοιχοι κωδικοί πλήκτρων (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "" "0 είναι ένα σφάλμα, γιά 1-88 (0x01-0x58) ο κωδικός σάρωσης ισούται με τον " "κωδικό πλήκτρου\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "" "για 1-%d (0x01-0x%02x) ο κωδικός σάρωσης ισούται με τον κωδικό πλήκτρου\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -188,12 +205,14 @@ "\n" "Κωδικοί σάρωσης διαφυγής e0 xx (hex)\n" -#: src/getkeycodes.c:90 -#, fuzzy, c-format +#: src/getkeycodes.c:95 +#, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" -msgstr "αποτυχία κατά τη λήψη κωδικού πλήκτρου γιά τον κώδικα σάρωσης 0x%x\n" +msgstr "" +"αποτυχία κατά τη λήψη κωδικού πλήκτρου γιά τον κώδικα σάρωσης 0x%x: ioctl " +"KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -202,93 +221,96 @@ "Χρήση:\n" "\t%s [-s] [-C console]\n" -#: src/kbdinfo.c:18 -#, c-format +#: src/kbdinfo.c:21 +#, fuzzy, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Χρήση: %1$s [-C DEVICE] getmode [text|graphics]\n" " ή: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " ή: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " ή: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Σφάλμα: Όχι αρκετά ορίσματα.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Σφάλμα: Άγνωστη ενέργεια: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "χρήση: kbd_mode [-a|-u|-k|-s] [-C device]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε ακατέργαστη (scancode) κατάσταση\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Το πληκτρολόγιο είναι σε ημικατεργασμένη (keycode) κατάσταση\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται στην προεπιλεγμένη κατάσταση (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε κατάσταση Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε κάποια άγνωστη κατάσταση\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Ο ρυθμός επανάληψης ρυθμίστηκε σε %.1f cps (καθυστέρηση = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Χρήσις: kbdrate [-V] [-s] [-r ρυθμός] [-d καθυστέρηση]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Αδυνατώ ν' ανοίξω το /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "bug: getfont κλήθηκε με μετρητή<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "bug: getfont using GIO_FONT needs buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: εξάντληση μνήμης\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "περίεργο... ct άλλαξε από %d σε %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -297,168 +319,168 @@ "Φαίνεται πως ο πυρήνας είναι παλαιότερος του 1.1.92\n" "Δεν φορτώθηκε πίνακας Unicode.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "εξάντληση μνήμης" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "unable to initialize array: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Σφάλμα εγγραφής του πίνακα απεικόνισης στο αρχείο" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "αδύνατον: δεν είναι meta;\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: λάθος στο δείκτη %d του πίνακα %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: Unable to get function key string" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: Δεν μπορώ να βρω τον πίνακα των τόνων" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "unable to get keymap %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "unable to unset key %d for table %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "η lk_add_key κλήθηκε με λάθος κωδικό πλήκτρου %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "η προσθήκη map %d παραβιάζει υπάρχουσα σαφή αντιστοίχιση πλήκτρων" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "αποτυχία απόδωσης στο πλήκτρο %d της τιμής %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "αδύνατο σφάλμα σε lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "unable to get symbol by wrong type: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "unable to get symbol of %d type by wrong index: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "υποθέτοντας iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "υποθέτοντας iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "υποθέτοντας iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "υποθέτοντας iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "υποθέτοντας iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "άγνωστο keysym «%s»\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: αδυναμία μετάβασης σε Unicode mode" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Keymap %d: Άρνηση αδείας" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "κωδικός πλήκτρου %d, πίνακας %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " FAILED" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "αποτυχία απόδωσης στο πλήκτρο %d της τιμής %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "αποδέσμευση keymap %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: αδυναμία αποδέσμευσης keymap %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: αδυναμία αποδέσμευσης ή καθαρισμού keymap" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "KDSKBMODE: %s: αποτυχία επιστροφής στην αρχική keyboard mode" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "αποτυχία σύνδεσης συμβολοσειράς «%s» με τη συνάρτηση %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "αποτυχία καθαρισμού συμβολοσειράς %s" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "πάρα πολλοί ορισμοί compose" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -473,66 +495,66 @@ "\n" "Changed %d keys" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "Αλλαγή του %d" msgstr[1] "Changed %d strings" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "Loaded %d compose definition" msgstr[1] "Loaded %d compose definitions" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Ουδεμία αλλαγή στους ορισμούς compose.)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "" "περιοχή των κωδικών πλήκτρων που υποστηρίζεται απο τον πυρήνα: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "μέγιστος αριθμός ενεργειών αποδοτέων σ' ένα πλήκτρο: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "αριθμός απεικονίσεων πλήκτρων εν χρήσει: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "από τους οποίους %u έχουν δεσμευτεί δυναμικά\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "περιοχές κωδικών ενέργειας που υποστηρίζονται από τον πυρήνα:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "αριθμός πλήκτρων λειτουργιών υποστηριζομένων απ' τον πυρήνα : %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "μέγιστος αριθμός προσδιορισμών compose: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "αριθμός προσδιορισμών compose εν χρήσει: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -543,12 +565,12 @@ "Τα παρακάτω συνώνημα αναγνωρίστηκαν:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s γιά %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -557,7 +579,7 @@ "\n" "Ονόματα αναγνωρισμένων μετατροπέων και οι αριθμοί τους στήλης :\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -579,6 +601,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "έκδοση loadkeys %s\n" "\n" @@ -594,22 +617,23 @@ " -d --default load \"%s\"\n" " -h --help εμφάνιση αυτής εδώ της βοήθειας\n" " -m --mktable έξοδος μιας \"defkeymap.c\" στην stdout\n" +" -p --parse search and parse keymap without action\n" " -q --quiet suppress all normal output\n" " -s --clearstrings clear kernel string table\n" " -u --unicode υποχρεωτική μετατροπή σε Unicode\n" " -v --verbose αναφορά των αλλαγών\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s από %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Οι επιλογές --unicode and --ascii είναι αμοιβέα αποκλειόμενες\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -618,7 +642,7 @@ "%s: προειδοποίηση: φόρτωση μη-Unicode keymap σε κονσόλα Unicode\n" " (μήπως θες να δώσεις «kbd_mode -a»;)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -627,17 +651,17 @@ "%s: προειδοποίηση: φόρτωση Unicode keymap σε μη-Unicode κονσόλα\n" " (μήπως θέλεις να δώσεις `kbd_mode -u';)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Αδυναμία εύρεσης %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "Αδυνατώ ν' ανοίξω το αρχείο %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -646,30 +670,30 @@ "Χρήση:\n" "\t%s [-C console] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Εσφαλμένη γραμμή εισόδου: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "" "%s: Αριθμός γλύφου (0x%x) μεγαλύτερος απ' το μήκος της γραμματοσειράς\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Εσφαλμένο πέρας περιοχής (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -678,22 +702,22 @@ "%s: περιοχή Unicode U+%x-U+%x όχι του ιδίου μήκους με την περιοχή θέσεων 0x " "%x-0x%x της γραμματοσειράς\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: σκουπίδια στο τέλος (%s) αγνοήθηκαν\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Φόρτωση της απεικόνισης unicode από το αρχείο %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Προειδοποίηση: γραμμή πολύ μεγάλη\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -702,84 +726,84 @@ "%s: δεν φορτώνεται άδεια unimap\n" "(άν επιμένετε: χρησιμοποιείστε την επιλογή -f γιά παράβλεψη)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "καταχώρηση" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "καταχωρήσεις" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Ο πίνακας απεικόνισης unicode διασώθηκε στο «%s»\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Προστέθηκε πίνακας απεικόνισης Unicode \n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "χρήση: %s [-v] [-o map.orig] map-αρχείο\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: αδυνατώ ν' ανοίξω το αρχείο απεικόνισης _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Cannot stat map file" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "" "Φόρτωση δυαδικής απεικόνισης της οθόνης απευθείας-στη-γραμματοσειρά από το " "αρχείο %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Σφάλμα κατά την ανάγνωση του πίνακα απεικόνισης από το αρχείο «%s»\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Φόρτωση της δυαδικής απεικόνισης unicode της οθόνης από το αρχείο %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Φόρτωση του πίνακα απεικόνισης συμβόλων της οθόνης από το αρχείο %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "" "Σφάλμα κατά τη γραμματοσυντακτική ανάλυση του πίνακα απεικόνισης συμβόλων " "από «%s», γραμμή %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Σφάλμα εγγραφής του πίνακα απεικόνισης στο αρχείο\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Αδυναμία ανάγνωσης του πίνακα απεικόνισης της κονσόλας\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Ο πίνακας απεικόνισης της οθόνης διασώθηκε στο «%s»\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -816,176 +840,172 @@ " -h, --help output a brief help message.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Δεν μπόρεσα να βρω τον ιδιοκτήτη του τρέχοντος tty!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: παράτυπος αριθμός vt" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Μόνο ο root μπορεί να χρησιμοποιήσει τη σημαία -u." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Δέν μπορώ να λάβω περιγραφέα αρχείου πού αφορά την κονσόλα" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "δεν μπορώ να βρώ ένα ελεύθερο vt" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "Αδυναμία ελέγχου αν vt %d είναι ελεύθερη; δώσε «%s -f» αν επιμένεις." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" "vt %d εν χρήσει, εκτέλεση εντολής ματαιώθηκε, δώσε «%s -f» για εκτέλεση." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Αδυναμία εύρεσης εντολής." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Αδύνατον το άνοιγμα νέας συνόδου" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Δεν μπορώ ν' ανοίξω το %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "χρησιμοποίηση VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Δεν μπορώ ν' ανοίξω το %s σε ανάγνωση/εγγραφή" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "αδυναμία ενεργοποίησης vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "η ενεργοποίηση διακόπηκε;" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "αδυναμία αποδέσμευσης της κονσόλας %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: λειψός πίνακας unicode usc2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: λειψός πίνακας utf8 unicode\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: εσφαλμένος utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: άγνωστο σφάλμα utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: λειψός πίνακας unicode\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Σφάλμα κατά την ανάγνωση της γραμματοσειράς εισόδου" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Εσφαλμένη κλήση της readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Μη υποστηριζόμενη κατάσταση αρχείου psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Μή υποστηριζόμενη έκδοση psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: μήκος γραμματοσειράς εισόδου μηδέν;\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: μέγεθος χαρακτήρα εισόδου μηδέν;\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Αρχείο εισόδου: εσφαλμένο μήκος εισόδου (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Αρχείο εισόδου: σκουπίδια στο τέλος\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: παράτυπος κωδικός unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Αδυνατώ να γράψω την επικεφαλίδα του αρχείου γραμματοσειράς" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Δεν μπορώ να γράψω στο αρχείο της γραμματοσειράς" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Προειδοποίηση: γραμμή πολύ μεγάλη\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Εσφαλμένη γραμμή εισόδου: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Ο αριθμός γλύφου (0x%lx) ξεπερνά το τέλος της γραμματοσειράς\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Εσφαλμένο πέρας περιοχής (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -994,7 +1014,7 @@ "%s: Θα πρέπει να υπάρχει μιά περιοχή Unicode πού να αντιστοιχεί στη περιοχή " "θέσεων της γραμματοσειράς\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1003,7 +1023,7 @@ "Χρήση:\n" "\t%s infont intable outfont\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1012,7 +1032,7 @@ "Χρήση:\n" "\t%s infont [outtable]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1021,7 +1041,7 @@ "Χρήση:\n" "\t%s infont outfont\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1030,22 +1050,22 @@ "Χρήση:\n" "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Εσφαλμένος μαγικός αριθμός στο %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: αρχείο psf με άγνωστο μαγικό αριθμό\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: η γραμματοσειρά εισόδου δεν περιέχει ευρετήριο\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: αδυνατώ να βρώ το αρχείο videomode %s\n" @@ -1054,29 +1074,29 @@ msgid "Invalid number of lines\n" msgstr "Ακυρος αριθμός γραμμών\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Παλαιά κατάσταση: %dx%d Νέα κατάσταση: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Παλαιές #scanlines: %d Νέες #scanlines: %d Υψος χαρακτήρα: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: η διαταγή «%s» αστόχησε\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1089,42 +1109,42 @@ "ή: resizecons -lines ROWS, με ROWS μία από 25, 28, 30, 34, 36, 40, 44, 50, " "60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: αδυνατώ να λάβω άδειες I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "χρήση: screendump [n]\n" -#: src/screendump.c:80 -#, fuzzy, c-format +#: src/screendump.c:82 +#, c-format msgid "Error reading %s" -msgstr "Σφάλμα ανάγνωσης %s\n" +msgstr "Σφάλμα ανάγνωσης %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "" "αδυναμία ανάγνωσης του %s, και δεν μπορώ να το εμφανίσω με την ioctl()\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "αδύνατη ανάγνωση %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Περίεργο ...η οθόνη είναι συγχρόνως %dx%d και %dx%d ;;\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Σφάλμα εγγραφής screendump\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1181,12 +1201,12 @@ " -V Εμφάνιση πληροφοριών έκδοσης κι έξοδος.\n" "Τα αρχεία φορτώνονται από τον τρέχοντα κατάλογο ή από %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: πάρα πολλά αρχεία εισόδου\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1195,126 +1215,126 @@ "setfont: αδύνατη επαναφορά από τη ROM χαρακτήρων και απο αρχείο συγχρόνως.Η " "γραμματοσειρά παραμένει αμετάβλητη.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Εσφαλμένο ύψος χαρακτήρα %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Εσφαλμένο πλάτος χαρακτήρα %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: η θέση 32 της γραμματοσειράς δεν είναι κενή\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: το καθάρισα\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: το υπόβαθρο θα φαίνεται αλλόκοτο\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d απο το αρχείο %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d (%d) απο το αρχείο %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: bug στο do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Φόρτωση πίνακα απεικόνισης Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Αδυνατώ ν' ανοίξω το αρχείο γραμματοσειράς %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "Κατά τη φόρτωση διαφόρων γραμμ/σειρών, όλες πρέπει να είναι psf - %s δεν " "είναι\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Ανάγνωση %d-χαρακτ. της γραμματοσειράς %dx%d από το αρχείο %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν το ίδιο ύψος\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν ίδιο πλάτος\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Αδυνατώ να βρώ την προεπιλεγμένη γραμματοσειρά\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Αδυνατώ να βρώ τη γραμματοσειρά %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Ανάγνωση αρχείου γραμματοσειράς %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Δεν υπάρχει τελική γραμμή στο συνδιασμένο αρχείο\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Πάρα πολλά αρχεία γιά συνδιασμό\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Χμμ - γραμματοσειρά απο το restorefont; Χρήση του πρώτου μισού.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Εσφαλμένο μέγεθος αρχείου εισόδου\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1323,23 +1343,23 @@ "Αυτό το αρχείο περιέχει 3 γραμματοσειρές: 8x8, 8x14 και 8x16. Παρακαλώ\n" "υποδείξτε με τις επιλογές -8 ή -14 ή -16 ποιά θέλετε.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Ζητήσατε μέγεθος γραμματοσειράς %d, αλλά μόνον 8, 14, 16 είναι δυνατόν εδώ.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Τίποτε γιά διάσωση\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-χαρακτ. της γραμματοσειράς %dx%d διασώθηκαν στο αρχείο %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1350,24 +1370,26 @@ " (όπου ο scancode είναι xx ή e0xx, σε δεκαεξαδική μορφή,\n" " και ο keycode σε δεκαδική)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "αναμενόταν ζυγός αριθμός ορισμάτων " -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "σφάλμα ανάγνωσης κωδικού σάρωσης" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "κωδικός εκτός ορίων" -#: src/setkeycodes.c:69 -#, fuzzy, c-format +#: src/setkeycodes.c:74 +#, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" -msgstr "αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d\n" +msgstr "" +"αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d: ioctl " +"KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1405,58 +1427,61 @@ msgid "off" msgstr "εκτός" -#: src/setleds.c:87 -#, fuzzy +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" -msgstr "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης led. Μήπως stdin δεν είναι VT;\n" +msgstr "" +"Σφάλμα ανάγνωσης τρέχουσας ρύθμισης led. Μήπως stdin δεν είναι VT;: ioctl " +"KDGETLED" -#: src/setleds.c:105 -#, fuzzy +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" msgstr "" -"Σφάλμα ανάγνωσης τρέχουσας ρύθμισης σημαιών. Μήπως δεν είστε στην κονσόλα;\n" +"Σφάλμα ανάγνωσης τρέχουσας ρύθμισης σημαιών. Μήπως δεν είστε στην κονσόλα;: " +"ioctl KDGKBLED" -#: src/setleds.c:123 -#, fuzzy +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" -msgstr "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων από το /dev/kbd.\n" +msgstr "" +"Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων από το /dev/kbd: ioctl " +"KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED μη διαθέσιμο;\n" -#: src/setleds.c:141 -#, fuzzy +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" -msgstr "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων από το /dev/kbd.\n" +msgstr "" +"Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων από το /dev/kbd: ioctl " +"KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED μη διαθέσιμο;\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Σφάλμα επανάταξης ledmode\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Τρέχουσα προεπιλογή σημαιών: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Τρέχουσες σημαίες: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Τρέχουσες ρυθμίσεις φωτοδιόδων: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1465,37 +1490,37 @@ "άγνωστο όρισμα: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Παλαιά προεπιλογή σημαιών: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Νέα προεπιλογή σημαιών: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Παλαιές σημαίες: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Νέες σημαίες: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Παλαιές ρυθμίσεις φωτοδιόδων: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Νέες ρυθμίσεις φωτοδιόδων: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1512,43 +1537,45 @@ "γιά ν' αλλάξετε τις ρυθμίσεις ενός άλλου vt.\n" "Οι ρυθμίσεις πρίν και μετά τις αλλαγές εμφανίζονται υπό μορφή αναφοράς.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Το πλήκτρο Meta ρυθμίζει το bit υψηλής τάξεως\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Το πλήκτρο Meta δημιουργεί πρόθεμα Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Περίεργη κατάσταση γιά ένα πλήκτρο Meta;\n" -#: src/setmetamode.c:79 -#, fuzzy +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" -msgstr "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης. Ισως stdin δεν είναι ένα VT.\n" +msgstr "" +"Σφάλμα ανάγνωσης τρέχουσας ρύθμισης. Ισως stdin δεν είναι ένα VT;: ioctl " +"KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "παλαιά κατάσταση: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "νέα κατάσταση: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "χρήση: %s\n" -#: src/setvtrgb.c:42 -#, c-format +#: src/setvtrgb.c:44 +#, fuzzy, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1558,6 +1585,10 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" "Χρήση: %s vga|FILE|-\n" "\n" @@ -1570,50 +1601,51 @@ "and then edit the values in FILE.\n" "\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Σφάλμα: %s: Άκυρη τιμή στο πεδίο %u στη γραμμή %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Σφάλμα: %s: Ανεπαρκής αριθμός πεδίων στη γραμμή %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Σφαλμα: %s: Η γραμμη %u περατωθηκε αναπαντεχα.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Σφάλμα: %s: Γραμμή %u είναι πολύ μεγάλη.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "αποτυχία αποκατάστασης αρχικού πίνακα μετάφρασης\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "αποτυχία αποκατάστασης αρχικού unimap\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "αδυνατώ ν' αλλάξω τον πίνακα μετάφρασης\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "χρήση: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1626,22 +1658,22 @@ " -i Don't print out the font table, just show\n" " ROWSxCOLSxCOUNT κι έξοδος.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Character count: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Πλάτος γραμματοσειράς : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Ύψος γραμματοσειράς : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1650,16 +1682,16 @@ "Εμφάνιση γραμματοσειράς %d-χαρακτήρων\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr ";ΑΓΝΩΣΤΗ;" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "Η κατάσταση kb ήταν %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1668,13 +1700,13 @@ "[ αν το προσπαθείτε στα Χ, ίσως να μη δουλεύει\n" "αφού κι ο εξυπηρετητής Χ διαβάζει επίσης το /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "ελήφθη το σήμα %d, καθαρισμός...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1686,6 +1718,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey έκδοση %s\n" "\n" @@ -1699,7 +1732,7 @@ "\t-k --keycodes\tεμφάνιση μόνον των διερμηνευμένων κωδικών πλήκτρων " "(προεπιλογή)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1710,31 +1743,31 @@ "Πατήστε οιαδήποτε πλήκτρα - Ctrl-D θά τερματίσει το πρόγραμμα\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "πατήστε οποιοδήποτε πλήκτρο (το πρόγραμμα τερματίζεται 10s μετά τελευταίο " "πάτημα)..\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "απελευθέρωση" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "πάτημα" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "κωδικός πλήκτρου %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "χρήση: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1744,17 +1777,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "Ολόκληρη η κονσόλα είναι τώρα τελείως κλειδωμένη από %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "%s κλειδώθηκε από %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "Χρησιμοποίησε Alt-Fn για μετάβαση σε άλλες εικονικές κονσόλες." @@ -1796,27 +1829,12 @@ msgid "stdin is not a tty" msgstr "stdin δεν είναι tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Αυτό το tty (%s) δεν είναι εικονική κονσόλα.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Ολόκληρη η κονσόλα δεν μπορεί να κλειδωθεί.\n" - -#~ msgid "%s: deallocating all unused consoles failed\n" -#~ msgstr "%s: αποτυχία αποδέσμευσης όλων των μή χρησιμοποιουμένων κονσολών\n" - -#~ msgid "kbd_mode: error reading keyboard mode\n" -#~ msgstr "kbd_mode: σφάλμα ανάγνωσης καταστάσεως πληκτρολογίου\n" - -#~ msgid "%s: error setting keyboard mode\n" -#~ msgstr "%s: σφάλμα κατά την ρύθμιση της κατάστασης πληκτρολογίου\n" - -#~ msgid "Error opening /dev/kbd.\n" -#~ msgstr "Σφάλμα κατά το άνοιγμα του /dev/kbd.\n" - -#~ msgid "%s: out of memory?\n" -#~ msgstr "%s: εξαντλημένη μνήμη;\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/eo.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/eo.gmo differ diff -Nru kbd-2.0.3/po/eo.po kbd-2.0.4/po/eo.po --- kbd-2.0.3/po/eo.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/eo.po 2017-01-08 18:38:45.000000000 +0000 @@ -1,56 +1,65 @@ # Esperanto translation -# Copyright (C) 2010, 2011, 2012, 2014 Free Software Foundation, Inc. +# Copyright (C) 2010, 2011, 2012, 2014, 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the kbd package. # Alexey Gladkov , 2010. -# Felipe Castro , 2010, 2011, 2012, 2014. +# Felipe Castro , 2010, 2011, 2012, 2014, 2016. # msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.2-rc2\n" +"Project-Id-Version: kbd 2.0.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2014-07-01 09:16-0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-03-04 11:20-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "uzmaniero: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Ne eblis preni dosier-priskribilon rilatanta al la konzolo" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: nekonata modifilo\n" -#: src/deallocvt.c:50 -#, fuzzy +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" -msgstr "%s: 0: malpermesata VT-numero\n" +msgstr "0: malpermesata VT-numero\n" -#: src/deallocvt.c:52 -#, fuzzy +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" -msgstr "%s: VT 1 estas la konzolo kaj ne povas esti liberigata\n" +msgstr "VT 1 estas la konzolo kaj ne povas esti liberigata\n" -#: src/deallocvt.c:54 -#, fuzzy, c-format +#: src/deallocvt.c:58 +#, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" -msgstr "%s: ni ne povis liberigi la konzolon %d\n" +msgstr "ne eblis liberigi la konzolon %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys versio %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -59,13 +68,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -85,7 +95,7 @@ "\t --compose-only montri nur kunmetajn klav-kombinojn\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -94,17 +104,24 @@ "\t\t\t interpreti signajn ago-kodojn kvazaŭ ili estu el la\n" "\t\t\t specifita signaro\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "nekonata signaro %s - ni preteratentas peton de signaro\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: eraro dum legado de la klavar-reĝimo: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -115,7 +132,7 @@ "(cifera valoro, simbolo)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -138,41 +155,41 @@ "\t-V --version montri la programo-version\n" "\t-n --next-available montri kiom da venontaj nerezervitaj VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " -msgstr "Ni ne povis legi VTNO: " +msgstr "Ne eblis legi VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" -msgstr "Ni ne povis malfermi %s\n" +msgstr "Ne eblis malfermi %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" +msgstr "Ne eblis preni dosier-priskriblon rilatanta al la konzolo\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "uzmaniero: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Simplaj skankodoj xx (16-ume) kontraŭ klavkodoj (10-ume)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "0 estas eraro; inter 1-88 (0x01-0x58) skankodoj egalas al klavkodoj\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "inter 1-%d (0x01-0x%02x) skankodoj egalas al klavkodoj\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -183,12 +200,12 @@ "\n" "Ni preterpasis skankodojn e0 xx (16-ume)\n" -#: src/getkeycodes.c:90 -#, fuzzy, c-format +#: src/getkeycodes.c:95 +#, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" -msgstr "malsukcesis preni klavkodon por skankodo 0x%x\n" +msgstr "malsukcesis preni klavkodon por skankodo 0x%x: ioctl KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -197,93 +214,96 @@ "Uzmaniero:\n" "\t%s [-s] [-C konzolo]\n" -#: src/kbdinfo.c:18 -#, c-format +#: src/kbdinfo.c:21 +#, fuzzy, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Uzmaniero: %1$s [-C APARATO] getmode [text|graphics]\n" " aŭ: %1$s [-C APARATO] gkbmode [raw|xlate|mediumraw|unicode]\n" " aŭ: %1$s [-C APARATO] gkbmeta [metabit|escprefix]\n" " aŭ: %1$s [-C APARATO] gkbled [scrolllock|numlock|capslock]\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Eraro: Ne sufiĉe da argumentoj.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Eraro: Nerekonita ago: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "uzmaniero: kbd_mode [-a|-u|-k|-s] [-C aparato]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "La klavaro estas en kruda (skankoda) reĝimo\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "La klavaro estas en mezkruda (klavkoda) reĝimo\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "La klavaro estas en la apriora (ASCII) reĝimo\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "La klavaro estas en Unikoda (UTF-8) reĝimo\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "La klavaro estas en iu nekonata reĝimo\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Ripet-Rapido fiksita po %.1f signoj sekunde (prokrasto = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Uzmaniero: kbdrate [-V] [-s] [-r rapido] [-d prokrasto]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Ni ne povas malfermi /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "miso: getfont vokita kun count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "miso: getfont uzanta GIO_FONT postulas bufron.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: mankas memoro\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "strange... ct ŝanĝis el %d al %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -292,168 +312,168 @@ "Ŝajnas ke tiu ĉi kerno estas pli malnova ol 1.1.92\n" "Neniu Unikoda map-tabelo ŝargita.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "mankas memoro" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "ne eblas ekplenigi matricon: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Eraro dum skribo de mapo al dosiero" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "neeble: ne estas meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: eraro ĉe indico %d en la tabelo %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: ne eblas preni ŝlosilan ĉenon de funkcio" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: ne eblas preni kromsignan tabelon" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "ne eblas preni klavmapon %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "ne eblas malŝalti klavon %d por tabelo %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key vokita kun malĝusta klavkodo %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "aldonado de la mapo %d malrespektas linion de keymaps" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "ne eblas ŝalti klavon %d por tabelo %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "malebla eraro en lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "ne eblas preni simbolon per malkorekta tipo: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "ne eblas preni simbolon de tipo %d per malkorekta indico: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "ni konsideras kiel iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "ni konsideras kiel iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "ni konsideras kiel iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "ni konsideras kiel iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "ni konsideras kiel iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "nekonata klavsimbolo '%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: ne eblis ŝalti al Unikoda reĝimo" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Klavmapo %d: Permeso neita" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "klavkodo %d, tabelo %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " FIASKO" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "fiasko ligi klavon %d al valoro %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "liberigi klavmapon %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: ne eblis liberigi klavmapon %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: ne eblas liberigi aŭ forviŝi klavmapon" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "KDSKBMODE: %s: ne eblis retroiri al la originala klavar-reĝimo" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "fiasko ligi ĉenon '%s' al funkcio %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "fiasko forviŝi ĉenon %s" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "tro da kunmetaj difinoj" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -468,65 +488,65 @@ "\n" "Ni ŝanĝis %d ŝlosilojn" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "Ni ŝanĝis %d ĉenon" msgstr[1] "Ni ŝanĝis %d ĉenojn" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "Ni ŝargis je %d kunmeta difino" msgstr[1] "Ni ŝargis je %d kunmetaj difinoj" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Neniu ŝanĝo en kunmetaj difinoj)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "rango de klavkodoj subtenata de la kerno: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "maksimuma nombro da agoj ligeblaj al unu klavo: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "nombro da klavmapoj fakte uzataj: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "el kiuj %u estas dinamike rezervitaj\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "rangoj de ago-kodoj subtenataj de la kerno:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "nombro da funkciaj klavoj subtenataj de la kerno: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "maks nombro da kunmetaj difinoj: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "nombro da kunmetaj difinoj fakte uzataj: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -537,12 +557,12 @@ "La jenaj sinonimoj estas rekoneblaj:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s por %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -551,7 +571,7 @@ "\n" "Rekoneblaj modif-nomoj kaj ties kolumno-numeroj:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -573,6 +593,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys versio %s\n" "\n" @@ -588,22 +609,23 @@ " -d --default ŝargi je \"%s\"\n" " -h --help montri tiun ĉi help-tekston\n" " -m --mktable eligi \"defkeymap.c\" al stdout\n" +" -p --parse serĉi kaj analizi klavmapon sen ago\n" " -q --quiet forkaŝi ĉiun normalan eligon\n" " -s --clearstrings forviŝi kernan ĉen-tabelon\n" " -u --unicode devigi konvertadon al Unikodo\n" " -v --verbose listigi la ŝanĝojn\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s el %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Elektoj --unicode kaj --ascii estas reciproke malkunigeblaj\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -612,7 +634,7 @@ "%s: averto: ŝargado je ne-Unikoda klavmapo ĉe Unikoda konzolo\n" " (eble vi volas fari `kbd_mode -a'?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -621,17 +643,17 @@ "%s: averto: ŝargado je Unikoda klavmapo al ne-Unikoda konzolo\n" " (eble vi volas fari `kbd_mode -u'?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Ni ne povas trovi %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "ne malfermeblas la dosiero %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -640,28 +662,28 @@ "Uzmaniero:\n" "\t%s [-C konzolo] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Malĝusta enig-linio: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Signobilda numero (0x%x) pli granda ol longo de tiparo\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Malĝusta fino de rango (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -670,22 +692,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: vosta rubaĵo (%s) preteratentita\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Ŝargado je unikoda map el dosiero %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Averto: linio tro longa\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -694,80 +716,80 @@ "%s: ne ŝargadas malplenan unikodmapon\n" "(se vi insistas: uzu modifilon -f por preterpasi)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "enigo" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "enigoj" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Unikoda mapo konservita en '%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Postmetita Unikoda mapo\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "uzmaniero: %s [-v] [-o map.orig] map-dosiero\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: ne povas malfermi map-dosieron _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Ne eblas statlegi map-dosieron" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Ŝargado je duuma rekte-al-tipara ekran-mapo el dosiero %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Eraro dum legado de mapo el dosiero '%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Ŝargado je duuma unikoda ekran-mapo el dosiero %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Ŝargado je simbola ekran-mapo el dosiero %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Eraro dum analizado de simbola mapo el '%s', linio %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Eraro dum skribo de mapo al dosiero\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Ne eblas legi konzolan mapon\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Ekran-mapo konservita en '%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -804,182 +826,178 @@ " -h, --help eligi mallongan help-mesaĝon.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Ne povis trovi la posedanton de la aktuala tty!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Malpermesata numero de vt" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Nur root povas uzi la flagon -u." -#: src/openvt.c:256 -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:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Ne eblas trovi liberan vt" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "Ne eblas kontroli ĉu vt %d estas libera; uzu '%s - f' por perforti." -#: src/openvt.c:271 +#: src/openvt.c:273 #, 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:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Ne eblas trovi la komandon." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Ne eblas ekigi novan seancon" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Ne eblas malfermi %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Ni uzadas VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Ne eblas malfermi %s lege/skribe" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Ne povis aktivigi vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Ĉu aktivigo interrompita?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" -msgstr "Ni ne povis liberigi la konzolon %d" +msgstr "Ne eblis liberigi la konzolon %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: mallonga unikoda tabelo ucs2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: mallonga unikoda tabelo utf8\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: malĝusta utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: nekonata eraro utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: mallonga unikoda tabelo\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Eraro dum legado de eniga tiparo" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Malĝusta voko al readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Nesubtenata dosiera reĝimo psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Nesubtenata versio psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: ĉu nula eniga tipar-longo?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: ĉu nula eniga signo-grando?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Enig-dosiero: malĝusta eniga longo (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Enig-dosiero: vosta rubaĵo\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: malpermesata unikodo %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Ne eblas skribi tiparan dosier-kapon" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Ne eblas skribi tipar-dosieron" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Averto: linio tro longa\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Malĝusta eniga linio: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Signobilda numero (0x%lx) post fino de tiparo\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Malĝusta fino de rango (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format 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 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -988,7 +1006,7 @@ "Uzmaniero:\n" "\t%s en_tiparo en_tabelo el_tiparo\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -997,7 +1015,7 @@ "Uzmaniero:\n" "\t%s en_tiparo [el_tabelo]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1006,7 +1024,7 @@ "Uzmaniero:\n" "\t%s en_tiparo el_tiparo\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1015,22 +1033,22 @@ "Uzmaniero:\n" "\t%s [-i en_tiparo] [-o el_tiparo] [-it en_tabelo] [-ot el_tabelo] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Malĝusta magi-numero en %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: dosiero psf kun nekota magi-numero\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: eniga tiparo ne havas indicon\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: ne eblas trovi dosieron videomode %s\n" @@ -1039,28 +1057,28 @@ msgid "Invalid number of lines\n" msgstr "Malvalida nombro da linioj\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Malnova reĝimo: %dx%d Nova reĝimo: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Malnovaj #skanlinioj: %d Novaj #skanlinioj: %d Signo-alto: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: la komando '%s' malsukcesis\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format 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:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1073,41 +1091,41 @@ "aŭ: resizecons -lines LIN, kie LIN estu unu el 25, 28, 30, 34, 36, 40, 44, " "50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: ne eblas havi permesojn EN/EL.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "uzmaniero: screendump [n]\n" -#: src/screendump.c:80 -#, fuzzy, c-format +#: src/screendump.c:82 +#, c-format msgid "Error reading %s" -msgstr "Eraro dum legado de %s\n" +msgstr "Eraro dum legado de %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "ne eblis legi %s, kaj ne eblas uzi ioctl dump\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" -msgstr "ne povis legi %s\n" +msgstr "ne eblis legi %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Strange ... ekrano estas kaj %dx%d kaj %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Eraro dum skribado de ekrankopio\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1162,12 +1180,12 @@ " -V Printi version kaj eliri.\n" "Dosieroj estas ŝargataj el la aktuala dosierujo aŭ el %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: tro da enig-dosieroj\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1176,122 +1194,122 @@ "setfont: ne eblas restarigi kaj el signeca ROM kaj el dosiero. Tiparo " "neŝanĝita.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Malĝusta signo-alto %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Malĝusta signo-larĝo %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: tipar-pozicio 32 estas nespaca\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: viŝis ĝin\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: fono ŝajnos ridinda\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Ŝargado je tiparo %d-char %dx%d el dosiero %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Ŝargado je tiparo %d-char %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Ŝargado je tiparo %d-char %dx%d (%d) el dosiero %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Ŝargado je tiparo %d-char %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: miso en do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Ŝargado je Unikoda mapiga tabelo...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Ne eblas malfermi la tipar-dosieron %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "Dum ŝargado je pluraj tiparoj, ĉiuj devas esti psf - %s ne estas\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Legi tiparon %d-char %dx%d el dosiero %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Dum ŝargado je pluraj tiparoj, ĉiuj devas havi la saman alton\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Dum ŝargado je pluraj tiparoj, ĉiuj devas havi la saman larĝon\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Ne eblas trovi aprioran tiparon\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Ne eblas trovi la tiparon %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Legado de tipar-dosiero %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Neniu fina novlinio en kunmeta dosiero\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Tro da dosieroj por kunmeti\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - ĉu tiparo el restorefont? Ni uzas la unuan duonon.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Malĝusta grando de enig-dosiero\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1300,22 +1318,22 @@ "Tiu ĉi dosiero enhavas 3 tiparojn: 8x8, 8x14 kaj 8x16. Bonvolu indiki\n" "uzante modifilon -8 aŭ -14 aŭ -16 je kiu el ili vi volas ŝargi.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "Vi petis tipar-grandon %d, sed nur 8, 14 kaj 16 eblas ĉi tie.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Nenio trovita por konservi\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Konservita tipar-dosiero %d-char %dx%d en %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1326,24 +1344,24 @@ " (kie skankodo estas xx aŭ e0xx, indikata deksesume,\n" " kaj klavkodo estas indikata dekume)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "para nombro da argumentoj atendataj" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "eraro dum legado de skankodo" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "kodo for de limoj" -#: src/setkeycodes.c:69 -#, fuzzy, c-format +#: src/setkeycodes.c:74 +#, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" -msgstr "malsukcesis alĝustigi skankodon %x al klavkodo %d\n" +msgstr "malsukcesis alĝustigi skankodon %x al klavkodo %d: ioctl KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1380,57 +1398,59 @@ msgid "off" msgstr "malŝaltita" -#: src/setleds.c:87 -#, fuzzy +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" -msgstr "Eraro dum legado de aktuala lumdioda stato. Eble stdin ne estas VT?\n" +msgstr "" +"Eraro dum legado de aktuala lumdioda stato. Eble stdin ne estas VT?: ioctl " +"KDGETLED" -#: src/setleds.c:105 -#, fuzzy +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" -msgstr "Eraro dum legado de aktuala flag-stato. Eble vi ne estas ĉe konzolo?\n" +msgstr "" +"Eraro dum legado de aktuala flag-stato. Eble vi ne estas ĉe konzolo?: ioctl " +"KDGKBLED" -#: src/setleds.c:123 -#, fuzzy +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" -msgstr "Eraro dum legado de aktuala lumdioda stato el /dev/kbd.\n" +msgstr "" +"Eraro dum legado de aktuala stato de lumdiodo el /dev/kbd: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "Ĉu KIOCGLED ne disponeblas?\n" -#: src/setleds.c:141 -#, fuzzy +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" -msgstr "Eraro dum legado de aktuala lumdioda stato el /dev/kbd.\n" +msgstr "" +"Eraro dum legado de aktuala stato de lumdiodo el /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "Ĉu KIOCSLED ne disponeblas?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" -msgstr "Eraro dum rekomencigo de ledmode\n" +msgstr "Eraro dum rekomencigo de 'ledmode'\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Aktualaj aprioraj flagoj: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Aktualaj flagoj: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Aktualaj lumdiodoj: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1439,37 +1459,37 @@ "nerekonita argumento: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Malnovaj aprioraj flagoj: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Novaj aprioraj flagoj: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Malnovaj flagoj: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Novaj flagoj: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Malnovaj lumdiodoj: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Novaj lumdiodoj: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1486,43 +1506,44 @@ "por ŝanĝi la staton de alia vt.\n" "La statoj antaŭ kaj post la ŝanĝo estos montrataj.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Klavo Meta difinas alt-ordan biton\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Klavo Meta donas prefikson Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Ĉu stranga reĝimo por klavo Meta?\n" -#: src/setmetamode.c:79 -#, fuzzy +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" -msgstr "Eraro dum legado de aktuala stato. Eble stdin ne estas VT?\n" +msgstr "" +"Eraro dum legado de aktuala stato. Eble stdin ne estas VT?: ioctl KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "malnova stato: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "nova stato: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "uzmaniero: %s\n" -#: src/setvtrgb.c:42 -#, c-format +#: src/setvtrgb.c:44 +#, fuzzy, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1532,6 +1553,10 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" "Uzmaniero: %s vga|DOSIERO|-\n" "\n" @@ -1544,50 +1569,51 @@ "kaj tiam redaktu la valorojn en DOSIERO.\n" "\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Eraro: %s: Malvalida valoro en kampo %u en linio %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Eraro: %s: Ne sufiĉa nombro da kampoj en linio %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Eraro: %s: Linio %u finiĝis ne atendite.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Eraro: %s: Linio %u tro longas.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "malsukcesis restarigi originalan traduk-tabelon\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "malsukcesis restarigi originalan unimapon\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "ne eblas ŝanĝi traduk-tabelon\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "uzmaniero: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1599,22 +1625,22 @@ " -i Ne presi la tipar-tabelon, nur montri\n" " LINxKOLxNOMBRO kaj eliri.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Kiom signoj: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Tipar-larĝo: %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Tipar-alto : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1623,16 +1649,16 @@ "Montrado de tiparo %d-char\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?NEKONATA?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "kb-reĝimo estis %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1641,13 +1667,13 @@ "[ se vi provas tion ĉi sub X, ĝi eble ne funkcios\n" "ĉar la servilo X ankaŭ legas /dev/console, nune ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "kaptinte la signalon %d, ni forviŝadas...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1659,6 +1685,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey, versio %s\n" "\n" @@ -1671,7 +1698,7 @@ "\t-s --scancodes\tmontrigi nur la krudajn skan-kodojn\n" "\t-k --keycodes\tmontrigi nur la interpretitajn klavkodojn (apriore)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1682,29 +1709,29 @@ "Premu iujn ajn klavojn - Ctrl-D ĉesigos tiun ĉi programon\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "premu iun ajn klavon (la programo ĉesos 10s post lasta klavpremo)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "lasite" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "premite" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "klavkodo %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "uzmaniero: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1714,17 +1741,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "La tuta konzola montrilo estas nun entute ŝlosita de %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "La %s estas nun ŝlosita de %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "Uzi Alt-funkciajn klavojn por alterni al aliaj virtualaj konsoloj." @@ -1765,12 +1792,12 @@ msgid "stdin is not a tty" msgstr "ĉef-enigo ne estas tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Tiu ĉi tty (%s) ne estas virtuala konzolo.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "La tuta konzola montrilo ne povas esti ŝlosita.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/es.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/es.gmo differ diff -Nru kbd-2.0.3/po/es.po kbd-2.0.4/po/es.po --- kbd-2.0.3/po/es.po 2015-07-13 22:17:44.000000000 +0000 +++ kbd-2.0.4/po/es.po 2017-01-08 18:38:56.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: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2008-05-14 23:48+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Spanish \n" @@ -17,38 +17,50 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "uso: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +#, 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" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: opción desconocida\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: número de terminal virtual no válido\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: la terminal virtual 1 es la consola y no puede liberarse\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s: no se pudo liberar la consola %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys, versión %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -57,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -83,7 +96,7 @@ " --compose-only mostrar sólo las combinaciones con la tecla Componer\n" " -c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -92,17 +105,24 @@ " interpretar que los códigos de acción de carácter\n" " proceden del conjunto de caracteres especificado\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "conjunto de caracteres %s desconocido - no se atiende a la petición\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: error al establecer el modo de teclado\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -113,7 +133,7 @@ "(valor numérico, símbolo)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, fuzzy, c-format msgid "" "%s version %s\n" @@ -137,45 +157,45 @@ " -n --next-available mostrar el número de la próxima terminal virtual " "libre\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "no se pudo leer VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "No se pudo abrir %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "uso: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Códigos de rastreo simples xx (hex) frente a códigos de tecla (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, 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" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -186,276 +206,279 @@ "\n" "Códigos de rastreo con escape e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "fallo al averiguar el código de tecla para el código de rastreo 0x%x\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" "\t%s [-s] [-C console]\n" msgstr "Uso: %s [-s] [C consola]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, fuzzy, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" "argumento desconocido: _%s_\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "uso: kbd_mode [-a|-u|-k|-s] [-C dispositivo]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "El teclado está en modo crudo (de código de rastreo)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "El teclado está en modo medio crudo (de código de tecla)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "El teclado está en el modo predeterminado (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "El teclado está en modo Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "El teclado está en algún modo desconocido\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, 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" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Uso: kbdrate [-V] [-s] [-r cadencia] [-d retraso]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "No se puede abrir /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "error interno: llamada a getfont con contador<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "error interno: cuando getfont() usa GIO_FONT necesita un buffer.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: memoria agotada\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: memoria agotada\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Error al escribir la tabla asociativa en el fichero\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "imposible: ¿no será una tecla Meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "Error KDGKBENT en el índice %d de la tabla %d\n" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "fallo al averiguar el código de tecla para el código de rastreo 0x%x\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "fallo al averiguar el código de tecla para el código de rastreo 0x%x\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "conjeturando iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "conjeturando iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "conjeturando iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "conjeturando iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "conjeturando iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "keysym '%s' desconocida\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "código de tecla %3d %s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr "" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "no se pudo asignar el código de rastreo %x al código de tecla %d\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s: no se pudo liberar la consola %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "número máximo de definiciones de composición: %d\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -466,66 +489,66 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "número máximo de definiciones de composición: %d\n" msgstr[1] "número máximo de definiciones de composición: %d\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "número máximo de definiciones de composición: %d\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "el núcleo acepta el rango de códigos de teclado: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "máximo número de acciones asociables a una tecla: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "número de mapas de teclado realmente en uso: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "de los cuales %d han sido asignados dinámicamente\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "rangos de códigos de acción admitidos por el núcleo:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "número de teclas de función admitidas por el núcleo: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "número máximo de definiciones de composición: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "número de definiciones de composición en uso real: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -536,12 +559,12 @@ "Se reconocen los siguientes sinónimos:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s para %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -550,7 +573,7 @@ "\n" "Nombres de modificador reconocidos y sus números de columna:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -572,73 +595,74 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s de %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "No se encontró el tipo %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "No se pudo abrir el fichero de tipo de letra %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "Uso: %s [-C consola] [-o mapa.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Línea de entrada incorrecta: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, 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" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: fin de rango (0x%x) incorrecto\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -647,22 +671,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: se descarta la basura del final (%s)\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Cargando la tabla asociativa unicode del archivo %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Advertencia: la línea es demasiado larga\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -671,82 +695,82 @@ "%s: no se carga una tabla asociativa unicode vacía\n" "(para forzar a cargarla, use la opción -f)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "entrada" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "entradas" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Se ha guardado la tabla asociativa unicode en `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Se ha añadido una tabla asociativa Unicode\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "uso: %s [-v] [-o tabla.orig] fichero-tabla-asociativa\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: no puede abrir el fichero-tabla-asociativa _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "No se puede hacer stat() sobre el fichero-tabla-asociativa" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, 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" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Error de lectura de la tabla asociativa contenida en el fichero `%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Cargando el mapa de pantalla binario unicode desde el fichero %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Cargando el mapa de pantalla simbólico desde el fichero %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Error al analizar el mapa simbólico contenido en `%s', línea %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Error al escribir la tabla asociativa en el fichero\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "No se puede leer la tabla asociativa de consola\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Guardada la tabla asociativa de pantalla en `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -767,180 +791,174 @@ "\n" msgstr "" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:208 +#: src/openvt.c:210 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: número de term. virt. erróneo\n" -#: src/openvt.c:234 +#: src/openvt.c:236 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: sólo root puede usar el indicador -u.\n" -#: src/openvt.c:256 -#, 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" - -#: src/openvt.c:263 +#: src/openvt.c:265 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: no se encuentra ninguna term. virt. libre\n" -#: src/openvt.c:267 +#: src/openvt.c:269 #, 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:271 +#: src/openvt.c:273 #, 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:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "" -#: src/openvt.c:313 +#: src/openvt.c:315 #, fuzzy msgid "Unable to set new session" msgstr "openvt: No se puede establecer nueva sesión (%s)\n" -#: src/openvt.c:337 +#: src/openvt.c:339 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: No se pudo abrir %s: %s\n" -#: src/openvt.c:341 +#: src/openvt.c:343 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: usando la terminal virtual %s\n" -#: src/openvt.c:347 +#: src/openvt.c:349 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: No se puede abrir %s para lectura/escritura (%s)\n" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:401 +#: src/openvt.c:403 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: no se pudo liberar la consola %d\n" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: tabla ucs2 unicode abreviada\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: tabla utf8 unicode abreviada\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: utf8 incorrecto\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: error utf8 desconocido\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: tabla unicode abreviada\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Error al leer el tipo de letra de entrada" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Llamada a readpsffont incorrecta\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: modalidad (%d) de fichero psf no admitida\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Versión (%d) de psf no admitida\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: ¿la longitud del tipo de letra introducido es cero?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: ¿el tamaño del carácter introducido es cero?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Fichero de entrada: longitud de entrada (%d) incorrecta\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Fichero de entrada: basura al final\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: unicode %u es erróneo\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "No se puede escribir la cabecera del fichero de tipo de letra" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "No se pudo escribir el fichero de tipos de letra " -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Advertencia: línea demasiado larga\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Línea de entrada incorrecta: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: El número de glifo (0x%lx) es mayor que el final del tipo\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Fin de rango (0x%lx) incorrecto)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -949,7 +967,7 @@ "%s: Correspondiendo a un rango de posiciones de tipo, debería haber un rango " "Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -957,21 +975,21 @@ msgstr "" "Uso: %s: tipo-de-letra-de-entrada tabla-de-entrada tipo-de-letra-de-salida\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" "\t%s infont [outtable]\n" msgstr "Uso: %s tipo-de-entrada [tabla-de-salida]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" "\t%s infont outfont\n" msgstr "Uso: %s tipo-de-letra-de-entrada tipo-de-letra-de-salida\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -980,22 +998,22 @@ "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 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Número mágico incorrecto en %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: fichero psf con número mágico incorrecto\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: el fichero de entrada no tiene un índice\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: no se encuentra el fichero de modos de video %s\n" @@ -1004,31 +1022,31 @@ msgid "Invalid number of lines\n" msgstr "Número de líneas inválido\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Modo anterior: %dx%d Modo nuevo: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, 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" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: la orden `%s' devuelve error\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1041,41 +1059,41 @@ "o: resizecons -lines FILAS, donde FILAS es 25, 28, 30, 34, 36, 40, 44, 50, o " "60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: no se pueden obtener permisos de Entrada/Salida (I/O).\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "uso: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Error al leer %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "no se pudo leer %s, y no se puede volcar con ioctl\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "no se pudo leer %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Extraño ... ¿¿la pantalla es a la vez %dx%d y %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Error al escribir el volcado de pantalla\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1141,12 +1159,12 @@ "\n" "Los ficheros se cargan del directorio actual o de /%s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: demasiados ficheros de entrada\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1155,126 +1173,126 @@ "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 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Altura de carácter incorrecta: %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Anchura de carácter incorrecta: %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: la posición 32 en el tipo no es un blanco\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: eliminado\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: el fondo va a tener un aspecto extraño\n" # Tengo que conservar el orden de los %d aunque # en español sería `tipo de caracteres' -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Cargando, de %d caract., el tipo %dx%d desde el fichero %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Cargando, de %d caract., el tipo %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Cargando, de %d caract., el tipo %dx%d (%d) desde el fichero %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Cargando, de %d caract., el tipo %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: error en do_loadtable()\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Cargando la tabla asociativa Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "No se pudo abrir el fichero de tipo de letra %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Leer, de %d caract., el tipo %dx%d a partir del fichero %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Cuando se cargan varios tipos, todos deben tener la misma altura\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Cuando se cargan varios tipos, todos deben tener el mismo ancho\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "No se encontró el tipo predefinido\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "No se encontró el tipo %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Leyendo el fichero de tipo de letra %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Falta Nueva Línea final en el fichero combinado\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Demasiados ficheros que combinar\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, 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" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Tamaño de fichero de entrada incorrecto\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1283,23 +1301,23 @@ "Este fichero contiene tres tipos: 8x8, 8x14 y 8x16. Por favor indique\n" "cuál quiere cargar mediante una opción -8, -14 ó -16.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "Ha pedido un tipo de %d puntos, pero sólo son posibles 8, 14 ó 16.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "No se encontró nada que guardar\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, 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 %4$s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1310,24 +1328,24 @@ " (donde código_de_rastreo es ó xx ó e0xx, en hexadecimal,\n" " y código_de_tecla se da en decimal)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "se espera un número par de argumentos" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "error al leer el código de rastreo" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "código fuera de los límites" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "no se pudo asignar el código de rastreo %x al código de tecla %d\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1368,7 +1386,7 @@ msgid "off" msgstr "desactivado" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1376,7 +1394,7 @@ "Error al leer el estado actual de los leds. ¿Quizás stdin no es una terminal " "virtual?\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1385,44 +1403,44 @@ "Error al leer el estado actual de los indicadores. ¿Quizás no se esté en una " "consola?\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Error al leer de /dev/kbd el estado actual de los LEDs.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "¿no está disponible KIOCGLED?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Error al leer de /dev/kbd el estado actual de los LEDs.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "¿no está disponible KIOCSLED?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Erro al reinicializar el modo de los LEDs\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Indicadores predefinidos actuales: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Indicadores actuales. " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Leds actuales. " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1431,37 +1449,37 @@ "argumento desconocido: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Indicadores predefinidos anteriores: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Indicadores predefinidos nuevos: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Indicadores anteriores: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Indicadores nuevos: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "LEDs anteriores: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "LEDs nuevos: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1478,44 +1496,45 @@ "para cambiar la configuración de otra term. virt.\n" "Informará de las configuraciones anterior y posterior al cambio.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "La tecla Meta activa el bit de orden alto\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "La tecla Meta genera un prefijo de Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "¿Modo extraño para una tecla Meta?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Error al leer el estado actual. ¿Quizás stdin no es una terminal virtual?\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "estado anterior: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "estado nuevo: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "uso: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1525,52 +1544,57 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, fuzzy, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "%s: %s: Advertencia: la línea es demasiado larga\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "error al restaurar la tabla de traducciones original\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "error al restaurar la tabla asociativa unimap original\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "no se puede cambiar de tabla de traducciones\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "Uso: showconsolefont) [-V|--version]\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1582,38 +1606,38 @@ " -v Modo verboso.\n" " -i No mostrar la tabla del tipo, sino sólo FILASxCOLUMNASxCANTIDAD.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, fuzzy, c-format msgid "Character count: %d\n" msgstr "Anchura de carácter incorrecta: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, fuzzy, c-format msgid "" "Showing %d-char font\n" "\n" msgstr "Cargando, de %d caract., el tipo %dx%d\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "¿DESCONOCIDO?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "el modo del teclado era %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1622,13 +1646,13 @@ "[ si lo está intentando bajo las X, podría no funcionar\n" "ya que el servidor X también está leyendo /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "se recibió la señal %d, limpiando...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1640,6 +1664,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey, versión %s\n" "\n" @@ -1653,7 +1678,7 @@ " -k --keycodes mostrar únicamente los códigos de teclado interpretados " "(predeterminado)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1664,49 +1689,49 @@ "Pulse cualquier tecla -- o Ctrl-D para salir de este programa\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "pulse cualquier tecla...\n" "(el programa termina 10 segundos después de la última pulsación de tecla)\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "liberada" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "pulsada" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "código de tecla %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 #, fuzzy msgid "usage: totextmode\n" msgstr "uso: getkeycodes\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1740,12 +1765,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, 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" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/fr.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/fr.gmo differ diff -Nru kbd-2.0.3/po/fr.po kbd-2.0.4/po/fr.po --- kbd-2.0.3/po/fr.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/fr.po 2017-01-08 18:38:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: GNU kbd 1.15.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2012-12-28 10:27+0200\n" "Last-Translator: Jean-Baka Domelevo Entfellner \n" "Language-Team: French \n" @@ -16,41 +16,53 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.5.4\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "syntaxe : chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "" +"Impossible d'obtenir un descripteur de fichier faisant référence à la console" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s : option inconnue\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s : 0 est un numéro de terminal virtuel illégal\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s : le terminal virtuel 1 est la console et ne peut être désalloué\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s : ne peut désallouer la console %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys version %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -59,13 +71,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -88,7 +101,7 @@ " --compose-only affiche seulement les combinaisons de touches\n" " -c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -97,17 +110,24 @@ "\t\t\t interprète les codes d'action de caractère à partir\n" "\t\t\t du jeu de caractères spécifié\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "jeu de caractères inconnu %s - requête de jeu de caractères ignorée\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s : erreur lors de la lecture du mode du clavier : %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -118,7 +138,7 @@ "(valeur numérique, symbole)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -142,45 +162,45 @@ "\t-n --next-available affiche le numéro du prochain terminal virtuel " "disponible\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Impossible de lire le numéro de terminal virtuel :" -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Impossible d'ouvrir %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "" "Impossible d'obtenir le descripteur de fichier faisant référence à la " "console\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "syntaxe : getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "scancodes bruts xx (hex) contre codes clavier (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "pour 1-%d (0x01-0x%02x) les scancodes sont égaux aux codes clavier\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -191,12 +211,12 @@ "\n" "Scancodes d'échappement e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "échec lors de l'obtention du code clavier pour le scancode 0x%x\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -205,95 +225,98 @@ "Syntaxe :\n" "\t%s [-s] [-C console]\n" -#: src/kbdinfo.c:18 -#, c-format +#: src/kbdinfo.c:21 +#, fuzzy, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\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 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Erreur : pas assez d'arguments !\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Erreur ! Action non reconnue : %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "syntaxe : kbd_mode [-a|-u|-k|-s] [-C device]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Le clavier est en mode brut (scancodes)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Le clavier est en mode semi-brut (codes clavier)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Le clavier est en mode ASCII (mode par défaut)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Le clavier est en mode Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Le clavier est en mode inconnu\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Le vitesse Typematic est réglée à %.1f cps (délai = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Syntaxe : kbdrate [-V] [-s] [-r vitesse] [-d délai]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Ne peut ouvrir /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "bug : getfont a été appelé avec un compteur < 256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, 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" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s : mémoire épuisée\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "étrange... le terminal courant est passé de %d à %d.\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -302,173 +325,173 @@ "Ce noyau semble antérieur à la version 1.1.92.\n" "Pas de table Unicode chargée.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s : mémoire épuisée\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Erreur d'écriture de la mappe dans le fichier\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "impossible: n'est pas meta ?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "Erreur KDGKBENT à l'index %d dans la table %d\n" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, fuzzy, c-format msgid "unable to get keymap %d" msgstr "désalloue la mappe de clavier %d\n" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "échec lors de la liaison de la touche %d à la valeur %d\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, fuzzy, c-format msgid "lk_add_key called with bad keycode %d" msgstr "addkey a été appelé avec le keycode erroné %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "l'ajout de la mappe %d viole une ligne de keymaps explicite" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "échec lors de la liaison de la touche %d à la valeur %d\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 #, fuzzy msgid "impossible error in lk_add_constants" msgstr "erreur impossible dans do_constant" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "on suppose iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "on suppose iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "on suppose iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "on suppose iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "on suppose iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "keysym inconnu « %s »\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "%s : impossible de basculer en mode Unicode\n" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, fuzzy, c-format msgid "Keymap %d: Permission denied" msgstr "Mappe de clavier %d : permission refusée\n" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "code clavier %d, table %d = %d%s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " ÉCHEC" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "échec lors de la liaison de la touche %d à la valeur %d\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, fuzzy, c-format msgid "deallocate keymap %d" msgstr "désalloue la mappe de clavier %d\n" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s : impossible de désallouer la mappe de clavier %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, fuzzy, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "%s : impossible de désallouer ou d'effacer la mappe de clavier\n" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "%s : impossible de revenir au mode d'origine du clavier\n" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, fuzzy, c-format msgid "failed to bind string '%s' to function %s" msgstr "" "échec lors de la tentative de liaison de la chaîne « %s » à la fonction %s\n" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, fuzzy, c-format msgid "failed to clear string %s" msgstr "échec lors de l'effacement de la chaîne %s\n" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "trop de définitions de combinaisons de touches\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -479,7 +502,7 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, fuzzy, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -490,64 +513,64 @@ "\n" "A changé %d %s et %d %s.\n" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "trop de définitions de combinaisons de touches\n" msgstr[1] "trop de définitions de combinaisons de touches\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "(Aucun changement dans les définitions de combinaisons de touches.)\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, 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" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, 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" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "" "nombre de configurations de clavier actuellement en usage : " "%d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "parmi lesquelles %d ont été allouées dynamiquement\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "étendue des codes d'action pris en charge par le noyau :\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "nombre de touches de fonction prises en charge par le noyau : %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "nombre maximal de définitions de combinaisons de touches : %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "" "nombre de définitions de combinaisons de touches actuellement en usage : %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -558,12 +581,12 @@ "Les synonymes suivants sont reconnus :\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s pour %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -572,7 +595,7 @@ "\n" "Nom des modifcateurs reconnus et leur numéro de colonne :\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -594,6 +617,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys version %s\n" "\n" @@ -615,17 +639,17 @@ " -u --unicode force la conversion vers Unicode\n" " -v --verbose affiche les modifications\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s à partir de %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s : Les options --unicode et --ascii s'excluent mutuellement\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -634,7 +658,7 @@ "%s : attention ! Chargement d'une mappe non Unicode sur une console Unicode\n" " (peut-être voudrez-vous faire un `kbd_mode -a' ?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -643,17 +667,17 @@ "%s : attention ! Chargement d'une mappe Unicode sur une console non Unicode\n" " (peut-être voudrez-vous faire un `kbd_mode -u' ?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Impossible de trouver %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "Impossible d'ouvrir le fichier %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -662,29 +686,29 @@ "Syntaxe:\n" "\t%s [-C console] [-o mappe.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Ligne d'entrée erronée : %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, 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" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s : borne supérieure erronée (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -693,22 +717,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s : caractères finaux (%s) ignorés\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Chargement de la carte unicode à partir du fichier %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s : %s : AVERTISSEMENT : ligne trop longue\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -717,83 +741,83 @@ "%s : ne peut charger une unimap vide\n" "(utiliser l'option -f pour passer outre)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "entrée" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "entrées" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Mappe unicode sauvegardée dans « %s »\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Mappe Unicode concaténée\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "syntaxe : %s [-v] [-o mappe.orig] fichier-de-mappe\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn : ne peut ouvrir le fichier de mappe _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Ne peut évaluer le fichier par stat()" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %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 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Erreur de lecture de la mappe à partir du fichier « %s »\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Chargement de la mappe d'écran Unicode à partir du fichier %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Chargement de la mappe symbolique d'écran à partir du fichier %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "" "Erreur d'analyse syntaxique de la mappe symbolique à partir de « %s », ligne " "%d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Erreur d'écriture de la mappe dans le fichier\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Ne peut lire la mappe de la console\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "La mappe d'écran a été sauvegardée dans « %s »\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -832,180 +856,175 @@ " -h, --help afficher un bref message d'aide.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Impossible de déterminer le propriétaire du terminal courant !" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s : numéro de terminal virtuel invalide" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Le commutateur -u est réservé à l'usage du superutilisateur." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "" -"Impossible d'obtenir un descripteur de fichier faisant référence à la console" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Pas de terminal virtuel libre" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" "Impossible de vérifier si le terminal virtuel %d est libre ; utiliser « %s -" "f » pour forcer." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" "Le terminal virtuel %d est déjà utilisé ; commande interrompue ; utiliser « " "%s -f » pour forcer." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Impossible de trouver la commande." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Impossible de mettre en place une nouvelle session" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Impossible d'ouvrir %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Utilisation du terminal virtuel %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Impossible d'ouvrir %s en lecture/écriture" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Impossible d'activer le terminal virtuel %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Activation interrompue ?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Impossible de désallouer la console %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s : table abrégée ucs2 unicode\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s : table abrégée utf8 unicode\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s : utf8 erroné\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s : erreur utf8 inconnue\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s : table abrégée unicode\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s : erreur lors de la lecture de la fonte" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s : appel erroné à readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s : mode du fichier psf non pris en charge (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s : version psf non prise en charge (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s : longueur nulle pour la fonte d'entrée ?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s : caractère entré de taille nulle ?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s : fichier d'entrée : longueur erronée (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s : fichier d'entrée: rebut à la fin\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode : unicode illégal %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Ne peut écrire l'en-tête du fichier de fontes" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Ne peut écrire le fichier de fonte" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s : AVERTISSEMENT : ligne trop longue\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s : ligne d'entrée erronée : %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s : le numéro de glyphe (0x%lx) dépasse la fin de la fonte\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s : borne finale erronée (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -1014,7 +1033,7 @@ "%s : en correspondance avec une plage de positions de fontes, il devrait y " "avoir une plage Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1023,7 +1042,7 @@ "Syntaxe :\n" "\t%s fonte_d_entree table_d_entree fonte_de_sortie\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1032,7 +1051,7 @@ "Syntaxe :\n" "\t%s fonte_d_entree [table_de_sortie]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1041,7 +1060,7 @@ "Syntaxe :\n" "\t%s fonte_entree fonte_sortie\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1051,22 +1070,22 @@ "\t%s [-i fonte_entree] [-o fonte_sortie] [-it table_entree] [-ot " "table_sortie] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s : numéro magique incorrect pour %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s : fichier psf avec un nombre magique inconnu\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s : la fonte d'entrée n'a pas d'index\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons : ne peut repérer le fichier videomode %s\n" @@ -1075,30 +1094,30 @@ msgid "Invalid number of lines\n" msgstr "Nombre de lignes invalide\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Ancien mode : %dx%d Nouveau mode: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, 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" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons : échec de la commande « %s »\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1111,41 +1130,41 @@ "ou resizecons -lines LIGNES où LIGNES vaut 25, 28, 30, 34, 36, 40, 44, 50 ou " "60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons : ne peut obtenir les permissions d'entrée/sortie (I/O).\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "syntaxe : screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Erreur de lecture sur %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "ne peut lire %s, et ne peut effectuer une vidange ioctl()\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "ne peut lire %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Étrange... l'écran est à la fois %dx%d et %dx%d ?!\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Erreur lors de la production de la vidange screendump\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1204,12 +1223,12 @@ " -V affiche la version et quitter.\n" "Les fichiers sont chargés à partir du répertoire courant ou de %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: trop de fichiers à l'entrée\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1218,131 +1237,131 @@ "setfont: ne peut restaurer les caractères de la ROM et du fichier. Fonte " "inchangée.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Heuteur de caractère erronée %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Largeur de caractère erronée %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s : la position 32 de la fonte n'est pas un blanc\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s : a été effacé\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s : l'arrière-plan aura l'air bizarre\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Chargement de %d carac. de la fonte %dx%d à partir du fichier %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Chargement de %d carac. de la fonte %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, 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" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Chargement de %d carac. de la fonte %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s : bug dans do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Chargement de la table de mapping Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Ne peut ouvrir le fichier de fonte %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Lecture de %d carac. de la fonte %dx%d à partir du fichier %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, 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" -#: src/setfont.c:448 +#: src/setfont.c:456 #, 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" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Ne peut repérer la fonte par défaut\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Ne peut repérer la fonte %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Lecture du fichier de fonte %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Pas de ligne finale dans le ficheir combiné\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Trop de fichiers à combiner\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, 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" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Taille erronée du fichier d'entrée\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1351,24 +1370,24 @@ "Ce fichier contient 3 fontes: 8x8, 8x14 et 8x16. SVP indiquer\n" "laquelle vous désirez charger à l'aide de l'option -8, -14 ou -16.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Il n'y a rien à sauvegarder\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d carac. de la fonte %dx%d sauvegardée dans le fichier %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1379,24 +1398,24 @@ " (où le scancode est soit xx ou e0xx en hexadécimal,\n" " et le keycode est en décimal)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "nombre paire d'arguments attendu" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "erreur lors de la lecture du scancode" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "code en dehors des bornes" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "échec d'initialisation du scancode %x au keycode %d\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1436,7 +1455,7 @@ msgid "off" msgstr "off" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1444,7 +1463,7 @@ "Erreur de lecture des paramètres courants des leds. Peut-être stdin n'est " "pas un terminal virtuel ?\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1453,46 +1472,46 @@ "Erreur de lecture des paramètres courants de fanions. Peut-être n'êtes vous " "pas sur la console ?\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "" "Erreur de lecture des paramètres courants des leds à partir de /dev/kbd.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED non disponible ?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "" "Erreur de lecture des paramètres courants des leds à partir de /dev/kbd.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED non disponible ?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Erreur de réinitialisation du mode du ledsmode\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Fanions courants par défaut : " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Fanions courants : " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Leds courantes : " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1501,37 +1520,37 @@ "argument non reconnu : _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Anciens fanions par défaut : " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nouveaux fanions par défaut : " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Ancien fanions : " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nouveaux fanions : " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Anciennes diodes électrolunimescentes : " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Nouvelles diodes électroluminescentes : " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1548,19 +1567,19 @@ "pour modifier le paramètrage d'un autre terminal virtuel.\n" "Les paramétrages d'avant et après la commande sont rapportés.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "La touche Méta initialise le bit du haut\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "La touche Méta génère des préfixes Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Mode étrange pour une touche Méta ?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" @@ -1568,25 +1587,26 @@ "Erreur de lecture des paramètres courants. Peut-être stdin n'est-il pas un " "terminal virtuel ?\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "ancien état : " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "nouvel état : " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "syntaxe : %s\n" -#: src/setvtrgb.c:42 -#, c-format +#: src/setvtrgb.c:44 +#, fuzzy, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1596,6 +1616,10 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" "Syntaxe : %s vga|FICHIER|-\n" "\n" @@ -1610,50 +1634,51 @@ "puis éditez les valeurs dans FICHIER.\n" "\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Erreur : %s : valeur invalide dans le champ %u à la ligne %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Erreur : %s : pas assez de champs sur la ligne %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Erreur : %s : la ligne %u se termine prématurément.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Erreur ! %s : la ligne %u est trop longue.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "échec de restauration de la table originale de traduction\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "échec de restauration de la mappe unimap originale\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "ne peut modifier la table de traduction\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "syntaxe : showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1666,22 +1691,22 @@ " -i Ne pas imprimer la table de fonte, afficher simplement\n" " LIGNESxCOLSxCOMPTEUR et quitter.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Décompte des caractères : %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Largeur de fonte : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Hauteur de fonte : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1690,16 +1715,16 @@ "Montre la fonte %d-char\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?INCONNU?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "le mode clavier était %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1708,13 +1733,13 @@ "[ si vous essayez cela sous X Window, cela peut ne pas fonctionner\n" "étant donné que le serveur X utilise également /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "signal %d reçu, nettoyage en cours...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1726,6 +1751,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey version %s\n" "\n" @@ -1740,7 +1766,7 @@ " -k --keycodes affiche seulement les codes clavier interprétés " "(comportement par défaut)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1751,48 +1777,48 @@ "Appuyer sur n'importe quelle touche. Ctrl-D mettra fin au programme\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "Appuyez sur n'importe quelle touche (le programme terminera 10s après la " "dernière touche enfoncée)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "relâché" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "appuyé" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "code clavier %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "Syntaxe : totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "Merci de réessayer plus tard.\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "L'affichage en mode console est entièrement verrouillé par %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "Le %s est désormais verrouillé par %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" "Utiliser Alt+F1, Alt+F2… pour basculer vers les autres consoles virtuelles." @@ -1834,12 +1860,12 @@ msgid "stdin is not a tty" msgstr "stdin n'est pas un terminal (tty)" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Ce terminal (%s) n'est pas une console virtuelle.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "L'affichage en mode console ne peut être intégralement verrouillé.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/gr.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/gr.gmo differ diff -Nru kbd-2.0.3/po/gr.po kbd-2.0.4/po/gr.po --- kbd-2.0.3/po/gr.po 2015-06-30 20:46:20.000000000 +0000 +++ kbd-2.0.4/po/gr.po 2017-01-08 18:39:05.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd 1.08\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2003-02-16 20:56+0200\n" "Last-Translator: Lefteris Dimitroulakis \n" "Language-Team: Greek \n" @@ -17,38 +17,49 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.6\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "χρήση: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +#, fuzzy +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Δε μπορώ να λάβω περιγραφέα αρχείου που αφορά την κονσόλα\n" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: άγνωστη επιλογή\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: παράτυπος αριθμός VT\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: VT 1 είναι η κονσόλα και δε μπορεί ν' αποδεσμευτεί\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys έκδοση %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -57,13 +68,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -85,7 +97,7 @@ "\t --compose-only εμφάνιση μόνο των συνδιασμών των πλήκτρων\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -94,17 +106,24 @@ "\t\t\t διερμηνεία κωδικών των χαρακτήρων ενέργειας\n" "\t\t\t από το προδιαγεγραμμένο σύνολο χαρακτήρων\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "άγνωστο σύνολο χαρακτήρων %s - η αίτηση αγνοήθηκε\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: σφάλμα κατά τον ορισμό της κατάστασης πληκτρολογίου\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -115,7 +134,7 @@ "(αριθμητική τιμή, σύμβολο)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -129,47 +148,47 @@ "\t-n --next-available display number of next unallocated VT\n" msgstr "" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 #, fuzzy msgid "Couldn't read VTNO: " msgstr "αδύνατη ανάγνωση %s\n" -#: src/getfd.c:67 +#: src/getfd.c:69 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "αδύνατη ανάγνωση %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Δε μπορώ να λάβω περιγραφέα αρχείου που αφορά την κονσόλα\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "χρήση: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "" "Απλοί κωδικοί σάρωσης xx (hex) και οι αντίστοιχοι κωδικοί πλήκτρων (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "" "0 είναι ένα σφάλμα; για 1-88 (0x01-0x58) ο κωδικός σάρωσης ισούται με τον " "κωδικό πλήκτρου\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, fuzzy, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "" "0 είναι ένα σφάλμα; για 1-88 (0x01-0x58) ο κωδικός σάρωσης ισούται με τον " "κωδικό πλήκτρου\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -180,12 +199,12 @@ "\n" "Κωδικοί σάρωσης διαφυγής e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "αποτυχία κατά τη λήψη κωδικού πλήκτρου για τον κώδικα σάρωσης 0x%x\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, fuzzy, c-format msgid "" "Usage:\n" @@ -194,262 +213,265 @@ "Χρήση:\n" "\t%s [-s]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, fuzzy, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" "μη αναγνωρισμένα ορίσματα: _%s_\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, fuzzy, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "χρήση: kbd_mode [-a|-u|-k|-s]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε ακατέργαστη (scancode) κατάσταση\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε ημικατεργασμένη (keycode) κατάσταση\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται στην προεπιλεγμένη κατάσταση (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε κατάσταση Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Το πληκτρολόγιο βρίσκεται σε κάποια άγνωστη κατάσταση\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Ο ρυθμός επανάληψης ρυθμίστηκε σε %.1f cps (καθυστέρηση = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Χρήση: kbdrate [-V] [-s] [-r ρυθμός] [-d καθυστέρηση]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Αδυναμία ανοίγματος του /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "bug: getfont κλήθηκε με μετρητή<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: η μνήμη εξαντλήθηκε\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: η μνήμη εξαντλήθηκε\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Σφάλμα εγγραφής της απεικόνισης στο αρχείο\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "αδύνατον: δεν είναι meta;\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "Σφάλμα KDGKBENT στο ευρετήριο %d στον πίνακα %d: " -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, fuzzy, c-format msgid "unable to get keymap %d" msgstr "openvt: Δε μπορώ ν' ανοίξω το %s: %s\n" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, fuzzy, c-format msgid "unable to get symbol by wrong type: %d" msgstr "openvt: Δε μπορώ ν' ανοίξω το %s: %s\n" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "υποθέτοντας iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "υποθέτοντας iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "υποθέτοντας iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "υποθέτοντας iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "υποθέτοντας iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "άγνωστο keysym '%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "κωδικός πλήκτρου %3d %s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr "" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, fuzzy, c-format msgid "deallocate keymap %d" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, fuzzy, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "%s: σφάλμα κατά τον ορισμό της κατάστασης πληκτρολογίου\n" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, fuzzy, c-format msgid "failed to bind string '%s' to function %s" msgstr "αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d\n" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, fuzzy, c-format msgid "failed to clear string %s" msgstr "αποτυχία αποκατάστασης αρχικού unimap\n" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "μέγιστος αριθμός συνθέτων προσδιορισμών: %d\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -460,67 +482,67 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "μέγιστος αριθμός συνθέτων προσδιορισμών: %d\n" msgstr[1] "μέγιστος αριθμός συνθέτων προσδιορισμών: %d\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "μέγιστος αριθμός συνθέτων προσδιορισμών: %d\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "" "περιοχή των keycode που υποστηρίζεται απο τον πυρήνα: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "μέγιστος αριθμός ενεργειών αποδοτέων σ' ένα πλήκτρο: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "αριθμός απεικονίσεων πλήκτρων εν χρήσει: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "από τους οποίους %d έχουν διατεθεί δυναμικά\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "περιοχές κωδικών ενέργειας που υποστηρίζονται από τον πυρήνα:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "αριθμός πλήκτρων λειτουργιών υποστηριζομένων απ' τον πυρήνα : %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "μέγιστος αριθμός συνθέτων προσδιορισμών: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "αριθμός συνθέτων προσδιορισμών εν χρήσει: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -531,12 +553,12 @@ "Τα παρακάτω συνώνημα αναγνωρίστηκαν:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s για %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -545,7 +567,7 @@ "\n" "Ονόματα αναγνωρισμένων μετατροπέων και οι αριθμοί τους στήλης :\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -567,73 +589,74 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s από %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Αδυνατώ να βρω τη γραμματοσειρά %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Αδύνατο το άνοιγμα του αρχείου γραμματοσειράς %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, fuzzy, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "χρήση: %s [-v] [-o map.orig] αρχείο-map\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Εσφαλμένη γραμμή εισόδου: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "" "%s: Αριθμός γλύφου (0x%x) μεγαλύτερος απ' το μήκος της γραμματοσειράς\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Εσφαλμένο πέρας περιοχής (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -642,22 +665,22 @@ "%s: Unicode περιοχή U+%x-U+%x όχι του ιδίου μήκους με την περιοχή θέσεων 0x" "%x-0x%x της γραμματοσειράς\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: αγνοήθηκαν σκουπίδια στο τέλος (%s)\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Φόρτωση της απεικόνισης unicode από το αρχείο %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Προειδοποίηση: πολύ μεγάλη γραμμή\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -666,84 +689,84 @@ "%s: δε φορτώνεται άδειο unimap\n" "(αν επιμένετε: χρησιμοποιείστε την επιλογή -f για παράβλεψη)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "καταχώρηση" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "καταχωρήσεις" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Η απεικόνιση unicode αποθηκεύθηκε στο `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Προσαρτήθηκε απεικόνιση Unicode\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "χρήση: %s [-v] [-o map.orig] αρχείο-map\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: αδυνατώ ν' ανοίξω το αρχείο απεικόνισης _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Δε μπορώ να αξιολογήσω το αρχείο απεικόνισης με τη stat()" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "" "Φόρτωση δυαδικής απεικόνισης της οθόνης απευθείας-στη-γραμματοσειρά από το " "αρχείο %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Σφάλμα ανάγνωσης απεικόνισης από το αρχείο `%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Φόρτωση της δυαδικής unicode απεικόνισης της οθόνης από το αρχείο %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Φόρτωση της συμβολικής απεικόνισης της οθόνης από το αρχείο %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "" "Σφάλμα κατά τη γραμματοσυντακτική ανάλυσητης συμβολικής απεικόνισης από `" "%s', γραμμή %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Σφάλμα εγγραφής της απεικόνισης στο αρχείο\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Αδυναμία ανάγνωσης της απεικόνισης της κονσόλας\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Η απεικόνιση της οθόνης αποθηκεύθηκε στο `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -764,182 +787,177 @@ "\n" msgstr "" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:208 +#: src/openvt.c:210 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: παράτυπος αριθμός vt\n" -#: src/openvt.c:234 +#: src/openvt.c:236 #, fuzzy msgid "Only root can use the -u flag." msgstr "" "openvt: μόνο ο διαχειριστής (root) μπορεί να χρησιμοποιήσει τη σημαία -u.\n" -#: src/openvt.c:256 -#, fuzzy -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Δε μπορώ να λάβω περιγραφέα αρχείου που αφορά την κονσόλα\n" - -#: src/openvt.c:263 +#: src/openvt.c:265 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: δε μπορώ να βρω ένα ελεύθερο vt\n" -#: src/openvt.c:267 +#: src/openvt.c:269 #, fuzzy, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "openvt: αδύνατος ο έλεγχος αν το vt %d είναι ελεύθερο\n" -#: src/openvt.c:271 +#: src/openvt.c:273 #, fuzzy, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "openvt: vt %d εν χρήσει εκτέλεση διαταγής ματαιώθηκε\n" -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "" -#: src/openvt.c:313 +#: src/openvt.c:315 #, fuzzy msgid "Unable to set new session" msgstr "openvt: Αδύνατον το άνοιγμα νέας συνόδου (%s)\n" -#: src/openvt.c:337 +#: src/openvt.c:339 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Δε μπορώ ν' ανοίξω το %s: %s\n" -#: src/openvt.c:341 +#: src/openvt.c:343 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: χρησιμοποίηση VT %s\n" -#: src/openvt.c:347 +#: src/openvt.c:349 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Δε μπορώ ν' ανοίξω το %s για ανάγνωση/εγγραφή (%s)\n" -#: src/openvt.c:358 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Couldn't activate vt %d" msgstr "" "\n" "openvt: αδύνατον το άνοιγμα του %s σε Α/Ε (%s)\n" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:401 +#: src/openvt.c:403 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: αδυναμία αποδέσμευσης της κονσόλας %d\n" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: λειψός πίνακας unicode usc2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: λειψός πίνακας utf8 unicode\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: εσφαλμένο utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: άγνωστο σφάλμα utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: λειψός πίνακας unicode\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Σφάλμα κατά την ανάγνωση της γραμματοσειράς" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Εσφαλμένη κλήση της readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Μη υποστηριζόμενη κατάσταση αρχείου psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Μή υποστηριζόμενη έκδοση psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: μηδέν μήκος γραμματοσειράς εισόδου;\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: μηδέν μέγεθος χαρακτήρα εισόδου;\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Αρχείο εισόδου: εσφαλμένο μήκος εισόδου (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Αρχείο εισόδου: σκουπίδια στο τέλος\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: παράτυπο unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Αδυναμία εγγραφής της επικεφαλίδας του αρχείου γραμματοσειράς" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Δε μπορώ να γράψω στο αρχείο της γραμματοσειράς" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Προειδοποίηση: πολύ μεγάλη γραμμή\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Εσφαλμένη γραμμή εισόδου: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Ο αριθμός γλύφου (0x%lx) υπερβαίνει το πέρας της γραμματοσειράς\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Εσφαλμένο πέρας περιοχής (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -948,7 +966,7 @@ "%s: Θα πρέπει να υπάρχει μια Unicode περιοχήπου αντιστοιχεί στη περιοχή " "θέσεων της γραμματοσειράς\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -957,7 +975,7 @@ "Χρήση:\n" "\t%s γραμματοσειράΕισόδου πίνακαςΕισόδου γραμματοσειράΕξόδου\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -966,7 +984,7 @@ "Χρήση:\n" "\t%s γραμματοσειράΕισόδου [πίνακαςΕξόδου]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -975,7 +993,7 @@ "Χρήση:\n" "\t%s γραμματοσειράΕισόδου γραμματοσειράΕξόδου\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -985,22 +1003,22 @@ "\t%s [-i γραμματοσειράΕισόδου] [-o γραμματοσειράΕξόδου] [-it πίνακαςΕισόδου] " "[-ot πίνακαςΕξόδου] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Εσφαλμένος μαγικός αριθμός για %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: αρχείο psf με άγνωστο μαγικό αριθμό\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: η γραμματοσειρά εισόδου δεν περιέχει ευρετήριο\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: αδυνατώ να βρω το αρχείο videomode %s\n" @@ -1009,29 +1027,29 @@ msgid "Invalid number of lines\n" msgstr "Άκυρος αριθμός γραμμών\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Παλαιά κατάσταση: %dx%d Νέα κατάσταση: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Παλαιές #scanlines: %d Νέες #scanlines: %d Ύψος χαρακτήρα: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: αποτυχία εντολής `%s'\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1044,42 +1062,42 @@ "ή: resizecons -lines ΓΡΑΜΜΕΣ, με ΓΡΑΜΜΕΣ μία από 25, 28, 30, 34, 36, 40, 44, " "50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: αδύνατη η λήψη δικαιωμάτων I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "χρήση: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Σφάλμα ανάγνωσης %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "" "αδυναμία ανάγνωσης του %s, και δε μπορώ να το εμφανίσω με την ioctl()\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "αδύνατη ανάγνωση %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Περίεργο ...η οθόνη είναι συγχρόνως %dx%d και %dx%d ;;\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Σφάλμα εγγραφής screendump\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, fuzzy, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1135,12 +1153,12 @@ " -V Εμφάνιση πληροφοριών έκδοσης κι έξοδος.\n" "Τα αρχεία φορτώνονται από τον τρέχοντα κατάλογο ή από %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: πάρα πολλά αρχεία εισόδου\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1149,126 +1167,126 @@ "setfont: αδύνατη επαναφορά από τη ROM χαρακτήρων και από αρχείο συγχρόνως. Η " "γραμματοσειρά παραμένει αμετάβλητη.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Εσφαλμένο ύψος χαρακτήρα %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Εσφαλμένο πλάτος χαρακτήρα %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: η θέση 32 της γραμματοσειράς δεν είναι κενή\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: το καθάρισα\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: το παρασκήνιο θα φαίνεται αλλόκοτο\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d από το αρχείο %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d (%d) από το αρχείο %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: σφάλμα στο do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Φόρτωση πίνακα απεικόνισης Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Αδύνατο το άνοιγμα του αρχείου γραμματοσειράς %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "Κατά τη φόρτωση διαφόρων γραμμ/σειρών, όλες πρέπει να είναι psf - %s δεν " "είναι\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Ανάγνωση %d-χαρακτ. της γραμματοσειράς %dx%d από το αρχείο %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν το ίδιο ύψος\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "Κατά τη φόρτωση πολλών γραμματοσειρών, όλες πρέπει να έχουν ίδιο πλάτος\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Αδυνατώ να βρω την προεπιλεγμένη γραμματοσειρά\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Αδυνατώ να βρω τη γραμματοσειρά %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Ανάγνωση αρχείου γραμματοσειράς %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Δεν υπάρχει τελική νέα γραμμή στο συνδιασμένο αρχείο\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Πάρα πολλά αρχεία για συνδιασμό\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Χμμ - γραμματοσειρά από το restorefont; Χρήση του πρώτου μισού.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Εσφαλμένο μέγεθος αρχείου εισόδου\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1277,24 +1295,24 @@ "Αυτό το αρχείο περιέχει 3 γραμματοσειρές: 8x8, 8x14 και 8x16. Παρακαλώ\n" "υποδείξτε με τις επιλογές -8 ή -14 ή -16 ποια θέλετε.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Ζητήσατε μέγεθος γραμματοσειράς %d, αλλά μόνον 8, 14, 16\n" "είναι δυνατόν εδώ.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Τίποτε για διάσωση\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-χαρακτ. της γραμματοσειράς %dx%d διασώθηκαν στο αρχείο %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1305,24 +1323,24 @@ " (όπου ο scancode είναι xx ή e0xx, σε δεκαεξαδική μορφή,\n" " και ο keycode σε δεκαδική)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "αναμενόταν ζυγός αριθμός ορισμάτων " -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "σφάλμα ανάγνωσης κωδικού σάρωσης" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "κωδικός εκτός ορίων" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "αποτυχία απόδοσης του κωδικού σάρωσης %x στον κωδικό πλήκτρου %d\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1360,7 +1378,7 @@ msgid "off" msgstr "ανενεργό" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1368,7 +1386,7 @@ "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων. Μήπως η κανονική είσοδος δεν " "είναι VT;\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1376,44 +1394,44 @@ msgstr "" "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης σημαιών. Μήπως δεν είστε στην κονσόλα;\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων από το /dev/kbd.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED μη διαθέσιμο;\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης φωτοδιόδων από το /dev/kbd.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED μη διαθέσιμο;\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Σφάλμα επανάταξης ledmode\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Τρέχουσα προεπιλογή σημαιών: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Τρέχουσες σημαίες: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Τρέχουσες φωτοδίοδοι: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1422,37 +1440,37 @@ "μη αναγνωρισμένα ορίσματα: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Παλαιά προεπιλογή σημαιών: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Νέα προεπιλεγή σημαιών: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Παλαιές σημαίες: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Νέες σημαίες: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Παλαιές φωτοδίοδοι: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Νέες φωτοδίοδοι: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1469,19 +1487,19 @@ "για ν' αλλάξετε τις ρυθμίσεις ενός άλλου vt.\n" "Οι ρυθμίσεις πριν και μετά τις αλλαγές εμφανίζονται υπό μορφή αναφοράς.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Το πλήκτρο Meta ενεργοποιεί το bit υψηλής τάξεως\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Το πλήκτρο Meta δημιουργεί πρόθεμα Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Περίεργη κατάσταση για ένα πλήκτρο Meta;\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" @@ -1489,25 +1507,26 @@ "Σφάλμα ανάγνωσης τρέχουσας ρύθμισης. Ισως η κανονική είσοδος δεν είναι ένα " "VT.\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "παλαιά κατάσταση: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "νέα κατάσταση: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "χρήση: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1517,41 +1536,45 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, fuzzy, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "%s: %s: Προειδοποίηση: πολύ μεγάλη γραμμή\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "αποτυχία αποκατάστασης αρχικού πίνακα μετάφρασης\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "αποτυχία αποκατάστασης αρχικού unimap\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "αδυνατώ ν' αλλάξω τον πίνακα μετάφρασης\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1559,44 +1582,45 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, fuzzy, c-format msgid "Character count: %d\n" msgstr "Εσφαλμένο πλάτος χαρακτήρα %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, fuzzy, c-format msgid "" "Showing %d-char font\n" "\n" msgstr "Φόρτωση των %d-χαρακτ. της γραμμ/σειράς %dx%d\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr ";ΑΓΝΩΣΤΟ;" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "Η κατάσταση kb ήταν %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1605,13 +1629,13 @@ "[ αν το προσπαθείτε στα Χ, ίσως να μη δουλεύει\n" "αφού κι ο εξυπηρετητής Χ διαβάζει επίσης το /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "ελήφθη το σήμα %d, καθαρισμός...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1623,6 +1647,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey έκδοση %s\n" "\n" @@ -1636,7 +1661,7 @@ "\t-k --keycodes\tεμφάνιση μόνον των διερμηνευμένων κωδικών πλήκτρων " "(προεπιλογή)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1647,48 +1672,48 @@ "Πατήστε οιαδήποτε πλήκτρα - Ctrl-D θα τερματίσει το πρόγραμμα\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "πατήστε ένα πλήκτρο (το πρόγραμμα τερματίζεται 10s μετά τελευταίο πάτημα)..\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "απελευθέρωση" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "πάτημα" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "κωδικός πλήκτρου %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 #, fuzzy msgid "usage: totextmode\n" msgstr "χρήση: getkeycodes\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1722,12 +1747,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, fuzzy, c-format msgid "The entire console display cannot be locked.\n" msgstr "%s: VT 1 είναι η κονσόλα και δε μπορεί ν' αποδεσμευτεί\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/hu.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/hu.gmo differ diff -Nru kbd-2.0.3/po/hu.po kbd-2.0.4/po/hu.po --- kbd-2.0.3/po/hu.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/hu.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,1825 +0,0 @@ -# Hungarian translation for kbd. -# Copyright (C) 2014 Free Software Foundation, Inc. -# This file is distributed under the same license as the kbd package. -# -# Balázs Úr , 2014. -msgid "" -msgstr "" -"Project-Id-Version: kbd 2.0.2-rc2\n" -"Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2014-07-10 19:14+0200\n" -"Last-Translator: Balázs Úr \n" -"Language-Team: Hungarian \n" -"Language: hu\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" - -#: src/chvt.c:30 -#, c-format -msgid "usage: chvt N\n" -msgstr "használat: chvt N\n" - -#: src/deallocvt.c:35 -#, c-format -msgid "%s: unknown option\n" -msgstr "%s: ismeretlen kapcsoló\n" - -#: src/deallocvt.c:50 -#, fuzzy -msgid "0: illegal VT number\n" -msgstr "%s: 0: szabálytalan VT szám\n" - -#: src/deallocvt.c:52 -#, fuzzy -msgid "VT 1 is the console and cannot be deallocated\n" -msgstr "%s: VT 1 a konzol és nem sikerült felszabadítani\n" - -#: src/deallocvt.c:54 -#, fuzzy, c-format -msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" -msgstr "%s: nem sikerült felszabadítani a(z) %d. konzolt\n" - -#: src/dumpkeys.c:27 -#, c-format -msgid "dumpkeys version %s" -msgstr "dumpkeys verzió: %s" - -#: src/dumpkeys.c:28 -#, c-format -msgid "" -"\n" -"usage: dumpkeys [options...]\n" -"\n" -"valid options are:\n" -"\n" -"\t-h --help\t display this help text\n" -"\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" -"\t-n --numeric\t display keytable in hexadecimal notation\n" -"\t-f --full-table\t don't use short-hand notations, one row per keycode\n" -"\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" -"\t-c --charset=" -msgstr "" -"\n" -"használat: dumpkeys [kapcsolók…]\n" -"\n" -"az érvényes kapcsolók:\n" -"\n" -"\t-h --help\t ezen súgószöveg megjelenítése\n" -"\t-i --short-info\t információk megjelenítése a billentyűzet-meghajtóról\n" -"\t-l --long-info\t a fenti és a loadkeys ismert szimbólumai " -"megjelenítése\n" -"\t-n --numeric\t billentyűtáblázat megjelenítése hexadecimális " -"jelöléssel\n" -"\t-f --full-table\t ne használjon gyorsírás jelölést, egy sor\n" -"\t\t\tbillentyűkódonként\n" -"\t-1 --separate-lines egy sor (módosító, billentyűkód) páronként\n" -"\t --funcs-only\t csak a funkcióbillentyű szövegek megjelenítése\n" -"\t --keys-only\t csak a billentyűkötések megjelenítése\n" -"\t --compose-only csak az összeállító billentyűkombinációk " -"megjelenítése\n" -"\t-c --charset=" - -#: src/dumpkeys.c:45 -#, c-format -msgid "" -"\t\t\t interpret character action codes to be from the\n" -"\t\t\t specified character set\n" -msgstr "" -"\t\t\t karakter műveleti kódok értelmezése a megadott\n" -"\t\t\t karakterkészletből\n" - -#: src/dumpkeys.c:131 -#, c-format -msgid "unknown charset %s - ignoring charset request\n" -msgstr "ismeretlen karakterkészlet: %s - a karakterkészlet-kérés mellőzése\n" - -#: src/dumpkeys.c:152 src/loadkeys.c:182 -#, c-format -msgid "%s: error reading keyboard mode: %m\n" -msgstr "%s: hiba a billentyűzetmód olvasásakor: %m\n" - -#: src/dumpkeys.c:168 -#, c-format -msgid "" -"Symbols recognized by %s:\n" -"(numeric value, symbol)\n" -"\n" -msgstr "" -"A(z) %s által felismert szimbólumok:\n" -"(számérték, szimbólum)\n" -"\n" - -#: src/fgconsole.c:19 -#, c-format -msgid "" -"%s version %s\n" -"\n" -"Usage: %s [options]\n" -"\n" -"Valid options are:\n" -"\n" -"\t-h --help display this help text\n" -"\t-V --version display program version\n" -"\t-n --next-available display number of next unallocated VT\n" -msgstr "" -"%s verzió: %s\n" -"\n" -"Használat: %s [kapcsolók]\n" -"\n" -"Az érvényes kapcsolók:\n" -"\n" -"\t-h --help ezen súgószöveg megjelenítése\n" -"\t-V --version programverzió megjelenítése\n" -"\t-n --next-available a következő nem lefoglalt VT számának megjelenítése\n" - -#: src/fgconsole.c:68 -msgid "Couldn't read VTNO: " -msgstr "A VTNO olvasása nem sikerült: " - -#: src/getfd.c:67 -#, c-format -msgid "Couldn't open %s\n" -msgstr "A(z) %s megnyitása nem sikerült\n" - -#: src/getfd.c:84 -#, c-format -msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "Nem sikerült a konzolra hivatkozó fájlleíró beszerzése\n" - -#: src/getkeycodes.c:19 -#, c-format -msgid "usage: getkeycodes\n" -msgstr "használat: getkeycodes\n" - -#: src/getkeycodes.c:55 -#, c-format -msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" -msgstr "Egyszerű xx (hex) vizsgálókód a (dec) billentyűkód ellen\n" - -#: src/getkeycodes.c:58 -#, c-format -msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" -msgstr "" -"A 0 hiba; az 1-88 (0x01-0x58) vizsgálókódnál egyenlő a billentyűkóddal\n" - -#: src/getkeycodes.c:61 -#, c-format -msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "az 1-%d (0x01-0x%02x) vizsgálókódnál egyenlő a billentyűkóddal\n" - -#: src/getkeycodes.c:67 -#, c-format -msgid "" -"\n" -"\n" -"Escaped scancodes e0 xx (hex)\n" -msgstr "" -"\n" -"\n" -"Elfedett vizsgálókódok: e0 xx (hex)\n" - -#: src/getkeycodes.c:90 -#, fuzzy, c-format -msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" -msgstr "nem sikerült a billentyűkód lekérése a 0x%x vizsgálókódhoz\n" - -#: src/getunimap.c:29 -#, c-format -msgid "" -"Usage:\n" -"\t%s [-s] [-C console]\n" -msgstr "" -"Használat:\n" -"\t%s [-s] [-C konzol]\n" - -#: src/kbdinfo.c:18 -#, c-format -msgid "" -"Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" -" or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" -" or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" -" or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" -msgstr "" -"Használat: %1$s [-C ESZKÖZ] getmode [text|graphics]\n" -" vagy: %1$s [-C ESZKÖZ] gkbmode [raw|xlate|mediumraw|unicode]\n" -" vagy: %1$s [-C ESZKÖZ] gkbmeta [metabit|escprefix]\n" -" vagy: %1$s [-C ESZKÖZ] gkbled [scrolllock|numlock|capslock]\n" - -#: src/kbdinfo.c:65 -msgid "Error: Not enough arguments.\n" -msgstr "Hiba: nincs elég argumentum.\n" - -#: src/kbdinfo.c:123 -#, c-format -msgid "Error: Unrecognized action: %s\n" -msgstr "Hiba: azonosítatlan művelet: %s\n" - -#: src/kbd_mode.c:22 -#, c-format -msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" -msgstr "használat: kbd_mode [-a|-u|-k|-s] [-C eszköz]\n" - -#: src/kbd_mode.c:85 -#, c-format -msgid "The keyboard is in raw (scancode) mode\n" -msgstr "A billentyűzet nyers (vizsgálómód) módban van\n" - -#: src/kbd_mode.c:88 -#, c-format -msgid "The keyboard is in mediumraw (keycode) mode\n" -msgstr "A billentyűzet közepes nyers (billentyűmód) módban van\n" - -#: src/kbd_mode.c:91 -#, c-format -msgid "The keyboard is in the default (ASCII) mode\n" -msgstr "A billentyűzet az alapértelmezett (ASCII) módban van\n" - -#: src/kbd_mode.c:94 -#, c-format -msgid "The keyboard is in Unicode (UTF-8) mode\n" -msgstr "A billentyűzet Unicode (UTF-8) módban van\n" - -#: src/kbd_mode.c:97 -#, c-format -msgid "The keyboard is in some unknown mode\n" -msgstr "A billentyűzet valamilyen ismeretlen módban van\n" - -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 -#, c-format -msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" -msgstr "" -"A leütési gyakoriság beállítva %.1f cps értékre (késleltetés = %d ms)\n" - -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Használat: kbdrate [-V] [-s] [-r gyakoriság] [-d késleltetés]\n" - -#: src/kbdrate.c:293 -msgid "Cannot open /dev/port" -msgstr "Nem sikerült a /dev/port megnyitása" - -#: src/kdfontop.c:94 -#, c-format -msgid "bug: getfont called with count<256\n" -msgstr "hiba: a getfont szám<256 értékkel lett meghívva\n" - -#: src/kdfontop.c:98 -#, c-format -msgid "bug: getfont using GIO_FONT needs buf.\n" -msgstr "hiba: a GIO_FONT-ot használó getfont ezt igényli: buf.\n" - -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 -#, c-format -msgid "%s: out of memory\n" -msgstr "%s: nincs elég memória\n" - -#: src/kdmapop.c:159 -#, c-format -msgid "strange... ct changed from %d to %d\n" -msgstr "furcsa… ct megváltozott: %d -> %d\n" - -#: src/kdmapop.c:185 -#, c-format -msgid "" -"It seems this kernel is older than 1.1.92\n" -"No Unicode mapping table loaded.\n" -msgstr "" -"Úgy tűnik, hogy ez a kernel 1.1.92-nél régebbi.\n" -"Nincs betöltve Unicode leképezési táblázat.\n" - -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 -msgid "out of memory" -msgstr "nincs elég memória" - -#: src/libkeymap/common.c:132 -#, c-format -msgid "unable to initialize array: %s" -msgstr "nem sikerült előkészíteni a tömböt: %s" - -#: src/libkeymap/dump.c:82 -msgid "Error writing map to file" -msgstr "Hiba a térkép fájlba írásakor" - -#: src/libkeymap/dump.c:525 -#, c-format -msgid "impossible: not meta?\n" -msgstr "lehetetlen: nem meta?\n" - -#: src/libkeymap/kernel.c:31 -#, c-format -msgid "KDGKBENT: %s: error at index %d in table %d" -msgstr "KDGKBENT: %s: hiba a(z) %d indexnél a(z) %d táblázatban" - -#: src/libkeymap/kernel.c:57 -#, c-format -msgid "KDGKBSENT: %s: Unable to get function key string" -msgstr "KDGKBSENT: %s: nem sikerült lekérni a függvény kulcs szöveget" - -#: src/libkeymap/kernel.c:88 -#, c-format -msgid "KDGKBDIACR(UC): %s: Unable to get accent table" -msgstr "KDGKBDIACR(UC): %s: nem sikerült lekérni az ékezet táblázatot" - -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 -#, c-format -msgid "unable to get keymap %d" -msgstr "nem sikerült lekérni a(z) %d billentyűtérképet" - -#: src/libkeymap/kmap.c:110 -#, c-format -msgid "unable to unset key %d for table %d" -msgstr "nem sikerült felszabadítani a(z) %d billentyűt a(z) %d táblázatnál" - -#: src/libkeymap/kmap.c:127 -#, c-format -msgid "lk_add_key called with bad keycode %d" -msgstr "az lk_add_key rossz billentyűkóddal (%d) lett meghívva" - -#: src/libkeymap/kmap.c:137 -#, c-format -msgid "adding map %d violates explicit keymaps line" -msgstr "a(z) %d térkép hozzáadása megsérti az explicit billentyűtérképek sorát" - -#: src/libkeymap/kmap.c:153 -#, c-format -msgid "unable to set key %d for table %d" -msgstr "nem sikerült beállítani a(z) %d billentyűt a(z) %d táblázatnál" - -#: src/libkeymap/kmap.c:245 -msgid "impossible error in lk_add_constants" -msgstr "lehetetlen hiba ebben: lk_add_constants" - -#: src/libkeymap/ksyms.c:147 -#, c-format -msgid "unable to get symbol by wrong type: %d" -msgstr "nem sikerült lekérni a szimbólumot a rossz típus alapján: %d" - -#: src/libkeymap/ksyms.c:161 -#, c-format -msgid "unable to get symbol of %d type by wrong index: %d" -msgstr "" -"nem sikerült lekérni a(z) %d típus szimbólumát a rossz index alapján: %d" - -#: src/libkeymap/ksyms.c:348 -#, c-format -msgid "assuming iso-8859-1 %s" -msgstr "iso-8859-1 %s feltételezve" - -#: src/libkeymap/ksyms.c:354 -#, c-format -msgid "assuming iso-8859-15 %s" -msgstr "iso-8859-15 %s feltételezve" - -#: src/libkeymap/ksyms.c:360 -#, c-format -msgid "assuming iso-8859-2 %s" -msgstr "iso-8859-2 %s feltételezve" - -#: src/libkeymap/ksyms.c:366 -#, c-format -msgid "assuming iso-8859-3 %s" -msgstr "iso-8859-3 %s feltételezve" - -#: src/libkeymap/ksyms.c:372 -#, c-format -msgid "assuming iso-8859-4 %s" -msgstr "iso-8859-4 %s feltételezve" - -#: src/libkeymap/ksyms.c:377 -#, c-format -msgid "unknown keysym '%s'\n" -msgstr "ismeretlen billentyűszimbólum: „%s”\n" - -#: src/libkeymap/loadkeys.c:26 -#, c-format -msgid "KDSKBMODE: %s: could not switch to Unicode mode" -msgstr "KDSKBMODE: %s: nem sikerült átváltani Unicode módra" - -#: src/libkeymap/loadkeys.c:48 -#, c-format -msgid "Keymap %d: Permission denied" -msgstr "%d billentyűtérkép: hozzáférés megtagadva" - -#: src/libkeymap/loadkeys.c:56 -#, c-format -msgid "keycode %d, table %d = %d%s" -msgstr "%d billentyűkód, %d táblázat = %d%s" - -#: src/libkeymap/loadkeys.c:57 -msgid " FAILED" -msgstr " SIKERTELEN" - -#: src/libkeymap/loadkeys.c:60 -#, c-format -msgid "failed to bind key %d to value %d" -msgstr "nem sikerült a(z) %d billentyű kötése a(z) %d értékhez" - -#: src/libkeymap/loadkeys.c:70 -#, c-format -msgid "deallocate keymap %d" -msgstr "a(z) %d billentyűtérkép felszabadítása" - -#: src/libkeymap/loadkeys.c:74 -#, c-format -msgid "KDSKBENT: %s: could not deallocate keymap %d" -msgstr "KDSKBENT: %s: nem sikerült felszabadítani a(z) %d billentyűtérképet" - -#: src/libkeymap/loadkeys.c:89 -#, c-format -msgid "KDSKBENT: %s: cannot deallocate or clear keymap" -msgstr "" -"KDSKBENT: %s: nem sikerült felszabadítani vagy törölni a billentyűtérképet" - -#: src/libkeymap/loadkeys.c:99 -#, c-format -msgid "KDSKBMODE: %s: could not return to original keyboard mode" -msgstr "KDSKBMODE: %s: nem sikerült visszatérni az eredeti billentyűzet módra" - -#: src/libkeymap/loadkeys.c:161 -#, c-format -msgid "failed to bind string '%s' to function %s" -msgstr "nem sikerült a(z) „%s” szöveg kötése a(z) %s függvényhez" - -#: src/libkeymap/loadkeys.c:171 -#, c-format -msgid "failed to clear string %s" -msgstr "nem sikerült a(z) %s szöveg törlése" - -#: src/libkeymap/loadkeys.c:190 -msgid "too many compose definitions" -msgstr "túl sok összeállítási meghatározás" - -#: src/libkeymap/loadkeys.c:251 -#, c-format -msgid "" -"\n" -"Changed %d key" -msgid_plural "" -"\n" -"Changed %d keys" -msgstr[0] "" -"\n" -"%d billentyű változott" -msgstr[1] "" -"\n" -"%d billentyű változott" - -#: src/libkeymap/loadkeys.c:252 -#, c-format -msgid "Changed %d string" -msgid_plural "Changed %d strings" -msgstr[0] "%d szöveg változott" -msgstr[1] "%d szöveg változott" - -#: src/libkeymap/loadkeys.c:260 -#, c-format -msgid "Loaded %d compose definition" -msgid_plural "Loaded %d compose definitions" -msgstr[0] "%d összeállítási meghatározás betöltve" -msgstr[1] "%d összeállítási meghatározás betöltve" - -#: src/libkeymap/loadkeys.c:264 -msgid "(No change in compose definitions)" -msgstr "(Nincs változás az összeállítási meghatározásokban)" - -#: src/libkeymap/summary.c:97 -#, c-format -msgid "keycode range supported by kernel: 1 - %d\n" -msgstr "kernel által támogatott billentyűkód tartomány: 1 - %d\n" - -#: src/libkeymap/summary.c:99 -#, c-format -msgid "max number of actions bindable to a key: %d\n" -msgstr "a billentyűhöz köthető műveletek legnagyobb száma: %d\n" - -#: src/libkeymap/summary.c:101 -#, c-format -msgid "number of keymaps in actual use: %u\n" -msgstr "tényleges használatban lévő billentyűtérképek száma: %u\n" - -#: src/libkeymap/summary.c:104 -#, c-format -msgid "of which %u dynamically allocated\n" -msgstr "amelyből %u dinamikusan van lefoglalva\n" - -#: src/libkeymap/summary.c:107 -#, c-format -msgid "ranges of action codes supported by kernel:\n" -msgstr "a kernel által támogatott műveleti kódok tartományai:\n" - -#: src/libkeymap/summary.c:113 -#, c-format -msgid "number of function keys supported by kernel: %d\n" -msgstr "a kernel által támogatott funkcióbillentyűk száma: %d\n" - -#: src/libkeymap/summary.c:115 -#, c-format -msgid "max nr of compose definitions: %d\n" -msgstr "az összeállítási meghatározások legnagyobb száma: %d\n" - -#: src/libkeymap/summary.c:117 -#, c-format -msgid "nr of compose definitions in actual use: %u\n" -msgstr "tényleges használatban lévő összeállítási meghatározások száma: %u\n" - -#: src/libkeymap/summary.c:142 -#, c-format -msgid "" -"\n" -"The following synonyms are recognized:\n" -"\n" -msgstr "" -"\n" -"A következő szinonimák vannak felismerve:\n" -"\n" - -#: src/libkeymap/summary.c:145 -#, c-format -msgid "%-15s for %s\n" -msgstr "%-15s ehhez: %s\n" - -#: src/libkeymap/summary.c:149 -#, c-format -msgid "" -"\n" -"Recognized modifier names and their column numbers:\n" -msgstr "" -"\n" -"Felismert módosító nevek és az oszlopszámaik:\n" - -#: src/loadkeys.c:35 -#, fuzzy, c-format -msgid "" -"loadkeys version %s\n" -"\n" -"Usage: %s [option...] [mapfile...]\n" -"\n" -"Valid options are:\n" -"\n" -" -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" -" -p --parse search and parse keymap without action\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 %s verzió\n" -"\n" -"Használat: %s [kapcsoló…] [térképfájl…]\n" -"\n" -"Az érvényes kapcsolók:\n" -"\n" -" -a --ascii átalakítás kényszerítése ASCII-ra\n" -" -b --bkeymap bináris billentyűtérkép kiírása a szabványos kimenetre\n" -" -c --clearcompose a kernel összeállítási táblázat törlése\n" -" -C --console=file\n" -" a használandó konzoleszköz\n" -" -d --default „%s” betöltése\n" -" -h --help ezen súgószöveg megjelenítése\n" -" -m --mktable egy „defkeymap.c” fájl kiírása a szabványos kimenetre\n" -" -q --quiet minden normál kimenet elnyomása\n" -" -s --clearstrings kernel szövegtáblázat törlése\n" -" -u --unicode átalakítás kényszerítése Unicode-ra\n" -" -v --verbose módosítások jelentése\n" - -#: src/loadkeys.c:160 src/version.h:20 -#, c-format -msgid "%s from %s\n" -msgstr "%s innen: %s\n" - -#: src/loadkeys.c:170 -#, c-format -msgid "%s: Options --unicode and --ascii are mutually exclusive\n" -msgstr "%s: A --unicode és az --ascii kapcsolók kölcsönösen kizárják egymást\n" - -#: src/loadkeys.c:190 -#, c-format -msgid "" -"%s: warning: loading non-Unicode keymap on Unicode console\n" -" (perhaps you want to do `kbd_mode -a'?)\n" -msgstr "" -"%s: figyelmeztetés: nem Unicode billentyűtérkép betöltése Unicode konzolon\n" -" (talán ezt akarta: „kbd_mode -a”?)\n" - -#: src/loadkeys.c:202 -#, c-format -msgid "" -"%s: warning: loading Unicode keymap on non-Unicode console\n" -" (perhaps you want to do `kbd_mode -u'?)\n" -msgstr "" -"%s: figyelmeztetés: Unicode billentyűtérkép betöltése nem Unicode konzolon\n" -" (talán ezt akarta: „kbd_mode -u”?)\n" - -#: src/loadkeys.c:220 -#, c-format -msgid "Cannot find %s\n" -msgstr "Nem található: %s\n" - -#: src/loadkeys.c:242 -#, c-format -msgid "cannot open file %s\n" -msgstr "nem sikerült megnyitni a(z) %s fájlt\n" - -#: src/loadunimap.c:43 -#, c-format -msgid "" -"Usage:\n" -"\t%s [-C console] [-o map.orig]\n" -msgstr "" -"Használat:\n" -"\t%s [-C konzol] [-o map.orig]\n" - -#: src/loadunimap.c:175 src/loadunimap.c:186 -#, c-format -msgid "Bad input line: %s\n" -msgstr "Rossz bemeneti sor: %s\n" - -#: src/loadunimap.c:195 -#, c-format -msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s: a szimbólum szám (0x%x) nagyobb mint a betűhossz\n" - -#: src/loadunimap.c:201 -#, c-format -msgid "%s: Bad end of range (0x%x)\n" -msgstr "%s: a tartomány vége rossz (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: rossz Unicode tartomány a megfelelő 0x%x-0x%x betűpozíció tartományhoz\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: az U+%x-U+%x Unicode tartomány nem ugyanolyan hosszú mint a 0x%x-0x%x " -"betűpozíció tartomány\n" - -#: src/loadunimap.c:257 src/psfxtable.c:203 -#, c-format -msgid "%s: trailing junk (%s) ignored\n" -msgstr "%s: a záró szemét (%s) mellőzve\n" - -#: src/loadunimap.c:273 -#, c-format -msgid "Loading unicode map from file %s\n" -msgstr "Unicode térkép betöltése a(z) %s fájlból\n" - -#: src/loadunimap.c:279 -#, c-format -msgid "%s: %s: Warning: line too long\n" -msgstr "%s: %s: Figyelmeztetés: a sor túl hosszú\n" - -#: src/loadunimap.c:289 -#, c-format -msgid "" -"%s: not loading empty unimap\n" -"(if you insist: use option -f to override)\n" -msgstr "" -"%s: nincs betöltve üres unimap\n" -"(ha ragaszkodik hozzá: használja a -f kapcsolót a felülbíráláshoz)\n" - -#: src/loadunimap.c:310 -msgid "entry" -msgstr "bejegyzés" - -#: src/loadunimap.c:310 -msgid "entries" -msgstr "bejegyzések" - -#: src/loadunimap.c:336 -#, c-format -msgid "Saved unicode map on `%s'\n" -msgstr "Mentett Unicode térkép ezen: „%s”\n" - -#: src/loadunimap.c:372 -#, c-format -msgid "Appended Unicode map\n" -msgstr "Hozzáfűzött Unicode térkép\n" - -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "használat: %s [-v] [-o map.orig] map-file\n" - -#: src/mapscrn.c:133 -#, c-format -msgid "mapscrn: cannot open map file _%s_\n" -msgstr "mapscrn: nem sikerült megnyitni a(z) _%s_ térképfájlt\n" - -#: src/mapscrn.c:139 -#, c-format -msgid "Cannot stat map file" -msgstr "Nem sikerült elérni a térképfájlt" - -#: src/mapscrn.c:144 -#, c-format -msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "" -"Bináris, közvetlenül betűbe képernyő térkép betöltése a(z) %s fájlból\n" - -#: src/mapscrn.c:149 src/mapscrn.c:160 -#, c-format -msgid "Error reading map from file `%s'\n" -msgstr "Hiba a térkép olvasásakor a(z) „%s” fájlból\n" - -#: src/mapscrn.c:155 -#, c-format -msgid "Loading binary unicode screen map from file %s\n" -msgstr "Bináris Unicode képernyő térkép betöltése a(z) %s fájlból\n" - -#: src/mapscrn.c:167 -#, c-format -msgid "Loading symbolic screen map from file %s\n" -msgstr "Szimbolikus képernyő térkép betöltése a(z) %s fájlból\n" - -#: src/mapscrn.c:171 -#, c-format -msgid "Error parsing symbolic map from `%s', line %d\n" -msgstr "Hiba a szimbolikus térkép feldolgozásakor a(z) „%s” fájl %d. soránál\n" - -#: src/mapscrn.c:275 src/mapscrn.c:280 -#, c-format -msgid "Error writing map to file\n" -msgstr "Hiba a térkép fájlba írásakor\n" - -#: src/mapscrn.c:284 -#, c-format -msgid "Cannot read console map\n" -msgstr "Nem olvasható a konzol térkép\n" - -#: src/mapscrn.c:290 -#, c-format -msgid "Saved screen map in `%s'\n" -msgstr "Mentett képernyő térkép ebbe: „%s”\n" - -#: src/openvt.c:47 -#, c-format -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 "" -"Használat: %s [KAPCSOLÓK] -- parancs\n" -"\n" -"Ez a segédprogram segít egy program indításában egy új\n" -"virtuális terminálon (VT).\n" -"\n" -"Kapcsolók:\n" -" -c, --console=NUM a megadott VT szám használata;\n" -" -e, --exec a parancs végrehajtása elágazás nélkül;\n" -" -f, --force egy VT nyitásának erőltetése ellenőrzés nélkül;\n" -" -l, --login bejelentkező parancsértelmezővé teszi a programot;\n" -" -u, --user a jelenlegi VT tulajdonosának kitalálása;\n" -" -s, --switch átváltás egy új VT-re;\n" -" -w, --wait várakozás a program befejeződésére;\n" -" -v, --verbose üzenet kiírása minden művelethez;\n" -" -V, --version programverzió kiírása és kilépés;\n" -" -h, --help rövid súgóüzenet kiírása.\n" -"\n" - -#: src/openvt.c:138 -msgid "Couldn't find owner of current tty!" -msgstr "Nem található a jelenlegi tty tulajdonosa!" - -#: src/openvt.c:208 -#, c-format -msgid "%s: Illegal vt number" -msgstr "%s: szabálytalan vt szám" - -#: src/openvt.c:234 -msgid "Only root can use the -u flag." -msgstr "Csak a rendszergazda használhatja a -u jelzőt." - -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Nem sikerült a konzolra hivatkozó fájlleíró beszerzése" - -#: src/openvt.c:263 -msgid "Cannot find a free vt" -msgstr "Nem található szabad vt" - -#: src/openvt.c:267 -#, c-format -msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "" -"Nem ellenőrizhető, hogy a(z) %d. vt szabad-e. Használja a „%s -f” parancsot " -"a kényszerítéshez." - -#: src/openvt.c:271 -#, c-format -msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "" -"A %d. vt használatban van. A parancs megszakítva. Használja a „%s -f” " -"parancsot a kényszerítéshez." - -#: src/openvt.c:281 -msgid "Unable to find command." -msgstr "Nem található parancs." - -#: src/openvt.c:313 -msgid "Unable to set new session" -msgstr "Nem állítható be új munkamenet" - -#: src/openvt.c:337 -#, c-format -msgid "Unable to open %s" -msgstr "A(z) „%s” nem nyitható meg" - -#: src/openvt.c:341 -#, c-format -msgid "Using VT %s" -msgstr "%s VT használata" - -#: src/openvt.c:347 -#, c-format -msgid "Cannot open %s read/write" -msgstr "Nem sikerült a(z) %s megnyitása olvasásra/írásra" - -#: src/openvt.c:358 -#, c-format -msgid "Couldn't activate vt %d" -msgstr "Nem sikerült a(z) %d. vt aktiválása" - -#: src/openvt.c:361 -msgid "Activation interrupted?" -msgstr "Aktiválás megszakítva?" - -#: src/openvt.c:401 -#, c-format -msgid "Couldn't deallocate console %d" -msgstr "Nem sikerült a(z) %d. konzol felszabadítása" - -#: src/psffontop.c:69 -#, c-format -msgid "%s: short ucs2 unicode table\n" -msgstr "%s: rövid ucs2 unicode táblázat\n" - -#: src/psffontop.c:90 -#, c-format -msgid "%s: short utf8 unicode table\n" -msgstr "%s: rövid utf8 unicode táblázat\n" - -#: src/psffontop.c:93 -#, c-format -msgid "%s: bad utf8\n" -msgstr "%s: rossz utf8\n" - -#: src/psffontop.c:96 -#, c-format -msgid "%s: unknown utf8 error\n" -msgstr "%s: ismeretlen utf8 hiba\n" - -#: src/psffontop.c:126 -#, c-format -msgid "%s: short unicode table\n" -msgstr "%s: rövid unicode táblázat\n" - -#: src/psffontop.c:206 -#, c-format -msgid "%s: Error reading input font" -msgstr "%s: hiba a bemeneti betűkészlet olvasásakor" - -#: src/psffontop.c:220 -#, c-format -msgid "%s: Bad call of readpsffont\n" -msgstr "%s: rossz readpsffont hívás\n" - -#: src/psffontop.c:235 -#, c-format -msgid "%s: Unsupported psf file mode (%d)\n" -msgstr "%s: nem támogatott psf fájl mód (%d)\n" - -#: src/psffontop.c:253 -#, c-format -msgid "%s: Unsupported psf version (%d)\n" -msgstr "%s: nem támogatott psf verzió (%d)\n" - -#: src/psffontop.c:269 -#, c-format -msgid "%s: zero input font length?\n" -msgstr "%s: nulla bemeneti betűkészlet hossz?\n" - -#: src/psffontop.c:274 -#, c-format -msgid "%s: zero input character size?\n" -msgstr "%s: nulla bemeneti karakterméret?\n" - -#: src/psffontop.c:280 -#, c-format -msgid "%s: Input file: bad input length (%d)\n" -msgstr "%s: bemeneti fájl: rossz bemeneti hossz (%d)\n" - -#: src/psffontop.c:312 -#, c-format -msgid "%s: Input file: trailing garbage\n" -msgstr "%s: bemeneti fájl: záró szemét\n" - -#: src/psffontop.c:350 -#, c-format -msgid "appendunicode: illegal unicode %u\n" -msgstr "appendunicode: szabálytalan unicode: %u\n" - -#: src/psffontop.c:443 -#, c-format -msgid "Cannot write font file header" -msgstr "Nem sikerült a betűkészletfájl fejlécének írása" - -#: src/psffontop.c:469 src/setfont.c:679 -#, c-format -msgid "Cannot write font file" -msgstr "Nem sikerült a betűkészletfájl írása" - -#: src/psfxtable.c:109 -#, c-format -msgid "%s: Warning: line too long\n" -msgstr "%s: figyelmeztetés: a sor túl hosszú\n" - -#: src/psfxtable.c:123 src/psfxtable.c:133 -#, c-format -msgid "%s: Bad input line: %s\n" -msgstr "%s: rossz bemeneti sor: %s\n" - -#: src/psfxtable.c:142 -#, c-format -msgid "%s: Glyph number (0x%lx) past end of font\n" -msgstr "%s: a szimbólum szám (0x%lx) a betűkészlet vége után\n" - -#: src/psfxtable.c:147 -#, c-format -msgid "%s: Bad end of range (0x%lx)\n" -msgstr "%s: rossz tartományvég (0x%lx)\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: a betűkészlet pozíciói tartományának megfelelően Unicode tartománynak " -"kellene lennie\n" - -#: src/psfxtable.c:257 -#, c-format -msgid "" -"Usage:\n" -"\t%s infont intable outfont\n" -msgstr "" -"Használat:\n" -"\t%s infont intable outfont\n" - -#: src/psfxtable.c:266 -#, c-format -msgid "" -"Usage:\n" -"\t%s infont [outtable]\n" -msgstr "" -"Használat:\n" -"\t%s infont [outtable]\n" - -#: src/psfxtable.c:275 -#, c-format -msgid "" -"Usage:\n" -"\t%s infont outfont\n" -msgstr "" -"Használat:\n" -"\t%s infont outfont\n" - -#: src/psfxtable.c:300 -#, c-format -msgid "" -"Usage:\n" -"\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" -msgstr "" -"Használat:\n" -"\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" - -#: src/psfxtable.c:360 -#, c-format -msgid "%s: Bad magic number on %s\n" -msgstr "%s: rossz varázsszám ezen: %s\n" - -#: src/psfxtable.c:379 -#, c-format -msgid "%s: psf file with unknown magic\n" -msgstr "%s: psf fájl ismeretlen varázslattal\n" - -#: src/psfxtable.c:395 -#, c-format -msgid "%s: input font does not have an index\n" -msgstr "%s: a bemeneti betűkészletnek nincs indexe\n" - -#: src/resizecons.c:148 -#, c-format -msgid "resizecons: cannot find videomode file %s\n" -msgstr "resizecons: nem található a videomód fájl: %s\n" - -#: src/resizecons.c:164 -msgid "Invalid number of lines\n" -msgstr "A sorok száma érvénytelen\n" - -#: src/resizecons.c:227 -#, c-format -msgid "Old mode: %dx%d New mode: %dx%d\n" -msgstr "Régi mód: %dx%d Új mód: %dx%d\n" - -#: src/resizecons.c:229 -#, c-format -msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" -msgstr "Régi #scanlines: %d Új #scanlines: %d Karaktermagasság: %d\n" - -#: src/resizecons.c:240 -#, c-format -msgid "resizecons: the command `%s' failed\n" -msgstr "resizecons: a(z) „%s” parancs meghiúsult\n" - -#: src/resizecons.c:313 -#, c-format -msgid "" -"resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" -msgstr "" -"resizecons: ne felejtse el a TERM megváltoztatását (talán erre: con%dx%d " -"vagy linux-%dx%d)\n" - -#: src/resizecons.c:326 -#, 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" -msgstr "" -"resizecons:\n" -"hívás: resizecons OSZLOPxSOR vagy: resizecons OSZLOP SOR\n" -"vagy: resizecons -lines SOR, a 25, 28, 30, 34, 36, 40, 44, 50, 60 SOR " -"egyikével\n" - -#: src/resizecons.c:364 -#, c-format -msgid "resizecons: cannot get I/O permissions.\n" -msgstr "resizecons: nem sikerült megszerezni az I/O jogosultságokat.\n" - -#: src/screendump.c:50 -#, c-format -msgid "usage: screendump [n]\n" -msgstr "használat: screendump [n]\n" - -#: src/screendump.c:80 -#, fuzzy, c-format -msgid "Error reading %s" -msgstr "Hiba a(z) „%s” olvasásakor\n" - -#: src/screendump.c:126 -#, c-format -msgid "couldn't read %s, and cannot ioctl dump\n" -msgstr "nem sikerült a(z) %s olvasása, és az ioctl kiírás sikertelen\n" - -#: src/screendump.c:132 -#, c-format -msgid "couldn't read %s\n" -msgstr "nem sikerült a(z) %s olvasása\n" - -#: src/screendump.c:141 -#, c-format -msgid "Strange ... screen is both %dx%d and %dx%d ??\n" -msgstr "Különös… a képernyő %dx%d és %dx%d is?\n" - -#: src/screendump.c:158 -msgid "Error writing screendump\n" -msgstr "Hiba a screendump írásakor\n" - -#: src/setfont.c:74 -#, c-format -msgid "" -"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" -" -om Write current consolemap to \n" -" -ou Write current unicodemap to \n" -"If no newfont and no -[o|O|om|ou|m|u] option is given,\n" -"a default font is loaded:\n" -" setfont Load font \"default[.gz]\"\n" -" setfont - Load font \"default8x[.gz]\"\n" -"The - option selects a font from a codepage that contains three fonts:\n" -" setfont -{8|14|16} codepage.cp[.gz] Load 8x font from codepage.cp\n" -"Explicitly (with -m or -u) or implicitly (in the fontfile) given mappings\n" -"will be loaded and, in the case of consolemaps, activated.\n" -" -h (no space) Override font height.\n" -" -m Load console screen map.\n" -" -u Load font unicode map.\n" -" -m none Suppress loading and activation of a screen map.\n" -" -u none Suppress loading of a unicode map.\n" -" -v Be verbose.\n" -" -C Indicate console device to be used.\n" -" -V Print version and exit.\n" -"Files are loaded from the current directory or %s/*/.\n" -msgstr "" -"Használat: setfont [írási-kapcsolók] [-] [új-betű…] [-m konzoltérkép] [-u " -"unicode-térkép]\n" -" írási kapcsolók (a fájlbetöltés előtt történik):\n" -" -o Jelenlegi betűkészlet írása \n" -" -O Jelenlegi betűkészlet és Unicode térkép írása " -"\n" -" -om Jelenlegi konzoltérkép írása \n" -" -ou Jelenlegi Unicode térkép írása \n" -"Ha nincs új-betű és nincs megadva -[o|O|om|ou|m|u] kapcsoló,\n" -"akkor az alapértelmezett betűkészlet lesz betöltve:\n" -" setfont „default[.gz]” betűkészlet betöltése\n" -" setfont - „default8x[.gz]” betűkészlet betöltése\n" -"A - kapcsoló kiválaszt egy betűkészletet a kódlapról, amely három\n" -"betűkészletet tartalmaz:\n" -" setfont -{8|14|16} codepage.cp[.gz] a codepage.cp 8x betű " -"betöltése\n" -"Explicit (-m vagy -u kapcsolóval) vagy implicit (a betűfájlban) megadott\n" -"leképezések lesznek betöltve, és - a konzoltérképek esetében - alkalmazva.\n" -" -h (nincs szóköz) Betűkészlet magasságának felülbírálása.\n" -" -m Konzolképernyő térkép betöltése.\n" -" -u Betűkészlet Unicode térkép betöltése.\n" -" -m none A képernyőtérkép betöltésének és aktiválásának elnyomása.\n" -" -u none Egy Unicode térkép betöltésének elnyomása.\n" -" -v Legyen bőbeszédű.\n" -" -C A használandó konzoleszköz jelzése.\n" -" -V Verzió kiírása és kilépés.\n" -"A fájlok az aktuális könyvtárból vagy a(z) %s/*/ helyről vannak betöltve.\n" - -#: src/setfont.c:177 -#, c-format -msgid "setfont: too many input files\n" -msgstr "setfont: túl sok bemeneti fájl\n" - -#: src/setfont.c:185 -#, c-format -msgid "" -"setfont: cannot both restore from character ROM and from file. Font " -"unchanged.\n" -msgstr "" -"setfont: nem lehet karaktert visszaállítani ROM-ból és fájlból is. A " -"betűkészlet nem változott.\n" - -#: src/setfont.c:259 -#, c-format -msgid "Bad character height %d\n" -msgstr "Rossz karaktermagasság: %d\n" - -#: src/setfont.c:263 -#, c-format -msgid "Bad character width %d\n" -msgstr "Rossz karakterszélesség: %d\n" - -#: src/setfont.c:288 -#, c-format -msgid "%s: font position 32 is nonblank\n" -msgstr "%s: a 32. betűkészlet pozíció nem üres\n" - -#: src/setfont.c:296 -#, c-format -msgid "%s: wiped it\n" -msgstr "%s: letörölte\n" - -#: src/setfont.c:300 -#, c-format -msgid "%s: background will look funny\n" -msgstr "%s: a háttér viccesen fog kinézni\n" - -#: src/setfont.c:310 -#, c-format -msgid "Loading %d-char %dx%d font from file %s\n" -msgstr "%d-char %dx%d betűkészlet betöltése a(z) %s fájlból\n" - -#: src/setfont.c:313 -#, c-format -msgid "Loading %d-char %dx%d font\n" -msgstr "%d-char %dx%d betűkészlet betöltése\n" - -#: src/setfont.c:316 -#, c-format -msgid "Loading %d-char %dx%d (%d) font from file %s\n" -msgstr "%d-char %dx%d (%d) betűkészlet betöltése a(z) %s fájlból\n" - -#: src/setfont.c:319 -#, c-format -msgid "Loading %d-char %dx%d (%d) font\n" -msgstr "%d-char %dx%d (%d) betűkészlet betöltése\n" - -#: src/setfont.c:372 -#, c-format -msgid "%s: bug in do_loadtable\n" -msgstr "%s: hiba ebben: do_loadtable\n" - -#: src/setfont.c:378 -#, c-format -msgid "Loading Unicode mapping table...\n" -msgstr "Unicode leképezési táblázat betöltése…\n" - -#: src/setfont.c:414 src/setfont.c:502 -#, c-format -msgid "Cannot open font file %s\n" -msgstr "Nem sikerült megnyitni a(z) %s betűkészletfájlt\n" - -#: src/setfont.c:425 -#, c-format -msgid "When loading several fonts, all must be psf fonts - %s isn't\n" -msgstr "" -"Különböző betűkészletek betöltésekor mindegyiknek psf betűkészletnek kell " -"lennie - %s nem az\n" - -#: src/setfont.c:435 -#, c-format -msgid "Read %d-char %dx%d font from file %s\n" -msgstr "%d-char %dx%d betűkészlet beolvasása a(z) %s fájlból\n" - -#: src/setfont.c:441 -#, c-format -msgid "When loading several fonts, all must have the same height\n" -msgstr "" -"Különböző betűkészletek betöltésekor mindegyiknek ugyanolyan magasnak kell " -"lennie\n" - -#: src/setfont.c:448 -#, c-format -msgid "When loading several fonts, all must have the same width\n" -msgstr "" -"Különböző betűkészletek betöltésekor mindegyiknek ugyanolyan szélesnek kell " -"lennie\n" - -#: src/setfont.c:489 -#, c-format -msgid "Cannot find default font\n" -msgstr "Nem található alapértelmezett betűkészlet\n" - -#: src/setfont.c:496 -#, c-format -msgid "Cannot find %s font\n" -msgstr "Nem található %s betűkészlet\n" - -#: src/setfont.c:508 -#, c-format -msgid "Reading font file %s\n" -msgstr "A(z) %s betűkészletfájl olvasása\n" - -#: src/setfont.c:548 -#, c-format -msgid "No final newline in combine file\n" -msgstr "Nincs végső új sor az egyesített fájlban\n" - -#: src/setfont.c:554 -#, c-format -msgid "Too many files to combine\n" -msgstr "Túl sok egyesítendő fájl\n" - -#: src/setfont.c:578 -#, c-format -msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Hmm - egy betűkészlet ebből: restorefont? Az első fél használata.\n" - -#: src/setfont.c:595 -#, c-format -msgid "Bad input file size\n" -msgstr "Rossz bemeneti fájlméret\n" - -#: src/setfont.c:616 -#, c-format -msgid "" -"This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" -"using an option -8 or -14 or -16 which one you want loaded.\n" -msgstr "" -"Ez a fájl 3 betűkészletet tartalmaz: 8x8, 8x14 és 8x16. Jelölje meg a -8\n" -"vagy -14 vagy -16 kapcsoló használatával, hogy melyiket szeretné betölteni.\n" - -#: src/setfont.c:630 -#, c-format -msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" -msgstr "%d betűméretet kért, de csak 8, 14, 16 lehetséges itt.\n" - -#: src/setfont.c:675 -#, c-format -msgid "Found nothing to save\n" -msgstr "Nincs mit menteni\n" - -#: src/setfont.c:684 -#, c-format -msgid "Saved %d-char %dx%d font file on %s\n" -msgstr "A(z) %d-char %dx%d betűkészletfájl elmentve ekkor: %s\n" - -#: src/setkeycodes.c:23 -#, c-format -msgid "" -"usage: setkeycode scancode keycode ...\n" -" (where scancode is either xx or e0xx, given in hexadecimal,\n" -" and keycode is given in decimal)\n" -msgstr "" -"használat: setkeycode vizsgálókód billentyűkód …\n" -" (ahol a vizsgálókód xx vagy e0xx hexadecimálisként megadva,\n" -" és a billentyűkód decimálisként megadva)\n" - -#: src/setkeycodes.c:45 -msgid "even number of arguments expected" -msgstr "páros számú argumentumot kell megadni" - -#: src/setkeycodes.c:52 -msgid "error reading scancode" -msgstr "hiba a vizsgálókód olvasásakor" - -#: src/setkeycodes.c:60 -msgid "code outside bounds" -msgstr "külső kódhatárok" - -#: src/setkeycodes.c:69 -#, fuzzy, c-format -msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" -msgstr "nem sikerült a(z) %x vizsgálókód beállítása a(z) %d billentyűkódra\n" - -#: src/setleds.c:24 -#, c-format -msgid "" -"Usage:\n" -"\tsetleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" -"Thus,\n" -"\tsetleds +caps -num\n" -"will set CapsLock, clear NumLock and leave ScrollLock unchanged.\n" -"The settings before and after the change (if any) are reported\n" -"when the -v option is given or when no change is requested.\n" -"Normally, setleds influences the vt flag settings\n" -"(and these are usually reflected in the leds).\n" -"With -L, setleds only sets the leds, and leaves the flags alone.\n" -"With -D, setleds sets both the flags and the default flags, so\n" -"that a subsequent reset will not change the flags.\n" -msgstr "" -"Használat:\n" -"\tsetleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" -"Így a,\n" -"\tsetleds +caps -num\n" -"be fogja állítani CapsLock-ot, törli a NumLock-ot és változatlanul hagyja\n" -"a ScrollLock-ot.\n" -"A módosítás előtti és utáni beállítások (ha vannak) jelentve lesznek,\n" -"amikor a -v kapcsoló meg van adva, vagy ha nem kértek módosítást.\n" -"Normális esetben a setleds befolyásolja a vt jelző beállításokat\n" -"(és ezek általában visszaköszönnek a LED-eken).\n" -"A -L kapcsolóval csak beállítja a LED-eket, és békén hagyja a jelzőket.\n" -"A -D kapcsolóval beállítja a jelzőket és az alapértelmezett jelzőket is, " -"így\n" -"a következő újraindításkor nem fogja módosítani a jelzőket.\n" - -#: src/setleds.c:46 -msgid "on " -msgstr "be " - -#: src/setleds.c:46 -msgid "off" -msgstr "ki " - -#: src/setleds.c:87 -#, fuzzy -msgid "" -"Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" -msgstr "" -"Hiba a jelenlegi LED-beállítás olvasásakor. Talán a szabványos bemenet nem a " -"VT?\n" - -#: src/setleds.c:105 -#, fuzzy -msgid "" -"Error reading current flags setting. Maybe you are not on the console?: " -"ioctl KDGKBLED" -msgstr "" -"Hiba a jelenlegi jelzőbeállítások olvasásakor. Talán nem a konzolon van?\n" - -#: src/setleds.c:123 -#, fuzzy -msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" -msgstr "Hiba a jelenlegi LED-beállítás olvasásakor a /dev/kbd fájlból.\n" - -#: src/setleds.c:127 -msgid "KIOCGLED unavailable?\n" -msgstr "KIOCGLED nem érhető el?\n" - -#: src/setleds.c:141 -#, fuzzy -msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" -msgstr "Hiba a jelenlegi LED-beállítás olvasásakor a /dev/kbd fájlból.\n" - -#: src/setleds.c:145 -msgid "KIOCSLED unavailable?\n" -msgstr "KIOCSLED nem érhető el?\n" - -#: src/setleds.c:201 -msgid "Error resetting ledmode\n" -msgstr "Hiba a LED-mód visszaállításakor\n" - -#: src/setleds.c:209 -#, c-format -msgid "Current default flags: " -msgstr "Jelenlegi alapértelmezett jelzők: " - -#: src/setleds.c:213 -#, c-format -msgid "Current flags: " -msgstr "Jelenlegi jelzők: " - -#: src/setleds.c:217 -#, c-format -msgid "Current leds: " -msgstr "Jelenlegi LED-ek: " - -#: src/setleds.c:253 src/setmetamode.c:95 -#, c-format -msgid "" -"unrecognized argument: _%s_\n" -"\n" -msgstr "" -"azonosítatlan argumentum: _%s_\n" -"\n" - -#: src/setleds.c:262 -#, c-format -msgid "Old default flags: " -msgstr "Régi alapértelmezett jelzők: " - -#: src/setleds.c:264 -#, c-format -msgid "New default flags: " -msgstr "Új alapértelmezett jelzők: " - -#: src/setleds.c:271 -#, c-format -msgid "Old flags: " -msgstr "Régi jelzők: " - -#: src/setleds.c:273 -#, c-format -msgid "New flags: " -msgstr "Új jelzők: " - -#: src/setleds.c:286 src/setleds.c:295 -#, c-format -msgid "Old leds: " -msgstr "Régi LED-ek: " - -#: src/setleds.c:288 src/setleds.c:297 -#, c-format -msgid "New leds: " -msgstr "Új LED-ek: " - -#: src/setmetamode.c:23 -#, c-format -msgid "" -"Usage:\n" -"\tsetmetamode [ metabit | meta | bit | escprefix | esc | prefix ]\n" -"Each vt has his own copy of this bit. Use\n" -"\tsetmetamode [arg] < /dev/ttyn\n" -"to change the settings of another vt.\n" -"The setting before and after the change are reported.\n" -msgstr "" -"Használat:\n" -"\tsetmetamode [ metabit | meta | bit | escprefix | esc | prefix ]\n" -"Minden vt saját másolattal rendelkezik erről a bitről. Így használja:\n" -"\tsetmetamode [arg] < /dev/ttyn\n" -"egy másik vt beállításainak módosításához.\n" -"A módosítás előtti és utáni beállítás jelentve lesz.\n" - -#: src/setmetamode.c:39 -msgid "Meta key sets high order bit\n" -msgstr "A Meta billentyű magas sorrendbitet állít be\n" - -#: src/setmetamode.c:42 -msgid "Meta key gives Esc prefix\n" -msgstr "A Meta billentyű Esc előtagot ad\n" - -#: src/setmetamode.c:45 -msgid "Strange mode for Meta key?\n" -msgstr "Különös mód a Meta billentyűnél?\n" - -#: src/setmetamode.c:79 -#, fuzzy -msgid "" -"Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" -msgstr "" -"Hiba a jelenlegi beállítás olvasásakor. Talán a szabványos bemenet nem a " -"VT?\n" - -#: src/setmetamode.c:99 -#, c-format -msgid "old state: " -msgstr "régi állapot: " - -#: src/setmetamode.c:104 -#, c-format -msgid "new state: " -msgstr "új állapot: " - -#: src/setvesablank.c:25 -#, c-format -msgid "usage: %s\n" -msgstr "használat: %s\n" - -#: src/setvtrgb.c:42 -#, c-format -msgid "" -"Usage: %s vga|FILE|-\n" -"\n" -"If you use the FILE parameter, FILE should be exactly 3 lines of\n" -"comma-separated decimal values for RED, GREEN, and BLUE.\n" -"\n" -"To seed a valid FILE:\n" -" cat /sys/module/vt/parameters/default_{red,grn,blu} > FILE\n" -"\n" -"and then edit the values in FILE.\n" -"\n" -msgstr "" -"Használat: %s vga|FÁJL|-\n" -"\n" -"Ha a FÁJL paramétert használja, a FÁJLNAK pontosan 3 soros, vesszővel\n" -"elválasztott decimális értékeknek kell lennie a VÖRÖS, ZÖLD és KÉK\n" -"értékekhez.\n" -"\n" -"Egy érvényes FÁJL megszerzéséhez:\n" -" cat /sys/module/vt/parameters/default_{red,grn,blu} > FÁJL\n" -"\n" -"majd ezután szerkessze a FÁJLBAN lévő értékeket.\n" -"\n" - -#: src/setvtrgb.c:68 -#, c-format -msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "Hiba: %s: érvénytelen érték a(z) %u mezőben a(z) %u sorban." - -#: src/setvtrgb.c:75 -#, c-format -msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "Hiba: %s: a mezők száma nem elegendő a(z) %u sorban." - -#: src/setvtrgb.c:80 -#, c-format -msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "Hiba: %s: a(z) %u sor váratlanul befejeződött.\n" - -#: src/setvtrgb.c:84 -#, c-format -msgid "Error: %s: Line %u is too long.\n" -msgstr "Hiba: %s: a(z) %u sor túl hosszú.\n" - -#: src/showconsolefont.c:35 -msgid "failed to restore original translation table\n" -msgstr "nem sikerült az eredeti fordítási táblázat visszaállítása\n" - -#: src/showconsolefont.c:39 -msgid "failed to restore original unimap\n" -msgstr "nem sikerült az eredeti unimap visszaállítása\n" - -#: src/showconsolefont.c:57 -msgid "cannot change translation table\n" -msgstr "nem sikerült a fordítási táblázat módosítása\n" - -#: src/showconsolefont.c:95 -#, c-format -msgid "" -"usage: showconsolefont -V|--version\n" -" showconsolefont [-C tty] [-v] [-i]\n" -"(probably after loading a font with `setfont font')\n" -"\n" -"Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" -msgstr "" -"használat: showconsolefont -V|--version\n" -" showconsolefont [-C tty] [-v] [-i]\n" -"(valószínűleg egy betűkészlet betöltése után a „setfont font” " -"használatával)\n" -"\n" -"Az érvényes kapcsolók:\n" -" -C tty A betű beolvasásának eszköze. Alapértelmezett: jelenlegi tty.\n" -" -v Legyen bőbeszédűbb.\n" -" -i Ne írja ki a betűkészlet táblázatot, csak jelenítse meg a\n" -" SORxOSZLOPxSZÁM értékét és lépjen ki.\n" - -#: src/showconsolefont.c:161 -#, c-format -msgid "Character count: %d\n" -msgstr "Karakterszám: %d\n" - -#: src/showconsolefont.c:162 -#, c-format -msgid "Font width : %d\n" -msgstr "Betűkészlet szélesség: %d\n" - -#: src/showconsolefont.c:163 -#, c-format -msgid "Font height : %d\n" -msgstr "Betűkészlet magasság: %d\n" - -#: src/showconsolefont.c:175 -#, c-format -msgid "" -"Showing %d-char font\n" -"\n" -msgstr "" -"%d-char betűkészlet megjelenítése\n" -"\n" - -#: src/showkey.c:44 -msgid "?UNKNOWN?" -msgstr "?ISMERETLEN?" - -#: src/showkey.c:46 -#, c-format -msgid "kb mode was %s\n" -msgstr "a kb mód ez volt: %s\n" - -#: src/showkey.c:48 -#, c-format -msgid "" -"[ if you are trying this under X, it might not work\n" -"since the X server is also reading /dev/console ]\n" -msgstr "" -"[ ha ezt X alatt próbálja, előfordulhat, hogy nem működik,\n" -"amióta az X-kiszolgáló is a /dev/console fájlt olvassa ]\n" - -#: src/showkey.c:66 -#, c-format -msgid "caught signal %d, cleaning up...\n" -msgstr "%d szignál elkapva, tisztítás…\n" - -#: src/showkey.c:80 -#, c-format -msgid "" -"showkey version %s\n" -"\n" -"usage: showkey [options...]\n" -"\n" -"valid options are:\n" -"\n" -"\t-h --help\tdisplay this help text\n" -"\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" -"\t-s --scancodes\tdisplay only the raw scan-codes\n" -"\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" -msgstr "" -"showkey %s verzió\n" -"\n" -"használat: showkey [kapcsolók…]\n" -"\n" -"az érvényes kapcsolók:\n" -"\n" -"\t-h --help\tezen súgószöveg megjelenítése és kilépés\n" -"\t-a --ascii\ta billentyűk decimális/oktális/hexa értékeinek megjelenítése\n" -"\t-s --scancodes\tcsak a nyers vizsgálókódok megjelenítése\n" -"\t-k --keycodes\tcsak az értelmezett billentyűkódok megjelenítése (alap)\n" - -#: src/showkey.c:158 -#, c-format -msgid "" -"\n" -"Press any keys - Ctrl-D will terminate this program\n" -"\n" -msgstr "" -"\n" -"Nyomjon meg egy billentyűt - a Ctrl-D befejezi a programot\n" -"\n" - -#: src/showkey.c:226 -#, c-format -msgid "press any key (program terminates 10s after last keypress)...\n" -msgstr "" -"nyomjon meg egy billentyűt (a program befejeződik az utolsó " -"billentyűlenyomás után 10 másodperccel)…\n" - -#: src/showkey.c:250 -msgid "release" -msgstr "elengedés" - -#: src/showkey.c:250 -msgid "press" -msgstr "lenyomás" - -#: src/showkey.c:262 -#, c-format -msgid "keycode %3d %s\n" -msgstr "billentyűkód: %3d %s\n" - -#: src/totextmode.c:31 -msgid "usage: totextmode\n" -msgstr "használat: totextmode\n" - -#: src/vlock/auth.c:78 -msgid "" -"Please try again later.\n" -"\n" -"\n" -msgstr "" -"Próbálja meg később.\n" -"\n" -"\n" - -#: src/vlock/auth.c:87 -#, c-format -msgid "The entire console display is now completely locked by %s.\n" -msgstr "Az egész konzolkijelzőt most a(z) %s teljesen zárolta.\n" - -#: src/vlock/auth.c:91 -#, c-format -msgid "The %s is now locked by %s.\n" -msgstr "A(z) %s most zárolva van a(z) %s által.\n" - -#: src/vlock/auth.c:94 -msgid "Use Alt-function keys to switch to other virtual consoles." -msgstr "" -"Használja az Alt-funkcióbillentyűket egy másik virtuális konzolra váltáshoz." - -#: src/vlock/parse.c:51 -#, c-format -msgid "Try `%s --help' for more information.\n" -msgstr "További információkért próbálja a(z) „%s --help” parancsot.\n" - -#: src/vlock/parse.c:59 -#, 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: lezárja a virtuális konzolokat, elmenti a jelenlegi munkamenetet.\n" -"Használat: %s [kapcsolók]\n" -" Ahol a [kapcsolók] a következők lehetnek:\n" -"-c vagy --current: csak ezen virtuális konzol zárolása, lehetővé téve a\n" -" felhasználónak másik virtuális konzolra váltást.\n" -"-a vagy --all: minden virtuális konzol zárolása, megakadályozva más\n" -" felhasználóknak a virtuális konzolra váltást.\n" -"-v vagy --version: A vlock verziószámának kiírása és kilépés.\n" -"-h vagy --help: Ezen súgószöveg kiírása és kilépés.\n" - -#: src/vlock/username.c:57 -msgid "unrecognized user" -msgstr "azonosítatlan felhasználó" - -#: src/vlock/vlock.c:59 -msgid "stdin is not a tty" -msgstr "a szabványos bemenet nem tty" - -#: src/vlock/vt.c:152 -#, c-format -msgid "This tty (%s) is not a virtual console.\n" -msgstr "Ez a tty (%s) nem egy virtuális konzol.\n" - -#: src/vlock/vt.c:160 -#, c-format -msgid "The entire console display cannot be locked.\n" -msgstr "Az egész konzolkijelzőt nem sikerült zárolni.\n" - -#~ msgid "%s: deallocating all unused consoles failed\n" -#~ msgstr "%s: az összes nem használt konzol felszabadítása sikertelen\n" - -#~ msgid "kbd_mode: error reading keyboard mode\n" -#~ msgstr "kbd_mode: hiba a billentyűzetmód olvasásakor\n" - -#~ msgid "%s: error setting keyboard mode\n" -#~ msgstr "%s: hiba a billentyűzetmód beállításakor\n" - -#~ msgid "Error opening /dev/kbd.\n" -#~ msgstr "Hiba a /dev/kbd megnyitásakor.\n" - -#~ msgid "%s: out of memory?\n" -#~ msgstr "%s: elfogyott a memória?\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/id.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/id.gmo differ diff -Nru kbd-2.0.3/po/id.po kbd-2.0.4/po/id.po --- kbd-2.0.3/po/id.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/id.po 2017-01-08 18:38:45.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: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2010-07-07 23:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -15,39 +15,52 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "penggunaan: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +#, fuzzy +msgid "Couldn't get a file descriptor referring to the console" +msgstr "" +"Tidak dapat memperoleh deskripsi berkas yang mereferensikan ke konsole\n" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: pilihan tidak diketahui\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: nomor VT tidak legal\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: VT 1 adalah konsole dan tidak dapat didealokasikan\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s: tidak dapat didealokasikan console %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys versi %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -56,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -83,7 +97,7 @@ "\t --compose-only tampilkan hanya kombinasi tombol compose\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -92,17 +106,24 @@ "\t\t\t interpretasikan aksi kode karakter dari\n" "\t\t\t set karakter yang dispesifikasikan\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "charset %s tidak diketahui - mengabaikan permintaan charset\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: error membaca mode keyboard\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -113,7 +134,7 @@ "(nilai numerik, simbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -136,43 +157,43 @@ "\t-V --version tampilkan informasi versi\n" "\t-n --next-available tampilkan VT yang belum dialokasikan selanjutnya\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Tidak dapat membaca VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Tidak dapat membuka %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "penggunaan: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Plain scancodes xx (hex) lawan keycodes (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "untuk 1-%d (0x01-0x%02x) scancode sama dengan keycode\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -183,12 +204,12 @@ "\n" "Escaped scancodes e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "gagal memperoleh keycode untuk scancode 0x%x\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -197,263 +218,266 @@ "Penggunaan:\n" "\t%s [-s] [-C console]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, fuzzy, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" "argumen tidak diketahui: _%s_\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "penggunaan: kbd_mode [-a|-u|-k|-s] [-C perangkat]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Keyboard sekarang dalam mode raw (scancode)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Keyboard sekarang dalam mode mediumraw (keycode)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Keyboard sekarang dalam mode baku (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Keyboard sekarang dalam mode Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Keyboard sekarang dalam mode tidak dikenal\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Typematic Rate diset ke %.1f cps (tunda = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Penggunaan: kbdrate [-V] [-s] [-r rate] [-d tunda]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Tidak dapat membuka /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "bug: getfont dipanggil dengan count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "bug: getfont menggunakan GIO_FONT membutuhkan buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: kehabisan memori\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: kehabisan memori\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Error menulis peta ke berkas\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "tidak memungkinkan: bukan meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT error di indeks %d dalam tabel %d\n" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, fuzzy, c-format msgid "unable to get keymap %d" msgstr "dealokasi peta tombol %d\n" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "gagal untuk mengikat tombol %d ke nilai %d\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, fuzzy, c-format msgid "lk_add_key called with bad keycode %d" msgstr "addkey dipanggil dengan kode tombol %d buruk" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "menambahkan peta %d melanggar baris peta-kunci eksplisit" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "gagal untuk mengikat tombol %d ke nilai %d\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 #, fuzzy msgid "impossible error in lk_add_constants" msgstr "tidak mungkin error dalam do_constant" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "mengasumsikan iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "mengasumsikan iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "mengasumsikan iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "mengasumsikan iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "mengasumsikan iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "keysym '%s' tidak diketahui\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "%s: tidak dapat mengubah ke mode Unicode\n" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, fuzzy, c-format msgid "Keymap %d: Permission denied" msgstr "Peta-tombol %d: Ijin ditolak\n" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "kode-tombol %d, tabel %d = %d%s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " GAGAL" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "gagal untuk mengikat tombol %d ke nilai %d\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, fuzzy, c-format msgid "deallocate keymap %d" msgstr "dealokasi peta tombol %d\n" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s: tidak dapat dealokasikan peta-tombol %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, fuzzy, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "%s: tidak dapat dealokasikan atau menghapus peta-tombol\n" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "%s: tidak dapat kembali ke mode keyboard asli\n" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, fuzzy, c-format msgid "failed to bind string '%s' to function %s" msgstr "gagal untuk mengikat string '%s' ke fungsi %s\n" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, fuzzy, c-format msgid "failed to clear string %s" msgstr "gagal untuk menghapus string %s\n" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "terlalu banyak definisi compose\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -464,7 +488,7 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, fuzzy, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -475,59 +499,59 @@ "\n" "Diubah %d %s dan %d %s.\n" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "terlalu banyak definisi compose\n" msgstr[1] "terlalu banyak definisi compose\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "(Tidak ada perubahan dalam definisi compose.)\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "jangkauan keycode tidak didukung oleh kernel: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "jumlah maksimal dari aksi yang dapat diikat oleh sebuah kunci: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "jumlah dari peta kunci dalam penggunaan aktual: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "dari yang mana %d secara dinamis dialokasikan\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "jangkauan dari kode aksi tidak didukung oleh kernel:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "jumlah dari kunci fungsi tidak didukung oleh kernel: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "jumlah dari nr dari definisi compose: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "nr dari definisi compose dalam penggunaan aktual: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -538,12 +562,12 @@ "Sinonim berikut dikenal:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s untuk %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -552,7 +576,7 @@ "\n" "Nama pemodifikasi dikenal dan jumlah kolomnya:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -574,6 +598,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys version %s\n" "\n" @@ -593,17 +618,17 @@ " -u --unicode konversi implisit ke Unicode\n" " -v --verbose laporkan perubahan\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s dari %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, fuzzy, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -612,7 +637,7 @@ "%s: peringatan: memuat peta-kunci Unicode dalam console tidak-Unicode\n" " (mungkin anda ingin melakukan `kbd_mode -u'?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -621,17 +646,17 @@ "%s: peringatan: memuat peta-kunci Unicode dalam console tidak-Unicode\n" " (mungkin anda ingin melakukan `kbd_mode -u'?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Tidak dapat menemukan %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "tidak dapat membuka berkas %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -640,29 +665,29 @@ "Penggunaan:\n" "\t%s [-C console] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Baris masukan buruk: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Nomor glyph (0x%x) lebih besar dari panjang font\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Akhir dari jangkauan (0x%x) buruk\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -671,22 +696,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: akhiran sampah (%s) diabaikan\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Menload peta unicode dari berkas %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Peringatan: baris terlalu panjang\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -695,80 +720,80 @@ "%s: tidak meload unimap kosong\n" "(jika anda tetap memaksa: gunakan pilihan -f untuk memaksa)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "masukan" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "masukan" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Disimpan peta unicode di `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Ditambahkan peta unicode\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "penggunaan: %s [-v] [-o peta.asal] berkas-peta]\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: tidak dapat membuka berkas peta _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Tidak dapat memperoleh statistik berkas peta" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Meload binari langsung ke font peta layar dari berkas %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Error membaca peta dari berkas `%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Meload binari unicode peta layar dari berkas %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Meload simbolik peta layar dari berkas %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Error parsing peta simbolik dari `%s', baris %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Error menulis peta ke berkas\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Tidak dapat membaca peta console\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Peta layar disimpan dalam `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -789,186 +814,180 @@ "\n" msgstr "" -#: src/openvt.c:138 +#: src/openvt.c:141 #, fuzzy msgid "Couldn't find owner of current tty!" msgstr "Tidak dapat menemukan pemilik dari tty sekarang!\n" -#: src/openvt.c:208 +#: src/openvt.c:210 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: nomor vt tidak legal\n" -#: src/openvt.c:234 +#: src/openvt.c:236 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: hanya root yang dapat menggunakan pilihan -u.\n" -#: src/openvt.c:256 -#, fuzzy -msgid "Couldn't get a file descriptor referring to the console" -msgstr "" -"Tidak dapat memperoleh deskripsi berkas yang mereferensikan ke konsole\n" - -#: src/openvt.c:263 +#: src/openvt.c:265 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: tidak dapat menemukan sebuah free vt\n" -#: src/openvt.c:267 +#: src/openvt.c:269 #, 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:271 +#: src/openvt.c:273 #, 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:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "" -#: src/openvt.c:313 +#: src/openvt.c:315 #, fuzzy msgid "Unable to set new session" msgstr "openvt: Tidak dapat menset sesi baru (%s)\n" -#: src/openvt.c:337 +#: src/openvt.c:339 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Tidak dapat membuka %s: %s\n" -#: src/openvt.c:341 +#: src/openvt.c:343 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: menggunakan VT %s\n" -#: src/openvt.c:347 +#: src/openvt.c:349 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Tidak dapat membuka %s baca/tulis (%s)\n" -#: src/openvt.c:358 +#: src/openvt.c:360 #, fuzzy, c-format msgid "Couldn't activate vt %d" msgstr "" "\n" "openvt: tidak dapat mengaktifkan vt %d (%s)\n" -#: src/openvt.c:361 +#: src/openvt.c:363 #, fuzzy msgid "Activation interrupted?" msgstr "" "\n" "openvt: aktivasi terinterupsi? (%s)\n" -#: src/openvt.c:401 +#: src/openvt.c:403 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: tidak dapat didealokasikan console %d\n" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: short ucs2 tabel unicode\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: short utf8 tabel unicode\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: utf8 buruk\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: error utf8 tidak diketahui\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: tabel unicode pendek\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Error membaca font masukan" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Panggilan dari readpsffont buruk\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Mode berkas psf (%d) tidak didukung\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Versi psf tidak didukung (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: panjang masukan font nol?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: ukuran masukan karakter nol?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Berkas masukan: panjang masukan buruk (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Berkas masukan: akhiran sampah\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: unicode %u tidak legal\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Tidak dapat menulis font berkas header" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Tidak dapat menulis berkas font" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Peringatan: baris terlalu panjang\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Baris masukan buruk: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Nomor glyph (0x%lx) melewati akhir dari font\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Akhir dari jangkauan buruk (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -977,7 +996,7 @@ "%s: Sebuah daerah dari posisi font yang berkorespondensi, seharusnya sebuah " "jangkauan Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -986,7 +1005,7 @@ "Penggunaan:\n" "\t%s font-masukan tabel-masukan font-keluaran\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -995,7 +1014,7 @@ "Penggunaan:\n" "\t%s font-masukan [tabel-keluaran]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1004,7 +1023,7 @@ "Penggunaan:\n" "\t%s font-masukan font-keluaran\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1014,22 +1033,22 @@ "\t%s [-i font-masukan] [-o font-keluaran] [-it tabel-masukan] [-ot tabel-" "keluaran] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Nomor magik di %s buruk\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: berkas psf dengan magik tidak diketahui\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: font masukan tidak memiliki sebuah indeks\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: tidak dapat menemukan berkas videomode %s\n" @@ -1038,22 +1057,22 @@ msgid "Invalid number of lines\n" msgstr "Jumlah dari baris tidak valid\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Mode lama: %dx%d Mode baru: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Lama #scanlines: %d Baru #scanlines: %d Tinggi karakter: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: perintah `%s' gagal\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1061,7 +1080,7 @@ "resizecons: jangan lupa untuk mengubah TERM (mungkin ke con%dx%d atau linux-" "%dx%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1074,41 +1093,41 @@ "atau: resizecons -lines ROWS, dengan ROWS satu dari 25, 28, 30, 34, 36, 40, " "44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: tidak dapat memperoleh ijin I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "penggunaan: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Error membaca %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "tidak dapat membaca %s, dan tidak dapat dump ioctl\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "tidak dapat membaca %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Aneh ... layar baik %dx%d dan %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Error menulis screendump\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1163,12 +1182,12 @@ " -V Tampilkan versi dan keluar.\n" "Berkas yang dilad dari direktori sekarang atau %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: terlalu banyak berkas masukan\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1177,124 +1196,124 @@ "setfont: tidak dapat baik mengembalikan dari karakter ROM dan dari berkas." "Font tidak berubah.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Tinggi karakter buruk %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Lebar karakter buruk %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: posisi font 32 adalah bukan blank\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: disapu\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: background akan kelihatan lucu\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Meload %d-char %dx%d font dari berkas %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Meload %d-char %dx%d font\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Meload %d-char %dx%d (%d) font dari berkas %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Meload %d-char %dx%d (%d) font\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: bug dalam do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Meload tabel peta Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Tidak dapat membuka berkas font %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "Ketika meload beberapa font, semua harus berupa font psf - %s bukan\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Baca %d-char %dx%d font dari berkas %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Ketika meload beberapa font, semua harus memiliki tinggi yang sama\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Ketika meload beberapa fonts, semua harus memiliki lebar yang sama\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Tidak dapat menemukan font baku\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Tidak dapat menemukan font %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Membaca berkas font %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Tidak ada final baris baru dalam kombinasi berkas\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Terlalu banyak berkas untuk dikombinasikan\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, 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" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Ukuran berkas masukan buruk\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1304,24 +1323,24 @@ "dengan menggunakan sebuah pilihan -8 atau -14 atau -16 mana yang anda ingin " "load.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Ditemukan nothing untuk disimpan\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Disimpan %d-char %dx%d font berkas di %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1332,24 +1351,24 @@ " (dimana scancode baik xx atau e0xx, diberikan dalam heksa desimal,\n" " dan keycode diberikan dalam desimal)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "jumlah genap dari argumen diduga" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "error membaca scancode" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "kode diluar jangkauan" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "gagal untuk menset scancode %x ke keycode %d\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1387,14 +1406,14 @@ msgid "off" msgstr "mati" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Error membaca konfigurasi led sekarang. Mungkin stdin bukan sebuah VT?\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1403,44 +1422,44 @@ "Error membaca konfigurasi pilihan sekarang. Mungkin anda tidak berada di " "konsole?\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Error membaca konfigurasi led sekarang dari /dev/kbd.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED tidak tersedia?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Error membaca konfigurasi led sekarang dari /dev/kbd.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED tidak tersedia?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Error mereset mode led\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Pilihan baku sekarang: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Pilihan sekarang: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Led sekarang: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1449,37 +1468,37 @@ "argumen tidak diketahui: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Pilihan baku lama: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Pilihan baku baru: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Pilihan lama: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Pilihan baru: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Led lama: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Led baru: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1496,43 +1515,44 @@ "untuk mengubah konfigurasi dari vt lain.\n" "Konfigurasi sebelum dan sesudah perubahan akan dilaporkan.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "tombol meta menset bit orde tinggi\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Tombol meta memberikan awalan Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Mode aneh untuk tombol Meta?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "Errro membaca konfigurasi sekarang. Mungkin stdin bukan sebuah VT\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "keadaan lama: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "keadaan baru: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "penggunaan: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1542,52 +1562,57 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, fuzzy, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "%s: %s: Peringatan: baris terlalu panjang\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "gagal untuk merestore tabel terjemahan asli\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "gagal untuk mengembalikan unimap asli\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "tidak dapat mengubah tabel terjemahan\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "penggunaan: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1599,22 +1624,22 @@ " -i Jangan tampilkan tabel font, hanya perlihatkan\n" " BARISxKOLOMxJUMLAH dan keluar.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Jumlah karakter: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Lebar font : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Tinggi font : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1623,16 +1648,16 @@ "Menampilkan %d-char font\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?TIDAK DIKETAHUI?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "kb mode adalah %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1641,13 +1666,13 @@ "[ jika anda mencoba ini dibawah X, ini mungkin tidak bekerja\n" "karena X server juga membaca /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "menangkap sinyal %d, membersihkan...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1659,6 +1684,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkeys versi %s\n" "\n" @@ -1671,7 +1697,7 @@ "\t-s --scancodes\ttampilkan hanya raw scan-codes\n" "\t-k --keycodes\ttampilkan hanya interpretasi keycodes (baku)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1682,49 +1708,49 @@ "Tekan tombol apapun - Ctrl-D akan mengakhiri aplikasi ini\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, 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" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "lepas" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "tekan" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "keycode %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 #, fuzzy msgid "usage: totextmode\n" msgstr "penggunaan: getkeycodes\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1758,12 +1784,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, fuzzy, c-format msgid "The entire console display cannot be locked.\n" msgstr "%s: VT 1 adalah konsole dan tidak dapat didealokasikan\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/it.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/it.gmo differ diff -Nru kbd-2.0.3/po/it.po kbd-2.0.4/po/it.po --- kbd-2.0.3/po/it.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/it.po 2017-01-08 18:38:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kbd-1.15.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2011-06-13 00:36+0200\n" "Last-Translator: Sergio Zanchetta \n" "Language-Team: Italian \n" @@ -15,40 +15,52 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural= (n != 1)\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "uso: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "" +"Impossibile ottenere un descrittore di file che si riferisca alla console" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: opzione sconosciuta\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: numero di terminale virtuale non consentito\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: il terminale virtuale 1 è la console e non può essere deallocata\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s: impossibile deallocare la console %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys versione %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -57,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -83,7 +96,7 @@ "\t --compose-only Visualizza solo le combinazioni del tasto compose\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -92,18 +105,25 @@ "\t\t\t Interpreta i codici azione per i caratteri come derivanti dal\n" "\t\t\t set di caratteri specificato\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "" "set di caratteri %s sconosciuto - richiesta del set di caratteri ignorata\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: errore nella lettura della modalità di tastiera\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -114,7 +134,7 @@ "(valore numerico, simbolo)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -138,45 +158,45 @@ "\t-n --next-available Mostra il numero di terminale virtuale non allocato " "successivo\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Impossibile leggere il n. del terminale virtuale (VTNO): " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Impossibile aprire %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "uso: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Codici di scansione xx in chiaro (hex) contro codici di tasto (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "" "0 è un errore; per 1-88 (0x01-0x58) il codice di scansione è uguale al " "codice di tasto\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "" "per 1-%d (0x01-0x%02x) il codice di scansione è uguale al codice di tasto\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -187,13 +207,13 @@ "\n" "Codici di scansione per sequenze di escape e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "recupero del codice di tasto per il codice di scansione 0x%x non riuscito\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -202,95 +222,98 @@ "Uso:\n" "\t%s [-s] [-C console]\n" -#: src/kbdinfo.c:18 -#, c-format +#: src/kbdinfo.c:21 +#, fuzzy, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\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 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Errore: argomenti non sufficienti.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" "Errore, azione non riconosciuta: %s\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "uso: kbd_mode [-a|-u|-k|-s] [-C device]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "La tastiera si trova in modalità raw (codice di scansione)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "La tastiera si trova in modalità mediumraw (codice di tasto)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "La tastiera si trova in modalità predefinita (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "La tastiera si trova in modalità Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "La tastiera si trova in qualche modalità sconosciuta\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "\"Typematic Rate\" impostato a %.1f cps (ritardo = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Uso: kbdrate [-V] [-s] [-r frequenza] [-d ritardo]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Impossibile aprire /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "bug: chiamata a getfont con contatore<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "bug: getfont usa GIO_FONT e necessita del buffer\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: memoria esaurita\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "strano... ct è cambiato da %d a %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -299,172 +322,172 @@ "Sembra che questo kernel sia antecedente al 1.1.92\n" "Nessuna tabella di mappatura Unicode caricata.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: memoria esaurita\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Errore nella scrittura della mappa sul file\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "impossibile: forse non è meta\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "errore di KDGKBENT all'indice %d nella tabella %d\n" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, fuzzy, c-format msgid "unable to get keymap %d" msgstr "deallocazione della mappatura %d\n" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "associazione del tasto %d al valore %d non riuscita\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, fuzzy, c-format msgid "lk_add_key called with bad keycode %d" msgstr "addkey chiamata con codice di tasto %d errato" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "l'aggiunta della mappa %d vìola la riga delle mappature esplicite" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "associazione del tasto %d al valore %d non riuscita\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 #, fuzzy msgid "impossible error in lk_add_constants" msgstr "errore impossibile in do_constant" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "si assume iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "si assume iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "si assume iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "si assume iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "si assume iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "simbolo di tasto \"%s\" sconosciuto\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "%s: impossibile passare alla modalità Unicode\n" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, fuzzy, c-format msgid "Keymap %d: Permission denied" msgstr "Mappatura %d: permesso negato\n" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "codice tasto %d, tabella %d = %d%s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " ERRORE" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "associazione del tasto %d al valore %d non riuscita\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, fuzzy, c-format msgid "deallocate keymap %d" msgstr "deallocazione della mappatura %d\n" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s: impossibile deallocare la mappatura %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, fuzzy, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "%s: impossibile deallocare o cancellare la mappatura\n" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, fuzzy, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "%s: impossibile ripristinare la modalità originaria della tastiera\n" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, fuzzy, c-format msgid "failed to bind string '%s' to function %s" msgstr "associazione della stringa \"%s\" alla funzione %s non riuscita\n" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, fuzzy, c-format msgid "failed to clear string %s" msgstr "cancellazione della stringa %s non riuscita\n" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "troppe definizioni compose\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -475,7 +498,7 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, fuzzy, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -486,59 +509,59 @@ "\n" "Cambiato %d %s e %d %s.\n" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "troppe definizioni compose\n" msgstr[1] "troppe definizioni compose\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "(Nessuna modifica nelle definizioni compose.)\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "intervallo dei codici di tasto supportati dal kernel: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "massimo numero di azioni associabili a un tasto: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "numero di mappature realmente usate: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "di cui %d allocate dinamicamente\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "intervallo dei codici di azione supportati dal kernel:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "numero di tasti funzione supportati dal kernel: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "n. massimo di definizioni compose: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "n. di definizioni compose effettive usate: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -549,12 +572,12 @@ "Sono riconosciuti i seguenti sinonimi:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s per %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -563,7 +586,7 @@ "\n" "Nomi dei modificatori rilevati e relativi numeri di colonna:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -585,6 +608,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys versione %s\n" "\n" @@ -605,17 +629,17 @@ " -u --unicode Forza la conversione a Unicode\n" " -v --verbose Riporta le modifiche\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s da %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: le opzioni --unicode e --ascii sono mutuamente esclusive\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -624,7 +648,7 @@ "%s: attenzione, caricata una mappatura non Unicode su una console Unicode\n" " (forse si vuole eseguire \"kbd_mode -a\")\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -633,17 +657,17 @@ "%s: attenzione, caricata una mappatura Unicode su una console non Unicode\n" " (forse si vuole eseguire \"kbd_mode -u\")\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Impossibile trovare %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "impossibile aprire il file %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -652,30 +676,30 @@ "Uso:\n" "\t%s [-C console] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Riga di input errata: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, 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" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: fine dell'intervallo errata (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -684,22 +708,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: spazzatura a fine riga (%s) ignorata\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Caricamento della mappa Unicode dal file %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: attenzione: riga troppo lunga\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -708,80 +732,80 @@ "%s: mappa Unimap vuota non caricata\n" "(se si insiste: usare l'opzione -f per sovrascrivere)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "voce" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "voci" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Mappa Unimap salvata su \"%s\"\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Mappa Unimap accodata\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "uso: %s [-v] [-o map.orig] file-mappa\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: impossibile aprire il file di mappa _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Impossibile fare stat del file di mappa" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Caricamento della mappa schermo binaria direct-to-font dal file %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Errore nella lettura della mappa dal file \"%s\"\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Caricamento della mappa schermo binaria Unicode dal file %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Caricamento della mappa schermo simbolica dal file %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Errore nell'analisi della mappa simbolica da \"%s\", riga %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Errore nella scrittura della mappa sul file\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Impossibile leggere la mappa della console\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Mappa schermo salvata in \"%s\"\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, fuzzy, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -818,180 +842,175 @@ " -h, --help Mostra un breve messaggio di aiuto.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Impossibile trovare il proprietario del tty corrente." -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: numero di terminale virtuale non consentito" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Solo root può usare l'opzione -u." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "" -"Impossibile ottenere un descrittore di file che si riferisca alla console" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Impossibile trovare un terminale virtuale libero" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" "Impossibile verificare se il terminale virtuale %d sia libero; usare \"%s -f" "\" per forzarlo." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" "Il terminale virtuale %d è in uso, comando interrotto; usare \"%s -f\" per " "forzarlo." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Impossibile trovare il comando." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Impossibile impostare una nuova sessione" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Impossibile aprire %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Viene usato il terminale virtuale %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Impossibile aprire %s in lettura/scrittura" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Impossibile attivare il terminale virtuale %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Forse l'attivazione è stata interrotta" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Impossibile deallocare la console %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: tabella Unicode UCS-2 corta\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: tabella Unicode UTF-8 corta\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: UTF-8 errata\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: errore UTF-8 sconosciuto\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: tabella Unicode corta\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: errore nella lettura del carattere di input" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: chiamata a readpsffont errata\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: modo file psf non supportato (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: versione psf non supportata (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: forse la lunghezza del tipo di carattere in input è zero\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: forse la dimensione del carattere in input è zero\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: file di input: lunghezza in input errata (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: file di input: spazzatura alla fine della riga\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: carattere Unicode %u non consentito\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Impossibile scrivere l'intestazione del file di carattere" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Impossibile scrivere il file di carattere" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: attenzione: riga troppo lunga\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: riga di input errata: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Numero di glifo (0x%lx) dopo la fine del carattere\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: fine dell'intervallo errata (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -1000,7 +1019,7 @@ "%s: in corrispondenza di un intervallo di posizioni carattere dovrebbe " "esserci un intervallo Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1009,7 +1028,7 @@ "Uso:\n" "\t%s caratterein tabellain carattereout\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1018,7 +1037,7 @@ "Uso:\n" "\t%s caratterein [tabellaout]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1027,7 +1046,7 @@ "Uso:\n" "\t%s caratterein carattereout\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1037,22 +1056,22 @@ "\t%s [-i caratterein] [-o carattereout] [-it tabellain] [-ot tabellaout] [-" "nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: numero magico errato su %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: file psf con numero magico sconosciuto\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: il carattere di input non ha un indice\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: impossibile trovare il file delle modalità video %s\n" @@ -1061,22 +1080,22 @@ msgid "Invalid number of lines\n" msgstr "Numero di righe non valido\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Vecchia modalità: %dx%d Nuova modalità: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Vecchie #scanlines: %d Nuove #scanlines: %d Altezza carattere: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: comando \"%s\" non riuscito\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1084,7 +1103,7 @@ "resizecons: non dimenticarsi di cambiare TERM (forse in con%dx%d o linux-%dx" "%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1097,41 +1116,41 @@ "o: resizecons -lines RIGHE, con RIGHE uno tra 25, 28, 30, 34, 36, 40, 44, " "50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: impossibile ottenere i permessi di I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "uso: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Errore nel leggere %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "impossibile leggere %s ed effettuare l'ioctl di dump\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "impossibile leggere %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Strano ... lo schermo è sia %dx%d che %dx%d \n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Errore in scrittura di screendump\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1189,12 +1208,12 @@ " -V Stampa la versione ed esce.\n" "I file sono caricati dalla directory corrente o da %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: troppi file di input\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1203,129 +1222,129 @@ "setfont: impossibile ripristinare sia dalla ROM caratteri che dal file. " "Carattere non modificato.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Altezza errata del carattere %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Larghezza errata del carattere %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: la posizione carattere 32 non rappresenta uno spazio\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: pulito\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: lo sfondo sarà strano\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Caricamento del tipo di carattere %d-char %dx%d dal file %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Caricamento del tipo di carattere %d-char %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Caricamento del tipo di carattere %d-char %dx%d (%d) dal file %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Caricamento del tipo di carattere %d-char %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: bug in do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Caricamento della tabella di mappatura Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Impossibile aprire il file di carattere %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Lettura del tipo di carattere %d-char %dx%d dal file %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, 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" -#: src/setfont.c:448 +#: src/setfont.c:456 #, 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" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Impossibile trovare il tipo di carattere predefinito\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Impossibile trovare il tipo di carattere %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Lettura del file di carattere %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Nessun carattere newline finale nel file da unire\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Troppi file da unire\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, 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" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Dimensione errata del file di input\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1334,24 +1353,24 @@ "Questo file contiene 3 tipi di carattere: 8x8, 8x14 e 8x16. Indicare,\n" "usando l'opzione -8, -14 o -16, quale si desidera caricare.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Non è stato trovato nulla da salvare\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "File del carattere di tipo %d-char %dx%d salvato su %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1362,25 +1381,25 @@ " (dove codicescansione è o xx oppure e0xx, fornito in esadecimale,\n" " e codicetasto è fornito in decimale)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "atteso un numero pari di argomenti" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "errore nella lettura del codice di scansione" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "codice fuori dai limiti" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "" "impostazione del codice di scansione %x al codice di tasto %d non riuscita\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1419,7 +1438,7 @@ msgid "off" msgstr "spento" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1427,7 +1446,7 @@ "Errore nella lettura dell'impostazione corrente del led. Forse lo standard " "input non è un terminale virtuale.\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1436,44 +1455,44 @@ "Errore nella lettura dell'impostazione corrente dei flag. Forse non ci si " "trova su una console.\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Errore nella lettura dell'impostazione corrente del led da /dev/kbd.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "Forse KIOCGLED non è disponibile.\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Errore nella lettura dell'impostazione corrente del led da /dev/kbd.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "Forse KIOCSLED non è disponibile.\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Errore nella reimpostazione di ledmode\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Flag predefiniti correnti: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Flag correnti: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Led correnti: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1482,37 +1501,37 @@ "argomento non riconosciuto: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Vecchi flag predefiniti: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nuovi flag predefiniti: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Vecchi flag: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nuovi flag: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Led vecchi: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Led nuovi: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1529,19 +1548,19 @@ "per modificare le impostazioni di un altro terminale virtuale.\n" "Sono riportate le impostazioni precedenti e successive alle modifiche.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Il tasto Meta imposta il bit di ordine superiore\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Il tasto Meta fornisce il prefisso Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Modalità inusuale per il tasto Meta\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" @@ -1549,25 +1568,26 @@ "Errore nella lettura delle impostazioni correnti. Forse lo stdin non è un " "terminale virtuale.\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "stato vecchio: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "stato nuovo: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "uso: %s\n" -#: src/setvtrgb.c:42 -#, c-format +#: src/setvtrgb.c:44 +#, fuzzy, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1577,6 +1597,10 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" "Uso: %s vga|FILE|-\n" "\n" @@ -1589,50 +1613,51 @@ "e quindi modificare i valori nel FILE.\n" "\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Errore: %s, valore non valido nel campo %u riga %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Errore: %s, numero insufficiente di campi nella riga %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Errore: %s, la riga %u è terminata in modo inatteso.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Errore: %s, la riga %u è troppo lunga.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "ripristino della tabella di traduzione originale non riuscito\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "ripristino unimap originale non riuscito\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "impossibile cambiare la tabella di traduzione\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "uso: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1646,22 +1671,22 @@ " -i Non stampa la tabella caratteri, mostra solo\n" " RIGHExCOLONNExCONTATORE ed esce.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Contatore carattere: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Larghezza carattere: %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Altezza carattere : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1670,16 +1695,16 @@ "Tipo di carattere %d-char\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?SCONOSCIUTO?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "la modalità della tastiera era %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1688,13 +1713,13 @@ "[ Se questo tentativo viene effettuato usando X potrebbe non\n" "funzionare, dato che anche il server X sta leggendo /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "catturato segnale %d, pulizia...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1706,6 +1731,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey versione %s\n" "\n" @@ -1718,7 +1744,7 @@ "\t-s --scancodes\tMostra solo i codici di scansione raw\n" "\t-k --keycodes\tMostra solo i codici di tasto interpretati (predefinito)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1729,48 +1755,48 @@ "Premere un tasto - Ctrl-D terminerà questo programma\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, 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" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "rilasciato" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "premuto" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "codice tasto %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "uso: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1804,12 +1830,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, fuzzy, c-format msgid "The entire console display cannot be locked.\n" msgstr "%s: il terminale virtuale 1 è la console e non può essere deallocata\n" diff -Nru kbd-2.0.3/po/kbd.pot kbd-2.0.4/po/kbd.pot --- kbd-2.0.3/po/kbd.pot 2015-06-30 20:46:20.000000000 +0000 +++ kbd-2.0.4/po/kbd.pot 2017-01-08 18:37:56.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,45 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -56,34 +66,42 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" "\t\t\t specified character set\n" msgstr "" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -91,7 +109,7 @@ "\n" msgstr "" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -105,41 +123,41 @@ "\t-n --next-available display number of next unallocated VT\n" msgstr "" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "" -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -147,269 +165,272 @@ "Escaped scancodes e0 xx (hex)\n" msgstr "" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" "\t%s [-s] [-C console]\n" msgstr "" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr "" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -420,65 +441,65 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -486,19 +507,19 @@ "\n" msgstr "" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" "Recognized modifier names and their column numbers:\n" msgstr "" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -520,172 +541,173 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" msgstr "" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, 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 "" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" "(if you insist: use option -f to override)\n" msgstr "" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -706,225 +728,221 @@ "\n" msgstr "" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "" -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "" -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " "range\n" msgstr "" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" "\t%s infont intable outfont\n" msgstr "" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" "\t%s infont [outtable]\n" msgstr "" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" "\t%s infont outfont\n" msgstr "" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" msgstr "" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "" @@ -933,28 +951,28 @@ msgid "Invalid number of lines\n" msgstr "" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" msgstr "" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -963,41 +981,41 @@ "60\n" msgstr "" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1026,156 +1044,156 @@ "Files are loaded from the current directory or %s/*/.\n" msgstr "" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " "unchanged.\n" msgstr "" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" "using an option -8 or -14 or -16 which one you want loaded.\n" msgstr "" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1183,24 +1201,24 @@ " and keycode is given in decimal)\n" msgstr "" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1225,90 +1243,90 @@ msgid "off" msgstr "" -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" msgstr "" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "" -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "" -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "" -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" "\n" msgstr "" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "" -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "" -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "" -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "" -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "" -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "" -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1319,42 +1337,43 @@ "The setting before and after the change are reported.\n" msgstr "" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "" -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "" -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1364,41 +1383,45 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1406,56 +1429,57 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" "\n" msgstr "" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" "since the X server is also reading /dev/console ]\n" msgstr "" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1468,9 +1492,10 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1478,46 +1503,46 @@ "\n" msgstr "" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1548,12 +1573,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/nl.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/nl.gmo differ diff -Nru kbd-2.0.3/po/nl.po kbd-2.0.4/po/nl.po --- kbd-2.0.3/po/nl.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/nl.po 2017-01-08 18:38:45.000000000 +0000 @@ -3,53 +3,64 @@ # # "We strive to retain action in ditches already dug." # -# Benno Schulenberg , 2005, 2007, 2008, 2010, 2011, 2012, 2014, 2015. +# Benno Schulenberg , 2005, 2007, 2008, 2010, 2011, 2012, 2014, 2015, 2017. # Erwin Poeze , 2009. # Elros Cyriatan , 2003, 2004. msgid "" msgstr "" -"Project-Id-Version: kbd-2.0.3-rc1\n" +"Project-Id-Version: kbd-2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2015-07-01 20:52+0200\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2017-01-07 15:02+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.0\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "Gebruik: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Kan geen bestandsdescriptor verkrijgen die verwijst naar de console" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: onbekende optie\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "ongeldig VT-nummer: 0\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "VT-1 is de hoofdconsole en kan niet worden vrijgegeven\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "kan console %d niet vrijgeven: ioctl(VT_DISALLOCATE)" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys, versie %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -59,13 +70,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -86,7 +98,7 @@ " --compose-only alleen de samenstellingstoetscombinaties tonen\n" " -c, --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -94,17 +106,26 @@ msgstr "" " tekenactiecodes via deze tekenset interpreteren\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +" -v, --verbose uitgebreidere uitvoer produceren\n" +" -V, --version programmaversie tonen\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "onbekende tekenset '%s' -- tekensetverzoek wordt genegeerd\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: fout tijdens lezen van toetsenbordmodus: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -116,7 +137,7 @@ "(waarde, symbool)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -135,46 +156,47 @@ "\n" " Geldige opties zijn:\n" "\n" -" -h, --help deze hulptekst tonen\n" " -n, --next-available nummer van eerste ongebruikte VT tonen\n" +"\n" +" -h, --help deze hulptekst tonen\n" " -V, --version programmaversie tonen\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Kan VT-nummer niet lezen: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Kan %s niet openen\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "Gebruik: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Ruwe scancodes xx (hex) tegenover toetscodes (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "voor 1-%d (0x01-0x%02x) is de scancode gelijk aan de toetscode\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -185,107 +207,115 @@ "\n" "Geëscapede scancodes e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "opvragen van toetscode voor scancode 0x%x is mislukt: ioctl(KDGETKEYCODE)" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" "\t%s [-s] [-C console]\n" msgstr "Gebruik: %s [-s] [-C console]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Gebruik: %1$s [-C APPARAAT] getmode [text|graphics]\n" " of: %1$s [-C APPARAAT] gkbmode [raw|xlate|mediumraw|unicode]\n" " of: %1$s [-C APPARAAT] gkbmeta [metabit|escprefix]\n" " of: %1$s [-C APPARAAT] gkbled [scrolllock|numlock|capslock]\n" +"\n" +"Andere opties:\n" +" -h deze hulptekst tonen\n" +" -V programmaversie tonen\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Fout: te weinig argumenten.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Fout: onbekende actie: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "Gebruik: kbd_mode [-a|-u|-k|-s] [-C apparaat]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Het toetsenbord is in ruwe (scancode-)modus\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Het toetsenbord is in halfbakken (toetscode-)modus\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Het toetsenbord is in de standaard modus (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Het toetsenbord is in Unicode-modus (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Het toetsenbord is in een onbekende modus\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, 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" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Gebruik: kbdrate [-V] [-s] [-r frequentie] [-d vertraging]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "" +"Gebruik: kbdrate [-V|--version] [-s] [-r frequentie] [-d vertraging]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Kan /dev/port niet openen" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "*interne programmafout*: getfont() is aangeroepen met count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "*interne programmafout*: getfont() met GIO_FONT heeft buffer nodig\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: onvoldoende geheugen beschikbaar\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "Vreemd... huidige terminal veranderde van %d naar %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -294,169 +324,169 @@ "Deze kernel schijnt ouder te zijn dan versie 1.1.92.\n" "Er is geen Unicode-afbeeldingstabel geladen.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "onvoldoende geheugen beschikbaar" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "kan array niet initialiseren: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Fout tijdens schrijven van toetsenkaart naar bestand" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "onmogelijk: niet meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: fout op positie %d in tabel %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: kan geen functietoets-tekenreeks verkrijgen" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: kan geen accententabel verkrijgen" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "kan toetsenkaart %d niet verkrijgen" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "kan toets %d niet uitschakelen voor tabel %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key() is aangeroepen met onjuiste toetscode %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "toevoegen van kaart %d schendt expliciete toetsenkaartregel" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "kan toets %d niet instellen voor tabel %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "onmogelijke fout in lk_add_constants()" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "kan symbool niet verkrijgen wegens onjuist type: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "kan symbool van type %d niet verkrijgen wegens onjuiste index: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "iso-8859-1 '%s' wordt aangenomen" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "iso-8859-15 '%s' wordt aangenomen" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "iso-8859-2 '%s' wordt aangenomen" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "iso-8859-3 '%s' wordt aangenomen" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "iso-8859-4 '%s' wordt aangenomen" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "onbekende toetsnaam '%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: kan niet overschakelen naar Unicode-modus" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Toetsenkaart %d: toegang geweigerd" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "toetscode %d, tabel %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " Mislukt" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "verbinden van toets %d met waarde %d is mislukt" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "vrijgeven van toetsenkaart %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: kan toetsenkaart %d niet vrijgeven" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: kan toetsenkaart niet vrijgeven of wissen" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" "KDSKBMODE: %s: kan niet terugkeren naar oorspronkelijke toetsenbordmodus" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "verbinden van tekenreeks '%s' met functie %s is mislukt" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "wissen van tekenreeks %s is mislukt" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "te veel samenstellingsdefinities" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -471,65 +501,65 @@ "\n" "Er zijn %d toetsen veranderd." -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "Er is %d tekenreeks veranderd." msgstr[1] "Er zijn %d tekenreeksen veranderd." -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "Er is %d samenstellingsdefinitie geladen." msgstr[1] "Er zijn %d samenstellingsdefinities geladen." -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Geen verandering in samenstellingsdefinities.)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "door kernel ondersteund toetscodebereik: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "maximum aantal acties verbindbaar met een toets: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "aantal gebruikte toetsenbordkaarten: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr " (waarvan %u dynamisch zijn toegewezen)\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "door kernel ondersteunde actiecodebereiken:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "door kernel ondersteund aantal functietoetsen: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "maximum aantal samenstellingsdefinities: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "aantal gebruikte samenstellingsdefinities: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -540,12 +570,12 @@ "De volgende synoniemen worden herkend:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s voor %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -555,7 +585,7 @@ "Herkende optietoetsnamen en hun kolomnummers:\n" "\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -577,6 +607,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys, versie %s\n" "\n" @@ -590,25 +621,27 @@ " -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" " -p, --parse toetsenkaart ontleden zonder actie te ondernemen\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" +"\n" +" -h, --help deze hulptekst tonen\n" +" -V, --version programmaversie tonen\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s (uit %s)\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: de opties '--unicode' en '--ascii' gaan niet samen\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -618,7 +651,7 @@ "terminal\n" " (wilt u misschien 'kbd_mode -a' doen?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -628,46 +661,46 @@ "terminal\n" " (wilt u misschien 'kbd_mode -u' doen?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Kan %s niet vinden\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "Kan bestand %s niet openen\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "Gebruik: %s [-C console] [-o toetsenkaart.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Ongeldige invoerregel: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Glyph-getal (0x%x) is groter dan lengte van lettertype\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Ongeldig einde van bereik (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -676,22 +709,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: rommel (%s) aan het einde is genegeerd\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Laden van Unicodekaart uit bestand %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Waarschuwing: regel is te lang\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -700,80 +733,80 @@ "%s: lege Unicodekaart wordt niet geladen\n" "(als u dit toch wilt, gebruik dan optie '-f')\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "item" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "items" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Unicodekaart is opgeslagen in '%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Unicodekaart is achteraan toegevoegd\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "Gebruik: %s [-v] [-o kaart.orig] kaartbestand\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "Gebruik: %s [-V] [-v] [-o kaart.orig] kaartbestand\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: kan kaartbestand '%s' niet openen\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Kan status van kaartbestand niet opvragen" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Laden van binaire direct-naar-lettertype-schermkaart uit bestand %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Fout tijdens lezen van kaart uit bestand '%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Laden van binaire Unicode-schermkaart uit bestand %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Laden van symbolische schermkaart uit bestand %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Fout tijdens verwerken van symbolische kaart uit '%s', regel %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Fout tijdens schrijven van toetsenkaart naar bestand\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Kan consolekaart niet lezen\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Schermkaart is opgeslagen in '%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -795,194 +828,191 @@ msgstr "" "Gebruik: %s [OPTIE...] -- OPDRACHT\n" "\n" -"Start programma OPDRACHT op een nieuwe virtuele terminal (VT).\n" +"Start het 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" -" -s, --switch naar de nieuwe VT overschakelen;\n" -" -w, --wait wachten tot de gegeven opdracht beëindigd is;\n" -" -v, --verbose een bericht tonen voor elke uitgevoerde actie;\n" -" -V, --version de programmaversie tonen en stoppen;\n" -" -h, --help deze hulptekst tonen en stoppen.\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" +" -s, --switch naar de nieuwe VT overschakelen\n" +" -w, --wait wachten tot de gegeven opdracht beëindigd is\n" +" -v, --verbose een bericht tonen voor elke uitgevoerde actie\n" +"\n" +" -h, --help deze hulptekst tonen en stoppen\n" +" -V, --version de programmaversie tonen en stoppen\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Kan eigenaar van huidige tty niet vinden!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: ongeldig VT-nummer" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Alleen root kan de optie '-u' gebruiken." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Kan geen bestandsdescriptor verkrijgen die verwijst naar de console" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "kan geen vrije VT vinden" -#: src/openvt.c:267 +#: src/openvt.c:269 #, 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" -#: src/openvt.c:271 +#: src/openvt.c:273 #, 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" -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Kan gegeven opdracht niet vinden." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Kan geen nieuwe sessie instellen" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "VT-%s wordt gebruikt" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Kan %s niet openen voor lezen-en-schrijven" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Kan VT %d niet activeren" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Activatie onderbroken?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Kan console %d niet vrijgeven" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: korte ucs2-Unicodetabel\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: korte utf8-Unicodetabel\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: ongeldige utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: onbekende utf8-fout\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: korte Unicodetabel\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Fout tijdens lezen van invoerlettertype" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Ongeldige aanroep van 'readpsffont'\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Niet-ondersteunde psf-bestandsmodus (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Niet-ondersteunde psf-versie (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: invoerlettertype met lengte nul?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: invoertekengrootte is nul?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Invoerbestand: ongeldige invoerlengte (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Invoerbestand: rommel aan het einde\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: ongeldige Unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Kan kop van lettertypebestand niet schrijven" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Kan lettertypebestand niet schrijven" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Waarschuwing: regel is te lang\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Ongeldige invoerregel: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Glyph-getal (0x%lx) na einde van lettertype\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Ongeldig einde van bereik (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -991,28 +1021,28 @@ "%s: Met het bereik van lettertype-posities dient een Unicodebereik te " "corresponderen\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" "\t%s infont intable outfont\n" msgstr "Gebruik: %s invoerlettertype invoertabel uitvoerlettertype\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" "\t%s infont [outtable]\n" msgstr "Gebruik: %s invoerlettertype [uitvoertabel]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" "\t%s infont outfont\n" msgstr "Gebruik: %s invoerlettertype uitvoerlettertype\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1021,22 +1051,22 @@ "Gebruik: %s [-i invoerlettertype] [-o uitvoerlettertype]\n" " [-it invoertabel] [-ot uitvoertabel] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Ongeldig magisch nummer op %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: psf-bestand met onbekend magisch nummer\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: invoerlettertype heeft geen index\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: kan videomodusbestand %s niet vinden\n" @@ -1045,23 +1075,23 @@ msgid "Invalid number of lines\n" msgstr "Ongeldig aantal regels\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Oude modus: %dx%d Nieuwe modus: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, 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" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: de opdracht '%s' is mislukt\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1069,7 +1099,7 @@ "resizecons: vergeet niet TERM te veranderen (mogelijk naar con%dx%d of linux-" "%dx%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1082,41 +1112,41 @@ " of: resizecons -lines RIJEN\n" " (met RIJEN één van 25, 28, 30, 34, 36, 40, 44, 50, 60)\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: kan in-/uitvoer-toegangsrechten niet opvragen\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "Gebruik: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "Fout bij lezen van %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "kan %s niet lezen, en ioctl() voor meer informatie is mislukt\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "kan %s niet lezen\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Vreemd... het scherm is zowel in %dx%d als in %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Fout bij schrijven van schermafdruk\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1179,12 +1209,12 @@ "\n" "Bestanden worden geladen uit de huidige map of uit %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: te veel invoerbestanden\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1193,130 +1223,130 @@ "setfont: kan niet herstellen uit zowel teken-ROM als bestand -- lettertype " "is onveranderd\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Ongeldige tekenhoogte %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Ongeldige tekenbreedte %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: lettertype-positie 32 is niet blanco\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: gewist\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: achtergrond zal er raar uitzien\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Laden van %d-teken %dx%d-lettertype uit bestand %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Laden van %d-teken %dx%d-lettertype\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Laden van %d-teken %dx%d (%d) lettertype uit bestand %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Laden van %d-teken %dx%d (%d) lettertype\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: *interne programmafout* in 'do_loadtable'\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Laden van Unicode-afbeeldingstabel...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Kan lettertypebestand %s niet openen\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Het %d-tekens %dx%d lettertype is gelezen uit bestand %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, 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" -#: src/setfont.c:448 +#: src/setfont.c:456 #, 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" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Kan standaardlettertype niet vinden\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Kan lettertype %s niet vinden\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Lezen van lettertypebestand %s...\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Geen afsluitend regeleinde in combinatiebestand\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Te veel bestanden om te combineren\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, 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" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Ongeldige grootte van invoerbestand\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1325,23 +1355,23 @@ "Dit bestand bevat drie lettertypen: 8x8, 8x14 en 8x16.\n" "Geef met optie '-8', '-14' of '-16' aan welke u wilt laden.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Niets gevonden om op te slaan\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Het %d-tekens %dx%d lettertypebestand is opgeslagen als %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1352,25 +1382,25 @@ " (SCANCODE is hexadecimaal, te geven als xx of e0xx)\n" " (TOETSCODE is decimaal)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "een even aantal argumenten wordt verwacht" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "fout tijdens lezen van scancode" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "code ligt buiten bereik" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "" "verbinden van scancode %x aan toetscode %d is mislukt: ioctl(KDSETKEYCODE)" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1409,14 +1439,14 @@ msgid "off" msgstr "uit" -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Fout tijdens lezen van huidige led-instelling: ioctl (KDGETLED).\n" "Mogelijk is standaardinvoer geen VT?" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" @@ -1424,44 +1454,44 @@ "Fout tijdens lezen van huidige instelling: ioctl(KDGKBLED).\n" "Mogelijk werkt u niet op de console?" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "" "Fout tijdens lezen van huidige led-instelling uit /dev/kbd: ioctl(KIOCGLED)" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED is onbeschikbaar?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "" "Fout tijdens lezen van huidige led-instelling uit /dev/kbd: ioctl(KIOCSLED)" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED is onbeschikbaar?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Fout tijdens opnieuw instellen van led-modus.\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Huidige standaardopties: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Huidige opties: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Huidige leds: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1470,37 +1500,37 @@ "onbekend argument: '%s'\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Oude standaardopties: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nieuwe standaardopties: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Oude opties: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nieuwe opties: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Oude leds: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Nieuwe leds: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1516,44 +1546,45 @@ " 'setmetamode [arg] < /dev/ttyn' om de instelling van een andere VT te\n" " veranderen. De instelling voor en na de verandering wordt gerapporteerd.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Metatoets zet het hoogste bit\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Metatoets geeft Esc-voorvoegsel\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Vreemde modus voor Metatoets?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Fout tijdens lezen van huidige instelling: ioctl(KDGKBMETA).\n" "Mogelijk is standaardinvoer geen VT?" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "oude status: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "nieuwe status: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "Gebruik: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1563,8 +1594,13 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" "Gebruik: %s vga|BESTAND|-\n" +" of: %s [-h] [-V]\n" "\n" "Als u BESTAND als argument geeft, dan moet dit BESTAND precies drie regels\n" "van kommagescheiden decimale waarden voor rood, groen en blauw bevatten.\n" @@ -1573,40 +1609,44 @@ " cat /sys/module/vt/parameters/default_{red,grn,blu} > BESTAND\n" "waarna u de waarden in dit BESTAND bewerkt.\n" "\n" +"Opties:\n" +" -h deze hulptekst tonen\n" +" -V programmaversie tonen\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Fout: %s: ongeldige waarde in veld %u op regel %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Fout: %s: onvoldoende velden op regel %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Fout: %s: regel %u eindigde onverwacht.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Fout: %s: regel %u is te lang.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "herstellen van originele vertaaltabel is mislukt\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "herstellen van originele Unicodekaart is mislukt\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "kan vertaaltabel niet wijzigen\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1614,10 +1654,11 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "Gebruik: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1625,43 +1666,45 @@ "\n" " Geldige opties zijn:\n" "\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" +" -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" +" -V, --version programmaversie tonen en stoppen\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Aantal tekens: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Letterbreedte: %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Letterhoogte: %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" "\n" msgstr "Weergave van lettertype met %d tekens:\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?ONBEKEND?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "toetsenbordmodus was %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1670,12 +1713,12 @@ "[ als u dit onder X probeert, werkt het mogelijk niet,\n" " omdat de X server ook /dev/console leest ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "signaal %d ontvangen; bezig met opschonen...\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1688,6 +1731,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey, versie %s\n" "\n" @@ -1695,14 +1739,16 @@ "\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" +"\n" +" -h, --help deze hulptekst tonen\n" +" -V, --version programmaversie tonen\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1713,31 +1759,31 @@ "Druk op allerlei toetsen... (Ctrl-D beëindigt dit programma)\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "Druk op allerlei toetsen...\n" "(het programma stopt tien seconden na de laatste toetsaanslag)\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "losgelaten" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "ingedrukt" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "toetscode %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "Gebruik: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1747,17 +1793,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, 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:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "Het %s is nu vergrendeld door %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" "Gebruik Alt+functietoetsen om naar andere virtuele consoles over te " @@ -1793,8 +1839,9 @@ " -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" +"\n" " -h, --help deze hulptekst tonen en stoppen\n" +" -v, --version programmaversie tonen en stoppen\n" #: src/vlock/username.c:57 msgid "unrecognized user" @@ -1804,12 +1851,12 @@ msgid "stdin is not a tty" msgstr "standaardinvoer is geen terminal" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, 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 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Het gehele console-scherm kan niet vergrendeld worden.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/pl.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/pl.gmo differ diff -Nru kbd-2.0.3/po/pl.po kbd-2.0.4/po/pl.po --- kbd-2.0.3/po/pl.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/pl.po 2017-01-08 18:38:45.000000000 +0000 @@ -1,51 +1,62 @@ # Polish translations for kbd. # This file is distributed under the same license as the kbd package. -# Jakub Bogusz , 2002-2015. +# Jakub Bogusz , 2002-2016. # msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.3-rc1\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2015-07-02 16:29+0200\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-28 16:31+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "składnia: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Nie udało się uzyskać deskryptora pliku wskazującego na konsolę" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: nieznana opcja\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "0: błędny numer VT\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "VT 1 jest konsolą i nie może być zwolniony\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "nie można zwolnić konsoli %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys wersja %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -55,13 +66,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -71,17 +83,18 @@ "\n" "\t-h --help\t wyświetlenie tego opisu\n" "\t-i --short-info\t wyświetlenie informacji o sterowniku klawiatury\n" -"\t-l --long-info\t wyświetlenie powyższego i symboli znanych loadkeys\n" +"\t-l -s --long-info wyświetlenie powyższego i symboli znanych loadkeys\n" "\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 " +"\t-S --shape=\n" +"\t-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-k --keys-only\t wyświetlenie tylko przypisań klawiszy\n" +"\t-d --compose-only wyświetlenie tylko kombinacji compose\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -90,17 +103,26 @@ "\t\t\t interpretowanie kodów znaków jako pochodzących\n" "\t\t\t z podanego zestawu\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t wypisanie numeru wersji\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "nieznany zestaw znaków %s - ignorowanie żądania zestawu znaków\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: błąd podczas odczytu trybu klawiatury: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -111,7 +133,7 @@ "(wartość liczbowa, symbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -134,42 +156,42 @@ "\t-V --version wyświetlenie tego opisu\n" "\t-n --next-available wyświetlenie następnego nieprzydzielonego VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Nie udało się odczytać VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Nie udało się otworzyć %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "składnia: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Zwykłe skankody xx (hex) a kody klawiszy (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "dla 1-%d (0x01-0x%02x) skankod jest równy kodowi klawisza\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -180,13 +202,13 @@ "\n" "Specjalne skankody e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "nie udało się odczytać kodu klawisza dla skankodu 0x%x: ioctl KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -195,94 +217,101 @@ "Składnia:\n" "\t%s [-s] [-C konsola]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Składnia: %1$s [-C URZĄDZENIE] getmode [text|graphics]\n" " lub: %1$s [-C URZĄDZENIE] gkbmode [raw|xlate|mediumraw|unicode]\n" " lub: %1$s [-C URZĄDZENIE] gkbmeta [metabit|escprefix]\n" " lub: %1$s [-C URZĄDZENIE] gkbled [scrolllock|numlock|capslock]\n" +"Inne opcje:\n" +" -h wyświetlenie tego opisu\n" +" -V wyświetlenie numeru wersji\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Błąd: za mało argumentów.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Błąd: Nierozpoznana akcja: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "składnia: kbd_mode [-a|-u|-k|-s] [-C urządzenie]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Klawiatura jest w trybie surowym (skankodów)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Klawiatura jest w trybie średnio surowym (kodów klawiszy)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Klawiatura jest w trybie normalnym (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Klawiatura jest w trybie Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Klawiatura jest w nieznanym trybie\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, 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" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Składnia: kbdrate [-V] [-s] [-r częstotliwość] [-d opóźnienie]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "" +"Składnia: kbdrate [-V | --version] [-s] [-r częstotliwość] [-d opóźnienie]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Nie można otworzyć /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "błąd: getfont wywołane z licznikiem<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "błąd: getfont z użyciem GIO_FONT wymaga bufora.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: brak pamięci\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "dziwne... ct zmieniło się z %d na %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -291,168 +320,168 @@ "Wygląda na to, że jądro jest starsze niż 1.1.92\n" "Nie wczytano tabeli mapy unikodowej.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "brak pamięci" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "nie udało się zainicjować tablicy: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Błąd podczas zapisu mapy do pliku" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "niemożliwe: nie meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: błąd pod indeksem %d w tabeli %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: Nie udało się pobrać łańcucha klawisza funkcyjnego" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: Nie udało się pobrać tabeli akcentów" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "nie udało się pobrać mapy klawiszy %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "nie udało się usunąć przypisania klawisza %d dla tabeli %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key wywołano z błędnym kodem klawisza %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "dodanie mapy %d narusza jawną linię mapy klawiszy" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "nie udało się przypisać klawisza %d dla tabeli %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "niemożliwy błąd w lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "nie udało się pobrać symbolu poprzez niewłaściwy typ: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "nie udało się pobrać symbolu typu %d poprzez niewłaściwy indeks: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "przyjęto %s w iso-8859-1" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "przyjęto %s w iso-8859-15" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "przyjęto %s w iso-8859-2" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "przyjęto %s w iso-8859-3" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "przyjęto %s w iso-8859-4" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "nieznany symbol '%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: nie udało się przełączyć w tryb Unicode" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Mapa klawiszy %d: brak uprawnień" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "kod klawisza %d, tabela %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " BŁĄD" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "nie udało się przypisać klawisza %d do wartości %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "zwalnianie mapy klawiszy %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: nie udało się zwolnić mapy klawiszy %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: nie udało się zwolnić lub wyczyścić mapy klawiszy" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "KDSKBMODE: %s: nie udało się wrócić do pierwotnego trybu klawiatury" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "nie udało się przypisać łańcucha '%s' do funkcji %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "nie udało się wyczyścić łańcucha %s" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "zbyt dużo definicji compose" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -470,7 +499,7 @@ "\n" "Zmieniono %d klawiszy" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -478,7 +507,7 @@ msgstr[1] "Zmieniono %d łańcuchy" msgstr[2] "Zmieniono %d łańcuchów" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" @@ -486,51 +515,51 @@ msgstr[1] "Wczytano %d definicje compose" msgstr[2] "Wczytano %d definicji compose" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Brak zmian w definicjach compose)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "przedział kodów klawiszy obsł. przez jądro: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "maks. liczba akcji do przypisania klawiszowi: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "liczba aktualnie używanych map klawiatury: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "z których %u przydzielono dynamicznie\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "przedziały kodów akcji obsługiwanych przez jądro:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "liczba klawiszy funkcyjnych obsługiwanych przez jądro: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "maksymalna liczba definicji compose: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "liczba aktualnie używanych definicji compose: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -541,12 +570,12 @@ "Rozpoznawane są następujące synonimy:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s dla %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -555,7 +584,7 @@ "\n" "Rozpoznawane nazwy modyfikatorów i numery ich kolumn:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -577,6 +606,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys wersja %s\n" "\n" @@ -597,18 +627,19 @@ " -s --clearstrings wyczyszczenie tabeli łańcuchów w jądrze\n" " -u --unicode wymuszenie konwersji do Unicode\n" " -v --verbose informowanie o zmianach\n" +" -V --version wyświetlenie numeru wersji\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s z %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: Opcje --unicode i --ascii wykluczają się wzajemnie\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -617,7 +648,7 @@ "%s: uwaga: wczytywanie nieunikodowej mapy klawiszy na nieunikodowej konsoli\n" " (być może powinno być jeszcze `kbd_mode -a'?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -626,17 +657,17 @@ "%s: uwaga: wczytywanie unikodowej mapy klawiszy na nieunikodowej konsoli\n" " (być może powinno być jeszcze `kbd_mode -u'?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Nie można odnaleźć %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "nie można otworzyć pliku %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -645,28 +676,28 @@ "Składnia:\n" "\t%s [-C konsola] [-o mapa.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Błędna linia wejściowa: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: numer znaku (0x%x) większy od długości fontu\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Błędny koniec przedziału (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" msgstr "" "%s: Błędny przedział Unicode odpowiadający przedziałowi 0x%x-0x%x w foncie\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -675,22 +706,22 @@ "%s: Przedział Unicode 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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: zignorowano końcowe śmieci (%s)\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Wczytywanie mapy unikodowej z pliku %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Uwaga: linia zbyt długa\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -699,80 +730,80 @@ "%s: nie wczytywanie pustej unimapy\n" "(jeśli tak ma być: można wymusić opcją -f)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "wpis" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "wpisów" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Zapisano mapę unikodową w `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Dołączono mapę unikodową\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "składnia: %s [-v] [-o mapa.orig] plik-mapy\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "składnia: %s [-V] [-v] [-o mapa.orig] plik-mapy\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: nie można otworzyć pliku mapy _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Nie można wykonać stat na pliku mapy" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Wczytywanie binarnej, bezpośredniej mapy ekranowej z pliku %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Błąd podczas czytania mapy z pliku `%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Wczytywanie binarnej, unikodowej mapy ekranowej z pliku %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Wczytywanie symbolicznej mapy ekranowej z pliku %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Błąd podczas analizy mapy symbolicznej z `%s' w linii %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Błąd podczas zapisu mapy do pliku\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Nie można odczytać mapy konsoli\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Zapisano mapę ekranową w `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -809,186 +840,182 @@ " -h, --help wyświetlenie krótkiego opisu użycia\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Nie udało się odnaleźć właściciela bieżącego tty!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Błędny numer vt" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Tylko root może użyć flagi -u." -#: src/openvt.c:256 -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:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Nie można znaleźć wolnego vt" -#: src/openvt.c:267 +#: src/openvt.c:269 #, 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." -#: src/openvt.c:271 +#: src/openvt.c:273 #, 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." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Nie udało się odnaleźć polecenia." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Nie można ustanowić nowej sesji" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Nie można otworzyć %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Użycie VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Nie można otworzyć %s do odczytu i zapisu" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Nie udało się uaktywnić vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Uaktywnianie przerwane?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Nie udało się zwolnić konsoli %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: krótka tablica unikodowa ucs2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: krótka tablica unikodowa utf8\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: błędne utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: nieznany błąd utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: krótka tablica unikodowa\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Błąd podczas odczytu fontu wejściowego" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Błędne wywołanie readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Nie obsługiwany rodzaj pliku psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Nie obsługiwana wersja psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: font wejściowy zerowej długości?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: znak wejściowy zerowego rozmiaru?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Plik wejściowy: błędna długość wejścia (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Plik wejściowy: końcowe śmieci\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: błędny unikod %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Nie można zapisać nagłówka pliku fontu" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Nie można zapisać pliku fontu" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Uwaga: linia zbyt długa\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Błędna linia wejściowa: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Numer znaku (0x%lx) wykracza poza koniec fontu\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Błędny koniec przedziału (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format 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ł Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -997,7 +1024,7 @@ "Składnia:\n" "\t%s font-wejściowy tablica-wejściowa font-wyjściowy\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1006,7 +1033,7 @@ "Składnia:\n" "\t%s font-wejściowy [tablica-wyjściowa]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1015,7 +1042,7 @@ "Składnia:\n" "\t%s font-wejściowy font-wyjściowy\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1024,22 +1051,22 @@ "Składnia:\n" "\t%s [-i font-wej] [-o font-wyj] [-it tab-wej] [-ot tab-wyj] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Błędna liczba magiczna w %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: plik psf z nieznanym znacznikiem\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: font wejściowy nie ma indeksu\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: nie można odnaleźć pliku trybów graficznych %s\n" @@ -1048,28 +1075,28 @@ msgid "Invalid number of lines\n" msgstr "Błędna liczba linii\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Stary tryb: %dx%d Nowy tryb: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Stara l.skanlinii: %d Nowa l.skanlinii: %d Wysokość znaku: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: polecenie `%s' nie powiodło się\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format 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:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1082,41 +1109,41 @@ "lub: resizecons -lines WIERSZE\n" "gdzie WIERSZE mogą być liczbą jedną z: 25, 28, 30, 34, 36, 40, 44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: nie można uzyskać uprawnień do wejścia/wyjścia\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "składnia: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "Błąd podczas czytania %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "nie można odczytać %s, nie można zrzucić ioctl\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "nie można odczytać %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Dziwne... ekran jest jednocześnie %dx%d i %dx%d???\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Błąd podczas zapisu zrzutu ekranu\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1170,12 +1197,12 @@ " -V Wypisanie informacji o wersji i zakończenie.\n" "Pliki są wczytywane z katalogu bieżącego lub %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: zbyt dużo plików wejściowych\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1184,123 +1211,123 @@ "setfont: nie można jednocześnie odtworzyć z ROM-u i z pliku. Font nie " "zmieniony.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Błędna wysokość znaku %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Błędna szerokość znaku %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: pozycja 32 w foncie nie jest pusta\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: wyczyszczono\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: tło będzie wyglądać zabawnie\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Wczytywanie %d-znakowego fontu %dx%d z pliku %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Wczytywanie %d-znakowego fontu %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Wczytywanie %d-znakowego fontu %dx%d (%d) z pliku %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Wczytywanie %d-znakowego fontu %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: błąd w do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Wczytywanie tablicy odwzorowania Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Nie można otworzyć pliku fontu %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "Przy wczytywaniu kilku fontów, wszystkie muszą być psf - %s nie jest\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Wczytywanie %d-znakowego fontu %dx%d z pliku %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Przy wczytywaniu kilku fontów, wszystkie muszą mieć tę samą wysokość\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, 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" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Nie można znaleźć domyślnego fontu\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Nie można znaleźć fontu %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Czytanie pliku fontu %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Brak ostatniego znaku końca linii w pliku dołączanym\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Zbyt dużo plików do połączenia\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - font z restorefont? Używanie pierwszej połowy.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Błędny rozmiar pliku wejściowego\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1309,22 +1336,22 @@ "Ten plik zawiera 3 fonty: 8x8, 8x14 i 8x16. Proszę podać przy\n" "użyciu opcji -8, -14 lub -16, który z nich ma być wczytany.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "Wybrano rozmiar fontu %d, ale możliwe są tylko 8, 14, 16.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Nie znaleziono nic do zapisania\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Zapisano %d-znakowy font %dx%d do pliku %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1335,25 +1362,25 @@ " (gdzie skankod to xx lub e0xx, podany szesnastkowo,\n" " a kod klawisza jest podany dziesiętnie)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "oczekiwano parzystej liczby argumentów" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "błąd podczas czytania skankodu" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "kod spoza zakresu" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "" "nie udało się ustawić skankodu %x na kod klawisza %d: ioctl KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1390,14 +1417,14 @@ msgid "off" msgstr "wył." -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Błąd podczas odczytu aktualnych ustawień diod. Może stdin nie jest VT?: " "ioctl KDGETLED" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" @@ -1405,44 +1432,44 @@ "Błąd podczas odczytu aktualnych ustawień flag. Może wywołanie nie na " "konsoli?: ioctl KDGKBLED" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "" "Błąd podczas odczytu aktualnych ustawień diod z /dev/kbd: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED niedostępne?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "" "Błąd podczas odczytu aktualnych ustawień diod z /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED niedostępne?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Błąd podczas resetowania trybu diod.\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Aktualne flagi domyślne: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Aktualne flagi: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Aktualne diody: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1451,37 +1478,37 @@ "nierozpoznany argument: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Stare domyślne flagi: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nowe domyślne flagi: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Stare flagi: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nowe flagi: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Stare diody: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Nowe diody: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1498,44 +1525,45 @@ "zmienia ustawienia innego vt.\n" "Ustawienia przed i po zmianie są raportowane.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Klawisz Meta ustawia najbardziej znaczący bit\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Klawisz Meta daje przedrostek Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Dziwny tryb dla klawisza Meta?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Błąd podczas czytania aktualnego ustawienia. Może stdin nie jest VT?: ioctl " "KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "stary stan: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "nowy stan: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "składnia: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1545,8 +1573,13 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -"Składnia: %s vga|PLIK|-\n" +"Składnia: %s [-h] [-V]\n" +" %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 " @@ -1557,40 +1590,44 @@ "\n" "a następnie zmodyfikować wartości w PLIKU.\n" "\n" +"Inne opcje:\n" +" -h wyświetlenie tego opisu\n" +" -V wyświetlenie informacji o wersji\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Błąd: %s: Błędna wartość w polu %u w linii %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Błąd: %s: Zbyt mała liczba pól w linii %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Błąd: %s: Nieoczekiwany koniec linii %u.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Błąd: %s: Linia %u jest zbyt długa.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "odtworzenie oryginalnej tablicy translacji nie powiodło się\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "odtworzenie oryginalnej unimapy nie powiodło się\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "nie można zmienić tablicy translacji\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1598,37 +1635,39 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "składnia: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(prawdopodobnie po wczytaniu fontu poprzez `setfont font')\n" "\n" "Poprawne opcje to:\n" -" -C tty Urządzenie do odczytania fontu. Domyślne: bieżący tty.\n" -" -v Wypisywanie większej ilości informacji.\n" -" -i Nie wypisywanie tabeli fontów, a jedynie WIERSZExKOLUMNYxLICZBA\n" -" i zakończenie.\n" +" -V --version Wypisanie numeru wersji i zakończenie.\n" +" -C tty Urządzenie do odczytania fontu. Domyślne: bieżący tty.\n" +" -v Wypisywanie większej ilości informacji.\n" +" -i Nie wypisywanie tabeli fontów, a jedynie\n" +" WIERSZExKOLUMNYxLICZBA i zakończenie.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Liczba znakow : %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Szerokość fontu: %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Wysokość fontu : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1637,16 +1676,16 @@ "Wyświetlanie fontu %d-znakowego\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?NIEZNANY?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "tryb kb był %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1655,12 +1694,12 @@ "[ jeśli to jest wykonywane pod X, może nie działać\n" "ponieważ X serwer także czyta /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "złapano sygnał %d, sprzątanie...\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1673,6 +1712,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey wersja %s\n" "\n" @@ -1684,8 +1724,9 @@ "\t-a --ascii\twartości dziesiętne/ósemkowe/szesnastkowe klawiszy\n" "\t-s --scancodes\ttylko surowe skankody\n" "\t-k --keycodes\ttylko interpretowane kody klawiszy (domyślne)\n" +"\t-V --version\twyświetlenie numeru wersji\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1696,30 +1737,30 @@ "Można naciskać dowolne klawisze - Ctrl-D przerwie ten program\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, 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" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "puszczenie" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "naciśnięcie" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "kod klawisza %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "Składnia: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1729,17 +1770,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, 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:91 +#: src/vlock/auth.c:86 #, 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:94 +#: src/vlock/auth.c:89 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 " @@ -1781,12 +1822,12 @@ msgid "stdin is not a tty" msgstr "stdin nie jest terminalem" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, 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 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Nie można zablokować całości konsoli.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/ro.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/ro.gmo differ diff -Nru kbd-2.0.3/po/ro.po kbd-2.0.4/po/ro.po --- kbd-2.0.3/po/ro.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/ro.po 2017-01-08 18:38:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kbd 1.08\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2003-11-20 17:33+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -14,39 +14,53 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "folosire: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +#, fuzzy +msgid "Couldn't get a file descriptor referring to the console" +msgstr "" +"Nu am putut gsi un descriptor de fiier care s se refere la aceast " +"consol\n" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: opiune necunoscut\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: numr VT ilegal\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: VT 1 este consola i nu poate fi dealocat\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys versiune %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -55,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -81,7 +96,7 @@ "\t --compose-only afieaz doar combinaiile tastelor compuse\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -91,18 +106,25 @@ "luate\n" "\t\t\t din setul de caractere specificat\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "" "set de caractere %s necunoscut - se ignor cererea de set de caractere\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: eroare n setarea modului tastaturii\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -113,7 +135,7 @@ "(valoare numeric, simbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -127,48 +149,48 @@ "\t-n --next-available display number of next unallocated VT\n" msgstr "" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 #, fuzzy msgid "Couldn't read VTNO: " msgstr "nu s-a putut citi %s\n" -#: src/getfd.c:67 +#: src/getfd.c:69 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "nu s-a putut citi %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, fuzzy, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "" "Nu am putut gsi un descriptor de fiier care s se refere la aceast " "consol\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "folosire: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Scancodes normale(plain) xx (hex) versus keycodes (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, 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" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -179,14 +201,14 @@ "\n" "Coduri scanare de escape e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "eroare n primirea codului de tast(keycode) pentru codul de scan(scancode) " "0x%x\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, fuzzy, c-format msgid "" "Usage:\n" @@ -195,266 +217,269 @@ "Folosire:\n" "\t%s [-s]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, fuzzy, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" "argument necunoscut: _%s_\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, fuzzy, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "folosire: kbd_mode [-a|-u|-k|-s]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Tastatura este n mod brut (scancode)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Tastatura este n mod mediu-brut (keycode)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Tastatura este n modul implicit (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Tastatura este n modul Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Tastatura este ntr-un mod necunoscut\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Rata de Tiprire(Typematic) setat la %.1f cps (ntrziere = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Folosire: kbdrate [-V] [-s] [-r rat] [-d ntrziere]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Nu se poate deschide /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "bug: getfont apelat cu numr(count)<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: memorie plin\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: memorie plin\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "Eroare n scrierea maprii n fiier\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "imposibil: non meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "eroare KDGKBENT la indexul %d n tabelul %d: " -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "" "eroare n primirea codului de tast(keycode) pentru codul de scan(scancode) " "0x%x\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "" "eroare n primirea codului de tast(keycode) pentru codul de scan(scancode) " "0x%x\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "se presupune iso-8859-1 %s\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "se presupune iso-8859-15 %s\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "se presupune iso-8859-2 %s\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "se presupune iso-8859-3 %s\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "se presupune iso-8859-4 %s\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "keysym '%s' necunoscut\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "cod tast %3d %s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr "" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "eroare n setarea scancode %x n keycode %d\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "nr max de definiii compuse: %d\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -465,66 +490,66 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "nr max de definiii compuse: %d\n" msgstr[1] "nr max de definiii compuse: %d\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "nr max de definiii compuse: %d\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "domeniu cod de taste suportat de kernel: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "numr maxim de aciuni legate(bindable) de o tast: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "numr de mapri de taste n folosire actual: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "din care %d alocate dinamic\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "interval de coduri de aciune suportat de kernel:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "numr taste de funcii suportat de kernel: %d.\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "nr max de definiii compuse: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "nr de definiii compuse actualmente n folosire: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -535,12 +560,12 @@ "Urmtoarele sinonime sunt recunoscute:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s pentru %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -549,7 +574,7 @@ "\n" "S-au recunoscut numele modificatorilor i numerele lor de coloane:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -571,72 +596,73 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s din %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "Nu se poate gsi fontul %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "Nu se poate deschide fiierul de font %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, fuzzy, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "folosire: %s [-v] [-o map.orig] fiier-mapare\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Linie de intrare(input) greit: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Numrul reprezentrii(glyph) (0x%x) mai mare dect fontul\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Sfrit de interval eronat (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" msgstr "" "%s: Interval Unicode greit corespunztor intervalului de poziie font 0x" "%x-0x%x\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -645,22 +671,22 @@ "%s: Intervalul Unicode U+%x-U+%x nu are aceeai mrime ca intervalul de " "poziie al fontului 0x%x-0x%x\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: gunoiul(junk) de la sfrit (%s) ignorat\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Se ncarc maparea unicode din fiierul %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Avertisment: linie prea lung\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -669,80 +695,80 @@ "%s: nu s-a ncrcat unimap-ul vid\n" "(dac inistai: folosii opiunea -f pentru suprascriere(override))\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "intrare" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "intrri" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "S-a salvat maparea unicode n `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "S-a adugat(appended) maparea Unicode\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "folosire: %s [-v] [-o map.orig] fiier-mapare\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: nu se poate deschide fiierul de mapare _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Nu se poate gsi starea(stat) fiierului de mapare" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Se ncarc maparea de ecran binar direct-la-font din fiierul %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Eroare n citirea maprii din fiierul `%s'\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Se ncarc maparea de ecran binar unicode din fiierul %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Se ncarc maparea de ecran simbolic din fiierul %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Eroare in analiza(parsing) maprii simbolice din `%s', linia `%d'\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Eroare n scrierea maprii n fiier\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Nu se poate citi maparea consolei\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "S-a salvat maparea ecranului n `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -763,182 +789,175 @@ "\n" msgstr "" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "" -#: src/openvt.c:208 +#: src/openvt.c:210 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: numr vt ilegal\n" -#: src/openvt.c:234 +#: src/openvt.c:236 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: doar root-ul poate folosi marcajul(flag) -u.\n" -#: src/openvt.c:256 -#, fuzzy -msgid "Couldn't get a file descriptor referring to the console" -msgstr "" -"Nu am putut gsi un descriptor de fiier care s se refere la aceast " -"consol\n" - -#: src/openvt.c:263 +#: src/openvt.c:265 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: nu pot gsi un vt liber\n" -#: src/openvt.c:267 +#: src/openvt.c:269 #, 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:271 +#: src/openvt.c:273 #, 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:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "" -#: src/openvt.c:313 +#: src/openvt.c:315 #, fuzzy msgid "Unable to set new session" msgstr "openvt: nu se poate seta sesiune nou (%s)\n" -#: src/openvt.c:337 +#: src/openvt.c:339 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: Nu se poate deschide %s: %s\n" -#: src/openvt.c:341 +#: src/openvt.c:343 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: se folosete VT %s\n" -#: src/openvt.c:347 +#: src/openvt.c:349 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: Nu se poate deschide %s citire/scriere (%s)\n" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:401 +#: src/openvt.c:403 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s:nu se poate derepartiza(deallocate) consola %d\n" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: tabel scurt ucs2 unicode\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: tabel scurt utf8 unicode\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: utf8 eronat\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: eroare utf8 necunoscut\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: tabel scurt unicode\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Eroare n citirea fontului de intrare(input)" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Apelare greit a readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s:Mod fiier psf nesuportat (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s:Versiune fiier psf nesuportat (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: intrare(input) zero pentru mrime(length)?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: intrare(input) mrime caracter zero?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Fiier intrare(input): mrime intrare(input) eronat (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Fiier intrare(input): gunoi(garbage) la sfrit\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: unicode ilegal %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Nu se poate scrie header-ul fiierului de font" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Nu se poate scrie fiierul de font" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Avertisment: linie prea lung\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Linie de intrare(input) greit: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "" "%s: Numrul reprezentrii(glyph) (0x%lx) a depit sfritul fontului\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Sfrit de domeniu(range) eronat (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -947,7 +966,7 @@ "%s: Corespunztor unui interval de poziii de fonturi, ar trebui s fie un " "interval (range) Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -956,7 +975,7 @@ "Folosire:\n" "\t%s infont intable outfont\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -965,7 +984,7 @@ "Folosire:\n" "\t%s infont [outtable]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -974,7 +993,7 @@ "Folosire:\n" "\t%s infont outfont\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -983,22 +1002,22 @@ "Folosire:\n" "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Numr magic greit n cazul %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: fiier psf cu numr magic necunoscut\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: fontul de intrare(input) nu are un index\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: nu se poate gsi fiierul de moduri video %s\n" @@ -1007,22 +1026,22 @@ msgid "Invalid number of lines\n" msgstr "Numr de linii invalid\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Mod vechi: %dx%d Mod nou: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "Vechi #liniiscan: %d Nou #liniiscan: %d nlime caracter: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: comanda `%s' a euat\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1030,7 +1049,7 @@ "resizecons: nu uitai s schimbai TERM (poate n con%dx%d sau n linux-%dx" "%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1044,41 +1063,41 @@ "sau: resizecons -lines RDURI, cu RNDURI unul din numerele 25, 28, 30, 34,\n" "36, 40, 44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: nu se pot primi(get) permisiile I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "folosire: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "Eroare n citirea %s\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "nu s-a putut citi %s, i nu se poate face dump ioctl\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "nu s-a putut citi %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Ciudat ... ecranul este i %dx%d i %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Eroare n scrierea dump-ului de ecran\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, fuzzy, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1134,12 +1153,12 @@ " -V\t\tAfieaz versiunea i iese.\n" "Fiierele sunt ncrcate din directorul curent sau din /usr/lib/kbd/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: prea multe fiiere de intrare(input)\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1148,126 +1167,126 @@ "setfont: nu se poate reveni(restore) i din caracterul ROM i din fiier. " "Font neschimbat.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "nlime de caracter greit: %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Lime de caracter greit: %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: poziia font 32 este nonblank\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: a fost ters(wiped)\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: fundalul va arta nostim\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Se ncarc %d-char fontul %dx%d din fiierul %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Se ncarc %d-char fontul %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Se ncarc %d-char fontul %dx%d(%d) din fiierul %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Se ncarc %d-char fontul %dx%d(%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: bug n do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Se ncarc tabela de mapare Unicode...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Nu se poate deschide fiierul de font %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "Cnd se ncarc mai multe fonturi, toate trebuie s fie fonturi psf. - %s nu " "este\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "S-a citit %d-char fontul %dx%d din fiierul %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "" "Cnd se ncarc mai multe fonturi, toate trebuie s aib aceeai nlime\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "Cnd se ncarc mai multe fonturi, toate trebuie s aib aceeai lime\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Nu se poate gsi fontul implicit\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Nu se poate gsi fontul %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Se citete fiierul de font %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Nu exist marcaj_linie_nou(newline) final n fiierul combinat\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Prea multe fiiere de combinat\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - un font din restorefont? Se folosete prima jumtate.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Mrime fiier intrare(input) invalid\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1276,23 +1295,23 @@ "Acest fiier conine 3 fonturi: 8x8, 8x14 i 8x16. V rugm indicai\n" "folosind o opiune -8 or -14 or -16 pentru a-l selecta pe cel dorit.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Ai cerut o mrime de font %d, dar doar 8, 14, 16 sunt posibile aici.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Nu am gsit nimic de salvat\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "S-a salvat fiierul %d-char fontul %dx%d n %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1303,24 +1322,24 @@ " (unde scancode este fie xx sau e0xx, dat n hexazecimal,\n" " i keycode este dat n zecimal)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "numr par de argumente ateptat" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "eroare n citirea codului de scan(scancode)" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "cod n afara limitelor(bounds)" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "eroare n setarea scancode %x n keycode %d\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1357,7 +1376,7 @@ msgid "off" msgstr "dezactivat(off)" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1365,7 +1384,7 @@ "Eroare n citirea setrilor curente ale ledului. E posibil ca stdin s nu " "fie un VT?\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1374,44 +1393,44 @@ "Eroare n citirea setrilor marcajelor(flags) curente. Poate nu suntei n " "consol?\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Eroare n citirea setrii curente a ledului din /dev/kbd.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED indisponibil?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Eroare n citirea setrii curente a ledului din /dev/kbd.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED indisponibil?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Eroare n resetarea modurilor ledului\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Marcajele(flags) implicite curente:" -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Marcajele(flags) curente: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Leduri curente: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1420,37 +1439,37 @@ "argument necunoscut: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Marcaje(flags) implicite vechi: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Marcaje(flags) implicite noi: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Marcaje(flags) vechi: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Marcaje(flags) noi: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Leduri vechi: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Leduri noi: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1467,44 +1486,45 @@ "pentru a schimba setrile altui vt.\n" "Setrile de dinainte i de dup schimbri sunt raportate.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Tasta Meta seteaz bitul de ordine nalt\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Tasta Meta furnizeaz prefix Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Mod ciudat pentru tasta Meta?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Eroare n citirea setrii curente. E posibil ca stdin s nu fie un VT?\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "stare veche: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "stare nou: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "folosire: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1514,41 +1534,45 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, fuzzy, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "%s: %s: Avertisment: linie prea lung\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "eroare n restaurarea(restore) tabelei de traduceri originale\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "eroare n restaurarea unimap-ului original\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "nu se poate schimba tabela de traduceri\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1556,44 +1580,45 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, fuzzy, c-format msgid "Character count: %d\n" msgstr "Lime de caracter greit: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, fuzzy, c-format msgid "" "Showing %d-char font\n" "\n" msgstr "Se ncarc %d-char fontul %dx%d\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?NECUNOSCUT?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "modul kb a fost %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1602,13 +1627,13 @@ "[ Dac ncercai asta sub X, s-ar putea s nu funcioneze\n" "atta timp ct i serverul X citete /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "s-a primit semnal %d, se face curenie...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1620,6 +1645,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey versiunea %s\n" "\n" @@ -1632,7 +1658,7 @@ "\t-s --scancodes\tafieaz doar codurile de scanare brute(raw)\n" "\t-k --keycodes\tafieaz doar codurile de taste interpretate(implicit)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1643,49 +1669,49 @@ "Apsai orice taste - Ctrl-D va termina acest program\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "aspsai orice tast (programul se termin la 10s dup ultima apsare de " "tast)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "eliberare" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "apsare" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "cod tast %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 #, fuzzy msgid "usage: totextmode\n" msgstr "folosire: getkeycodes\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1719,12 +1745,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, fuzzy, c-format msgid "The entire console display cannot be locked.\n" msgstr "%s: VT 1 este consola i nu poate fi dealocat\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/ru.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/ru.gmo differ diff -Nru kbd-2.0.3/po/ru.po kbd-2.0.4/po/ru.po --- kbd-2.0.3/po/ru.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/ru.po 2017-01-08 18:38:45.000000000 +0000 @@ -3,52 +3,63 @@ # This file is distributed under the same license as the kbd package. # # QingLong , 1999. -# Yuri Kozlov , 2010, 2011, 2012, 2014, 2015. +# Yuri Kozlov , 2010, 2011, 2012, 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.3-rc1\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2015-07-05 08:17+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-27 19:55+0300\n" "Last-Translator: Yuri Kozlov \n" -"Language-Team: Russian \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" +"X-Bugs: Report translation errors to the Language-Team address.\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.5\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "Использование: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Не удалось получить файловый дескриптор, указывающий на консоль" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: неизвестный параметр\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "0: недопустимый номер VT\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "VT 1 является консолью и не может быть освобождена\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "не удалось освободить консоль %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys, версия %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -58,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -74,18 +86,19 @@ "\n" "\t-h --help\t показать эту справку\n" "\t-i --short-info\t показать информацию о драйвере клавиатуры\n" -"\t-l --long-info\t показать что и выше и символы известные loadkeys\n" +"\t-l -s --long-info показать что и выше и символы известные loadkeys\n" "\t-n --numeric\t показать таблицу клавиш в шестнадцатеричном " "представлении\n" "\t-f --full-table\t не использовать сокращённое представление,\n" "\t\t\t по одной строке на код клавиши\n" "\t-1 --separate-lines одна строка на пару (модификатор, код клавиши)\n" -"\t --funcs-only\t показать только строки функциональных клавиш\n" -"\t --keys-only\t показать только назначения клавиш\n" -"\t --compose-only показать только составные комбинации клавиш\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t показать только строки функциональных клавиш\n" +"\t-k --keys-only\t показать только назначения клавиш\n" +"\t-d --compose-only показать только составные комбинации клавиш\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -94,17 +107,26 @@ "\t\t\t считать, что коды действий клавиш заданы\n" "\t\t\t в указанной символьной кодировке\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t показать номер версии\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "неизвестная кодировка %s — пропускается запрос кодировки\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: ошибка чтения режима клавиатуры: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -115,7 +137,7 @@ "(числовое значение, символ)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -138,41 +160,41 @@ "\t-V --version показать версию программы\n" "\t-n --next-available показать номер следующего незанятого VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Не удалось прочитать VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Не удалось открыть %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Не удалось получить файловый дескриптор, указывающий на консоль\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "Использование: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Простые скан-коды xx (шестн.) и соответствующие коды клавиш (десят.)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "0 — ошибка; скан-коды 1-88 (0x01-0x58) эквивалентны кодам клавиш\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "скан-коды 1-%d (0x01-0x%02x) эквивалентны кодам клавиш\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -183,14 +205,14 @@ "\n" "Экранированные скан-коды e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "не удалось найти код клавиши, соответствующий скан-коду 0x%x: ioctl " "KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -199,93 +221,100 @@ "Использование:\n" "\t%s [-s] [-C консоль]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Использование: %1$s [-C УСТРОЙСТВО] getmode [text|graphics]\n" " или: %1$s [-C УСТРОЙСТВО] gkbmode [raw|xlate|mediumraw|unicode]\n" " или: %1$s [-C УСТРОЙСТВО] gkbmeta [metabit|escprefix]\n" " или: %1$s [-C УСТРОЙСТВО] gkbled [scrolllock|numlock|capslock]\n" +"Другие параметры:\n" +" -h показать эту справку\n" +" -V показать номер версии\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Ошибка: недостаточно аргументов.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Ошибка: нераспознанное действие: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "Использование: kbd_mode [-a|-u|-k|-s] [-C устройство]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Клавиатура находится в режиме без обработки (шлёт скан-коды)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Клавиатура находится в режиме полуобработки (шлёт коды клавиш)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Клавиатура находится в обычном режиме (шлёт ASCII-коды)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Клавиатура находится в режиме Unicode (шлёт коды UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Клавиатура находится в неизвестном режиме\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Скорость ввода равна %.1f знак/сек (задержка = %d мс)\n" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Использование: kbdrate [-V] [-s] [-r скорость] [-d задержка]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "" +"Использование: kbdrate [-V | --version] [-s] [-r скорость] [-d задержка]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Не удалось открыть /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "ошибка: getfont была вызвана с count < 256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "ошибка: getfont, использующему GIO_FONT, требуется buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: нехватка памяти\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "странно... ct изменено с %d на %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -294,169 +323,169 @@ "Кажется, что версия ядра старее чем 1.1.92.\n" "Таблица отображения Юникода загружена не будет.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "недостаточно памяти" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "не удалось инициализировать массив: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Ошибка записи карты в файл" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "невозможно: не мета?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: ошибка для индекса %d в таблице %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" "KDGKBSENT: %s: Невозможно получить значение строки функциональной клавиши" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: Невозможно получить таблицу диакритических знаков" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "не удалось получить раскладку %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "не удалось удалить клавишу %d из таблицы %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key вызвана с некорректным кодом клавиши %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "добавление карты %d противоречит явному указанию в строке keymaps" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "не удалось добавить клавишу %d в таблицу %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "невозможная ошибка в lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "невозможно получить символ по некорректному типу: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "невозможно получить символ с типом %d по некорректному индексу: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "предполагается iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "предполагается iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "предполагается iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "предполагается iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "предполагается iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "неизвестный keysym «%s»\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: не удалось переключиться в режим Юникода" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Раскладка %d: доступ запрещён" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "код клавиши %d, таблица %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " НЕ ВЫПОЛНЕНО" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "не удалось сопоставить клавише %d значение %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "освобождена раскладка %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: не удалось освободить раскладку %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: не удалось освободить или очистить раскладку" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "KDSKBMODE: %s: не удалось вернуть первоначальный режим клавиатуры" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "не удалось назначить строку «%s» на функцию %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "не удалось очистить строку %s" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "слишком много составных определений" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -474,7 +503,7 @@ "\n" "Изменено %d клавиш" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -482,7 +511,7 @@ msgstr[1] "Изменены %d строки" msgstr[2] "Изменено %d строк" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" @@ -490,52 +519,52 @@ msgstr[1] "Загружено %d составных определения" msgstr[2] "Загружено %d составных определений" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Составные определения не изменились)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "диапазон кодов клавиш, поддерживаемых ядром: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "" "максимальное количество действий, которые можно назначить клавише: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "количество раскладок, используемых сейчас: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "из которых %u распределено динамически\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "диапазон кодов действий, поддерживаемых ядром:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "количество функциональных клавиш, поддерживаемых ядром: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "макс. количество составных определений: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "количество составных определений, используемых сейчас: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -546,12 +575,12 @@ "Распознаны следующие синонимы:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s для %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -560,7 +589,7 @@ "\n" "Распознанные имена модификаторов и их номера колонок:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -582,6 +611,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys, версия %s\n" "\n" @@ -602,18 +632,19 @@ " -s --clearstrings очистить таблицу строк ядра\n" " -u --unicode принудительно преобразовать в Юникод\n" " -v --verbose сообщить об изменениях\n" +" -V --version показать номер версии\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s из %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: параметры --unicode и --ascii взаимно исключают друг друга\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -623,7 +654,7 @@ "консоль\n" " (возможно, вы хотите выполнить «kbd_mode -u»?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -633,17 +664,17 @@ "консоль\n" " (возможно, вы хотите выполнить «kbd_mode -u»?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Не удалось найти %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "не удалось открыть файл %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -652,30 +683,30 @@ "Использование:\n" "\t%s [-C консоль] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Некорректная входная строка: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "" "%s: Номер образа символа (0x%x) больше количества знаков в этом шрифте\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Некорректный конец диапазона (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, c-format msgid "%s: Bad Unicode range corresponding to font position range 0x%x-0x%x\n" msgstr "" "%s: Недопустимый диапазон Юникода, соответствующий диапазону шрифта 0x%x-0x" "%x\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -684,22 +715,22 @@ "%s: Диапазон Юникода U+%x-U+%x отличается длиной от диапазона шрифта 0x%x-0x" "%x\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: игнорируется мусор в конце (%s)\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Загружается карта Юникода из файла %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Предупреждение: слишком длинная строка\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -708,82 +739,82 @@ "%s: не загружается пустой unimap\n" "(если это нужно, укажите параметр -f)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "элемент" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "элементов" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Юникодная карта записана в «%s»\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Юникодная карта добавлена\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "Использование: %s [-v] [-o map.orig] файл_карты\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "Использование: %s [-v] [-v] [-o map.orig] файл_карты\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: не удалось открыть файл _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Не удалось получить информацию о файле (stat)" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "" "Загружается двоичная экранная карта прямого соответствия шрифтов из файла " "%s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Ошибка чтения карты из файла «%s»\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Загружается двоичная юникодная экранная карта из файла %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Загружается символьная экранная карта из файла %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Ошибка при разборе символьной карты из «%s», строка %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Ошибка записи карты в файл\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Не удалось прочитать консольную карту\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Экранная карта записана в «%s»\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -821,180 +852,176 @@ " -h, --help показать краткую справку.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Не удалось определить владельца текущего tty!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: недопустимый номер vt" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Только суперпользователь может использовать параметр -u." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Не удалось получить файловый дескриптор, указывающий на консоль" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Не удалось найти свободный vt" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" "Не удалось проверить свободен ли vt %d; используйте «%s -f» для " "принудительного запуска." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" "vt %d используется; команда прервана; используйте «%s -f» для " "принудительного запуска." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Не удалось найти команду." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Не удалось установить новый сеанс" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Не удалось открыть %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Используется VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Не удалось открыть %s на чтение/запись" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Не удалось активировать vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Активация прервана?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Не удалось освободить консоль %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: сокращённая юникодная таблица ucs2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: сокращённая юникодная таблица utf8\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: некорректный utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: неизвестная ошибка utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: короткая юникодная таблица\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: ошибка чтения входного шрифта" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: некорректный вызов readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: неподдерживаемый режим файла psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: неподдерживаемая версия psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: входной шрифт имеет нулевую длину?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: входной символ имеет нулевой размер?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: входной файл: некорректная входная длина (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: входной файл: мусор в конце\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: недопустимый юникод %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Не удалось записать заголовок файла шрифта" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Не удалось записать файл шрифта" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Предупреждение: слишком длинная строка\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: некорректная входная строка: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "" "%s: Номер образа символа (0x%lx) больше количества знаков в этом шрифте\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: некорректный конец диапазона (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -1002,7 +1029,7 @@ msgstr "" "%s: диапазону позиций шрифта должен соответствовать некий диапазон Юникода\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1011,7 +1038,7 @@ "Использование:\n" "\t%s вх_шрифт вх_таблица вых_шрифт\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1020,7 +1047,7 @@ "Использование:\n" "\t%s вх_шрифт [вых_таблица]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1029,7 +1056,7 @@ "Использование:\n" "\t%s вх_шрифт вых_шрифт\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1038,22 +1065,22 @@ "Использование:\n" "\t%s [-i вх_шрифт] [-o вых_шрифт] [-it вх_таблица] [-ot вых_таблица] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: некорректный опознавательный номер у %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: файл psf с неизвестным опознавательным номером\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: входной шрифт не имеет индекса\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: не удалось найти файл видеорежима %s\n" @@ -1062,24 +1089,24 @@ msgid "Invalid number of lines\n" msgstr "недопустимое число строк\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Прежний режим: %dx%d Новый режим: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "" "Строк развёртки в прежнем режиме: %d Строк развёртки в новом режиме: %d " "Высота шрифта: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: команда «%s» завершилась неудачно\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1087,7 +1114,7 @@ "resizecons: не забудьте сменить TERM (возможно, на con%dx%d или linux-%dx" "%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1100,41 +1127,41 @@ "или:\tresizecons -lines СТРОК, где параметр СТРОК может\n" "принимать значения: 25, 28, 30, 34, 36, 40, 44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: не удалось получить права на доступ ко вводу-выводу.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "Использование: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "Ошибка чтения %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "не удалось прочитать %s и не удалось выполнить ioctl dump\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "не удалось прочитать %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Странно... Экран одновременно и %dx%d, и %dx%d?\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Ошибка записи содержимого экрана\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1189,12 +1216,12 @@ " -V Показать версию и закончить работу.\n" "Файлы загружаются из текущего каталога или из %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: слишком много входных файлов\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1203,124 +1230,124 @@ "setfont: не удалось восстановить сразу из символьного ПЗУ и из файла. Шрифт " "не изменён.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Некорректная высота символа %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Некорректная ширина символа %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: позиция 32 в шрифте не пробельная\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: стереть его\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: фон будет выглядеть забавно\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Загружается %d-символ шрифта %dx%d из файла %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Загружается %d-символ шрифта %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Загружается %d-символ шрифта %dx%d (%d) из файла %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Загружается %d-символ шрифта %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: ошибка в do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Загружается юникодная таблица отображения...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Не удалось открыть файл шрифта %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "При загрузке нескольких шрифтов все должны быть в формате psf: %s таковым не " "является\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Читается %d-символ шрифта %dx%d из файла %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "При загрузке нескольких шрифтов все должны быть одинаковой высоты\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "При загрузке нескольких шрифтов все должны быть одинаковой ширины\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Не удалось найти шрифт по умолчанию\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Не удалось найти шрифт %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Читается файл шрифта %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Отсутствует завершающий символ новой строки в объединённом файле\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Слишком много объединяемых файлов\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Хм. Шрифт из restorefont? Используется первая половина.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Некорректный размер входного файла\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1330,22 +1357,22 @@ "Укажите, одним из параметров: -8, -14 или -16,\n" "какой именно нужно загрузить.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "Вы просили шрифт размера %d, но возможны только 8, 14 или 16.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Не найдено что записывать\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Записывается %d-символ шрифта %dx%d файла в %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1356,24 +1383,24 @@ "Скан-код следует писать в шестнадцатеричном виде: xx или e0xx,\n" "код клавиши — в десятичном.\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "ожидается чётное число аргументов" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "ошибка чтения скан-кода" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "код вне допустимого диапазона" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "не удалось назначить скан-код %x коду клавиши %d: ioctl KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1413,14 +1440,14 @@ msgid "off" msgstr "выключен" -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Ошибка чтения текущего состояния индикаторов. Возможно, stdin не является " "VT?: ioctl KDGETLED" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" @@ -1428,44 +1455,44 @@ "Ошибка чтения текущего состояния индикаторов. Возможно, вы не в консоли?: " "ioctl KDGKBLED" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "" "Ошибка чтения текущего состояния индикаторов из /dev/kbd: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED недоступен?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "" "Ошибка чтения текущего состояния индикаторов из /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED недоступен?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Ошибка установки индикаторов в исходное состояние\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Значения флагов по умолчанию: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Текущие значения флагов: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Текущее состояние индикаторов: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1474,37 +1501,37 @@ "нераспознанный аргумент: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Старые значения флагов по умолчанию: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Новые значения флагов по умолчанию: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Старые флаги: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Новые флаги: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Старые индикаторы: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Новые индикаторы: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1521,44 +1548,45 @@ "чтобы изменить настройки другого vt.\n" "Выводятся настройки до и после изменения.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Клавиша мета устанавливает старший бит\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Клавиша мета даёт Esc-префикс\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Странный режим для клавиши мета?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Ошибка чтения текущих настроек. Возможно, stdin не является VT?: ioctl " "KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "прежнее состояние: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "новое состояние: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "Использование: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1568,51 +1596,60 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -"Использование: %s vga|ФАЙЛ|-\n" +"Использование: %s [-h] [-V]\n" +" %s vga|ФАЙЛ|-\n" "\n" "Если указан параметр ФАЙЛ, то в ФАЙЛЕ должно содержаться 3 строки\n" "с десятичными значениями КРАСНОГО, ЗЕЛЁНОГО и СИНЕГО через запятую.\n" "\n" "Начальное заполнение ФАЙЛА:\n" -" cat /sys/module/vt/parameters/default_{red,grn,blu} > FILE\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > ФАЙЛ\n" "\n" "После этого отредактируйте содержимое ФАЙЛА.\n" "\n" +"Другие параметры:\n" +" -h показать эту справку\n" +" -V показать номер версии\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Ошибка: %s: Некорректное значение в поле %u в строке %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Ошибка: %s: недостаточное количество полей в строке %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Ошибка: %s: неожиданный конец строки %u.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Ошибка: %s: строка %u слишком длинна.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "не удалось восстановить исходную таблицу трансляций\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "не удалось восстановить исходную unimap\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "не удалось изменить таблицу трансляций\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1620,38 +1657,40 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "Использование: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(вероятно, после загрузки шрифта с помощью «setfont шрифт»)\n" "\n" "Допустимые параметры:\n" -" -C tty Устройство, из которого читается шрифт. По умолчанию: текущий " -"tty.\n" -" -v Выводить подробности выполнения.\n" -" -i Не выводить таблицу шрифта, просто показать.\n" -" СТРОКxСТОЛБЦОВxКОЛИЧЕСТВО и выйти.\n" +" -V --version показать номер версии и закончить работу\n" +" -C tty устройство, из которого читается шрифт\n" +" по умолчанию: текущий tty\n" +" -v выводить подробности выполнения\n" +" -i не выводить таблицу шрифта, просто показать\n" +" СТРОКxСТОЛБЦОВxКОЛИЧЕСТВО и выйти\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Количество символов: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Ширина шрифта : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Высота шрифта : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1660,16 +1699,16 @@ "Отображается %d-символ шрифта\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?НЕИЗВЕСТНО?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "режим kb был %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1678,12 +1717,12 @@ "[ если вы пытаетесь проделать это под X-ами, то, возможно,\n" "это не сработает, так как X-сервер тоже читает /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "пойман сигнал %d, очистка...\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1696,20 +1735,23 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey, версия %s\n" "\n" "Использование: showkey [параметры...]\n" "\n" "Допустимые параметры:\n" +"\n" "\t-h --help \tпоказать эту справку\n" "\t-a --ascii \tпоказать десятичные/восьмеричные/шестнадцатеричные\n" "\t \tзначения клавиш\n" "\t-s --scancodes\tпоказать только скан-коды\n" "\t-k --keycodes \tпоказать только обработанные коды клавиш\n" "\t \t(по умолчанию)\n" +"\t-V --version\tпоказать номер версии\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1720,31 +1762,31 @@ "Нажимайте любые клавиши — работа программы завершается по Ctrl-D\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "нажмите любую клавишу (программа завершается через 10 секунд после " "последнего нажатия на клавиатуре)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "отпущена" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "нажата" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "код клавиши %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "Использование: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1754,17 +1796,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "Теперь вывод на консоль полностью заблокирован %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "Блокировка %s установлена %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" "Используйте Alt-функциональные клавиши для перехода в другие виртуальные " @@ -1806,12 +1848,12 @@ msgid "stdin is not a tty" msgstr "стандартный ввод не является устройством tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Данное устройство tty (%s) не является виртуальной консолью.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Экран консоли не может быть быть заблокирован целиком.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/sv.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/sv.gmo differ diff -Nru kbd-2.0.3/po/sv.po kbd-2.0.4/po/sv.po --- kbd-2.0.3/po/sv.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/sv.po 2017-01-08 18:38:45.000000000 +0000 @@ -1,51 +1,66 @@ # Swedish message file for kbd. -# Martin Sjgren , 2001. +# Copyright © 2016 Free Software Foundation, Inc. +# This file is distributed under the same license as the kbd package. +# +# Martin Sjögren , 2001. # Christer Anderssom , 2007. +# Göran Uddeborg , 2016 # +# $Revision: 1.8 $ msgid "" msgstr "" -"Project-Id-Version: kbd 1.12\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2007-12-19 11:50+0100\n" -"Last-Translator: Christer Andersson \n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-27 23:53+0100\n" +"Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" -msgstr "anvndning: chvt N\n" +msgstr "användning: chvt N\n" + +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Kunde inte få en filidentifierare för konsolen" -#: src/deallocvt.c:35 +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" -msgstr "%s: oknd flagga\n" +msgstr "%s: okänd flagga\n" -#: src/deallocvt.c:50 -#, fuzzy +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" -msgstr "%s: 0: ogiltigt VT-nummer\n" +msgstr "0: ogiltigt VT-nummer\n" -#: src/deallocvt.c:52 -#, fuzzy +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" -msgstr "%s: VT 1 r konsollen och kan inte avallokeras\n" +msgstr "VT 1 är konsolen och kan inte avallokeras\n" -#: src/deallocvt.c:54 -#, fuzzy, c-format +#: src/deallocvt.c:58 +#, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" -msgstr "%s: kunde inte avallokera konsoll %d\n" +msgstr "kunde inte avallokera konsol %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys version %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -55,62 +70,73 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" -"anvndning: dumpkeys [flaggor...]\n" +"användning: dumpkeys [flaggor…]\n" "\n" -"giltiga flaggor r:\n" +"giltiga flaggor är:\n" "\n" -"\t-h --help\t visa den hr hjlptexten\n" -"\t-i --short-info\t visa information om tangentbordsdrivutin\n" -"\t-l --long-info\t visa ovanstende och symboler knda fr loadkeys\n" +"\t-h --help\t visa den här hjälptexten\n" +"\t-i --short-info\t visa information om tangentbordsdrivrutin\n" +"\t-l -s --long-info visa ovanstående och symboler kända för loadkeys\n" "\t-n --numeric\t visa tangentbordstabell i hexadecimal notation\n" -"\t-f --full-table\t anvnd inte kort notation, en rad per tangentkod\n" +"\t-f --full-table\t använd inte kort notation, en rad per tangentkod\n" "\t-1 --separate-lines en rad per (modifierare,tangentkod)-par\n" -"\t --funcs-only\t visa bara strngar fr funktionstangenter\n" -"\t --keys-only\t visa bara tangentbindningar\n" -"\t --composeonly visa bara \"compose\"-tangentkombinationer\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t visa bara strängar för funktionstangenter\n" +"\t-k --keys-only\t visa bara tangentbindningar\n" +"\t-d --compose-only visa bara kompositionstangentkombinationer\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" "\t\t\t specified character set\n" msgstr "" -"\t\t\t tolka teckenhandlingskoder som om de r frn den\n" -"\t\t\t angivna teckenuppsttningen\n" +"\t\t\t tolka teckenåtgärdsskoder som om de är från den\n" +"\t\t\t angivna teckenuppsättningen\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t skriv ut versionsnummer\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" -msgstr "oknd teckenuppsttning %s - ignorerar begran om teckenuppsttning\n" +msgstr "okänd teckenuppsättning %s - ignorerar begäran om teckenuppsättning\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 -#, fuzzy, c-format +#: src/dumpkeys.c:162 src/loadkeys.c:184 +#, c-format msgid "%s: error reading keyboard mode: %m\n" -msgstr "%s: fel nr tangentbordslge sattes\n" +msgstr "%s: fel när tangentbordsläge lästes: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" "(numeric value, symbol)\n" "\n" msgstr "" -"Symboler som knns igen av %s:\n" -"(numeriskt vrde, symbol)\n" +"Symboler som känns igen av %s:\n" +"(numeriskt värde, symbol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -123,44 +149,52 @@ "\t-V --version display program version\n" "\t-n --next-available display number of next unallocated VT\n" msgstr "" +"%s version %s\n" +"\n" +"Användning: %s [flaggor]\n" +"\n" +"Giltiga flaggor är:\n" +"\n" +"\t-h --help visa denna hjälptext\n" +"\t-V --version visa programversionen\n" +"\t-n --next-available visa numret på nästa oallokerade VT\n" -#: src/fgconsole.c:68 -#, fuzzy +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " -msgstr "kunde inte lsa %s\n" +msgstr "Kunde inte läsa VTNO: " -#: src/getfd.c:67 -#, fuzzy, c-format +#: src/getfd.c:69 +#, c-format msgid "Couldn't open %s\n" -msgstr "Kunde inte ppna %s\n" +msgstr "Kunde inte öppna %s\n" -#: src/getfd.c:84 -#, fuzzy, c-format +#: src/getfd.c:86 +#, c-format msgid "Couldn't get a file descriptor referring to the console\n" -msgstr "Kunde inte f en filidentifierare fr konsollen\n" +msgstr "Kunde inte få en filidentifierare för konsolen\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" -msgstr "anvndning: getkeycodes\n" +msgstr "användning: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" -msgstr "Enkla avlsningskoder xx (hex) mot tangentkoder (dec)\n" +msgstr "Enkla avläsningskoder xx (hex) mot tangentkoder (dec)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "" -"0 r ett fel, fr 1-88 (0x01-0x58) r avlsningskoden lika med tangentkoden\n" +"0 är ett fel, för 1-88 (0x01-0x58) är avläsningskoden lika med tangentkoden\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" -msgstr "fr 1-%d (0x01-0x%02x) r avlsningskoden lika med tangentkoden\n" +msgstr "för 1-%d (0x01-0x%02x) är avläsningskoden lika med tangentkoden\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -169,278 +203,288 @@ msgstr "" "\n" "\n" -"Utvidgade avlsningskoder e0 xx (hex)\n" +"Utvidgade avläsningskoder e0 xx (hex)\n" -#: src/getkeycodes.c:90 -#, fuzzy, c-format +#: src/getkeycodes.c:95 +#, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" -msgstr "misslyckades med att hmta tangentkoden fr avlsningskod 0x%x\n" +msgstr "" +"misslyckades med att hämta tangentkoden för avläsningskod 0x%x: ioctl " +"KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" "\t%s [-s] [-C console]\n" msgstr "" -"Anvndning:\n" -"\t%s [-s] [-C konsoll]\n" +"Användning:\n" +"\t%s [-s] [-C konsol]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" -msgstr "" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +msgstr "" +"Användning: %1$s [-C ENHET] getmode [text|graphics]\n" +" eller: %1$s [-C ENHET] gkbmode [raw|xlate|mediumraw|unicode]\n" +" eller: %1$s [-C ENHET] gkbmeta [metabit|escprefix]\n" +" eller: %1$s [-C ENHET] gkbled [scrolllock|numlock|capslock]\n" +"Andra flaggor:\n" +" -h skriv detta användningsmeddelande\n" +" -V skriv ut versionsnummer\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "Fel: Inte tillräckligt med argument.\n" -#: src/kbdinfo.c:123 -#, fuzzy, c-format +#: src/kbdinfo.c:147 +#, c-format msgid "Error: Unrecognized action: %s\n" -msgstr "" -"oknt argument: _%s_\n" -"\n" +msgstr "Fel: Okänd åtgärd: %s\n" -#: src/kbd_mode.c:22 -#, fuzzy, c-format +#: src/kbd_mode.c:24 +#, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" -msgstr "anvndning: kbd_mode [-a|-u|-k|-s]\n" +msgstr "användning: kbd_mode [-a|-u|-k|-s] [-C enhet]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" -msgstr "Tangentbordet r i rtt (avlsningskods-)lge\n" +msgstr "Tangentbordet är i rått (avläsningskods-)läge\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" -msgstr "Tangentbordet r i halvrtt (tangentkods-)lge\n" +msgstr "Tangentbordet är i halvrått (tangentkods-)läge\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" -msgstr "Tangentbordet r i standardlge (ASCII)\n" +msgstr "Tangentbordet är i standardläge (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" -msgstr "Tangentbordet r i Unicodelge (UTF-8)\n" +msgstr "Tangentbordet är i Unicode-läge (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" -msgstr "Tangentbordet r i ngot oknt lge\n" +msgstr "Tangentbordet är i något okänt läge\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" -msgstr "Upprepningshastighet satt till %.1f t/s (frdrjning = %d ms)\n" +msgstr "Upprepningshastighet satt till %.1f t/s (fördröjning = %d ms)\n" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Anvndning: kbdrate [-V] [-s] [-r frekvens] [-d frdrjning]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "" +"Användning: kbdrate [-V | --version] [-s] [-r frekvens] [-d fördröjning]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" -msgstr "Kan inte ppna /dev/port" +msgstr "Kan inte öppna /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "fel: getfont anropad med count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" -msgstr "" +msgstr "fel: getfont som använder GIO_FONT behöver buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: minnet slut\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "konstigt … ct ändrades från %d till %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"Det verkar som att denna kärna är äldre än 1.1.92\n" +"Ingen Unicode-konverteringstabell inläst.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 -#, fuzzy +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" -msgstr "%s: minnet slut\n" +msgstr "minnet slut" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" -msgstr "" +msgstr "kan inte initiera vektor: %s" -#: src/libkeymap/dump.c:82 -#, fuzzy +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" -msgstr "Fel vid skrivning av tabell till fil\n" +msgstr "Fel vid skrivning av tabell till fil" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" -msgstr "omjligt: inte meta?\n" +msgstr "omöjligt: inte meta?\n" -#: src/libkeymap/kernel.c:31 -#, fuzzy, c-format +#: src/libkeymap/kernel.c:32 +#, c-format msgid "KDGKBENT: %s: error at index %d in table %d" -msgstr "KDGKBENT-fel vid index %d i tabell %d\n" +msgstr "KDGKBENT: %s: fel vid index %d i tabell %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" -msgstr "" +msgstr "KDGKBSENT: %s: Kan inte hämta funktionstangentssträng" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" -msgstr "" +msgstr "KDGKBDIACR(UC): %s: Kan inte hämta accenttabell" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" -msgstr "" +msgstr "kan inte hämta tangenttabell %d" -#: src/libkeymap/kmap.c:110 -#, fuzzy, c-format +#: src/libkeymap/kmap.c:106 +#, c-format msgid "unable to unset key %d for table %d" -msgstr "misslyckades med att hmta tangentkoden fr avlsningskod 0x%x\n" +msgstr "kan inte ta bort tangent %d i tabell %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" -msgstr "" +msgstr "lk_add_key anropad med felaktig tangentkod %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" -msgstr "" +msgstr "att lägga till tabell %d bryter mot explicit tangenttabellrad" -#: src/libkeymap/kmap.c:153 -#, fuzzy, c-format +#: src/libkeymap/kmap.c:145 +#, c-format msgid "unable to set key %d for table %d" -msgstr "misslyckades med att hmta tangentkoden fr avlsningskod 0x%x\n" +msgstr "kan inte sätta nyckel %d för tabell %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" -msgstr "" +msgstr "omöjligt fel i lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" -msgstr "" +msgstr "kan inte hämta symbol enligt fel typ: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" -msgstr "" +msgstr "kan inte hämta symbol av typ %d enligt fel index: %d" -#: src/libkeymap/ksyms.c:348 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:339 +#, c-format msgid "assuming iso-8859-1 %s" -msgstr "antar iso-8859-1 %s\n" +msgstr "antar iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:345 +#, c-format msgid "assuming iso-8859-15 %s" -msgstr "antar iso-8859-15 %s\n" +msgstr "antar iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:351 +#, c-format msgid "assuming iso-8859-2 %s" -msgstr "antar iso-8859-2 %s\n" +msgstr "antar iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:357 +#, c-format msgid "assuming iso-8859-3 %s" -msgstr "antar iso-8859-3 %s\n" +msgstr "antar iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:363 +#, c-format msgid "assuming iso-8859-4 %s" -msgstr "antar iso-8859-4 %s\n" +msgstr "antar iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" -msgstr "oknd teckensymbol \"%s\"\n" +msgstr "okänd teckensymbol \"%s\"\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" -msgstr "" +msgstr "KDSKBMODE: %s: kunde inte byta till Unicode-läge" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" -msgstr "" +msgstr "Tangenttabell %d: Åtkomst nekas" -#: src/libkeymap/loadkeys.c:56 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:58 +#, c-format msgid "keycode %d, table %d = %d%s" -msgstr "tangentkod %3d %s\n" +msgstr "tangentkod %d, tabell %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" -msgstr "" +msgstr " MISSLYCKADES" -#: src/libkeymap/loadkeys.c:60 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:62 +#, c-format msgid "failed to bind key %d to value %d" -msgstr "kunde inte stta avlsningskoden %x till tangentkoden %d\n" +msgstr "misslyckades att binda tangent %d till värdet %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" -msgstr "" +msgstr "avallokera tangenttabell %d" -#: src/libkeymap/loadkeys.c:74 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:76 +#, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" -msgstr "%s: kunde inte avallokera konsoll %d\n" +msgstr "KDSKBENT: %s: kunde inte avallokera tangenttabell %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" -msgstr "" +msgstr "KDSKBENT: %s: kan inte avallokera eller tömma tangenttabell" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" -msgstr "" +msgstr "KDSKBMODE: %s: kunde inte återgå till originaltangentbordsläget" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" -msgstr "" +msgstr "misslyckades att binda strängen ”%s” till funktionen %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" -msgstr "" +msgstr "misslyckades att tömma strängen %s" -#: src/libkeymap/loadkeys.c:190 -#, fuzzy +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" -msgstr "strsta antal kompositionsdefinitioner: %d\n" +msgstr "för många kompositionsdefinitioner" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -449,68 +493,71 @@ "\n" "Changed %d keys" msgstr[0] "" +"\n" +"Ändrade %d nyckel" msgstr[1] "" +"\n" +"Ändrade %d nycklar" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ändrade %d sträng" +msgstr[1] "Ändrade %d strängar" -#: src/libkeymap/loadkeys.c:260 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:261 +#, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" -msgstr[0] "strsta antal kompositionsdefinitioner: %d\n" -msgstr[1] "strsta antal kompositionsdefinitioner: %d\n" +msgstr[0] "Laddade %d kompositionsdefinition" +msgstr[1] "Laddade %d kompositionsdefinitioner" -#: src/libkeymap/loadkeys.c:264 -#, fuzzy +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" -msgstr "strsta antal kompositionsdefinitioner: %d\n" +msgstr "(Ingen ändring bland kompositionsdefinitioner)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" -msgstr "tangentkodsintervall som stds av krnan: 1 - %d\n" +msgstr "tangentkodsintervall som stödjs av kärnan: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" -msgstr "strsta antal handlingar bindbara till en tangent: %d\n" +msgstr "största antal handlingar bindbara till en tangent: %d\n" -#: src/libkeymap/summary.c:101 -#, fuzzy, c-format +#: src/libkeymap/summary.c:99 +#, c-format msgid "number of keymaps in actual use: %u\n" -msgstr "antal tangentbordstabeller som faktiskt anvnds: %d\n" +msgstr "antal tangentbordstabeller som faktiskt används: %u\n" -#: src/libkeymap/summary.c:104 -#, fuzzy, c-format +#: src/libkeymap/summary.c:102 +#, c-format msgid "of which %u dynamically allocated\n" -msgstr "varav %d r dynamiskt allokerade\n" +msgstr "varav %u är dynamiskt allokerade\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" -msgstr "intervall av handlingskoder som stds av krnan:\n" +msgstr "intervall av handlingskoder som stödjs av kärnan:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" -msgstr "antal funktionstangenter som stds av krnan: %d\n" +msgstr "antal funktionstangenter som stödjs av kärnan: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" -msgstr "strsta antal kompositionsdefinitioner: %d\n" +msgstr "största antal kompositionsdefinitioner: %d\n" -#: src/libkeymap/summary.c:117 -#, fuzzy, c-format +#: src/libkeymap/summary.c:115 +#, c-format msgid "nr of compose definitions in actual use: %u\n" -msgstr "antal kompositionsdefinitioner som faktiskt anvnds: %d\n" +msgstr "antal kompositionsdefinitioner som faktiskt används: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -518,24 +565,24 @@ "\n" msgstr "" "\n" -"Fljande synonymer knns igen:\n" +"Följande synonymer känns igen:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" -msgstr "%-15s fr %s\n" +msgstr "%-15s för %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" "Recognized modifier names and their column numbers:\n" msgstr "" "\n" -"Igenknda modifierarnamn och deras kolumnnummer:\n" +"Igenkända modifierarnamn och deras kolumnnummer:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -557,180 +604,204 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" +"loadkeys version %s\n" +"\n" +"Användning: %s [flaggor…] [tabellfil…]\n" +"\n" +"Giltiga flaggor är:\n" +"\n" +" -a --ascii framtvinga konvertering till ASCII\n" +" -b --bkeymap mata ut en binär tangenttabell på standard ut\n" +" -c --clearcompose töm kärnans kompositionstabell\n" +" -C --console=fil konsolenheten att använda\n" +" -d --default läs in ”%s”\n" +" -h --help visa denna hjälptext\n" +" -m --mktable mata ut en ”defkeymap.c” till standard ut\n" +" -p --parse sök och tolka tangenttabell utan åtgärd\n" +" -q --quiet undertryck normal utmatning\n" +" -s --clearstrings töm kärnans strängtabell\n" +" -u --unicode framtvinga konvertering till Unicode\n" +" -v --verbose rapportera ändringarna\n" +" -V --version skriv ut versionsnummer\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" -msgstr "%s frn %s\n" +msgstr "%s från %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" -msgstr "" +msgstr "%s: Flaggorna --unicode och --ascii är ömsesidigt uteslutande\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" +"%s: varning: läser in en icke-Unicode-tangenttabell på en Unicode-konsol\n" +" (kanske du vill göra ”kbd_mode -a”?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" +"%s: varning: läser in en Unicode-tangenttabell på en icke-Unicode-konsol\n" +" (kanske du vill göra ”kbd_mode -u”?)\n" -#: src/loadkeys.c:220 -#, fuzzy, c-format +#: src/loadkeys.c:222 +#, c-format msgid "Cannot find %s\n" -msgstr "Hittar inte typsnittet %s\n" +msgstr "Hittar inte %s\n" -#: src/loadkeys.c:242 -#, fuzzy, c-format +#: src/loadkeys.c:243 +#, c-format msgid "cannot open file %s\n" -msgstr "Kan inte ppna typsnittsfilen %s\n" +msgstr "kan inte öppna filen %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" "\t%s [-C console] [-o map.orig]\n" msgstr "" -"Anvndning:\n" -"\t%s [-C konsoll] [-o originaltabell]\n" +"Användning:\n" +"\t%s [-C konsol] [-o originaltabell]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Felaktig indatarad: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" -msgstr "%s: Teckennummer (0x%x) strre n typsnittslngd\n" +msgstr "%s: Glyfnummer (0x%x) större än typsnittslängd\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" -msgstr "%s: Felaktigt slut p intervall (0x%x)\n" +msgstr "%s: Felaktigt slut på intervall (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" +"%s: Felaktigt Unicode-intervall som motsvarar typsnittspositionsintervall 0x" "%x-0x%x\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, 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 lngd som " +"%s: Unicode-intervall 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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" -msgstr "%s: efterfljande skrp (%s) ignorerat\n" +msgstr "%s: efterföljande skräp (%s) ignorerat\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" -msgstr "Lser in unicodetabell frn fil %s\n" +msgstr "Läser in Unicode-tabell från fil %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" -msgstr "%s: %s: Varning: raden r fr lng\n" +msgstr "%s: %s: Varning: raden är för lång\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" "(if you insist: use option -f to override)\n" msgstr "" -"%s: lser inte in tom unitabell\n" -"(om du insisterar: anvnd flaggan -f fr att sidostta)\n" +"%s: läser inte in tom unitabell\n" +"(om du insisterar: använd flaggan -f för att åsidosätta)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "post" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "poster" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" -msgstr "Sparade unicodetabell till \"%s\"\n" +msgstr "Sparade Unicode-tabell till \"%s\"\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" -msgstr "Lade till Unicodetabell\n" +msgstr "Lade till Unicode-tabell\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "anvndning: %s [-v] [-o originaltabell] tabellfil\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "användning: %s [-V] [-v] [-o originaltabell] tabellfil\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" -msgstr "mapscrn: kan inte ppna tabellfil _%s_\n" +msgstr "mapscrn: kan inte öppna tabellfil _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" -msgstr "Kan inte ta status p tabellfil" +msgstr "Kan inte ta status på tabellfil" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" -msgstr "Lser in binr direkt-till-typsnitt-skrmtabell frn fil %s\n" +msgstr "Läser in binär direkt-till-typsnitt-skärmtabell från fil %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" -msgstr "Fel vid lsning av tabell frn fil \"%s\"\n" +msgstr "Fel vid läsning av tabell från fil \"%s\"\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" -msgstr "Lser in binr unicode-skrmfil frn fil %s\n" +msgstr "Läser in binär Unicode-skärmfil från fil %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" -msgstr "Lser in symbolisk skrmtabell frn fil %s\n" +msgstr "Läser in symbolisk skärmtabell från fil %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" -msgstr "Fel vid tolkning av symbolisk tabell frn \"%s\", rad %d\n" +msgstr "Fel vid tolkning av symbolisk tabell från \"%s\", rad %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Fel vid skrivning av tabell till fil\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" -msgstr "Kan inte lsa konsolltabell\n" +msgstr "Kan inte läsa konsoltabell\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" -msgstr "Sparade skrmtabell i \"%s\"\n" +msgstr "Sparade skärmtabell i \"%s\"\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -750,272 +821,283 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"Användning: %s [OPTIONS] -- kommando\n" +"\n" +"Detta verktyg hjälper dig att starta ett program på en ny virtuell terminal " +"(VT).\n" +"\n" +"Flaggor:\n" +" -c, --console=NUM använd det angivna VT-numret;\n" +" -e, --exec kör kommandot, utan att grena;\n" +" -f, --force framtvinga att öppna en VT utan kontroll;\n" +" -l, --login gör kommandot till ett inloggningsskal;\n" +" -u, --user ta reda på ägaren till den aktuella VT:n;\n" +" -s, --switch byt till den nya VT:n;\n" +" -w, --wait vänta på att kommandot avslutar;\n" +" -v, --verbose skriv ett meddelande för varje åtgärd;\n" +" -V, --version skriv programversionen och avsluta;\n" +" -h, --help skriv ut ett kort hjälpmeddelande.\n" +"\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" -msgstr "" +msgstr "Kunde inte hitta ägaren till den aktuella tty:n!" -#: src/openvt.c:208 -#, fuzzy, c-format +#: src/openvt.c:210 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt: %s: otilltet vt-nummer\n" +msgstr "%s: Otillåtet vt-nummer" -#: src/openvt.c:234 -#, fuzzy +#: src/openvt.c:236 msgid "Only root can use the -u flag." -msgstr "openvt: endast root kan anvnda flaggan -u.\n" +msgstr "Endast root kan använda flaggan -u." -#: src/openvt.c:256 -#, fuzzy -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Kunde inte f en filidentifierare fr konsollen\n" - -#: src/openvt.c:263 -#, fuzzy +#: src/openvt.c:265 msgid "Cannot find a free vt" -msgstr "openvt: kan inte hitta en ledig vt\n" +msgstr "Kan inte hitta en ledig vt" -#: src/openvt.c:267 -#, fuzzy, c-format +#: src/openvt.c:269 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt: kan inte underska huruvida vt %d r ledig\n" +msgstr "" +"Kan inte undersöka huruvida vt %d är ledig; använd ”%s -f“ för att " +"framtvinga." -#: src/openvt.c:271 -#, fuzzy, c-format +#: src/openvt.c:273 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt: vt %d anvnds, kommandot avbrutet\n" +msgstr "vt %d används, kommandot avbrutet; använd ”%s -f” för att framtvinga." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." -msgstr "" +msgstr "Kunde inte hitta kommandot." -#: src/openvt.c:313 -#, fuzzy +#: src/openvt.c:315 msgid "Unable to set new session" -msgstr "openvt: Kan inte stta ny session (%s)\n" +msgstr "Kan inte sätta ny session" -#: src/openvt.c:337 -#, fuzzy, c-format +#: src/openvt.c:339 +#, c-format msgid "Unable to open %s" -msgstr "openvt: Kan inte ppna %s: %s\n" +msgstr "Kan inte öppna %s" -#: src/openvt.c:341 -#, fuzzy, c-format +#: src/openvt.c:343 +#, c-format msgid "Using VT %s" -msgstr "openvt: anvnder VT %s\n" +msgstr "Använder VT %s" -#: src/openvt.c:347 -#, fuzzy, c-format +#: src/openvt.c:349 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt: Kan inte ppna %s fr lsning/skrivning (%s)\n" +msgstr "Kan inte öppna %s för läsning/skrivning" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" -msgstr "" +msgstr "Kunde inte aktivera vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" -msgstr "" +msgstr "Aktiveringen avbröts?" -#: src/openvt.c:401 -#, fuzzy, c-format +#: src/openvt.c:403 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s: kunde inte avallokera konsoll %d\n" +msgstr "Kunde inte avallokera konsol %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" -msgstr "%s: kort ucs2-unicodetabell\n" +msgstr "%s: kort ucs2-Unicode-tabell\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" -msgstr "%s: kort utf8-unicodetabell\n" +msgstr "%s: kort utf8-Unicode-tabell\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: felaktig utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" -msgstr "%s: oknt utf8-fel\n" +msgstr "%s: okänt utf8-fel\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" -msgstr "%s: kort unicodetabell\n" +msgstr "%s: kort Unicode-tabell\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" -msgstr "%s: Fel vid lsning av indatatypsnitt" +msgstr "%s: Fel vid läsning av indatatypsnitt" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Felaktigt anrop av readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" -msgstr "%s: psf-fillge (%d) stds inte\n" +msgstr "%s: psf-filläge (%d) stödjs inte\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" -msgstr "%s: psf-version (%d) stds inte\n" +msgstr "%s: psf-version (%d) stödjs inte\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" -msgstr "%s: lngd av indatatypsnitt r noll?\n" +msgstr "%s: längd av indatatypsnitt är noll?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" -msgstr "%s: storlek av indatatecken r noll?\n" +msgstr "%s: storlek av indatatecken är noll?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" -msgstr "%s: Indatafil: ogiltig indatalngd (%d)\n" +msgstr "%s: Indatafil: ogiltig indatalängd (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" -msgstr "%s: Indatafil: efterfljande skrp\n" +msgstr "%s: Indatafil: efterföljande skräp\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" -msgstr "appendunicode: ogiltig unicode %u\n" +msgstr "appendunicode: ogiltig Unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Kan inte skriva typsnittsfilshuvud" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Kan inte skriva till typsnittsfilen" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" -msgstr "%s: Varning: raden r fr lng\n" +msgstr "%s: Varning: raden är för lång\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Felaktig indatarad: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Glyfnummer (0x%lx) bortom slutet av typsnittet\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Felaktigt slut av intervall (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, 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" +"ett Unicode-intervall\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" "\t%s infont intable outfont\n" msgstr "" -"Anvndning:\n" +"Användning:\n" "\t%s intypsnitt intabell uttypsnitt\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" "\t%s infont [outtable]\n" msgstr "" -"Anvndning:\n" +"Användning:\n" "\t%s intypsnitt [uttabell]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" "\t%s infont outfont\n" msgstr "" -"Anvndning:\n" +"Användning:\n" "\t%s intypsnitt uttypsnitt\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" msgstr "" -"Anvndning:\n" +"Användning:\n" "\t%s [-i intypsnitt] [-o uttypsnitt] [-it intabell] [-ot uttabell] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" -msgstr "%s: Felaktigt magiskt nummer p %s\n" +msgstr "%s: Felaktigt magiskt nummer på %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" -msgstr "%s: psf-fil med oknd magi\n" +msgstr "%s: psf-fil med okänd magi\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" -msgstr "%s: indatatypsnittet har inte ngot index\n" +msgstr "%s: indatatypsnittet har inte något index\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" -msgstr "resizecons: kan inte hitta videolgesfil %s\n" +msgstr "resizecons: kan inte hitta videolägesfil %s\n" #: src/resizecons.c:164 msgid "Invalid number of lines\n" msgstr "Ogiltigt antal rader\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" -msgstr "Gammalt lge: %d%d Nytt lge: %d%d\n" +msgstr "Gammalt läge: %d×%d Nytt läge: %d×%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "" -"Gammalt antal skannlinjer: %d Nytt antal skannlinjer: %d Teckenhjd: %d\n" +"Gammalt antal skannlinjer: %d Nytt antal skannlinjer: %d Teckenhöjd: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: kommandot \"%s\" misslyckades\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" msgstr "" -"resizecons: glm inte ndra TERM (kanske till con%dx%d eller linux-%dx%d)\n" +"resizecons: glöm inte ändra TERM (kanske till con%dx%d eller linux-%dx%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1025,45 +1107,45 @@ msgstr "" "resizecons:\n" "anrop: resizecons KOLUMNERxRADER eller: resizecons KOLUMNER RADER\n" -"eller: resizecons -lines RADER, dr RADER r en av 25, 28, 30, 34, 36, 40, " +"eller: resizecons -lines RADER, där RADER är en av 25, 28, 30, 34, 36, 40, " "44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" -msgstr "resizecons: kan inte f I/O-rttigheter.\n" +msgstr "resizecons: kan inte få I/O-rättigheter.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" -msgstr "anvndning: screendump [n]\n" +msgstr "användning: screendump [n]\n" -#: src/screendump.c:80 -#, fuzzy, c-format +#: src/screendump.c:82 +#, c-format msgid "Error reading %s" -msgstr "Fel vid lsning av %s\n" +msgstr "Fel vid läsning av %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" -msgstr "kunde inte lsa %s, och kan inte kra \"ioctl dump\"\n" +msgstr "kunde inte läsa %s, och kan inte köra \"ioctl dump\"\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" -msgstr "kunde inte lsa %s\n" +msgstr "kunde inte läsa %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" -msgstr "Konstigt ... skrmen r bde %d%d och %d%d??\n" +msgstr "Konstigt ... skärmen är både %d×%d och %d×%d??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" -msgstr "Fel vid skrivning av skrmdump\n" +msgstr "Fel vid skrivning av skärmdump\n" -#: src/setfont.c:74 -#, fuzzy, c-format +#: src/setfont.c:78 +#, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " "unicodemap]\n" @@ -1090,216 +1172,218 @@ " -V Print version and exit.\n" "Files are loaded from the current directory or %s/*/.\n" msgstr "" -"Anvndning: setfont [skrivflaggor] [-] [nyttypsnitt..] [-m konsolltabell] " -"[-u unicodetabell]\n" -" skrivflaggor (hnder fre filer lses):\n" +"Användning: setfont [skrivflaggor] [-] [nytt_typsnitt…] [-m konsoltabell] " +"[-u Unicode-tabell]\n" +" skrivflaggor (händer före filer läses):\n" " -o Skriv nuvarande typsnitt till \n" -" -O Skriv nuvarande typsnitt och unicodetabell till \n" -" -om Skriv nuvarande konsolltabell till \n" -" -ou Skriv nuvarande unicodetabell till \n" -"Om inget \"nyttypsnitt\" och ingen -[o|O|om|ou|m|u]-flagga r given,\n" -"lses ett standardtypsnitt in:\n" -" setfont Ls in typsnitt \"default[.gz]\"\n" -" setfont - Ls in typsnitt \"default8x[.gz]\"\n" -"--flaggan vljer ett typsnitt frn en teckentabell som innehller tre " +" -O Skriv nuvarande typsnitt och Unicode-tabell till " +"\n" +" -om Skriv nuvarande konsoltabell till \n" +" -ou Skriv nuvarande Unicode-tabell till \n" +"Om inget \"nytt_typsnitt\" och ingen -[o|O|om|ou|m|u]-flagga är given,\n" +"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] Ls in 8-typsnitt frn " +" 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 lsas in och, om det gller konsolltabeller, aktiveras.\n" -" -h (inget blanktecken) sidostt typsnittshjd.\n" -" -m Ls in konsollskrmstabell.\n" -" -u Ls in unicodetypsnittstabell.\n" -" -m none Lt bli att lsa in och aktivera skrmtabell.\n" -" -u none Lt bli att lsa in unicodetabell.\n" +"kommer läsas in och, om det gäller konsoltabeller, aktiveras.\n" +" -h (inget blanktecken) åsidosätt typsnittshöjd.\n" +" -m Läs in konsolskärmstabell.\n" +" -u Läs in Unicode-typsnittstabell.\n" +" -m none Låt bli att läsa in och aktivera skärmtabell.\n" +" -u none Låt bli att läsa in Unicode-tabell.\n" " -v Var pratsam.\n" " -V Skriv ut version och avsluta.\n" -"Filer lses in frn den aktuella katalogen eller /usr/lib/kbd/*/.\n" +"Filer läses in från den aktuella katalogen eller %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" -msgstr "setfont: fr mnga indatafiler\n" +msgstr "setfont: för många indatafiler\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " "unchanged.\n" msgstr "" -"setfont: kan inte bde terstlla frn tecken-ROM och frn fil. Fonten " -"ofrndrad.\n" +"setfont: kan inte både återställa från tecken-ROM och från fil. Typsnittet " +"oförändrat.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" -msgstr "Felaktig teckenhjd %d\n" +msgstr "Felaktig teckenhöjd %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Felaktig teckenbredd %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" -msgstr "%s: Typsnittsposition 32 r icke-blank\n" +msgstr "%s: typsnittsposition 32 är icke-blank\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: rensade det\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: bakgrunden kommer se konstig ut\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" -msgstr "Lser in %d-teckens %d%d-typsnitt frn filen %s\n" +msgstr "Läser in %d-teckens %d×%d-typsnitt från filen %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" -msgstr "Lser in %d-teckens %d%d-typsnitt\n" +msgstr "Läser in %d-teckens %d×%d-typsnitt\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" -msgstr "Lser in %d-teckens %d%d-typsnitt (%d) frn filen %s\n" +msgstr "Läser in %d-teckens %d×%d-typsnitt (%d) från filen %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" -msgstr "Lser in %d-teckens %d%d-typsnitt (%d)\n" +msgstr "Läser in %d-teckens %d×%d-typsnitt (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: fel i do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" -msgstr "Lser in Unicode-konverteringsstabell...\n" +msgstr "Läser in Unicode-konverteringsstabell …\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" -msgstr "Kan inte ppna typsnittsfilen %s\n" +msgstr "Kan inte öppna typsnittsfilen %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" -"Nr flera typsnitt lses in mste alla vara psf-typsnitt - %s r inte det\n" +"När flera typsnitt läses in måste alla vara psf-typsnitt - %s är inte det\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" -msgstr "Lste %d-teckens %d%d-typsnitt frn filen %s\n" +msgstr "Läste %d-teckens %d×%d-typsnitt från filen %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" -msgstr "Nr flera typsnitt lses in mste alla ha samma hjd\n" +msgstr "När flera typsnitt läses in måste alla ha samma höjd\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" -msgstr "Nr flera typsnitt lses in mste alla ha samma bredd\n" +msgstr "När flera typsnitt läses in måste alla ha samma bredd\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Hittar inte standardtypsnittet\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Hittar inte typsnittet %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" -msgstr "Lser typsnittsfilen %s\n" +msgstr "Läser typsnittsfilen %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Inget slutgiltigt nyradstecken i kombinationsfilen\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" -msgstr "Fr mnga filer att kombinera\n" +msgstr "För många filer att kombinera\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" -msgstr "Hmm - ett typsnitt frn restorefont? Anvnder frsta halvan.\n" +msgstr "Hmm - ett typsnitt från restorefont? Använder första halvan.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" -msgstr "Felaktig storlek p indatafilen\n" +msgstr "Felaktig storlek på indatafilen\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" "using an option -8 or -14 or -16 which one you want loaded.\n" msgstr "" -"Den hr filen innehller 3 typsnitt: 88, 814 och 816. Vlj vilket\n" -"du vill lsa in med ngon av flaggorna -8, -14 och -16.\n" +"Den här filen innehåller 3 typsnitt: 8×8, 8×14 och 8×16. Välj vilket\n" +"du vill läsa in med någon av flaggorna -8, -14 och -16.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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 mjliga hr.\n" +"Du bad om typsnittsstorleken %d, men bara 8, 14 och 16 är möjliga här.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Hittade inget att spara\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" -msgstr "Sparade %d-teckens %d%d-typsnittsfil till %s\n" +msgstr "Sparade %d-teckens %d×%d-typsnittsfil till %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" " (where scancode is either xx or e0xx, given in hexadecimal,\n" " and keycode is given in decimal)\n" msgstr "" -"anvndning: setkeycode avlsningskod tangentkod ...\n" -" (dr avlsningskod r antingen xx eller e0xx angivet hexadecimalt,\n" -" och tangentkod r angivet decimalt)\n" +"användning: setkeycode avläsningskod tangentkod ...\n" +" (där avläsningskod är antingen xx eller e0xx angivet hexadecimalt,\n" +" och tangentkod är angivet decimalt)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" -msgstr "jmnt antal argument frvntades" +msgstr "jämnt antal argument förväntades" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" -msgstr "fel vid lsning av avlsningskod" +msgstr "fel vid läsning av avläsningskod" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" -msgstr "kod utanfr grnserna" +msgstr "kod utanför gränserna" -#: src/setkeycodes.c:69 -#, fuzzy, c-format +#: src/setkeycodes.c:74 +#, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" -msgstr "kunde inte stta avlsningskoden %x till tangentkoden %d\n" +msgstr "" +"kunde inte sätta avläsningskoden %x till tangentkoden %d; ioctl KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1315,120 +1399,119 @@ "With -D, setleds sets both the flags and the default flags, so\n" "that a subsequent reset will not change the flags.\n" msgstr "" -"Anvndning:\n" +"Användning:\n" "\tsetleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" "Dvs,\n" "\tsetleds +caps -num\n" -"kommer stta capslock, stnga av numlock och lmna scrollock ofrndrad.\n" -"Instllningarna fre och efter ndring (om ngon) rapporteras nr\n" -"-v-flaggan r given eller nr inga ndringar begrs.\n" -"Normalt pverkar setleds vt-flagginstllningarna\n" +"kommer sätta capslock, stänga av numlock och lämna scrollock oförändrad.\n" +"Inställningarna före och efter ändring (om någon) rapporteras när\n" +"-v-flaggan är given eller när inga ändringar begärs.\n" +"Normalt påverkar setleds vt-flagginställningarna\n" "(och detta visas normalt med dioderna).\n" -"Med -L stter setleds dioderna och pverkar inte flaggorna.\n" -"Med -D stter bde flaggorna och standardflaggorna s att senare\n" -"nollstllningar inte kommer ndra flaggorna.\n" +"Med -L sätter setleds dioderna och påverkar inte flaggorna.\n" +"Med -D sätter både flaggorna och standardflaggorna så att senare\n" +"nollställningar inte kommer ändra flaggorna.\n" #: src/setleds.c:46 msgid "on " -msgstr "p" +msgstr "på" #: src/setleds.c:46 msgid "off" msgstr "av" -#: src/setleds.c:87 -#, fuzzy +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" -"Fel vid lsning av nuvarande instllning. Standard in kanske inte r en VT?\n" +"Fel vid läsning av nuvarande inställning. Standard in kanske inte är en VT?: " +"ioctl KDGETLED" -#: src/setleds.c:105 -#, fuzzy +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" msgstr "" -"Fel vid lsning av nuvarande flagginstllning. Du kanske inte r p " -"konsollen?\n" +"Fel vid läsning av nuvarande flagginställning. Du kanske inte är på " +"konsolen?: ioctl KDGKBLED" -#: src/setleds.c:123 -#, fuzzy +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" -msgstr "Fel vid lsning av nuvarande diodinstllning frn /dev/kbd.\n" +msgstr "" +"Fel vid läsning av nuvarande diodinställning från /dev/kbd: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" -msgstr "KIOCGLED inte tillgnglig?\n" +msgstr "KIOCGLED inte tillgänglig?\n" -#: src/setleds.c:141 -#, fuzzy +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" -msgstr "Fel vid lsning av nuvarande diodinstllning frn /dev/kbd.\n" +msgstr "" +"Fel vid läsning av nuvarande diodinställning från /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" -msgstr "KIOCSLED inte tillgnglig?\n" +msgstr "KIOCSLED inte tillgänglig?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" -msgstr "Fel vid nollstllning av diodlge\n" +msgstr "Fel vid nollställning av diodläge\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Nuvarande standardflaggor: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Nuvarande flaggor: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Nuvarande dioder: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" "\n" msgstr "" -"oknt argument: _%s_\n" +"okänt argument: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Gamla standardflaggor: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Nya standardflaggor: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Gamla flaggor: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Nya flaggor: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Gamla dioder: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Nya dioder: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1438,51 +1521,52 @@ "to change the settings of another vt.\n" "The setting before and after the change are reported.\n" msgstr "" -"Anvndning:\n" +"Användning:\n" "\tsetmetamode [ metabit | meta | bit | escprefix | esc | prefix ]\n" -"Varje vt har sin egen kopia av den hr biten. Anvnd\n" +"Varje vt har sin egen kopia av den här biten. Använd\n" "\tsetmetamode [arg] < /dev/ttyn\n" -"fr att ndra instllningen fr en annan vt.\n" -"Instllningen fre och efter frndringen rapporteras.\n" +"för att ändra inställningen för en annan vt.\n" +"Inställningen före och efter förändringen rapporteras.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" -msgstr "Metatangenten stter hgsta biten\n" +msgstr "Metatangenten sätter högsta biten\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Metatangenten ger esc-prefix\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" -msgstr "Konstigt lge fr Metatangenten?\n" +msgstr "Konstigt läge för Metatangenten?\n" -#: src/setmetamode.c:79 -#, fuzzy +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" -"Fel vid lsning av nuvarande instllning. Standard in kanske inte r en VT?\n" +"Fel vid läsning av nuvarande inställning. Standard in kanske inte är en VT?: " +"ioctl KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " -msgstr "gammalt tillstnd: " +msgstr "gammalt tillstånd: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " -msgstr "nytt tillstnd: " +msgstr "nytt tillstånd: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" -msgstr "anvndning: %s\n" +msgstr "användning: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1492,41 +1576,61 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" +"Användning: %s [-h] [-V]\n" +" %s vga|FIL|-\n" +"\n" +"Om du använder parametern FIL, skall FIL vara precis 3 rader med\n" +"kommaseparerade decimala värden för RÖD, GRÖN och BLÅ.\n" +"\n" +"För att initiera en giltig FIL:\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > FILE\n" +"\n" +"och redigera sedan värdena i FIL.\n" +"\n" +"Andra flaggor:\n" +" -h skriv detta användningsmeddelande\n" +" -V skriv ut versionsnummer\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "Fel: %s: Felaktigt värde i fält %u på rad %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "Fel: %s: Otillräckligt antal fält på rad %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "Fel: %s: Rad %u slutade oväntat.\n" -#: src/setvtrgb.c:84 -#, fuzzy, c-format +#: src/setvtrgb.c:91 +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s: %s: Varning: raden r fr lng\n" +msgstr "Fel: %s: Rad %u är för lång.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" -msgstr "misslyckades med att terstlla originalversttningstabellen\n" +msgstr "" +"misslyckades med att återställa den ursprungliga översättningstabellen\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" -msgstr "misslyckades med att terstlla originalunitabell\n" +msgstr "misslyckades med att återställa den ursprungliga uni-tabellen\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" -msgstr "kan inte ndra versttningstabellen\n" +msgstr "kan inte ändra översättningstabellen\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1534,58 +1638,71 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" -msgstr "" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" +msgstr "" +"användning: showconsolefont -V|--version\n" +" showconsolefont [-C tty] [-v] [-i]\n" +"(antagligen efter att läsa in ett typsnitt med ”setfont font”)\n" +"\n" +"Giltiga flaggor är:\n" +" -V --version Skriv ut versionsnummer och avsluta\n" +" -C tty Enhet att läsa typsnittet ifrån. Standard: aktuell tty.\n" +" -v Var mer utförlig.\n" +" -i Skriv inte ut typsnittstabellen, visa bara\n" +" RADER×KOLUMNER×ANTAL och avsluta.\n" -#: src/showconsolefont.c:161 -#, fuzzy, c-format +#: src/showconsolefont.c:170 +#, c-format msgid "Character count: %d\n" -msgstr "Felaktig teckenbredd %d\n" +msgstr "Teckenantal: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" -msgstr "" +msgstr "Typsnittsbredd : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" -msgstr "" +msgstr "Typsnittshöjd : %d\n" -#: src/showconsolefont.c:175 -#, fuzzy, c-format +#: src/showconsolefont.c:183 +#, c-format msgid "" "Showing %d-char font\n" "\n" -msgstr "Lser in %d-teckens %d%d-typsnitt\n" +msgstr "" +"Visar %d-teckens typsnitt\n" +"\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" -msgstr "?OKNT?" +msgstr "?OKÄNT?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" -msgstr "tgb-lge var %s\n" +msgstr "tgb-läge var %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" "since the X server is also reading /dev/console ]\n" msgstr "" -"[ om du gr det hr i X kanske det inte fungerar\n" -"eftersom X-servern ocks lser /dev/console ]\n" +"[ om du gör det här i X kanske det inte fungerar\n" +"eftersom X-servern också läser /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" -msgstr "fick signalen %d, stdar upp...\n" +msgstr "fick signalen %d, städar upp...\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1598,19 +1715,21 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey version %s\n" "\n" -"anvndning: showkey [flaggor...]\n" +"användning: showkey [flaggor...]\n" "\n" -"tilltna flaggor r:\n" +"tillåtna flaggor är:\n" "\n" -"\t-h --help\tvisa den hr hjlptexten\n" -"\t-a --ascii\tvisa decimala/oktala/hexadecimala vrden fr tecknen\n" -"\t-s --scancodes\tvisa bara de ra avlsningskoderna\n" +"\t-h --help\tvisa den här hjälptexten\n" +"\t-a --ascii\tvisa decimala/oktala/hexadecimala värden för tecknen\n" +"\t-s --scancodes\tvisa bara de råa avläsningskoderna\n" "\t-k --keycodes\tvisa bara de tolkade tangentkoderna (standardval)\n" +"\t-V --version\tskriv ut versionsnummer\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1618,59 +1737,62 @@ "\n" msgstr "" "\n" -"Tryck ngon tangent - Ctrl-D kommer att avsluta programmet\n" +"Tryck någon tangent - Ctrl-D kommer att avsluta programmet\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" -"tryck ngon tangent (programmet avslutas 10 s efter sista " +"tryck någon tangent (programmet avslutas 10 s efter sista " "tangenttryckning)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" -msgstr "slpp" +msgstr "släpp" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "tryck" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "tangentkod %3d %s\n" -#: src/totextmode.c:31 -#, fuzzy +#: src/totextmode.c:33 msgid "usage: totextmode\n" -msgstr "anvndning: getkeycodes\n" +msgstr "användning: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" +"Försök igen senare.\n" +"\n" +"\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" -msgstr "" +msgstr "Hela konsoldisplayen är nu helt låst av %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" -msgstr "" +msgstr "%s är nu låst av %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" +"Använd Alt-funktionstangenter för att byta till andra virtuella konsoler." #: src/vlock/parse.c:51 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "" +msgstr "Prova ”%s --help” för mer information.\n" #: src/vlock/parse.c:59 #, c-format @@ -1685,81 +1807,31 @@ "-v or --version: Print the version number of vlock and exit.\n" "-h or --help: Print this help message and exit.\n" msgstr "" +"%s: låser virtuella konsoler, sparar din aktuella session.\n" +"Användning: %s [flaggor]\n" +" Där [flaggor] är några av:\n" +"-c eller --current: lås endast denna virtuella konsol, tillåt användare att\n" +" byta till andra virtuella konsoler.\n" +"-a eller --all: lås alla virtuella konsoler genom att hindra andra " +"användare\n" +" att byta virtuell konsol.\n" +"-v eller --version: Skriv vlocks versionsnummer och avsluta.\n" +"-h eller --help: Skriv detta hjälpmeddelande och avsluta.\n" #: src/vlock/username.c:57 -#, fuzzy msgid "unrecognized user" -msgstr "" -"oknt argument: _%s_\n" -"\n" +msgstr "okänd användare" #: src/vlock/vlock.c:59 msgid "stdin is not a tty" -msgstr "" +msgstr "standard in är inte en tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" -msgstr "" +msgstr "Denna tty (%s) är inte en virtuell konsol.\n" -#: src/vlock/vt.c:160 -#, fuzzy, c-format +#: src/vlock/vt.c:155 +#, 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 " anvnd \"openvt -f\" fr att framtvinga.\n" - -#~ msgid "" -#~ "\n" -#~ "openvt: could not open %s R/W (%s)\n" -#~ msgstr "" -#~ "\n" -#~ "openvt: kunde inte ppna %s fr lsning/skrivning (%s)\n" - -#~ msgid "openvt: could not deallocate console %d\n" -#~ msgstr "openvt: kunde inte avallokera konsoll %d\n" - -#~ msgid "%s: deallocating all unused consoles failed\n" -#~ msgstr "%s: avallokering av alla oanvnda konsoller misslyckades\n" - -#~ msgid "KDGKBENT error at index 0 in table %d\n" -#~ msgstr "KDGKBENT-fel vid index 0 i tabell %d\n" - -#~ msgid "%s: cannot find any keymaps?\n" -#~ msgstr "%s: kan inte hitta ngra tangentbordstabeller?\n" - -#~ msgid "%s: plain map not allocated? very strange ...\n" -#~ msgstr "%s: enkel tabell inte allokerad? mycket mystiskt ...\n" - -#~ msgid "# not alt_is_meta: on keymap %d key %d is bound to" -#~ msgstr "" -#~ "# inte alt_is_meta: i tangentbordstabell %d r tangent %d bunden till" - -#~ msgid "KDGKBSENT failed at index %d: " -#~ msgstr "KDGKBSENT misslyckades vid index %d: " - -#~ msgid "error executing %s\n" -#~ msgstr "fel vid exekvering av %s\n" - -#~ msgid "kbd_mode: error reading keyboard mode\n" -#~ msgstr "kbd_mode: fel vid lsning av tangentbordslge\n" - -#~ msgid "plus before %s ignored\n" -#~ msgstr "plus fre %s ignorerat\n" - -#~ msgid "Error opening /dev/kbd.\n" -#~ msgstr "Fel vid ppnande av /dev/kbd.\n" - -#~ msgid "%s: out of memory?\n" -#~ msgstr "%s: slut p minne?\n" - -#~ msgid "" -#~ "usage: showconsolefont [-v|-V]\n" -#~ "(probably after loading a font with `setfont font')\n" -#~ msgstr "" -#~ "anvndning: showconsolefont [-v|-V]\n" -#~ "(frmodligen efter att ha lst in ett typsnitt med \"setfont typsnitt\")\n" - -#~ msgid "usage: %s [-o map.orig] [map-file]\n" -#~ msgstr "anvndning: %s [-o originaltabell] [tabellfil]\n" +msgstr "Hela konsoldisplayen kan inte låsas.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/tr.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/tr.gmo differ diff -Nru kbd-2.0.3/po/tr.po kbd-2.0.4/po/tr.po --- kbd-2.0.3/po/tr.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/tr.po 2017-01-08 18:38:45.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kbd 1.10\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" "PO-Revision-Date: 2004-01-21 06:15+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -13,40 +13,52 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: KBabel 1.0\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "kullanimi: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +#, fuzzy +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Konsolu hedef alan bir dosya betimleyici (fd) alinamadi\n" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: bilinmeyen secenek\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 #, fuzzy msgid "0: illegal VT number\n" msgstr "%s: 0: VT numarasi uygun degil\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 #, fuzzy msgid "VT 1 is the console and cannot be deallocated\n" msgstr "%s: VT 1 konsolun kendisi ve kaldirilamaz\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, fuzzy, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "%s: %d konsolu kaldirilamadi\n" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys %s surumu" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -55,13 +67,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -80,7 +93,7 @@ " --compose-only sadece tu$-dizgi ili$kileri gosterilir\n" " -c --charset= " -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -89,17 +102,24 @@ " eylem kodalrini belirtilen karakter kumesine\n" " gore yorumlar\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "%s karakter seti bilinmiyor - istek yoksayildi\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, fuzzy, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: klavye kipi ayarlanirken hata\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -110,7 +130,7 @@ "(sayisal deger, sembol)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -124,46 +144,46 @@ "\t-n --next-available display number of next unallocated VT\n" msgstr "" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 #, fuzzy msgid "Couldn't read VTNO: " msgstr "%s okunamadi\n" -#: src/getfd.c:67 +#: src/getfd.c:69 #, fuzzy, c-format msgid "Couldn't open %s\n" msgstr "%s acilamadi\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, 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" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "kullanimi: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Tu$ kodlarina (onluk) kar$i du$en basit tarama kodlari (onaltilik)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, 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" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -174,12 +194,12 @@ "\n" "Oncelemeli tarama kodlari e0 xx (onaltilik)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, fuzzy, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "0x%x tarama kodu icin tu$ kodu alinamadi\n" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -188,262 +208,265 @@ "Kullanimi:\n" "\t%s [-s] [-C konsol]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, fuzzy, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" "bilinmeyen arguman: _%s_\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, fuzzy, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "kullanimi: kbd_mode [-a|-u|-k|-s]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Klavye tarama kodlari (temel) kipinde\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Klavye tu$ kodlari (temelustu) kipinde\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Klavye ontanimli (ASCII) kipte\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Klavye Unicode (UTF-8) kipinde\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Klavye bilinmeyen bir kipte\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Yineleme hizi %.1f cps (gecikme = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "Kullanimi: kbdrate [-V] [-s] [-r hiz] [-d gecikme]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "/dev/port acilamiyor" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "yazilim hatasi: getfont sayac<256 ile cagrildi\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: bellek yetersiz\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 #, fuzzy msgid "out of memory" msgstr "%s: bellek yetersiz\n" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 #, fuzzy msgid "Error writing map to file" msgstr "E$lem dosyaya yazilirken hata\n" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "imkansiz: meta degil?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, fuzzy, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "%2$d. tablonun %1$d. indisinde KDGKBENT hatasi\n" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, fuzzy, c-format msgid "unable to unset key %d for table %d" msgstr "0x%x tarama kodu icin tu$ kodu alinamadi\n" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, fuzzy, c-format msgid "unable to set key %d for table %d" msgstr "0x%x tarama kodu icin tu$ kodu alinamadi\n" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, fuzzy, c-format msgid "assuming iso-8859-1 %s" msgstr "iso-8859-1'deki %s oldugu varsayildi\n" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, fuzzy, c-format msgid "assuming iso-8859-15 %s" msgstr "iso-8859-15'deki %s oldugu varsayildi\n" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, fuzzy, c-format msgid "assuming iso-8859-2 %s" msgstr "iso-8859-2'deki %s oldugu varsayildi\n" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, fuzzy, c-format msgid "assuming iso-8859-3 %s" msgstr "iso-8859-3'deki %s oldugu varsayildi\n" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, fuzzy, c-format msgid "assuming iso-8859-4 %s" msgstr "iso-8859-4'deki %s oldugu varsayildi\n" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "'%s' sembolu bilinmiyor\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, fuzzy, c-format msgid "keycode %d, table %d = %d%s" msgstr "tu$ kodu %3d %s\n" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr "" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, fuzzy, c-format msgid "failed to bind key %d to value %d" msgstr "tarama kodu %x tu$ kodu %d ile e$le$tirilirken hata olu$tu\n" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, fuzzy, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "%s: %d konsolu kaldirilamadi\n" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 #, fuzzy msgid "too many compose definitions" msgstr "en fazla dizgi tanimi sayisi: %d\n" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -454,66 +477,66 @@ msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "" msgstr[1] "" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, fuzzy, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "en fazla dizgi tanimi sayisi: %d\n" msgstr[1] "en fazla dizgi tanimi sayisi: %d\n" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 #, fuzzy msgid "(No change in compose definitions)" msgstr "en fazla dizgi tanimi sayisi: %d\n" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "cekirdek tarafindan desteklenen tu$ kodlari: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "Bir tu$a atanabilecek en fazla eylem sayisi: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, fuzzy, c-format msgid "number of keymaps in actual use: %u\n" msgstr "kullanimda olan tu$e$lem sayisi: %d\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, fuzzy, c-format msgid "of which %u dynamically allocated\n" msgstr "/ %d etkin olarak tahsis edildi\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "cekirdek tarafindan desteklenen eylem kodlari araligi:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "cekirdek tarafindan desteklenen i$lev tu$larinin sayisi: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "en fazla dizgi tanimi sayisi: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, fuzzy, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "kullanimdaki dizgi tanimi sayisi: %d\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -524,12 +547,12 @@ "A$agidaki e$anlamlilar tanimli:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%s icin %-15s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -538,7 +561,7 @@ "\n" "Tanimli degi$tirici isimleri ve sutun numaralari:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -560,43 +583,44 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s (%s den)\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" " (perhaps you want to do `kbd_mode -a'?)\n" msgstr "" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" " (perhaps you want to do `kbd_mode -u'?)\n" msgstr "" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, fuzzy, c-format msgid "Cannot find %s\n" msgstr "%s yazitipi bulunamiyor\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, fuzzy, c-format msgid "cannot open file %s\n" msgstr "%s yazitipi dosyasi acilamiyor\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -605,29 +629,29 @@ "Kullanimi:\n" "\t%s [-C konsol] [-o eslem.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "girdi satiri hatali: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: (0x%x) karakter numarasi yazitipi uzunlugundan fazla\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: aralik sonu hatali (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -637,22 +661,22 @@ "yazitipi konumlari araligi 0x%x-0x%x\n" "ile ayni uzunlukta degil\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: geri kalan (%s) yoksayildi\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "%s dosyasindan Unicode e$lem yukleniyor\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Uyari: satir cok uzun\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -661,80 +685,80 @@ "%s: bo$ Unicode e$lem yuklenmez\n" "(israr ediyorsaniz: -f secenegi ile a$abilirsiniz)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "girdi" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "girdi" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "`%s'dosyasina Unicode e$lem kaydedildi\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Unicode e$lem eklendi\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "kullanimi: %s [-v] [-o e$lem.ozgun] e$lem-dosyasi\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: _%s_ e$lem dosyasi acilamadi\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "e$lem dosyasi durum bilgileri alinamiyor" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "ikilik dogrudan yazitipine ekran e$lem dosyasi %s yukleniyor\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "`%s' dosyasindan e$lem okunurken hata\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "ikilik unicode ekran e$lem dosyasi %s yukleniyor\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Sembolik ekran e$lemi %s dosyasindan yukleniyor\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Sembolik e$lem `%s' dosyasindan cozumlenirken %d. satirda hata\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "E$lem dosyaya yazilirken hata\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "konsol e$lemi okunamiyor\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Ekran e$lemi `%s' dosyasina kaydedildi\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -755,182 +779,177 @@ "\n" msgstr "" -#: src/openvt.c:138 +#: src/openvt.c:141 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:208 +#: src/openvt.c:210 #, fuzzy, c-format msgid "%s: Illegal vt number" msgstr "openvt: %s: kuraldisi sanal terminal (vt) numarasi\n" -#: src/openvt.c:234 +#: src/openvt.c:236 #, fuzzy msgid "Only root can use the -u flag." msgstr "openvt: -u bayragini sadece root kullanabilir.\n" -#: src/openvt.c:256 -#, 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:263 +#: src/openvt.c:265 #, fuzzy msgid "Cannot find a free vt" msgstr "openvt: serbest bir sanal terminal (vt) bulunamiyor\n" -#: src/openvt.c:267 +#: src/openvt.c:269 #, 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:271 +#: src/openvt.c:273 #, 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:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "" -#: src/openvt.c:313 +#: src/openvt.c:315 #, fuzzy msgid "Unable to set new session" msgstr "openvt: yeni oturum (%s) ayarlanamiyor\n" -#: src/openvt.c:337 +#: src/openvt.c:339 #, fuzzy, c-format msgid "Unable to open %s" msgstr "openvt: %s acilamiyor: %s\n" -#: src/openvt.c:341 +#: src/openvt.c:343 #, fuzzy, c-format msgid "Using VT %s" msgstr "openvt: VT %s kullanarak\n" -#: src/openvt.c:347 +#: src/openvt.c:349 #, fuzzy, c-format msgid "Cannot open %s read/write" msgstr "openvt: %s oku/yaz kipinde acilamiyor (%s)\n" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "" -#: src/openvt.c:401 +#: src/openvt.c:403 #, fuzzy, c-format msgid "Couldn't deallocate console %d" msgstr "%s: %d konsolu kaldirilamadi\n" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: kisa ucs2 unicode tablosu\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: kisa utf8 unicode tablosu\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: hatali utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: bilinmeyen utf8 hatasi\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: kisa unicode tablosu\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: giri$ yazitipi okunurken hata" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: readpsffont cagrisi hatali\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Desteklenmeyen psf dosya kipi (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: Desteklenmeyen psf surumu (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: sifir giri$ yazitipi uzunlugu?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: sifir giri$ karakteri uzunlugu?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Girdi dosyasi: girdi uzunlugu (%d) hatali\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Girdi dosyasi: kalan bozuk\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: kuraldi$i unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Yazitipi dosyasinin basligi yazilamiyor" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Yazitipi dosyasi yazilamiyor" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Uyari: satir cok uzun\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: girdi satiri hatali: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Karakter numarasi (0x%lx) yazitipi sonunu a$iyor\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Aralik sonu hatali (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -939,7 +958,7 @@ "%s: Bir yazitipi konumlari araligi ile ili$kilendirilen\n" "bir Unicode araligi olmaliydi.\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -948,7 +967,7 @@ "Kullanimi:\n" "\t%s girdi-yazitipi girdi-tablo cikti-yazitipi\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -957,7 +976,7 @@ "Kullanimi:\n" "\t%s girdi-yazitipi [cikti-tablo]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -966,7 +985,7 @@ "Kullanimi:\n" "\t%s girdi-yazitipi cikti-yazitipi\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -976,22 +995,22 @@ "\t%s [-i girdi-yazitipi] [-o cikti-yazitipi]\n" "\t\t\t[-it girdi-tablo] [-ot cikti-tablo] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: %s uzerindeki dosya betimleyici hatali\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: psf dosyasindaki dosya betimleyici bilinmiyor\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: girdi yazitipi bir indekse sahip degil\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: %s video kipi dosyasi bulunamiyor\n" @@ -1000,12 +1019,12 @@ msgid "Invalid number of lines\n" msgstr "Satir sayisi gecersiz\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Eski kip: %dx%d Yeni kip: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "" @@ -1013,12 +1032,12 @@ "Yeni tarama-satirlari sayisi: %d\n" "Karakter yuksekligi: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: komut `%s' ba$arisiz\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1026,7 +1045,7 @@ "resizecons: TERM cevre degi$kenini degi$tirmeyi unutmayin\n" "(con%dx%d veya linux-%dx%d olabilir)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1040,41 +1059,41 @@ " ya da: resizecons -lines SATIR-SAYISI\n" "SATIR-SAYISI 25, 28, 30, 34, 36, 40, 44, 50, 60 degerlerinden biri olabilir\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: G/C izinleri alinamiyor.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "Kullanimi: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, fuzzy, c-format msgid "Error reading %s" msgstr "%s okunurken hata\n" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "%s okunamadi, ve ioctl dokumlenemiyor\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "%s okunamadi\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Tuhaf ... %dx%d ve %dx%d her ikisi de ekran mi??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "screendump yazmada ba$arisiz\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, fuzzy, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1129,12 +1148,12 @@ " -V surum bilgilerini gosterir ve cikar\n" "Dosyalar cali$ilan dizinden ya da /usr/lib/kbd/*/ dizininden yuklenir.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: cok fazla girdi dosyasi\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1143,123 +1162,123 @@ "setfont: hem ekran kartindan hem de dosyadan yuklenemez. Yazitipi degi" "$medi.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Karakter yuksekligi %d hatali\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Karakter geni$ligi %d hatali\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: 32. yazitipi konumu bo$luk degil\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: o silindi\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: artalan tuhaf gorunecek\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "%d karakterlik %dx%d yazitipi %s dosyasindan yukleniyor\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "%d karakterlik %dx%d yazitipi yukleniyor\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "%d karakterlik %dx%d (%d) yazitipi %s dosyasindan yukleniyor\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "%d karakterlik %dx%d (%d) yazitipi yukleniyor\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: do_loadtable'da yazilim hatasi\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Unicode e$le$me tablosu yukleniyor...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "%s yazitipi dosyasi acilamiyor\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "%d karakterlik %dx%d yazitipi %s dosyasindan okundu\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Ayri ayri yazitipleri yuklenirken hepsi ayni yukseklikte olmali\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Ayri ayri yazitipleri yuklenirken hepsi ayni geni$likte olmali\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "\"default.cp[gz]\" yazitipi dosyasi bulunamiyor\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "%s yazitipi bulunamiyor\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "%s yazitipi dosyasi okunuyor\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Birle$ik dosya icinde son satirsonu imi yok\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Birle$tirilecek dosya sayisi cok fazla\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hmm - restorefont'tan bir yazitipi? ilk yarisi kullaniliyor.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Girdi dosyasi uzunlugu hatali\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1268,24 +1287,24 @@ "Bu dosya 3 yazitipi icerir: 8x8, 8x14 ve 8x16. istediginiz birini\n" "-8, -14 veya -16 seceneklerinden biri ile belirtebilirsiniz.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "" "Yazitipi yuksekligini %d belirttiniz ama burada sadece 8, 14, 16\n" "degerleri mumkun.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Kaydedilecek hicbir sey yok\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d karakterlik %dx%d yazitipi %s dosyasina kaydedildi\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1296,24 +1315,24 @@ " (burada tarama-kodu onaltilik (xx veya e0xx) ve\n" " tu$-kodu onluk bicimde verilmelidir)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "arguman sayisinin cift-sayi olmasi gerekli" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "tarama kodlari okunurken hata" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "kod kabul edilen sinirin di$inda" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, fuzzy, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "tarama kodu %x tu$ kodu %d ile e$le$tirilirken hata olu$tu\n" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1350,7 +1369,7 @@ msgid "off" msgstr "kapali" -#: src/setleds.c:87 +#: src/setleds.c:90 #, fuzzy msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" @@ -1358,7 +1377,7 @@ "$u anki led durumlari okunurken hata olu$tu. Standard girdi bir VT " "olmayabilir mi?\n" -#: src/setleds.c:105 +#: src/setleds.c:110 #, fuzzy msgid "" "Error reading current flags setting. Maybe you are not on the console?: " @@ -1366,44 +1385,44 @@ msgstr "" "Mevcut bayraklar okunurken hata olu$tu. Konsolda olmayabilir misiniz?\n" -#: src/setleds.c:123 +#: src/setleds.c:129 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Mevcut led durumlari /dev/kbd'den okunurken hata olu$tu.\n" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED kullanimdi$i mi?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 #, fuzzy msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Mevcut led durumlari /dev/kbd'den okunurken hata olu$tu.\n" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED kullanimdi$i mi?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Ledler ba$langictaki durumuna alinirken hata\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "$u anki ontanimli bayraklar: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "$u anki bayraklar: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "$u anki ledler: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1412,37 +1431,37 @@ "bilinmeyen arguman: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Eski ontanimli bayraklar: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Yeni ontanimli bayraklar: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Eski bayraklar: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Yeni bayraklar: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Eski ledler: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Yeni ledler: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1465,43 +1484,44 @@ "karakter kaybina ugramadan okuyabilmeniz icin Turkceye ozgu karakterlerden\n" "kacinilmistir.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Meta tu$u yuksek biti 1 yapar\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Meta tu$u Esc onekini verir\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Meta tu$u icin tuhaf kip??\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 #, fuzzy msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "$u anki ayarlar okunurken hata olustu. StdG bir VT olmayabilir mi?\n" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "eski durum: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "yeni durum: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "kullanimi: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1511,41 +1531,45 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, fuzzy, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "%s: %s: Uyari: satir cok uzun\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "ozgun ceviri tablosu yerine konurken hata olu$tu\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "ozgun unicode e$lem yerine konamadi\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "ceviri tablosu degistirilemiyor\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1553,44 +1577,45 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, fuzzy, c-format msgid "Character count: %d\n" msgstr "Karakter geni$ligi %d hatali\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, fuzzy, c-format msgid "" "Showing %d-char font\n" "\n" msgstr "%d karakterlik %dx%d yazitipi yukleniyor\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?BiLiNMEYEN?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "klavye kipi %s idi\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1599,13 +1624,13 @@ "[ Eger bunu X altinda deniyorsaniz, X sunucusu\n" "/dev/console'u okuyana kadar cali$mayabilir ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "%d sinyali yakalandi, temizleniyor...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1617,6 +1642,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey %s surumu\n" "\n" @@ -1633,7 +1659,7 @@ "karakter kaybina ugramadan okuyabilmeniz icin Turkceye ozgu karakterlerden\n" "kacinilmistir.\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1644,49 +1670,49 @@ "Herhangi bir tu$a basiniz - Ctrl-D sureci sonlandirir\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "Herhangi bir tusa basin. Son tusa bastiktan 10 saniye sonra\n" "program icrasi durdurulur...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "dagitim" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "basim" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "tu$ kodu %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 #, fuzzy msgid "usage: totextmode\n" msgstr "kullanimi: getkeycodes\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" @@ -1720,12 +1746,12 @@ msgid "stdin is not a tty" msgstr "" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, fuzzy, c-format msgid "The entire console display cannot be locked.\n" msgstr "%s: VT 1 konsolun kendisi ve kaldirilamaz\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/uk.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/uk.gmo differ diff -Nru kbd-2.0.3/po/uk.po kbd-2.0.4/po/uk.po --- kbd-2.0.3/po/uk.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/uk.po 2017-01-08 18:38:45.000000000 +0000 @@ -2,52 +2,63 @@ # This file is distributed under the same license as the kbd package. # # Maxim V. Dziumanenko , 2006. -# Yuri Chornoivan , 2011, 2012, 2014, 2015. +# Yuri Chornoivan , 2011, 2012, 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.3-rc1\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2015-07-01 20:35+0300\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-27 13:13+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-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "використання: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Не вдалося отримати файловий дескриптор, що відповідає консолі" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: невідомий параметр\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "0: некоректний номер VT\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "VT 1 є системною консоллю та не може бути звільнений\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "не вдалося звільнити консоль %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys версії %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -57,13 +68,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -73,17 +85,19 @@ "\n" "\t-h --help\t вивести текст довідки\n" "\t-i --short-info\t вивести інформацію про драйвер клавіатури\n" -"\t-l --long-info\t вивести вказане вище та символи, що відомі loadkeys\n" +"\t-l -s --long-info\t вивести вказане вище та символи, що відомі " +"loadkeys\n" "\t-n --numeric\t вивести таблицю клавіш к шістнадцятковому вигляді\n" "\t-f --full-table\t не вживати короткі нотації, один рядок на код " "клавіші\n" "\t-1 --separate-lines одна лінія на пару (модифікатор, код клавіші)\n" -"\t --funcs-only\t вивести лише рядки функцій клавіш\n" -"\t --keys-only\t вивести лише прив'язки клавіш\n" -"\t --compose-only вивести лише комбінації сполучених клавіш\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t вивести лише рядки функцій клавіш\n" +"\t-k --keys-only\t вивести лише прив'язки клавіш\n" +"\t-d --compose-only вивести лише комбінації сполучених клавіш\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -92,17 +106,26 @@ "\t\t\t інтерпретувати коди дій у символах як у вказаному\n" "\t\t\t наборі символів\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t вивести дані щодо номера версії\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "невідомий набір символів %s - вказування набору символів ігнорується\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: помилка під час спроби читання режиму роботи клавіатури: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -113,7 +136,7 @@ "(числове значення, символ)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -136,41 +159,41 @@ "\t-V --version показати дані щодо версії програми\n" "\t-n --next-available показати номер наступного не розподіленого VT\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Не вдалося прочитати значення VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Не вдалося відкрити %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Не вдалося отримати файловий дескриптор, що відповідає консолі\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "використання: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "Прямі скан-коди xx (hex) проти кодів клавіш (десяткові)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "0 - помилка; скан-коди 1--88 (0x01--0x58) дорівнюють кодам клавіш\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "для 1 %d (0x01-0x%02x) скан-код дорівнює коду клавіші\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -181,14 +204,14 @@ "\n" "Скан-коди з `Escape' e0 xx (hex)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "не вдалося знайти код клавіші, що відповідає скан-коду 0x%x: ioctl " "KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -197,95 +220,102 @@ "Використання:\n" "\t%s [-s] [-C консоль]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" msgstr "" "Використання: %1$s [-C ПРИСТРІЙ] getmode [text|graphics]\n" " або: %1$s [-C ПРИСТРІЙ] gkbmode [raw|xlate|mediumraw|unicode]\n" " або: %1$s [-C ПРИСТРІЙ] gkbmeta [metabit|escprefix]\n" " або: %1$s [-C ПРИСТРІЙ] gkbled [scrolllock|numlock|capslock]\n" +"Інші параметри:\n" +" -h вивести це повідомлення щодо користування\n" +" -V вивести дані щодо номера версії\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Помилка: недостатньо аргументів\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Помилка: невідома дія: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "використання: kbd_mode [-a|-u|-k|-s] [-C пристрій]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Клавіатура знаходиться у сирому (raw) режимі (надсилає скан-коди)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Клавіатура знаходиться у напівсирому режимі (надсилає коди клавіш)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "" "Клавіатура знаходиться у звичайному режимі (надсилає ASCII-коди знаків)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "" "Клавіатура знаходиться у режимі Unicode (надсилає коди знаків у UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Клавіатура знаходиться у невідомому режимі\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Значення частоти повтору: %.1f симв/сек (затримка = %d мс)\n" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Використання: kbdrate [-V] [-s] [-r частота] [-d затримка]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "" +"Користування: kbdrate [-V | --version] [-s] [-r частота] [-d затримка]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Не вдалося відкрити /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "помилка: getfont виконано з count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "помилка: використання GIO_FONT у getfont потребує визначення буфера.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: недостатньо пам'яті\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "дивно... ct змінено з %d на %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -294,169 +324,169 @@ "Версія ядра є старішою за 1.1.92\n" "Таблиці відповідності Unicode не завантажено.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "недостатньо пам'яті" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "не вдалося ініціалізувати масив: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Помилка запису у файл" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "неможливо: не `meta'?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: помилка за індексом %d у таблиці %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: не вдалося отримати рядок функціональної клавіші" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: не вдалося отримати таблицю акцентів" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "не вдалося отримати розкладку %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "не вдалося скасувати визначення клавіші %d для таблиці %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key викликано з помилковим кодом клавіші %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "додавання розкладки %d суперечить рядку явного визначення розкладки" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "не вдалося визначити клавішу %d для таблиці %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "неможлива помилка у lk_add_constants" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "не вдалося отримати символ за помилковим типом: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "не вдалося отримати символ типу %d за помилковим індексом: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "припускаємо iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "припускаємо iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "припускаємо iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "припускаємо iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "припускаємо iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "невідомий keysym `%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: не вдалося перемкнутися у режим Unicode" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Розкладка %d: відмовлено у доступі" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "клавіша %d, таблиця %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " ПОМИЛКА" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "не вдалося прив’язати клавішу %d до значення %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "вилучити розкладку %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: не вдалося вилучити розкладку %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: не вдалося вилучити або спорожнити розкладку" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "" "KDSKBMODE: %s: не вдалося повернутися до початкового режиму роботи клавіатури" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "не вдалося пов’язати рядок «%s» з функцією %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "не вдалося спорожнити рядок %s" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "занадто багато визначень сполучень" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -477,7 +507,7 @@ "\n" "Змінено %d клавішу" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" @@ -486,7 +516,7 @@ msgstr[2] "Змінено %d рядків" msgstr[3] "Змінено %d рядок" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" @@ -495,51 +525,51 @@ msgstr[2] "Завантажено %d визначень сполучень" msgstr[3] "Завантажено %d визначення сполучення" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Немає змін у визначеннях сполучених клавіш.)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "діапазон кодів клавіш, що відомі ядру: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "кількість дій, що можна призначити клавіші: %d\n" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "кількість розкладок, що дійсно використовуються: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "з них встановлено динамічно %u\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "коди дій, що допускаються ядром:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "кількість функціональних клавіш, що підтримуються ядром: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "максимальна кількість сполучених визначень: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "дійсно використаних сполучених визначень: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -550,12 +580,12 @@ "Розпізнаються наступні синоніми:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s замість %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -564,7 +594,7 @@ "\n" "Відомі назви модификаторів та номери відповідних колонок: \n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -586,6 +616,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys, версія %s\n" "\n" @@ -606,18 +637,19 @@ " -s --clearstrings спорожнити таблицю рядків ядра\n" " -u --unicode примусове перетворення у Unicode\n" " -v --verbose повідомити про внесені зміни\n" +" -V --version вивести номер версії\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s з %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" msgstr "%s: параметри --unicode і --ascii не можна використовувати одночасно\n" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -626,7 +658,7 @@ "%s: попередження: завантаження не-Unicode-розкладки до консолі Unicode\n" " (можливо, вам варто виконати «kbd_mode -a»?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -635,17 +667,17 @@ "%s: попередження: завантаження Unicode-розкладки до не-Unicode-консолі\n" " (можливо, вам варто виконати «kbd_mode -u»?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Не вдалося знайти %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "не вдалося відкрити файл %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -654,29 +686,29 @@ "Використання:\n" "\t%s [-C консоль] [-o map.orig]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Неправильний рядок на вході: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: Номер знаку (0x%x) більший ніж кількість знаків у цьому шрифті\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: Неправильний кінець діапазону (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -685,22 +717,22 @@ "%s: Довжина Unicode-діапазону U+%x-U+%x відрізняється від довжини діапазону " "шрифту 0x%x-0x%x\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: сміття наприкінці (%s) ігнорується\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Завантажується unicode-схема з файлу %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Попередження: надто довгий рядок\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -709,80 +741,81 @@ "%s: не можна завантажувати порожню unimap\n" "(якщо ви наполягаєте, скористайтесь параметром `-f')\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "пункт" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "пункти" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" -msgstr "Записав unicode-схему в `%s'\n" +msgstr "Збережено unicode-схему до `%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" -msgstr "Додав в Unicode-схему\n" +msgstr "Додано у Unicode-схему\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "Використання: %s [-o початкова_розкладка] файл_з_розкладкою\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "" +"Користування: %s [-V] [-v] [-o початкова_розкладка] файл_з_розкладкою\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: неможливо відкрити файл \"%s\"\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Не вдалося отримати інформацію про файл (stat)" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "Завантажується схема відображення з екрану та з файлу %s\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Помилка читання розкладки з файлу %s\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "Завантажується схема відображення екрану з файлу %s\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Завантажується опис схеми відображення екрану з файлу %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Помилка розбору описану схеми відображення з `%s', рядок %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Помилка запису у файл\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Не вдалося прочитати схему відображення консолі\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Схема відображення екрану збережена у `%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -821,179 +854,175 @@ " -h, --help показати коротке довідкове повідомлення.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "Не вдалося визначити власника поточного tty!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: некоректний номер VT" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "параметри -u може вказувати лише адміністратор (root)." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Не вдалося отримати файловий дескриптор, що відповідає консолі" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "не вдалося знайти вільний VT" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." msgstr "" "не вдалося перевірити, чи вільний VT %d; скористайтеся командою «%s -f» для " "встановлення у примусовому режимі." -#: src/openvt.c:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." msgstr "" "vt %d вже використовується; виконання команди перервано; скористайтеся " "командою «%s -f» для встановлення у примусовому режимі." -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Не вдалося знайти команду." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Не вдалося встановити новий сеанс" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Не вдалося відкрити %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Використовується VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "Не вдалося відкрити %s для читання або запису" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Не вдалося активувати VT %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Активацію перервано?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "не вдалося звільнити консоль %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: коротка таблиця Юнікоду ucs2\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: коротка таблиця Юнікоду utf8\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: неправильний utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: невідома помилка utf8\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: коротка таблиця Юнікоду\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: помилка читання вхідного шрифту" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: неправильний виклик readpsffont\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: непідтримуваний режим файлу psf (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: непідтримувана версія psf (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: нульова довжина вхідного шрифту?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: нульовий розмір знаку на вході?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: Вхідний файл: неправильна довжина вхідного файлу (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: вхідний файл: сміття наприкінці файлу\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: некоректний unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Не вдалося записати заголовок файлу шрифту" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Не вдалося записати файл шрифту" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Попередження: надто довгий рядок\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: неправильний рядок на вході: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Номер знака (0x%lx) більше кількості знаків у цьому шрифті\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: неправильний кінець діапазону (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -1001,7 +1030,7 @@ msgstr "" "%s: Діапазону позицій шрифту має відповідати певний діапазон у Unicode\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1010,7 +1039,7 @@ "Використання:\n" "\t%s вх_шрифт вх_таблиця вих_шрифт\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1019,7 +1048,7 @@ "Використання:\n" "\t%s вх_шрифт [вих_таблиця]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1028,7 +1057,7 @@ "Використання:\n" "\t%s вх_шрифт вих_шрифт\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1037,22 +1066,22 @@ "Використання:\n" "\t%s [-i вх_шрифт] [-o вих_шрифт] [-it вх_таблиця] [-ot вих_таблиця] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: неправильна сигнатура у %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: файл psf з невідомою сигнатурою\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: вхідний шрифт не має індексу\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: не вдалося знайти файл відеорежиму %s\n" @@ -1061,31 +1090,31 @@ msgid "Invalid number of lines\n" msgstr "Неприпустима кількість рядків\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Попередній режим: %dx%d Новий режим: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "" "Рядків розгортки у попередньому режимі: %d У новому: %d Висота шрифту: " "%d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: помилка команди `%s'\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1098,41 +1127,41 @@ " або: tresizecons -lines РЯДКІВ, де параметр РЯДКІВ може мати значення:\n" " 25, 28, 30, 34, 36, 40, 44, 50, 60\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: не вдалося отримати права доступу до вводу-виводу.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "використання: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "Помилка читання %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "Не вдалося прочитати %s та викликати дамп (ioctl dump)\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "не вдалося прочитати %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Дивно ... екран одночасно %dx%d та %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Помилка запису екранного дампу\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1187,12 +1216,12 @@ " -V Вивести версію.\n" "Файли завантажуються з поточного каталогу або з %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: надто багато вхідних файлів\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1201,125 +1230,125 @@ "setfont: не вдалося ставити шрифт одразу з ПЗУ, та з файлу. Шрифт НЕ " "змінено.\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Неприпустима висота символу %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Неприпустима ширина символу %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: позиція шрифту 32 не порожня\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: витерти її\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: тло буде виглядати смішно\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Завантажується %d-знаковий шрифт %dx%d з файлу %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Завантажується %d-знаковий шрифт %dx%d\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Завантажується %d-знаковий шрифт %dx%d (%d) з файлу %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Завантажується %d-знаковий шрифт %dx%d (%d)\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: помилка у do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Завантажується Unicode-таблиця...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Не вдалося відкрити файл %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "" "При завантаженні кількох шрифтів, усі мають бути psf-шрифтами - %s не є " "таким\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Завантажується %d-знаковий шрифт %dx%d з файлу %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "При завантаженні кількох шрифтів, усі мають бути однакової висоти\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "" "При завантаженні кількох шрифті, усі повинні мати однакову ширину символів\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Не вдалося знайти основний шрифт\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Не вдалося знайти шрифт %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Читається файл зі шрифтом %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Відсутній завершальний порожній рядок у об'єднаному файлі\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Надто багато файлів для об'єднання\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Ой... шрифт з restorefont? Використовується перша половина.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Неприпустимий розмір вхідного файлу\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1329,22 +1358,22 @@ "Вкажіть одним з ключів: -8, -14 чи -16,\n" "який саме шрифт завантажувати.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "Ви вказали шрифт із розміром %d, але можливі лише 8, 14 чи 16.\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Немає що записувати\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Записано %d-знаковий шрифт %dx%d у файл %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1355,24 +1384,24 @@ "Скан-код треба вказувати у шістнадцятковому вигляді: xx чи e0xx,\n" "код клавіші - у десятковій формі.\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "очікується парна кількість аргументів" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "помилка читання скан-коду" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "код поза допустимим діапазоном" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "помилка встановлення скан-коду %x коду %d: ioctl KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1409,58 +1438,58 @@ msgid "off" msgstr "вимкн" -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Помилка читання поточного стану індикаторів. Можливо, stdin не є VT?: ioctl " "KDGETLED" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" msgstr "" "Помилка читання поточного стану ознак. Можливо ядро застаре?: ioctl KDGKBLED" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "" "Помилка читання поточного стану індикаторів з /dev/kbd. Можливо stdin не є " "VT?: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED недоступний?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Помилка читання поточного стану індикаторів з /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED недоступний?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Помилка встановлення індикаторів у початковий стан\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Поточні `типові' ознаки: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Поточні ознаки: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Поточний стан індикаторів: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1469,37 +1498,37 @@ "невідомий аргумент: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Попередні `типові' ознаки: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Нові `типові' ознаки: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Старі ознаки " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Нові ознаки: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Попередній стан індикаторів: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Новий стан індикаторів: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1517,43 +1546,44 @@ "щоб керувати станом іншого VT.\n" "Виводяться стани до та після зміни.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Клавіша Meta встановлює старший біт\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Клавіша Meta видає Esc-префікс\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Дивний режим клавіші Meta\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Помилка читання поточного параметра. Можливо, stdin не є VT?: ioctl KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "попередній стан: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "новий стан: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "використання: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1563,8 +1593,13 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -"Використання: %s vga|ФАЙЛ|-\n" +"Користування: %s [-h] [-V]\n" +" %s vga|ФАЙЛ|-\n" "\n" "Якщо буде використано параметр ФАЙЛ, у ФАЙЛі має бути точно 3 рядки\n" "відокремлених комами десяткових значень для каналів червоного, зеленого,\n" @@ -1576,39 +1611,39 @@ "з подальшим редагуванням даних у отриманому файлі.\n" "\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Помилка: %s: некоректне значення у полі %u, рядок %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Помилка: %s: недостатня кількість полів у рядку %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Помилка: %s: незавершений рядок %u.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Помилка: %s: рядок %u є занадто довгим.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "помилка відновлення початкової таблиці перетворень\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "не вдалося відновити початкову таблицю unimap\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "не вдалося змінити таблицю перетворень\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1616,37 +1651,40 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" -"використання: showconsolefont -V|--version\n" +"користування: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(ймовірно, після завантаження шрифту командою «setfont шрифт»)\n" "\n" "Можливі параметри:\n" -" -C tty пристрій для читання шрифту. Типове значення: поточний tty.\n" -" -v докладний режим повідомлень.\n" -" -i не виводити таблицю шрифту, просто показати дані\n" -" РЯДКИxСТОВПЧИКИxКІЛЬКІСТЬ і завершити роботу.\n" +" -V --version вивести дані щодо версії і завершити роботу.\n" +" -C tty пристрій для читання шрифту. Типове значення: поточний " +"tty.\n" +" -v докладний режим повідомлень.\n" +" -i не виводити таблицю шрифту, просто показати дані\n" +" РЯДКИxСТОВПЧИКИxКІЛЬКІСТЬ і завершити роботу.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Кількість символів: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Ширина шрифту : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Висота шрифту : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1655,16 +1693,16 @@ "Показ %d-знакового шрифту\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?НЕВІДОМО?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "режим клавіатури був %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1673,12 +1711,12 @@ "[ якщо Ви намагаєтесь виконати команду у X-Window,\n" "можливо, вона не працюватиме, оскільки X-сервер теж читає /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "отримано сигнал %d, очищення...\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1691,10 +1729,11 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey версії %s\n" "\n" -"використання: showkey [параметри...]\n" +"користування: showkey [параметри...]\n" "\n" "Параметри:\n" "\t-h --help \tвивести довідку\n" @@ -1703,8 +1742,9 @@ "\t-s --scancodes\tпоказати лише скан-коди\n" "\t-k --keycodes \tпоказати лише інтерпретовані коди клавіш\n" "\t \t(якщо не вказано інше, вважається вказаним `keycodes')\n" +"\t-V --version \tвивести дані щодо номера версії\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1715,31 +1755,31 @@ "Натисніть будь-яку клавішу - Ctrl-D перерве виконання програми\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "" "натисніть будь-яку клавішу (програма завершиться через 10 секунд після " "останнього натискання клавіші)\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "звільнена" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "натиснута" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "клавіша %3d (код) %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "використання: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1749,17 +1789,17 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" msgstr "Показ даних у консолі тепер повністю заблоковано %s.\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "%s тепер заблоковано %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." msgstr "" "Скористайтеся комбінацією Alt-функціональна клавіша для перемикання на інші " @@ -1801,12 +1841,12 @@ msgid "stdin is not a tty" msgstr "стандартне джерело даних не є пристроєм tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" msgstr "Цей пристрій tty (%s) не є віртуальною консоллю.\n" -#: src/vlock/vt.c:160 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Показ даних у консолі не може бути повністю заблоковано.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/vi.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/vi.gmo differ diff -Nru kbd-2.0.3/po/vi.po kbd-2.0.4/po/vi.po --- kbd-2.0.3/po/vi.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/vi.po 2017-01-08 18:38:45.000000000 +0000 @@ -4,53 +4,64 @@ # 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-2014, 2015. +# Trần Ngọc Quân , 2012-2014, 2015, 2016. # msgid "" msgstr "" -"Project-Id-Version: kbd 2.0.3-rc1\n" +"Project-Id-Version: kbd 2.0.4-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2015-07-02 07:18+0700\n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2016-12-28 13:46+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" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Gtranslator 2.91.7\n" "X-Poedit-SourceCharset: UTF-8\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "cách dùng: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "Không thể lấy mô tả tập tin mà chỉ đến thiết bị điều khiển" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: không hiểu tùy chọn\n" -#: src/deallocvt.c:50 +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" msgstr "0: số VT không hợp lệ\n" -#: src/deallocvt.c:52 +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" msgstr "VT 1 là một thiết bị điều khiển và không thể bị bỏ phân phối\n" -#: src/deallocvt.c:54 +#: src/deallocvt.c:58 #, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" msgstr "không thể bỏ phân phối thiết bị điều khiển %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "phiên bản dumpkeys %s" -#: src/dumpkeys.c:28 +#: src/dumpkeys.c:32 #, c-format msgid "" "\n" @@ -60,13 +71,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -75,19 +87,20 @@ "Tùy chọn có thể 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-i -s --short-info hiển thị thông tin 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-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 \"viết tắt\" (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" -"\t --compose-only chỉ hiện thị tổ hợp phím soạn thảo\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t chỉ hiển thị chuỗi của phím chức năng\n" +"\t-k --keys-only\t chỉ hiện thị phím ràng buộc\n" +"\t-d --compose-only chỉ hiện thị tổ hợp phím soạn thảo\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" @@ -96,17 +109,26 @@ "\t\t\t dịch mã hoạt động của phím từ\n" "\t\t\t bảng mã chỉ ra\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" +"\t-v --verbose\n" +"\t-V --version\t hiển thị số hiệu phiên bản\n" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "không rõ bảng mã %s - lờ đi yêu cầu bảng mã\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 +#: src/dumpkeys.c:162 src/loadkeys.c:184 #, c-format msgid "%s: error reading keyboard mode: %m\n" msgstr "%s: gặp lỗi khi đọc chế độ bàn phím: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -117,7 +139,7 @@ "(giá trị số, ký hiệu)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -140,44 +162,44 @@ "\t-V --version hiển thị phiên bản chương trình\n" "\t-n --next-available hiển thị số thứ tự của VT được cấp phát kế tiếp\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "Không thể đọc VTNO: " -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "Không thể mở %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "Không thể lấy bộ mô tả tập tin mà nó chỉ đến thiết bị điều khiển\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "cách dùng: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "" "Mã quét (scancode) đơn giản xx (hệ mười sáu) đối lập với mã phím (hệ mười)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, 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" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, c-format msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n" msgstr "đối với 1-%d (0x01-0x%02x) mã quét (scancode) bằng mã phím (keycode)\n" -#: src/getkeycodes.c:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -188,14 +210,14 @@ "\n" "Mã quét (scancode) thoát e0xx (hệ bát phân)\n" -#: src/getkeycodes.c:90 +#: src/getkeycodes.c:95 #, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" msgstr "" "gặp lỗi khi lấy mã phím (keycode) cho mã quét (scancode) 0x%x: ioctl " "KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -204,93 +226,99 @@ "Cách dùng:\n" "\t%s [-s] [-C thiết bị điều khiển]\n" -#: src/kbdinfo.c:18 +#: src/kbdinfo.c:21 #, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\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" +"Các tùy chọn khác:\n" +" -h in cách dùng này\n" +" -V hiển thị số hiệu phiên bản\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" msgstr "Lỗi: không có đủ đối số.\n" -#: src/kbdinfo.c:123 +#: src/kbdinfo.c:147 #, c-format msgid "Error: Unrecognized action: %s\n" msgstr "Lỗi: Thao tác không được chấp nhận: %s\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "cách dùng: kbd_mode [-a|-u|-k|-s] [-C thiết_bị]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "Bàn phím ở trong chế độ thô (scancode)\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "Bàn phím ở trong chế độ thô trung bình (keycode)\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "Bàn phím ở trong chế độ mặc định (ASCII)\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "Bàn phím ở trong chế độ Unicode (UTF-8)\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "Bàn phím ở trong một chế độ chưa được biết đến\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "Tốc độ “Typematic” đặt thành %.1f cps (chậm trễ = %d ms)\n" -#: src/kbdrate.c:263 +#: src/kbdrate.c:267 #, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" -msgstr "Cách dùng: kbdrate [-V] [-s] [-r tốc_độ] [-d trì_hoãn]\n" +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" +msgstr "Cách dùng: kbdrate [-V | --version] [-s] [-r tốc_độ] [-d độ_trễ]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "Không thể mở /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "lỗi (bug): getfont được gọi với số lượng <256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "lỗi: getfont dùng GIO_FONT thì dùng buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: hết bộ nhớ\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" msgstr "lạ thật… ct bị thay đổi từ %d thành %d\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" @@ -299,168 +327,168 @@ "Hình như là nhân (kernel) có phiên bản cũ hơn 1.1.92\n" "Không có bảng ánh xạ Unicode được tải lên.\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" msgstr "hết bộ nhớ" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" msgstr "không thể khởi tạo mảng: %s" -#: src/libkeymap/dump.c:82 +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" msgstr "Lỗi ghi nhớ ánh xạ vào tập tin" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "không thể: không phải meta?\n" -#: src/libkeymap/kernel.c:31 +#: src/libkeymap/kernel.c:32 #, c-format msgid "KDGKBENT: %s: error at index %d in table %d" msgstr "KDGKBENT: %s: có lỗi tại chỉ mục %d trong bảng %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" msgstr "KDGKBSENT: %s: Không thể lấy chuỗi khóa hàm" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" msgstr "KDGKBDIACR(UC): %s: Không thể lấy bảng trọng âm" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 #, c-format msgid "unable to get keymap %d" msgstr "không thể lấy ánh xạ phím %d" -#: src/libkeymap/kmap.c:110 +#: src/libkeymap/kmap.c:106 #, c-format msgid "unable to unset key %d for table %d" msgstr "không thể bỏ đặt phím %d cho bảng %d" -#: src/libkeymap/kmap.c:127 +#: src/libkeymap/kmap.c:122 #, c-format msgid "lk_add_key called with bad keycode %d" msgstr "lk_add_key được gọi với mã phím sai %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "việc thêm ánh xạ %d thì vi phạm dòng ánh xạ phím dứt khoát" -#: src/libkeymap/kmap.c:153 +#: src/libkeymap/kmap.c:145 #, c-format msgid "unable to set key %d for table %d" msgstr "không thể đặt phím %d cho bảng %d" -#: src/libkeymap/kmap.c:245 +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" msgstr "gần như chắc chắn là lk_add_constans có chứa lỗi" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" msgstr "không thể lấy ký hiệu bằng kiểu sai: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" msgstr "không thể lấy ký hiệu của kiểu %d bằng chỉ số sai: %d" -#: src/libkeymap/ksyms.c:348 +#: src/libkeymap/ksyms.c:339 #, c-format msgid "assuming iso-8859-1 %s" msgstr "coi là iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 +#: src/libkeymap/ksyms.c:345 #, c-format msgid "assuming iso-8859-15 %s" msgstr "coi là iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 +#: src/libkeymap/ksyms.c:351 #, c-format msgid "assuming iso-8859-2 %s" msgstr "coi là iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 +#: src/libkeymap/ksyms.c:357 #, c-format msgid "assuming iso-8859-3 %s" msgstr "coi là iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 +#: src/libkeymap/ksyms.c:363 #, c-format msgid "assuming iso-8859-4 %s" msgstr "coi là iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "không rõ ký tự phím (keysym) “%s”\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" msgstr "KDSKBMODE: %s: không thể chuyển đổi sang chế độ Unicode" -#: src/libkeymap/loadkeys.c:48 +#: src/libkeymap/loadkeys.c:50 #, c-format msgid "Keymap %d: Permission denied" msgstr "Ánh xạ phím %d: Không đủ quyền" -#: src/libkeymap/loadkeys.c:56 +#: src/libkeymap/loadkeys.c:58 #, c-format msgid "keycode %d, table %d = %d%s" msgstr "mã phím %d, bảng %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " GẶP-LỖI" -#: src/libkeymap/loadkeys.c:60 +#: src/libkeymap/loadkeys.c:62 #, c-format msgid "failed to bind key %d to value %d" msgstr "gặp lỗi khi tổ hợp phím %d với giá trị %d" -#: src/libkeymap/loadkeys.c:70 +#: src/libkeymap/loadkeys.c:72 #, c-format msgid "deallocate keymap %d" msgstr "giải cấp phát ánh xạ phím %d" -#: src/libkeymap/loadkeys.c:74 +#: src/libkeymap/loadkeys.c:76 #, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" msgstr "KDSKBENT: %s: không thể giải cấp phát ánh xạ phím %d" -#: src/libkeymap/loadkeys.c:89 +#: src/libkeymap/loadkeys.c:91 #, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" msgstr "KDSKBENT: %s: không thể giải cấp phát hay xóa sạch ánh xạ phím" -#: src/libkeymap/loadkeys.c:99 +#: src/libkeymap/loadkeys.c:101 #, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" msgstr "KDSKBMODE: %s: không thể trở về chế độ bàn phím gốc" -#: src/libkeymap/loadkeys.c:161 +#: src/libkeymap/loadkeys.c:163 #, c-format msgid "failed to bind string '%s' to function %s" msgstr "gặp lỗi khi ràng buộc chuỗi “%s” với hàm %s" -#: src/libkeymap/loadkeys.c:171 +#: src/libkeymap/loadkeys.c:173 #, c-format msgid "failed to clear string %s" msgstr "gặp lỗi khi xóa sạch chuỗi %s" -#: src/libkeymap/loadkeys.c:190 +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" msgstr "quá nhiều định nghĩa cấu tạo" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -472,63 +500,63 @@ "\n" "Đã thay đổi %d chuỗi" -#: src/libkeymap/loadkeys.c:252 +#: src/libkeymap/loadkeys.c:253 #, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" msgstr[0] "Đã thay đổi %d chuỗi" -#: src/libkeymap/loadkeys.c:260 +#: src/libkeymap/loadkeys.c:261 #, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" msgstr[0] "Đã tảo %d định nghĩa tổ hợp" -#: src/libkeymap/loadkeys.c:264 +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" msgstr "(Chưa sửa đổi phần định nghĩa cấu tạo)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "vùng mã phím (keycode) được nhân hỗ trợ: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, 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" -#: src/libkeymap/summary.c:101 +#: src/libkeymap/summary.c:99 #, c-format msgid "number of keymaps in actual use: %u\n" msgstr "số lượng ánh xạ phím (keymap) dùng trên thực tế: %u\n" -#: src/libkeymap/summary.c:104 +#: src/libkeymap/summary.c:102 #, c-format msgid "of which %u dynamically allocated\n" msgstr "cái mà %u được phân phối tự động\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "phạm vi mã hành động được nhân hỗ trợ:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "số phím chức năng được nhân hỗ trợ: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "nr lớn nhất của định nghĩa cấu tạo: %d\n" -#: src/libkeymap/summary.c:117 +#: src/libkeymap/summary.c:115 #, c-format msgid "nr of compose definitions in actual use: %u\n" msgstr "nr của định nghĩa cấu tạo được dùng trên thực tế: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -539,12 +567,12 @@ "Những từ đồng nghĩa sau được nhận ra:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s cho %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -553,7 +581,7 @@ "\n" "Nhận ra tên bộ điều chỉnh và số cột của chúng:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, c-format msgid "" "loadkeys version %s\n" @@ -575,6 +603,7 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys phiên bản %s\n" "\n" @@ -595,19 +624,20 @@ " -s --clearstrings xóa 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" +" -V --version hiển thị số hiệu phiên bản\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s từ %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, 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" -#: src/loadkeys.c:190 +#: src/loadkeys.c:192 #, c-format msgid "" "%s: warning: loading non-Unicode keymap on Unicode console\n" @@ -617,7 +647,7 @@ "khiển Unicode\n" " (có lẽ bạn ý bạn muốn làm là “kbd_mode -a” phải không?)\n" -#: src/loadkeys.c:202 +#: src/loadkeys.c:204 #, c-format msgid "" "%s: warning: loading Unicode keymap on non-Unicode console\n" @@ -627,17 +657,17 @@ "không phải Unicode\n" " (có lẽ bạn muốn làm là “kbd_mode -u” phải không?)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "Không tìm thấy %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "không mở được tập tin %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -646,28 +676,28 @@ "Cách dùng:\n" "\t%s [-C thiết bị điều khiển] [-o ánh-xạ.gốc]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "Dòng nhập vào sai: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: số glyph (0x%x) lớn hơn chiều dài phông chữ\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (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 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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 sai\n" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -676,22 +706,22 @@ "%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 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: lờ đi khúc theo sau (%s)\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "Nạp ánh xạ unicode từ tập tin %s\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: Cảnh báo: dòng quá dài\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -700,82 +730,82 @@ "%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:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "mục" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "các mục" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Ghi ánh xạ unicode trên “%s”\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Nhập thêm ánh xạ Unicode\n" -#: src/mapscrn.c:68 +#: src/mapscrn.c:71 #, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" -msgstr "Cách dùng: %s [-v] [-o ánh-xạ.gốc] tập-tin-ánh-xạ\n" +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" +msgstr "Cách dùng: %s [-V] [-v] [-o ánh-xạ.gốc] tập-tin-ánh-xạ\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: không thể mở tập tin ánh xạ _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "Không thể lấy được trạng thái (stat) tập tin bản đồ (map)" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %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 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "Lỗi đọc ánh xạ từ tập tin “%s”\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %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 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "Nạp ánh xạ màn hình (screen map) ký hiệu từ tập tin %s\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "Lỗi phân tích ánh xạ ký hiệu từ “%s”, dòng %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "Lỗi ghi nhớ ánh xạ vào tập tin\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "Không đọc được ánh xạ thiết bị điều khiển (console map)\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "Ghi nhớ ánh xạ màn hình (screen map) trong “%s”\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -813,179 +843,175 @@ " -h, --help hiển thị thông tin trợ giúp ở dạng ngắn gọn.\n" "\n" -#: src/openvt.c:138 +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" msgstr "không tìm thấy người sở hữu tty đang dùng!" -#: src/openvt.c:208 +#: src/openvt.c:210 #, c-format msgid "%s: Illegal vt number" msgstr "%s: Số vt không hợp lệ" -#: src/openvt.c:234 +#: src/openvt.c:236 msgid "Only root can use the -u flag." msgstr "Chỉ có siêu quản trị mới có thể dùng cờ -u." -#: src/openvt.c:256 -msgid "Couldn't get a file descriptor referring to the console" -msgstr "Không thể lấy mô tả tập tin mà chỉ đến thiết bị điều khiển" - -#: src/openvt.c:263 +#: src/openvt.c:265 msgid "Cannot find a free vt" msgstr "Không tìm thấy vt nào còn rảnh rỗi" -#: src/openvt.c:267 +#: src/openvt.c:269 #, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." 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:271 +#: src/openvt.c:273 #, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." 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:281 +#: src/openvt.c:283 msgid "Unable to find command." msgstr "Không thể tìm thấy lệnh." -#: src/openvt.c:313 +#: src/openvt.c:315 msgid "Unable to set new session" msgstr "Không thể đặt phiên làm việc mới" -#: src/openvt.c:337 +#: src/openvt.c:339 #, c-format msgid "Unable to open %s" msgstr "Không thể mở %s" -#: src/openvt.c:341 +#: src/openvt.c:343 #, c-format msgid "Using VT %s" msgstr "Đang dùng VT %s" -#: src/openvt.c:347 +#: src/openvt.c:349 #, c-format msgid "Cannot open %s read/write" msgstr "không thể mở %s để đọc/ghi" -#: src/openvt.c:358 +#: src/openvt.c:360 #, c-format msgid "Couldn't activate vt %d" msgstr "Không thể kích hoạt vt %d" -#: src/openvt.c:361 +#: src/openvt.c:363 msgid "Activation interrupted?" msgstr "Kích hoạt bị ngắt phải không?" -#: src/openvt.c:401 +#: src/openvt.c:403 #, c-format msgid "Couldn't deallocate console %d" msgstr "Không thể cấp phát lại console (thiết bị điều khiển) %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: bảng unicode ucs2 ngắn\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: bảng unicode utf8 ngắn\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: utf8 sai\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: lỗi utf8 không rõ\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: bảng unicode ngắn\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: Lỗi đọc phông chữ nhập vào" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: Lời gọi readpsffont sai\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: Chế độ tập tin psf (%d) không được hỗ trợ\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: phiên bản psf (%d) không được hỗ trợ\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: chiều dài phông chữ nhập vào bằng không?\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: kích thước ký tự nhập vào bằng không?\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, 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 sai (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: Tập tin nhập vào: vết rác\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: unicode không đúng %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "Không thể ghi nhớ phần đầu (header) tập tin phông chữ" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "Không thể ghi tập tin phông chữ" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: Cảnh báo: dòng quá dài\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: Dòng nhập vào sai: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: Số Glyph (0x%lx) vượt quá kết thúc phông chữ\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: Kết thúc của phạm vi (0x%lx) sai\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " @@ -994,7 +1020,7 @@ "%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 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -1003,7 +1029,7 @@ "Cách dùng:\n" "\t%s infont intable outfont\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -1012,7 +1038,7 @@ "Cách dùng:\n" "\t%s infont [outtable]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -1021,7 +1047,7 @@ "Cách dùng:\n" "\t%s infont outfont\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1030,22 +1056,22 @@ "Cách dùng:\n" "\t%s [-i infont] [-o outfont] [-it intable] [-ot outtable] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: Số màu nhiệm (magic) sai trên %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: tập tin psf với số màu nhiệm không rõ\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: phông nhập vào không có một chỉ mục\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: không tìm thấy tập tin chế độ video %s\n" @@ -1054,22 +1080,22 @@ msgid "Invalid number of lines\n" msgstr "Số dòng không đúng\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "Chế độ cũ: %dx%d Chế độ mới: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "#scanlines Cũ: %d #scanlines Mới: %d Chiều cao ký tự : %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: câu lệnh “%s” bị lỗi\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, c-format msgid "" "resizecons: don't forget to change TERM (maybe to con%dx%d or linux-%dx%d)\n" @@ -1077,7 +1103,7 @@ "resizecons: đừng quên thay đổi TERM (có thể thành con%dx%d hoặc linux-%dx" "%d)\n" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1090,41 +1116,41 @@ "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:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: không lấy được quyền I/O.\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "cách dùng: screendump [n]\n" -#: src/screendump.c:80 +#: src/screendump.c:82 #, c-format msgid "Error reading %s" msgstr "Lỗi đọc %s" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "không thể đọc %s, và không thể ioctl dump\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "không thể đọc %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "Kỳ lạ … màn hình là cả %dx%d và %dx%d ??\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "Gặp lỗi khi ghi đổ màn hình\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1179,12 +1205,12 @@ " -V In ra số hiệu phiên bản và thoát.\n" "Tập tin được nạp từ thư mục hiện tại hoặc từ %s/*/.\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: quá nhiều tập tin đầu vào\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " @@ -1193,123 +1219,123 @@ "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 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "Chiều cao ký tự %d sai\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "Chiều rộng ký tự %d sai\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: vị trí phông chữ 32 không trống\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: tẩy nó\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: phông nền trông buồn cười\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "Nạp %d-char %dx%d phông từ tập tin %s\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "Nạp %d-char %dx%d phông\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "Nạp %d-char %dx%d (%d) phông từ tập tin %s\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "Nạp %d-char %dx%d (%d) phông\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: lỗi (bug) trong do_loadtable\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "Đang nạp bảng ánh xạ Unicode…\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "Không mở được tập tin phông chữ %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, 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" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "Đọc %d-char %dx%d phông từ tập tin %s\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "Khi nạp vài phông chữ, tất cả phải có cùng chiều cao\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "Khi nạp vài phông chữ, tất cả phải có cùng chiều rộng\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "Không tìm thấy phông mặc định\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "Không tìm thấy phông %s\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "Đang đọc tập tin phông chữ %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "Không có dòng mới cuối cùng trong liên hợp tập tin\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "Quá nhiều tập tin trong liên hợp\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "Hừm - một phông chữ từ phông phục hồi? Sử dụng nửa đầu tiên.\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "Kích thước tập tin nhập vào sai\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1318,23 +1344,23 @@ "Tập tin này chứa 3 phông chữ: 8x8, 8x14 và 8x16. Xin hãy cho biết\n" "phông bạn muốn nạp bằng một tùy chọn -8 hoặc -14 hoặc -16.\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, 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" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "Khôg tìm thấy gì để ghi nhớ\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "Ghi nhớ %d-char %dx%d tập tin phông chữ trên%s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1345,26 +1371,26 @@ " (trong đó scancode là xx hoặc e0xx, ở dạng hệ mười sáu,\n" " còn keycode ở dạng hệ mười)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "mong đợi một tham số số chẵn" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "lỗi đọc mã quét (scancode)" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "mã nằm ngoài khung giới hạn" -#: src/setkeycodes.c:69 +#: src/setkeycodes.c:74 #, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" msgstr "" "gặp lỗi khi đặt mã quét (scancode) %x cho mã phím (keycode) %d: ioctl " "KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1402,14 +1428,14 @@ msgid "off" msgstr "tắt" -#: src/setleds.c:87 +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" msgstr "" "Lỗi đọc cài đặt đèn báo hiện tại. Có thể đầu vào tiêu chuẩn không phải là " "một VT?: ioctl KDGETLED" -#: src/setleds.c:105 +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" @@ -1417,42 +1443,42 @@ "Lỗi đọc cài đặt cờ hiện tại. Có thể bạn đang ở ngoài thiết bị điều khiển?: " "ioctl KDGKBLED" -#: src/setleds.c:123 +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" msgstr "Lỗi đọc cài đặt đèn báo hiện từ /dev/kbd: ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "Không thể KIOCGLED?\n" -#: src/setleds.c:141 +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" msgstr "Lỗi đọc cài đặt đèn báo hiện từ /dev/kbd: ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "Không thể KIOCSLED?\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "Lỗi đặt lại chế độ đèn\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "Cờ mặc định hiện tại: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "Cờ hiện tại: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "Đèn báo hiện tại: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1461,37 +1487,37 @@ "tham số không nhận ra: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "Cờ mặc định cũ: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "Cờ mặc định mới: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "Cờ cũ: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "Cờ mới: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "Đèn báo cũ: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "Đèn báo mới: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1508,44 +1534,45 @@ "để thay đổi cài đặt của vt khác.\n" "Cài đặt trước và sau sự thay đổi sẽ được báo cáo.\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Phím Meta đặt bit thứ bậc cao\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Phím Meta đưa ra tiền tố Esc\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Chế độ lạ cho phím Meta?\n" -#: src/setmetamode.c:79 +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" msgstr "" "Lỗi đọc cài đặt hiện tại. Có thể đầu vào tiêu chuẩn không phải là một VT?: " "ioctl KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "trạng thái cũ: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "trạng thái mới: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "cách dùng: %s\n" -#: src/setvtrgb.c:42 +#: src/setvtrgb.c:44 #, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1555,8 +1582,13 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" -"Cách dùng: %s vga|TẬP-TIN|-\n" +"Cách dùng: %s [-h] [-V]\n" +" %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à " @@ -1567,40 +1599,44 @@ "\n" "và sau đó sửa giá trị trong TẬP-TIN.\n" "\n" +"Các tùy chọn khác:\n" +" -h in cách dùng này\n" +" -V in số hiệu phiên bản\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." msgstr "Lỗi: %s: Giá trị không hợp lện trong trường %u tại dòng %u." -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." msgstr "Lỗi: %s: Số lượng trường bị thiếu tại dòng %u." -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" msgstr "Lỗi: %s: Dòng %u bị chấm dứt bất ngờ.\n" -#: src/setvtrgb.c:84 +#: src/setvtrgb.c:91 #, c-format msgid "Error: %s: Line %u is too long.\n" msgstr "Lỗi: %s: Dòng %u quá đài.\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "phục hồi bảng dịch thuật gốc không thành công\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "phục hồi ánh xạ unicode (unimap) gốc không thành công\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "không thể thay đổi bảng dịch thuật\n" -#: src/showconsolefont.c:95 +#: src/showconsolefont.c:102 #, c-format msgid "" "usage: showconsolefont -V|--version\n" @@ -1608,37 +1644,39 @@ "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "cách dùng: showconsolefont -V|--version\n" -" showconsolefont [-C tty] [-v] [-i]\n" +" showconsolefont [-C tty] [-v] [-i]\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 tại.\n" -" -v Xuất thêm chi tiết.\n" -" -i Đừng in ra bảng phông, chỉ hiển thị\n" -" HÀNG×CỘT×ĐẾM rồi thoát.\n" +" -V --version In số hiệu phiên bản rồi thoát.\n" +" -C tty Thiết bị từ đó cần đọc phông. Mặc định: tty hiện tại.\n" +" -v Xuất thêm chi tiết.\n" +" -i Đừng in ra bảng phông, chỉ hiển thị\n" +" HÀNG×CỘT×SỐ_LƯỢNG rồi thoát.\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "Số lượng ký tự : %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "Độ rộng phông chữ: %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "Độ cao phông chữ : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1647,16 +1685,16 @@ "Đang hiển thị phông chữ %d-ký-tự\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?KHÔNG RÕ?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "chế độ bàn phím từng là %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1665,12 +1703,12 @@ "[ nếu bạn chạy lệnh này dưới X, có thể nó không làm việc\n" "vì máy chủ X cũng đọc /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "nhận được tín hiệu %d, đang dọn dẹp…\n" -#: src/showkey.c:80 +#: src/showkey.c:92 #, c-format msgid "" "showkey version %s\n" @@ -1683,6 +1721,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey phiên bản %s\n" "\n" @@ -1694,8 +1733,9 @@ "\t-a --ascii\thiển thị giá trị của phím trong các hệ mười/tám/mười_sáu\n" "\t-s --scancodes\tchỉ hiển thị mã quét thô\n" "\t-k --keycodes\tchỉ hiển thị mã phím đã dịch (mặc định)\n" +"\t-V --version\tin số hiệu phiên bản\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1706,30 +1746,30 @@ "Nhấn phím bất kỳ - Ctrl-D sẽ dừng chương trình này\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, 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" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "nhả" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "nhấn" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "mã phím (keycode) %3d %s\n" -#: src/totextmode.c:31 +#: src/totextmode.c:33 msgid "usage: totextmode\n" msgstr "cách dùng: totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" @@ -1739,18 +1779,18 @@ "\n" "\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, 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:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" msgstr "“%s” bị khóa bởi %s.\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 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." @@ -1792,12 +1832,12 @@ msgid "stdin is not a tty" msgstr "stdin không phải là một tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, 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 +#: src/vlock/vt.c:155 #, c-format msgid "The entire console display cannot be locked.\n" msgstr "Toàn bộ phần trình bày bảng điều khiển không thể bị khóa.\n" Binary files /tmp/tmpFgr5rJ/n3A0e_IaXp/kbd-2.0.3/po/zh_CN.gmo and /tmp/tmpFgr5rJ/J71C28GH6b/kbd-2.0.4/po/zh_CN.gmo differ diff -Nru kbd-2.0.3/po/zh_CN.po kbd-2.0.4/po/zh_CN.po --- kbd-2.0.3/po/zh_CN.po 2015-07-13 22:17:22.000000000 +0000 +++ kbd-2.0.4/po/zh_CN.po 2017-01-08 18:38:45.000000000 +0000 @@ -1,53 +1,66 @@ # Chinese translations for kbd package. -# Copyright (C) 2008 THE kbd'S COPYRIGHT HOLDER +# Copyright (C) 2002 Nils Naumann +# (C) 2008 Michael Schutte # This file is distributed under the same license as the kbd package. # Jarod Wang , 2008. +# Mingye Wang , 2015. # msgid "" msgstr "" -"Project-Id-Version: kbd-1.15\n" +"Project-Id-Version: kbd 2.0.3-rc1\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" -"POT-Creation-Date: 2015-06-30 23:46+0300\n" -"PO-Revision-Date: 2008-12-10 23:24+0800\n" -"Last-Translator: Jarod Wang \n" +"POT-Creation-Date: 2016-12-26 17:38+0100\n" +"PO-Revision-Date: 2015-11-03 10:39-0500\n" +"Last-Translator: Mingye Wang (Arthur2e5) \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.8.6\n" -#: src/chvt.c:30 +#: src/chvt.c:32 #, c-format msgid "usage: chvt N\n" msgstr "用法: chvt N\n" -#: src/deallocvt.c:35 +#: src/chvt.c:37 src/clrunimap.c:30 src/deallocvt.c:43 src/dumpkeys.c:158 +#: src/fgconsole.c:69 src/getkeycodes.c:45 src/getunimap.c:73 src/kbdinfo.c:81 +#: src/kbd_mode.c:79 src/loadkeys.c:179 src/loadunimap.c:84 src/mapscrn.c:60 +#: src/openvt.c:258 src/resizecons.c:153 src/setfont.c:195 src/setkeycodes.c:51 +#: src/setlogcons.c:37 src/setpalette.c:36 src/setvesablank.c:33 +#: src/setvtrgb.c:140 src/showconsolefont.c:152 src/showkey.c:189 +#: src/totextmode.c:37 +msgid "Couldn't get a file descriptor referring to the console" +msgstr "无法获取指向控制台的文件描述符" + +#: src/deallocvt.c:37 #, c-format msgid "%s: unknown option\n" msgstr "%s: 未知的选项\n" -#: src/deallocvt.c:50 -#, fuzzy +#: src/deallocvt.c:54 msgid "0: illegal VT number\n" -msgstr "%s: 0: 非法的 VT 号\n" +msgstr "0: 非法的 VT 号\n" -#: src/deallocvt.c:52 -#, fuzzy +#: src/deallocvt.c:56 msgid "VT 1 is the console and cannot be deallocated\n" -msgstr "%s: VT 1 是控制台并且无法被回收\n" +msgstr "VT 1 是控制台并且无法被回收\n" -#: src/deallocvt.c:54 -#, fuzzy, c-format +#: src/deallocvt.c:58 +#, c-format msgid "could not deallocate console %d: ioctl VT_DISALLOCATE" -msgstr "%s: 无法回收控制台 %d\n" +msgstr "无法回收控制台 %d: ioctl VT_DISALLOCATE" -#: src/dumpkeys.c:27 +#: src/dumpkeys.c:31 #, c-format msgid "dumpkeys version %s" msgstr "dumpkeys 版本 %s" -#: src/dumpkeys.c:28 -#, c-format +#: src/dumpkeys.c:32 +#, fuzzy, c-format msgid "" "\n" "usage: dumpkeys [options...]\n" @@ -56,13 +69,14 @@ "\n" "\t-h --help\t display this help text\n" "\t-i --short-info\t display information about keyboard driver\n" -"\t-l --long-info\t display above and symbols known to loadkeys\n" +"\t-l -s --long-info display above and symbols known to loadkeys\n" "\t-n --numeric\t display keytable in hexadecimal notation\n" "\t-f --full-table\t don't use short-hand notations, one row per keycode\n" "\t-1 --separate-lines one line per (modifier,keycode) pair\n" -"\t --funcs-only\t display only the function key strings\n" -"\t --keys-only\t display only key bindings\n" -"\t --compose-only display only compose key combinations\n" +"\t-S --shape=\n" +"\t-t --funcs-only\t display only the function key strings\n" +"\t-k --keys-only\t display only key bindings\n" +"\t-d --compose-only display only compose key combinations\n" "\t-c --charset=" msgstr "" "\n" @@ -81,26 +95,33 @@ "\t --compose-only 只显示组合键\n" "\t-c --charset=" -#: src/dumpkeys.c:45 +#: src/dumpkeys.c:50 #, c-format msgid "" "\t\t\t interpret character action codes to be from the\n" "\t\t\t specified character set\n" msgstr "" -"\t\t\t 翻译来自指定字符集的\n" +"\t\t\t 解释来自指定字符集的\n" "\t\t\t 字符动作代码\n" -#: src/dumpkeys.c:131 +#: src/dumpkeys.c:54 +#, c-format +msgid "" +"\t-v --verbose\n" +"\t-V --version\t print version number\n" +msgstr "" + +#: src/dumpkeys.c:140 #, c-format msgid "unknown charset %s - ignoring charset request\n" msgstr "未知的字符集 %s - 忽略字符集请求\n" -#: src/dumpkeys.c:152 src/loadkeys.c:182 -#, fuzzy, c-format +#: src/dumpkeys.c:162 src/loadkeys.c:184 +#, c-format msgid "%s: error reading keyboard mode: %m\n" -msgstr "%s: 设置键盘模式出错\n" +msgstr "%s: 设置键盘模式出错: %m\n" -#: src/dumpkeys.c:168 +#: src/dumpkeys.c:178 #, c-format msgid "" "Symbols recognized by %s:\n" @@ -111,7 +132,7 @@ "(数值, 标志)\n" "\n" -#: src/fgconsole.c:19 +#: src/fgconsole.c:21 #, c-format msgid "" "%s version %s\n" @@ -134,41 +155,41 @@ "\t-V --version 显示程序版本\n" "\t-n --next-available 显示下一个未被分配的 VT 编号\n" -#: src/fgconsole.c:68 +#: src/fgconsole.c:73 msgid "Couldn't read VTNO: " msgstr "无法读取 VT 号:" -#: src/getfd.c:67 +#: src/getfd.c:69 #, c-format msgid "Couldn't open %s\n" msgstr "无法打开 %s\n" -#: src/getfd.c:84 +#: src/getfd.c:86 #, c-format msgid "Couldn't get a file descriptor referring to the console\n" msgstr "无法获取指向控制台的文件描述符\n" -#: src/getkeycodes.c:19 +#: src/getkeycodes.c:22 #, c-format msgid "usage: getkeycodes\n" msgstr "用法: getkeycodes\n" -#: src/getkeycodes.c:55 +#: src/getkeycodes.c:60 #, c-format msgid "Plain scancodes xx (hex) versus keycodes (dec)\n" msgstr "普通扫描码 xx (十六进制) 对应键码(十进制)\n" -#: src/getkeycodes.c:58 +#: src/getkeycodes.c:63 #, c-format msgid "0 is an error; for 1-88 (0x01-0x58) scancode equals keycode\n" msgstr "0 是一个错误；对于等于扫描码 1-88 (0x01-0x58) 的键码来说\n" -#: src/getkeycodes.c:61 +#: src/getkeycodes.c:66 #, 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:67 +#: src/getkeycodes.c:72 #, c-format msgid "" "\n" @@ -179,12 +200,12 @@ "\n" "跳过扫描码 e0 xx (十六进制)\n" -#: src/getkeycodes.c:90 -#, fuzzy, c-format +#: src/getkeycodes.c:95 +#, c-format msgid "failed to get keycode for scancode 0x%x: ioctl KDGETKEYCODE" -msgstr "获取扫描码 0x%x 的键码失败\n" +msgstr "获取扫描码 0x%x 的键码失败: ioctl KDGETKEYCODE" -#: src/getunimap.c:29 +#: src/getunimap.c:33 #, c-format msgid "" "Usage:\n" @@ -193,263 +214,268 @@ "用法:\n" "\t%s [-s] [-C 控制台]\n" -#: src/kbdinfo.c:18 -#, c-format +#: src/kbdinfo.c:21 +#, fuzzy, c-format msgid "" "Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" -msgstr "" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +msgstr "" +"用法：%1$s [-C 设备] getmode [text|graphics]\n" +"或者：%1$s [-C 设备] gkbmode [raw|xlate|mediumraw|unicode]\n" +"或者：%1$s [-C 设备] gkbmeta [metabit|escprefix]\n" +"或者：%1$s [-C 设备] gkbled [scrolllock|numlock|capslock]\n" -#: src/kbdinfo.c:65 +#: src/kbdinfo.c:72 msgid "Error: Not enough arguments.\n" -msgstr "" +msgstr "错误: 参数不足。\n" -#: src/kbdinfo.c:123 -#, fuzzy, c-format +#: src/kbdinfo.c:147 +#, c-format msgid "Error: Unrecognized action: %s\n" msgstr "" -"无法识别的参数: _%s_\n" +"错误：无法识别的动作: _%s_\n" "\n" -#: src/kbd_mode.c:22 +#: src/kbd_mode.c:24 #, c-format msgid "usage: kbd_mode [-a|-u|-k|-s] [-C device]\n" msgstr "用法: kbd_mode [-a|-u|-k|-s] [-C 设备]\n" -#: src/kbd_mode.c:85 +#: src/kbd_mode.c:88 #, c-format msgid "The keyboard is in raw (scancode) mode\n" msgstr "键盘处于原始(扫描码)模式\n" -#: src/kbd_mode.c:88 +#: src/kbd_mode.c:91 #, c-format msgid "The keyboard is in mediumraw (keycode) mode\n" msgstr "键盘处于半原始(键码)模式\n" -#: src/kbd_mode.c:91 +#: src/kbd_mode.c:94 #, c-format msgid "The keyboard is in the default (ASCII) mode\n" msgstr "键盘处于默认 (ASCII) 模式\n" -#: src/kbd_mode.c:94 +#: src/kbd_mode.c:97 #, c-format msgid "The keyboard is in Unicode (UTF-8) mode\n" msgstr "键盘处于 Unicode (UTF-8) 模式\n" -#: src/kbd_mode.c:97 +#: src/kbd_mode.c:100 #, c-format msgid "The keyboard is in some unknown mode\n" msgstr "键盘处于某种未知模式\n" -#: src/kbdrate.c:155 src/kbdrate.c:173 src/kbdrate.c:330 +#: src/kbdrate.c:157 src/kbdrate.c:175 src/kbdrate.c:332 #, c-format msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n" msgstr "字元输入速率设置为 %.1f cps (延迟 = %d ms)\n" -#: src/kbdrate.c:263 -#, c-format -msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n" +#: src/kbdrate.c:267 +#, fuzzy, c-format +msgid "Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n" msgstr "用法: kbdrate [-V] [-s] [-r 速率] [-d 延迟]\n" -#: src/kbdrate.c:293 +#: src/kbdrate.c:295 msgid "Cannot open /dev/port" msgstr "无法打开 /dev/port" -#: src/kdfontop.c:94 +#: src/kdfontop.c:97 #, c-format msgid "bug: getfont called with count<256\n" msgstr "程序错误: 调用 getfont 时 count<256\n" -#: src/kdfontop.c:98 +#: src/kdfontop.c:101 #, c-format msgid "bug: getfont using GIO_FONT needs buf.\n" msgstr "程序错误: 使用 GIO_FONT 时 getfont 需要 buf.\n" -#: src/kdfontop.c:155 src/kdmapop.c:150 src/xmalloc.c:15 +#: src/kdfontop.c:158 src/kdmapop.c:152 src/xmalloc.c:18 #, c-format msgid "%s: out of memory\n" msgstr "%s: 内存不足\n" -#: src/kdmapop.c:159 +#: src/kdmapop.c:161 #, c-format msgid "strange... ct changed from %d to %d\n" -msgstr "" +msgstr "奇怪...ct 从 %d 变成了 %d。\n" -#: src/kdmapop.c:185 +#: src/kdmapop.c:187 #, c-format msgid "" "It seems this kernel is older than 1.1.92\n" "No Unicode mapping table loaded.\n" msgstr "" +"看来这个内核比 1.1.92 旧。\n" +"未加载任何 Unicode 映射表。\n" -#: src/libkeymap/common.c:126 src/libkeymap/kmap.c:60 src/libkeymap/kmap.c:68 -#: src/libkeymap/loadkeys.c:118 -#, fuzzy +#: src/libkeymap/common.c:140 src/libkeymap/kmap.c:58 src/libkeymap/kmap.c:66 +#: src/libkeymap/loadkeys.c:120 msgid "out of memory" -msgstr "%s: 内存不足\n" +msgstr "%内存不足" -#: src/libkeymap/common.c:132 +#: src/libkeymap/common.c:146 #, c-format msgid "unable to initialize array: %s" -msgstr "" +msgstr "无法初始化数组: %s" -#: src/libkeymap/dump.c:82 -#, fuzzy +#: src/libkeymap/dump.c:86 msgid "Error writing map to file" -msgstr "将映射写入文件失败\n" +msgstr "将映射写入文件失败" -#: src/libkeymap/dump.c:525 +#: src/libkeymap/dump.c:542 #, c-format msgid "impossible: not meta?\n" msgstr "不可能:不是 meta 键?\n" -#: src/libkeymap/kernel.c:31 -#, fuzzy, c-format +#: src/libkeymap/kernel.c:32 +#, c-format msgid "KDGKBENT: %s: error at index %d in table %d" -msgstr "表 %2$d 的索引 %1$d 处发生 KDGKBENT 错误\n" +msgstr "KDGKBENT: %s: 错误出现在索引 %d，表 %d" -#: src/libkeymap/kernel.c:57 +#: src/libkeymap/kernel.c:60 #, c-format msgid "KDGKBSENT: %s: Unable to get function key string" -msgstr "" +msgstr "KDGKBSENT: %s: 无法获取功能键字符串" -#: src/libkeymap/kernel.c:88 +#: src/libkeymap/kernel.c:90 #, c-format msgid "KDGKBDIACR(UC): %s: Unable to get accent table" -msgstr "" +msgstr "KDGKBDIACR(UC): %s: 无法获取重音字符表" -#: src/libkeymap/kmap.c:83 src/libkeymap/kmap.c:102 -#, fuzzy, c-format +#: src/libkeymap/kmap.c:80 src/libkeymap/kmap.c:98 +#, c-format msgid "unable to get keymap %d" -msgstr "回收键映射 %d\n" +msgstr "无法获取键映射 %d" -#: src/libkeymap/kmap.c:110 -#, fuzzy, c-format +#: src/libkeymap/kmap.c:106 +#, c-format msgid "unable to unset key %d for table %d" -msgstr "将键 %d 绑定到值 %d 失败\n" +msgstr "将键 %d 取消绑定到表 %d 失败" -#: src/libkeymap/kmap.c:127 -#, fuzzy, c-format +#: src/libkeymap/kmap.c:122 +#, c-format msgid "lk_add_key called with bad keycode %d" -msgstr "调用 addkey 时使用了错误的键码 %d" +msgstr "调用 lk_add_key 时使用了错误的键码 %d" -#: src/libkeymap/kmap.c:137 +#: src/libkeymap/kmap.c:129 #, c-format msgid "adding map %d violates explicit keymaps line" msgstr "添加映射 %d 违反了显式键映射行" -#: src/libkeymap/kmap.c:153 -#, fuzzy, c-format +#: src/libkeymap/kmap.c:145 +#, c-format msgid "unable to set key %d for table %d" -msgstr "将键 %d 绑定到值 %d 失败\n" +msgstr "将键 %d 绑定到表 %d 失败" -#: src/libkeymap/kmap.c:245 -#, fuzzy +#: src/libkeymap/kmap.c:236 msgid "impossible error in lk_add_constants" -msgstr "do_constant 中发生不可能的错误" +msgstr "lk_add_constants 中发生不可能的错误" -#: src/libkeymap/ksyms.c:147 +#: src/libkeymap/ksyms.c:150 #, c-format msgid "unable to get symbol by wrong type: %d" -msgstr "" +msgstr "无法以错误的类型获取符号: %d" -#: src/libkeymap/ksyms.c:161 +#: src/libkeymap/ksyms.c:164 #, c-format msgid "unable to get symbol of %d type by wrong index: %d" -msgstr "" +msgstr "无法以错误的索引获取 %d 类型的符号: %d" -#: src/libkeymap/ksyms.c:348 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:339 +#, c-format msgid "assuming iso-8859-1 %s" -msgstr "使用 iso-8859-1 %s\n" +msgstr "假定 iso-8859-1 %s" -#: src/libkeymap/ksyms.c:354 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:345 +#, c-format msgid "assuming iso-8859-15 %s" -msgstr "使用 iso-8859-15 %s\n" +msgstr "假定 iso-8859-15 %s" -#: src/libkeymap/ksyms.c:360 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:351 +#, c-format msgid "assuming iso-8859-2 %s" -msgstr "使用 iso-8859-2 %s\n" +msgstr "假定 iso-8859-2 %s" -#: src/libkeymap/ksyms.c:366 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:357 +#, c-format msgid "assuming iso-8859-3 %s" -msgstr "使用 iso-8859-3 %s\n" +msgstr "假定 iso-8859-3 %s" -#: src/libkeymap/ksyms.c:372 -#, fuzzy, c-format +#: src/libkeymap/ksyms.c:363 +#, c-format msgid "assuming iso-8859-4 %s" -msgstr "使用 iso-8859-4 %s\n" +msgstr " iso-8859-4 %s" -#: src/libkeymap/ksyms.c:377 +#: src/libkeymap/ksyms.c:368 #, c-format msgid "unknown keysym '%s'\n" msgstr "未知的 keysym '%s'\n" -#: src/libkeymap/loadkeys.c:26 +#: src/libkeymap/loadkeys.c:28 #, c-format msgid "KDSKBMODE: %s: could not switch to Unicode mode" -msgstr "" +msgstr "KDSKBMODE: %s: 不能切换到 Unicode 模式" -#: src/libkeymap/loadkeys.c:48 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:50 +#, c-format msgid "Keymap %d: Permission denied" -msgstr "键映射 %d: 权限不足\n" +msgstr "键映射 %d: 权限不足" -#: src/libkeymap/loadkeys.c:56 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:58 +#, c-format msgid "keycode %d, table %d = %d%s" -msgstr "键码 %d, 表 %d = %d%s\n" +msgstr "键码 %d, 表 %d = %d%s" -#: src/libkeymap/loadkeys.c:57 +#: src/libkeymap/loadkeys.c:59 msgid " FAILED" msgstr " 失败" -#: src/libkeymap/loadkeys.c:60 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:62 +#, c-format msgid "failed to bind key %d to value %d" -msgstr "将键 %d 绑定到值 %d 失败\n" +msgstr "将键 %d 绑定到值 %d 失败" -#: src/libkeymap/loadkeys.c:70 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:72 +#, c-format msgid "deallocate keymap %d" -msgstr "回收键映射 %d\n" +msgstr "回收键映射 %d" -#: src/libkeymap/loadkeys.c:74 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:76 +#, c-format msgid "KDSKBENT: %s: could not deallocate keymap %d" -msgstr "%s: 无法回收键映射 %d\n" +msgstr "KDSKBENT: %s: 无法回收键映射 %d" -#: src/libkeymap/loadkeys.c:89 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:91 +#, c-format msgid "KDSKBENT: %s: cannot deallocate or clear keymap" -msgstr "%s: 无法回收或清除键映射\n" +msgstr "KDSKBENT: %s: 无法回收或清除键映射" -#: src/libkeymap/loadkeys.c:99 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:101 +#, c-format msgid "KDSKBMODE: %s: could not return to original keyboard mode" -msgstr "%s: 恢复键盘模式失败\n" +msgstr "KDSKBMODE: %s: 无法回到原来的键盘模式" -#: src/libkeymap/loadkeys.c:161 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:163 +#, c-format msgid "failed to bind string '%s' to function %s" -msgstr "将字符串 '%s' 绑定到函数 %s 失败\n" +msgstr "将字符串 '%s' 绑定到函数 %s 失败" -#: src/libkeymap/loadkeys.c:171 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:173 +#, c-format msgid "failed to clear string %s" -msgstr "清除字符串 %s 失败\n" +msgstr "清除字符串 %s 失败" -#: src/libkeymap/loadkeys.c:190 -#, fuzzy +#: src/libkeymap/loadkeys.c:192 msgid "too many compose definitions" -msgstr "太多组合定义\n" +msgstr "太多组合定义" -#: src/libkeymap/loadkeys.c:251 +#: src/libkeymap/loadkeys.c:252 #, c-format msgid "" "\n" @@ -458,72 +484,66 @@ "\n" "Changed %d keys" msgstr[0] "" -msgstr[1] "" +"\n" +"更改了 %d 个键" -#: src/libkeymap/loadkeys.c:252 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:253 +#, c-format msgid "Changed %d string" msgid_plural "Changed %d strings" -msgstr[0] "" -"\n" -"已修改 %d %s 和 %d %s.\n" -msgstr[1] "" -"\n" -"已修改 %d %s 和 %d %s.\n" +msgstr[0] "已修改 %d 个字符串" -#: src/libkeymap/loadkeys.c:260 -#, fuzzy, c-format +#: src/libkeymap/loadkeys.c:261 +#, c-format msgid "Loaded %d compose definition" msgid_plural "Loaded %d compose definitions" -msgstr[0] "太多组合定义\n" -msgstr[1] "太多组合定义\n" +msgstr[0] "加载了 %d 个组合定义" -#: src/libkeymap/loadkeys.c:264 -#, fuzzy +#: src/libkeymap/loadkeys.c:266 msgid "(No change in compose definitions)" -msgstr "(组合定义没有改变。)\n" +msgstr "(组合定义没有改变)" -#: src/libkeymap/summary.c:97 +#: src/libkeymap/summary.c:95 #, c-format msgid "keycode range supported by kernel: 1 - %d\n" msgstr "内核支持的键码范围: 1 - %d\n" -#: src/libkeymap/summary.c:99 +#: src/libkeymap/summary.c:97 #, c-format msgid "max number of actions bindable to a key: %d\n" msgstr "可绑定到一个键上的动作的最大个数: %d\n" -#: src/libkeymap/summary.c:101 -#, fuzzy, c-format +#: src/libkeymap/summary.c:99 +#, c-format msgid "number of keymaps in actual use: %u\n" -msgstr "实际使用的键映射个数为: %d\n" +msgstr "实际使用的键映射个数为: %u\n" -#: src/libkeymap/summary.c:104 -#, fuzzy, c-format +#: src/libkeymap/summary.c:102 +#, c-format msgid "of which %u dynamically allocated\n" -msgstr "其中 %d 为动态分配\n" +msgstr "其中 %u 个为动态分配\n" -#: src/libkeymap/summary.c:107 +#: src/libkeymap/summary.c:105 #, c-format msgid "ranges of action codes supported by kernel:\n" msgstr "内核支持的行为码范围:\n" -#: src/libkeymap/summary.c:113 +#: src/libkeymap/summary.c:111 #, c-format msgid "number of function keys supported by kernel: %d\n" msgstr "内核支持的功能键的个数: %d\n" -#: src/libkeymap/summary.c:115 +#: src/libkeymap/summary.c:113 #, c-format msgid "max nr of compose definitions: %d\n" msgstr "组合定义的最大个数: %d\n" -#: src/libkeymap/summary.c:117 -#, fuzzy, c-format +#: src/libkeymap/summary.c:115 +#, c-format msgid "nr of compose definitions in actual use: %u\n" -msgstr "实际使用的组合定义的个数: %d\n" +msgstr "实际使用的组合定义的个数: %u\n" -#: src/libkeymap/summary.c:142 +#: src/libkeymap/summary.c:139 #, c-format msgid "" "\n" @@ -534,12 +554,12 @@ "下列同义词已被识别:\n" "\n" -#: src/libkeymap/summary.c:145 +#: src/libkeymap/summary.c:142 #, c-format msgid "%-15s for %s\n" msgstr "%-15s 为 %s\n" -#: src/libkeymap/summary.c:149 +#: src/libkeymap/summary.c:146 #, c-format msgid "" "\n" @@ -548,7 +568,7 @@ "\n" "已被识别的修饰符名称和它们的列号:\n" -#: src/loadkeys.c:35 +#: src/loadkeys.c:36 #, fuzzy, c-format msgid "" "loadkeys version %s\n" @@ -570,63 +590,65 @@ " -s --clearstrings clear kernel string table\n" " -u --unicode force conversion to Unicode\n" " -v --verbose report the changes\n" +" -V --version print version number\n" msgstr "" "loadkeys 版本 %s\n" "\n" -"用法: loadkeys [选项...] [映射文件...]\n" +"用法: %s [选项...] [映射文件...]\n" "\n" "有效的选项:\n" -"\n" +" -a --ascii 强制转换到 ASCII\n" " -b --bkeymap 输出一个二进制键映射到标准输出\n" " -c --clearcompose 清除内核组合表\n" -" -C <控制台1,控制台2,...> --console=<控制台1,控制台2,...>\n" -" 使用的控制台设备\n" +" -C --console=文件 使用的控制台设备\n" " -d --default 加载 \"%s\"\n" " -h --help 显示帮助文本\n" " -m --mktable 输出一个 \"defkeymap.c\" 到标准输出\n" +" -p --parse 搜索并解析键映射文件，什么都不做\n" +" -q --quiet 略过一切正常输出\n" " -s --clearstrings 清除内核字符串表\n" " -u --unicode 隐式转换为 Unicode\n" " -v --verbose 报告任何改变\n" -#: src/loadkeys.c:160 src/version.h:20 +#: src/loadkeys.c:161 src/version.h:22 #, c-format msgid "%s from %s\n" msgstr "%s 来自 %s\n" -#: src/loadkeys.c:170 +#: src/loadkeys.c:171 #, c-format msgid "%s: Options --unicode and --ascii are mutually exclusive\n" -msgstr "" +msgstr "%s: 选项 --unicode 和 --ascii 互斥\n" -#: src/loadkeys.c:190 -#, fuzzy, c-format +#: src/loadkeys.c:192 +#, 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 模式=%d\n" +"%s: 警告：正在 Unicode 终端上加载非 Unicode 键映射\n" " (或许你想 `kbd_mode -u'？)\n" -#: src/loadkeys.c:202 -#, fuzzy, c-format +#: src/loadkeys.c:204 +#, 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 模式=%d\n" +"%s: 警告：正在非 Unicode 终端上加载 Unicode 键映射\n" " (或许你想 `kbd_mode -u'？)\n" -#: src/loadkeys.c:220 +#: src/loadkeys.c:222 #, c-format msgid "Cannot find %s\n" msgstr "无法找到 %s\n" -#: src/loadkeys.c:242 +#: src/loadkeys.c:243 #, c-format msgid "cannot open file %s\n" msgstr "无法打开文件 %s\n" -#: src/loadunimap.c:43 +#: src/loadunimap.c:46 #, c-format msgid "" "Usage:\n" @@ -635,27 +657,27 @@ "用法:\n" "\t%s [-C 控制台] [-o 原始映射]\n" -#: src/loadunimap.c:175 src/loadunimap.c:186 +#: src/loadunimap.c:182 src/loadunimap.c:193 #, c-format msgid "Bad input line: %s\n" msgstr "错误的输入行: %s\n" -#: src/loadunimap.c:195 +#: src/loadunimap.c:202 #, c-format msgid "%s: Glyph number (0x%x) larger than font length\n" msgstr "%s: 符号编号 (0x%x) 大于字体长度\n" -#: src/loadunimap.c:201 +#: src/loadunimap.c:208 #, c-format msgid "%s: Bad end of range (0x%x)\n" msgstr "%s: 错误的范围结束值 (0x%x)\n" -#: src/loadunimap.c:231 src/psfxtable.c:175 +#: src/loadunimap.c:238 src/psfxtable.c:180 #, 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" -#: src/loadunimap.c:238 src/psfxtable.c:182 +#: src/loadunimap.c:245 src/psfxtable.c:187 #, c-format msgid "" "%s: Unicode range U+%x-U+%x not of the same length as font position range 0x" @@ -663,22 +685,22 @@ msgstr "" "%s: Unicode 范围 U+%x-U+%x 的长度和字体位置范围 0x%x-0x%x 的长度不一致\n" -#: src/loadunimap.c:257 src/psfxtable.c:203 +#: src/loadunimap.c:264 src/psfxtable.c:208 #, c-format msgid "%s: trailing junk (%s) ignored\n" msgstr "%s: 尾部无用信息 (%s) 被忽略\n" -#: src/loadunimap.c:273 +#: src/loadunimap.c:280 #, c-format msgid "Loading unicode map from file %s\n" msgstr "正在从文件 %s 加载 unicode 映射\n" -#: src/loadunimap.c:279 +#: src/loadunimap.c:286 #, c-format msgid "%s: %s: Warning: line too long\n" msgstr "%s: %s: 警告: 行太长\n" -#: src/loadunimap.c:289 +#: src/loadunimap.c:296 #, c-format msgid "" "%s: not loading empty unimap\n" @@ -687,80 +709,80 @@ "%s: 无法加载空的 unimap\n" "(如果你坚持: 使用选项 -f 来覆盖)\n" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entry" msgstr "个条目" -#: src/loadunimap.c:310 +#: src/loadunimap.c:318 msgid "entries" msgstr "个条目" -#: src/loadunimap.c:336 +#: src/loadunimap.c:344 #, c-format msgid "Saved unicode map on `%s'\n" msgstr "Unicode 映射已保存到文件 '%s'\n" -#: src/loadunimap.c:372 +#: src/loadunimap.c:380 #, c-format msgid "Appended Unicode map\n" msgstr "Unicode 映射已附加\n" -#: src/mapscrn.c:68 -#, c-format -msgid "usage: %s [-v] [-o map.orig] map-file\n" +#: src/mapscrn.c:71 +#, fuzzy, c-format +msgid "usage: %s [-V] [-v] [-o map.orig] map-file\n" msgstr "用法: %s [-v] [-o 原始映射] 映射文件\n" -#: src/mapscrn.c:133 +#: src/mapscrn.c:138 #, c-format msgid "mapscrn: cannot open map file _%s_\n" msgstr "mapscrn: 无法打开映射文件 _%s_\n" -#: src/mapscrn.c:139 +#: src/mapscrn.c:144 #, c-format msgid "Cannot stat map file" msgstr "无法 stat 映射文件" -#: src/mapscrn.c:144 +#: src/mapscrn.c:149 #, c-format msgid "Loading binary direct-to-font screen map from file %s\n" msgstr "正在从文件 %s 加载二进制 direct-to-font 屏幕映射\n" -#: src/mapscrn.c:149 src/mapscrn.c:160 +#: src/mapscrn.c:154 src/mapscrn.c:165 #, c-format msgid "Error reading map from file `%s'\n" msgstr "从文件 '%s' 读取映射出错\n" -#: src/mapscrn.c:155 +#: src/mapscrn.c:160 #, c-format msgid "Loading binary unicode screen map from file %s\n" msgstr "正在从文件 %s 加载二进制 unicode 屏幕映射\n" -#: src/mapscrn.c:167 +#: src/mapscrn.c:172 #, c-format msgid "Loading symbolic screen map from file %s\n" msgstr "正在从文件 %s 加载符号屏幕映射\n" -#: src/mapscrn.c:171 +#: src/mapscrn.c:176 #, c-format msgid "Error parsing symbolic map from `%s', line %d\n" msgstr "从文件 '%s' 解析标志映射出错，行 %d\n" -#: src/mapscrn.c:275 src/mapscrn.c:280 +#: src/mapscrn.c:281 src/mapscrn.c:286 #, c-format msgid "Error writing map to file\n" msgstr "将映射写入文件失败\n" -#: src/mapscrn.c:284 +#: src/mapscrn.c:290 #, c-format msgid "Cannot read console map\n" msgstr "无法读取控制台映射\n" -#: src/mapscrn.c:290 +#: src/mapscrn.c:296 #, c-format msgid "Saved screen map in `%s'\n" msgstr "屏幕映射已保存到 '%s'\n" -#: src/openvt.c:47 +#: src/openvt.c:49 #, c-format msgid "" "Usage: %s [OPTIONS] -- command\n" @@ -780,193 +802,195 @@ " -h, --help output a brief help message.\n" "\n" msgstr "" +"用法：%s [选项] -- 命令\n" +"\n" +"本实用工具帮助你在新的虚拟终端上启动一个程序。\n" +"\n" +"选项：\n" +" -c, --console=数字 使用给定的 VT 号；\n" +" -e, --exec 直接 exec 执行命令，不分叉子进程（fork）；\n" +" -f, --force 强行打开 VT 而不检查\n" +" -l, --login 使命令成为登录 shell\n" +" -u, --user 找出目前 VT 的所有者\n" +" -s, --switch 切换到新 VT\n" +" -w, --wait 等待命令完成\n" +" -v, --verbose 对每步操作打印信息\n" +" -V, --version 打印程序版本并退出\n" +" -h, --help 输出简短的帮助信息\n" +"\n" -#: src/openvt.c:138 -#, fuzzy +#: src/openvt.c:141 msgid "Couldn't find owner of current tty!" -msgstr "无法找到当前 tty 的所有者！\n" +msgstr "无法找到当前 tty 的所有者！" -#: src/openvt.c:208 -#, fuzzy, c-format +#: src/openvt.c:210 +#, c-format msgid "%s: Illegal vt number" -msgstr "openvt: %s: 非法的 VT 号\n" +msgstr "%s: 非法的 VT 号" -#: src/openvt.c:234 -#, fuzzy +#: src/openvt.c:236 msgid "Only root can use the -u flag." -msgstr "openvt: 只有 root 用户可以使用 -u 标志。\n" +msgstr "只有 root 用户可以使用 -u 标志。" -#: src/openvt.c:256 -#, fuzzy -msgid "Couldn't get a file descriptor referring to the console" -msgstr "无法获取指向控制台的文件描述符\n" - -#: src/openvt.c:263 -#, fuzzy +#: src/openvt.c:265 msgid "Cannot find a free vt" -msgstr "openvt: 无法找到一个空闲的 VT\n" +msgstr "无法找到一个空闲的 VT" -#: src/openvt.c:267 -#, fuzzy, c-format +#: src/openvt.c:269 +#, c-format msgid "Cannot check whether vt %d is free; use `%s -f' to force." -msgstr "openvt: 无法检查 VT %d 是否空闲\n" +msgstr "无法检查 VT %d 是否空闲；使用“%s -f”强制执行。" -#: src/openvt.c:271 -#, fuzzy, c-format +#: src/openvt.c:273 +#, c-format msgid "vt %d is in use; command aborted; use `%s -f' to force." -msgstr "openvt: VT %d 正在使用中；命令中止\n" +msgstr "VT %d 正在使用中；使用“%s -f”强制执行。" -#: src/openvt.c:281 +#: src/openvt.c:283 msgid "Unable to find command." -msgstr "" +msgstr "无法找到命令。" -#: src/openvt.c:313 -#, fuzzy +#: src/openvt.c:315 msgid "Unable to set new session" -msgstr "openvt: 无法设置新的会话 (%s)\n" +msgstr "无法设置新的会话" -#: src/openvt.c:337 -#, fuzzy, c-format +#: src/openvt.c:339 +#, c-format msgid "Unable to open %s" -msgstr "openvt: 无法打开 %s: %s\n" +msgstr "无法打开 %s" -#: src/openvt.c:341 -#, fuzzy, c-format +#: src/openvt.c:343 +#, c-format msgid "Using VT %s" -msgstr "openvt: 正在使用 VT %s\n" +msgstr "正在使用 VT %s" -#: src/openvt.c:347 -#, fuzzy, c-format +#: src/openvt.c:349 +#, c-format msgid "Cannot open %s read/write" -msgstr "openvt: 无法打开 %s 进行读/写 (%s)\n" +msgstr "无法打开 %s 以供读写" -#: src/openvt.c:358 -#, fuzzy, c-format +#: src/openvt.c:360 +#, c-format msgid "Couldn't activate vt %d" -msgstr "" -"\n" -"openvt: 无法激活 VT %d (%s)\n" +msgstr "无法激活 VT %d" -#: src/openvt.c:361 -#, fuzzy +#: src/openvt.c:363 msgid "Activation interrupted?" -msgstr "" -"\n" -"openvt: 激活被中断？(%s)\n" +msgstr "激活被中断？" -#: src/openvt.c:401 -#, fuzzy, c-format +#: src/openvt.c:403 +#, c-format msgid "Couldn't deallocate console %d" -msgstr "%s: 无法回收控制台 %d\n" +msgstr "无法回收控制台 %d" -#: src/psffontop.c:69 +#: src/psffontop.c:76 #, c-format msgid "%s: short ucs2 unicode table\n" msgstr "%s: 短 ucs2 unicode 表\n" -#: src/psffontop.c:90 +#: src/psffontop.c:98 #, c-format msgid "%s: short utf8 unicode table\n" msgstr "%s: 短 utf8 unicode 表\n" -#: src/psffontop.c:93 +#: src/psffontop.c:101 #, c-format msgid "%s: bad utf8\n" msgstr "%s: 错误的 utf8\n" -#: src/psffontop.c:96 +#: src/psffontop.c:104 #, c-format msgid "%s: unknown utf8 error\n" msgstr "%s: 未知的 utf8 错误\n" -#: src/psffontop.c:126 +#: src/psffontop.c:136 #, c-format msgid "%s: short unicode table\n" msgstr "%s: 短 unicode 表\n" -#: src/psffontop.c:206 +#: src/psffontop.c:216 #, c-format msgid "%s: Error reading input font" msgstr "%s: 读取输入字体出错" -#: src/psffontop.c:220 +#: src/psffontop.c:230 #, c-format msgid "%s: Bad call of readpsffont\n" msgstr "%s: 对 readpsffont 的错误调用\n" -#: src/psffontop.c:235 +#: src/psffontop.c:245 #, c-format msgid "%s: Unsupported psf file mode (%d)\n" msgstr "%s: 不支持的 psf 文件模式 (%d)\n" -#: src/psffontop.c:253 +#: src/psffontop.c:263 #, c-format msgid "%s: Unsupported psf version (%d)\n" msgstr "%s: 不支持的 psf 版本 (%d)\n" -#: src/psffontop.c:269 +#: src/psffontop.c:279 #, c-format msgid "%s: zero input font length?\n" msgstr "%s: 输入字体的长度为 0？\n" -#: src/psffontop.c:274 +#: src/psffontop.c:284 #, c-format msgid "%s: zero input character size?\n" msgstr "%s: 输入字符的大小为 0？\n" -#: src/psffontop.c:280 +#: src/psffontop.c:290 #, c-format msgid "%s: Input file: bad input length (%d)\n" msgstr "%s: 输入文件: 错误的输入长度 (%d)\n" -#: src/psffontop.c:312 +#: src/psffontop.c:322 #, c-format msgid "%s: Input file: trailing garbage\n" msgstr "%s: 输入文件: 尾部无用信息\n" -#: src/psffontop.c:350 +#: src/psffontop.c:361 #, c-format msgid "appendunicode: illegal unicode %u\n" msgstr "appendunicode: 非法的 unicode %u\n" -#: src/psffontop.c:443 +#: src/psffontop.c:455 #, c-format msgid "Cannot write font file header" msgstr "无法写入字体文件头部" -#: src/psffontop.c:469 src/setfont.c:679 +#: src/psffontop.c:480 src/setfont.c:693 #, c-format msgid "Cannot write font file" msgstr "无法写入字体文件" -#: src/psfxtable.c:109 +#: src/psfxtable.c:114 #, c-format msgid "%s: Warning: line too long\n" msgstr "%s: 警告: 行太长\n" -#: src/psfxtable.c:123 src/psfxtable.c:133 +#: src/psfxtable.c:128 src/psfxtable.c:138 #, c-format msgid "%s: Bad input line: %s\n" msgstr "%s: 错误的输入行: %s\n" -#: src/psfxtable.c:142 +#: src/psfxtable.c:147 #, c-format msgid "%s: Glyph number (0x%lx) past end of font\n" msgstr "%s: 符号编号 (0x%lx) 超过了字体的结尾\n" -#: src/psfxtable.c:147 +#: src/psfxtable.c:152 #, c-format msgid "%s: Bad end of range (0x%lx)\n" msgstr "%s: 错误的范围结束值 (0x%lx)\n" -#: src/psfxtable.c:166 +#: src/psfxtable.c:171 #, c-format msgid "" "%s: Corresponding to a range of font positions, there should be a Unicode " "range\n" msgstr "%s: 对应于一个字体位置的范围，应该存在一个 Unicode 范围\n" -#: src/psfxtable.c:257 +#: src/psfxtable.c:263 #, c-format msgid "" "Usage:\n" @@ -975,7 +999,7 @@ "用法:\n" "\t%s 输入字体 输入表 输出字体\n" -#: src/psfxtable.c:266 +#: src/psfxtable.c:272 #, c-format msgid "" "Usage:\n" @@ -984,7 +1008,7 @@ "用法:\n" "\t%s 输入字体 [输出表]\n" -#: src/psfxtable.c:275 +#: src/psfxtable.c:281 #, c-format msgid "" "Usage:\n" @@ -993,7 +1017,7 @@ "用法:\n" "\t%s 输入字体 输出字体\n" -#: src/psfxtable.c:300 +#: src/psfxtable.c:304 #, c-format msgid "" "Usage:\n" @@ -1002,22 +1026,22 @@ "用法:\n" "\t%s [-i 输入字体] [-o 输出字体] [-it 输入表] [-ot 输出表] [-nt]\n" -#: src/psfxtable.c:360 +#: src/psfxtable.c:364 #, c-format msgid "%s: Bad magic number on %s\n" msgstr "%s: 错误的魔数 %s\n" -#: src/psfxtable.c:379 +#: src/psfxtable.c:383 #, c-format msgid "%s: psf file with unknown magic\n" msgstr "%s: psf 文件使用了未知的魔数\n" -#: src/psfxtable.c:395 +#: src/psfxtable.c:399 #, c-format msgid "%s: input font does not have an index\n" msgstr "%s: 输入字体没有索引\n" -#: src/resizecons.c:148 +#: src/resizecons.c:147 #, c-format msgid "resizecons: cannot find videomode file %s\n" msgstr "resizecons: 无法找到 videomode 文件 %s\n" @@ -1026,28 +1050,28 @@ msgid "Invalid number of lines\n" msgstr "非法的行数\n" -#: src/resizecons.c:227 +#: src/resizecons.c:247 #, c-format msgid "Old mode: %dx%d New mode: %dx%d\n" msgstr "旧的模式: %dx%d 新的模式: %dx%d\n" -#: src/resizecons.c:229 +#: src/resizecons.c:249 #, c-format msgid "Old #scanlines: %d New #scanlines: %d Character height: %d\n" msgstr "旧的扫描行个数为: %d 新的扫描行个数为: %d 字符高度为: %d\n" -#: src/resizecons.c:240 +#: src/resizecons.c:260 #, c-format msgid "resizecons: the command `%s' failed\n" msgstr "resizecons: 命令 '%s' 失败\n" -#: src/resizecons.c:313 +#: src/resizecons.c:343 #, 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" -#: src/resizecons.c:326 +#: src/resizecons.c:357 #, c-format msgid "" "resizecons:\n" @@ -1060,41 +1084,41 @@ "或: resizecons -lines ROWS, 其中 ROWS 为 25, 28, 30, 34, 36, 40, 44, 50, 60 " "中的一个\n" -#: src/resizecons.c:364 +#: src/resizecons.c:396 #, c-format msgid "resizecons: cannot get I/O permissions.\n" msgstr "resizecons: 无法获取 I/O 权限。\n" -#: src/screendump.c:50 +#: src/screendump.c:52 #, c-format msgid "usage: screendump [n]\n" msgstr "用法: screendump [n]\n" -#: src/screendump.c:80 -#, fuzzy, c-format +#: src/screendump.c:82 +#, c-format msgid "Error reading %s" -msgstr "读取 %s 出错\n" +msgstr "读取 %s 出错" -#: src/screendump.c:126 +#: src/screendump.c:127 #, c-format msgid "couldn't read %s, and cannot ioctl dump\n" msgstr "无法读取 %s, 并且不能 ioctl 转储\n" -#: src/screendump.c:132 +#: src/screendump.c:133 #, c-format msgid "couldn't read %s\n" msgstr "无法读取 %s\n" -#: src/screendump.c:141 +#: src/screendump.c:142 #, c-format msgid "Strange ... screen is both %dx%d and %dx%d ??\n" msgstr "奇怪...屏幕既是 %dx%d 又是 %dx%d ？？\n" -#: src/screendump.c:158 +#: src/screendump.c:159 msgid "Error writing screendump\n" msgstr "写入屏幕转储出错\n" -#: src/setfont.c:74 +#: src/setfont.c:78 #, c-format msgid "" "Usage: setfont [write-options] [-] [newfont..] [-m consolemap] [-u " @@ -1147,134 +1171,134 @@ " -V 打印版本并退出。\n" "从当前目录或 %s/*/ 加载文件。\n" -#: src/setfont.c:177 +#: src/setfont.c:181 #, c-format msgid "setfont: too many input files\n" msgstr "setfont: 太多的输入文件\n" -#: src/setfont.c:185 +#: src/setfont.c:189 #, c-format msgid "" "setfont: cannot both restore from character ROM and from file. Font " "unchanged.\n" msgstr "setfont: 无法既从字符 ROM 进行恢复又从文件进行恢复。字体不变。\n" -#: src/setfont.c:259 +#: src/setfont.c:264 #, c-format msgid "Bad character height %d\n" msgstr "错误的字符高度 %d\n" -#: src/setfont.c:263 +#: src/setfont.c:268 #, c-format msgid "Bad character width %d\n" msgstr "错误的字符宽度 %d\n" -#: src/setfont.c:288 +#: src/setfont.c:293 #, c-format msgid "%s: font position 32 is nonblank\n" msgstr "%s: 字体位置 32 不是空白\n" -#: src/setfont.c:296 +#: src/setfont.c:301 #, c-format msgid "%s: wiped it\n" msgstr "%s: 已清除\n" -#: src/setfont.c:300 +#: src/setfont.c:305 #, c-format msgid "%s: background will look funny\n" msgstr "%s: 背景将会看起来很有趣\n" -#: src/setfont.c:310 +#: src/setfont.c:315 #, c-format msgid "Loading %d-char %dx%d font from file %s\n" msgstr "正在从文件 %4$s 加载 %1$d-字节 %2$dx%3$d 字体\n" -#: src/setfont.c:313 +#: src/setfont.c:318 #, c-format msgid "Loading %d-char %dx%d font\n" msgstr "正在加载 %d-字节 %dx%d 字体\n" -#: src/setfont.c:316 +#: src/setfont.c:321 #, c-format msgid "Loading %d-char %dx%d (%d) font from file %s\n" msgstr "正在从文件 %5$s 加载 %1$d-字节 %2$dx%3$d (%4$d) 字体\n" -#: src/setfont.c:319 +#: src/setfont.c:324 #, c-format msgid "Loading %d-char %dx%d (%d) font\n" msgstr "正在加载 %d-字节 %dx%d (%d) 字体\n" -#: src/setfont.c:372 +#: src/setfont.c:380 #, c-format msgid "%s: bug in do_loadtable\n" msgstr "%s: do_loadtable 中的程序错误\n" -#: src/setfont.c:378 +#: src/setfont.c:386 #, c-format msgid "Loading Unicode mapping table...\n" msgstr "正在加载 Unicode 映射表 ...\n" -#: src/setfont.c:414 src/setfont.c:502 +#: src/setfont.c:422 src/setfont.c:510 #, c-format msgid "Cannot open font file %s\n" msgstr "无法打开字体文件 %s\n" -#: src/setfont.c:425 +#: src/setfont.c:433 #, c-format msgid "When loading several fonts, all must be psf fonts - %s isn't\n" msgstr "当加载多个字体时，它们必须都是 psf 字体 - %s 不是\n" -#: src/setfont.c:435 +#: src/setfont.c:443 #, c-format msgid "Read %d-char %dx%d font from file %s\n" msgstr "从文件 %4$s 读取 %1$d-字节 %2$dx%3$d 字体\n" -#: src/setfont.c:441 +#: src/setfont.c:449 #, c-format msgid "When loading several fonts, all must have the same height\n" msgstr "当加载多个字体时，它们必须具有相同的高度\n" -#: src/setfont.c:448 +#: src/setfont.c:456 #, c-format msgid "When loading several fonts, all must have the same width\n" msgstr "当加载多个字体时，它们必须具有相同的宽度\n" -#: src/setfont.c:489 +#: src/setfont.c:497 #, c-format msgid "Cannot find default font\n" msgstr "无法找到默认字体\n" -#: src/setfont.c:496 +#: src/setfont.c:504 #, c-format msgid "Cannot find %s font\n" msgstr "无法找到 %s 字体\n" -#: src/setfont.c:508 +#: src/setfont.c:516 #, c-format msgid "Reading font file %s\n" msgstr "正在读取字体文件 %s\n" -#: src/setfont.c:548 +#: src/setfont.c:557 #, c-format msgid "No final newline in combine file\n" msgstr "合并文件结尾处没有新的行\n" -#: src/setfont.c:554 +#: src/setfont.c:563 #, c-format msgid "Too many files to combine\n" msgstr "太多的文件需要合并\n" -#: src/setfont.c:578 +#: src/setfont.c:587 #, c-format msgid "Hmm - a font from restorefont? Using the first half.\n" msgstr "嗯 - 一个来自 restorefont 的字体？使用它的前一半。\n" -#: src/setfont.c:595 +#: src/setfont.c:604 #, c-format msgid "Bad input file size\n" msgstr "错误的输入文件大小\n" -#: src/setfont.c:616 +#: src/setfont.c:626 #, c-format msgid "" "This file contains 3 fonts: 8x8, 8x14 and 8x16. Please indicate\n" @@ -1283,22 +1307,22 @@ "这个文件包含3种字体: 8x8, 8x14 和 8x16. 请使用\n" "选项 -8 或 -14 或 -16 来指定你想加载哪一个。\n" -#: src/setfont.c:630 +#: src/setfont.c:643 #, c-format msgid "You asked for font size %d, but only 8, 14, 16 are possible here.\n" msgstr "你想要字体大小 %d, 但是这里只有 8, 14, 16 可选。\n" -#: src/setfont.c:675 +#: src/setfont.c:689 #, c-format msgid "Found nothing to save\n" msgstr "没有找到需要保存的东西\n" -#: src/setfont.c:684 +#: src/setfont.c:698 #, c-format msgid "Saved %d-char %dx%d font file on %s\n" msgstr "%d-字节 %dx%d 字体文件已保存到 %s\n" -#: src/setkeycodes.c:23 +#: src/setkeycodes.c:26 #, c-format msgid "" "usage: setkeycode scancode keycode ...\n" @@ -1309,24 +1333,24 @@ "(其中扫描码为 xx 或 e0xx, 以十六进制形式给出，\n" "键码以十进制形式给出)\n" -#: src/setkeycodes.c:45 +#: src/setkeycodes.c:48 msgid "even number of arguments expected" msgstr "请输入偶数个参数" -#: src/setkeycodes.c:52 +#: src/setkeycodes.c:57 msgid "error reading scancode" msgstr "读取扫描码出错" -#: src/setkeycodes.c:60 +#: src/setkeycodes.c:65 msgid "code outside bounds" msgstr "边界外的键码" -#: src/setkeycodes.c:69 -#, fuzzy, c-format +#: src/setkeycodes.c:74 +#, c-format msgid "failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE" -msgstr "设置扫描码 %x 到键码 %d 失败\n" +msgstr "设置扫描码 %x 到键码 %d 失败：ioctl KDSETKEYCODE" -#: src/setleds.c:24 +#: src/setleds.c:25 #, c-format msgid "" "Usage:\n" @@ -1363,57 +1387,53 @@ msgid "off" msgstr "关" -#: src/setleds.c:87 -#, fuzzy +#: src/setleds.c:90 msgid "" "Error reading current led setting. Maybe stdin is not a VT?: ioctl KDGETLED" -msgstr "读取当前 LED 设置出错。也许标准输入不是一个 VT？\n" +msgstr "读取当前 LED 设置出错。也许标准输入不是一个 VT？：ioctl KDGETLED" -#: src/setleds.c:105 -#, fuzzy +#: src/setleds.c:110 msgid "" "Error reading current flags setting. Maybe you are not on the console?: " "ioctl KDGKBLED" -msgstr "读取当前标志设置出错。也许你不是在控制台上？\n" +msgstr "读取当前标志设置出错。也许你不是在控制台上（ioctl KDGKBLED）？" -#: src/setleds.c:123 -#, fuzzy +#: src/setleds.c:129 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCGLED" -msgstr "从 /dev/kbd 读取当前 LED 设置出错。\n" +msgstr "从 /dev/kbd 读取当前 LED 设置出错：ioctl KIOCGLED" -#: src/setleds.c:127 +#: src/setleds.c:133 msgid "KIOCGLED unavailable?\n" msgstr "KIOCGLED 不可用？\n" -#: src/setleds.c:141 -#, fuzzy +#: src/setleds.c:148 msgid "Error reading current led setting from /dev/kbd: ioctl KIOCSLED" -msgstr "从 /dev/kbd 读取当前 LED 设置出错。\n" +msgstr "从 /dev/kbd 读取当前 LED 设置出错：ioctl KIOCSLED" -#: src/setleds.c:145 +#: src/setleds.c:152 msgid "KIOCSLED unavailable?\n" msgstr "KIOCSLED 不可用？\n" -#: src/setleds.c:201 +#: src/setleds.c:208 msgid "Error resetting ledmode\n" msgstr "复位 LED 模式出错\n" -#: src/setleds.c:209 +#: src/setleds.c:216 #, c-format msgid "Current default flags: " msgstr "当前默认标志: " -#: src/setleds.c:213 +#: src/setleds.c:220 #, c-format msgid "Current flags: " msgstr "当前标志: " -#: src/setleds.c:217 +#: src/setleds.c:224 #, c-format msgid "Current leds: " msgstr "当前 LED: " -#: src/setleds.c:253 src/setmetamode.c:95 +#: src/setleds.c:260 src/setmetamode.c:96 #, c-format msgid "" "unrecognized argument: _%s_\n" @@ -1422,37 +1442,37 @@ "无法识别的参数: _%s_\n" "\n" -#: src/setleds.c:262 +#: src/setleds.c:269 #, c-format msgid "Old default flags: " msgstr "旧的默认标志: " -#: src/setleds.c:264 +#: src/setleds.c:271 #, c-format msgid "New default flags: " msgstr "新的默认标志: " -#: src/setleds.c:271 +#: src/setleds.c:278 #, c-format msgid "Old flags: " msgstr "旧的标志: " -#: src/setleds.c:273 +#: src/setleds.c:280 #, c-format msgid "New flags: " msgstr "新的标志: " -#: src/setleds.c:286 src/setleds.c:295 +#: src/setleds.c:293 src/setleds.c:302 #, c-format msgid "Old leds: " msgstr "旧的 LED: " -#: src/setleds.c:288 src/setleds.c:297 +#: src/setleds.c:295 src/setleds.c:304 #, c-format msgid "New leds: " msgstr "新的 LED: " -#: src/setmetamode.c:23 +#: src/setmetamode.c:24 #, c-format msgid "" "Usage:\n" @@ -1469,43 +1489,43 @@ "来改变另外一个 VT 的设置。\n" "改变之前和之后的设置都会被报告。\n" -#: src/setmetamode.c:39 +#: src/setmetamode.c:40 msgid "Meta key sets high order bit\n" msgstr "Meta 键设置了高有效位\n" -#: src/setmetamode.c:42 +#: src/setmetamode.c:43 msgid "Meta key gives Esc prefix\n" msgstr "Meta 键给出了 Esc 前缀\n" -#: src/setmetamode.c:45 +#: src/setmetamode.c:46 msgid "Strange mode for Meta key?\n" msgstr "Meta 键的奇怪模式？\n" -#: src/setmetamode.c:79 -#, fuzzy +#: src/setmetamode.c:80 msgid "" "Error reading current setting. Maybe stdin is not a VT?: ioctl KDGKBMETA" -msgstr "读取当前设置出错。也许标准输出不是一个 VT？\n" +msgstr "读取当前设置出错。也许标准输入不是一个 VT？： ioctl KDGKBMETA" -#: src/setmetamode.c:99 +#: src/setmetamode.c:100 #, c-format msgid "old state: " msgstr "旧状态: " -#: src/setmetamode.c:104 +#: src/setmetamode.c:105 #, c-format msgid "new state: " msgstr "新状态: " -#: src/setvesablank.c:25 +#: src/setvesablank.c:29 #, c-format msgid "usage: %s\n" msgstr "用法: %s\n" -#: src/setvtrgb.c:42 -#, c-format +#: src/setvtrgb.c:44 +#, fuzzy, c-format msgid "" -"Usage: %s vga|FILE|-\n" +"Usage: %s [-h] [-V]\n" +" %s vga|FILE|-\n" "\n" "If you use the FILE parameter, FILE should be exactly 3 lines of\n" "comma-separated decimal values for RED, GREEN, and BLUE.\n" @@ -1515,52 +1535,67 @@ "\n" "and then edit the values in FILE.\n" "\n" +"Other options:\n" +" -h print this usage message\n" +" -V print version number\n" +"\n" msgstr "" +"使用方法: %s vga|文件|-\n" +"\n" +"如果您使用 <文件> 参数，文件应正好含三行逗号分隔的十进制数值，\n" +"分别对应红、绿、蓝。\n" +"\n" +"要获得一个有效的 <文件> 作为模板：\n" +" cat /sys/module/vt/parameters/default_{red,grn,blu} > 文件\n" +"\n" +"然后编辑 <文件> 内的数值。\n" +"\n" -#: src/setvtrgb.c:68 +#: src/setvtrgb.c:75 #, c-format msgid "Error: %s: Invalid value in field %u in line %u." -msgstr "" +msgstr "错误: %1$s: 行 %3$u 中的字段 %2$u 有无效值。" -#: src/setvtrgb.c:75 +#: src/setvtrgb.c:82 #, c-format msgid "Error: %s: Insufficient number of fields in line %u." -msgstr "" +msgstr "错误: %s: %u 行中字段的数目不足。" -#: src/setvtrgb.c:80 +#: src/setvtrgb.c:87 #, c-format msgid "Error: %s: Line %u has ended unexpectedly.\n" -msgstr "" +msgstr "错误: %s: 行 %u 意外结束。\n" -#: src/setvtrgb.c:84 -#, fuzzy, c-format +#: src/setvtrgb.c:91 +#, c-format msgid "Error: %s: Line %u is too long.\n" -msgstr "%s: %s: 警告: 行太长\n" +msgstr "错误：%s: 行 %u 太长。\n" -#: src/showconsolefont.c:35 +#: src/showconsolefont.c:38 msgid "failed to restore original translation table\n" msgstr "恢复原始翻译表失败\n" -#: src/showconsolefont.c:39 +#: src/showconsolefont.c:42 msgid "failed to restore original unimap\n" msgstr "恢复原始 unimap 失败\n" -#: src/showconsolefont.c:57 +#: src/showconsolefont.c:61 msgid "cannot change translation table\n" msgstr "无法更改翻译表\n" -#: src/showconsolefont.c:95 -#, c-format +#: src/showconsolefont.c:102 +#, fuzzy, c-format msgid "" "usage: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" "(probably after loading a font with `setfont font')\n" "\n" "Valid options are:\n" -" -C tty Device to read the font from. Default: current tty.\n" -" -v Be more verbose.\n" -" -i Don't print out the font table, just show\n" -" ROWSxCOLSxCOUNT and exit.\n" +" -V --version Print version number and exit.\n" +" -C tty Device to read the font from. Default: current tty.\n" +" -v Be more verbose.\n" +" -i Don't print out the font table, just show\n" +" ROWSxCOLSxCOUNT and exit.\n" msgstr "" "用法: showconsolefont -V|--version\n" " showconsolefont [-C tty] [-v] [-i]\n" @@ -1572,22 +1607,22 @@ "-i 不打印字体表，只显示\n" " ROWSxCOLSxCOUNT 并退出。\n" -#: src/showconsolefont.c:161 +#: src/showconsolefont.c:170 #, c-format msgid "Character count: %d\n" msgstr "字符总数: %d\n" -#: src/showconsolefont.c:162 +#: src/showconsolefont.c:171 #, c-format msgid "Font width : %d\n" msgstr "字体宽度 : %d\n" -#: src/showconsolefont.c:163 +#: src/showconsolefont.c:172 #, c-format msgid "Font height : %d\n" msgstr "字体高度 : %d\n" -#: src/showconsolefont.c:175 +#: src/showconsolefont.c:183 #, c-format msgid "" "Showing %d-char font\n" @@ -1596,16 +1631,16 @@ "显示 %d-字节字体\n" "\n" -#: src/showkey.c:44 +#: src/showkey.c:51 msgid "?UNKNOWN?" msgstr "?未知的?" -#: src/showkey.c:46 +#: src/showkey.c:54 #, c-format msgid "kb mode was %s\n" msgstr "旧的键盘模式是 %s\n" -#: src/showkey.c:48 +#: src/showkey.c:56 #, c-format msgid "" "[ if you are trying this under X, it might not work\n" @@ -1614,13 +1649,13 @@ "[ 如果你在 X 中尝试，它可能不会工作\n" "因为 X 服务器也在读取 /dev/console ]\n" -#: src/showkey.c:66 +#: src/showkey.c:76 #, c-format msgid "caught signal %d, cleaning up...\n" msgstr "捕获到信号 %d，正在清理...\n" -#: src/showkey.c:80 -#, c-format +#: src/showkey.c:92 +#, fuzzy, c-format msgid "" "showkey version %s\n" "\n" @@ -1632,6 +1667,7 @@ "\t-a --ascii\tdisplay the decimal/octal/hex values of the keys\n" "\t-s --scancodes\tdisplay only the raw scan-codes\n" "\t-k --keycodes\tdisplay only the interpreted keycodes (default)\n" +"\t-V --version\tprint version number\n" msgstr "" "showkey 版本 %s\n" "\n" @@ -1644,7 +1680,7 @@ "\t-s --scancodes\t只显示原始扫描码\n" "\t-k --keycodes\t只显示翻译后的键码(默认)\n" -#: src/showkey.c:158 +#: src/showkey.c:171 #, c-format msgid "" "\n" @@ -1655,54 +1691,56 @@ "按任意键 - Ctrl-D 将结束这个程序\n" "\n" -#: src/showkey.c:226 +#: src/showkey.c:239 #, c-format msgid "press any key (program terminates 10s after last keypress)...\n" msgstr "按任意键(在上次按键后10秒程序结束)...\n" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "release" msgstr "释放" -#: src/showkey.c:250 +#: src/showkey.c:263 msgid "press" msgstr "按下" -#: src/showkey.c:262 +#: src/showkey.c:273 #, c-format msgid "keycode %3d %s\n" msgstr "键码 %3d %s\n" -#: src/totextmode.c:31 -#, fuzzy +#: src/totextmode.c:33 msgid "usage: totextmode\n" -msgstr "用法: getkeycodes\n" +msgstr "用法：totextmode\n" -#: src/vlock/auth.c:78 +#: src/vlock/auth.c:75 msgid "" "Please try again later.\n" "\n" "\n" msgstr "" +"请稍后再试\n" +"\n" +"\n" -#: src/vlock/auth.c:87 +#: src/vlock/auth.c:83 #, c-format msgid "The entire console display is now completely locked by %s.\n" -msgstr "" +msgstr "整个控制台显示器已被 %s 锁定。\n" -#: src/vlock/auth.c:91 +#: src/vlock/auth.c:86 #, c-format msgid "The %s is now locked by %s.\n" -msgstr "" +msgstr "此 %s 现已被 %s 锁定。\n" -#: src/vlock/auth.c:94 +#: src/vlock/auth.c:89 msgid "Use Alt-function keys to switch to other virtual consoles." -msgstr "" +msgstr "使用 Alt-功能键 (F1..F12) 切换到其他虚拟控制台。" #: src/vlock/parse.c:51 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "" +msgstr "尝试“%s --help”以获得更多信息。\n" #: src/vlock/parse.c:59 #, c-format @@ -1717,27 +1755,30 @@ "-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" +" -c, --current 仅锁定此虚拟控制台，允许用户切换到其他虚拟控制台。\n" +" -a, --all 锁定所有虚拟控制台。通过防止其他用户切换虚拟控制台达成。\n" +" -v, --version 打印 vlock 和 exit 的版本号\n" +" -h, --help 显示此帮助消息并退出。\n" #: src/vlock/username.c:57 -#, fuzzy msgid "unrecognized user" -msgstr "" -"无法识别的参数: _%s_\n" -"\n" +msgstr "无法识别的用户" #: src/vlock/vlock.c:59 msgid "stdin is not a tty" -msgstr "" +msgstr "stdin 不是 tty" -#: src/vlock/vt.c:152 +#: src/vlock/vt.c:148 #, c-format msgid "This tty (%s) is not a virtual console.\n" -msgstr "" +msgstr "这个 tty (%s) 不是一个虚拟控制台。\n" -#: src/vlock/vt.c:160 -#, fuzzy, c-format +#: src/vlock/vt.c:155 +#, c-format msgid "The entire console display cannot be locked.\n" -msgstr "%s: VT 1 是控制台并且无法被回收\n" +msgstr "无法锁定整个控制台显示器。\n" #~ msgid "%s: deallocating all unused consoles failed\n" #~ msgstr "%s: 回收所有未使用的控制台失败\n" diff -Nru kbd-2.0.3/README kbd-2.0.4/README --- kbd-2.0.3/README 2015-05-04 18:26:46.000000000 +0000 +++ kbd-2.0.4/README 2016-11-28 12:27:34.000000000 +0000 @@ -1,4 +1,4 @@ -KBD +KBD [![Build Status](https://travis-ci.org/legionus/kbd.svg?branch=master)](https://travis-ci.org/legionus/kbd) --- This package contains tools for managing Linux console (Linux console, virtual diff -Nru kbd-2.0.3/src/chvt.c kbd-2.0.4/src/chvt.c --- kbd-2.0.3/src/chvt.c 2015-05-04 17:06:20.000000000 +0000 +++ kbd-2.0.4/src/chvt.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,6 +1,8 @@ /* * chvt.c - aeb - 940227 - Change virtual terminal */ +#include "config.h" + #include #include #include @@ -13,34 +15,36 @@ #include "version.h" #include "kbd_error.h" -int -main(int argc, char *argv[]) { - int fd, num; +int main(int argc, char *argv[]) +{ + int fd, num; + + set_progname(argv[0]); - set_progname(argv[0]); + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + textdomain(PACKAGE_NAME); - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE_NAME, LOCALEDIR); - textdomain(PACKAGE_NAME); + if (argc == 2 && !strcmp(argv[1], "-V")) + print_version_and_exit(); - if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); + if (argc != 2) { + fprintf(stderr, _("usage: chvt N\n")); + return EXIT_FAILURE; + } - if (argc != 2) { - fprintf(stderr, _("usage: chvt N\n")); - return EXIT_FAILURE; - } + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); - fd = getfd(NULL); - num = atoi(argv[1]); + num = atoi(argv[1]); - if (ioctl(fd,VT_ACTIVATE,num)) { - kbd_error(EXIT_FAILURE, errno, "ioctl VT_ACTIVATE"); - } + if (ioctl(fd, VT_ACTIVATE, num)) { + kbd_error(EXIT_FAILURE, errno, "ioctl VT_ACTIVATE"); + } - if (ioctl(fd,VT_WAITACTIVE,num)) { - kbd_error(EXIT_FAILURE, errno, "ioctl VT_WAITACTIVE"); - } + if (ioctl(fd, VT_WAITACTIVE, num)) { + kbd_error(EXIT_FAILURE, errno, "ioctl VT_WAITACTIVE"); + } - return EXIT_SUCCESS; + return EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/clrunimap.c kbd-2.0.4/src/clrunimap.c --- kbd-2.0.3/src/clrunimap.c 2012-02-27 10:27:11.000000000 +0000 +++ kbd-2.0.4/src/clrunimap.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,6 +3,7 @@ * * Note: nowadays this kills kernel console output! */ +#include "config.h" #include #include @@ -13,8 +14,8 @@ #include "getfd.h" #include "nls.h" -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ int fd; char *console = NULL; @@ -25,7 +26,8 @@ if (argc >= 3 && !strcmp(argv[1], "-C")) console = argv[2]; - fd = getfd(console); + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); - return loadunimap (fd, NULL, NULL); + return loadunimap(fd, NULL, NULL); } diff -Nru kbd-2.0.3/src/deallocvt.c kbd-2.0.4/src/deallocvt.c --- kbd-2.0.3/src/deallocvt.c 2015-05-04 14:34:44.000000000 +0000 +++ kbd-2.0.4/src/deallocvt.c 2016-12-19 15:01:51.000000000 +0000 @@ -2,6 +2,8 @@ * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s) * Renamed deallocvt. */ +#include "config.h" + #include #include #include @@ -15,11 +17,11 @@ #include "version.h" #include "kbd_error.h" -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ int fd, num, i; - if (argc < 1) /* unlikely */ + if (argc < 1) /* unlikely */ return EXIT_FAILURE; set_progname(argv[0]); @@ -37,23 +39,26 @@ } } - fd = getfd(NULL); + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); if (argc == 1) { /* deallocate all unused consoles */ - if (ioctl(fd,VT_DISALLOCATE,0)) { + if (ioctl(fd, VT_DISALLOCATE, 0)) { kbd_error(EXIT_FAILURE, errno, "ioctl VT_DISALLOCATE"); } - } else for (i = 1; i < argc; i++) { - num = atoi(argv[i]); - if (num == 0) { - kbd_error(EXIT_FAILURE, 0, _("0: illegal VT number\n")); - } else if (num == 1) { - kbd_error(EXIT_FAILURE, 0, _("VT 1 is the console and cannot be deallocated\n")); - } else if (ioctl(fd,VT_DISALLOCATE,num)) { - kbd_error(EXIT_FAILURE, errno, _("could not deallocate console %d: " - "ioctl VT_DISALLOCATE"), num); + } else + for (i = 1; i < argc; i++) { + num = atoi(argv[i]); + if (num == 0) { + kbd_error(EXIT_FAILURE, 0, _("0: illegal VT number\n")); + } else if (num == 1) { + kbd_error(EXIT_FAILURE, 0, _("VT 1 is the console and cannot be deallocated\n")); + } else if (ioctl(fd, VT_DISALLOCATE, num)) { + kbd_error(EXIT_FAILURE, errno, _("could not deallocate console %d: " + "ioctl VT_DISALLOCATE"), + num); + } } - } - exit(0); + exit(EXIT_SUCCESS); } diff -Nru kbd-2.0.3/src/dumpkeys.c kbd-2.0.4/src/dumpkeys.c --- kbd-2.0.3/src/dumpkeys.c 2015-05-11 21:55:13.000000000 +0000 +++ kbd-2.0.4/src/dumpkeys.c 2017-01-08 18:36:15.000000000 +0000 @@ -3,6 +3,8 @@ * * derived from version 0.81 - aeb@cwi.nl */ +#include "config.h" + #include #include #include @@ -19,11 +21,13 @@ #include "modifiers.h" #include "nls.h" #include "version.h" +#include "kbd_error.h" static int fd; -static void __attribute__ ((noreturn)) -usage(void) { +static void __attribute__((noreturn)) +usage(void) +{ fprintf(stderr, _("dumpkeys version %s"), PACKAGE_VERSION); fprintf(stderr, _("\ \n\ @@ -33,51 +37,56 @@ \n\ -h --help display this help text\n\ -i --short-info display information about keyboard driver\n\ - -l --long-info display above and symbols known to loadkeys\n\ + -l -s --long-info display above and symbols known to loadkeys\n\ -n --numeric display keytable in hexadecimal notation\n\ -f --full-table don't use short-hand notations, one row per keycode\n\ -1 --separate-lines one line per (modifier,keycode) pair\n\ - --funcs-only display only the function key strings\n\ - --keys-only display only key bindings\n\ - --compose-only display only compose key combinations\n\ + -S --shape=\n\ + -t --funcs-only display only the function key strings\n\ + -k --keys-only display only key bindings\n\ + -d --compose-only display only compose key combinations\n\ -c --charset=")); lk_list_charsets(stderr); fprintf(stderr, _("\ interpret character action codes to be from the\n\ specified character set\n\ ")); + fprintf(stderr, _("\ + -v --verbose\n\ + -V --version print version number\n\ +")); exit(1); } -int -main (int argc, char *argv[]) { - const char *short_opts = "hilvsnf1tkdS:c:V"; +int main(int argc, char *argv[]) +{ + const char *short_opts = "hilvsnf1tkdS:c:V"; const struct option long_opts[] = { - { "help", no_argument, NULL, 'h' }, - { "short-info", no_argument, NULL, 'i' }, - { "long-info", no_argument, NULL, 'l' }, - { "numeric", no_argument, NULL, 'n' }, - { "full-table", no_argument, NULL, 'f' }, - { "separate-lines",no_argument, NULL, '1' }, - { "shape", required_argument, NULL, 'S' }, - { "funcs-only", no_argument, NULL, 't' }, - { "keys-only", no_argument, NULL, 'k' }, - { "compose-only",no_argument, NULL, 'd' }, - { "charset", required_argument, NULL, 'c' }, - { "verbose", no_argument, NULL, 'v' }, - { "version", no_argument, NULL, 'V' }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "short-info", no_argument, NULL, 'i' }, + { "long-info", no_argument, NULL, 'l' }, + { "numeric", no_argument, NULL, 'n' }, + { "full-table", no_argument, NULL, 'f' }, + { "separate-lines", no_argument, NULL, '1' }, + { "shape", required_argument, NULL, 'S' }, + { "funcs-only", no_argument, NULL, 't' }, + { "keys-only", no_argument, NULL, 'k' }, + { "compose-only", no_argument, NULL, 'd' }, + { "charset", required_argument, NULL, 'c' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, + { NULL, 0, NULL, 0 } }; int c, rc; int kbd_mode; - char long_info = 0; - char short_info = 0; - char numeric = 0; + char long_info = 0; + char short_info = 0; + char numeric = 0; lk_table_shape table = LK_SHAPE_DEFAULT; - char funcs_only = 0; - char keys_only = 0; - char diac_only = 0; + char funcs_only = 0; + char keys_only = 0; + char diac_only = 0; struct lk_ctx *ctx; @@ -93,7 +102,7 @@ } while ((c = getopt_long(argc, argv, - short_opts, long_opts, NULL)) != -1) { + short_opts, long_opts, NULL)) != -1) { switch (c) { case 'i': short_info = 1; @@ -129,7 +138,7 @@ case 'c': if ((lk_set_charset(ctx, optarg)) != 0) { fprintf(stderr, _("unknown charset %s - ignoring charset request\n"), - optarg); + optarg); usage(); } printf("charset \"%s\"\n", optarg); @@ -145,12 +154,13 @@ if (optind < argc) usage(); - fd = getfd(NULL); + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); /* check whether the keyboard is in Unicode mode */ if (ioctl(fd, KDGKBMODE, &kbd_mode)) { fprintf(stderr, _("%s: error reading keyboard mode: %m\n"), - progname); + progname); exit(EXIT_FAILURE); } @@ -166,7 +176,7 @@ if (long_info) { printf(_("Symbols recognized by %s:\n(numeric value, symbol)\n\n"), - progname); + progname); lk_dump_symbols(ctx, stdout); } exit(EXIT_SUCCESS); @@ -175,9 +185,9 @@ #ifdef KDGKBDIACR if (!diac_only) { #endif - if (!funcs_only) { - lk_dump_keymap(ctx, stdout, table, numeric); - } + if (!funcs_only) { + lk_dump_keymap(ctx, stdout, table, numeric); + } #ifdef KDGKBDIACR } @@ -185,7 +195,8 @@ lk_dump_diacs(ctx, stdout); #endif - fail: lk_free(ctx); +fail: + lk_free(ctx); close(fd); if (rc < 0) diff -Nru kbd-2.0.3/src/fgconsole.c kbd-2.0.4/src/fgconsole.c --- kbd-2.0.3/src/fgconsole.c 2015-05-04 14:23:21.000000000 +0000 +++ kbd-2.0.4/src/fgconsole.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,6 +1,8 @@ /* * fgconsole.c - aeb - 960123 - Print foreground console */ +#include "config.h" + #include #include #include @@ -13,71 +15,74 @@ #include "version.h" #include "kbd_error.h" -static void __attribute__ ((noreturn)) +static void __attribute__((noreturn)) usage(void) { fprintf(stderr, _("%s version %s\n" -"\n" -"Usage: %s [options]\n" -"\n" -"Valid options are:\n" -"\n" -" -h --help display this help text\n" -" -V --version display program version\n" -" -n --next-available display number of next unallocated VT\n"), - progname, PACKAGE_VERSION, progname); + "\n" + "Usage: %s [options]\n" + "\n" + "Valid options are:\n" + "\n" + " -h --help display this help text\n" + " -V --version display program version\n" + " -n --next-available display number of next unallocated VT\n"), + progname, PACKAGE_VERSION, progname); exit(EXIT_FAILURE); } -int -main(int argc, char **argv){ +int main(int argc, char **argv) +{ struct vt_stat vtstat; int fd, vtno = -1, c, show_vt = 0; struct serial_struct sr; const struct option long_opts[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'V' }, - { "next-available", no_argument, NULL, 'n' }, - { NULL, 0, NULL, 0 } }; + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, + { "next-available", no_argument, NULL, 'n' }, + { NULL, 0, NULL, 0 } + }; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE_NAME, LOCALEDIR); textdomain(PACKAGE_NAME); set_progname(argv[0]); - while (( c = getopt_long (argc, argv, "Vhn", long_opts, NULL)) != EOF) { - switch (c) { - case 'h': - usage(); - exit (0); - case 'n': - show_vt = 1; - break; - case 'V': - print_version_and_exit(); - break; - case '?': - usage(); - exit(1); - } + while ((c = getopt_long(argc, argv, "Vhn", long_opts, NULL)) != EOF) { + switch (c) { + case 'h': + usage(); + exit(0); + case 'n': + show_vt = 1; + break; + case 'V': + print_version_and_exit(); + break; + case '?': + usage(); + exit(1); + } } - - fd = getfd(NULL); + + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); + if (show_vt) { - if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || vtno == -1) { - kbd_error(2, errno, _("Couldn't read VTNO: ")); - } - printf ("%d\n", vtno); - return EXIT_SUCCESS; + if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || vtno == -1) { + kbd_error(2, errno, _("Couldn't read VTNO: ")); + } + printf("%d\n", vtno); + return EXIT_SUCCESS; } - + if (ioctl(fd, TIOCGSERIAL, &sr) == 0) { - printf ("serial\n"); - return EXIT_SUCCESS; + printf("serial\n"); + return EXIT_SUCCESS; } - + if (ioctl(fd, VT_GETSTATE, &vtstat)) { - kbd_error(EXIT_FAILURE, errno, "fgconsole: VT_GETSTATE"); + kbd_error(EXIT_FAILURE, errno, "fgconsole: VT_GETSTATE"); } printf("%d\n", vtstat.v_active); return EXIT_SUCCESS; diff -Nru kbd-2.0.3/src/getfd.c kbd-2.0.4/src/getfd.c --- kbd-2.0.3/src/getfd.c 2012-02-27 10:27:11.000000000 +0000 +++ kbd-2.0.4/src/getfd.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -27,17 +29,17 @@ */ static int -is_a_console(int fd) { +is_a_console(int fd) +{ char arg; arg = 0; - return (isatty (fd) - && ioctl(fd, KDGKBTYPE, &arg) == 0 - && ((arg == KB_101) || (arg == KB_84))); + return (isatty(fd) && ioctl(fd, KDGKBTYPE, &arg) == 0 && ((arg == KB_101) || (arg == KB_84))); } static int -open_a_console(const char *fnam) { +open_a_console(const char *fnam) +{ int fd; /* @@ -54,8 +56,8 @@ return fd; } -int -getfd(const char *fnam) { +int getfd(const char *fnam) +{ int fd, i; if (fnam) { @@ -81,7 +83,7 @@ return fd; fprintf(stderr, - _("Couldn't get a file descriptor referring to the console\n")); + _("Couldn't get a file descriptor referring to the console\n")); /* total failure */ exit(1); diff -Nru kbd-2.0.3/src/getkeycodes.c kbd-2.0.4/src/getkeycodes.c --- kbd-2.0.3/src/getkeycodes.c 2015-05-04 14:23:45.000000000 +0000 +++ kbd-2.0.4/src/getkeycodes.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,6 +3,8 @@ * * aeb, 941108 */ +#include "config.h" + #include #include #include @@ -14,14 +16,15 @@ #include "version.h" #include "kbd_error.h" -static void __attribute__ ((noreturn)) -usage(void) { - fprintf(stderr, _("usage: getkeycodes\n")); - exit(EXIT_FAILURE); +static void __attribute__((noreturn)) +usage(void) +{ + fprintf(stderr, _("usage: getkeycodes\n")); + exit(EXIT_FAILURE); } -int -main(int argc, char **argv) { +int main(int argc, char **argv) +{ int fd; unsigned int sc, sc0; struct kbkeycode a; @@ -37,26 +40,28 @@ if (argc != 1) usage(); - fd = getfd(NULL); + + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); /* Old kernels don't support changing scancodes below SC_LIM. */ a.scancode = 0; - a.keycode = 0; + a.keycode = 0; if (ioctl(fd, KDGETKEYCODE, &a)) { sc0 = 89; } else - for (sc0 = 1; sc0 <= 88; sc0++) { - a.scancode = sc0; - a.keycode = 0; - if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0) - break; - } + for (sc0 = 1; sc0 <= 88; sc0++) { + a.scancode = sc0; + a.keycode = 0; + if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0) + break; + } printf(_("Plain scancodes xx (hex) versus keycodes (dec)\n")); if (sc0 == 89) { printf(_("0 is an error; " - "for 1-88 (0x01-0x58) scancode equals keycode\n")); + "for 1-88 (0x01-0x58) scancode equals keycode\n")); } else if (sc0 > 1) { printf(_("for 1-%d (0x01-0x%02x) scancode equals keycode\n"), sc0 - 1, sc0 - 1); @@ -69,7 +74,7 @@ if (sc < 128) printf("\n 0x%02x: ", sc); else - printf("\ne0 %02x: ", sc-128); + printf("\ne0 %02x: ", sc - 128); } if (sc < sc0) { @@ -78,7 +83,7 @@ } a.scancode = sc; - a.keycode = 0; + a.keycode = 0; if (ioctl(fd, KDGETKEYCODE, &a) == 0) { printf(" %3d", a.keycode); continue; @@ -88,7 +93,8 @@ continue; } kbd_error(EXIT_FAILURE, errno, _("failed to get keycode for scancode 0x%x: " - "ioctl KDGETKEYCODE"), sc); + "ioctl KDGETKEYCODE"), + sc); exit(1); } printf("\n"); diff -Nru kbd-2.0.3/src/getunimap.c kbd-2.0.4/src/getunimap.c --- kbd-2.0.3/src/getunimap.c 2015-05-04 14:16:04.000000000 +0000 +++ kbd-2.0.4/src/getunimap.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -18,22 +20,24 @@ #endif static int -ud_compar(const void *u1, const void *u2){ - unsigned short fp1 = ((struct unipair *) u1)->fontpos; - unsigned short fp2 = ((struct unipair *) u2)->fontpos; - return (int) fp1 - (int) fp2; +ud_compar(const void *u1, const void *u2) +{ + unsigned short fp1 = ((struct unipair *)u1)->fontpos; + unsigned short fp2 = ((struct unipair *)u2)->fontpos; + return (int)fp1 - (int)fp2; } -static void __attribute__ ((noreturn)) -usage(void) { +static void __attribute__((noreturn)) +usage(void) +{ fprintf(stderr, _("Usage:\n\t%s [-s] [-C console]\n"), progname); exit(EXIT_FAILURE); } -int -main(int argc, char **argv){ +int main(int argc, char **argv) +{ int sortflag = 0; - char mb[]={0,0,0,0,0,0,0,0}; + char mb[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; unsigned mb_length; int fd, c, i; char *console = NULL; @@ -51,21 +55,23 @@ while ((c = getopt(argc, argv, "sC:")) != EOF) { switch (c) { - case 's': - sortflag = 1; - break; - case 'C': - console = optarg; - break; - default: - usage(); + case 's': + sortflag = 1; + break; + case 'C': + console = optarg; + break; + default: + usage(); } } if (optind < argc) usage(); - fd = getfd(console); + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); + if (getunimap(fd, &ud)) return EXIT_FAILURE; @@ -73,20 +79,20 @@ printf("# sorted kernel unimap - count=%d\n", ud.entry_ct); /* sort and merge entries */ qsort(ud.entries, ud.entry_ct, sizeof(ud.entries[0]), - ud_compar); - for(i=0; i 6) ? 0 : mb_length ] = 0 ; + for (i = 0; i < ud.entry_ct; i++) { + mb_length = wctomb(mb, ud.entries[i].unicode); + mb[(mb_length > 6) ? 0 : mb_length] = 0; if (mb_length == 1 && !isprint(mb[0])) { mb[2] = 0; mb[1] = mb[0] + 0100; diff -Nru kbd-2.0.3/src/kbd_error.c kbd-2.0.4/src/kbd_error.c --- kbd-2.0.3/src/kbd_error.c 2015-05-11 21:54:42.000000000 +0000 +++ kbd-2.0.4/src/kbd_error.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -10,8 +12,8 @@ extern const char *progname; void -__attribute__ ((format (printf, 2, 3))) -kbd_warning(const int errnum, const char *fmt, ...) + __attribute__((format(printf, 2, 3))) + kbd_warning(const int errnum, const char *fmt, ...) { va_list ap; @@ -28,9 +30,9 @@ } void -__attribute__ ((noreturn)) -__attribute__ ((format (printf, 3, 4))) -kbd_error(const int exitnum, const int errnum, const char *fmt, ...) + __attribute__((noreturn)) + __attribute__((format(printf, 3, 4))) + kbd_error(const int exitnum, const int errnum, const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff -Nru kbd-2.0.3/src/kbd.h kbd-2.0.4/src/kbd.h --- kbd-2.0.3/src/kbd.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/kbd.h 2016-12-19 15:01:55.000000000 +0000 @@ -2,7 +2,7 @@ #define _KBD_H #ifndef __GNUC__ -# define __attribute__(x) /*NOTHING*/ +#define __attribute__(x) /*NOTHING*/ #endif #endif /* _KBD_H */ diff -Nru kbd-2.0.3/src/kbdinfo.c kbd-2.0.4/src/kbdinfo.c --- kbd-2.0.3/src/kbdinfo.c 2015-05-04 14:14:41.000000000 +0000 +++ kbd-2.0.4/src/kbdinfo.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -12,19 +14,24 @@ static const char *action = NULL; static const char *value = NULL; -static void __attribute__ ((noreturn)) -usage(int code) { +static void __attribute__((noreturn)) +usage(int code) +{ fprintf(stderr, - _("Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" - " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" + _("Usage: %1$s [-C DEVICE] getmode [text|graphics]\n" + " or: %1$s [-C DEVICE] gkbmode [raw|xlate|mediumraw|unicode]\n" " or: %1$s [-C DEVICE] gkbmeta [metabit|escprefix]\n" - " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n"), - progname); + " or: %1$s [-C DEVICE] gkbled [scrolllock|numlock|capslock]\n" + "Other options:\n" + " -h print this usage message\n" + " -V print version number\n"), + progname); exit(code); } static int -answer(const char *ans) { +answer(const char *ans) +{ if (value) return strcasecmp(value, ans) ? EXIT_FAILURE : EXIT_SUCCESS; @@ -32,8 +39,8 @@ return EXIT_SUCCESS; } -int -main(int argc, char **argv) { +int main(int argc, char **argv) +{ int fd, mode, c; int rc = EXIT_FAILURE; char flags; @@ -70,15 +77,20 @@ if (optind < argc) value = argv[optind++]; - fd = getfd(console); + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); if (!strcasecmp("GETMODE", action)) { if (ioctl(fd, KDGETMODE, &mode) == -1) kbd_error(EXIT_FAILURE, errno, "ioctl KDGETMODE"); switch (mode) { - case KD_TEXT: rc = answer("text"); break; - case KD_GRAPHICS: rc = answer("graphics"); break; + case KD_TEXT: + rc = answer("text"); + break; + case KD_GRAPHICS: + rc = answer("graphics"); + break; } } else if (!strcasecmp("GKBMODE", action)) { @@ -86,10 +98,18 @@ kbd_error(EXIT_FAILURE, errno, "ioctl KDGKBMODE"); switch (mode) { - case K_RAW: rc = answer("raw"); break; - case K_XLATE: rc = answer("xlate"); break; - case K_MEDIUMRAW: rc = answer("mediumraw"); break; - case K_UNICODE: rc = answer("unicode"); break; + case K_RAW: + rc = answer("raw"); + break; + case K_XLATE: + rc = answer("xlate"); + break; + case K_MEDIUMRAW: + rc = answer("mediumraw"); + break; + case K_UNICODE: + rc = answer("unicode"); + break; } } else if (!strcasecmp("GKBMETA", action)) { @@ -97,8 +117,12 @@ kbd_error(EXIT_FAILURE, errno, "ioctl KDGKBMETA"); switch (mode) { - case K_METABIT: rc = answer("metabit"); break; - case K_ESCPREFIX: rc = answer("escprefix"); break; + case K_METABIT: + rc = answer("metabit"); + break; + case K_ESCPREFIX: + rc = answer("escprefix"); + break; } } else if (!strcasecmp("GKBLED", action)) { @@ -109,13 +133,13 @@ if (value) { if (((mode & LED_SCR) && !strcasecmp(value, "scrolllock")) || - ((mode & LED_NUM) && !strcasecmp(value, "numlock")) || + ((mode & LED_NUM) && !strcasecmp(value, "numlock")) || ((mode & LED_CAP) && !strcasecmp(value, "capslock"))) rc = EXIT_SUCCESS; } else { printf("scrolllock:%s ", (mode & LED_SCR) ? "on" : "off"); - printf("numlock:%s ", (mode & LED_NUM) ? "on" : "off"); - printf("capslock:%s\n", (mode & LED_CAP) ? "on" : "off"); + printf("numlock:%s ", (mode & LED_NUM) ? "on" : "off"); + printf("capslock:%s\n", (mode & LED_CAP) ? "on" : "off"); rc = EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/kbd_mode.c kbd-2.0.4/src/kbd_mode.c --- kbd-2.0.3/src/kbd_mode.c 2015-05-11 21:55:13.000000000 +0000 +++ kbd-2.0.4/src/kbd_mode.c 2016-12-19 15:01:51.000000000 +0000 @@ -4,6 +4,7 @@ * If you make \215A\201 an alias for "kbd_mode -a", and you are * in raw mode, then hitting F7 = (two keys) will return you to sanity. */ +#include "config.h" #include #include @@ -17,16 +18,17 @@ #include "version.h" #include "kbd_error.h" -static void __attribute__ ((noreturn)) -usage(void){ - fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [-C device]\n")); - exit(EXIT_FAILURE); +static void __attribute__((noreturn)) +usage(void) +{ + fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [-C device]\n")); + exit(EXIT_FAILURE); } -int -main(int argc, char *argv[]){ - int fd, mode, c, n = 0; - char *console = NULL; +int main(int argc, char *argv[]) +{ + int fd, mode, c, n = 0; + char *console = NULL; set_progname(argv[0]); @@ -35,68 +37,69 @@ textdomain(PACKAGE_NAME); if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); + print_version_and_exit(); while ((c = getopt(argc, argv, "auskC:")) != EOF) { switch (c) { - case 'a': - if (n > 0) - usage (); - mode = K_XLATE; - n++; - break; - case 'u': - if (n > 0) - usage (); - mode = K_UNICODE; - n++; - break; - case 's': - if (n > 0) - usage (); - mode = K_RAW; - n++; - break; - case 'k': - if (n > 0) - usage (); - mode = K_MEDIUMRAW; - n++; - break; - case 'C': - if (!optarg || !optarg[0]) - usage (); - console = optarg; - break; - default: - usage(); + case 'a': + if (n > 0) + usage(); + mode = K_XLATE; + n++; + break; + case 'u': + if (n > 0) + usage(); + mode = K_UNICODE; + n++; + break; + case 's': + if (n > 0) + usage(); + mode = K_RAW; + n++; + break; + case 'k': + if (n > 0) + usage(); + mode = K_MEDIUMRAW; + n++; + break; + case 'C': + if (!optarg || !optarg[0]) + usage(); + console = optarg; + break; + default: + usage(); } } - fd = getfd(console); + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); if (n == 0) { - /* report mode */ - if (ioctl(fd, KDGKBMODE, &mode)) { - kbd_error(EXIT_FAILURE, errno, "ioctl KDGKBMODE"); - } - switch(mode) { - case K_RAW: - printf(_("The keyboard is in raw (scancode) mode\n")); - break; - case K_MEDIUMRAW: - printf(_("The keyboard is in mediumraw (keycode) mode\n")); - break; - case K_XLATE: - printf(_("The keyboard is in the default (ASCII) mode\n")); - break; - case K_UNICODE: - printf(_("The keyboard is in Unicode (UTF-8) mode\n")); - break; - default: - printf(_("The keyboard is in some unknown mode\n")); - } - return EXIT_SUCCESS; + /* report mode */ + if (ioctl(fd, KDGKBMODE, &mode)) { + kbd_error(EXIT_FAILURE, errno, "ioctl KDGKBMODE"); + } + switch (mode) { + case K_RAW: + printf(_("The keyboard is in raw (scancode) mode\n")); + break; + case K_MEDIUMRAW: + printf(_("The keyboard is in mediumraw (keycode) mode\n")); + break; + case K_XLATE: + printf(_("The keyboard is in the default (ASCII) mode\n")); + break; + case K_UNICODE: + printf(_("The keyboard is in Unicode (UTF-8) mode\n")); + break; + default: + printf(_("The keyboard is in some unknown mode\n")); + } + return EXIT_SUCCESS; } if (ioctl(fd, KDSKBMODE, mode)) { diff -Nru kbd-2.0.3/src/kbdrate.c kbd-2.0.4/src/kbdrate.c --- kbd-2.0.3/src/kbdrate.c 2015-05-11 21:54:42.000000000 +0000 +++ kbd-2.0.4/src/kbdrate.c 2016-12-19 15:01:51.000000000 +0000 @@ -67,6 +67,7 @@ with yet another measurement system. Thus, try for KIOCSRATE, too. */ +#include "config.h" #include #include @@ -87,9 +88,9 @@ /* Equal to kernel version, but field names vary. */ struct my_kbd_repeat { - int delay; /* in msec; <= 0: don't change */ - int period; /* in msec; <= 0: don't change */ - /* earlier this field was misnamed "rate" */ + int delay; /* in msec; <= 0: don't change */ + int period; /* in msec; <= 0: don't change */ + /* earlier this field was misnamed "rate" */ }; #include @@ -99,16 +100,17 @@ #include "kbd_error.h" static int valid_rates[] = { 300, 267, 240, 218, 200, 185, 171, 160, 150, - 133, 120, 109, 100, 92, 86, 80, 75, 67, - 60, 55, 50, 46, 43, 40, 37, 33, 30, 27, - 25, 23, 21, 20 }; -#define RATE_COUNT (sizeof( valid_rates ) / sizeof( int )) + 133, 120, 109, 100, 92, 86, 80, 75, 67, + 60, 55, 50, 46, 43, 40, 37, 33, 30, 27, + 25, 23, 21, 20 }; +#define RATE_COUNT (sizeof(valid_rates) / sizeof(int)) static int valid_delays[] = { 250, 500, 750, 1000 }; -#define DELAY_COUNT (sizeof( valid_delays ) / sizeof( int )) +#define DELAY_COUNT (sizeof(valid_delays) / sizeof(int)) static int -KDKBDREP_ioctl_ok(double rate, int delay, int silent) { +KDKBDREP_ioctl_ok(double rate, int delay, int silent) +{ /* * This ioctl is defined in but is not * implemented anywhere - must be in some m68k patches. @@ -118,8 +120,8 @@ /* don't change, just test */ kbdrep_s.period = -1; - kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + kbdrep_s.delay = -1; + if (ioctl(0, KDKBDREP, &kbdrep_s)) { if (errno == EINVAL || errno == ENOTTY) return 0; kbd_error(EXIT_FAILURE, errno, "ioctl KDKBDREP"); @@ -131,16 +133,16 @@ #endif /* do the change */ - if (rate == 0) /* switch repeat off */ + if (rate == 0) /* switch repeat off */ kbdrep_s.period = 0; else - kbdrep_s.period = 1000.0 / rate; /* convert cps to msec */ + kbdrep_s.period = 1000.0 / rate; /* convert cps to msec */ if (kbdrep_s.period < 1) kbdrep_s.period = 1; - kbdrep_s.delay = delay; + kbdrep_s.delay = delay; if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; - + if (ioctl(0, KDKBDREP, &kbdrep_s)) { kbd_error(EXIT_FAILURE, errno, "ioctl KDKBDREP"); } @@ -149,15 +151,15 @@ if (kbdrep_s.period == 0) rate = 0; else - rate = 1000.0 / (double) kbdrep_s.period; + rate = 1000.0 / (double)kbdrep_s.period; if (!silent) - printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"), - rate, kbdrep_s.delay ); + printf(_("Typematic Rate set to %.1f cps (delay = %d ms)\n"), + rate, kbdrep_s.delay); kbdrep_s.period = -1; - kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + kbdrep_s.delay = -1; + if (ioctl(0, KDKBDREP, &kbdrep_s)) { if (errno == EINVAL) return 0; kbd_error(EXIT_FAILURE, errno, "ioctl KDKBDREP"); @@ -167,23 +169,24 @@ if (kbdrep_s.period == 0) rate = 0; else - rate = 1000.0 / (double) kbdrep_s.period; + rate = 1000.0 / (double)kbdrep_s.period; if (!silent) - printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"), - rate, kbdrep_s.delay ); + printf(_("Typematic Rate set to %.1f cps (delay = %d ms)\n"), + rate, kbdrep_s.delay); - return 1; /* success! */ + return 1; /* success! */ } #ifndef KIOCSRATE -#define arg_state __attribute__ ((unused)) +#define arg_state __attribute__((unused)) #else #define arg_state #endif static int -KIOCSRATE_ioctl_ok(arg_state double rate, arg_state int delay, arg_state int silent) { +KIOCSRATE_ioctl_ok(arg_state double rate, arg_state int delay, arg_state int silent) +{ #ifdef KIOCSRATE struct kbd_rate kbdrate_s; int fd; @@ -193,47 +196,48 @@ kbd_error(EXIT_FAILURE, errno, "open /dev/kbd"); } - kbdrate_s.rate = (int) (rate + 0.5); /* round up */ - kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ + kbdrate_s.rate = (int)(rate + 0.5); /* round up */ + kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ if (kbdrate_s.rate > 50) kbdrate_s.rate = 50; - if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { + if (ioctl(fd, KIOCSRATE, &kbdrate_s)) { kbd_error(EXIT_FAILURE, errno, "ioctl KIOCSRATE"); } - close( fd ); + close(fd); if (!silent) - printf( "Typematic Rate set to %d cps (delay = %d ms)\n", - kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ ); + printf("Typematic Rate set to %d cps (delay = %d ms)\n", + kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ); return 1; -#else /* no KIOCSRATE */ +#else /* no KIOCSRATE */ return 0; #endif /* KIOCSRATE */ } static void -sigalrmhandler(int sig __attribute__ ((unused))) { +sigalrmhandler(int sig __attribute__((unused))) +{ kbd_warning(0, "Failed waiting for kbd controller!\n"); - raise( SIGINT ); + raise(SIGINT); } -int -main( int argc, char **argv ) { +int main(int argc, char **argv) +{ #ifdef __sparc__ - double rate = 5.0; /* Default rate */ - int delay = 200; /* Default delay */ + double rate = 5.0; /* Default rate */ + int delay = 200; /* Default delay */ #else - double rate = 10.9; /* Default rate */ - int delay = 250; /* Default delay */ + double rate = 10.9; /* Default rate */ + int delay = 250; /* Default delay */ #endif - int value = 0x7f; /* Maximum delay with slowest rate */ - /* DO NOT CHANGE this value */ - int silent = 0; - int fd; - char data; - int c; + int value = 0x7f; /* Maximum delay with slowest rate */ + /* DO NOT CHANGE this value */ + int silent = 0; + int fd; + char data; + int c; unsigned int i; extern char *optarg; @@ -247,31 +251,30 @@ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) print_version_and_exit(); - while ( (c = getopt( argc, argv, "r:d:sv" )) != EOF ) { + while ((c = getopt(argc, argv, "r:d:s")) != EOF) { switch (c) { - case 'r': - rate = atof( optarg ); - break; - case 'd': - delay = atoi( optarg ); - break; - case 's': - silent = 1; - break; - default: - fprintf(stderr, - _("Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n")); - exit(EXIT_FAILURE); + case 'r': + rate = atof(optarg); + break; + case 'd': + delay = atoi(optarg); + break; + case 's': + silent = 1; + break; + default: + fprintf(stderr, + _("Usage: kbdrate [-V | --version] [-s] [-r rate] [-d delay]\n")); + exit(EXIT_FAILURE); } } - if(KDKBDREP_ioctl_ok(rate, delay, silent)) /* m68k? */ + if (KDKBDREP_ioctl_ok(rate, delay, silent)) /* m68k? */ return 0; - if(KIOCSRATE_ioctl_ok(rate, delay, silent)) /* sparc? */ + if (KIOCSRATE_ioctl_ok(rate, delay, silent)) /* sparc? */ return 0; - /* The ioport way */ for (i = 0; i < RATE_COUNT; i++) @@ -281,7 +284,6 @@ break; } - for (i = 0; i < DELAY_COUNT; i++) if (delay <= valid_delays[i]) { value &= 0x1f; @@ -289,47 +291,47 @@ break; } - if ( (fd = open( "/dev/port", O_RDWR )) < 0) { + if ((fd = open("/dev/port", O_RDWR)) < 0) { kbd_error(EXIT_FAILURE, errno, _("Cannot open /dev/port")); } - signal( SIGALRM, sigalrmhandler ); - alarm( 3 ); + signal(SIGALRM, sigalrmhandler); + alarm(3); do { - lseek( fd, 0x64, 0 ); - if (read( fd, &data, 1 ) == -1) { + lseek(fd, 0x64, 0); + if (read(fd, &data, 1) == -1) { kbd_error(EXIT_FAILURE, errno, "read"); } - } while ((data & 2) == 2 ); /* wait */ + } while ((data & 2) == 2); /* wait */ - lseek( fd, 0x60, 0 ); - data = 0xf3; /* set typematic rate */ - if (write( fd, &data, 1 ) == -1) { + lseek(fd, 0x60, 0); + data = 0xf3; /* set typematic rate */ + if (write(fd, &data, 1) == -1) { kbd_error(EXIT_FAILURE, errno, "write"); } do { - lseek( fd, 0x64, 0 ); - if (read( fd, &data, 1 ) == -1) { + lseek(fd, 0x64, 0); + if (read(fd, &data, 1) == -1) { kbd_error(EXIT_FAILURE, errno, "read"); } - } while ((data & 2) == 2 ); /* wait */ + } while ((data & 2) == 2); /* wait */ - alarm( 0 ); + alarm(0); - lseek( fd, 0x60, 0 ); - sleep( 1 ); - if (write( fd, &value, 1 ) == -1) { + lseek(fd, 0x60, 0); + sleep(1); + if (write(fd, &value, 1) == -1) { kbd_error(EXIT_FAILURE, errno, "write"); } - close( fd ); + close(fd); if (!silent) - printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"), - valid_rates[value & 0x1f] / 10.0, - valid_delays[ (value & 0x60) >> 5 ] ); + printf(_("Typematic Rate set to %.1f cps (delay = %d ms)\n"), + valid_rates[value & 0x1f] / 10.0, + valid_delays[(value & 0x60) >> 5]); return EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/kdfontop.c kbd-2.0.4/src/kdfontop.c --- kbd-2.0.3/src/kdfontop.c 2015-04-27 21:43:47.000000000 +0000 +++ kbd-2.0.4/src/kdfontop.c 2016-12-19 15:01:51.000000000 +0000 @@ -4,9 +4,11 @@ * Font handling differs between various kernel versions. * Hide the differences in this file. */ +#include "config.h" + #include #include -#include /* free() */ +#include /* free() */ #include #include #include "kdfontop.h" @@ -17,8 +19,8 @@ #include "compat/linux-kd.h" #endif -int -restorefont(int fd) { +int restorefont(int fd) +{ if (ioctl(fd, PIO_FONTRESET, 0)) { perror("PIO_FONTRESET"); return -1; @@ -26,17 +28,17 @@ return 0; } -int -font_charheight(unsigned char *buf, int count, int width) { +int font_charheight(unsigned char *buf, int count, int width) +{ int h, i, x; - int bytewidth = (width+7)/8; + int bytewidth = (width + 7) / 8; for (h = 32; h > 0; h--) for (i = 0; i < count; i++) for (x = 0; x < bytewidth; x++) - if (buf[(32*i+h-1)*bytewidth+x]) + if (buf[(32 * i + h - 1) * bytewidth + x]) goto nonzero; - nonzero: +nonzero: return h; } @@ -45,19 +47,19 @@ * May be called with width==NULL and height==NULL. * Must not exit - we may have cleanup to do. */ -int -getfont(int fd, unsigned char *buf, int *count, int *width, int *height) { +int getfont(int fd, unsigned char *buf, int *count, int *width, int *height) +{ struct consolefontdesc cfd; struct console_font_op cfo; int i; /* First attempt: KDFONTOP */ - cfo.op = KD_FONT_OP_GET; + cfo.op = KD_FONT_OP_GET; cfo.flags = 0; cfo.width = cfo.height = 32; - cfo.charcount = *count; - cfo.data = buf; - i = ioctl(fd, KDFONTOP, &cfo); + cfo.charcount = *count; + cfo.data = buf; + i = ioctl(fd, KDFONTOP, &cfo); if (i == 0) { *count = cfo.charcount; if (height) @@ -72,12 +74,13 @@ } /* The other methods do not support width != 8 */ - if (width) *width = 8; + if (width) + *width = 8; /* Second attempt: GIO_FONTX */ - cfd.charcount = *count; + cfd.charcount = *count; cfd.charheight = 0; - cfd.chardata = (char *)buf; - i = ioctl(fd, GIO_FONTX, &cfd); + cfd.chardata = (char *)buf; + i = ioctl(fd, GIO_FONTX, &cfd); if (i == 0) { *count = cfd.charcount; if (height) @@ -95,8 +98,8 @@ return -1; } if (!buf) { - fprintf(stderr, _("bug: getfont using GIO_FONT needs buf.\n")); - return -1; + fprintf(stderr, _("bug: getfont using GIO_FONT needs buf.\n")); + return -1; } i = ioctl(fd, GIO_FONT, buf); if (i) { @@ -105,22 +108,22 @@ } *count = 256; if (height) - *height = 0; /* undefined, at most 32 */ + *height = 0; /* undefined, at most 32 */ return 0; } -int -getfontsize(int fd) { +int getfontsize(int fd) +{ int count; int i; count = 0; - i = getfont(fd, NULL, &count, NULL, NULL); + i = getfont(fd, NULL, &count, NULL, NULL); return (i == 0) ? count : 256; } -int -putfont(int fd, unsigned char *buf, int count, int width, int height) { +int putfont(int fd, unsigned char *buf, int count, int width, int height) +{ struct consolefontdesc cfd; struct console_font_op cfo; int i; @@ -131,13 +134,13 @@ height = font_charheight(buf, count, width); /* First attempt: KDFONTOP */ - cfo.op = KD_FONT_OP_SET; - cfo.flags = 0; - cfo.width = width; - cfo.height = height; + cfo.op = KD_FONT_OP_SET; + cfo.flags = 0; + cfo.width = width; + cfo.height = height; cfo.charcount = count; - cfo.data = buf; - i = ioctl(fd, KDFONTOP, &cfo); + cfo.data = buf; + i = ioctl(fd, KDFONTOP, &cfo); if (i == 0) return 0; if (width != 8 || (errno != ENOSYS && errno != EINVAL)) { @@ -148,7 +151,7 @@ /* Variation on first attempt: in case count is not 256 or 512 round up and try again. */ if (errno == EINVAL && width == 8 && count != 256 && count < 512) { - int ct = ((count > 256) ? 512 : 256); + int ct = ((count > 256) ? 512 : 256); unsigned char *mybuf = malloc(32 * ct); if (!mybuf) { @@ -157,19 +160,19 @@ } memset(mybuf, 0, 32 * ct); memcpy(mybuf, buf, 32 * count); - cfo.data = mybuf; + cfo.data = mybuf; cfo.charcount = ct; - i = ioctl(fd, KDFONTOP, &cfo); + i = ioctl(fd, KDFONTOP, &cfo); free(mybuf); if (i == 0) return 0; } /* Second attempt: PIO_FONTX */ - cfd.charcount = count; + cfd.charcount = count; cfd.charheight = height; - cfd.chardata = (char *)buf; - i = ioctl(fd, PIO_FONTX, &cfd); + cfd.chardata = (char *)buf; + i = ioctl(fd, PIO_FONTX, &cfd); if (i == 0) return 0; if (errno != ENOSYS && errno != EINVAL) { diff -Nru kbd-2.0.3/src/kdmapop.c kbd-2.0.4/src/kdmapop.c --- kbd-2.0.3/src/kdmapop.c 2012-02-27 10:27:11.000000000 +0000 +++ kbd-2.0.4/src/kdmapop.c 2016-12-19 15:01:51.000000000 +0000 @@ -4,6 +4,8 @@ * * Hide the ioctl use in this file. */ +#include "config.h" + #include #include #include @@ -34,18 +36,18 @@ * translation tables, and this ioctl would get/set the fourth * table, while the other three tables are built-in and constant.) */ -int -getscrnmap(int fd, char *map) { - if (ioctl(fd,GIO_SCRNMAP,map)) { +int getscrnmap(int fd, char *map) +{ + if (ioctl(fd, GIO_SCRNMAP, map)) { perror("GIO_SCRNMAP"); return -1; } return 0; } -int -loadscrnmap(int fd, char *map) { - if (ioctl(fd,PIO_SCRNMAP,map)) { +int loadscrnmap(int fd, char *map) +{ + if (ioctl(fd, PIO_SCRNMAP, map)) { perror("PIO_SCRNMAP"); return -1; } @@ -75,19 +77,19 @@ * In the new scheme, the old PIO_SCRNMAP fills the kernel umap * table with such direct-to-font values. */ - -int -getuniscrnmap(int fd, unsigned short *map) { - if (ioctl(fd,GIO_UNISCRNMAP,map)) { + +int getuniscrnmap(int fd, unsigned short *map) +{ + if (ioctl(fd, GIO_UNISCRNMAP, map)) { perror("GIO_UNISCRNMAP"); return -1; } return 0; } -int -loaduniscrnmap(int fd, unsigned short *map) { - if (ioctl(fd,PIO_UNISCRNMAP,map)) { +int loaduniscrnmap(int fd, unsigned short *map) +{ + if (ioctl(fd, PIO_UNISCRNMAP, map)) { perror("PIO_UNISCRNMAP"); return -1; } @@ -131,21 +133,21 @@ * Linux 2.6.1 makes GIO_UNIMAP, PIO_UNIMAP, PIO_UNIMAPCLR per-vt * so that fd no longer is random. */ -int -getunimap(int fd, struct unimapdesc *ud0) { +int getunimap(int fd, struct unimapdesc *ud0) +{ struct unimapdesc ud; int ct; ud.entry_ct = 0; - ud.entries = 0; + ud.entries = 0; if (ioctl(fd, GIO_UNIMAP, &ud)) { - if(errno != ENOMEM || ud.entry_ct == 0) { + if (errno != ENOMEM || ud.entry_ct == 0) { perror("GIO_UNIMAP(0)"); return -1; } - ct = ud.entry_ct; + ct = ud.entry_ct; ud.entries = (struct unipair *) - malloc(ct * sizeof(struct unipair)); + malloc(ct * sizeof(struct unipair)); if (ud.entries == NULL) { fprintf(stderr, _("%s: out of memory\n"), progname); return -1; @@ -156,8 +158,8 @@ } if (ct != ud.entry_ct) fprintf(stderr, - _("strange... ct changed from %d to %d\n"), - ct, ud.entry_ct); + _("strange... ct changed from %d to %d\n"), + ct, ud.entry_ct); /* someone could change the unimap between our first and second ioctl, so the above errors are not impossible */ @@ -166,27 +168,27 @@ return 0; } -int -loadunimap(int fd, struct unimapinit *ui, struct unimapdesc *ud) { +int loadunimap(int fd, struct unimapinit *ui, struct unimapdesc *ud) +{ struct unimapinit advice; if (ui) advice = *ui; else { - advice.advised_hashsize = 0; - advice.advised_hashstep = 0; + advice.advised_hashsize = 0; + advice.advised_hashstep = 0; advice.advised_hashlevel = 0; } - again: +again: if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { #ifdef ENOIOCTLCMD if (errno == ENOIOCTLCMD) { fprintf(stderr, - _("It seems this kernel is older than 1.1.92\n" - "No Unicode mapping table loaded.\n")); + _("It seems this kernel is older than 1.1.92\n" + "No Unicode mapping table loaded.\n")); } else #endif - perror("PIO_UNIMAPCLR"); + perror("PIO_UNIMAPCLR"); return -1; } if (ud == NULL) diff -Nru kbd-2.0.3/src/libkeymap/analyze.c kbd-2.0.4/src/libkeymap/analyze.c --- kbd-2.0.3/src/libkeymap/analyze.c 2015-05-31 19:20:04.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/analyze.c 2016-12-26 16:31:33.000000000 +0000 @@ -1,4 +1,4 @@ -#line 15 "analyze.l" +#line 17 "analyze.l" #include "keymap.h" int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner); int stack_pop(struct lk_ctx *ctx, void *scanner); @@ -13,8 +13,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -180,7 +180,15 @@ /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -202,6 +210,7 @@ #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -347,7 +356,7 @@ /* Begin user sect3 */ -#define yywrap(yyscanner) 1 +#define yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -440,7 +449,7 @@ 30, 13, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -472,7 +481,7 @@ 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[58] = +static yyconst YY_CHAR yy_meta[58] = { 0, 1, 1, 2, 1, 3, 1, 1, 1, 1, 1, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, @@ -482,7 +491,7 @@ 5, 5, 5, 5, 5, 5, 5 } ; -static yyconst flex_int16_t yy_base[517] = +static yyconst flex_uint16_t yy_base[517] = { 0, 0, 0, 57, 0, 110, 111, 721, 720, 724, 727, 721, 727, 719, 727, 684, 727, 727, 727, 106, 108, @@ -604,7 +613,7 @@ 503, 503, 503, 503, 503, 503 } ; -static yyconst flex_int16_t yy_nxt[785] = +static yyconst flex_uint16_t yy_nxt[785] = { 0, 10, 11, 12, 13, 14, 13, 15, 16, 17, 18, 19, 20, 20, 21, 22, 10, 23, 10, 10, 24, @@ -793,6 +802,8 @@ #define YY_RESTORE_YY_MORE_OFFSET #line 1 "analyze.l" #line 2 "analyze.l" +#include "config.h" + #include #include /* readlink */ @@ -805,7 +816,7 @@ #include "parser.h" #define YY_NO_INPUT 1 -#line 32 "analyze.l" +#line 34 "analyze.l" int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner) { @@ -1044,7 +1055,7 @@ -#line 1048 "analyze.c" +#line 1059 "analyze.c" #define INITIAL 0 #define RVALUE 1 @@ -1122,11 +1133,11 @@ FILE *yyget_in (yyscan_t yyscanner ); -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_in (FILE * _in_str ,yyscan_t yyscanner ); FILE *yyget_out (yyscan_t yyscanner ); -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); +void yyset_out (FILE * _out_str ,yyscan_t yyscanner ); yy_size_t yyget_leng (yyscan_t yyscanner ); @@ -1134,11 +1145,11 @@ int yyget_lineno (yyscan_t yyscanner ); -void yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_lineno (int _line_number ,yyscan_t yyscanner ); int yyget_column (yyscan_t yyscanner ); -void yyset_column (int column_no ,yyscan_t yyscanner ); +void yyset_column (int _column_no ,yyscan_t yyscanner ); YYSTYPE * yyget_lval (yyscan_t yyscanner ); @@ -1156,6 +1167,10 @@ #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); #endif @@ -1174,13 +1189,18 @@ #endif - static void yy_push_state (int new_state ,yyscan_t yyscanner); + static void yy_push_state (int _new_state ,yyscan_t yyscanner); static void yy_pop_state (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1269,7 +1289,7 @@ /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1279,15 +1299,15 @@ */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 306 "analyze.l" +#line 308 "analyze.l" -#line 1291 "analyze.c" +#line 1311 "analyze.c" yylval = yylval_param; @@ -1317,7 +1337,7 @@ yy_load_buffer_state(yyscanner ); } - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = yyg->yy_c_buf_p; @@ -1333,7 +1353,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { yyg->yy_last_accepting_state = yy_current_state; @@ -1370,14 +1390,14 @@ case 1: YY_RULE_SETUP -#line 308 "analyze.l" +#line 310 "analyze.l" { yy_push_state(INCLSTR, yyscanner); } YY_BREAK case 2: YY_RULE_SETUP -#line 311 "analyze.l" +#line 313 "analyze.l" { char *s = strndup(yytext+1, strlen(yytext)-2); if (s == NULL) { @@ -1396,7 +1416,7 @@ case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 325 "analyze.l" +#line 327 "analyze.l" { ERR(yyextra, _("expected filename between quotes")); return(ERROR); @@ -1406,7 +1426,7 @@ case YY_STATE_EOF(RVALUE): case YY_STATE_EOF(STR): case YY_STATE_EOF(INCLSTR): -#line 329 "analyze.l" +#line 331 "analyze.l" { stack_pop(yyextra, yyscanner); if (!YY_CURRENT_BUFFER) @@ -1416,7 +1436,7 @@ case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 334 "analyze.l" +#line 336 "analyze.l" { yyset_lineno(yyget_lineno(yyscanner) + 1,yyscanner); } @@ -1424,7 +1444,7 @@ case 5: /* rule 5 can match eol */ YY_RULE_SETUP -#line 337 "analyze.l" +#line 339 "analyze.l" { yyset_lineno(yyget_lineno(yyscanner) + 1,yyscanner); @@ -1436,21 +1456,22 @@ YY_BREAK case 6: YY_RULE_SETUP -#line 345 "analyze.l" +#line 347 "analyze.l" ; /* do nothing */ YY_BREAK case 7: /* rule 7 can match eol */ *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); yyg->yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 346 "analyze.l" +#line 348 "analyze.l" ; /* do nothing */ YY_BREAK case 8: YY_RULE_SETUP -#line 347 "analyze.l" +#line 349 "analyze.l" { yy_push_state(RVALUE, yyscanner); lk_array_empty(yyextra->key_line); @@ -1459,7 +1480,7 @@ YY_BREAK case 9: YY_RULE_SETUP -#line 352 "analyze.l" +#line 354 "analyze.l" { yy_push_state(RVALUE, yyscanner); return(STRING); @@ -1467,7 +1488,7 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 356 "analyze.l" +#line 358 "analyze.l" { yy_push_state(RVALUE, yyscanner); return(TO); @@ -1475,7 +1496,7 @@ YY_BREAK case 11: YY_RULE_SETUP -#line 360 "analyze.l" +#line 362 "analyze.l" { yylval->num = strtol(yytext + 1, NULL, 16); if (yylval->num >= 0xf000) { @@ -1488,7 +1509,7 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 369 "analyze.l" +#line 371 "analyze.l" { yylval->num = strtol(yytext, NULL, 0); return(NUMBER); @@ -1496,127 +1517,127 @@ YY_BREAK case 13: YY_RULE_SETUP -#line 373 "analyze.l" +#line 375 "analyze.l" { return((yylval->num = ksymtocode(yyextra, yytext, TO_AUTO)) == -1 ? ERROR : LITERAL); } YY_BREAK case 14: YY_RULE_SETUP -#line 374 "analyze.l" +#line 376 "analyze.l" { return(DASH); } YY_BREAK case 15: YY_RULE_SETUP -#line 375 "analyze.l" +#line 377 "analyze.l" { return(COMMA); } YY_BREAK case 16: YY_RULE_SETUP -#line 376 "analyze.l" +#line 378 "analyze.l" { return(PLUS); } YY_BREAK case 17: YY_RULE_SETUP -#line 377 "analyze.l" +#line 379 "analyze.l" { return(CHARSET); } YY_BREAK case 18: YY_RULE_SETUP -#line 378 "analyze.l" +#line 380 "analyze.l" { return(KEYMAPS); } YY_BREAK case 19: YY_RULE_SETUP -#line 379 "analyze.l" +#line 381 "analyze.l" { return(KEYCODE); } YY_BREAK case 20: YY_RULE_SETUP -#line 380 "analyze.l" +#line 382 "analyze.l" { return(PLAIN); } YY_BREAK case 21: YY_RULE_SETUP -#line 381 "analyze.l" +#line 383 "analyze.l" { return(SHIFT); } YY_BREAK case 22: YY_RULE_SETUP -#line 382 "analyze.l" +#line 384 "analyze.l" { return(CONTROL); } YY_BREAK case 23: YY_RULE_SETUP -#line 383 "analyze.l" +#line 385 "analyze.l" { return(ALT); } YY_BREAK case 24: YY_RULE_SETUP -#line 384 "analyze.l" +#line 386 "analyze.l" { return(ALTGR); } YY_BREAK case 25: YY_RULE_SETUP -#line 385 "analyze.l" +#line 387 "analyze.l" { return(SHIFTL); } YY_BREAK case 26: YY_RULE_SETUP -#line 386 "analyze.l" +#line 388 "analyze.l" { return(SHIFTR); } YY_BREAK case 27: YY_RULE_SETUP -#line 387 "analyze.l" +#line 389 "analyze.l" { return(CTRLL); } YY_BREAK case 28: YY_RULE_SETUP -#line 388 "analyze.l" +#line 390 "analyze.l" { return(CTRLR); } YY_BREAK case 29: YY_RULE_SETUP -#line 389 "analyze.l" +#line 391 "analyze.l" { return(CAPSSHIFT); } YY_BREAK case 30: YY_RULE_SETUP -#line 390 "analyze.l" +#line 392 "analyze.l" { return(ALT_IS_META); } YY_BREAK case 31: YY_RULE_SETUP -#line 391 "analyze.l" +#line 393 "analyze.l" { return(STRINGS); } YY_BREAK case 32: YY_RULE_SETUP -#line 392 "analyze.l" +#line 394 "analyze.l" { return(COMPOSE); } YY_BREAK case 33: YY_RULE_SETUP -#line 393 "analyze.l" +#line 395 "analyze.l" { return(AS); } YY_BREAK case 34: YY_RULE_SETUP -#line 394 "analyze.l" +#line 396 "analyze.l" { return(USUAL); } YY_BREAK case 35: YY_RULE_SETUP -#line 395 "analyze.l" +#line 397 "analyze.l" { return(ON); } YY_BREAK case 36: YY_RULE_SETUP -#line 396 "analyze.l" +#line 398 "analyze.l" { return(FOR); } YY_BREAK case 37: YY_RULE_SETUP -#line 397 "analyze.l" +#line 399 "analyze.l" { yylval->num = strtol(yytext + 2, NULL, 8); return(CCHAR); @@ -1624,7 +1645,7 @@ YY_BREAK case 38: YY_RULE_SETUP -#line 401 "analyze.l" +#line 403 "analyze.l" { yylval->num = (unsigned char) yytext[2]; return(CCHAR); @@ -1632,7 +1653,7 @@ YY_BREAK case 39: YY_RULE_SETUP -#line 405 "analyze.l" +#line 407 "analyze.l" { yylval->num = (unsigned char) yytext[1]; return(CCHAR); @@ -1640,7 +1661,7 @@ YY_BREAK case 40: YY_RULE_SETUP -#line 409 "analyze.l" +#line 411 "analyze.l" { yylval->str.data[0] = '\0'; yylval->str.len = 0; @@ -1650,7 +1671,7 @@ YY_BREAK case 41: YY_RULE_SETUP -#line 415 "analyze.l" +#line 417 "analyze.l" { if (yylval->str.len == MAX_PARSER_STRING) { ERR(yyextra, _("string too long")); @@ -1661,7 +1682,7 @@ YY_BREAK case 42: YY_RULE_SETUP -#line 422 "analyze.l" +#line 424 "analyze.l" { if (yylval->str.len == MAX_PARSER_STRING) { ERR(yyextra, _("string too long")); @@ -1672,7 +1693,7 @@ YY_BREAK case 43: YY_RULE_SETUP -#line 429 "analyze.l" +#line 431 "analyze.l" { if (yylval->str.len == MAX_PARSER_STRING) { ERR(yyextra, _("string too long")); @@ -1683,7 +1704,7 @@ YY_BREAK case 44: YY_RULE_SETUP -#line 436 "analyze.l" +#line 438 "analyze.l" { if (yylval->str.len == MAX_PARSER_STRING) { ERR(yyextra, _("string too long")); @@ -1695,7 +1716,7 @@ case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 443 "analyze.l" +#line 445 "analyze.l" { int len = strlen(yytext); @@ -1710,7 +1731,7 @@ YY_BREAK case 46: YY_RULE_SETUP -#line 454 "analyze.l" +#line 456 "analyze.l" { yylval->str.data[yylval->str.len] = '\0'; while (((struct yyguts_t*)yyscanner)->yy_start_stack_ptr) { @@ -1721,17 +1742,17 @@ YY_BREAK case 47: YY_RULE_SETUP -#line 461 "analyze.l" +#line 463 "analyze.l" { return(ERROR); } YY_BREAK case 48: YY_RULE_SETUP -#line 464 "analyze.l" +#line 466 "analyze.l" ECHO; YY_BREAK -#line 1735 "analyze.c" +#line 1756 "analyze.c" case YY_END_OF_BUFFER: { @@ -1873,9 +1894,9 @@ static int yy_get_next_buffer (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = yyg->yytext_ptr; - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = yyg->yytext_ptr; + yy_size_t number_to_move, i; int ret_val; if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) @@ -1904,7 +1925,7 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2007,15 +2028,15 @@ static yy_state_type yy_get_previous_state (yyscan_t yyscanner) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_current_state = yyg->yy_start; for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { yyg->yy_last_accepting_state = yy_current_state; @@ -2040,11 +2061,11 @@ */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) { - register int yy_is_jam; + int yy_is_jam; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - register char *yy_cp = yyg->yy_c_buf_p; + char *yy_cp = yyg->yy_c_buf_p; - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { yyg->yy_last_accepting_state = yy_current_state; @@ -2063,6 +2084,10 @@ return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (yyscan_t yyscanner) @@ -2216,7 +2241,7 @@ if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -2377,7 +2402,7 @@ * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; // After all that talk, this was set to 1 anyways... yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); @@ -2394,7 +2419,7 @@ if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc @@ -2496,7 +2521,7 @@ return b; } - static void yy_push_state (int new_state , yyscan_t yyscanner) + static void yy_push_state (int _new_state , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth ) @@ -2518,7 +2543,7 @@ yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START; - BEGIN(new_state); + BEGIN(_new_state); } static void yy_pop_state (yyscan_t yyscanner) @@ -2642,10 +2667,10 @@ } /** Set the current line number. - * @param line_number + * @param _line_number line number * @param yyscanner The scanner object. */ -void yyset_lineno (int line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2653,14 +2678,14 @@ if (! YY_CURRENT_BUFFER ) YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); - yylineno = line_number; + yylineno = _line_number; } /** Set the current column. - * @param line_number + * @param _column_no column number * @param yyscanner The scanner object. */ -void yyset_column (int column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2668,25 +2693,25 @@ if (! YY_CURRENT_BUFFER ) YY_FATAL_ERROR( "yyset_column called with no buffer" ); - yycolumn = column_no; + yycolumn = _column_no; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * @param yyscanner The scanner object. * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (yyscan_t yyscanner) @@ -2695,10 +2720,10 @@ return yy_flex_debug; } -void yyset_debug (int bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } /* Accessor methods for yylval and yylloc */ @@ -2849,7 +2874,7 @@ #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED) { - register int i; + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2858,7 +2883,7 @@ #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2890,7 +2915,7 @@ #define YYTABLES_NAME "yytables" -#line 464 "analyze.l" +#line 466 "analyze.l" diff -Nru kbd-2.0.3/src/libkeymap/analyze.h kbd-2.0.4/src/libkeymap/analyze.h --- kbd-2.0.3/src/libkeymap/analyze.h 2015-05-31 19:20:04.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/analyze.h 2016-12-26 16:31:33.000000000 +0000 @@ -2,7 +2,7 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 15 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.l" +#line 17 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.l" #include "keymap.h" int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner); int stack_pop(struct lk_ctx *ctx, void *scanner); @@ -17,8 +17,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -153,7 +153,15 @@ /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif #ifndef YY_TYPEDEF_YY_BUFFER_STATE @@ -235,7 +243,7 @@ /* Begin user sect3 */ -#define yywrap(yyscanner) 1 +#define yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define yytext_ptr yytext_r @@ -277,11 +285,11 @@ FILE *yyget_in (yyscan_t yyscanner ); -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_in (FILE * _in_str ,yyscan_t yyscanner ); FILE *yyget_out (yyscan_t yyscanner ); -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); +void yyset_out (FILE * _out_str ,yyscan_t yyscanner ); yy_size_t yyget_leng (yyscan_t yyscanner ); @@ -289,11 +297,11 @@ int yyget_lineno (yyscan_t yyscanner ); -void yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_lineno (int _line_number ,yyscan_t yyscanner ); int yyget_column (yyscan_t yyscanner ); -void yyset_column (int column_no ,yyscan_t yyscanner ); +void yyset_column (int _column_no ,yyscan_t yyscanner ); YYSTYPE * yyget_lval (yyscan_t yyscanner ); @@ -325,7 +333,12 @@ /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Number of entries by which start-condition stack grows. */ @@ -360,9 +373,9 @@ #undef YY_DECL #endif -#line 464 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.l" +#line 466 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.l" -#line 367 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.h" +#line 380 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ diff -Nru kbd-2.0.3/src/libkeymap/analyze.l kbd-2.0.4/src/libkeymap/analyze.l --- kbd-2.0.3/src/libkeymap/analyze.l 2013-10-04 13:28:49.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/analyze.l 2016-12-19 16:18:00.000000000 +0000 @@ -1,4 +1,6 @@ %{ +#include "config.h" + #include #include /* readlink */ diff -Nru kbd-2.0.3/src/libkeymap/array.c kbd-2.0.4/src/libkeymap/array.c --- kbd-2.0.3/src/libkeymap/array.c 2014-06-14 18:09:08.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/array.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -6,8 +8,7 @@ #include -int -lk_array_init(struct lk_array *a, size_t memb, size_t size) +int lk_array_init(struct lk_array *a, size_t memb, size_t size) { if (!a) return -EINVAL; @@ -24,8 +25,7 @@ return 0; } -int -lk_array_free(struct lk_array *a) +int lk_array_free(struct lk_array *a) { if (!a) return -EINVAL; @@ -34,8 +34,7 @@ return 0; } -int -lk_array_empty(struct lk_array *a) +int lk_array_empty(struct lk_array *a) { if (!a) return -EINVAL; @@ -46,8 +45,7 @@ return 0; } -int -lk_array_exists(struct lk_array *a, unsigned int i) +int lk_array_exists(struct lk_array *a, unsigned int i) { char *s; size_t k; @@ -56,7 +54,7 @@ return 0; } - s = (char *) (a->array + (a->memb * i)); + s = (char *)(a->array + (a->memb * i)); for (k = 0; k < a->memb; k++) { if (s[k] != 0) @@ -105,8 +103,7 @@ return 0; } -int -lk_array_set(struct lk_array *a, unsigned int i, const void *e) +int lk_array_set(struct lk_array *a, unsigned int i, const void *e) { int ret = array_resize(a, i); @@ -119,8 +116,7 @@ return 0; } -int -lk_array_unset(struct lk_array *a, unsigned int i) +int lk_array_unset(struct lk_array *a, unsigned int i) { if (!a || i >= a->total) return -EINVAL; @@ -133,8 +129,7 @@ return 0; } -int -lk_array_append(struct lk_array *a, const void *e) +int lk_array_append(struct lk_array *a, const void *e) { int ret = array_resize(a, a->count); diff -Nru kbd-2.0.3/src/libkeymap/common.c kbd-2.0.4/src/libkeymap/common.c --- kbd-2.0.3/src/libkeymap/common.c 2014-06-14 18:09:08.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/common.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -8,7 +10,7 @@ #include "nls.h" #include "contextP.h" -void __attribute__ ((format (printf, 6, 7))) +void __attribute__((format(printf, 6, 7))) lk_log(struct lk_ctx *ctx, int priority, const char *file, int line, const char *fn, const char *fmt, ...) @@ -22,17 +24,17 @@ } #ifndef DEBUG -# define log_unused __attribute__ ((unused)) +#define log_unused __attribute__((unused)) #else -# define log_unused +#define log_unused #endif -static void __attribute__ ((format(printf, 6, 0))) +static void __attribute__((format(printf, 6, 0))) log_file(void *data, - int priority log_unused, + int priority log_unused, const char *file log_unused, - const int line log_unused, - const char *fn log_unused, + const int line log_unused, + const char *fn log_unused, const char *format, va_list args) { FILE *fp = data; @@ -41,14 +43,30 @@ const char *priname; switch (priority) { - case LOG_EMERG: priname = "EMERGENCY"; break; - case LOG_ALERT: priname = "ALERT"; break; - case LOG_CRIT: priname = "CRITICAL"; break; - case LOG_ERR: priname = "ERROR"; break; - case LOG_WARNING: priname = "WARNING"; break; - case LOG_NOTICE: priname = "NOTICE"; break; - case LOG_INFO: priname = "INFO"; break; - case LOG_DEBUG: priname = "DEBUG"; break; + case LOG_EMERG: + priname = "EMERGENCY"; + break; + case LOG_ALERT: + priname = "ALERT"; + break; + case LOG_CRIT: + priname = "CRITICAL"; + break; + case LOG_ERR: + priname = "ERROR"; + break; + case LOG_WARNING: + priname = "WARNING"; + break; + case LOG_NOTICE: + priname = "NOTICE"; + break; + case LOG_INFO: + priname = "INFO"; + break; + case LOG_DEBUG: + priname = "DEBUG"; + break; default: snprintf(buf, sizeof(buf), "L:%d", priority); priname = buf; @@ -61,12 +79,11 @@ #undef log_unused -int -lk_set_log_fn(struct lk_ctx *ctx, - void (*log_fn)(void *data, int priority, - const char *file, int line, const char *fn, - const char *format, va_list args), - const void *data) +int lk_set_log_fn(struct lk_ctx *ctx, + void (*log_fn)(void *data, int priority, + const char *file, int line, const char *fn, + const char *format, va_list args), + const void *data) { if (!ctx) return -1; @@ -77,8 +94,7 @@ return 0; } -int -lk_get_log_priority(struct lk_ctx *ctx) +int lk_get_log_priority(struct lk_ctx *ctx) { if (!ctx) return -1; @@ -86,8 +102,7 @@ return ctx->log_priority; } -int -lk_set_log_priority(struct lk_ctx *ctx, int priority) +int lk_set_log_priority(struct lk_ctx *ctx, int priority) { if (!ctx) return -1; @@ -105,8 +120,7 @@ return ctx->flags; } -int -lk_set_parser_flags(struct lk_ctx *ctx, lk_flags flags) +int lk_set_parser_flags(struct lk_ctx *ctx, lk_flags flags) { if (!ctx) return -1; @@ -152,11 +166,11 @@ lk_set_log_fn(ctx, log_file, stderr); lk_set_log_priority(ctx, LOG_ERR); - if (init_array(ctx, &ctx->keymap, sizeof(void*)) < 0 || - init_array(ctx, &ctx->func_table, sizeof(void*)) < 0 || - init_array(ctx, &ctx->accent_table, sizeof(void*)) < 0 || - init_array(ctx, &ctx->key_constant, sizeof(char)) < 0 || - init_array(ctx, &ctx->key_line, sizeof(int)) < 0) { + if (init_array(ctx, &ctx->keymap, sizeof(void *)) < 0 || + init_array(ctx, &ctx->func_table, sizeof(void *)) < 0 || + init_array(ctx, &ctx->accent_table, sizeof(void *)) < 0 || + init_array(ctx, &ctx->key_constant, sizeof(char)) < 0 || + init_array(ctx, &ctx->key_line, sizeof(int)) < 0) { lk_free(ctx); return NULL; } @@ -164,11 +178,9 @@ return ctx; } - -int -lk_free(struct lk_ctx *ctx) +int lk_free(struct lk_ctx *ctx) { - unsigned int i;//, j; + unsigned int i; //, j; if (!ctx) return -1; diff -Nru kbd-2.0.3/src/libkeymap/diacr.c kbd-2.0.4/src/libkeymap/diacr.c --- kbd-2.0.3/src/libkeymap/diacr.c 2014-06-26 14:46:40.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/diacr.c 2016-12-19 15:01:51.000000000 +0000 @@ -6,6 +6,8 @@ * This file is covered by the GNU General Public License, * which should be included with kbd as the file COPYING. */ +#include "config.h" + #include #include @@ -17,14 +19,12 @@ #include "contextP.h" #include "ksyms.h" -int -lk_diacr_exists(struct lk_ctx *ctx, unsigned int index) +int lk_diacr_exists(struct lk_ctx *ctx, unsigned int index) { return (lk_array_get_ptr(ctx->accent_table, index) != NULL); } -int -lk_get_diacr(struct lk_ctx *ctx, unsigned int index, struct lk_kbdiacr *dcr) +int lk_get_diacr(struct lk_ctx *ctx, unsigned int index, struct lk_kbdiacr *dcr) { struct lk_kbdiacr *ptr; @@ -41,8 +41,7 @@ return 0; } -int -lk_append_diacr(struct lk_ctx *ctx, struct lk_kbdiacr *dcr) +int lk_append_diacr(struct lk_ctx *ctx, struct lk_kbdiacr *dcr) { struct lk_kbdiacr *ptr; @@ -61,8 +60,7 @@ return 0; } -int -lk_add_diacr(struct lk_ctx *ctx, unsigned int index, struct lk_kbdiacr *dcr) +int lk_add_diacr(struct lk_ctx *ctx, unsigned int index, struct lk_kbdiacr *dcr) { struct lk_kbdiacr *ptr; @@ -81,8 +79,7 @@ return 0; } -int -lk_del_diacr(struct lk_ctx *ctx, unsigned int index) +int lk_del_diacr(struct lk_ctx *ctx, unsigned int index) { int rc; rc = lk_array_unset(ctx->accent_table, index); @@ -93,8 +90,7 @@ return 0; } -int -lk_append_compose(struct lk_ctx *ctx, struct lk_kbdiacr *dcr) +int lk_append_compose(struct lk_ctx *ctx, struct lk_kbdiacr *dcr) { struct lk_kbdiacr dcr0; int direction = TO_8BIT; @@ -104,8 +100,8 @@ direction = TO_UNICODE; #endif - dcr0.diacr = convert_code(ctx, dcr->diacr, direction); - dcr0.base = convert_code(ctx, dcr->base, direction); + dcr0.diacr = convert_code(ctx, dcr->diacr, direction); + dcr0.base = convert_code(ctx, dcr->base, direction); dcr0.result = convert_code(ctx, dcr->result, direction); return lk_append_diacr(ctx, &dcr0); diff -Nru kbd-2.0.3/src/libkeymap/dump.c kbd-2.0.4/src/libkeymap/dump.c --- kbd-2.0.3/src/libkeymap/dump.c 2015-05-11 21:55:13.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/dump.c 2016-12-19 15:01:51.000000000 +0000 @@ -9,6 +9,8 @@ * This file is covered by the GNU General Public License, * which should be included with kbd as the file COPYING. */ +#include "config.h" + #include #include #include @@ -28,8 +30,9 @@ { fprintf(fd, "'"); fprintf(fd, (c == '\'' || c == '\\') ? "\\%c" - : isgraph(c) ? "%c" - : "\\%03o", c); + : isgraph(c) ? "%c" + : "\\%03o", + c); fprintf(fd, comma ? "', " : "'"); } @@ -39,13 +42,13 @@ { fprintf(fd, "'"); fprintf(fd, (c == '\'' || c == '\\') ? "\\%c" - : (isgraph(c) || c == ' ' || c >= 0200) ? "%c" - : "\\%03o", c); + : (isgraph(c) || c == ' ' || c >= 0200) ? "%c" + : "\\%03o", + c); fprintf(fd, comma ? "', " : "'"); } -int -lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd) +int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd) { unsigned int i, j; char magic[] = "bkeymap"; @@ -79,7 +82,8 @@ return 0; - fail: ERR(ctx, _("Error writing map to file")); +fail: + ERR(ctx, _("Error writing map to file")); return -1; } @@ -104,8 +108,7 @@ return buf; } -int -lk_dump_ctable(struct lk_ctx *ctx, FILE *fd) +int lk_dump_ctable(struct lk_ctx *ctx, FILE *fd) { int j; unsigned int i, imax; @@ -119,8 +122,8 @@ return -1; fprintf(fd, -/* not to be translated... */ - "/* Do not edit this file! It was automatically generated by */\n"); + /* not to be translated... */ + "/* Do not edit this file! It was automatically generated by */\n"); fprintf(fd, "/* loadkeys --mktable defkeymap.map > defkeymap.c */\n\n"); fprintf(fd, "#include \n"); fprintf(fd, "#include \n\n"); @@ -151,15 +154,16 @@ } if (imax < MAX_NR_KEYMAPS - 1) fprintf(fd, "\t0"); - fprintf(fd, "\n};\n\nunsigned int keymap_count = %u;\n\n", (unsigned int) ctx->keymap->count); + fprintf(fd, "\n};\n\nunsigned int keymap_count = %u;\n\n", (unsigned int)ctx->keymap->count); -/* uglified just for xgettext - it complains about nonterminated strings */ + /* uglified just for xgettext - it complains about nonterminated strings */ fprintf(fd, - "/*\n" - " * Philosophy: most people do not define more strings, but they who do\n" - " * often want quite a lot of string space. So, we statically allocate\n" - " * the default and allocate dynamically in chunks of 512 bytes.\n" - " */\n" "\n"); + "/*\n" + " * Philosophy: most people do not define more strings, but they who do\n" + " * often want quite a lot of string space. So, we statically allocate\n" + " * the default and allocate dynamically in chunks of 512 bytes.\n" + " */\n" + "\n"); for (maxfunc = MAX_NR_FUNC; maxfunc; maxfunc--) if (lk_array_get_ptr(ctx->func_table, maxfunc - 1)) break; @@ -184,9 +188,10 @@ fprintf(fd, "};\n\n"); fprintf(fd, - "char *funcbufptr = func_buf;\n" - "int funcbufsize = sizeof(func_buf);\n" - "int funcbufleft = 0; /* space left */\n" "\n"); + "char *funcbufptr = func_buf;\n" + "int funcbufsize = sizeof(func_buf);\n" + "int funcbufleft = 0; /* space left */\n" + "\n"); fprintf(fd, "char *func_table[MAX_NR_FUNC] = {\n"); for (i = 0; i < maxfunc; i++) { @@ -232,13 +237,12 @@ fprintf(fd, "};\n\n"); } fprintf(fd, "unsigned int accent_table_size = %u;\n", - (unsigned int) ctx->accent_table->count); + (unsigned int)ctx->accent_table->count); return 0; } /* void dump_funcs(void) */ -void -lk_dump_funcs(struct lk_ctx *ctx, FILE *fd) +void lk_dump_funcs(struct lk_ctx *ctx, FILE *fd) { unsigned int i; @@ -256,7 +260,7 @@ } else if (isgraph(*ptr) || *ptr == ' ') { fputc(*ptr, fd); } else { - fprintf(fd, "\\%03o", *ptr); + fprintf(fd, "\\%03hho", *ptr); } } fputc('"', fd); @@ -265,11 +269,11 @@ } /* void dump_diacs(void) */ -void -lk_dump_diacs(struct lk_ctx *ctx, FILE *fd) +void lk_dump_diacs(struct lk_ctx *ctx, FILE *fd) { unsigned int i; struct lk_kbdiacr *ptr; + const char *ksym; for (i = 0; i < ctx->accent_table->count; i++) { ptr = lk_array_get_ptr(ctx->accent_table, i); @@ -277,25 +281,36 @@ continue; fprintf(fd, "compose "); - + dumpchar(fd, ptr->diacr, 0); + fprintf(fd, " "); + dumpchar(fd, ptr->base, 0); +#ifdef KDGKBDIACRUC if (ctx->flags & LK_FLAG_PREFER_UNICODE) { - dumpchar(fd, ptr->diacr & 0xff, 0); - fprintf(fd, " "); - dumpchar(fd, ptr->base & 0xff, 0); - fprintf(fd, " to U+%04x\n", ptr->result); + ksym = codetoksym(ctx, ptr->result ^ 0xf000); + if (ksym) { + fprintf(fd, " to %s\n", ksym); + } else { + fprintf(fd, " to U+%04x\n", ptr->result); + } + } else +#endif + if (ptr->result > 0xff) { + // impossible case? + fprintf(fd, " to 0x%x\n", ptr->result); } else { - dumpchar(fd, ptr->diacr, 0); - fprintf(fd, " "); - dumpchar(fd, ptr->base, 0); - fprintf(fd, " to "); - dumpchar(fd, ptr->result, 0); - fprintf(fd, "\n"); + ksym = codetoksym(ctx, ptr->result); + if (ksym) { + fprintf(fd, " to %s\n", ksym); + } else { + fprintf(fd, " to "); + dumpchar(fd, ptr->result, 0); + fprintf(fd, "\n"); + } } } } -void -lk_dump_keymaps(struct lk_ctx *ctx, FILE *fd) +void lk_dump_keymaps(struct lk_ctx *ctx, FILE *fd) { unsigned int i; int n, m, s; @@ -312,22 +327,22 @@ continue; n--, m--; (n == m) - ? fprintf(fd, "%c%d" , (s ? ',' : ' '), n) - : fprintf(fd, "%c%d-%d", (s ? ',' : ' '), n, m); + ? fprintf(fd, "%c%d", (s ? ',' : ' '), n) + : fprintf(fd, "%c%d-%d", (s ? ',' : ' '), n, m); n = m = 0; - s = 1; + s = 1; } else { if (!n) - n = i+1; - m = i+1; + n = i + 1; + m = i + 1; } } if (m) { n--, m--; (n == m) - ? fprintf(fd, "%c%d" , (s ? ',' : ' '), n) - : fprintf(fd, "%c%d-%d", (s ? ',' : ' '), n, m); + ? fprintf(fd, "%c%d", (s ? ',' : ' '), n) + : fprintf(fd, "%c%d-%d", (s ? ',' : ' '), n, m); } fprintf(fd, "\n"); @@ -337,7 +352,7 @@ print_mod(FILE *fd, int x) { if (x) { - modifier_t *mod = (modifier_t *) modifiers; + modifier_t *mod = (modifier_t *)modifiers; while (mod->name) { if (x & (1 << mod->bit)) fprintf(fd, "%s\t", mod->name); @@ -371,11 +386,14 @@ fprintf(fd, "+"); plus++; } - if (!numeric && t < syms_size && v < get_sym_size(ctx, t) && - (p = get_sym(ctx, t, v))[0]) + if (!numeric && t == KT_LATIN && + (p = codetoksym(ctx, code))) + fprintf(fd, "%-*s", 16 - plus, p); + else if (!numeric && t < syms_size && v < get_sym_size(ctx, t) && + (p = get_sym(ctx, t, v))[0]) fprintf(fd, "%-*s", 16 - plus, p); else if (!numeric && t == KT_META && v < 128 && v < get_sym_size(ctx, KT_LATIN) && - (p = get_sym(ctx, KT_LATIN, v))[0]) + (p = get_sym(ctx, KT_LATIN, v))[0]) fprintf(fd, "Meta_%-11s", p); else fprintf(fd, "0x%04x %s", code, plus ? "" : " "); @@ -384,7 +402,7 @@ static void print_bind(struct lk_ctx *ctx, FILE *fd, int bufj, int i, int j, char numeric) { - if(j) + if (j) fprintf(fd, "\t"); print_mod(fd, j); fprintf(fd, "keycode %3d =", i); @@ -392,8 +410,7 @@ fprintf(fd, "\n"); } -void -lk_dump_keys(struct lk_ctx *ctx, FILE *fd, lk_table_shape table, char numeric) +void lk_dump_keys(struct lk_ctx *ctx, FILE *fd, lk_table_shape table, char numeric) { unsigned int i, j; int buf[MAX_NR_KEYMAPS]; @@ -429,8 +446,8 @@ if ((type == KT_LATIN || type == KT_LETTER) && KVAL(buf0) < 128) { buf1 = lk_map_exists(ctx, ja) - ? lk_get_key(ctx, ja, i) - : -1; + ? lk_get_key(ctx, ja, i) + : -1; if (buf1 != K(KT_META, KVAL(buf0))) goto not_alt_is_meta; @@ -462,8 +479,10 @@ if (table == LK_SHAPE_FULL_TABLE) { fprintf(fd, "keycode %3d =", i); - for (j = 0; j < keymapnr; j++) - print_keysym(ctx, fd, buf[j], numeric); + for (j = 0; j < keymapnr; j++) { + if (lk_map_exists(ctx, j)) + print_keysym(ctx, fd, buf[j], numeric); + } fprintf(fd, "\n"); continue; @@ -479,12 +498,12 @@ continue; } - typ = KTYP(buf[0]); - val = KVAL(buf[0]); - islatin = (typ == KT_LATIN || typ == KT_LETTER); + typ = KTYP(buf[0]); + val = KVAL(buf[0]); + islatin = (typ == KT_LATIN || typ == KT_LETTER); isletter = (islatin && - ((val >= 'A' && val <= 'Z') || - (val >= 'a' && val <= 'z'))); + ((val >= 'A' && val <= 'Z') || + (val >= 'a' && val <= 'z'))); isasexpected = 0; if (isletter) { @@ -494,11 +513,11 @@ defs[2] = defs[0]; defs[3] = defs[1]; - for (j = 4; j < 8; j++) + for (j = 4; j < 8; j++) defs[j] = K(KT_LATIN, val & ~96); - for (j = 8; j < 16; j++) - defs[j] = K(KT_META, KVAL(defs[j-8])); + for (j = 8; j < 16; j++) + defs[j] = K(KT_META, KVAL(defs[j - 8])); for (j = 0; j < keymapnr; j++) { if ((j >= 16 && buf[j] != K_HOLE) || (j < 16 && buf[j] != defs[j])) @@ -507,23 +526,21 @@ isasexpected = 1; } -unexpected: + unexpected: /* wipe out predictable meta bindings */ - for (j = 0; j < keymapnr; j++) + for (j = 0; j < keymapnr; j++) zapped[j] = 0; if (alt_is_meta) { - for(j = 0; j < keymapnr; j++) { + for (j = 0; j < keymapnr; j++) { unsigned int ja, ktyp; ja = (j | M_ALT); - if (j != ja && lk_map_exists(ctx, ja) - && ((ktyp=KTYP(buf[j])) == KT_LATIN || ktyp == KT_LETTER) - && KVAL(buf[j]) < 128) { + if (j != ja && lk_map_exists(ctx, ja) && ((ktyp = KTYP(buf[j])) == KT_LATIN || ktyp == KT_LETTER) && KVAL(buf[j]) < 128) { if (buf[ja] != K(KT_META, KVAL(buf[j]))) fprintf(stderr, _("impossible: not meta?\n")); - buf[ja] = K_HOLE; + buf[ja] = K_HOLE; zapped[ja] = 1; } } @@ -553,7 +570,7 @@ count++; } - if (bad <= count && bad < keymapnr-1) { + if (bad <= count && bad < keymapnr - 1) { if (buf[0] != K_HOLE) { print_keysym(ctx, fd, buf[0], numeric); } @@ -567,7 +584,7 @@ } else { for (j = 0; j < keymapnr && buf[j] != K_HOLE && - (table != LK_SHAPE_UNTIL_HOLE || lk_map_exists(ctx, j)); + (table != LK_SHAPE_UNTIL_HOLE || lk_map_exists(ctx, j)); j++) { //print_bind(ctx, fd, buf[j], i, j, numeric); print_keysym(ctx, fd, buf[j], numeric); @@ -584,8 +601,7 @@ } } -void -lk_dump_keymap(struct lk_ctx *ctx, FILE *fd, lk_table_shape table, char numeric) +void lk_dump_keymap(struct lk_ctx *ctx, FILE *fd, lk_table_shape table, char numeric) { lk_dump_keymaps(ctx, fd); lk_dump_keys(ctx, fd, table, numeric); diff -Nru kbd-2.0.3/src/libkeymap/findfile.c kbd-2.0.4/src/libkeymap/findfile.c --- kbd-2.0.3/src/libkeymap/findfile.c 2013-12-14 11:06:55.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/findfile.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -9,8 +11,7 @@ #include "nls.h" #include "keymap/findfile.h" -void -lk_fpclose(lkfile_t *fp) +void lk_fpclose(lkfile_t *fp) { if (!fp || !fp->fd) return; @@ -21,7 +22,7 @@ fp->fd = NULL; } -#define SIZE(a) (sizeof(a)/sizeof(a[0])) +#define SIZE(a) (sizeof(a) / sizeof(a[0])) static struct decompressor { const char *ext; /* starts with `.', has no other dots */ @@ -43,7 +44,7 @@ sprintf(pipe_cmd, "%s %s", dc->cmd, fp->pathname); - fp->fd = popen(pipe_cmd, "r"); + fp->fd = popen(pipe_cmd, "r"); fp->pipe = 1; free(pipe_cmd); @@ -73,7 +74,7 @@ return pipe_open(dc, fp); } } - fp->fd = fopen(fp->pathname, "r"); + fp->fd = fopen(fp->pathname, "r"); fp->pipe = 0; if (fp->fd == NULL) @@ -104,9 +105,7 @@ sprintf(fp->pathname, "%s%s", fnam, suffixes[i]); - if(stat(fp->pathname, &st) == 0 - && S_ISREG(st.st_mode) - && (fp->fd = fopen(fp->pathname, "r")) != NULL) + if (stat(fp->pathname, &st) == 0 && S_ISREG(st.st_mode) && (fp->fd = fopen(fp->pathname, "r")) != NULL) return 0; for (dc = &decompressors[0]; dc->cmd; dc++) { @@ -115,9 +114,7 @@ sprintf(fp->pathname, "%s%s%s", fnam, suffixes[i], dc->ext); - if (stat(fp->pathname, &st) == 0 - && S_ISREG(st.st_mode) - && access(fp->pathname, R_OK) == 0) + if (stat(fp->pathname, &st) == 0 && S_ISREG(st.st_mode) && access(fp->pathname, R_OK) == 0) return pipe_open(dc, fp); } } @@ -136,7 +133,7 @@ int i, rc = -1, secondpass = 0; size_t dir_len; - fp->fd = NULL; + fp->fd = NULL; fp->pipe = 0; if ((d = opendir(dir)) == NULL) @@ -152,87 +149,88 @@ } } - /* Scan the directory twice: first for files, then +/* Scan the directory twice: first for files, then for subdirectories, so that we do never search a subdirectory when the directory itself already contains the file we are looking for. */ StartScan: while ((de = readdir(d)) != NULL) { - struct stat st; - int okdir; - size_t d_len; - - d_len = strlen(de->d_name); - if (d_len < 3) { - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - } - - if (dir_len + d_len + 2 > sizeof(fp->pathname)) - continue; - - okdir = (ff && strcmp(de->d_name, fdir) == 0); + struct stat st; + int okdir; + size_t d_len; + + d_len = strlen(de->d_name); + if (d_len < 3) { + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + } - if ((secondpass && recdepth) || okdir) { - char *a; + if (dir_len + d_len + 2 > sizeof(fp->pathname)) + continue; - if ((a = malloc(dir_len + d_len + 2)) == NULL) - goto EndScan; + okdir = (ff && strcmp(de->d_name, fdir) == 0); - sprintf(a, "%s/%s", dir, de->d_name); + if ((secondpass && recdepth) || okdir) { + char *a; - if (stat(a, &st) == 0 && S_ISDIR(st.st_mode)) { - if (okdir) - rc = findfile_in_dir(ff+1, a, 0, suf, fp); + if ((a = malloc(dir_len + d_len + 2)) == NULL) + goto EndScan; - if (rc && recdepth) - rc = findfile_in_dir(fnam, a, recdepth-1, suf, fp); + sprintf(a, "%s/%s", dir, de->d_name); - if (!rc) { - free(a); - goto EndScan; + if (stat(a, &st) == 0 && S_ISDIR(st.st_mode)) { + if (okdir) + rc = findfile_in_dir(ff + 1, a, 0, suf, fp); + + if (rc && recdepth) + rc = findfile_in_dir(fnam, a, recdepth - 1, suf, fp); + + if (!rc) { + free(a); + goto EndScan; + } } + free(a); } - free(a); - } - if (secondpass) - continue; + if (secondpass) + continue; + + /* Should we be in a subdirectory? */ + if (ff) + continue; + + /* Does d_name start right? */ + p = &de->d_name[0]; + q = fnam; + while (*p && *p == *q) + p++, q++; + if (*q) + continue; - /* Should we be in a subdirectory? */ - if (ff) - continue; - - /* Does d_name start right? */ - p = &de->d_name[0]; - q = fnam; - while (*p && *p == *q) p++,q++; - if (*q) - continue; - - sprintf(fp->pathname, "%s/%s", dir, de->d_name); - if (stat(fp->pathname, &st) != 0 || !S_ISREG(st.st_mode)) - continue; + sprintf(fp->pathname, "%s/%s", dir, de->d_name); + if (stat(fp->pathname, &st) != 0 || !S_ISREG(st.st_mode)) + continue; - /* Does tail consist of a known suffix and possibly + /* Does tail consist of a known suffix and possibly a compression suffix? */ - for(i = 0; suf[i]; i++) { - size_t l; + for (i = 0; suf[i]; i++) { + size_t l; - if (!strcmp(p, suf[i])) { - rc = maybe_pipe_open(fp); - goto EndScan; - } - - l = strlen(suf[i]); - if (!strncmp(p, suf[i], l)) { - for (dc = &decompressors[0]; dc->cmd; dc++) - if (strcmp(p+l, dc->ext) == 0) { - rc = pipe_open(dc, fp); - goto EndScan; - } - } - } + if (!strcmp(p, suf[i])) { + rc = maybe_pipe_open(fp); + goto EndScan; + } + + l = strlen(suf[i]); + if (!strncmp(p, suf[i], l)) { + for (dc = &decompressors[0]; dc->cmd; dc++) + if (strcmp(p + l, dc->ext) == 0) { + rc = pipe_open(dc, fp); + goto EndScan; + } + } + } } if (recdepth > 0 && !secondpass) { @@ -248,13 +246,12 @@ return rc; } -int -lk_findfile(const char *fnam, const char *const *dirpath, const char *const *suffixes, lkfile_t *fp) +int lk_findfile(const char *fnam, const char *const *dirpath, const char *const *suffixes, lkfile_t *fp) { char *dir; int dl, recdepth, rc, i; - fp->fd = NULL; + fp->fd = NULL; fp->pipe = 0; /* Try explicitly given name first */ @@ -272,14 +269,14 @@ /* Search a list of directories and directory hierarchies */ for (i = 0; dirpath[i]; i++) { recdepth = 0; - dl = strlen(dirpath[i]); + dl = strlen(dirpath[i]); /* trailing stars denote recursion */ - while (dl && dirpath[i][dl-1] == '*') + while (dl && dirpath[i][dl - 1] == '*') dl--, recdepth++; /* delete trailing slashes */ - while (dl && dirpath[i][dl-1] == '/') + while (dl && dirpath[i][dl - 1] == '/') dl--; if (dl) diff -Nru kbd-2.0.3/src/libkeymap/func.c kbd-2.0.4/src/libkeymap/func.c --- kbd-2.0.3/src/libkeymap/func.c 2014-06-26 14:46:59.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/func.c 2016-12-19 15:01:51.000000000 +0000 @@ -6,6 +6,8 @@ * This file is covered by the GNU General Public License, * which should be included with kbd as the file COPYING. */ +#include "config.h" + #include #include @@ -16,14 +18,12 @@ #include "contextP.h" -int -lk_func_exists(struct lk_ctx *ctx, unsigned int index) +int lk_func_exists(struct lk_ctx *ctx, unsigned int index) { return (lk_array_get_ptr(ctx->func_table, index) != NULL); } -int -lk_get_func(struct lk_ctx *ctx, struct kbsentry *kbs) +int lk_get_func(struct lk_ctx *ctx, struct kbsentry *kbs) { char *s; @@ -39,8 +39,7 @@ return 0; } -int -lk_add_func(struct lk_ctx *ctx, struct kbsentry *kbs) +int lk_add_func(struct lk_ctx *ctx, struct kbsentry *kbs) { char *s; @@ -59,8 +58,7 @@ return 0; } -int -lk_del_func(struct lk_ctx *ctx, unsigned int index) +int lk_del_func(struct lk_ctx *ctx, unsigned int index) { if (lk_array_unset(ctx->func_table, index) < 0) { ERR(ctx, _("Unable to remove item from the list of functions")); @@ -69,4 +67,3 @@ return 0; } - diff -Nru kbd-2.0.3/src/libkeymap/kernel.c kbd-2.0.4/src/libkeymap/kernel.c --- kbd-2.0.3/src/libkeymap/kernel.c 2014-06-26 13:12:58.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/kernel.c 2016-12-19 15:01:51.000000000 +0000 @@ -6,6 +6,8 @@ * This file is covered by the GNU General Public License, * which should be included with kbd as the file COPYING. */ +#include "config.h" + #include #include #include @@ -15,8 +17,7 @@ #include "nls.h" #include "contextP.h" -int -lk_kernel_keys(struct lk_ctx *ctx, int fd) +int lk_kernel_keys(struct lk_ctx *ctx, int fd) { int i, t; struct kbentry ke; @@ -27,12 +28,15 @@ ke.kb_index = i; ke.kb_value = 0; - if (ioctl(fd, KDGKBENT, (unsigned long) &ke)) { + if (ioctl(fd, KDGKBENT, (unsigned long)&ke)) { ERR(ctx, _("KDGKBENT: %s: error at index %d in table %d"), - strerror(errno), i, t); + strerror(errno), i, t); return -1; } + if (!i && ke.kb_value == K_NOSUCHMAP) + break; + if (lk_add_key(ctx, t, i, ke.kb_value) < 0) return -1; } @@ -44,8 +48,7 @@ return 0; } -int -lk_kernel_funcs(struct lk_ctx *ctx, int fd) +int lk_kernel_funcs(struct lk_ctx *ctx, int fd) { int i; struct kbsentry kbs; @@ -53,13 +56,13 @@ for (i = 0; i < MAX_NR_FUNC; i++) { kbs.kb_func = i; - if (ioctl(fd, KDGKBSENT, (unsigned long) &kbs)) { + if (ioctl(fd, KDGKBSENT, (unsigned long)&kbs)) { ERR(ctx, _("KDGKBSENT: %s: Unable to get function key string"), - strerror(errno)); + strerror(errno)); return -1; } - if (!strlen((char *) kbs.kb_string)) + if (!strlen((char *)kbs.kb_string)) continue; if (lk_add_func(ctx, &kbs) < 0) @@ -69,8 +72,7 @@ return 0; } -int -lk_kernel_diacrs(struct lk_ctx *ctx, int fd) +int lk_kernel_diacrs(struct lk_ctx *ctx, int fd) { #ifdef KDGKBDIACRUC int request = KDGKBDIACRUC; @@ -84,16 +86,16 @@ unsigned int i; struct lk_kbdiacr dcr; - if (ioctl(fd, request, (unsigned long) &kd)) { + if (ioctl(fd, request, (unsigned long)&kd)) { ERR(ctx, _("KDGKBDIACR(UC): %s: Unable to get accent table"), - strerror(errno)); + strerror(errno)); return -1; } for (i = 0; i < kd.kb_cnt; i++) { - dcr.diacr = (ar+i)->diacr; - dcr.base = (ar+i)->base; - dcr.result = (ar+i)->result; + dcr.diacr = (ar + i)->diacr; + dcr.base = (ar + i)->base; + dcr.result = (ar + i)->result; if (lk_add_diacr(ctx, i, &dcr) < 0) return -1; @@ -102,11 +104,10 @@ return 0; } -int -lk_kernel_keymap(struct lk_ctx *ctx, int fd) +int lk_kernel_keymap(struct lk_ctx *ctx, int fd) { - if (lk_kernel_keys(ctx, fd) < 0 || - lk_kernel_funcs(ctx, fd) < 0 || + if (lk_kernel_keys(ctx, fd) < 0 || + lk_kernel_funcs(ctx, fd) < 0 || lk_kernel_diacrs(ctx, fd) < 0) return -1; return 0; diff -Nru kbd-2.0.3/src/libkeymap/keymap/array.h kbd-2.0.4/src/libkeymap/keymap/array.h --- kbd-2.0.3/src/libkeymap/keymap/array.h 2014-06-14 18:09:08.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/keymap/array.h 2016-12-19 15:01:55.000000000 +0000 @@ -19,7 +19,7 @@ int lk_array_append(struct lk_array *a, const void *e); -int lk_array_set(struct lk_array *a, unsigned int i, const void *e); +int lk_array_set(struct lk_array *a, unsigned int i, const void *e); void *lk_array_get(struct lk_array *a, unsigned int i); void *lk_array_get_ptr(struct lk_array *a, unsigned int i); diff -Nru kbd-2.0.3/src/libkeymap/keymap/common.h kbd-2.0.4/src/libkeymap/keymap/common.h --- kbd-2.0.3/src/libkeymap/keymap/common.h 2014-01-06 18:29:46.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/keymap/common.h 2016-12-19 15:01:55.000000000 +0000 @@ -63,9 +63,9 @@ * @return 0 on success, -1 on error. */ int lk_set_log_fn(struct lk_ctx *ctx, - void (*log_fn)(void *data, int priority, - const char *file, int line, const char *fn, - const char *format, va_list args), - const void *data); + void (*log_fn)(void *data, int priority, + const char *file, int line, const char *fn, + const char *format, va_list args), + const void *data); #endif /* LK_COMMON_H */ diff -Nru kbd-2.0.3/src/libkeymap/keymap/dump.h kbd-2.0.4/src/libkeymap/keymap/dump.h --- kbd-2.0.3/src/libkeymap/keymap/dump.h 2014-06-22 21:16:50.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/keymap/dump.h 2016-12-19 15:01:55.000000000 +0000 @@ -23,16 +23,16 @@ * @brief General information about the keymap. */ struct kmapinfo { - lk_flags flags; /**< Parser flags that are set outside the library */ - lk_keywords keywords; /**< Keywords used in keymap files */ - size_t keymaps; /**< Number of keymaps in actual use */ - size_t keymaps_alloced; /**< Number of keymaps dynamically allocated */ - size_t functions; /**< Number of function keys */ - size_t composes; /**< Number of compose definitions in actual use */ + lk_flags flags; /**< Parser flags that are set outside the library */ + lk_keywords keywords; /**< Keywords used in keymap files */ + size_t keymaps; /**< Number of keymaps in actual use */ + size_t keymaps_alloced; /**< Number of keymaps dynamically allocated */ + size_t functions; /**< Number of function keys */ + size_t composes; /**< Number of compose definitions in actual use */ - size_t keymaps_total; - size_t functions_total; - size_t composes_total; + size_t keymaps_total; + size_t functions_total; + size_t composes_total; }; /** diff -Nru kbd-2.0.3/src/libkeymap/keymap/kmap.h kbd-2.0.4/src/libkeymap/keymap/kmap.h --- kbd-2.0.3/src/libkeymap/keymap/kmap.h 2014-06-26 14:37:42.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/keymap/kmap.h 2016-12-19 15:01:55.000000000 +0000 @@ -8,7 +8,7 @@ #include #include -int lk_add_map(struct lk_ctx *ctx, unsigned int k_table); +int lk_add_map(struct lk_ctx *ctx, unsigned int k_table); int lk_map_exists(struct lk_ctx *ctx, unsigned int k_table); int lk_get_keys_total(struct lk_ctx *ctx, unsigned int k_table); @@ -16,7 +16,7 @@ int lk_add_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index, int keycode); int lk_del_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index); int lk_get_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index); -int lk_key_exists(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index); +int lk_key_exists(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index); /* Functions for key string manipulations */ int lk_get_func(struct lk_ctx *ctx, struct kbsentry *kbs); diff -Nru kbd-2.0.3/src/libkeymap/keymap/logging.h kbd-2.0.4/src/libkeymap/keymap/logging.h --- kbd-2.0.3/src/libkeymap/keymap/logging.h 2014-01-06 00:56:51.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/keymap/logging.h 2016-12-19 16:17:00.000000000 +0000 @@ -18,10 +18,10 @@ const char *file, int line, const char *fn, const char *fmt, ...); -#define lk_log_cond(ctx, level, arg...) \ - do { \ - if (ctx->log_priority >= level) \ - lk_log(ctx, level, __FILE__, __LINE__, __func__, ## arg);\ +#define lk_log_cond(ctx, level, arg...) \ + do { \ + if (ctx->log_priority >= level) \ + lk_log(ctx, level, __FILE__, __LINE__, __func__, ##arg); \ } while (0) /** @@ -29,27 +29,27 @@ * @param ctx is a keymap library context. * @param arg is output message. */ -#define DBG(ctx, arg...) lk_log_cond(ctx, LOG_DEBUG, ## arg) +#define DBG(ctx, arg...) lk_log_cond(ctx, LOG_DEBUG, ##arg) /** * Wrapper to output informational messages * @param ctx is a keymap library context. * @param arg is output message. */ -#define INFO(ctx, arg...) lk_log_cond(ctx, LOG_INFO, ## arg) +#define INFO(ctx, arg...) lk_log_cond(ctx, LOG_INFO, ##arg) /** * Wrapper to output warning conditions * @param ctx is a keymap library context. * @param arg is output message. */ -#define WARN(ctx, arg...) lk_log_cond(ctx, LOG_WARNING, ## arg) +#define WARN(ctx, arg...) lk_log_cond(ctx, LOG_WARNING, ##arg) /** * Wrapper to output error conditions * @param ctx is a keymap library context. * @param arg is output message. */ -#define ERR(ctx, arg...) lk_log_cond(ctx, LOG_ERR, ## arg) +#define ERR(ctx, arg...) lk_log_cond(ctx, LOG_ERR, ##arg) #endif /* LK_LOGGING_H */ diff -Nru kbd-2.0.3/src/libkeymap/kmap.c kbd-2.0.4/src/libkeymap/kmap.c --- kbd-2.0.3/src/libkeymap/kmap.c 2015-05-11 21:55:13.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/kmap.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include @@ -10,14 +12,12 @@ #include "ksyms.h" #include "modifiers.h" -int -lk_map_exists(struct lk_ctx *ctx, unsigned int k_table) +int lk_map_exists(struct lk_ctx *ctx, unsigned int k_table) { return (lk_array_get_ptr(ctx->keymap, k_table) != NULL); } -int -lk_get_keys_total(struct lk_ctx *ctx, unsigned int k_table) +int lk_get_keys_total(struct lk_ctx *ctx, unsigned int k_table) { struct lk_array *map; map = lk_array_get_ptr(ctx->keymap, k_table); @@ -27,8 +27,7 @@ return map->total; } -int -lk_key_exists(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) +int lk_key_exists(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) { struct lk_array *map; unsigned int *key; @@ -46,8 +45,7 @@ return (*key > 0); } -int -lk_add_map(struct lk_ctx *ctx, unsigned int k_table) +int lk_add_map(struct lk_ctx *ctx, unsigned int k_table) { struct lk_array *keys; @@ -72,8 +70,7 @@ return 0; } -int -lk_get_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) +int lk_get_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) { struct lk_array *map; unsigned int *key; @@ -89,11 +86,10 @@ return K_HOLE; } - return (*key)-1; + return (*key) - 1; } -int -lk_del_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) +int lk_del_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) { struct lk_array *map; @@ -108,15 +104,14 @@ if (lk_array_unset(map, k_index) < 0) { ERR(ctx, _("unable to unset key %d for table %d"), - k_index, k_table); + k_index, k_table); return -1; } return 0; } -int -lk_add_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index, int keycode) +int lk_add_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index, int keycode) { struct lk_array *map; unsigned int code = keycode + 1; @@ -128,9 +123,6 @@ return -1; } - if (!k_index && keycode == K_NOSUCHMAP) - return 0; - map = lk_array_get_ptr(ctx->keymap, k_table); if (!map) { if (ctx->keywords & LK_KEYWORD_KEYMAPS) { @@ -151,14 +143,14 @@ if (lk_array_set(map, k_index, &code) < 0) { ERR(ctx, _("unable to set key %d for table %d"), - k_index, k_table); + k_index, k_table); return -1; } if (ctx->keywords & LK_KEYWORD_ALTISMETA) { unsigned int alttable = k_table | M_ALT; - int type = KTYP(keycode); - int val = KVAL(keycode); + int type = KTYP(keycode); + int val = KVAL(keycode); if (alttable != k_table && lk_map_exists(ctx, alttable) && !lk_key_exists(ctx, alttable, k_index) && @@ -189,10 +181,10 @@ defs[2] = defs[0]; defs[3] = defs[1]; - for (j = 4; j < 8; j++) + for (j = 4; j < 8; j++) defs[j] = K(KT_LATIN, val & ~96); - for (j = 8; j < 16; j++) + for (j = 8; j < 16; j++) defs[j] = K(KT_META, KVAL(defs[j - 8])); for (j = 0; j < ctx->keymap->total; j++) { @@ -223,8 +215,7 @@ return 0; } -int -lk_add_constants(struct lk_ctx *ctx) +int lk_add_constants(struct lk_ctx *ctx) { unsigned int i, r0 = 0; diff -Nru kbd-2.0.3/src/libkeymap/ksyms.c kbd-2.0.4/src/libkeymap/ksyms.c --- kbd-2.0.3/src/libkeymap/ksyms.c 2014-06-22 21:15:42.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/ksyms.c 2016-12-19 16:10:48.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -29,87 +31,88 @@ #include "syms.ktyp.h" -#define E(x) { x, sizeof(x) / sizeof(x[0]) } - -const syms_entry -syms[] = { - E(iso646_syms), /* KT_LATIN */ - E(fn_syms), /* KT_FN */ - E(spec_syms), /* KT_SPEC */ - E(pad_syms), /* KT_PAD */ - E(dead_syms), /* KT_DEAD */ - E(cons_syms), /* KT_CONS */ - E(cur_syms), /* KT_CUR */ - E(shift_syms), /* KT_SHIFT */ - { 0, 0 }, /* KT_META */ - E(ascii_syms), /* KT_ASCII */ - E(lock_syms), /* KT_LOCK */ - { 0, 0 }, /* KT_LETTER */ - E(sticky_syms), /* KT_SLOCK */ - { 0, 0 }, /* */ - E(brl_syms) /* KT_BRL */ +#define E(x) \ + { \ + x, sizeof(x) / sizeof(x[0]) \ + } + +const syms_entry syms[] = { + E(iso646_syms), /* KT_LATIN */ + E(fn_syms), /* KT_FN */ + E(spec_syms), /* KT_SPEC */ + E(pad_syms), /* KT_PAD */ + E(dead_syms), /* KT_DEAD */ + E(cons_syms), /* KT_CONS */ + E(cur_syms), /* KT_CUR */ + E(shift_syms), /* KT_SHIFT */ + { 0, 0 }, /* KT_META */ + E(ascii_syms), /* KT_ASCII */ + E(lock_syms), /* KT_LOCK */ + { 0, 0 }, /* KT_LETTER */ + E(sticky_syms), /* KT_SLOCK */ + { 0, 0 }, /* */ + E(brl_syms) /* KT_BRL */ }; #undef E const unsigned int syms_size = sizeof(syms) / sizeof(syms_entry); -const unsigned int syn_size = sizeof(synonyms) / sizeof(synonyms[0]); +const unsigned int syn_size = sizeof(synonyms) / sizeof(synonyms[0]); const struct cs { const char *charset; const sym *charnames; const int start; } charsets[] = { - { "", NULL, 0 }, - { "iso-8859-1", latin1_syms, 160 }, - { "iso-8859-2", latin2_syms, 160 }, - { "iso-8859-3", latin3_syms, 160 }, - { "iso-8859-4", latin4_syms, 160 }, - { "iso-8859-5", iso_8859_5_syms, 160 }, - { "iso-8859-7", iso_8859_7_syms, 160 }, - { "iso-8859-8", iso_8859_8_syms, 160 }, - { "iso-8859-9", iso_8859_9_syms, 208 }, - { "iso-8859-10", latin6_syms, 160 }, - { "iso-8859-15", iso_8859_15_syms, 160 }, - { "mazovia", mazovia_syms, 128 }, - { "cp-1250", cp1250_syms, 128 }, - { "koi8-r", koi8_syms, 128 }, - { "koi8-u", koi8_syms, 128 }, - { "tis-620", tis_620_syms, 160 }, /* thai */ - { "iso-10646-18", iso_10646_18_syms, 159 }, /* ethiopic */ - { "iso-ir-197", iso_ir_197_syms, 160 }, /* sami */ - { "iso-ir-209", iso_ir_209_syms, 160 }, /* sami */ + { "iso-8859-1", latin1_syms, 160 }, + { "iso-8859-2", latin2_syms, 160 }, + { "iso-8859-3", latin3_syms, 160 }, + { "iso-8859-4", latin4_syms, 160 }, + { "iso-8859-5", iso8859_5_syms, 160 }, + { "iso-8859-7", iso8859_7_syms, 160 }, + { "iso-8859-8", iso8859_8_syms, 160 }, + { "iso-8859-9", iso8859_9_syms, 160 }, + { "iso-8859-10", latin6_syms, 160 }, + { "iso-8859-15", iso8859_15_syms, 160 }, + { "mazovia", mazovia_syms, 128 }, + { "cp-1250", cp1250_syms, 128 }, + { "koi8-r", koi8_syms, 128 }, + { "koi8-u", koi8_syms, 128 }, + { "tis-620", tis_620_syms, 160 }, /* thai */ + { "iso-10646-18", iso10646_18_syms, 159 }, /* ethiopic */ + { "iso-ir-197", iso_ir_197_syms, 160 }, /* sami */ + { "iso-ir-209", iso_ir_209_syms, 160 }, /* sami */ }; -static unsigned int charsets_size = sizeof(charsets) / sizeof(charsets[0]); +static const unsigned int charsets_size = sizeof(charsets) / sizeof(charsets[0]); /* Functions for both dumpkeys and loadkeys. */ -void -lk_list_charsets(FILE *f) { - int lth,ct; +void lk_list_charsets(FILE *f) +{ + int lth, ct; unsigned int i, j; char *mm[] = { "iso-8859-", "koi8-" }; - for (j=0; jcharset || ctx->charset >= charsets_size) + if (!ctx || ctx->charset >= charsets_size) return NULL; return charsets[ctx->charset].charset; } -int -lk_set_charset(struct lk_ctx *ctx, const char *charset) { +int lk_set_charset(struct lk_ctx *ctx, const char *charset) +{ unsigned int i; - for (i = 1; i < charsets_size; i++) { + for (i = 0; i < charsets_size; i++) { if (!strcasecmp(charsets[i].charset, charset)) { ctx->charset = i; return 0; @@ -173,7 +176,8 @@ } const char * -codetoksym(struct lk_ctx *ctx, int code) { +codetoksym(struct lk_ctx *ctx, int code) +{ unsigned int i; int j; sym *p; @@ -181,7 +185,7 @@ if (code < 0) return NULL; - if (code < 0x1000) { /* "traditional" keysym */ + if (code < 0x1000) { /* "traditional" keysym */ if (code < 0x80) return get_sym(ctx, KT_LATIN, code); @@ -195,48 +199,29 @@ return get_sym(ctx, KTYP(code), KVAL(code)); i = ctx->charset; - while (1) { - p = (sym *) charsets[i].charnames; - if (p) { - p += KVAL(code) - charsets[i].start; - - if (p->name[0]) - return p->name; - } - - i++; - - if (i == charsets_size) - i = 0; - if (i == ctx->charset) - break; + p = (sym *)charsets[i].charnames; + if (p && (KVAL(code) >= charsets[i].start)) { + p += KVAL(code) - charsets[i].start; + if (p->name[0]) + return p->name; } } - else { /* Unicode keysym */ + else { /* Unicode keysym */ code ^= 0xf000; if (code < 0x80) return get_sym(ctx, KT_LATIN, code); - i = ctx->charset; - while (1) { - p = (sym *) charsets[i].charnames; + for (i = 0; i < charsets_size; i++) { + p = (sym *)charsets[i].charnames; if (p) { for (j = charsets[i].start; j < 256; j++, p++) { if (p->uni == code && p->name[0]) return p->name; } } - - i++; - - if (i == charsets_size) - i = 0; - if (i == ctx->charset) - break; } - } return NULL; @@ -257,16 +242,17 @@ /* Functions for loadkeys. */ static int -kt_latin(struct lk_ctx *ctx, const char *s, int direction) { +kt_latin(struct lk_ctx *ctx, const char *s, int direction) +{ unsigned int i, max; - if (ctx->charset) { - sym *p = (sym *) charsets[ctx->charset].charnames; + sym *p = (sym *)charsets[ctx->charset].charnames; - for (i = charsets[ctx->charset].start; i < 256; i++, p++) { - if(p->name[0] && !strcmp(s, p->name)) - return K(KT_LATIN, i); - } + max = (direction == TO_UNICODE ? 128 : 256); // TODO(dmage): is 256 valid for ethiopic charset? + + for (i = charsets[ctx->charset].start; i < max; i++, p++) { + if (p->name[0] && !strcmp(s, p->name)) + return K(KT_LATIN, i); } max = (direction == TO_UNICODE ? 128 : syms[KT_LATIN].size); @@ -279,8 +265,8 @@ return -1; } -int -ksymtocode(struct lk_ctx *ctx, const char *s, int direction) { +int ksymtocode(struct lk_ctx *ctx, const char *s, int direction) +{ unsigned int i, j; int n; int keycode; @@ -288,16 +274,17 @@ if (direction == TO_AUTO) direction = (ctx->flags & LK_FLAG_PREFER_UNICODE) - ? TO_UNICODE : TO_8BIT; + ? TO_UNICODE + : TO_8BIT; if (!strncmp(s, "Meta_", 5)) { - keycode = ksymtocode(ctx, s+5, TO_8BIT); + keycode = ksymtocode(ctx, s + 5, TO_8BIT); if (KTYP(keycode) == KT_LATIN) return K(KT_META, KVAL(keycode)); /* Avoid error messages for Meta_acute with UTF-8 */ - else if(direction == TO_UNICODE) - return (0); + else if (direction == TO_UNICODE) + return (0); /* fall through to error printf */ } @@ -319,22 +306,26 @@ if (direction == TO_UNICODE) { i = ctx->charset; + p = (sym *)charsets[i].charnames; + if (p) { + for (j = charsets[i].start; j < 256; j++, p++) { + if (!strcmp(s, p->name)) + return (p->uni ^ 0xf000); + } + } - while (1) { - p = (sym *) charsets[i].charnames; + /* not found in the current charset, maybe we'll have good luck in others? */ + for (i = 0; i < charsets_size; i++) { + if (i == ctx->charset) { + continue; + } + p = (sym *)charsets[i].charnames; if (p) { for (j = charsets[i].start; j < 256; j++, p++) { - if (!strcmp(s,p->name)) + if (!strcmp(s, p->name)) return (p->uni ^ 0xf000); } } - - i++; - - if (i == charsets_size) - i = 0; - if (i == ctx->charset) - break; } } else /* if (!chosen_charset[0]) */ { /* note: some keymaps use latin1 but with euro, @@ -350,7 +341,7 @@ } for (i = 0; i < 256 - 160; i++) - if (!strcmp(s, iso_8859_15_syms[i].name)) { + if (!strcmp(s, iso8859_15_syms[i].name)) { INFO(ctx, _("assuming iso-8859-15 %s"), s); return K(KT_LATIN, 160 + i); } @@ -379,23 +370,22 @@ return CODE_FOR_UNKNOWN_KSYM; } -int -lk_ksym_to_unicode(struct lk_ctx *ctx, const char *s) +int lk_ksym_to_unicode(struct lk_ctx *ctx, const char *s) { return ksymtocode(ctx, s, TO_UNICODE); } -int -convert_code(struct lk_ctx *ctx, int code, int direction) +int convert_code(struct lk_ctx *ctx, int code, int direction) { const char *ksym; - int unicode_forced = (direction == TO_UNICODE); + int unicode_forced = (direction == TO_UNICODE); int input_is_unicode = (code >= 0x1000); int result; if (direction == TO_AUTO) direction = (ctx->flags & LK_FLAG_PREFER_UNICODE) - ? TO_UNICODE : TO_8BIT; + ? TO_UNICODE + : TO_8BIT; if (KTYP(code) == KT_META) return code; @@ -406,7 +396,7 @@ /* so is Unicode "Basic Latin" */ return code ^ 0xf000; else if ((input_is_unicode && direction == TO_UNICODE) || - (!input_is_unicode && direction == TO_8BIT)) + (!input_is_unicode && direction == TO_8BIT)) /* no conversion necessary */ result = code; else { @@ -417,6 +407,10 @@ result = ksymtocode(ctx, ksym, direction); else result = code; + if (direction == TO_UNICODE && KTYP(code) == KT_LETTER && (result ^ 0xf000) < 0x100) { + /* Unicode Latin-1 Supplement */ + result = K(KT_LETTER, result ^ 0xf000); + } } /* if direction was TO_UNICODE from the beginning, we return the true @@ -427,8 +421,7 @@ return result; } -int -add_capslock(struct lk_ctx *ctx, int code) +int add_capslock(struct lk_ctx *ctx, int code) { if (KTYP(code) == KT_LATIN && (!(ctx->flags & LK_FLAG_PREFER_UNICODE) || code < 0x80)) return K(KT_LETTER, KVAL(code)); diff -Nru kbd-2.0.3/src/libkeymap/ksyms.h kbd-2.0.4/src/libkeymap/ksyms.h --- kbd-2.0.3/src/libkeymap/ksyms.h 2014-06-22 21:15:42.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/ksyms.h 2016-12-19 15:01:55.000000000 +0000 @@ -9,7 +9,7 @@ } sym; typedef struct { - const char * const *table; + const char *const *table; const unsigned int size; } syms_entry; @@ -26,7 +26,7 @@ #define CODE_FOR_UNKNOWN_KSYM (-1) /* Directions for converting keysyms */ -#define TO_AUTO (-1) /* use LK_FLAG_PREFER_UNICODE */ +#define TO_AUTO (-1) /* use LK_FLAG_PREFER_UNICODE */ #define TO_8BIT 0 #define TO_UNICODE 1 diff -Nru kbd-2.0.3/src/libkeymap/loadkeys.c kbd-2.0.4/src/libkeymap/loadkeys.c --- kbd-2.0.3/src/libkeymap/loadkeys.c 2014-06-25 15:33:55.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/loadkeys.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -24,7 +26,7 @@ /* temporarily switch to K_UNICODE while defining keys */ if (ioctl(fd, KDSKBMODE, K_UNICODE)) { ERR(ctx, _("KDSKBMODE: %s: could not switch to Unicode mode"), - strerror(errno)); + strerror(errno)); goto fail; } } @@ -54,7 +56,7 @@ ct++; INFO(ctx, _("keycode %d, table %d = %d%s"), - j, i, lk_get_key(ctx,i, j), fail ? _(" FAILED") : ""); + j, i, lk_get_key(ctx, i, j), fail ? _(" FAILED") : ""); if (fail) WARN(ctx, _("failed to bind key %d to value %d"), @@ -72,7 +74,7 @@ if (ioctl(fd, KDSKBENT, (unsigned long)&ke)) { if (errno != EINVAL) { ERR(ctx, _("KDSKBENT: %s: could not deallocate keymap %d"), - strerror(errno), i); + strerror(errno), i); goto fail; } /* probably an old kernel */ @@ -84,10 +86,10 @@ if (ioctl(fd, KDSKBENT, (unsigned long)&ke)) { if (errno == EINVAL && i >= 16) - break; /* old kernel */ + break; /* old kernel */ ERR(ctx, _("KDSKBENT: %s: cannot deallocate or clear keymap"), - strerror(errno)); + strerror(errno)); goto fail; } } @@ -97,22 +99,22 @@ if ((ctx->flags & LK_FLAG_UNICODE_MODE) && ioctl(fd, KDSKBMODE, kbd_mode)) { ERR(ctx, _("KDSKBMODE: %s: could not return to original keyboard mode"), - strerror(errno)); + strerror(errno)); goto fail; } return ct; - fail: return -1; +fail: + return -1; } - static char * ostr(struct lk_ctx *ctx, char *s) { - int lth = strlen(s); + int lth = strlen(s); char *ns0 = malloc(4 * lth + 1); - char *ns = ns0; + char *ns = ns0; if (ns == NULL) { ERR(ctx, _("out of memory")); @@ -121,18 +123,18 @@ while (*s) { switch (*s) { - case '\n': - *ns++ = '\\'; - *ns++ = 'n'; - break; - case '\033': - *ns++ = '\\'; - *ns++ = '0'; - *ns++ = '3'; - *ns++ = '3'; - break; - default: - *ns++ = *s; + case '\n': + *ns++ = '\\'; + *ns++ = 'n'; + break; + case '\033': + *ns++ = '\\'; + *ns++ = '0'; + *ns++ = '3'; + *ns++ = '3'; + break; + default: + *ns++ = *s; } s++; } @@ -159,7 +161,7 @@ if (s == NULL) return -1; ERR(ctx, _("failed to bind string '%s' to function %s"), - s, get_sym(ctx, KT_FN, kbs.kb_func)); + s, get_sym(ctx, KT_FN, kbs.kb_func)); free(s); } else { ct++; @@ -169,7 +171,7 @@ if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs)) { ERR(ctx, _("failed to clear string %s"), - get_sym(ctx, KT_FN, kbs.kb_func)); + get_sym(ctx, KT_FN, kbs.kb_func)); } else { ct++; } @@ -237,8 +239,7 @@ return count; } -int -lk_load_keymap(struct lk_ctx *ctx, int fd, int kbd_mode) +int lk_load_keymap(struct lk_ctx *ctx, int fd, int kbd_mode) { int keyct, funcct, diacct; @@ -258,7 +259,8 @@ return -1; INFO(ctx, P_("Loaded %d compose definition", - "Loaded %d compose definitions", diacct), diacct); + "Loaded %d compose definitions", diacct), + diacct); } else { INFO(ctx, _("(No change in compose definitions)")); diff -Nru kbd-2.0.3/src/libkeymap/Makefile.am kbd-2.0.4/src/libkeymap/Makefile.am --- kbd-2.0.3/src/libkeymap/Makefile.am 2014-06-26 12:57:50.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/Makefile.am 2016-11-14 19:46:56.000000000 +0000 @@ -18,21 +18,26 @@ keymap/logging.h \ keymap/findfile.h +SYMS = \ + syms.latin1.h/8859-1/160 \ + syms.latin2.h/8859-2/160 \ + syms.latin3.h/8859-3/160 \ + syms.latin4.h/8859-4/160 \ + syms.iso8859_5.h/8859-5/160 \ + syms.iso8859_7.h/8859-7/160 \ + syms.iso8859_8.h/8859-8/160 \ + syms.iso8859_9.h/8859-9/160 \ + syms.iso8859_15.h/8859-15/160 \ + syms.cp1250.h/cp1250/128 \ + syms.koi8.h/koi8-u/128 + +ksyms_gen_headers = $(call charset_headers) ksyms_headers = \ + $(ksyms_gen_headers) \ syms.ktyp.h \ syms.synonyms.h \ syms.cp1250.h \ syms.ethiopic.h \ - syms.iso8859_15.h \ - syms.iso8859_5.h \ - syms.iso8859_7.h \ - syms.iso8859_8.h \ - syms.iso8859_9.h \ - syms.koi8.h \ - syms.latin1.h \ - syms.latin2.h \ - syms.latin3.h \ - syms.latin4.h \ syms.mazovia.h \ syms.sami.h \ syms.thai.h @@ -59,12 +64,22 @@ endif AM_LFLAGS = --header-file=$(CURDIR)/analyze.h -BUILT_SOURCES = parser.c analyze.c parser.h analyze.h +BUILT_SOURCES = parser.c analyze.c parser.h analyze.h $(ksyms_gen_headers) CLEANFILES += $(BUILT_SOURCES) +GEN_SYMS = $(top_srcdir)/contrib/gen_charset_syms.pl +TRANS_DIR = $(top_srcdir)/data/consoletrans + +charset_headers = $(foreach x,$(SYMS),$(word 1,$(subst /, ,$(x)))) +charset_trans = $(TRANS_DIR)/$(word 2,$(subst /, ,$(filter syms.$(1).h/%,$(SYMS))))_to_uni.trans +charset_start = $(word 3,$(subst /, ,$(filter syms.$(1).h/%,$(SYMS)))) + parser.h: parser.c ; @true analyze.h: analyze.c ; @true +syms.%.h: + $(GEN_SYMS) -n $*_syms -s $(call charset_start,$*) <$(call charset_trans,$*) >$(builddir)/$@ + %.pc: %.pc.in Makefile sed \ -e 's,[@]VERSION[@],$(VERSION),g' \ diff -Nru kbd-2.0.3/src/libkeymap/Makefile.in kbd-2.0.4/src/libkeymap/Makefile.in --- kbd-2.0.3/src/libkeymap/Makefile.in 2015-07-13 22:17:11.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/Makefile.in 2017-01-08 18:49:38.000000000 +0000 @@ -103,10 +103,11 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libkeymap_la_LIBADD = am__objects_1 = +am__objects_2 = $(am__objects_1) am_libkeymap_la_OBJECTS = $(am__objects_1) array.lo findfile.lo \ common.lo kernel.lo dump.lo kmap.lo diacr.lo func.lo \ summary.lo loadkeys.lo parser.lo analyze.lo modifiers.lo \ - ksyms.lo $(am__objects_1) + ksyms.lo $(am__objects_2) libkeymap_la_OBJECTS = $(am_libkeymap_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -329,21 +330,26 @@ keymap/logging.h \ keymap/findfile.h +SYMS = \ + syms.latin1.h/8859-1/160 \ + syms.latin2.h/8859-2/160 \ + syms.latin3.h/8859-3/160 \ + syms.latin4.h/8859-4/160 \ + syms.iso8859_5.h/8859-5/160 \ + syms.iso8859_7.h/8859-7/160 \ + syms.iso8859_8.h/8859-8/160 \ + syms.iso8859_9.h/8859-9/160 \ + syms.iso8859_15.h/8859-15/160 \ + syms.cp1250.h/cp1250/128 \ + syms.koi8.h/koi8-u/128 + +ksyms_gen_headers = $(call charset_headers) ksyms_headers = \ + $(ksyms_gen_headers) \ syms.ktyp.h \ syms.synonyms.h \ syms.cp1250.h \ syms.ethiopic.h \ - syms.iso8859_15.h \ - syms.iso8859_5.h \ - syms.iso8859_7.h \ - syms.iso8859_8.h \ - syms.iso8859_9.h \ - syms.koi8.h \ - syms.latin1.h \ - syms.latin2.h \ - syms.latin3.h \ - syms.latin4.h \ syms.mazovia.h \ syms.sami.h \ syms.thai.h @@ -365,7 +371,12 @@ @BUILD_LIBKEYMAP_TRUE@libkeymap_la_LDFLAGS = -export-symbols-regex ^lk_.* @BUILD_LIBKEYMAP_FALSE@noinst_LTLIBRARIES = libkeymap.la AM_LFLAGS = --header-file=$(CURDIR)/analyze.h -BUILT_SOURCES = parser.c analyze.c parser.h analyze.h +BUILT_SOURCES = parser.c analyze.c parser.h analyze.h $(ksyms_gen_headers) +GEN_SYMS = $(top_srcdir)/contrib/gen_charset_syms.pl +TRANS_DIR = $(top_srcdir)/data/consoletrans +charset_headers = $(foreach x,$(SYMS),$(word 1,$(subst /, ,$(x)))) +charset_trans = $(TRANS_DIR)/$(word 2,$(subst /, ,$(filter syms.$(1).h/%,$(SYMS))))_to_uni.trans +charset_start = $(word 3,$(subst /, ,$(filter syms.$(1).h/%,$(SYMS)))) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -763,6 +774,9 @@ parser.h: parser.c ; @true analyze.h: analyze.c ; @true +syms.%.h: + $(GEN_SYMS) -n $*_syms -s $(call charset_start,$*) <$(call charset_trans,$*) >$(builddir)/$@ + %.pc: %.pc.in Makefile sed \ -e 's,[@]VERSION[@],$(VERSION),g' \ diff -Nru kbd-2.0.3/src/libkeymap/modifiers.c kbd-2.0.4/src/libkeymap/modifiers.c --- kbd-2.0.3/src/libkeymap/modifiers.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/modifiers.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,14 +1,15 @@ +#include "config.h" #include "modifiers.h" const modifier_t modifiers[] = { - { "shift", KG_SHIFT }, - { "altgr", KG_ALTGR }, - { "control", KG_CTRL }, - { "alt", KG_ALT }, - { "shiftl", KG_SHIFTL }, - { "shiftr", KG_SHIFTR }, - { "ctrll", KG_CTRLL }, - { "ctrlr", KG_CTRLR }, - { "capsshift", KG_CAPSSHIFT }, - { 0, 0 } + { "shift", KG_SHIFT }, + { "altgr", KG_ALTGR }, + { "control", KG_CTRL }, + { "alt", KG_ALT }, + { "shiftl", KG_SHIFTL }, + { "shiftr", KG_SHIFTR }, + { "ctrll", KG_CTRLL }, + { "ctrlr", KG_CTRLR }, + { "capsshift", KG_CAPSSHIFT }, + { 0, 0 } }; diff -Nru kbd-2.0.3/src/libkeymap/modifiers.h kbd-2.0.4/src/libkeymap/modifiers.h --- kbd-2.0.3/src/libkeymap/modifiers.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/modifiers.h 2016-12-19 15:01:55.000000000 +0000 @@ -1,17 +1,17 @@ #ifndef _MODIFIERS_H #define _MODIFIERS_H -#include +#include -#define M_PLAIN 0 -#define M_SHIFT (1 << KG_SHIFT) -#define M_CTRL (1 << KG_CTRL) -#define M_ALT (1 << KG_ALT) -#define M_ALTGR (1 << KG_ALTGR) +#define M_PLAIN 0 +#define M_SHIFT (1 << KG_SHIFT) +#define M_CTRL (1 << KG_CTRL) +#define M_ALT (1 << KG_ALT) +#define M_ALTGR (1 << KG_ALTGR) #define M_SHIFTL (1 << KG_SHIFTL) #define M_SHIFTR (1 << KG_SHIFTR) -#define M_CTRLL (1 << KG_CTRLL) -#define M_CTRLR (1 << KG_CTRLR) +#define M_CTRLL (1 << KG_CTRLL) +#define M_CTRLR (1 << KG_CTRLR) #define M_CAPSSHIFT (1 << KG_CAPSSHIFT) typedef struct { diff -Nru kbd-2.0.3/src/libkeymap/parser.c kbd-2.0.4/src/libkeymap/parser.c --- kbd-2.0.3/src/libkeymap/parser.c 2015-05-31 19:20:04.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/parser.c 2016-12-26 16:31:33.000000000 +0000 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7.1. */ +/* A Bison parser, made by GNU Bison 3.0.4.0.14.8bf2. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 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 the Free Software Foundation, either version 3 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, see . */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7.1" +#define YYBISON_VERSION "3.0.4.0.14.8bf2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,11 +62,11 @@ /* Copy the first part of user declarations. */ -/* Line 371 of yacc.c */ -#line 12 "parser.y" +#line 12 "parser.y" /* yacc.c:339 */ #define YY_HEADER_EXPORT_START_CONDITIONS 1 +#include "config.h" #include "nls.h" #include "kbd.h" @@ -77,14 +77,13 @@ #include "parser.h" #include "analyze.h" -/* Line 371 of yacc.c */ -#line 82 "parser.c" +#line 81 "parser.c" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif @@ -100,7 +99,7 @@ by #include "y.tab.h". */ #ifndef YY_YY_Y_TAB_H_INCLUDED # define YY_YY_Y_TAB_H_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -108,8 +107,7 @@ extern int yydebug; #endif /* "%code requires" blocks. */ -/* Line 387 of yacc.c */ -#line 26 "parser.y" +#line 27 "parser.y" /* yacc.c:355 */ #include "keymap.h" @@ -122,50 +120,47 @@ }; #endif +#line 124 "parser.c" /* yacc.c:355 */ -/* Line 387 of yacc.c */ -#line 128 "parser.c" - -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - EOL = 258, - NUMBER = 259, - LITERAL = 260, - CHARSET = 261, - KEYMAPS = 262, - KEYCODE = 263, - EQUALS = 264, - PLAIN = 265, - SHIFT = 266, - CONTROL = 267, - ALT = 268, - ALTGR = 269, - SHIFTL = 270, - SHIFTR = 271, - CTRLL = 272, - CTRLR = 273, - CAPSSHIFT = 274, - COMMA = 275, - DASH = 276, - STRING = 277, - STRLITERAL = 278, - COMPOSE = 279, - TO = 280, - CCHAR = 281, - ERROR = 282, - PLUS = 283, - UNUMBER = 284, - ALT_IS_META = 285, - STRINGS = 286, - AS = 287, - USUAL = 288, - ON = 289, - FOR = 290 - }; + enum yytokentype + { + EOL = 258, + NUMBER = 259, + LITERAL = 260, + CHARSET = 261, + KEYMAPS = 262, + KEYCODE = 263, + EQUALS = 264, + PLAIN = 265, + SHIFT = 266, + CONTROL = 267, + ALT = 268, + ALTGR = 269, + SHIFTL = 270, + SHIFTR = 271, + CTRLL = 272, + CTRLR = 273, + CAPSSHIFT = 274, + COMMA = 275, + DASH = 276, + STRING = 277, + STRLITERAL = 278, + COMPOSE = 279, + TO = 280, + CCHAR = 281, + ERROR = 282, + PLUS = 283, + UNUMBER = 284, + ALT_IS_META = 285, + STRINGS = 286, + AS = 287, + USUAL = 288, + ON = 289, + FOR = 290 + }; #endif /* Tokens. */ #define EOL 258 @@ -202,46 +197,32 @@ #define ON 289 #define FOR 290 - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +union YYSTYPE { -/* Line 387 of yacc.c */ -#line 58 "parser.y" +#line 59 "parser.y" /* yacc.c:355 */ long long int num; struct strdata str; +#line 211 "parser.c" /* yacc.c:355 */ +}; -/* Line 387 of yacc.c */ -#line 219 "parser.c" -} YYSTYPE; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -#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 *scanner, struct lk_ctx *ctx); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_Y_TAB_H_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 390 of yacc.c */ -#line 71 "parser.y" +#line 72 "parser.y" /* yacc.c:358 */ static int yyerror(yyscan_t scanner __attribute__ ((unused)), @@ -349,8 +330,7 @@ } -/* Line 390 of yacc.c */ -#line 354 "parser.c" +#line 334 "parser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -364,11 +344,8 @@ #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -388,8 +365,7 @@ # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -411,11 +387,30 @@ # endif #endif -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if (! defined __GNUC__ || __GNUC__ < 2 \ - || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) -# define __attribute__(Spec) /* empty */ +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif @@ -426,24 +421,25 @@ # define YYUSE(E) /* empty */ #endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(N) (N) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END #endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + #if ! defined yyoverflow || YYERROR_VERBOSE @@ -462,8 +458,7 @@ # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS @@ -475,8 +470,8 @@ # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -492,7 +487,7 @@ # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -500,15 +495,13 @@ # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -518,7 +511,7 @@ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -543,16 +536,16 @@ elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif @@ -571,7 +564,7 @@ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -579,7 +572,7 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 86 +#define YYLAST 85 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 36 @@ -587,17 +580,19 @@ #define YYNNTS 19 /* YYNRULES -- Number of rules. */ #define YYNRULES 50 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 91 +/* YYNSTATES -- Number of states. */ +#define YYNSTATES 90 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 290 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -633,48 +628,15 @@ }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 4, 7, 9, 11, 13, 15, 17, - 19, 21, 23, 25, 29, 32, 37, 44, 49, 53, - 57, 59, 63, 65, 71, 78, 85, 87, 89, 95, - 102, 109, 112, 114, 116, 118, 120, 122, 124, 126, - 128, 130, 132, 133, 136, 138, 140, 143, 145, 148, - 150 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 37, 0, -1, -1, 37, 38, -1, 3, -1, 39, - -1, 40, -1, 41, -1, 42, -1, 43, -1, 49, - -1, 46, -1, 47, -1, 6, 23, 3, -1, 30, - 3, -1, 31, 32, 33, 3, -1, 24, 32, 33, - 35, 23, 3, -1, 24, 32, 33, 3, -1, 7, - 44, 3, -1, 44, 20, 45, -1, 45, -1, 4, - 21, 4, -1, 4, -1, 22, 5, 9, 23, 3, - -1, 24, 48, 48, 25, 48, 3, -1, 24, 48, - 48, 25, 54, 3, -1, 26, -1, 29, -1, 8, - 4, 9, 52, 3, -1, 50, 8, 4, 9, 54, - 3, -1, 10, 8, 4, 9, 54, 3, -1, 50, - 51, -1, 51, -1, 11, -1, 12, -1, 13, -1, - 14, -1, 15, -1, 16, -1, 17, -1, 18, -1, - 19, -1, -1, 53, 52, -1, 54, -1, 4, -1, - 28, 4, -1, 29, -1, 28, 29, -1, 5, -1, - 28, 5, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 180, 180, 181, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 193, 210, 215, 222, 227, 233, 238, - 239, 241, 249, 255, 275, 285, 296, 297, 299, 359, - 365, 372, 373, 375, 376, 377, 378, 379, 380, 381, - 382, 383, 387, 388, 390, 396, 397, 398, 399, 400, - 401 + 0, 181, 181, 182, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 194, 211, 216, 223, 228, 234, 239, + 240, 242, 250, 256, 276, 286, 297, 298, 300, 360, + 366, 373, 374, 376, 377, 378, 379, 380, 381, 382, + 383, 384, 388, 389, 391, 397, 398, 399, 400, 401, + 402 }; #endif @@ -691,13 +653,13 @@ "$accept", "keytable", "line", "charsetline", "altismetaline", "usualstringsline", "usualcomposeline", "keymapline", "range", "range0", "strline", "compline", "compsym", "singleline", "modifiers", "modifier", - "rvalue0", "rvalue1", "rvalue", YY_NULL + "rvalue0", "rvalue1", "rvalue", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -707,31 +669,34 @@ }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 36, 37, 37, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 39, 40, 41, 42, 42, 43, 44, - 44, 45, 45, 46, 47, 47, 48, 48, 49, 49, - 49, 50, 50, 51, 51, 51, 51, 51, 51, 51, - 51, 51, 52, 52, 53, 54, 54, 54, 54, 54, - 54 -}; +#define YYPACT_NINF -31 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-31))) + +#define YYTABLE_NINF -1 + +#define yytable_value_is_error(Yytable_value) \ + 0 + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +static const yytype_int8 yypact[] = { - 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 2, 4, 6, 4, 3, 3, - 1, 3, 1, 5, 6, 6, 1, 1, 5, 6, - 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2, 1, 1, 2, 1, 2, 1, - 2 + -31, 3, -31, -31, -22, -2, 4, -1, -31, -31, + -31, -31, -31, -31, -31, -31, -31, 7, 10, 35, + 8, -31, -31, -31, -31, -31, -31, -31, -31, -31, + 45, -31, 41, 24, 32, -31, 42, 46, 56, -31, + -31, 21, 20, -31, 33, 63, -31, -31, 64, -31, + -2, 19, 60, 47, -3, 48, 68, 65, -31, -31, + -31, -31, 26, -31, 69, 19, -31, 19, 72, -31, + 53, 0, -31, 19, -31, -31, -31, -31, -31, 74, + -31, 75, 76, 77, 78, -31, -31, -31, -31, -31 }; -/* 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. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { 2, 0, 1, 4, 0, 0, 0, 0, 33, 34, @@ -742,79 +707,54 @@ 0, 42, 0, 0, 0, 0, 0, 0, 21, 19, 45, 49, 0, 47, 0, 42, 44, 0, 0, 17, 0, 0, 15, 0, 46, 50, 48, 28, 43, 0, - 23, 0, 27, 0, 0, 0, 30, 16, 24, 25, - 29 + 23, 0, 0, 0, 0, 30, 16, 24, 25, 29 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 1, 21, 22, 23, 24, 25, 26, 34, 35, - 27, 28, 42, 29, 30, 31, 64, 65, 66 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -42 -static const yytype_int8 yypact[] = + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = { - -42, 3, -42, -42, -21, 4, 8, -1, -42, -42, - -42, -42, -42, -42, -42, -42, -42, 26, 12, 37, - 10, -42, -42, -42, -42, -42, -42, -42, -42, -42, - 50, -42, 47, 30, 34, -42, 43, 49, 46, -42, - -42, 23, 20, -42, 24, 55, -42, -42, 66, -42, - 4, 19, 62, 51, -3, 48, 69, 67, -42, -42, - -42, -42, 31, -42, 72, 19, -42, 19, 74, -42, - 56, 0, -42, 19, -42, -42, -42, -42, -42, 75, - -42, 77, -42, 78, 79, 80, -42, -42, -42, -42, - -42 + -31, -31, -31, -31, -31, -31, -31, -31, -31, 34, + -31, -31, 40, -31, -31, 55, 18, -31, -30 }; -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = { - -42, -42, -42, -42, -42, -42, -42, -42, -42, 35, - -42, -42, -41, -42, -42, 54, 21, -42, -28 + -1, 1, 21, 22, 23, 24, 25, 26, 34, 35, + 27, 28, 42, 29, 30, 31, 64, 65, 66 }; -/* 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 YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint8 yytable[] = { - 69, 55, 32, 2, 60, 61, 3, 37, 33, 4, - 5, 6, 36, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 60, 61, 17, 39, 18, 62, 82, - 83, 38, 70, 19, 20, 74, 75, 49, 39, 79, - 43, 40, 44, 84, 41, 85, 39, 62, 63, 40, - 47, 48, 51, 52, 50, 53, 54, 56, 45, 57, - 76, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 58, 67, 72, 71, 68, 77, 73, 80, 86, 81, - 87, 88, 89, 90, 46, 59, 78 + 69, 32, 33, 2, 60, 61, 3, 37, 36, 4, + 5, 6, 38, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 60, 61, 17, 82, 18, 62, 63, + 74, 75, 70, 19, 20, 49, 39, 79, 43, 40, + 44, 83, 41, 84, 47, 48, 39, 62, 63, 40, + 52, 51, 50, 45, 54, 76, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 53, 56, 57, 58, 67, + 68, 72, 77, 71, 73, 80, 81, 85, 86, 87, + 88, 89, 55, 78, 59, 46 }; -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-42))) - -#define yytable_value_is_error(Yytable_value) \ - YYID (0) - static const yytype_uint8 yycheck[] = { - 3, 42, 23, 0, 4, 5, 3, 8, 4, 6, - 7, 8, 4, 10, 11, 12, 13, 14, 15, 16, + 3, 23, 4, 0, 4, 5, 3, 8, 4, 6, + 7, 8, 5, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 4, 5, 22, 26, 24, 28, 29, - 71, 5, 35, 30, 31, 4, 5, 3, 26, 67, - 3, 29, 32, 71, 32, 73, 26, 28, 29, 29, - 3, 21, 9, 4, 20, 9, 33, 33, 8, 4, - 29, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 4, 9, 3, 25, 23, 3, 9, 3, 3, 23, - 3, 3, 3, 3, 30, 50, 65 + 4, 5, 35, 30, 31, 3, 26, 67, 3, 29, + 32, 71, 32, 73, 3, 21, 26, 28, 29, 29, + 4, 9, 20, 8, 33, 29, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 9, 33, 4, 4, 9, + 23, 3, 3, 25, 9, 3, 23, 3, 3, 3, + 3, 3, 42, 65, 50, 30 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 37, 0, 3, 6, 7, 8, 10, 11, 12, @@ -825,34 +765,41 @@ 20, 9, 4, 9, 33, 48, 33, 4, 4, 45, 4, 5, 28, 29, 52, 53, 54, 9, 23, 3, 35, 25, 3, 9, 4, 5, 29, 3, 52, 54, - 3, 23, 29, 48, 54, 54, 3, 3, 3, 3, - 3 + 3, 23, 26, 54, 54, 3, 3, 3, 3, 3 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 36, 37, 37, 38, 38, 38, 38, 38, 38, + 38, 38, 38, 39, 40, 41, 42, 42, 43, 44, + 44, 45, 45, 46, 47, 47, 48, 48, 49, 49, + 49, 50, 50, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 52, 52, 53, 54, 54, 54, 54, 54, + 54 +}; + + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 3, 2, 4, 6, 4, 3, 3, + 1, 3, 1, 5, 6, 6, 1, 1, 5, 6, + 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 2, 1, 1, 2, 1, 2, 1, + 2 +}; + + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + #define YYRECOVERING() (!!yyerrstatus) @@ -869,27 +816,15 @@ else \ { \ yyerror (scanner, ctx, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) + YYERROR; \ + } \ +while (0) /* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 +#define YYTERROR 1 +#define YYERRCODE 256 -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval, scanner) -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -899,54 +834,46 @@ # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, scanner, ctx); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, scanner, ctx); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ + static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void *scanner, struct lk_ctx *ctx) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner, ctx) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - void *scanner; - struct lk_ctx *ctx; -#endif { FILE *yyo = yyoutput; YYUSE (yyo); - if (!yyvaluep) - return; YYUSE (scanner); YYUSE (ctx); + if (!yyvaluep) + return; # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif YYUSE (yytype); } @@ -956,24 +883,11 @@ | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void *scanner, struct lk_ctx *ctx) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep, scanner, ctx) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - void *scanner; - struct lk_ctx *ctx; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner, ctx); YYFPRINTF (yyoutput, ")"); @@ -984,16 +898,8 @@ | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1004,51 +910,42 @@ YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule, void *scanner, struct lk_ctx *ctx) -#else -static void -yy_reduce_print (yyvsp, yyrule, scanner, ctx) - YYSTYPE *yyvsp; - int yyrule; - void *scanner; - struct lk_ctx *ctx; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, void *scanner, struct lk_ctx *ctx) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , scanner, ctx); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , scanner, ctx); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule, scanner, ctx); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule, scanner, ctx); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1062,7 +959,7 @@ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1085,15 +982,8 @@ # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1109,16 +999,8 @@ # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1148,27 +1030,27 @@ char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1191,11 +1073,11 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1203,10 +1085,6 @@ 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 @@ -1256,7 +1134,7 @@ } yyarg[yycount++] = yytname[yyx]; { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -1323,30 +1201,19 @@ | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, void *scanner, struct lk_ctx *ctx) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, scanner, ctx) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - void *scanner; - struct lk_ctx *ctx; -#endif { YYUSE (yyvaluep); YYUSE (scanner); YYUSE (ctx); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1356,57 +1223,18 @@ | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void *scanner, struct lk_ctx *ctx) -#else -int -yyparse (scanner, ctx) - void *scanner; - struct lk_ctx *ctx; -#endif -#endif { /* The lookahead symbol. */ int yychar; -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else +/* The semantic value of the lookahead symbol. */ /* Default value used for initialization, for pacifying older GCCs or non-GCC compilers. */ -static YYSTYPE yyval_default; -# define YY_INITIAL_VALUE(Value) = Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - -/* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); +YY_INITIAL_VALUE (static YYSTYPE yyval_default;) +YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1416,8 +1244,8 @@ int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -1485,23 +1313,23 @@ #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); - yyss = yyss1; - yyvs = yyvs1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1509,22 +1337,22 @@ # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1533,10 +1361,10 @@ yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1565,7 +1393,7 @@ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, scanner); } if (yychar <= YYEOF) @@ -1630,7 +1458,7 @@ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1644,13 +1472,12 @@ switch (yyn) { case 13: -/* Line 1787 of yacc.c */ -#line 194 "parser.y" +#line 195 "parser.y" /* yacc.c:1647 */ { - if (lk_set_charset(ctx, (char *) (yyvsp[(2) - (3)].str).data)) { + if (lk_set_charset(ctx, (char *) (yyvsp[-1].str).data)) { ERR(ctx, _("unknown charset %s - ignoring charset request\n"), - (char *) (yyvsp[(2) - (3)].str).data); + (char *) (yyvsp[-1].str).data); YYERROR; } ctx->keywords |= LK_KEYWORD_CHARSET; @@ -1658,142 +1485,142 @@ /* Unicode: The first 256 code points were made identical to the content of ISO 8859-1 */ if (ctx->flags & LK_FLAG_PREFER_UNICODE && - !strcasecmp((char *) (yyvsp[(2) - (3)].str).data, "iso-8859-1")) + !strcasecmp((char *) (yyvsp[-1].str).data, "iso-8859-1")) ctx->flags ^= LK_FLAG_PREFER_UNICODE; } +#line 1492 "parser.c" /* yacc.c:1647 */ break; case 14: -/* Line 1787 of yacc.c */ -#line 211 "parser.y" +#line 212 "parser.y" /* yacc.c:1647 */ { ctx->keywords |= LK_KEYWORD_ALTISMETA; } +#line 1500 "parser.c" /* yacc.c:1647 */ break; case 15: -/* Line 1787 of yacc.c */ -#line 216 "parser.y" +#line 217 "parser.y" /* yacc.c:1647 */ { if (strings_as_usual(ctx) == -1) YYERROR; ctx->keywords |= LK_KEYWORD_STRASUSUAL; } +#line 1510 "parser.c" /* yacc.c:1647 */ break; case 16: -/* Line 1787 of yacc.c */ -#line 223 "parser.y" +#line 224 "parser.y" /* yacc.c:1647 */ { - if (compose_as_usual(ctx, (char *) (yyvsp[(5) - (6)].str).data) == -1) + if (compose_as_usual(ctx, (char *) (yyvsp[-1].str).data) == -1) YYERROR; } +#line 1519 "parser.c" /* yacc.c:1647 */ break; case 17: -/* Line 1787 of yacc.c */ -#line 228 "parser.y" +#line 229 "parser.y" /* yacc.c:1647 */ { if (compose_as_usual(ctx, 0) == -1) YYERROR; } +#line 1528 "parser.c" /* yacc.c:1647 */ break; case 18: -/* Line 1787 of yacc.c */ -#line 234 "parser.y" +#line 235 "parser.y" /* yacc.c:1647 */ { ctx->keywords |= LK_KEYWORD_KEYMAPS; } +#line 1536 "parser.c" /* yacc.c:1647 */ break; case 21: -/* Line 1787 of yacc.c */ -#line 242 "parser.y" +#line 243 "parser.y" /* yacc.c:1647 */ { int i; - for (i = (yyvsp[(1) - (3)].num); i <= (yyvsp[(3) - (3)].num); i++) { + for (i = (yyvsp[-2].num); i <= (yyvsp[0].num); i++) { if (lk_add_map(ctx, i) == -1) YYERROR; } } +#line 1548 "parser.c" /* yacc.c:1647 */ break; case 22: -/* Line 1787 of yacc.c */ -#line 250 "parser.y" +#line 251 "parser.y" /* yacc.c:1647 */ { - if (lk_add_map(ctx, (yyvsp[(1) - (1)].num)) == -1) + if (lk_add_map(ctx, (yyvsp[0].num)) == -1) YYERROR; } +#line 1557 "parser.c" /* yacc.c:1647 */ break; case 23: -/* Line 1787 of yacc.c */ -#line 256 "parser.y" +#line 257 "parser.y" /* yacc.c:1647 */ { struct kbsentry ke; - if (KTYP((yyvsp[(2) - (5)].num)) != KT_FN) { + if (KTYP((yyvsp[-3].num)) != KT_FN) { ERR(ctx, _("'%s' is not a function key symbol"), - get_sym(ctx, KTYP((yyvsp[(2) - (5)].num)), KVAL((yyvsp[(2) - (5)].num)))); + get_sym(ctx, KTYP((yyvsp[-3].num)), KVAL((yyvsp[-3].num)))); YYERROR; } - ke.kb_func = KVAL((yyvsp[(2) - (5)].num)); + ke.kb_func = KVAL((yyvsp[-3].num)); strncpy((char *) ke.kb_string, - (char *) (yyvsp[(4) - (5)].str).data, + (char *) (yyvsp[-1].str).data, sizeof(ke.kb_string)); ke.kb_string[sizeof(ke.kb_string) - 1] = 0; if (lk_add_func(ctx, &ke) == -1) YYERROR; } +#line 1580 "parser.c" /* yacc.c:1647 */ break; case 24: -/* Line 1787 of yacc.c */ -#line 276 "parser.y" +#line 277 "parser.y" /* yacc.c:1647 */ { struct lk_kbdiacr ptr; - ptr.diacr = (yyvsp[(2) - (6)].num); - ptr.base = (yyvsp[(3) - (6)].num); - ptr.result = (yyvsp[(5) - (6)].num); + ptr.diacr = (yyvsp[-4].num); + ptr.base = (yyvsp[-3].num); + ptr.result = (yyvsp[-1].num); if (lk_append_compose(ctx, &ptr) == -1) YYERROR; } +#line 1594 "parser.c" /* yacc.c:1647 */ break; case 25: -/* Line 1787 of yacc.c */ -#line 286 "parser.y" +#line 287 "parser.y" /* yacc.c:1647 */ { struct lk_kbdiacr ptr; - ptr.diacr = (yyvsp[(2) - (6)].num); - ptr.base = (yyvsp[(3) - (6)].num); - ptr.result = (yyvsp[(5) - (6)].num); + ptr.diacr = (yyvsp[-4].num); + ptr.base = (yyvsp[-3].num); + ptr.result = (yyvsp[-1].num); if (lk_append_compose(ctx, &ptr) == -1) YYERROR; } +#line 1608 "parser.c" /* yacc.c:1647 */ break; case 26: -/* Line 1787 of yacc.c */ -#line 296 "parser.y" - { (yyval.num) = (yyvsp[(1) - (1)].num); } +#line 297 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = (yyvsp[0].num); } +#line 1614 "parser.c" /* yacc.c:1647 */ break; case 27: -/* Line 1787 of yacc.c */ -#line 297 "parser.y" - { (yyval.num) = (yyvsp[(1) - (1)].num) ^ 0xf000; } +#line 298 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = (yyvsp[0].num) ^ 0xf000; } +#line 1620 "parser.c" /* yacc.c:1647 */ break; case 28: -/* Line 1787 of yacc.c */ -#line 300 "parser.y" +#line 301 "parser.y" /* yacc.c:1647 */ { unsigned int j, i, keycode; int *val; @@ -1803,7 +1630,7 @@ /* Some files do not have a keymaps line, and * we have to wait until all input has been read * before we know which maps to fill. */ - lk_array_set(ctx->key_constant, (yyvsp[(2) - (5)].num), &one); + lk_array_set(ctx->key_constant, (yyvsp[-3].num), &one); /* On the other hand, we now have include files, * and it should be possible to override lines @@ -1812,7 +1639,7 @@ if (!lk_map_exists(ctx, j)) continue; - if (lk_del_key(ctx, j, (yyvsp[(2) - (5)].num)) < 0) + if (lk_del_key(ctx, j, (yyvsp[-3].num)) < 0) YYERROR; } } @@ -1832,7 +1659,7 @@ keycode = *val; } - if (lk_add_key(ctx, j, (yyvsp[(2) - (5)].num), keycode) < 0) + if (lk_add_key(ctx, j, (yyvsp[-3].num), keycode) < 0) YYERROR; } i++; @@ -1847,135 +1674,135 @@ for (i = 0; i < ctx->key_line->count; i++) { val = lk_array_get(ctx->key_line, i); - if (lk_add_key(ctx, i, (yyvsp[(2) - (5)].num), *val) < 0) + if (lk_add_key(ctx, i, (yyvsp[-3].num), *val) < 0) YYERROR; } } } +#line 1683 "parser.c" /* yacc.c:1647 */ break; case 29: -/* Line 1787 of yacc.c */ -#line 360 "parser.y" +#line 361 "parser.y" /* yacc.c:1647 */ { - if (lk_add_key(ctx, ctx->mod, (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].num)) < 0) + if (lk_add_key(ctx, ctx->mod, (yyvsp[-3].num), (yyvsp[-1].num)) < 0) YYERROR; ctx->mod = 0; } +#line 1693 "parser.c" /* yacc.c:1647 */ break; case 30: -/* Line 1787 of yacc.c */ -#line 366 "parser.y" +#line 367 "parser.y" /* yacc.c:1647 */ { - if (lk_add_key(ctx, 0, (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].num)) < 0) + if (lk_add_key(ctx, 0, (yyvsp[-3].num), (yyvsp[-1].num)) < 0) YYERROR; ctx->mod = 0; } +#line 1703 "parser.c" /* yacc.c:1647 */ break; case 33: -/* Line 1787 of yacc.c */ -#line 375 "parser.y" +#line 376 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_SHIFT; } +#line 1709 "parser.c" /* yacc.c:1647 */ break; case 34: -/* Line 1787 of yacc.c */ -#line 376 "parser.y" +#line 377 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_CTRL; } +#line 1715 "parser.c" /* yacc.c:1647 */ break; case 35: -/* Line 1787 of yacc.c */ -#line 377 "parser.y" +#line 378 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_ALT; } +#line 1721 "parser.c" /* yacc.c:1647 */ break; case 36: -/* Line 1787 of yacc.c */ -#line 378 "parser.y" +#line 379 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_ALTGR; } +#line 1727 "parser.c" /* yacc.c:1647 */ break; case 37: -/* Line 1787 of yacc.c */ -#line 379 "parser.y" +#line 380 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_SHIFTL; } +#line 1733 "parser.c" /* yacc.c:1647 */ break; case 38: -/* Line 1787 of yacc.c */ -#line 380 "parser.y" +#line 381 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_SHIFTR; } +#line 1739 "parser.c" /* yacc.c:1647 */ break; case 39: -/* Line 1787 of yacc.c */ -#line 381 "parser.y" +#line 382 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_CTRLL; } +#line 1745 "parser.c" /* yacc.c:1647 */ break; case 40: -/* Line 1787 of yacc.c */ -#line 382 "parser.y" +#line 383 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_CTRLR; } +#line 1751 "parser.c" /* yacc.c:1647 */ break; case 41: -/* Line 1787 of yacc.c */ -#line 383 "parser.y" +#line 384 "parser.y" /* yacc.c:1647 */ { ctx->mod |= M_CAPSSHIFT; } +#line 1757 "parser.c" /* yacc.c:1647 */ break; case 44: -/* Line 1787 of yacc.c */ -#line 391 "parser.y" +#line 392 "parser.y" /* yacc.c:1647 */ { - int val = (yyvsp[(1) - (1)].num); + int val = (yyvsp[0].num); lk_array_append(ctx->key_line, &val); } +#line 1766 "parser.c" /* yacc.c:1647 */ break; case 45: -/* Line 1787 of yacc.c */ -#line 396 "parser.y" - { (yyval.num) = convert_code(ctx, (yyvsp[(1) - (1)].num), TO_AUTO); } +#line 397 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = convert_code(ctx, (yyvsp[0].num), TO_AUTO); } +#line 1772 "parser.c" /* yacc.c:1647 */ break; case 46: -/* Line 1787 of yacc.c */ -#line 397 "parser.y" - { (yyval.num) = add_capslock(ctx, (yyvsp[(2) - (2)].num)); } +#line 398 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = add_capslock(ctx, (yyvsp[0].num)); } +#line 1778 "parser.c" /* yacc.c:1647 */ break; case 47: -/* Line 1787 of yacc.c */ -#line 398 "parser.y" - { (yyval.num) = convert_code(ctx, (yyvsp[(1) - (1)].num)^0xf000, TO_AUTO); } +#line 399 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = convert_code(ctx, (yyvsp[0].num)^0xf000, TO_AUTO); } +#line 1784 "parser.c" /* yacc.c:1647 */ break; case 48: -/* Line 1787 of yacc.c */ -#line 399 "parser.y" - { (yyval.num) = add_capslock(ctx, (yyvsp[(2) - (2)].num)^0xf000); } +#line 400 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = add_capslock(ctx, (yyvsp[0].num)^0xf000); } +#line 1790 "parser.c" /* yacc.c:1647 */ break; case 49: -/* Line 1787 of yacc.c */ -#line 400 "parser.y" - { (yyval.num) = (yyvsp[(1) - (1)].num); } +#line 401 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = (yyvsp[0].num); } +#line 1796 "parser.c" /* yacc.c:1647 */ break; case 50: -/* Line 1787 of yacc.c */ -#line 401 "parser.y" - { (yyval.num) = add_capslock(ctx, (yyvsp[(2) - (2)].num)); } +#line 402 "parser.y" /* yacc.c:1647 */ + { (yyval.num) = add_capslock(ctx, (yyvsp[0].num)); } +#line 1802 "parser.c" /* yacc.c:1647 */ break; -/* Line 1787 of yacc.c */ -#line 1979 "parser.c" +#line 1806 "parser.c" /* yacc.c:1647 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1997,7 +1824,7 @@ *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -2012,9 +1839,9 @@ goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -2065,20 +1892,20 @@ if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval, scanner, ctx); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval, scanner, ctx); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -2097,7 +1924,7 @@ if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -2110,29 +1937,29 @@ | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp, scanner, ctx); + yystos[yystate], yyvsp, scanner, ctx); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -2183,14 +2010,14 @@ yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, scanner, ctx); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, scanner, ctx); + yystos[*yyssp], yyvsp, scanner, ctx); YYPOPSTACK (1); } #ifndef yyoverflow @@ -2201,13 +2028,9 @@ if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - -/* Line 2050 of yacc.c */ -#line 403 "parser.y" +#line 404 "parser.y" /* yacc.c:1906 */ int diff -Nru kbd-2.0.3/src/libkeymap/parser.h kbd-2.0.4/src/libkeymap/parser.h --- kbd-2.0.3/src/libkeymap/parser.h 2015-05-31 19:20:04.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/parser.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7.1. */ +/* A Bison parser, made by GNU Bison 3.0.4.0.14.8bf2. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 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 the Free Software Foundation, either version 3 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, see . */ @@ -26,13 +26,13 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ #ifndef YY_YY_PARSER_H_INCLUDED # define YY_YY_PARSER_H_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -40,8 +40,7 @@ extern int yydebug; #endif /* "%code requires" blocks. */ -/* Line 2053 of yacc.c */ -#line 26 "parser.y" +#line 27 "parser.y" /* yacc.c:1909 */ #include "keymap.h" @@ -54,50 +53,47 @@ }; #endif +#line 57 "parser.h" /* yacc.c:1909 */ -/* Line 2053 of yacc.c */ -#line 60 "parser.h" - -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - EOL = 258, - NUMBER = 259, - LITERAL = 260, - CHARSET = 261, - KEYMAPS = 262, - KEYCODE = 263, - EQUALS = 264, - PLAIN = 265, - SHIFT = 266, - CONTROL = 267, - ALT = 268, - ALTGR = 269, - SHIFTL = 270, - SHIFTR = 271, - CTRLL = 272, - CTRLR = 273, - CAPSSHIFT = 274, - COMMA = 275, - DASH = 276, - STRING = 277, - STRLITERAL = 278, - COMPOSE = 279, - TO = 280, - CCHAR = 281, - ERROR = 282, - PLUS = 283, - UNUMBER = 284, - ALT_IS_META = 285, - STRINGS = 286, - AS = 287, - USUAL = 288, - ON = 289, - FOR = 290 - }; + enum yytokentype + { + EOL = 258, + NUMBER = 259, + LITERAL = 260, + CHARSET = 261, + KEYMAPS = 262, + KEYCODE = 263, + EQUALS = 264, + PLAIN = 265, + SHIFT = 266, + CONTROL = 267, + ALT = 268, + ALTGR = 269, + SHIFTL = 270, + SHIFTR = 271, + CTRLL = 272, + CTRLR = 273, + CAPSSHIFT = 274, + COMMA = 275, + DASH = 276, + STRING = 277, + STRLITERAL = 278, + COMPOSE = 279, + TO = 280, + CCHAR = 281, + ERROR = 282, + PLUS = 283, + UNUMBER = 284, + ALT_IS_META = 285, + STRINGS = 286, + AS = 287, + USUAL = 288, + ON = 289, + FOR = 290 + }; #endif /* Tokens. */ #define EOL 258 @@ -134,39 +130,26 @@ #define ON 289 #define FOR 290 - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +union YYSTYPE { -/* Line 2053 of yacc.c */ -#line 58 "parser.y" +#line 59 "parser.y" /* yacc.c:1909 */ long long int num; struct strdata str; +#line 144 "parser.h" /* yacc.c:1909 */ +}; -/* Line 2053 of yacc.c */ -#line 151 "parser.h" -} YYSTYPE; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -#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 *scanner, struct lk_ctx *ctx); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_PARSER_H_INCLUDED */ diff -Nru kbd-2.0.3/src/libkeymap/parser.y kbd-2.0.4/src/libkeymap/parser.y --- kbd-2.0.3/src/libkeymap/parser.y 2014-06-26 13:11:50.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/parser.y 2016-12-15 14:55:45.000000000 +0000 @@ -12,6 +12,7 @@ %{ #define YY_HEADER_EXPORT_START_CONDITIONS 1 +#include "config.h" #include "nls.h" #include "kbd.h" @@ -272,7 +273,7 @@ YYERROR; } ; -compline : COMPOSE compsym compsym TO compsym EOL +compline : COMPOSE compsym compsym TO CCHAR EOL { struct lk_kbdiacr ptr; ptr.diacr = $2; diff -Nru kbd-2.0.3/src/libkeymap/summary.c kbd-2.0.4/src/libkeymap/summary.c --- kbd-2.0.3/src/libkeymap/summary.c 2015-05-11 21:55:13.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/summary.c 2016-12-19 15:01:51.000000000 +0000 @@ -6,6 +6,7 @@ * This file is covered by the GNU General Public License, * which should be included with kbd as the file COPYING. */ +#include "config.h" #include #include #include @@ -17,7 +18,6 @@ #include "ksyms.h" #include "modifiers.h" - static char valid_type(int fd, int t) { @@ -27,7 +27,7 @@ ke.kb_table = 0; ke.kb_value = K(t, 0); - return (ioctl(fd, KDSKBENT, (unsigned long) &ke) == 0); + return (ioctl(fd, KDSKBENT, (unsigned long)&ke) == 0); } static unsigned char @@ -39,23 +39,22 @@ ke.kb_index = 0; ke.kb_table = 0; ke.kb_value = K_HOLE; - ke0 = ke; + ke0 = ke; - ioctl(fd, KDGKBENT, (unsigned long) &ke0); + ioctl(fd, KDGKBENT, (unsigned long)&ke0); for (i = 0; i < 256; i++) { ke.kb_value = K(t, i); - if (ioctl(fd, KDSKBENT, (unsigned long) &ke)) + if (ioctl(fd, KDSKBENT, (unsigned long)&ke)) break; } ke.kb_value = K_HOLE; - ioctl(fd, KDSKBENT, (unsigned long) &ke0); + ioctl(fd, KDSKBENT, (unsigned long)&ke0); return i - 1; } -int -lk_get_kmapinfo(struct lk_ctx *ctx, struct kmapinfo *res) +int lk_get_kmapinfo(struct lk_ctx *ctx, struct kmapinfo *res) { int i; @@ -85,8 +84,7 @@ #define NR_TYPES 15 -void -lk_dump_summary(struct lk_ctx *ctx, FILE *fd, int console) +void lk_dump_summary(struct lk_ctx *ctx, FILE *fd, int console) { int i; struct kmapinfo info; @@ -95,60 +93,59 @@ return; fprintf(fd, _("keycode range supported by kernel: 1 - %d\n"), - NR_KEYS - 1); + NR_KEYS - 1); fprintf(fd, _("max number of actions bindable to a key: %d\n"), - MAX_NR_KEYMAPS); + MAX_NR_KEYMAPS); fprintf(fd, _("number of keymaps in actual use: %u\n"), - (unsigned int) info.keymaps); + (unsigned int)info.keymaps); fprintf(fd, _("of which %u dynamically allocated\n"), - (unsigned int) info.keymaps_alloced); + (unsigned int)info.keymaps_alloced); fprintf(fd, _("ranges of action codes supported by kernel:\n")); for (i = 0; i < NR_TYPES && valid_type(console, i); i++) fprintf(fd, " 0x%04x - 0x%04x\n", - K(i, 0), K(i, maximum_val(console, i))); + K(i, 0), K(i, maximum_val(console, i))); fprintf(fd, _("number of function keys supported by kernel: %d\n"), - MAX_NR_FUNC); + MAX_NR_FUNC); fprintf(fd, _("max nr of compose definitions: %d\n"), - MAX_DIACR); + MAX_DIACR); fprintf(fd, _("nr of compose definitions in actual use: %u\n"), - (unsigned int) info.composes); + (unsigned int)info.composes); } -void -lk_dump_symbols(struct lk_ctx *ctx, FILE *fd) +void lk_dump_symbols(struct lk_ctx *ctx, FILE *fd) { unsigned int t, v; modifier_t *mod; const char *p; for (t = 0; t < syms_size; t++) { - if (get_sym_size(ctx, t)) { - for (v = 0; v < get_sym_size(ctx, t); v++) { - if ((p = get_sym(ctx, t, v))[0]) - fprintf(fd, "0x%04x\t%s\n", K(t, v), p); - } - } else if (t == KT_META) { - for (v = 0; v < get_sym_size(ctx, KT_LATIN) && v < 128; v++) { - if ((p = get_sym(ctx, KT_LATIN, v))[0]) - fprintf(fd, "0x%04x\tMeta_%s\n", K(t, v), p); + if (get_sym_size(ctx, t)) { + for (v = 0; v < get_sym_size(ctx, t); v++) { + if ((p = get_sym(ctx, t, v))[0]) + fprintf(fd, "0x%04x\t%s\n", K(t, v), p); + } + } else if (t == KT_META) { + for (v = 0; v < get_sym_size(ctx, KT_LATIN) && v < 128; v++) { + if ((p = get_sym(ctx, KT_LATIN, v))[0]) + fprintf(fd, "0x%04x\tMeta_%s\n", K(t, v), p); + } } - } } fprintf(fd, _("\nThe following synonyms are recognized:\n\n")); for (t = 0; t < syn_size; t++) { fprintf(fd, _("%-15s for %s\n"), - synonyms[t].synonym, synonyms[t].official_name); + synonyms[t].synonym, synonyms[t].official_name); } fprintf(fd, _("\nRecognized modifier names and their column numbers:\n")); - mod = (modifier_t *) modifiers; + mod = (modifier_t *)modifiers; while (mod->name) { fprintf(fd, "%s\t\t%3d\n", mod->name, 1 << mod->bit); mod++; diff -Nru kbd-2.0.3/src/libkeymap/syms.cp1250.h kbd-2.0.4/src/libkeymap/syms.cp1250.h --- kbd-2.0.3/src/libkeymap/syms.cp1250.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.cp1250.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,138 +1,131 @@ -/* - * cp1250 symbols, aeb, 2000-12-29 - * first half as usual; last quarter identical to latin-2 (iso 8859-2) - * - * No names have been introduced yet for the various quotation marks - */ static sym -const cp1250_syms[] = { /* 128-255 */ - { 0x20ac, "euro"}, /* 0200 */ - { 0xfffd, ""}, /* undefined */ - { 0x201a, ""}, /* SINGLE LOW-9 QUOTATION MARK */ - { 0xfffd, ""}, /* undefined */ - { 0x201e, ""}, /* DOUBLE LOW-9 QUOTATION MARK */ - { 0x2026, "ellipsis"}, - { 0x2020, "dagger"}, - { 0x2021, "doubledagger"}, - { 0xfffd, ""}, /* undefined */ /* 0210 */ - { 0x2030, "permille"}, - { 0x0160, "Scaron"}, - { 0x2039, ""}, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ - { 0x015a, "Sacute"}, - { 0x0164, "Tcaron"}, - { 0x017d, "Zcaron"}, - { 0x0179, "Zacute"}, - { 0xfffd, ""}, /* undefined */ /* 0220 */ - { 0x2018, ""}, /* LEFT SINGLE QUOTATION MARK */ - { 0x2019, ""}, /* RIGHT SINGLE QUOTATION MARK */ - { 0x201c, ""}, /* LEFT DOUBLE QUOTATION MARK */ - { 0x201d, ""}, /* RIGHT DOUBLE QUOTATION MARK */ - { 0x2022, "bullet"}, - { 0x2013, "endash"}, - { 0x2014, "emdash"}, - { 0xfffd, ""}, /* undefined */ /* 0230 */ - { 0x2122, "trademark"}, - { 0x0161, "scaron"}, - { 0x203a, ""}, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ - { 0x015b, "sacute"}, - { 0x0165, "tcaron"}, - { 0x017e, "zcaron"}, - { 0x017a, "zacute"}, - { 0x00a0, ""}, /* nbsp */ /* 0240 */ - { 0x02c7, "caron"}, - { 0x02d8, "breve"}, - { 0x0141, "Lstroke"}, - { 0x00a4, ""}, /* CURRENCY SIGN */ - { 0x0104, "Aogonek"}, - { 0x00a6, ""}, /* BROKEN BAR */ - { 0x00a7, ""}, /* SECTION SIGN */ - { 0x00a8, ""}, /* DIAERESIS */ /* 0250 */ - { 0x00a9, ""}, /* COPYRIGHT SIGN */ - { 0x015e, "Scedilla"}, - { 0x00ab, ""}, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ - { 0x00ac, ""}, /* NOT SIGN */ - { 0x00ad, ""}, /* SOFT HYPHEN */ - { 0x00ae, ""}, /* REGISTERED SIGN */ - { 0x017b, "Zabovedot"}, - { 0x00b0, ""}, /* DEGREE SIGN */ /* 0260 */ - { 0x00b1, ""}, /* PLUS-MINUS SIGN */ - { 0x02db, "ogonek"}, - { 0x0142, "lstroke"}, - { 0x00b4, ""}, /* ACUTE ACCENT */ - { 0x00b5, ""}, /* MICRO SIGN */ - { 0x00b6, ""}, /* PILCROW SIGN */ - { 0x00b7, ""}, /* MIDDLE DOT */ - { 0x00b8, ""}, /* CEDILLA */ /* 0270 */ - { 0x0105, "aogonek"}, - { 0x015f, "scedilla"}, - { 0x00bb, ""}, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ - { 0x013d, "Lcaron"}, - { 0x02dd, "doubleacute"}, - { 0x013e, "lcaron"}, -/* from here identical to latin-2 */ - { 0x017c, "zabovedot"}, - { 0x0154, "Racute"}, /* 0300 */ - { 0x00c1, "Aacute"}, - { 0x00c2, "Acircumflex"}, - { 0x0102, "Abreve"}, - { 0x00c4, "Adiaeresis"}, - { 0x0139, "Lacute"}, - { 0x0106, "Cacute"}, - { 0x00c7, "Ccedilla"}, - { 0x010c, "Ccaron"}, /* 0310 */ - { 0x00c9, "Eacute"}, - { 0x0118, "Eogonek"}, - { 0x00cb, "Ediaeresis"}, - { 0x011a, "Ecaron"}, - { 0x00cd, "Iacute"}, - { 0x00ce, "Icircumflex"}, - { 0x010e, "Dcaron"}, - { 0x0110, "Dstroke"}, /* 0320 */ - { 0x0143, "Nacute"}, - { 0x0147, "Ncaron"}, - { 0x00d3, "Oacute"}, - { 0x00d4, "Ocircumflex"}, - { 0x0150, "Odoubleacute"}, - { 0x00d6, "Odiaeresis"}, - { 0x00d7, "multiply"}, - { 0x0158, "Rcaron"}, /* 0330 */ - { 0x016e, "Uring"}, - { 0x00da, "Uacute"}, - { 0x0170, "Udoubleacute"}, - { 0x00dc, "Udiaeresis"}, - { 0x00dd, "Yacute"}, - { 0x0162, "Tcedilla"}, - { 0x00df, "ssharp"}, - { 0x0155, "racute"}, /* 0340 */ - { 0x00e1, "aacute"}, - { 0x00e2, "acircumflex"}, - { 0x0103, "abreve"}, - { 0x00e4, "adiaeresis"}, - { 0x013a, "lacute"}, - { 0x0107, "cacute"}, - { 0x00e7, "ccedilla"}, - { 0x010d, "ccaron"}, /* 0350 */ - { 0x00e9, "eacute"}, - { 0x0119, "eogonek"}, - { 0x00eb, "ediaeresis"}, - { 0x011b, "ecaron"}, - { 0x00ed, "iacute"}, - { 0x00ee, "icircumflex"}, - { 0x010f, "dcaron"}, - { 0x0111, "dstroke"}, /* 0360 */ - { 0x0144, "nacute"}, - { 0x0148, "ncaron"}, - { 0x00f3, "oacute"}, - { 0x00f4, "ocircumflex"}, - { 0x0151, "odoubleacute"}, - { 0x00f6, "odiaeresis"}, - { 0x00f7, "division"}, - { 0x0159, "rcaron"}, /* 0370 */ - { 0x016f, "uring"}, - { 0x00fa, "uacute"}, - { 0x0171, "udoubleacute"}, - { 0x00fc, "udiaeresis"}, - { 0x00fd, "yacute"}, - { 0x0163, "tcedilla"}, - { 0x02d9, "abovedot"}, +const cp1250_syms[] = { + { 0x20ac, "euro" }, + { 0xfffd, "" }, + { 0x201a, "single_low_9_quotation_mark" }, + { 0xfffd, "" }, + { 0x201e, "double_low_9_quotation_mark" }, + { 0x2026, "ellipsis" }, + { 0x2020, "dagger" }, + { 0x2021, "doubledagger" }, + { 0xfffd, "" }, + { 0x2030, "permille" }, + { 0x0160, "Scaron" }, + { 0x2039, "single_left_pointing_angle_quotation_mark" }, + { 0x015a, "Sacute" }, + { 0x0164, "Tcaron" }, + { 0x017d, "Zcaron" }, + { 0x0179, "Zacute" }, + { 0xfffd, "" }, + { 0x2018, "leftquote" }, + { 0x2019, "rightquote" }, + { 0x201c, "left_double_quotation_mark" }, + { 0x201d, "right_double_quotation_mark" }, + { 0x2022, "bullet" }, + { 0x2013, "endash" }, + { 0x2014, "emdash" }, + { 0xfffd, "" }, + { 0x2122, "trademark" }, + { 0x0161, "scaron" }, + { 0x203a, "single_right_pointing_angle_quotation_mark" }, + { 0x015b, "sacute" }, + { 0x0165, "tcaron" }, + { 0x017e, "zcaron" }, + { 0x017a, "zacute" }, + { 0x00a0, "nobreakspace" }, + { 0x02c7, "caron" }, + { 0x02d8, "breve" }, + { 0x0141, "Lstroke" }, + { 0x00a4, "currency" }, + { 0x0104, "Aogonek" }, + { 0x00a6, "brokenbar" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, + { 0x00a9, "copyright" }, + { 0x015e, "Scedilla" }, + { 0x00ab, "guillemotleft" }, + { 0x00ac, "notsign" }, + { 0x00ad, "hyphen" }, + { 0x00ae, "registered" }, + { 0x017b, "Zabovedot" }, + { 0x00b0, "degree" }, + { 0x00b1, "plusminus" }, + { 0x02db, "ogonek" }, + { 0x0142, "lstroke" }, + { 0x00b4, "acute" }, + { 0x00b5, "mu" }, + { 0x00b6, "paragraph" }, + { 0x00b7, "periodcentered" }, + { 0x00b8, "cedilla" }, + { 0x0105, "aogonek" }, + { 0x015f, "scedilla" }, + { 0x00bb, "guillemotright" }, + { 0x013d, "Lcaron" }, + { 0x02dd, "doubleacute" }, + { 0x013e, "lcaron" }, + { 0x017c, "zabovedot" }, + { 0x0154, "Racute" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, + { 0x0102, "Abreve" }, + { 0x00c4, "Adiaeresis" }, + { 0x0139, "Lacute" }, + { 0x0106, "Cacute" }, + { 0x00c7, "Ccedilla" }, + { 0x010c, "Ccaron" }, + { 0x00c9, "Eacute" }, + { 0x0118, "Eogonek" }, + { 0x00cb, "Ediaeresis" }, + { 0x011a, "Ecaron" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, + { 0x010e, "Dcaron" }, + { 0x0110, "Dstroke" }, + { 0x0143, "Nacute" }, + { 0x0147, "Ncaron" }, + { 0x00d3, "Oacute" }, + { 0x00d4, "Ocircumflex" }, + { 0x0150, "Odoubleacute" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, + { 0x0158, "Rcaron" }, + { 0x016e, "Uring" }, + { 0x00da, "Uacute" }, + { 0x0170, "Udoubleacute" }, + { 0x00dc, "Udiaeresis" }, + { 0x00dd, "Yacute" }, + { 0x0162, "Tcedilla" }, + { 0x00df, "ssharp" }, + { 0x0155, "racute" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, + { 0x0103, "abreve" }, + { 0x00e4, "adiaeresis" }, + { 0x013a, "lacute" }, + { 0x0107, "cacute" }, + { 0x00e7, "ccedilla" }, + { 0x010d, "ccaron" }, + { 0x00e9, "eacute" }, + { 0x0119, "eogonek" }, + { 0x00eb, "ediaeresis" }, + { 0x011b, "ecaron" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, + { 0x010f, "dcaron" }, + { 0x0111, "dstroke" }, + { 0x0144, "nacute" }, + { 0x0148, "ncaron" }, + { 0x00f3, "oacute" }, + { 0x00f4, "ocircumflex" }, + { 0x0151, "odoubleacute" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, + { 0x0159, "rcaron" }, + { 0x016f, "uring" }, + { 0x00fa, "uacute" }, + { 0x0171, "udoubleacute" }, + { 0x00fc, "udiaeresis" }, + { 0x00fd, "yacute" }, + { 0x0163, "tcedilla" }, + { 0x02d9, "abovedot" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.ethiopic.h kbd-2.0.4/src/libkeymap/syms.ethiopic.h --- kbd-2.0.3/src/libkeymap/syms.ethiopic.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.ethiopic.h 2016-12-19 15:10:42.000000000 +0000 @@ -6,8 +6,8 @@ * * { "iso-10646-18", iso_10646_18_syms, 159 }, */ -static sym -const iso_10646_18_syms[] = { /* 0x1200 - 0x137F */ +static sym const iso10646_18_syms[] = { + /* 0x1200 - 0x137F */ { 0x1200, "ethiopic_syllable_ha" }, { 0x1201, "ethiopic_syllable_hu" }, { 0x1202, "ethiopic_syllable_hi" }, @@ -15,7 +15,7 @@ { 0x1204, "ethiopic_syllable_hee" }, { 0x1205, "ethiopic_syllable_he" }, { 0x1206, "ethiopic_syllable_ho" }, - { 0x1207, "" }, + { 0x1207, "ethiopic_syllable_hoa" }, { 0x1208, "ethiopic_syllable_la" }, { 0x1209, "ethiopic_syllable_lu" }, { 0x120A, "ethiopic_syllable_li" }, @@ -79,7 +79,7 @@ { 0x1244, "ethiopic_syllable_qee" }, { 0x1245, "ethiopic_syllable_qe" }, { 0x1246, "ethiopic_syllable_qo" }, - { 0x1247, "" }, + { 0x1247, "ethiopic_syllable_qoa" }, { 0x1248, "ethiopic_syllable_qwa" }, { 0x1249, "" }, { 0x124A, "ethiopic_syllable_qwi" }, @@ -143,7 +143,7 @@ { 0x1284, "ethiopic_syllable_xee" }, { 0x1285, "ethiopic_syllable_xe" }, { 0x1286, "ethiopic_syllable_xo" }, - { 0x1287, "" }, + { 0x1287, "ethiopic_syllable_xoa" }, { 0x1288, "ethiopic_syllable_xwa" }, { 0x1289, "" }, { 0x128A, "ethiopic_syllable_xwi" }, @@ -183,7 +183,7 @@ { 0x12AC, "ethiopic_syllable_kee" }, { 0x12AD, "ethiopic_syllable_ke" }, { 0x12AE, "ethiopic_syllable_ko" }, - { 0x12AF, "" }, + { 0x12AF, "ethiopic_syllable_koa" }, { 0x12B0, "ethiopic_syllable_kwa" }, { 0x12B1, "" }, { 0x12B2, "ethiopic_syllable_kwi" }, @@ -215,7 +215,7 @@ { 0x12CC, "ethiopic_syllable_wee" }, { 0x12CD, "ethiopic_syllable_we" }, { 0x12CE, "ethiopic_syllable_wo" }, - { 0x12CF, "" }, + { 0x12CF, "ethiopic_syllable_woa" }, { 0x12D0, "ethiopic_syllable_pharyngeal_a" }, { 0x12D1, "ethiopic_syllable_pharyngeal_u" }, { 0x12D2, "ethiopic_syllable_pharyngeal_i" }, @@ -247,7 +247,7 @@ { 0x12EC, "ethiopic_syllable_yee" }, { 0x12ED, "ethiopic_syllable_ye" }, { 0x12EE, "ethiopic_syllable_yo" }, - { 0x12EF, "" }, + { 0x12EF, "ethiopic_syllable_yoa" }, { 0x12F0, "ethiopic_syllable_da" }, { 0x12F1, "ethiopic_syllable_du" }, { 0x12F2, "ethiopic_syllable_di" }, @@ -279,7 +279,7 @@ { 0x130C, "ethiopic_syllable_gee" }, { 0x130D, "ethiopic_syllable_ge" }, { 0x130E, "ethiopic_syllable_go" }, - { 0x130F, "" }, + { 0x130F, "ethiopic_syllable_goa" }, { 0x1310, "ethiopic_syllable_gwa" }, { 0x1311, "" }, { 0x1312, "ethiopic_syllable_gwi" }, @@ -295,7 +295,7 @@ { 0x131C, "ethiopic_syllable_ggee" }, { 0x131D, "ethiopic_syllable_gge" }, { 0x131E, "ethiopic_syllable_ggo" }, - { 0x131F, "" }, + { 0x131F, "ethiopic_syllable_ggwaa" }, { 0x1320, "ethiopic_syllable_tha" }, { 0x1321, "ethiopic_syllable_thu" }, { 0x1322, "ethiopic_syllable_thi" }, @@ -335,7 +335,7 @@ { 0x1344, "ethiopic_syllable_tzee" }, { 0x1345, "ethiopic_syllable_tze" }, { 0x1346, "ethiopic_syllable_tzo" }, - { 0x1347, "" }, + { 0x1347, "ethiopic_syllable_tzoa" }, { 0x1348, "ethiopic_syllable_fa" }, { 0x1349, "ethiopic_syllable_fu" }, { 0x134A, "ethiopic_syllable_fi" }, @@ -357,10 +357,10 @@ { 0x135A, "ethiopic_syllable_fya" }, { 0x135B, "" }, { 0x135C, "" }, - { 0x135D, "" }, - { 0x135E, "" }, - { 0x135F, "" }, - { 0x1360, "" }, + { 0x135D, "" }, // TODO(dmage): ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK + { 0x135E, "" }, // TODO(dmage): ETHIOPIC COMBINING VOWEL LENGTH MARK + { 0x135F, "" }, // TODO(dmage): ETHIOPIC COMBINING GEMINATION MARK + { 0x1360, "" }, // TODO(dmage): ETHIOPIC SECTION MARK { 0x1361, "ethiopic_wordspace" }, { 0x1362, "ethiopic_full_stop" }, { 0x1363, "ethiopic_comma" }, diff -Nru kbd-2.0.3/src/libkeymap/syms.iso8859_15.h kbd-2.0.4/src/libkeymap/syms.iso8859_15.h --- kbd-2.0.3/src/libkeymap/syms.iso8859_15.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.iso8859_15.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,100 +1,99 @@ static sym -const iso_8859_15_syms[] = { - /* latin-1 with 8 changes */ - { 0x00a0, "" }, - { 0x00a1, "" }, - { 0x00a2, "" }, - { 0x00a3, "" }, +const iso8859_15_syms[] = { + { 0x00a0, "nobreakspace" }, + { 0x00a1, "exclamdown" }, + { 0x00a2, "cent" }, + { 0x00a3, "sterling" }, { 0x20ac, "euro" }, - { 0x00a5, "" }, + { 0x00a5, "yen" }, { 0x0160, "Scaron" }, - { 0x00a7, "" }, + { 0x00a7, "section" }, { 0x0161, "scaron" }, - { 0x00a9, "" }, - { 0x00aa, "" }, - { 0x00ab, "" }, - { 0x00ac, "" }, - { 0x00ad, "" }, - { 0x00ae, "" }, - { 0x00af, "" }, - { 0x00b0, "" }, - { 0x00b1, "" }, - { 0x00b2, "" }, - { 0x00b3, "" }, + { 0x00a9, "copyright" }, + { 0x00aa, "ordfeminine" }, + { 0x00ab, "guillemotleft" }, + { 0x00ac, "notsign" }, + { 0x00ad, "hyphen" }, + { 0x00ae, "registered" }, + { 0x00af, "macron" }, + { 0x00b0, "degree" }, + { 0x00b1, "plusminus" }, + { 0x00b2, "twosuperior" }, + { 0x00b3, "threesuperior" }, { 0x017d, "Zcaron" }, - { 0x00b5, "" }, - { 0x00b6, "" }, - { 0x00b7, "" }, + { 0x00b5, "mu" }, + { 0x00b6, "paragraph" }, + { 0x00b7, "periodcentered" }, { 0x017e, "zcaron" }, - { 0x00b9, "" }, - { 0x00ba, "" }, - { 0x00bb, "" }, + { 0x00b9, "onesuperior" }, + { 0x00ba, "masculine" }, + { 0x00bb, "guillemotright" }, { 0x0152, "OE" }, { 0x0153, "oe" }, { 0x0178, "Ydiaeresis" }, - { 0x00bf, "" }, - { 0x00c0, "" }, - { 0x00c1, "" }, - { 0x00c2, "" }, - { 0x00c3, "" }, - { 0x00c4, "" }, - { 0x00c5, "" }, - { 0x00c6, "" }, - { 0x00c7, "" }, - { 0x00c8, "" }, - { 0x00c9, "" }, - { 0x00ca, "" }, - { 0x00cb, "" }, - { 0x00cc, "" }, - { 0x00cd, "" }, - { 0x00ce, "" }, - { 0x00cf, "" }, - { 0x00d0, "" }, - { 0x00d1, "" }, - { 0x00d2, "" }, - { 0x00d3, "" }, - { 0x00d4, "" }, - { 0x00d5, "" }, - { 0x00d6, "" }, - { 0x00d7, "" }, - { 0x00d8, "" }, - { 0x00d9, "" }, - { 0x00da, "" }, - { 0x00db, "" }, - { 0x00dc, "" }, - { 0x00dd, "" }, - { 0x00de, "" }, - { 0x00df, "" }, - { 0x00e0, "" }, - { 0x00e1, "" }, - { 0x00e2, "" }, - { 0x00e3, "" }, - { 0x00e4, "" }, - { 0x00e5, "" }, - { 0x00e6, "" }, - { 0x00e7, "" }, - { 0x00e8, "" }, - { 0x00e9, "" }, - { 0x00ea, "" }, - { 0x00eb, "" }, - { 0x00ec, "" }, - { 0x00ed, "" }, - { 0x00ee, "" }, - { 0x00ef, "" }, - { 0x00f0, "" }, - { 0x00f1, "" }, - { 0x00f2, "" }, - { 0x00f3, "" }, - { 0x00f4, "" }, - { 0x00f5, "" }, - { 0x00f6, "" }, - { 0x00f7, "" }, - { 0x00f8, "" }, - { 0x00f9, "" }, - { 0x00fa, "" }, - { 0x00fb, "" }, - { 0x00fc, "" }, - { 0x00fd, "" }, - { 0x00fe, "" }, - { 0x00ff, "" } + { 0x00bf, "questiondown" }, + { 0x00c0, "Agrave" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, + { 0x00c3, "Atilde" }, + { 0x00c4, "Adiaeresis" }, + { 0x00c5, "Aring" }, + { 0x00c6, "AE" }, + { 0x00c7, "Ccedilla" }, + { 0x00c8, "Egrave" }, + { 0x00c9, "Eacute" }, + { 0x00ca, "Ecircumflex" }, + { 0x00cb, "Ediaeresis" }, + { 0x00cc, "Igrave" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, + { 0x00cf, "Idiaeresis" }, + { 0x00d0, "ETH" }, + { 0x00d1, "Ntilde" }, + { 0x00d2, "Ograve" }, + { 0x00d3, "Oacute" }, + { 0x00d4, "Ocircumflex" }, + { 0x00d5, "Otilde" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, + { 0x00d8, "Ooblique" }, + { 0x00d9, "Ugrave" }, + { 0x00da, "Uacute" }, + { 0x00db, "Ucircumflex" }, + { 0x00dc, "Udiaeresis" }, + { 0x00dd, "Yacute" }, + { 0x00de, "THORN" }, + { 0x00df, "ssharp" }, + { 0x00e0, "agrave" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, + { 0x00e3, "atilde" }, + { 0x00e4, "adiaeresis" }, + { 0x00e5, "aring" }, + { 0x00e6, "ae" }, + { 0x00e7, "ccedilla" }, + { 0x00e8, "egrave" }, + { 0x00e9, "eacute" }, + { 0x00ea, "ecircumflex" }, + { 0x00eb, "ediaeresis" }, + { 0x00ec, "igrave" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, + { 0x00ef, "idiaeresis" }, + { 0x00f0, "eth" }, + { 0x00f1, "ntilde" }, + { 0x00f2, "ograve" }, + { 0x00f3, "oacute" }, + { 0x00f4, "ocircumflex" }, + { 0x00f5, "otilde" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, + { 0x00f8, "oslash" }, + { 0x00f9, "ugrave" }, + { 0x00fa, "uacute" }, + { 0x00fb, "ucircumflex" }, + { 0x00fc, "udiaeresis" }, + { 0x00fd, "yacute" }, + { 0x00fe, "thorn" }, + { 0x00ff, "ydiaeresis" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.iso8859_5.h kbd-2.0.4/src/libkeymap/syms.iso8859_5.h --- kbd-2.0.3/src/libkeymap/syms.iso8859_5.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.iso8859_5.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,5 +1,5 @@ static sym -const iso_8859_5_syms[] = { /* 160-255 */ +const iso8859_5_syms[] = { { 0x00a0, "nobreakspace" }, { 0x0401, "cyrillic_capital_letter_io" }, { 0x0402, "serbocroatian_cyrillic_capital_letter_dje" }, @@ -8,15 +8,15 @@ { 0x0405, "macedonian_cyrillic_capital_letter_dze" }, { 0x0406, "ukrainian_cyrillic_capital_letter_i" }, { 0x0407, "ukrainian_cyrillic_capital_letter_yi" }, - { 0x0408, "cyrillic_capital_letter_je" }, /* 0250 */ + { 0x0408, "cyrillic_capital_letter_je" }, { 0x0409, "cyrillic_capital_letter_lje" }, { 0x040a, "cyrillic_capital_letter_nje" }, { 0x040b, "serbocroatian_cyrillic_capital_letter_chje" }, { 0x040c, "macedonian_cyrillic_capital_letter_kje" }, { 0x00ad, "hyphen" }, { 0x040e, "bielorussian_cyrillic_capital_letter_short_u" }, - { 0x040f, "cyrillic_capital_letter_dze" }, - { 0x0410, "cyrillic_capital_letter_a" }, /* 0260 */ + { 0x040f, "cyrillic_capital_letter_dzhe" }, + { 0x0410, "cyrillic_capital_letter_a" }, { 0x0411, "cyrillic_capital_letter_be" }, { 0x0412, "cyrillic_capital_letter_ve" }, { 0x0413, "cyrillic_capital_letter_ghe" }, @@ -24,7 +24,7 @@ { 0x0415, "cyrillic_capital_letter_ie" }, { 0x0416, "cyrillic_capital_letter_zhe" }, { 0x0417, "cyrillic_capital_letter_ze" }, - { 0x0418, "cyrillic_capital_letter_i" }, /* 0270 */ + { 0x0418, "cyrillic_capital_letter_i" }, { 0x0419, "cyrillic_capital_letter_short_i" }, { 0x041a, "cyrillic_capital_letter_ka" }, { 0x041b, "cyrillic_capital_letter_el" }, @@ -32,7 +32,7 @@ { 0x041d, "cyrillic_capital_letter_en" }, { 0x041e, "cyrillic_capital_letter_o" }, { 0x041f, "cyrillic_capital_letter_pe" }, - { 0x0420, "cyrillic_capital_letter_er" }, /* 0300 */ + { 0x0420, "cyrillic_capital_letter_er" }, { 0x0421, "cyrillic_capital_letter_es" }, { 0x0422, "cyrillic_capital_letter_te" }, { 0x0423, "cyrillic_capital_letter_u" }, @@ -40,7 +40,7 @@ { 0x0425, "cyrillic_capital_letter_ha" }, { 0x0426, "cyrillic_capital_letter_tse" }, { 0x0427, "cyrillic_capital_letter_che" }, - { 0x0428, "cyrillic_capital_letter_sha" }, /* 0310 */ + { 0x0428, "cyrillic_capital_letter_sha" }, { 0x0429, "cyrillic_capital_letter_shcha" }, { 0x042a, "cyrillic_capital_hard_sign" }, { 0x042b, "cyrillic_capital_letter_yeru" }, @@ -48,7 +48,7 @@ { 0x042d, "cyrillic_capital_letter_e" }, { 0x042e, "cyrillic_capital_letter_yu" }, { 0x042f, "cyrillic_capital_letter_ya" }, - { 0x0430, "cyrillic_small_letter_a" }, /* 0320 */ + { 0x0430, "cyrillic_small_letter_a" }, { 0x0431, "cyrillic_small_letter_be" }, { 0x0432, "cyrillic_small_letter_ve" }, { 0x0433, "cyrillic_small_letter_ghe" }, @@ -56,7 +56,7 @@ { 0x0435, "cyrillic_small_letter_ie" }, { 0x0436, "cyrillic_small_letter_zhe" }, { 0x0437, "cyrillic_small_letter_ze" }, - { 0x0438, "cyrillic_small_letter_i" }, /* 0330 */ + { 0x0438, "cyrillic_small_letter_i" }, { 0x0439, "cyrillic_small_letter_short_i" }, { 0x043a, "cyrillic_small_letter_ka" }, { 0x043b, "cyrillic_small_letter_el" }, @@ -64,7 +64,7 @@ { 0x043d, "cyrillic_small_letter_en" }, { 0x043e, "cyrillic_small_letter_o" }, { 0x043f, "cyrillic_small_letter_pe" }, - { 0x0440, "cyrillic_small_letter_er" }, /* 0340 */ + { 0x0440, "cyrillic_small_letter_er" }, { 0x0441, "cyrillic_small_letter_es" }, { 0x0442, "cyrillic_small_letter_te" }, { 0x0443, "cyrillic_small_letter_u" }, @@ -72,7 +72,7 @@ { 0x0445, "cyrillic_small_letter_ha" }, { 0x0446, "cyrillic_small_letter_tse" }, { 0x0447, "cyrillic_small_letter_che" }, - { 0x0448, "cyrillic_small_letter_sha" }, /* 0350 */ + { 0x0448, "cyrillic_small_letter_sha" }, { 0x0449, "cyrillic_small_letter_shcha" }, { 0x044a, "cyrillic_small_hard_sign" }, { 0x044b, "cyrillic_small_letter_yeru" }, @@ -80,7 +80,7 @@ { 0x044d, "cyrillic_small_letter_e" }, { 0x044e, "cyrillic_small_letter_yu" }, { 0x044f, "cyrillic_small_letter_ya" }, - { 0x2116, "number_acronym" }, /* 0360 */ + { 0x2116, "number_acronym" }, { 0x0451, "cyrillic_small_letter_io" }, { 0x0452, "serbocroatian_cyrillic_small_letter_dje" }, { 0x0453, "macedonian_cyrillic_small_letter_gje" }, @@ -88,12 +88,12 @@ { 0x0455, "macedonian_cyrillic_small_letter_dze" }, { 0x0456, "ukrainian_cyrillic_small_letter_i" }, { 0x0457, "ukrainian_cyrillic_small_letter_yi" }, - { 0x0458, "cyrillic_small_letter_je" }, /* 0370 */ + { 0x0458, "cyrillic_small_letter_je" }, { 0x0459, "cyrillic_small_letter_lje" }, { 0x045a, "cyrillic_small_letter_nje" }, { 0x045b, "serbocroatian_cyrillic_small_letter_chje" }, { 0x045c, "macedonian_cyrillic_small_letter_kje" }, { 0x00a7, "section" }, - { 0x045e, "bielorussian_cyrillic_small_letter_short_u" }, /* printing error in ECMA-113 */ - { 0x045f, "cyrillic_small_letter_dze" } + { 0x045e, "bielorussian_cyrillic_small_letter_short_u" }, + { 0x045f, "cyrillic_small_letter_dzhe" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.iso8859_7.h kbd-2.0.4/src/libkeymap/syms.iso8859_7.h --- kbd-2.0.3/src/libkeymap/syms.iso8859_7.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.iso8859_7.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,29 +1,29 @@ static sym -const iso_8859_7_syms[] = { /* 160-255 */ - { 0x00a0, "" }, - { 0x02bd, "leftquote" }, - { 0x02bc, "rightquote" }, - { 0x00a3, "" }, +const iso8859_7_syms[] = { + { 0x00a0, "nobreakspace" }, + { 0x2018, "leftquote" }, + { 0x2019, "rightquote" }, + { 0x00a3, "sterling" }, + { 0x20ac, "euro" }, + { 0x20af, "drachma" }, + { 0x00a6, "brokenbar" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, + { 0x00a9, "copyright" }, + { 0x037a, "greek_ypogegrammeni" }, + { 0x00ab, "guillemotleft" }, + { 0x00ac, "notsign" }, + { 0x00ad, "hyphen" }, { 0xfffd, "" }, - { 0xfffd, "" }, - { 0x00a6, "" }, - { 0x00a7, "" }, - { 0x00a8, "" }, - { 0x00a9, "" }, - { 0xfffd, "" }, - { 0x00ab, "" }, - { 0x00ac, "" }, - { 0x00ad, "" }, - { 0xfffd, "" }, - { 0x2015, "" }, - { 0x00b0, "" }, - { 0x00b1, "" }, - { 0x00b2, "" }, - { 0x00b3, "" }, + { 0x2015, "horizontal_bar" }, + { 0x00b0, "degree" }, + { 0x00b1, "plusminus" }, + { 0x00b2, "twosuperior" }, + { 0x00b3, "threesuperior" }, { 0x0384, "accent" }, { 0x0385, "diaeresisaccent" }, { 0x0386, "Alphaaccent" }, - { 0x00b7, "" }, + { 0x00b7, "periodcentered" }, { 0x0388, "Epsilonaccent" }, { 0x0389, "Etaaccent" }, { 0x038a, "Iotaaccent" }, @@ -43,7 +43,7 @@ { 0x0398, "Theta" }, { 0x0399, "Iota" }, { 0x039a, "Kappa" }, - { 0x039b, "Lamda" /*sic*/ }, + { 0x039b, "Lamda" }, { 0x039c, "Mu" }, { 0x039d, "Nu" }, { 0x039e, "Ksi" }, @@ -75,7 +75,7 @@ { 0x03b8, "theta" }, { 0x03b9, "iota" }, { 0x03ba, "kappa" }, - { 0x03bb, "lamda" /*sic*/ }, + { 0x03bb, "lamda" }, { 0x03bc, "mu" }, { 0x03bd, "nu" }, { 0x03be, "ksi" }, @@ -95,5 +95,5 @@ { 0x03cc, "omicronaccent" }, { 0x03cd, "upsilonaccent" }, { 0x03ce, "omegaaccent" }, - { 0xfffd, "" } + { 0xfffd, "" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.iso8859_8.h kbd-2.0.4/src/libkeymap/syms.iso8859_8.h --- kbd-2.0.3/src/libkeymap/syms.iso8859_8.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.iso8859_8.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,36 +1,36 @@ static sym -const iso_8859_8_syms[] = { - { 0x00a0, "" }, +const iso8859_8_syms[] = { + { 0x00a0, "nobreakspace" }, { 0xfffd, "" }, - { 0x00a2, "" }, - { 0x00a3, "" }, - { 0x00a4, "" }, - { 0x00a5, "" }, - { 0x00a6, "" }, - { 0x00a7, "" }, - { 0x00a8, "" }, - { 0x00a9, "" }, + { 0x00a2, "cent" }, + { 0x00a3, "sterling" }, + { 0x00a4, "currency" }, + { 0x00a5, "yen" }, + { 0x00a6, "brokenbar" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, + { 0x00a9, "copyright" }, { 0x00d7, "multiply" }, - { 0x00ab, "" }, - { 0x00ac, "" }, - { 0x00ad, "" }, - { 0x00ae, "" }, + { 0x00ab, "guillemotleft" }, + { 0x00ac, "notsign" }, + { 0x00ad, "hyphen" }, + { 0x00ae, "registered" }, { 0x203e, "overscore" }, - { 0x00b0, "" }, - { 0x00b1, "" }, - { 0x00b2, "" }, - { 0x00b3, "" }, - { 0x00b4, "" }, - { 0x00b5, "" }, - { 0x00b6, "" }, - { 0x00b7, "" }, - { 0x00b8, "" }, - { 0x00b9, "" }, + { 0x00b0, "degree" }, + { 0x00b1, "plusminus" }, + { 0x00b2, "twosuperior" }, + { 0x00b3, "threesuperior" }, + { 0x00b4, "acute" }, + { 0x00b5, "mu" }, + { 0x00b6, "paragraph" }, + { 0x00b7, "periodcentered" }, + { 0x00b8, "cedilla" }, + { 0x00b9, "onesuperior" }, { 0x00f7, "division" }, - { 0x00bb, "" }, - { 0x00bc, "" }, - { 0x00bd, "" }, - { 0x00be, "" }, + { 0x00bb, "guillemotright" }, + { 0x00bc, "onequarter" }, + { 0x00bd, "onehalf" }, + { 0x00be, "threequarters" }, { 0xfffd, "" }, { 0xfffd, "" }, { 0xfffd, "" }, @@ -95,5 +95,5 @@ { 0xfffd, "" }, { 0xfffd, "" }, { 0xfffd, "" }, - { 0xfffd, "" } + { 0xfffd, "" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.iso8859_9.h kbd-2.0.4/src/libkeymap/syms.iso8859_9.h --- kbd-2.0.3/src/libkeymap/syms.iso8859_9.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.iso8859_9.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,54 +1,99 @@ static sym -const iso_8859_9_syms[] = { /* latin-5 */ - /* Identical to latin-1, but with the 6 symbols - ETH, eth, THORN, thorn, Yacute, yacute replaced by - Gbreve, gbreve, Scedilla, scedilla, Idotabove, dotlessi */ +const iso8859_9_syms[] = { + { 0x00a0, "nobreakspace" }, + { 0x00a1, "exclamdown" }, + { 0x00a2, "cent" }, + { 0x00a3, "sterling" }, + { 0x00a4, "currency" }, + { 0x00a5, "yen" }, + { 0x00a6, "brokenbar" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, + { 0x00a9, "copyright" }, + { 0x00aa, "ordfeminine" }, + { 0x00ab, "guillemotleft" }, + { 0x00ac, "notsign" }, + { 0x00ad, "hyphen" }, + { 0x00ae, "registered" }, + { 0x00af, "macron" }, + { 0x00b0, "degree" }, + { 0x00b1, "plusminus" }, + { 0x00b2, "twosuperior" }, + { 0x00b3, "threesuperior" }, + { 0x00b4, "acute" }, + { 0x00b5, "mu" }, + { 0x00b6, "paragraph" }, + { 0x00b7, "periodcentered" }, + { 0x00b8, "cedilla" }, + { 0x00b9, "onesuperior" }, + { 0x00ba, "masculine" }, + { 0x00bb, "guillemotright" }, + { 0x00bc, "onequarter" }, + { 0x00bd, "onehalf" }, + { 0x00be, "threequarters" }, + { 0x00bf, "questiondown" }, + { 0x00c0, "Agrave" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, + { 0x00c3, "Atilde" }, + { 0x00c4, "Adiaeresis" }, + { 0x00c5, "Aring" }, + { 0x00c6, "AE" }, + { 0x00c7, "Ccedilla" }, + { 0x00c8, "Egrave" }, + { 0x00c9, "Eacute" }, + { 0x00ca, "Ecircumflex" }, + { 0x00cb, "Ediaeresis" }, + { 0x00cc, "Igrave" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, + { 0x00cf, "Idiaeresis" }, { 0x011e, "Gbreve" }, - { 0x00d1, "" }, - { 0x00d2, "" }, - { 0x00d3, "" }, - { 0x00d4, "" }, - { 0x00d5, "" }, - { 0x00d6, "" }, - { 0x00d7, "" }, - { 0x00d8, "" }, - { 0x00d9, "" }, - { 0x00da, "" }, - { 0x00db, "" }, - { 0x00dc, "" }, - { 0x0130, "Idotabove" }, + { 0x00d1, "Ntilde" }, + { 0x00d2, "Ograve" }, + { 0x00d3, "Oacute" }, + { 0x00d4, "Ocircumflex" }, + { 0x00d5, "Otilde" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, + { 0x00d8, "Ooblique" }, + { 0x00d9, "Ugrave" }, + { 0x00da, "Uacute" }, + { 0x00db, "Ucircumflex" }, + { 0x00dc, "Udiaeresis" }, + { 0x0130, "Iabovedot" }, { 0x015e, "Scedilla" }, - { 0x00df, "" }, - { 0x00e0, "" }, - { 0x00e1, "" }, - { 0x00e2, "" }, - { 0x00e3, "" }, - { 0x00e4, "" }, - { 0x00e5, "" }, - { 0x00e6, "" }, - { 0x00e7, "" }, - { 0x00e8, "" }, - { 0x00e9, "" }, - { 0x00ea, "" }, - { 0x00eb, "" }, - { 0x00ec, "" }, - { 0x00ed, "" }, - { 0x00ee, "" }, - { 0x00ef, "" }, + { 0x00df, "ssharp" }, + { 0x00e0, "agrave" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, + { 0x00e3, "atilde" }, + { 0x00e4, "adiaeresis" }, + { 0x00e5, "aring" }, + { 0x00e6, "ae" }, + { 0x00e7, "ccedilla" }, + { 0x00e8, "egrave" }, + { 0x00e9, "eacute" }, + { 0x00ea, "ecircumflex" }, + { 0x00eb, "ediaeresis" }, + { 0x00ec, "igrave" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, + { 0x00ef, "idiaeresis" }, { 0x011f, "gbreve" }, - { 0x00f1, "" }, - { 0x00f2, "" }, - { 0x00f3, "" }, - { 0x00f4, "" }, - { 0x00f5, "" }, - { 0x00f6, "" }, - { 0x00f7, "" }, - { 0x00f8, "" }, - { 0x00f9, "" }, - { 0x00fa, "" }, - { 0x00fb, "" }, - { 0x00fc, "" }, - { 0x0131, "dotlessi" }, + { 0x00f1, "ntilde" }, + { 0x00f2, "ograve" }, + { 0x00f3, "oacute" }, + { 0x00f4, "ocircumflex" }, + { 0x00f5, "otilde" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, + { 0x00f8, "oslash" }, + { 0x00f9, "ugrave" }, + { 0x00fa, "uacute" }, + { 0x00fb, "ucircumflex" }, + { 0x00fc, "udiaeresis" }, + { 0x0131, "idotless" }, { 0x015f, "scedilla" }, - { 0x00ff, "" } + { 0x00ff, "ydiaeresis" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.koi8.h kbd-2.0.4/src/libkeymap/syms.koi8.h --- kbd-2.0.3/src/libkeymap/syms.koi8.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.koi8.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,77 +1,70 @@ -/* For koi8-r, see rfc1489.txt */ -/* For koi8-u, see rfc2319.txt - it is identical to koi8-r with 8 exceptions */ -/* Since koi8-r did not have letters on these 8 places, - we can use the same table for both. */ -/* TODO: check unicode values for these 8 positions */ - static sym -const koi8_syms[] = { /* 128-255 */ - { 0x2500, "" }, /* 0200 */ - { 0x2502, "" }, - { 0x250c, "" }, - { 0x2510, "" }, - { 0x2514, "" }, - { 0x2518, "" }, - { 0x251c, "" }, - { 0x2524, "" }, - { 0x252c, "" }, /* 0210 */ - { 0x2534, "" }, - { 0x253c, "" }, - { 0x2580, "" }, - { 0x2584, "" }, - { 0x2588, "" }, - { 0x258c, "" }, - { 0x2590, "" }, - { 0x2591, "" }, /* 0220 */ - { 0x2592, "" }, - { 0x2593, "" }, - { 0x2320, "" }, - { 0x25a0, "" }, - { 0x2219, "" }, - { 0x221a, "" }, - { 0x2248, "" }, - { 0x2264, "" }, /* 0230 */ - { 0x2265, "" }, - { 0x00a0, "" }, - { 0x2321, "" }, - { 0x00b0, "" }, - { 0x00b2, "" }, - { 0x00b7, "" }, - { 0x00f7, "" }, - { 0x2550, "" }, /* 0240 */ - { 0x2551, "" }, - { 0x2552, "" }, +const koi8_syms[] = { + { 0x2500, "box_drawings_light_horizontal" }, + { 0x2502, "box_drawings_light_vertical" }, + { 0x250c, "box_drawings_light_down_and_right" }, + { 0x2510, "box_drawings_light_down_and_left" }, + { 0x2514, "box_drawings_light_up_and_right" }, + { 0x2518, "box_drawings_light_up_and_left" }, + { 0x251c, "box_drawings_light_vertical_and_right" }, + { 0x2524, "box_drawings_light_vertical_and_left" }, + { 0x252c, "box_drawings_light_down_and_horizontal" }, + { 0x2534, "box_drawings_light_up_and_horizontal" }, + { 0x253c, "box_drawings_light_vertical_and_horizontal" }, + { 0x2580, "upper_half_block" }, + { 0x2584, "lower_half_block" }, + { 0x2588, "full_block" }, + { 0x258c, "left_half_block" }, + { 0x2590, "right_half_block" }, + { 0x2591, "light_shade" }, + { 0x2592, "medium_shade" }, + { 0x2593, "dark_shade" }, + { 0x2320, "top_half_integral" }, + { 0x25a0, "black_square" }, + { 0x2219, "bullet_operator" }, + { 0x221a, "square_root" }, + { 0x2248, "almost_equal_to" }, + { 0x2264, "less_than_or_equal_to" }, + { 0x2265, "greater_than_or_equal_to" }, + { 0x00a0, "nobreakspace" }, + { 0x2321, "bottom_half_integral" }, + { 0x00b0, "degree" }, + { 0x00b2, "twosuperior" }, + { 0x00b7, "periodcentered" }, + { 0x00f7, "division" }, + { 0x2550, "box_drawings_double_horizontal" }, + { 0x2551, "box_drawings_double_vertical" }, + { 0x2552, "box_drawings_down_single_and_right_double" }, { 0x0451, "cyrillic_small_letter_io" }, - { 0x2553, "ukrainian_cyrillic_small_letter_ie" }, /* koi8-u #164 */ - { 0x2554, "" }, - { 0x2555, "ukrainian_cyrillic_small_letter_i" }, /* koi8-u #166 */ - { 0x2556, "ukrainian_cyrillic_small_letter_yi" }, /* koi8-u #167 */ - { 0x2557, "" }, /* 0250 */ - { 0x2558, "" }, - { 0x2559, "" }, - { 0x255a, "" }, - { 0x255b, "" }, - { 0x255c, "ukrainian_cyrillic_small_letter_ghe_with_upturn" }, /* koi8-u #173 */ - { 0x255d, "" }, - { 0x255e, "" }, - { 0x255f, "" }, /* 0260 */ - { 0x2560, "" }, - { 0x2561, "" }, + { 0x0454, "ukrainian_cyrillic_small_letter_ie" }, + { 0x2554, "box_drawings_double_down_and_right" }, + { 0x0456, "ukrainian_cyrillic_small_letter_i" }, + { 0x0457, "ukrainian_cyrillic_small_letter_yi" }, + { 0x2557, "box_drawings_double_down_and_left" }, + { 0x2558, "box_drawings_up_single_and_right_double" }, + { 0x2559, "box_drawings_up_double_and_right_single" }, + { 0x255a, "box_drawings_double_up_and_right" }, + { 0x255b, "box_drawings_up_single_and_left_double" }, + { 0x0491, "cyrillic_small_letter_ghe_with_upturn" }, + { 0x255d, "box_drawings_double_up_and_left" }, + { 0x255e, "box_drawings_vertical_single_and_right_double" }, + { 0x255f, "box_drawings_vertical_double_and_right_single" }, + { 0x2560, "box_drawings_double_vertical_and_right" }, + { 0x2561, "box_drawings_vertical_single_and_left_double" }, { 0x0401, "cyrillic_capital_letter_io" }, - { 0x2562, "ukrainian_cyrillic_capital_letter_ie" },/* koi8-u #180 */ - { 0x2563, "" }, - { 0x2564, "ukrainian_cyrillic_capital_letter_i" }, /* koi8-u #182 */ - { 0x2565, "ukrainian_cyrillic_capital_letter_yi" },/* koi8-u #183 */ - { 0x2566, "" }, /* 0270 */ - { 0x2567, "" }, - { 0x2568, "" }, - { 0x2569, "" }, - { 0x256a, "" }, - { 0x256b, "ukrainian_cyrillic_capital_letter_ghe_with_upturn" },/* koi8-u #189 */ - { 0x256c, "" }, + { 0x0404, "ukrainian_cyrillic_capital_letter_ie" }, + { 0x2563, "double_vertical_and_left" }, + { 0x0406, "ukrainian_cyrillic_capital_letter_i" }, + { 0x0407, "ukrainian_cyrillic_capital_letter_yi" }, + { 0x2566, "box_drawings_double_down_and_horizontal" }, + { 0x2567, "box_drawings_up_single_and_horizontal_double" }, + { 0x2568, "box_drawings_up_double_and_horizontal_single" }, + { 0x2569, "box_drawings_double_up_and_horizontal" }, + { 0x256a, "box_drawings_vertical_single_and_horizontal_double" }, + { 0x0490, "cyrillic_capital_letter_ghe_with_upturn" }, + { 0x256c, "box_drawings_double_vertical_and_horizontal" }, { 0x00a9, "copyright" }, - { 0x044e, "cyrillic_small_letter_yu" }, /* 0300 */ + { 0x044e, "cyrillic_small_letter_yu" }, { 0x0430, "cyrillic_small_letter_a" }, { 0x0431, "cyrillic_small_letter_be" }, { 0x0446, "cyrillic_small_letter_tse" }, @@ -79,7 +72,7 @@ { 0x0435, "cyrillic_small_letter_ie" }, { 0x0444, "cyrillic_small_letter_ef" }, { 0x0433, "cyrillic_small_letter_ghe" }, - { 0x0445, "cyrillic_small_letter_ha" }, /* 0310 */ + { 0x0445, "cyrillic_small_letter_ha" }, { 0x0438, "cyrillic_small_letter_i" }, { 0x0439, "cyrillic_small_letter_short_i" }, { 0x043a, "cyrillic_small_letter_ka" }, @@ -87,7 +80,7 @@ { 0x043c, "cyrillic_small_letter_em" }, { 0x043d, "cyrillic_small_letter_en" }, { 0x043e, "cyrillic_small_letter_o" }, - { 0x043f, "cyrillic_small_letter_pe" }, /* 0320 */ + { 0x043f, "cyrillic_small_letter_pe" }, { 0x044f, "cyrillic_small_letter_ya" }, { 0x0440, "cyrillic_small_letter_er" }, { 0x0441, "cyrillic_small_letter_es" }, @@ -95,7 +88,7 @@ { 0x0443, "cyrillic_small_letter_u" }, { 0x0436, "cyrillic_small_letter_zhe" }, { 0x0432, "cyrillic_small_letter_ve" }, - { 0x044c, "cyrillic_small_soft_sign" }, /* 0330 */ + { 0x044c, "cyrillic_small_soft_sign" }, { 0x044b, "cyrillic_small_letter_yeru" }, { 0x0437, "cyrillic_small_letter_ze" }, { 0x0448, "cyrillic_small_letter_sha" }, @@ -103,7 +96,7 @@ { 0x0449, "cyrillic_small_letter_shcha" }, { 0x0447, "cyrillic_small_letter_che" }, { 0x044a, "cyrillic_small_hard_sign" }, - { 0x042e, "cyrillic_capital_letter_yu" }, /* 0340 */ + { 0x042e, "cyrillic_capital_letter_yu" }, { 0x0410, "cyrillic_capital_letter_a" }, { 0x0411, "cyrillic_capital_letter_be" }, { 0x0426, "cyrillic_capital_letter_tse" }, @@ -111,7 +104,7 @@ { 0x0415, "cyrillic_capital_letter_ie" }, { 0x0424, "cyrillic_capital_letter_ef" }, { 0x0413, "cyrillic_capital_letter_ghe" }, - { 0x0425, "cyrillic_capital_letter_ha" }, /* 0350 */ + { 0x0425, "cyrillic_capital_letter_ha" }, { 0x0418, "cyrillic_capital_letter_i" }, { 0x0419, "cyrillic_capital_letter_short_i" }, { 0x041a, "cyrillic_capital_letter_ka" }, @@ -119,7 +112,7 @@ { 0x041c, "cyrillic_capital_letter_em" }, { 0x041d, "cyrillic_capital_letter_en" }, { 0x041e, "cyrillic_capital_letter_o" }, - { 0x041f, "cyrillic_capital_letter_pe" }, /* 0360 */ + { 0x041f, "cyrillic_capital_letter_pe" }, { 0x042f, "cyrillic_capital_letter_ya" }, { 0x0420, "cyrillic_capital_letter_er" }, { 0x0421, "cyrillic_capital_letter_es" }, @@ -127,12 +120,12 @@ { 0x0423, "cyrillic_capital_letter_u" }, { 0x0416, "cyrillic_capital_letter_zhe" }, { 0x0412, "cyrillic_capital_letter_ve" }, - { 0x042c, "cyrillic_capital_soft_sign" }, /* 0370 */ + { 0x042c, "cyrillic_capital_soft_sign" }, { 0x042b, "cyrillic_capital_letter_yeru" }, { 0x0417, "cyrillic_capital_letter_ze" }, { 0x0428, "cyrillic_capital_letter_sha" }, { 0x042d, "cyrillic_capital_letter_e" }, { 0x0429, "cyrillic_capital_letter_shcha" }, { 0x0427, "cyrillic_capital_letter_che" }, - { 0x042a, "cyrillic_capital_hard_sign" } + { 0x042a, "cyrillic_capital_hard_sign" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.ktyp.h kbd-2.0.4/src/libkeymap/syms.ktyp.h --- kbd-2.0.3/src/libkeymap/syms.ktyp.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.ktyp.h 2016-12-19 15:01:55.000000000 +0000 @@ -1,9 +1,8 @@ /* * Keysyms whose KTYP is KT_LATIN or KT_LETTER and whose KVAL is 0..127. */ -static const char * -const iso646_syms[] = { - "nul", +static const char *const iso646_syms[] = { + "nul", /* 0x00, 0000 */ "Control_a", "Control_b", "Control_c", @@ -19,7 +18,7 @@ "Control_m", "Control_n", "Control_o", - "Control_p", + "Control_p", /* 0x10, 0020 */ "Control_q", "Control_r", "Control_s", @@ -35,7 +34,7 @@ "Control_bracketright", "Control_asciicircum", "Control_underscore", - "space", + "space", /* 0x20, 0040 */ "exclam", "quotedbl", "numbersign", @@ -51,7 +50,7 @@ "minus", "period", "slash", - "zero", + "zero", /* 0x30, 0060 */ "one", "two", "three", @@ -67,7 +66,7 @@ "equal", "greater", "question", - "at", + "at", /* 0x40, 0100 */ "A", "B", "C", @@ -83,7 +82,7 @@ "M", "N", "O", - "P", + "P", /* 0x50, 0120 */ "Q", "R", "S", @@ -99,7 +98,7 @@ "bracketright", "asciicircum", "underscore", - "grave", + "grave", /* 0x60, 0140 */ "a", "b", "c", @@ -115,7 +114,7 @@ "m", "n", "o", - "p", + "p", /* 0x70, 0160 */ "q", "r", "s", @@ -131,12 +130,39 @@ "braceright", "asciitilde", "Delete", - - /* set_charset() fills in charset dependent strings here. */ - /* start with the latin1 defaults */ - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", - "nobreakspace", + "", /* 0x80, 0200 */ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", /* 0x90, 0220 */ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "nobreakspace", /* 0xa0, 0240 */ "exclamdown", "cent", "sterling", @@ -152,7 +178,7 @@ "hyphen", "registered", "macron", - "degree", + "degree", /* 0xb0, 0260 */ "plusminus", "twosuperior", "threesuperior", @@ -168,7 +194,7 @@ "onehalf", "threequarters", "questiondown", - "Agrave", + "Agrave", /* 0xc0, 0300 */ "Aacute", "Acircumflex", "Atilde", @@ -184,7 +210,7 @@ "Iacute", "Icircumflex", "Idiaeresis", - "ETH", + "ETH", /* 0xd0, 0320 */ "Ntilde", "Ograve", "Oacute", @@ -200,7 +226,7 @@ "Yacute", "THORN", "ssharp", - "agrave", + "agrave", /* 0xe0, 0340 */ "aacute", "acircumflex", "atilde", @@ -216,7 +242,7 @@ "iacute", "icircumflex", "idiaeresis", - "eth", + "eth", /* 0xf0, 0360 */ "ntilde", "ograve", "oacute", @@ -231,83 +257,79 @@ "udiaeresis", "yacute", "thorn", - "ydiaeresis", + "ydiaeresis", /* 0xff, 0377 */ }; - - /* * Keysyms whose KTYP is KT_FN. */ -static const char * -const fn_syms[] = { - "F1", "F2", "F3", "F4", "F5", - "F6", "F7", "F8", "F9", "F10", - "F11", "F12", "F13", "F14", "F15", - "F16", "F17", "F18", "F19", "F20", - "Find", /* also called: "Home" */ +static const char *const fn_syms[] = { + "F1", "F2", "F3", "F4", "F5", + "F6", "F7", "F8", "F9", "F10", + "F11", "F12", "F13", "F14", "F15", + "F16", "F17", "F18", "F19", "F20", + "Find", /* also called: "Home" */ "Insert", "Remove", - "Select", /* also called: "End" */ - "Prior", /* also called: "PageUp" */ - "Next", /* also called: "PageDown" */ + "Select", /* also called: "End" */ + "Prior", /* also called: "PageUp" */ + "Next", /* also called: "PageDown" */ "Macro", "Help", "Do", "Pause", - "F21", "F22", "F23", "F24", "F25", - "F26", "F27", "F28", "F29", "F30", - "F31", "F32", "F33", "F34", "F35", - "F36", "F37", "F38", "F39", "F40", - "F41", "F42", "F43", "F44", "F45", - "F46", "F47", "F48", "F49", "F50", - "F51", "F52", "F53", "F54", "F55", - "F56", "F57", "F58", "F59", "F60", - "F61", "F62", "F63", "F64", "F65", - "F66", "F67", "F68", "F69", "F70", - "F71", "F72", "F73", "F74", "F75", - "F76", "F77", "F78", "F79", "F80", - "F81", "F82", "F83", "F84", "F85", - "F86", "F87", "F88", "F89", "F90", - "F91", "F92", "F93", "F94", "F95", - "F96", "F97", "F98", "F99", "F100", - "F101", "F102", "F103", "F104", "F105", - "F106", "F107", "F108", "F109", "F110", - "F111", "F112", "F113", "F114", "F115", - "F116", "F117", "F118", "F119", "F120", - "F121", "F122", "F123", "F124", "F125", - "F126", "F127", "F128", "F129", "F130", - "F131", "F132", "F133", "F134", "F135", - "F136", "F137", "F138", "F139", "F140", - "F141", "F142", "F143", "F144", "F145", - "F146", "F147", "F148", "F149", "F150", - "F151", "F152", "F153", "F154", "F155", - "F156", "F157", "F158", "F159", "F160", - "F161", "F162", "F163", "F164", "F165", - "F166", "F167", "F168", "F169", "F170", - "F171", "F172", "F173", "F174", "F175", - "F176", "F177", "F178", "F179", "F180", - "F181", "F182", "F183", "F184", "F185", - "F186", "F187", "F188", "F189", "F190", - "F191", "F192", "F193", "F194", "F195", - "F196", "F197", "F198", "F199", "F200", - "F201", "F202", "F203", "F204", "F205", - "F206", "F207", "F208", "F209", "F210", - "F211", "F212", "F213", "F214", "F215", - "F216", "F217", "F218", "F219", "F220", - "F221", "F222", "F223", "F224", "F225", - "F226", "F227", "F228", "F229", "F230", - "F231", "F232", "F233", "F234", "F235", - "F236", "F237", "F238", "F239", "F240", - "F241", "F242", "F243", "F244", "F245", - "F246" /* there are 10 keys named Insert etc., total 256 */ + "F21", "F22", "F23", "F24", "F25", + "F26", "F27", "F28", "F29", "F30", + "F31", "F32", "F33", "F34", "F35", + "F36", "F37", "F38", "F39", "F40", + "F41", "F42", "F43", "F44", "F45", + "F46", "F47", "F48", "F49", "F50", + "F51", "F52", "F53", "F54", "F55", + "F56", "F57", "F58", "F59", "F60", + "F61", "F62", "F63", "F64", "F65", + "F66", "F67", "F68", "F69", "F70", + "F71", "F72", "F73", "F74", "F75", + "F76", "F77", "F78", "F79", "F80", + "F81", "F82", "F83", "F84", "F85", + "F86", "F87", "F88", "F89", "F90", + "F91", "F92", "F93", "F94", "F95", + "F96", "F97", "F98", "F99", "F100", + "F101", "F102", "F103", "F104", "F105", + "F106", "F107", "F108", "F109", "F110", + "F111", "F112", "F113", "F114", "F115", + "F116", "F117", "F118", "F119", "F120", + "F121", "F122", "F123", "F124", "F125", + "F126", "F127", "F128", "F129", "F130", + "F131", "F132", "F133", "F134", "F135", + "F136", "F137", "F138", "F139", "F140", + "F141", "F142", "F143", "F144", "F145", + "F146", "F147", "F148", "F149", "F150", + "F151", "F152", "F153", "F154", "F155", + "F156", "F157", "F158", "F159", "F160", + "F161", "F162", "F163", "F164", "F165", + "F166", "F167", "F168", "F169", "F170", + "F171", "F172", "F173", "F174", "F175", + "F176", "F177", "F178", "F179", "F180", + "F181", "F182", "F183", "F184", "F185", + "F186", "F187", "F188", "F189", "F190", + "F191", "F192", "F193", "F194", "F195", + "F196", "F197", "F198", "F199", "F200", + "F201", "F202", "F203", "F204", "F205", + "F206", "F207", "F208", "F209", "F210", + "F211", "F212", "F213", "F214", "F215", + "F216", "F217", "F218", "F219", "F220", + "F221", "F222", "F223", "F224", "F225", + "F226", "F227", "F228", "F229", "F230", + "F231", "F232", "F233", "F234", "F235", + "F236", "F237", "F238", "F239", "F240", + "F241", "F242", "F243", "F244", "F245", + "F246" /* there are 10 keys named Insert etc., total 256 */ }; /* * Keysyms whose KTYP is KT_SPEC. */ -static const char * -const spec_syms[] = { +static const char *const spec_syms[] = { "VoidSymbol", "Return", "Show_Registers", @@ -333,8 +355,7 @@ /* * Keysyms whose KTYP is KT_PAD. */ -static const char * -const pad_syms[] = { +static const char *const pad_syms[] = { "KP_0", "KP_1", "KP_2", @@ -358,8 +379,7 @@ /* * Keysyms whose KTYP is KT_DEAD. */ -static const char * -const dead_syms[] = { +static const char *const dead_syms[] = { "dead_grave", "dead_acute", "dead_circumflex", @@ -371,8 +391,7 @@ /* * Keysyms whose KTYP is KT_CONS. */ -static const char * -const cons_syms[] = { +static const char *const cons_syms[] = { "Console_1", "Console_2", "Console_3", @@ -441,8 +460,7 @@ /* * Keysyms whose KTYP is KT_CUR. */ -static const char * -const cur_syms[] = { +static const char *const cur_syms[] = { "Down", "Left", "Right", @@ -452,8 +470,7 @@ /* * Keysyms whose KTYP is KT_SHIFT. */ -static const char * -const shift_syms[] = { +static const char *const shift_syms[] = { "Shift", "AltGr", "Control", @@ -468,8 +485,7 @@ /* * Keysyms whose KTYP is KT_ASCII. */ -static const char * -const ascii_syms[] = { +static const char *const ascii_syms[] = { "Ascii_0", "Ascii_1", "Ascii_2", @@ -501,8 +517,7 @@ /* * Keysyms whose KTYP is KT_LOCK. */ -static const char * -const lock_syms[] = { +static const char *const lock_syms[] = { "Shift_Lock", "AltGr_Lock", "Control_Lock", @@ -517,8 +532,7 @@ /* * Keysyms whose KTYP is KT_SLOCK. */ -static const char * -const sticky_syms[] = { +static const char *const sticky_syms[] = { "SShift", "SAltGr", "SControl", @@ -533,8 +547,7 @@ /* * Keysyms whose KTYP is KT_BRL. */ -static const char * -const brl_syms[] = { +static const char *const brl_syms[] = { "Brl_blank", "Brl_dot1", "Brl_dot2", diff -Nru kbd-2.0.3/src/libkeymap/syms.latin1.h kbd-2.0.4/src/libkeymap/syms.latin1.h --- kbd-2.0.3/src/libkeymap/syms.latin1.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.latin1.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,7 +1,3 @@ -/* - * Keysyms whose KTYP is KT_LATIN or KT_LETTER and whose KVAL is 128..255, - * and their Unicode equivalent. - */ static sym const latin1_syms[] = { { 0x00a0, "nobreakspace" }, @@ -99,5 +95,5 @@ { 0x00fc, "udiaeresis" }, { 0x00fd, "yacute" }, { 0x00fe, "thorn" }, - { 0x00ff, "ydiaeresis" } + { 0x00ff, "ydiaeresis" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.latin2.h kbd-2.0.4/src/libkeymap/syms.latin2.h --- kbd-2.0.3/src/libkeymap/syms.latin2.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.latin2.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,30 +1,30 @@ static sym const latin2_syms[] = { - { 0x00a0, "" }, /* 0240 */ + { 0x00a0, "nobreakspace" }, { 0x0104, "Aogonek" }, { 0x02d8, "breve" }, { 0x0141, "Lstroke" }, - { 0x00a4, "" }, + { 0x00a4, "currency" }, { 0x013d, "Lcaron" }, { 0x015a, "Sacute" }, - { 0x00a7, "" }, - { 0x00a8, "" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, { 0x0160, "Scaron" }, { 0x015e, "Scedilla" }, { 0x0164, "Tcaron" }, { 0x0179, "Zacute" }, - { 0x00ad, "" }, + { 0x00ad, "hyphen" }, { 0x017d, "Zcaron" }, { 0x017b, "Zabovedot" }, - { 0x00b0, "" }, + { 0x00b0, "degree" }, { 0x0105, "aogonek" }, { 0x02db, "ogonek" }, { 0x0142, "lstroke" }, - { 0x00b4, "" }, + { 0x00b4, "acute" }, { 0x013e, "lcaron" }, { 0x015b, "sacute" }, { 0x02c7, "caron" }, - { 0x00b8, "" }, + { 0x00b8, "cedilla" }, { 0x0161, "scaron" }, { 0x015f, "scedilla" }, { 0x0165, "tcaron" }, @@ -32,68 +32,68 @@ { 0x02dd, "doubleacute" }, { 0x017e, "zcaron" }, { 0x017c, "zabovedot" }, - { 0x0154, "Racute" }, /* 0300 */ - { 0x00c1, "" }, - { 0x00c2, "" }, + { 0x0154, "Racute" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, { 0x0102, "Abreve" }, - { 0x00c4, "" }, + { 0x00c4, "Adiaeresis" }, { 0x0139, "Lacute" }, { 0x0106, "Cacute" }, - { 0x00c7, "" }, + { 0x00c7, "Ccedilla" }, { 0x010c, "Ccaron" }, - { 0x00c9, "" }, + { 0x00c9, "Eacute" }, { 0x0118, "Eogonek" }, - { 0x00cb, "" }, + { 0x00cb, "Ediaeresis" }, { 0x011a, "Ecaron" }, - { 0x00cd, "" }, - { 0x00ce, "" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, { 0x010e, "Dcaron" }, { 0x0110, "Dstroke" }, { 0x0143, "Nacute" }, { 0x0147, "Ncaron" }, - { 0x00d3, "" }, - { 0x00d4, "" }, + { 0x00d3, "Oacute" }, + { 0x00d4, "Ocircumflex" }, { 0x0150, "Odoubleacute" }, - { 0x00d6, "" }, - { 0x00d7, "" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, { 0x0158, "Rcaron" }, { 0x016e, "Uring" }, - { 0x00da, "" }, + { 0x00da, "Uacute" }, { 0x0170, "Udoubleacute" }, - { 0x00dc, "" }, - { 0x00dd, "" }, + { 0x00dc, "Udiaeresis" }, + { 0x00dd, "Yacute" }, { 0x0162, "Tcedilla" }, - { 0x00df, "" }, + { 0x00df, "ssharp" }, { 0x0155, "racute" }, - { 0x00e1, "" }, - { 0x00e2, "" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, { 0x0103, "abreve" }, - { 0x00e4, "" }, + { 0x00e4, "adiaeresis" }, { 0x013a, "lacute" }, { 0x0107, "cacute" }, - { 0x00e7, "" }, + { 0x00e7, "ccedilla" }, { 0x010d, "ccaron" }, - { 0x00e9, "" }, + { 0x00e9, "eacute" }, { 0x0119, "eogonek" }, - { 0x00eb, "" }, + { 0x00eb, "ediaeresis" }, { 0x011b, "ecaron" }, - { 0x00ed, "" }, - { 0x00ee, "" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, { 0x010f, "dcaron" }, { 0x0111, "dstroke" }, { 0x0144, "nacute" }, { 0x0148, "ncaron" }, - { 0x00f3, "" }, - { 0x00f4, "" }, + { 0x00f3, "oacute" }, + { 0x00f4, "ocircumflex" }, { 0x0151, "odoubleacute" }, - { 0x00f6, "" }, - { 0x00f7, "" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, { 0x0159, "rcaron" }, { 0x016f, "uring" }, - { 0x00fa, "" }, + { 0x00fa, "uacute" }, { 0x0171, "udoubleacute" }, - { 0x00fc, "" }, - { 0x00fd, "" }, + { 0x00fc, "udiaeresis" }, + { 0x00fd, "yacute" }, { 0x0163, "tcedilla" }, - { 0x02d9, "abovedot" } + { 0x02d9, "abovedot" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.latin3.h kbd-2.0.4/src/libkeymap/syms.latin3.h --- kbd-2.0.3/src/libkeymap/syms.latin3.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.latin3.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,99 +1,99 @@ static sym const latin3_syms[] = { - { 0x00a0, "" }, + { 0x00a0, "nobreakspace" }, { 0x0126, "Hstroke" }, - { 0x02d8, "" }, - { 0x00a3, "" }, - { 0x00a4, "" }, + { 0x02d8, "breve" }, + { 0x00a3, "sterling" }, + { 0x00a4, "currency" }, { 0xfffd, "" }, { 0x0124, "Hcircumflex" }, - { 0x00a7, "" }, - { 0x00a8, "" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, { 0x0130, "Iabovedot" }, - { 0x015e, "" }, + { 0x015e, "Scedilla" }, { 0x011e, "Gbreve" }, { 0x0134, "Jcircumflex" }, - { 0x00ad, "" }, + { 0x00ad, "hyphen" }, { 0xfffd, "" }, - { 0x017b, "" }, - { 0x00b0, "" }, + { 0x017b, "Zabovedot" }, + { 0x00b0, "degree" }, { 0x0127, "hstroke" }, - { 0x00b2, "" }, - { 0x00b3, "" }, - { 0x00b4, "" }, - { 0x00b5, "" }, + { 0x00b2, "twosuperior" }, + { 0x00b3, "threesuperior" }, + { 0x00b4, "acute" }, + { 0x00b5, "mu" }, { 0x0125, "hcircumflex" }, - { 0x00b7, "" }, - { 0x00b8, "" }, + { 0x00b7, "periodcentered" }, + { 0x00b8, "cedilla" }, { 0x0131, "idotless" }, - { 0x015f, "" }, + { 0x015f, "scedilla" }, { 0x011f, "gbreve" }, { 0x0135, "jcircumflex" }, - { 0x00bd, "" }, + { 0x00bd, "onehalf" }, { 0xfffd, "" }, - { 0x017c, "" }, - { 0x00c0, "" }, - { 0x00c1, "" }, - { 0x00c2, "" }, + { 0x017c, "zabovedot" }, + { 0x00c0, "Agrave" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, { 0xfffd, "" }, - { 0x00c4, "" }, + { 0x00c4, "Adiaeresis" }, { 0x010a, "Cabovedot" }, { 0x0108, "Ccircumflex" }, - { 0x00c7, "" }, - { 0x00c8, "" }, - { 0x00c9, "" }, - { 0x00ca, "" }, - { 0x00cb, "" }, - { 0x00cc, "" }, - { 0x00cd, "" }, - { 0x00ce, "" }, - { 0x00cf, "" }, - { 0xfffd, "" }, - { 0x00d1, "" }, - { 0x00d2, "" }, - { 0x00d3, "" }, - { 0x00d4, "" }, + { 0x00c7, "Ccedilla" }, + { 0x00c8, "Egrave" }, + { 0x00c9, "Eacute" }, + { 0x00ca, "Ecircumflex" }, + { 0x00cb, "Ediaeresis" }, + { 0x00cc, "Igrave" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, + { 0x00cf, "Idiaeresis" }, + { 0xfffd, "" }, + { 0x00d1, "Ntilde" }, + { 0x00d2, "Ograve" }, + { 0x00d3, "Oacute" }, + { 0x00d4, "Ocircumflex" }, { 0x0120, "Gabovedot" }, - { 0x00d6, "" }, - { 0x00d7, "" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, { 0x011c, "Gcircumflex" }, - { 0x00d9, "" }, - { 0x00da, "" }, - { 0x00db, "" }, - { 0x00dc, "" }, + { 0x00d9, "Ugrave" }, + { 0x00da, "Uacute" }, + { 0x00db, "Ucircumflex" }, + { 0x00dc, "Udiaeresis" }, { 0x016c, "Ubreve" }, { 0x015c, "Scircumflex" }, - { 0x00df, "" }, - { 0x00e0, "" }, - { 0x00e1, "" }, - { 0x00e2, "" }, + { 0x00df, "ssharp" }, + { 0x00e0, "agrave" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, { 0xfffd, "" }, - { 0x00e4, "" }, + { 0x00e4, "adiaeresis" }, { 0x010b, "cabovedot" }, { 0x0109, "ccircumflex" }, - { 0x00e7, "" }, - { 0x00e8, "" }, - { 0x00e9, "" }, - { 0x00ea, "" }, - { 0x00eb, "" }, - { 0x00ec, "" }, - { 0x00ed, "" }, - { 0x00ee, "" }, - { 0x00ef, "" }, - { 0xfffd, "" }, - { 0x00f1, "" }, - { 0x00f2, "" }, - { 0x00f3, "" }, - { 0x00f4, "" }, + { 0x00e7, "ccedilla" }, + { 0x00e8, "egrave" }, + { 0x00e9, "eacute" }, + { 0x00ea, "ecircumflex" }, + { 0x00eb, "ediaeresis" }, + { 0x00ec, "igrave" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, + { 0x00ef, "idiaeresis" }, + { 0xfffd, "" }, + { 0x00f1, "ntilde" }, + { 0x00f2, "ograve" }, + { 0x00f3, "oacute" }, + { 0x00f4, "ocircumflex" }, { 0x0121, "gabovedot" }, - { 0x00f6, "" }, - { 0x00f7, "" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, { 0x011d, "gcircumflex" }, - { 0x00f9, "" }, - { 0x00fa, "" }, - { 0x00fb, "" }, - { 0x00fc, "" }, + { 0x00f9, "ugrave" }, + { 0x00fa, "uacute" }, + { 0x00fb, "ucircumflex" }, + { 0x00fc, "udiaeresis" }, { 0x016d, "ubreve" }, { 0x015d, "scircumflex" }, - { 0x02d9, "" } + { 0x02d9, "abovedot" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.latin4.h kbd-2.0.4/src/libkeymap/syms.latin4.h --- kbd-2.0.3/src/libkeymap/syms.latin4.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.latin4.h 2016-12-26 16:31:33.000000000 +0000 @@ -1,99 +1,99 @@ static sym const latin4_syms[] = { - { 0x00a0, "" }, - { 0x0104, "" }, + { 0x00a0, "nobreakspace" }, + { 0x0104, "Aogonek" }, { 0x0138, "kra" }, { 0x0156, "Rcedilla" }, - { 0x00a4, "" }, + { 0x00a4, "currency" }, { 0x0128, "Itilde" }, { 0x013b, "Lcedilla" }, - { 0x00a7, "" }, - { 0x00a8, "" }, - { 0x0160, "" }, + { 0x00a7, "section" }, + { 0x00a8, "diaeresis" }, + { 0x0160, "Scaron" }, { 0x0112, "Emacron" }, { 0x0122, "Gcedilla" }, { 0x0166, "Tslash" }, - { 0x00ad, "" }, - { 0x017d, "" }, - { 0x00af, "" }, - { 0x00b0, "" }, - { 0x0105, "" }, - { 0x02db, "" }, + { 0x00ad, "hyphen" }, + { 0x017d, "Zcaron" }, + { 0x00af, "macron" }, + { 0x00b0, "degree" }, + { 0x0105, "aogonek" }, + { 0x02db, "ogonek" }, { 0x0157, "rcedilla" }, - { 0x00b4, "" }, + { 0x00b4, "acute" }, { 0x0129, "itilde" }, { 0x013c, "lcedilla" }, - { 0x02c7, "" }, - { 0x00b8, "" }, - { 0x0161, "" }, + { 0x02c7, "caron" }, + { 0x00b8, "cedilla" }, + { 0x0161, "scaron" }, { 0x0113, "emacron" }, { 0x0123, "gcedilla" }, { 0x0167, "tslash" }, { 0x014a, "ENG" }, - { 0x017e, "" }, + { 0x017e, "zcaron" }, { 0x014b, "eng" }, { 0x0100, "Amacron" }, - { 0x00c1, "" }, - { 0x00c2, "" }, - { 0x00c3, "" }, - { 0x00c4, "" }, - { 0x00c5, "" }, - { 0x00c6, "" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, + { 0x00c3, "Atilde" }, + { 0x00c4, "Adiaeresis" }, + { 0x00c5, "Aring" }, + { 0x00c6, "AE" }, { 0x012e, "Iogonek" }, - { 0x010c, "" }, - { 0x00c9, "" }, - { 0x0118, "" }, - { 0x00cb, "" }, + { 0x010c, "Ccaron" }, + { 0x00c9, "Eacute" }, + { 0x0118, "Eogonek" }, + { 0x00cb, "Ediaeresis" }, { 0x0116, "Eabovedot" }, - { 0x00cd, "" }, - { 0x00ce, "" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, { 0x012a, "Imacron" }, - { 0x0110, "" }, + { 0x0110, "Dstroke" }, { 0x0145, "Ncedilla" }, { 0x014c, "Omacron" }, { 0x0136, "Kcedilla" }, - { 0x00d4, "" }, - { 0x00d5, "" }, - { 0x00d6, "" }, - { 0x00d7, "" }, - { 0x00d8, "" }, + { 0x00d4, "Ocircumflex" }, + { 0x00d5, "Otilde" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, + { 0x00d8, "Ooblique" }, { 0x0172, "Uogonek" }, - { 0x00da, "" }, - { 0x00db, "" }, - { 0x00dc, "" }, + { 0x00da, "Uacute" }, + { 0x00db, "Ucircumflex" }, + { 0x00dc, "Udiaeresis" }, { 0x0168, "Utilde" }, { 0x016a, "Umacron" }, - { 0x00df, "" }, + { 0x00df, "ssharp" }, { 0x0101, "amacron" }, - { 0x00e1, "" }, - { 0x00e2, "" }, - { 0x00e3, "" }, - { 0x00e4, "" }, - { 0x00e5, "" }, - { 0x00e6, "" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, + { 0x00e3, "atilde" }, + { 0x00e4, "adiaeresis" }, + { 0x00e5, "aring" }, + { 0x00e6, "ae" }, { 0x012f, "iogonek" }, - { 0x010d, "" }, - { 0x00e9, "" }, - { 0x0119, "" }, - { 0x00eb, "" }, + { 0x010d, "ccaron" }, + { 0x00e9, "eacute" }, + { 0x0119, "eogonek" }, + { 0x00eb, "ediaeresis" }, { 0x0117, "eabovedot" }, - { 0x00ed, "" }, - { 0x00ee, "" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, { 0x012b, "imacron" }, - { 0x0111, "" }, + { 0x0111, "dstroke" }, { 0x0146, "ncedilla" }, { 0x014d, "omacron" }, { 0x0137, "kcedilla" }, - { 0x00f4, "" }, - { 0x00f5, "" }, - { 0x00f6, "" }, - { 0x00f7, "" }, - { 0x00f8, "" }, + { 0x00f4, "ocircumflex" }, + { 0x00f5, "otilde" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, + { 0x00f8, "oslash" }, { 0x0173, "uogonek" }, - { 0x00fa, "" }, - { 0x00fb, "" }, - { 0x00fc, "" }, + { 0x00fa, "uacute" }, + { 0x00fb, "ucircumflex" }, + { 0x00fc, "udiaeresis" }, { 0x0169, "utilde" }, { 0x016b, "umacron" }, - { 0x02d9, "" } + { 0x02d9, "abovedot" }, }; diff -Nru kbd-2.0.3/src/libkeymap/syms.mazovia.h kbd-2.0.4/src/libkeymap/syms.mazovia.h --- kbd-2.0.3/src/libkeymap/syms.mazovia.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.mazovia.h 2016-12-19 15:01:55.000000000 +0000 @@ -1,5 +1,4 @@ -static sym -const mazovia_syms[] = { +static sym const mazovia_syms[] = { /* as specified by Wlodek Bzyl */ { 0x0080, "" }, { 0x0081, "" }, @@ -41,92 +40,92 @@ { 0x0143, "Nacute" }, { 0x017a, "zacute" }, { 0x017c, "zabovedot" }, - { 0x00a8, "" }, - { 0x00a9, "" }, - { 0x00aa, "" }, - { 0x00ab, "" }, - { 0x00ac, "" }, - { 0x00ad, "" }, + { 0x00a8, "diaeresis" }, + { 0x00a9, "copyright" }, + { 0x00aa, "ordfeminine" }, { 0x00ab, "guillemotleft" }, + { 0x00ac, "notsign" }, + { 0x00ad, "hyphen" }, + { 0x00ab, "guillemotleft" }, + { 0x00bb, "guillemotright" }, + { 0x00b0, "degree" }, + { 0x00b1, "plusminus" }, + { 0x00b2, "twosuperior" }, + { 0x00b3, "threesuperior" }, + { 0x00b4, "acute" }, + { 0x00b5, "mu" }, + { 0x00b6, "paragraph" }, + { 0x00b7, "periodcentered" }, + { 0x00b8, "cedilla" }, + { 0x00b9, "onesuperior" }, + { 0x00ba, "masculine" }, { 0x00bb, "guillemotright" }, - { 0x00b0, "" }, - { 0x00b1, "" }, - { 0x00b2, "" }, - { 0x00b3, "" }, - { 0x00b4, "" }, - { 0x00b5, "" }, - { 0x00b6, "" }, - { 0x00b7, "" }, - { 0x00b8, "" }, - { 0x00b9, "" }, - { 0x00ba, "" }, - { 0x00bb, "" }, - { 0x00bc, "" }, - { 0x00bd, "" }, - { 0x00be, "" }, - { 0x00bf, "" }, - { 0x00c0, "" }, - { 0x00c1, "" }, - { 0x00c2, "" }, - { 0x00c3, "" }, - { 0x00c4, "" }, - { 0x00c5, "" }, - { 0x00c6, "" }, - { 0x00c7, "" }, - { 0x00c8, "" }, - { 0x00c9, "" }, - { 0x00ca, "" }, - { 0x00cb, "" }, - { 0x00cc, "" }, - { 0x00cd, "" }, - { 0x00ce, "" }, - { 0x00cf, "" }, - { 0x00d0, "" }, - { 0x00d1, "" }, - { 0x00d2, "" }, - { 0x00d3, "" }, - { 0x00d4, "" }, - { 0x00d5, "" }, - { 0x00d6, "" }, - { 0x00d7, "" }, - { 0x00d8, "" }, - { 0x00d9, "" }, - { 0x00da, "" }, - { 0x00db, "" }, - { 0x00dc, "" }, - { 0x00dd, "" }, - { 0x00de, "" }, - { 0x00df, "" }, - { 0x00e0, "" }, - { 0x00e1, "" }, - { 0x00e2, "" }, - { 0x00e3, "" }, - { 0x00e4, "" }, - { 0x00e5, "" }, - { 0x00e6, "" }, - { 0x00e7, "" }, - { 0x00e8, "" }, - { 0x00e9, "" }, - { 0x00ea, "" }, - { 0x00eb, "" }, - { 0x00ec, "" }, - { 0x00ed, "" }, - { 0x00ee, "" }, - { 0x00ef, "" }, - { 0x00f0, "" }, - { 0x00f1, "" }, - { 0x00f2, "" }, - { 0x00f3, "" }, - { 0x00f4, "" }, - { 0x00f5, "" }, - { 0x00f6, "" }, - { 0x00f7, "" }, - { 0x00f8, "" }, - { 0x00f9, "" }, - { 0x00fa, "" }, - { 0x00fb, "" }, - { 0x00fc, "" }, - { 0x00fd, "" }, - { 0x00fe, "" }, + { 0x00bc, "onequarter" }, + { 0x00bd, "onehalf" }, + { 0x00be, "threequarters" }, + { 0x00bf, "questiondown" }, + { 0x00c0, "Agrave" }, + { 0x00c1, "Aacute" }, + { 0x00c2, "Acircumflex" }, + { 0x00c3, "Atilde" }, + { 0x00c4, "Adiaeresis" }, + { 0x00c5, "Aring" }, + { 0x00c6, "AE" }, + { 0x00c7, "Ccedilla" }, + { 0x00c8, "Egrave" }, + { 0x00c9, "Eacute" }, + { 0x00ca, "Ecircumflex" }, + { 0x00cb, "Ediaeresis" }, + { 0x00cc, "Igrave" }, + { 0x00cd, "Iacute" }, + { 0x00ce, "Icircumflex" }, + { 0x00cf, "Idiaeresis" }, + { 0x00d0, "ETH" }, + { 0x00d1, "Ntilde" }, + { 0x00d2, "Ograve" }, + { 0x00d3, "Oacute" }, + { 0x00d4, "Ocircumflex" }, + { 0x00d5, "Otilde" }, + { 0x00d6, "Odiaeresis" }, + { 0x00d7, "multiply" }, + { 0x00d8, "Ooblique" }, + { 0x00d9, "Ugrave" }, + { 0x00da, "Uacute" }, + { 0x00db, "Ucircumflex" }, + { 0x00dc, "Udiaeresis" }, + { 0x00dd, "Yacute" }, + { 0x00de, "THORN" }, + { 0x00df, "ssharp" }, + { 0x00e0, "agrave" }, + { 0x00e1, "aacute" }, + { 0x00e2, "acircumflex" }, + { 0x00e3, "atilde" }, + { 0x00e4, "adiaeresis" }, + { 0x00e5, "aring" }, + { 0x00e6, "ae" }, + { 0x00e7, "ccedilla" }, + { 0x00e8, "egrave" }, + { 0x00e9, "eacute" }, + { 0x00ea, "ecircumflex" }, + { 0x00eb, "ediaeresis" }, + { 0x00ec, "igrave" }, + { 0x00ed, "iacute" }, + { 0x00ee, "icircumflex" }, + { 0x00ef, "idiaeresis" }, + { 0x00f0, "eth" }, + { 0x00f1, "ntilde" }, + { 0x00f2, "ograve" }, + { 0x00f3, "oacute" }, + { 0x00f4, "ocircumflex" }, + { 0x00f5, "otilde" }, + { 0x00f6, "odiaeresis" }, + { 0x00f7, "division" }, + { 0x00f8, "oslash" }, + { 0x00f9, "ugrave" }, + { 0x00fa, "uacute" }, + { 0x00fb, "ucircumflex" }, + { 0x00fc, "udiaeresis" }, + { 0x00fd, "yacute" }, + { 0x00fe, "thorn" }, { 0x201e, "quotedblbase" } }; diff -Nru kbd-2.0.3/src/libkeymap/syms.sami.h kbd-2.0.4/src/libkeymap/syms.sami.h --- kbd-2.0.3/src/libkeymap/syms.sami.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.sami.h 2016-12-19 15:01:55.000000000 +0000 @@ -6,8 +6,7 @@ * { "iso-ir-197", iso_ir_197_syms, nn }, */ -static sym -const iso_ir_197_syms[] = { +static sym const iso_ir_197_syms[] = { { 0x00a0, "nobreakspace" }, { 0x010c, "Ccaron" }, { 0x010d, "ccaron" }, @@ -118,8 +117,7 @@ * 0xBB 0x021F # LATIN SMALL LETTER H WITH CARON */ -static sym -const iso_ir_209_syms[] = { +static sym const iso_ir_209_syms[] = { { 0x00a0, "nobreakspace" }, { 0x010c, "Ccaron" }, { 0x010d, "ccaron" }, @@ -218,8 +216,7 @@ { 0x00ff, "ydiaeresis" }, }; -static sym -const latin6_syms[] = { +static sym const latin6_syms[] = { { 0x00a0, "nobreakspace" }, { 0x0104, "Aogonek" }, { 0x0112, "Emacron" }, diff -Nru kbd-2.0.3/src/libkeymap/syms.synonyms.h kbd-2.0.4/src/libkeymap/syms.synonyms.h --- kbd-2.0.3/src/libkeymap/syms.synonyms.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.synonyms.h 2016-12-19 15:12:09.000000000 +0000 @@ -1,58 +1,58 @@ -struct syn -const synonyms[] = { - { "Control_h", "BackSpace" }, - { "Control_i", "Tab" }, - { "Control_j", "Linefeed" }, - { "Home", "Find" }, -/* Unfortunately Delete already denotes ASCII 0177 */ -/* { "Delete", "Remove" }, */ - { "End", "Select" }, - { "PageUp", "Prior" }, - { "PageDown", "Next" }, - { "multiplication", "multiply" }, - { "pound", "sterling" }, - { "pilcrow", "paragraph" }, - { "Oslash", "Ooblique" }, - { "Shift_L", "ShiftL" }, - { "Shift_R", "ShiftR" }, - { "Control_L", "CtrlL" }, - { "Control_R", "CtrlR" }, - { "AltL", "Alt" }, - { "AltR", "AltGr" }, - { "Alt_L", "Alt" }, - { "Alt_R", "AltGr" }, - { "AltGr_L", "Alt" }, - { "AltGr_R", "AltGr" }, - { "AltLLock", "Alt_Lock" }, - { "AltRLock", "AltGr_Lock" }, - { "SCtrl", "SControl" }, - { "Spawn_Console", "KeyboardSignal" }, - { "Uncaps_Shift", "CapsShift" }, -/* the names of the Greek letters are spelled differently +struct syn const synonyms[] = { + { "Control_h", "BackSpace" }, + { "Control_i", "Tab" }, + { "Control_j", "Linefeed" }, + { "Home", "Find" }, + /* Unfortunately Delete already denotes ASCII 0177 */ + /* { "Delete", "Remove" }, */ + { "End", "Select" }, + { "PageUp", "Prior" }, + { "PageDown", "Next" }, + { "multiplication", "multiply" }, + { "pound", "sterling" }, + { "pilcrow", "paragraph" }, + { "Oslash", "Ooblique" }, + { "Shift_L", "ShiftL" }, + { "Shift_R", "ShiftR" }, + { "Control_L", "CtrlL" }, + { "Control_R", "CtrlR" }, + { "AltL", "Alt" }, + { "AltR", "AltGr" }, + { "Alt_L", "Alt" }, + { "Alt_R", "AltGr" }, + { "AltGr_L", "Alt" }, + { "AltGr_R", "AltGr" }, + { "AltLLock", "Alt_Lock" }, + { "AltRLock", "AltGr_Lock" }, + { "SCtrl", "SControl" }, + { "Spawn_Console", "KeyboardSignal" }, + { "Uncaps_Shift", "CapsShift" }, + /* the names of the Greek letters are spelled differently in the iso-8859-7 and the Unicode standards */ - { "lambda", "lamda" }, - { "Lambda", "Lamda" }, - { "xi", "ksi" }, - { "Xi", "Ksi" }, - { "chi", "khi" }, - { "Chi", "Khi" }, -/* diacriticals */ - { "tilde", "asciitilde" }, - { "circumflex", "asciicircum" }, -/* as dead_ogonek, dead_caron, dead_breve and dead_doubleacute do not exist - * (yet), I put also compose lines for use with respectively dead_cedilla, - * dead_circumflex, dead_tilde and dead_tilde */ - { "dead_ogonek", "dead_cedilla" }, - { "dead_caron", "dead_circumflex" }, - { "dead_breve", "dead_tilde" }, - { "dead_doubleacute", "dead_tilde" }, -/* turkish */ - { "Idotabove", "Iabovedot" }, - { "dotlessi", "idotless" }, -/* cyrillic */ - { "no-break_space", "nobreakspace" }, - { "paragraph_sign", "section" }, - { "soft_hyphen", "hyphen" }, + { "lambda", "lamda" }, + { "Lambda", "Lamda" }, + { "xi", "ksi" }, + { "Xi", "Ksi" }, + { "chi", "khi" }, + { "Chi", "Khi" }, + /* diacriticals */ + { "tilde", "asciitilde" }, + { "circumflex", "asciicircum" }, + /* as dead_ogonek, dead_caron, dead_breve and dead_doubleacute do not exist + * (yet), I put also compose lines for use with respectively dead_cedilla, + * dead_circumflex, dead_tilde and dead_tilde + */ + { "dead_ogonek", "dead_cedilla" }, + { "dead_caron", "dead_circumflex" }, + { "dead_breve", "dead_tilde" }, + { "dead_doubleacute", "dead_tilde" }, + /* turkish */ + { "Idotabove", "Iabovedot" }, + { "dotlessi", "idotless" }, + /* cyrillic */ + { "no-break_space", "nobreakspace" }, + { "paragraph_sign", "section" }, + { "soft_hyphen", "hyphen" }, { "bielorussian_cyrillic_capital_letter_i", "ukrainian_cyrillic_capital_letter_i" }, { "cyrillic_capital_letter_kha", "cyrillic_capital_letter_ha" }, { "cyrillic_capital_letter_ge", "cyrillic_capital_letter_ghe" }, @@ -71,6 +71,8 @@ { "cyrillic_small_letter_reversed_e", "cyrillic_small_letter_e" }, { "cyrillic_small_letter_ii", "cyrillic_small_letter_i" }, { "cyrillic_small_letter_short_ii", "cyrillic_small_letter_short_i" }, -/* iso-8859-7 */ - { "rightanglequote", "guillemotright" } + { "ukrainian_cyrillic_small_letter_ghe_with_upturn", "cyrillic_small_letter_ghe_with_upturn" }, + { "ukrainian_cyrillic_capital_letter_ghe_with_upturn", "cyrillic_capital_letter_ghe_with_upturn" }, + /* iso-8859-7 */ + { "rightanglequote", "guillemotright" } }; diff -Nru kbd-2.0.3/src/libkeymap/syms.thai.h kbd-2.0.4/src/libkeymap/syms.thai.h --- kbd-2.0.3/src/libkeymap/syms.thai.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/libkeymap/syms.thai.h 2016-12-19 15:01:55.000000000 +0000 @@ -2,102 +2,101 @@ * Theppitak Karoonboonyanan */ -static sym -const tis_620_syms[] = { - { 0x00a0, "nobreakspace" }, - { 0x0e01, "thai_kokai" }, - { 0x0e02, "thai_khokhai" }, - { 0x0e03, "thai_khokhuat" }, - { 0x0e04, "thai_khokhwai" }, - { 0x0e05, "thai_khokhon" }, - { 0x0e06, "thai_khorakhang" }, - { 0x0e07, "thai_ngongu" }, - { 0x0e08, "thai_chochan" }, - { 0x0e09, "thai_choching" }, - { 0x0e0a, "thai_chochang" }, - { 0x0e0b, "thai_soso" }, - { 0x0e0c, "thai_chochoe" }, - { 0x0e0d, "thai_yoying" }, - { 0x0e0e, "thai_dochada" }, - { 0x0e0f, "thai_topatak" }, - { 0x0e10, "thai_thothan" }, - { 0x0e11, "thai_thonangmontho" }, - { 0x0e12, "thai_thophuthao" }, - { 0x0e13, "thai_nonen" }, - { 0x0e14, "thai_dodek" }, - { 0x0e15, "thai_totao" }, - { 0x0e16, "thai_thothung" }, - { 0x0e17, "thai_thothahan" }, - { 0x0e18, "thai_thothong" }, - { 0x0e19, "thai_nonu" }, - { 0x0e1a, "thai_bobaimai" }, - { 0x0e1b, "thai_popla" }, - { 0x0e1c, "thai_phophung" }, - { 0x0e1d, "thai_fofa" }, - { 0x0e1e, "thai_phophan" }, - { 0x0e1f, "thai_fofan" }, - { 0x0e20, "thai_phosamphao" }, - { 0x0e21, "thai_moma" }, - { 0x0e22, "thai_yoyak" }, - { 0x0e23, "thai_rorua" }, - { 0x0e24, "thai_ru" }, - { 0x0e25, "thai_loling" }, - { 0x0e26, "thai_lu" }, - { 0x0e27, "thai_wowaen" }, - { 0x0e28, "thai_sosala" }, - { 0x0e29, "thai_sorusi" }, - { 0x0e2a, "thai_sosua" }, - { 0x0e2b, "thai_hohip" }, - { 0x0e2c, "thai_lochula" }, - { 0x0e2d, "thai_oang" }, - { 0x0e2e, "thai_honokhuk" }, - { 0x0e2f, "thai_paiyannoi" }, - { 0x0e30, "thai_saraa" }, - { 0x0e31, "thai_maihanakat" }, - { 0x0e32, "thai_saraaa" }, - { 0x0e33, "thai_saraam" }, - { 0x0e34, "thai_sarai" }, - { 0x0e35, "thai_saraii" }, - { 0x0e36, "thai_saraue" }, - { 0x0e37, "thai_sarauee" }, - { 0x0e38, "thai_sarau" }, - { 0x0e39, "thai_sarauu" }, - { 0x0e3a, "thai_phinthu" }, - { 0x0e3b, "" }, - { 0x0e3c, "" }, - { 0x0e3d, "" }, - { 0x0e3e, "" }, - { 0x0e3f, "thai_baht" }, - { 0x0e40, "thai_sarae" }, - { 0x0e41, "thai_saraae" }, - { 0x0e42, "thai_sarao" }, - { 0x0e43, "thai_saraaimaimuan" }, - { 0x0e44, "thai_saraaimaimalai" }, - { 0x0e45, "thai_lakkhangyao" }, - { 0x0e46, "thai_maiyamok" }, - { 0x0e47, "thai_maitaikhu" }, - { 0x0e48, "thai_maiek" }, - { 0x0e49, "thai_maitho" }, - { 0x0e4a, "thai_maitri" }, - { 0x0e4b, "thai_maichattawa" }, - { 0x0e4c, "thai_thanthakhat" }, - { 0x0e4d, "thai_nikhahit" }, - { 0x0e4e, "thai_yamakkan" }, - { 0x0e4f, "thai_fongman" }, - { 0x0e50, "thai_leksun" }, - { 0x0e51, "thai_leknung" }, - { 0x0e52, "thai_leksong" }, - { 0x0e53, "thai_leksam" }, - { 0x0e54, "thai_leksi" }, - { 0x0e55, "thai_lekha" }, - { 0x0e56, "thai_lekhok" }, - { 0x0e57, "thai_lekchet" }, - { 0x0e58, "thai_lekpaet" }, - { 0x0e59, "thai_lekkao" }, - { 0x0e5a, "thai_angkhankhu" }, - { 0x0e5b, "thai_khomut" }, - { 0x0e5c, "" }, - { 0x0e5d, "" }, - { 0x0e5e, "" }, - { 0x0e5f, "" }, +static sym const tis_620_syms[] = { + { 0x00a0, "nobreakspace" }, + { 0x0e01, "thai_kokai" }, + { 0x0e02, "thai_khokhai" }, + { 0x0e03, "thai_khokhuat" }, + { 0x0e04, "thai_khokhwai" }, + { 0x0e05, "thai_khokhon" }, + { 0x0e06, "thai_khorakhang" }, + { 0x0e07, "thai_ngongu" }, + { 0x0e08, "thai_chochan" }, + { 0x0e09, "thai_choching" }, + { 0x0e0a, "thai_chochang" }, + { 0x0e0b, "thai_soso" }, + { 0x0e0c, "thai_chochoe" }, + { 0x0e0d, "thai_yoying" }, + { 0x0e0e, "thai_dochada" }, + { 0x0e0f, "thai_topatak" }, + { 0x0e10, "thai_thothan" }, + { 0x0e11, "thai_thonangmontho" }, + { 0x0e12, "thai_thophuthao" }, + { 0x0e13, "thai_nonen" }, + { 0x0e14, "thai_dodek" }, + { 0x0e15, "thai_totao" }, + { 0x0e16, "thai_thothung" }, + { 0x0e17, "thai_thothahan" }, + { 0x0e18, "thai_thothong" }, + { 0x0e19, "thai_nonu" }, + { 0x0e1a, "thai_bobaimai" }, + { 0x0e1b, "thai_popla" }, + { 0x0e1c, "thai_phophung" }, + { 0x0e1d, "thai_fofa" }, + { 0x0e1e, "thai_phophan" }, + { 0x0e1f, "thai_fofan" }, + { 0x0e20, "thai_phosamphao" }, + { 0x0e21, "thai_moma" }, + { 0x0e22, "thai_yoyak" }, + { 0x0e23, "thai_rorua" }, + { 0x0e24, "thai_ru" }, + { 0x0e25, "thai_loling" }, + { 0x0e26, "thai_lu" }, + { 0x0e27, "thai_wowaen" }, + { 0x0e28, "thai_sosala" }, + { 0x0e29, "thai_sorusi" }, + { 0x0e2a, "thai_sosua" }, + { 0x0e2b, "thai_hohip" }, + { 0x0e2c, "thai_lochula" }, + { 0x0e2d, "thai_oang" }, + { 0x0e2e, "thai_honokhuk" }, + { 0x0e2f, "thai_paiyannoi" }, + { 0x0e30, "thai_saraa" }, + { 0x0e31, "thai_maihanakat" }, + { 0x0e32, "thai_saraaa" }, + { 0x0e33, "thai_saraam" }, + { 0x0e34, "thai_sarai" }, + { 0x0e35, "thai_saraii" }, + { 0x0e36, "thai_saraue" }, + { 0x0e37, "thai_sarauee" }, + { 0x0e38, "thai_sarau" }, + { 0x0e39, "thai_sarauu" }, + { 0x0e3a, "thai_phinthu" }, + { 0x0e3b, "" }, + { 0x0e3c, "" }, + { 0x0e3d, "" }, + { 0x0e3e, "" }, + { 0x0e3f, "thai_baht" }, + { 0x0e40, "thai_sarae" }, + { 0x0e41, "thai_saraae" }, + { 0x0e42, "thai_sarao" }, + { 0x0e43, "thai_saraaimaimuan" }, + { 0x0e44, "thai_saraaimaimalai" }, + { 0x0e45, "thai_lakkhangyao" }, + { 0x0e46, "thai_maiyamok" }, + { 0x0e47, "thai_maitaikhu" }, + { 0x0e48, "thai_maiek" }, + { 0x0e49, "thai_maitho" }, + { 0x0e4a, "thai_maitri" }, + { 0x0e4b, "thai_maichattawa" }, + { 0x0e4c, "thai_thanthakhat" }, + { 0x0e4d, "thai_nikhahit" }, + { 0x0e4e, "thai_yamakkan" }, + { 0x0e4f, "thai_fongman" }, + { 0x0e50, "thai_leksun" }, + { 0x0e51, "thai_leknung" }, + { 0x0e52, "thai_leksong" }, + { 0x0e53, "thai_leksam" }, + { 0x0e54, "thai_leksi" }, + { 0x0e55, "thai_lekha" }, + { 0x0e56, "thai_lekhok" }, + { 0x0e57, "thai_lekchet" }, + { 0x0e58, "thai_lekpaet" }, + { 0x0e59, "thai_lekkao" }, + { 0x0e5a, "thai_angkhankhu" }, + { 0x0e5b, "thai_khomut" }, + { 0x0e5c, "" }, + { 0x0e5d, "" }, + { 0x0e5e, "" }, + { 0x0e5f, "" }, }; diff -Nru kbd-2.0.3/src/loadkeys.c kbd-2.0.4/src/loadkeys.c --- kbd-2.0.3/src/loadkeys.c 2015-01-26 10:43:10.000000000 +0000 +++ kbd-2.0.4/src/loadkeys.c 2017-01-08 18:36:15.000000000 +0000 @@ -9,6 +9,7 @@ * This file is covered by the GNU General Public License, * which should be included with kbd as the file COPYING. */ +#include "config.h" #include #include @@ -17,41 +18,42 @@ #include #include -#include "../config.h" #include "nls.h" #include "kbd.h" #include "paths.h" #include "getfd.h" +#include "kbd_error.h" #include "keymap.h" -static const char *progname = NULL; +static const char *progname = NULL; static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; -static void __attribute__ ((noreturn)) +static void __attribute__((noreturn)) usage(void) { fprintf(stderr, _("loadkeys version %s\n" - "\n" - "Usage: %s [option...] [mapfile...]\n" - "\n" - "Valid options are:\n" - "\n" - " -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" - " -p --parse search and parse keymap without action\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"), - PACKAGE_VERSION, progname, DEFMAP); + "\n" + "Usage: %s [option...] [mapfile...]\n" + "\n" + "Valid options are:\n" + "\n" + " -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" + " -p --parse search and parse keymap without action\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" + " -V --version print version number\n"), + PACKAGE_VERSION, progname, DEFMAP); exit(EXIT_FAILURE); } @@ -63,24 +65,23 @@ return (p && p + 1 ? p + 1 : name); } -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { - const char *const short_opts = "abcC:dhmpsuqvV"; + const char *const short_opts = "abcC:dhmpsuqvV"; const struct option const long_opts[] = { - { "console", required_argument, NULL, 'C'}, - { "ascii", no_argument, NULL, 'a' }, - { "bkeymap", no_argument, NULL, 'b' }, - { "clearcompose", no_argument, NULL, 'c' }, - { "default", no_argument, NULL, 'd' }, - { "help", no_argument, NULL, 'h' }, - { "mktable", no_argument, NULL, 'm' }, - { "parse", no_argument, NULL, 'p' }, - { "clearstrings", no_argument, NULL, 's' }, - { "unicode", no_argument, NULL, 'u' }, - { "quiet", no_argument, NULL, 'q' }, - { "verbose", no_argument, NULL, 'v' }, - { "version", no_argument, NULL, 'V' }, + { "console", required_argument, NULL, 'C' }, + { "ascii", no_argument, NULL, 'a' }, + { "bkeymap", no_argument, NULL, 'b' }, + { "clearcompose", no_argument, NULL, 'c' }, + { "default", no_argument, NULL, 'd' }, + { "help", no_argument, NULL, 'h' }, + { "mktable", no_argument, NULL, 'm' }, + { "parse", no_argument, NULL, 'p' }, + { "clearstrings", no_argument, NULL, 's' }, + { "unicode", no_argument, NULL, 'u' }, + { "quiet", no_argument, NULL, 'q' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, { NULL, 0, NULL, 0 } }; @@ -101,7 +102,7 @@ lk_flags flags = 0; int c, i, rc = -1; - int fd; + int fd = -1; int kbd_mode; int kd_mode; char *console = NULL; @@ -121,75 +122,76 @@ while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (c) { - case 'a': - options |= OPT_A; - break; - case 'b': - options |= OPT_B; - break; - case 'c': - flags |= LK_FLAG_CLEAR_COMPOSE; - break; - case 'C': - console = optarg; - break; - case 'd': - options |= OPT_D; - break; - case 'm': - options |= OPT_M; - break; - case 'p': - options |= OPT_P; - break; - case 's': - flags |= LK_FLAG_CLEAR_STRINGS; - break; - case 'u': - options |= OPT_U; - flags |= LK_FLAG_UNICODE_MODE; - flags |= LK_FLAG_PREFER_UNICODE; - break; - case 'q': - lk_set_log_priority(ctx, LOG_ERR); - break; - case 'v': - lk_set_log_priority(ctx, LOG_INFO); - break; - case 'V': - fprintf(stdout, _("%s from %s\n"), progname, PACKAGE_STRING); - exit(0); - case 'h': - case '?': - usage(); + case 'a': + options |= OPT_A; + break; + case 'b': + options |= OPT_B; + break; + case 'c': + flags |= LK_FLAG_CLEAR_COMPOSE; + break; + case 'C': + console = optarg; + break; + case 'd': + options |= OPT_D; + break; + case 'm': + options |= OPT_M; + break; + case 'p': + options |= OPT_P; + break; + case 's': + flags |= LK_FLAG_CLEAR_STRINGS; + break; + case 'u': + options |= OPT_U; + flags |= LK_FLAG_UNICODE_MODE; + flags |= LK_FLAG_PREFER_UNICODE; + break; + case 'q': + lk_set_log_priority(ctx, LOG_ERR); + break; + case 'v': + lk_set_log_priority(ctx, LOG_INFO); + break; + case 'V': + fprintf(stdout, _("%s from %s\n"), progname, PACKAGE_STRING); + exit(0); + case 'h': + case '?': + usage(); } } if ((options & OPT_U) && (options & OPT_A)) { fprintf(stderr, - _("%s: Options --unicode and --ascii are mutually exclusive\n"), - progname); + _("%s: Options --unicode and --ascii are mutually exclusive\n"), + progname); exit(EXIT_FAILURE); } - /* get console */ - fd = getfd(console); - if (!(options & OPT_M) && !(options & OPT_B)) { + /* get console */ + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); + /* check whether the keyboard is in Unicode mode */ if (ioctl(fd, KDGKBMODE, &kbd_mode) || ioctl(fd, KDGETMODE, &kd_mode)) { fprintf(stderr, _("%s: error reading keyboard mode: %m\n"), - progname); + progname); exit(EXIT_FAILURE); } if (kbd_mode == K_UNICODE) { if (options & OPT_A) { fprintf(stderr, - _("%s: warning: loading non-Unicode keymap on Unicode console\n" - " (perhaps you want to do `kbd_mode -a'?)\n"), - progname); + _("%s: warning: loading non-Unicode keymap on Unicode console\n" + " (perhaps you want to do `kbd_mode -a'?)\n"), + progname); } else { flags |= LK_FLAG_PREFER_UNICODE; } @@ -199,9 +201,9 @@ } else if (options & OPT_U && 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); + _("%s: warning: loading Unicode keymap on non-Unicode console\n" + " (perhaps you want to do `kbd_mode -u'?)\n"), + progname); } } @@ -210,7 +212,7 @@ dirpath = dirpath1; if ((ev = getenv("LOADKEYS_KEYMAP_PATH")) != NULL) { dirpath2[0] = ev; - dirpath = dirpath2; + dirpath = dirpath2; } if (options & OPT_D) { @@ -224,7 +226,6 @@ if ((rc = lk_parse_keymap(ctx, &f)) == -1) goto fail; - } else if (optind == argc) { f.fd = stdin; strcpy(f.pathname, ""); @@ -257,9 +258,12 @@ } } - fail: lk_free(ctx); +fail: + lk_free(ctx); lk_fpclose(&f); - close(fd); + + if (fd >= 0) + close(fd); if (rc < 0) exit(EXIT_FAILURE); diff -Nru kbd-2.0.3/src/loadunimap.c kbd-2.0.4/src/loadunimap.c --- kbd-2.0.3/src/loadunimap.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/loadunimap.c 2017-01-08 18:36:15.000000000 +0000 @@ -3,6 +3,7 @@ * * Version 1.09 */ +#include "config.h" #include #include @@ -24,32 +25,34 @@ #include "utf8.h" #include "psf.h" #include "nls.h" +#include "kbd_error.h" extern char *progname; extern int force; -static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; +static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 }; #ifdef MAIN #include "version.h" int verbose = 0; -int force = 0; -int debug = 0; +int force = 0; +int debug = 0; -static void __attribute__ ((noreturn)) -usage(void) { - fprintf(stderr, - _("Usage:\n\t%s [-C console] [-o map.orig]\n"), progname); - exit(1); +static void __attribute__((noreturn)) +usage(void) +{ + fprintf(stderr, + _("Usage:\n\t%s [-C console] [-o map.orig]\n"), progname); + exit(1); } -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ int fd, c; char *console = NULL; char *outfnam = NULL; - char *infnam = "def.uni"; + char *infnam = "def.uni"; set_progname(argv[0]); @@ -63,21 +66,22 @@ while ((c = getopt(argc, argv, "C:o:")) != EOF) { switch (c) { - case 'C': - console = optarg; - break; - case 'o': - outfnam = optarg; - break; - default: - usage(); + case 'C': + console = optarg; + break; + case 'o': + outfnam = optarg; + break; + default: + usage(); } } - if (argc > optind+1 || (argc == optind && !outfnam)) + if (argc > optind + 1 || (argc == optind && !outfnam)) usage(); - fd = getfd(console); + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); if (outfnam) { saveunicodemap(fd, outfnam); @@ -85,7 +89,7 @@ exit(0); } - if (argc == optind+1) + if (argc == optind + 1) infnam = argv[optind]; loadunicodemap(fd, infnam); exit(0); @@ -95,9 +99,10 @@ /* * Skip spaces and read U+1234 or return -1 for error. * Return first non-read position in *p0 (unchanged on error). - */ + */ static int -getunicode(char **p0) { +getunicode(char **p0) +{ char *p = *p0; while (*p == ' ' || *p == '\t') @@ -123,25 +128,26 @@ if (*p != 'U' || p[1] != '+' || !isxdigit(p[2]) || !isxdigit(p[3]) || !isxdigit(p[4]) || !isxdigit(p[5]) || isxdigit(p[6])) return -1; - *p0 = p+6; - return strtol(p+2,0,16); + *p0 = p + 6; + return strtol(p + 2, 0, 16); } static struct unimapdesc descr; static struct unipair *list = 0; -static int listsz = 0; -static int listct = 0; +static int listsz = 0; +static int listct = 0; static void -addpair(int fp, int un) { - if (listct == listsz) { - listsz += 4096; - list = xrealloc((char *)list, listsz); - } - list[listct].fontpos = fp; - list[listct].unicode = un; - listct++; +addpair(int fp, int un) +{ + if (listct == listsz) { + listsz += 4096; + list = xrealloc((char *)list, listsz); + } + list[listct].fontpos = fp; + list[listct].unicode = un; + listct++; } /* @@ -157,7 +163,8 @@ */ static void -parseline(char *buffer, char *tblname) { +parseline(char *buffer, char *tblname) +{ int fontlen = 512; int i; int fp0, fp1, un0, un1; @@ -168,7 +175,7 @@ while (*p == ' ' || *p == '\t') p++; if (!*p || *p == '#') - return; /* skip comment or blank line */ + return; /* skip comment or blank line */ fp0 = strtol(p, &p1, 0); if (p1 == p) { @@ -190,16 +197,16 @@ } else fp1 = 0; - if ( fp0 < 0 || fp0 >= fontlen ) { + if (fp0 < 0 || fp0 >= fontlen) { fprintf(stderr, - _("%s: Glyph number (0x%x) larger than font length\n"), - tblname, fp0); + _("%s: Glyph number (0x%x) larger than font length\n"), + tblname, fp0); exit(EX_DATAERR); } - if ( fp1 && (fp1 < fp0 || fp1 >= fontlen) ) { + if (fp1 && (fp1 < fp0 || fp1 >= fontlen)) { fprintf(stderr, - _("%s: Bad end of range (0x%x)\n"), - tblname, fp1); + _("%s: Bad end of range (0x%x)\n"), + tblname, fp1); exit(EX_DATAERR); } @@ -210,8 +217,8 @@ p++; if (!strncmp(p, "idem", 4)) { p += 4; - for (i=fp0; i<=fp1; i++) - addpair(i,i); + for (i = fp0; i <= fp1; i++) + addpair(i, i); goto lookattail; } @@ -219,8 +226,8 @@ while (*p == ' ' || *p == '\t') p++; if (*p != '-') { - for (i=fp0; i<=fp1; i++) - addpair(i,un0); + for (i = fp0; i <= fp1; i++) + addpair(i, un0); goto lookattail; } @@ -228,38 +235,38 @@ un1 = getunicode(&p); if (un0 < 0 || un1 < 0) { fprintf(stderr, - _("%s: Bad Unicode range corresponding to " - "font position range 0x%x-0x%x\n"), - tblname, fp0, fp1); + _("%s: Bad Unicode range corresponding to " + "font position range 0x%x-0x%x\n"), + tblname, fp0, fp1); exit(EX_DATAERR); } if (un1 - un0 != fp1 - fp0) { fprintf(stderr, - _("%s: Unicode range U+%x-U+%x not of the same" - " length as font position range 0x%x-0x%x\n"), - tblname, un0, un1, fp0, fp1); + _("%s: Unicode range U+%x-U+%x not of the same" + " length as font position range 0x%x-0x%x\n"), + tblname, un0, un1, fp0, fp1); exit(EX_DATAERR); } - for(i=fp0; i<=fp1; i++) - addpair(i,un0-fp0+i); + for (i = fp0; i <= fp1; i++) + addpair(i, un0 - fp0 + i); } else { /* no range; expect a list of unicode values for a single font position */ - while ( (un0 = getunicode(&p)) >= 0 ) + while ((un0 = getunicode(&p)) >= 0) addpair(fp0, un0); } - lookattail: +lookattail: while (*p == ' ' || *p == '\t') p++; if (*p && *p != '#') fprintf(stderr, _("%s: trailing junk (%s) ignored\n"), - tblname, p); + tblname, p); } -void -loadunicodemap(int fd, char *tblname) { +void loadunicodemap(int fd, char *tblname) +{ char buffer[65536]; char *p; lkfile_t fp; @@ -272,12 +279,12 @@ if (verbose) printf(_("Loading unicode map from file %s\n"), fp.pathname); - while ( fgets(buffer, sizeof(buffer), fp.fd) != NULL ) { - if ( (p = strchr(buffer, '\n')) != NULL ) + while (fgets(buffer, sizeof(buffer), fp.fd) != NULL) { + if ((p = strchr(buffer, '\n')) != NULL) *p = '\0'; else fprintf(stderr, _("%s: %s: Warning: line too long\n"), - progname, tblname); + progname, tblname); parseline(buffer, tblname); } @@ -286,67 +293,67 @@ if (listct == 0 && !force) { fprintf(stderr, - _("%s: not loading empty unimap\n" - "(if you insist: use option -f to override)\n"), - progname); + _("%s: not loading empty unimap\n" + "(if you insist: use option -f to override)\n"), + progname); } else { descr.entry_ct = listct; - descr.entries = list; - if (loadunimap (fd, NULL, &descr)) + descr.entries = list; + if (loadunimap(fd, NULL, &descr)) exit(1); listct = 0; } } static struct unimapdesc -getunicodemap(int fd) { - struct unimapdesc unimap_descr; +getunicodemap(int fd) +{ + struct unimapdesc unimap_descr; - if (getunimap(fd, &unimap_descr)) - exit(1); + if (getunimap(fd, &unimap_descr)) + exit(1); #ifdef MAIN - fprintf(stderr, "# %d %s\n", unimap_descr.entry_ct, - (unimap_descr.entry_ct == 1) ? _("entry") : _("entries")); + fprintf(stderr, "# %d %s\n", unimap_descr.entry_ct, + (unimap_descr.entry_ct == 1) ? _("entry") : _("entries")); #endif - return unimap_descr; + return unimap_descr; } -void -saveunicodemap(int fd, char *oufil) { - FILE *fpo; - struct unimapdesc unimap_descr; - struct unipair *unilist; - int i; - - if ((fpo = fopen(oufil, "w")) == NULL) { - perror(oufil); - exit(1); - } - - unimap_descr = getunicodemap(fd); - unilist = unimap_descr.entries; - - for(i=0; i 1) appendseparator(fp, 1, utf8); -#endif - if (debug) printf ("\nchar %03x: ", i); - for(j=0; j #include @@ -17,15 +18,16 @@ #include "kdmapop.h" #include "utf8.h" #include "nls.h" +#include "kbd_error.h" /* the two exported functions */ void saveoldmap(int fd, char *omfil); void loadnewmap(int fd, char *mfil); -static int ctoi (char *); +static int ctoi(char *); /* search for the map file in these directories (with trailing /) */ -static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; +static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 }; #ifdef MAIN @@ -33,10 +35,10 @@ #include "version.h" int verbose = 0; -int debug = 0; +int debug = 0; -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ int fd; set_progname(argv[0]); @@ -46,7 +48,7 @@ textdomain(PACKAGE_NAME); if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); + print_version_and_exit(); if (argc > 1 && !strcmp(argv[1], "-v")) { verbose = 1; @@ -54,23 +56,24 @@ argv++; } - fd = getfd(NULL); + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); if (argc >= 3 && !strcmp(argv[1], "-o")) { - saveoldmap(fd, argv[2]); - argc -= 2; - argv += 2; - if (argc == 1) - exit(0); + saveoldmap(fd, argv[2]); + argc -= 2; + argv += 2; + if (argc == 1) + exit(EXIT_SUCCESS); } - + if (argc != 2) { - fprintf(stderr, _("usage: %s [-v] [-o map.orig] map-file\n"), - progname); - exit(1); + fprintf(stderr, _("usage: %s [-V] [-v] [-o map.orig] map-file\n"), + progname); + exit(EXIT_FAILURE); } loadnewmap(fd, argv[1]); - exit(0); + exit(EXIT_SUCCESS); } #endif @@ -88,19 +91,20 @@ * Set lineno to line number of first error. */ static int -parsemap(FILE *fp, char *buf, unsigned short *ubuf, int *u, int *lineno) { +parsemap(FILE *fp, char *buf, unsigned short *ubuf, int *u, int *lineno) +{ char buffer[256]; int in, on, ln, ret = 0; char *p, *q; ln = 0; - while (fgets(buffer,sizeof(buffer)-1,fp)) { + while (fgets(buffer, sizeof(buffer) - 1, fp)) { ln++; if (!*u && strstr(buffer, "U+")) *u = 1; - p = strtok(buffer," \t\n"); + p = strtok(buffer, " \t\n"); if (p && *p != '#') { - q = strtok(NULL," \t\n#"); + q = strtok(NULL, " \t\n#"); if (q) { in = ctoi(p); on = ctoi(q); @@ -114,7 +118,7 @@ } else { if (!ret) *lineno = ln; - ret = -1; + ret = -1; } } } @@ -123,15 +127,16 @@ } static int -readnewmapfromfile(char *mfil, char *buf, unsigned short *ubuf) { +readnewmapfromfile(char *mfil, char *buf, unsigned short *ubuf) +{ struct stat stbuf; - int u = 0; + int u = 0; int lineno = 0; lkfile_t fp; if (lk_findfile(mfil, mapdirpath, mapsuffixes, &fp)) { - fprintf(stderr, _("mapscrn: cannot open map file _%s_\n"), - mfil); + fprintf(stderr, _("mapscrn: cannot open map file _%s_\n"), + mfil); exit(1); } if (stat(fp.pathname, &stbuf)) { @@ -142,35 +147,35 @@ if (stbuf.st_size == E_TABSZ) { if (verbose) printf(_("Loading binary direct-to-font screen map " - "from file %s\n"), + "from file %s\n"), fp.pathname); - if (fread(buf,E_TABSZ,1,fp.fd) != 1) { + if (fread(buf, E_TABSZ, 1, fp.fd) != 1) { fprintf(stderr, - _("Error reading map from file `%s'\n"), - fp.pathname); + _("Error reading map from file `%s'\n"), + fp.pathname); exit(1); } - } else if (stbuf.st_size == 2*E_TABSZ) { + } else if (stbuf.st_size == 2 * E_TABSZ) { if (verbose) printf(_("Loading binary unicode screen map " - "from file %s\n"), + "from file %s\n"), fp.pathname); - if (fread(ubuf,2*E_TABSZ,1,fp.fd) != 1) { + if (fread(ubuf, 2 * E_TABSZ, 1, fp.fd) != 1) { fprintf(stderr, - _("Error reading map from file `%s'\n"), - fp.pathname); + _("Error reading map from file `%s'\n"), + fp.pathname); exit(1); } u = 1; - } else { + } else { if (verbose) printf(_("Loading symbolic screen map from file %s\n"), fp.pathname); - if (parsemap(fp.fd,buf,ubuf,&u,&lineno)) { + if (parsemap(fp.fd, buf, ubuf, &u, &lineno)) { fprintf(stderr, - _("Error parsing symbolic map " - "from `%s', line %d\n"), - fp.pathname, lineno); + _("Error parsing symbolic map " + "from `%s', line %d\n"), + fp.pathname, lineno); exit(1); } } @@ -178,15 +183,15 @@ return u; } -void -loadnewmap(int fd, char *mfil) { +void loadnewmap(int fd, char *mfil) +{ unsigned short ubuf[E_TABSZ]; char buf[E_TABSZ]; int i, u; /* default: trivial straight-to-font */ - for (i=0; i +#include #endif #ifdef ENABLE_NLS -# include -# define _(Text) gettext (Text) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -# define P_(singular, plural, number) ngettext(singular, plural, number) +#include +#define _(Text) gettext(Text) +#ifdef gettext_noop +#define N_(String) gettext_noop(String) +#else +#define N_(String) (String) +#endif +#define P_(singular, plural, number) ngettext(singular, plural, number) #else -# undef bindtextdomain -# define bindtextdomain(Domain, Directory) /* empty */ -# undef textdomain -# define textdomain(Domain) /* empty */ -# define _(Text) (Text) -# define N_(Text) (Text) -# define P_(singular, plural, number) (number == 1 ? singular : plural) +#undef bindtextdomain +#define bindtextdomain(Domain, Directory) /* empty */ +#undef textdomain +#define textdomain(Domain) /* empty */ +#define _(Text) (Text) +#define N_(Text) (Text) +#define P_(singular, plural, number) (number == 1 ? singular : plural) #endif diff -Nru kbd-2.0.3/src/openvt.c kbd-2.0.4/src/openvt.c --- kbd-2.0.3/src/openvt.c 2015-06-28 21:46:12.000000000 +0000 +++ kbd-2.0.4/src/openvt.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -27,7 +29,7 @@ #define FALSE (0) #ifdef ESIX_5_3_2_D -#define VTBASE "/dev/vt%02d" +#define VTBASE "/dev/vt%02d" #endif // Where your VTs are hidden @@ -41,25 +43,26 @@ #endif static void -__attribute__ ((noreturn)) -print_help(int ret) + __attribute__((noreturn)) + print_help(int ret) { printf(_("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"), progname); + "\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"), + progname); exit(ret); } @@ -137,7 +140,7 @@ kbd_error(EXIT_FAILURE, 0, _("Couldn't find owner of current tty!")); - got_a_process: +got_a_process: closedir(dp); return pwnam->pw_name; @@ -159,36 +162,35 @@ return fd; } -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int opt, pid, i; struct vt_stat vtstat; - int vtno = -1; - int fd = -1; - int consfd = -1; - int force = 0; - char optc = FALSE; - char show = FALSE; - char login = FALSE; - char verbose = FALSE; + int vtno = -1; + int fd = -1; + int consfd = -1; + int force = 0; + char optc = FALSE; + char show = FALSE; + char login = FALSE; + char verbose = FALSE; char direct_exec = FALSE; - char do_wait = FALSE; - char as_user = FALSE; + char do_wait = FALSE; + char as_user = FALSE; char vtname[sizeof(VTNAME) + 2]; /* allow 999 possible VTs */ char *cmd = NULL, *def_cmd = NULL, *username = NULL; struct option long_options[] = { - { "help", no_argument, 0, 'h' }, - { "version", no_argument, 0, 'V' }, - { "verbose", no_argument, 0, 'v' }, - { "exec", no_argument, 0, 'e' }, - { "force", no_argument, 0, 'f' }, - { "login", no_argument, 0, 'l' }, - { "user", no_argument, 0, 'u' }, - { "switch", no_argument, 0, 's' }, - { "wait", no_argument, 0, 'w' }, - { "console", required_argument, 0, 'c' }, + { "help", no_argument, 0, 'h' }, + { "version", no_argument, 0, 'V' }, + { "verbose", no_argument, 0, 'v' }, + { "exec", no_argument, 0, 'e' }, + { "force", no_argument, 0, 'f' }, + { "login", no_argument, 0, 'l' }, + { "user", no_argument, 0, 'u' }, + { "switch", no_argument, 0, 's' }, + { "wait", no_argument, 0, 'w' }, + { "console", required_argument, 0, 'c' }, { 0, 0, 0, 0 } }; @@ -201,7 +203,7 @@ while ((opt = getopt_long(argc, argv, "c:lsfuewhvV", long_options, NULL)) != -1) { switch (opt) { case 'c': - optc = 1; /* vtno was specified by the user */ + optc = 1; /* vtno was specified by the user */ vtno = (int)atol(optarg); if (vtno <= 0 || vtno > 63) @@ -265,11 +267,11 @@ } else if (!force) { if (vtno >= 16) kbd_error(7, 0, _("Cannot check whether vt %d is free; use `%s -f' to force."), - vtno, progname); + vtno, progname); if (vtstat.v_state & (1 << vtno)) kbd_error(7, 0, _("vt %d is in use; command aborted; use `%s -f' to force."), - vtno, progname); + vtno, progname); } if (as_user) @@ -301,15 +303,15 @@ if (direct_exec || ((pid = fork()) == 0)) { /* leave current vt */ if (!direct_exec) { -#ifdef ESIX_5_3_2_D +#ifdef ESIX_5_3_2_D #ifdef HAVE_SETPGRP if (setpgrp() < 0) #else if (1) -#endif /* HAVE_SETPGRP */ +#endif /* HAVE_SETPGRP */ #else if (setsid() < 0) -#endif /* ESIX_5_3_2_D */ +#endif /* ESIX_5_3_2_D */ kbd_error(5, errno, _("Unable to set new session")); } @@ -336,7 +338,7 @@ } kbd_error(5, errsv, _("Unable to open %s"), vtname); } - got_vtno: + got_vtno: if (verbose) kbd_warning(0, _("Using VT %s"), vtname); @@ -389,7 +391,7 @@ wait(NULL); waitpid(pid, &retval, 0); - if (show) { /* Switch back... */ + if (show) { /* Switch back... */ if (ioctl(consfd, VT_ACTIVATE, vtstat.v_active)) kbd_error(8, errno, "ioctl(VT_ACTIVATE)"); @@ -403,7 +405,7 @@ /* if all our stuff went right, we want to return the exit code of the command we ran super vital for scripting loops etc */ - return(retval); + return (retval); } return EXIT_SUCCESS; diff -Nru kbd-2.0.3/src/outpsfheader.c kbd-2.0.4/src/outpsfheader.c --- kbd-2.0.3/src/outpsfheader.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/outpsfheader.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,23 +1,26 @@ /* outpsfheader - auxiliary fn - not to be installed */ /* assumes a little-endian machine */ +#include "config.h" + #include -#include /* exit */ +#include /* exit */ #include "kbd.h" #include "psf.h" -static void __attribute__ ((noreturn)) -usage(void) { +static void __attribute__((noreturn)) +usage(void) +{ fprintf(stderr, "call: outpsfheader psftype fontsize charsize hastable\n"); exit(1); } -int -main(int argc, char **argv){ +int main(int argc, char **argv) +{ int psftype, fontsize, charsize, hastable; if (argc != 5) usage(); - psftype = atoi(argv[1]); + psftype = atoi(argv[1]); fontsize = atoi(argv[2]); charsize = atoi(argv[3]); hastable = atoi(argv[4]); @@ -29,7 +32,7 @@ usage(); h1.magic[0] = PSF1_MAGIC0; h1.magic[1] = PSF1_MAGIC1; - h1.mode = (fontsize == 256) ? 0 : PSF1_MODE512; + h1.mode = (fontsize == 256) ? 0 : PSF1_MODE512; if (hastable) h1.mode |= PSF1_MODEHASTAB; h1.charsize = charsize; @@ -40,17 +43,17 @@ } else if (psftype == 2) { struct psf2_header h2; - h2.magic[0] = PSF2_MAGIC0; - h2.magic[1] = PSF2_MAGIC1; - h2.magic[2] = PSF2_MAGIC2; - h2.magic[3] = PSF2_MAGIC3; - h2.version = 0; + h2.magic[0] = PSF2_MAGIC0; + h2.magic[1] = PSF2_MAGIC1; + h2.magic[2] = PSF2_MAGIC2; + h2.magic[3] = PSF2_MAGIC3; + h2.version = 0; h2.headersize = sizeof(h2); - h2.flags = (hastable ? PSF2_HAS_UNICODE_TABLE : 0); - h2.length = fontsize; - h2.charsize = charsize; - h2.width = 8; - h2.height = charsize; + h2.flags = (hastable ? PSF2_HAS_UNICODE_TABLE : 0); + h2.length = fontsize; + h2.charsize = charsize; + h2.width = 8; + h2.height = charsize; if (fwrite(&h2, sizeof(h2), 1, stdout) != 1) { fprintf(stderr, "write error\n"); exit(1); diff -Nru kbd-2.0.3/src/paths.h kbd-2.0.4/src/paths.h --- kbd-2.0.3/src/paths.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/paths.h 2016-12-19 15:01:55.000000000 +0000 @@ -18,11 +18,11 @@ * Default keymap, and where the kernel copy of it lives. */ #ifdef __sparc__ -# define DEFMAP "sunkeymap.map" -# define KERNDIR "/usr/src/linux/drivers/sbus/char" +#define DEFMAP "sunkeymap.map" +#define KERNDIR "/usr/src/linux/drivers/sbus/char" #else -# define DEFMAP "defkeymap.map" -# define KERNDIR "/usr/src/linux/drivers/tty/vt" +#define DEFMAP "defkeymap.map" +#define KERNDIR "/usr/src/linux/drivers/tty/vt" #endif extern int verbose; diff -Nru kbd-2.0.3/src/psffontop.c kbd-2.0.4/src/psffontop.c --- kbd-2.0.3/src/psffontop.c 2015-01-26 15:46:49.000000000 +0000 +++ kbd-2.0.4/src/psffontop.c 2016-12-21 23:51:48.000000000 +0000 @@ -1,6 +1,7 @@ /* * psffontop.c - aeb@cwi.nl, 990921 */ +#include "config.h" #include #include @@ -16,45 +17,50 @@ extern char *progname; static void -addpair(struct unicode_list *up, unsigned int uc) { +addpair(struct unicode_list *up, unsigned int uc) +{ struct unicode_list *ul; struct unicode_seq *us; - ul = xmalloc(sizeof(struct unicode_list)); - us = xmalloc(sizeof(struct unicode_seq)); - us->uc = uc; - us->prev = us; - us->next = NULL; - ul->seq = us; - ul->prev = up->prev; + ul = xmalloc(sizeof(struct unicode_list)); + us = xmalloc(sizeof(struct unicode_seq)); + us->uc = uc; + us->prev = us; + us->next = NULL; + ul->seq = us; + ul->prev = up->prev; ul->prev->next = ul; - ul->next = NULL; - up->prev = ul; + ul->next = NULL; + up->prev = ul; } static void -addseq(struct unicode_list *up, unsigned int uc) { +addseq(struct unicode_list *up, unsigned int uc) +{ struct unicode_seq *us; struct unicode_seq *usl; struct unicode_list *ul = up->prev; usl = ul->seq; - while (usl->next) usl = usl->next; - us = xmalloc(sizeof(struct unicode_seq)); - us->uc = uc; - us->prev = usl; - us->next = NULL; - usl->next = us; + while (usl->next) + usl = usl->next; + us = xmalloc(sizeof(struct unicode_seq)); + us->uc = uc; + us->prev = usl; + us->next = NULL; + usl->next = us; //ul->seq->prev = us; } static unsigned int -assemble_int(unsigned char *ip) { - return (ip[0] + (ip[1]<<8) + (ip[2]<<16) + (ip[3]<<24)); +assemble_int(unsigned char *ip) +{ + return (ip[0] + (ip[1] << 8) + (ip[2] << 16) + (ip[3] << 24)); } static void -store_int_le(unsigned char *ip, int num) { +store_int_le(unsigned char *ip, int num) +{ ip[0] = (num & 0xff); ip[1] = ((num >> 8) & 0xff); ip[2] = ((num >> 16) & 0xff); @@ -62,7 +68,8 @@ } static unsigned int -assemble_ucs2(char **inptr, int cnt) { +assemble_ucs2(char **inptr, int cnt) +{ unsigned int u1, u2; if (cnt < 2) { @@ -71,14 +78,15 @@ exit(EX_DATAERR); } - u1 = (unsigned char) *(*inptr)++; - u2 = (unsigned char) *(*inptr)++; + u1 = (unsigned char)*(*inptr)++; + u2 = (unsigned char)*(*inptr)++; return (u1 | (u2 << 8)); } /* called with cnt > 0 and **inptr not 0xff or 0xfe */ static unsigned int -assemble_utf8(char **inptr, int cnt) { +assemble_utf8(char **inptr, int cnt) +{ int err; unsigned long uc; char *u; @@ -86,14 +94,14 @@ uc = from_utf8(inptr, cnt, &err); if (err) { switch (err) { - case UTF8_SHORT: - u = _("%s: short utf8 unicode table\n"); - break; - case UTF8_BAD: - u = _("%s: bad utf8\n"); - break; - default: - u = _("%s: unknown utf8 error\n"); + case UTF8_SHORT: + u = _("%s: short utf8 unicode table\n"); + break; + case UTF8_BAD: + u = _("%s: bad utf8\n"); + break; + default: + u = _("%s: unknown utf8 error\n"); } fprintf(stderr, u, progname); exit(EX_DATAERR); @@ -102,26 +110,28 @@ } static void -clear_uni_entry(struct unicode_list *up) { +clear_uni_entry(struct unicode_list *up) +{ up->next = NULL; - up->seq = NULL; + up->seq = NULL; up->prev = up; -} +} /* * Read description of a single font position. */ static void -get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { +get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) +{ unsigned char uc; unicode unichar; int inseq = 0; up->next = NULL; - up->seq = NULL; + up->seq = NULL; up->prev = up; - while(1) { + while (1) { if (*endptr == *inptr) { char *u = _("%s: short unicode table\n"); fprintf(stderr, u, progname); @@ -176,12 +186,12 @@ */ extern char *progname; -int -readpsffont(FILE *fontf, char **allbufp, int *allszp, - char **fontbufp, int *fontszp, - int *fontwidthp, int *fontlenp, int fontpos0, - struct unicode_list **uclistheadsp) { - char *inputbuf = NULL; +int readpsffont(FILE *fontf, char **allbufp, int *allszp, + char **fontbufp, int *fontszp, + int *fontwidthp, int *fontlenp, int fontpos0, + struct unicode_list **uclistheadsp) +{ + char *inputbuf = NULL; size_t inputbuflth = 0; size_t inputlth, fontlen, fontwidth, charsize, hastable, ftoffset, utf8; size_t i, k, n; @@ -192,16 +202,16 @@ * just read the entire file. */ if (fontf) { - inputbuflth = MAXFONTSIZE/4; /* random */ - inputbuf = xmalloc(inputbuflth); - n = 0; + inputbuflth = MAXFONTSIZE / 4; /* random */ + inputbuf = xmalloc(inputbuflth); + n = 0; - while(1) { + while (1) { if (n >= inputbuflth) { inputbuflth *= 2; inputbuf = xrealloc(inputbuf, inputbuflth); } - n += fread(inputbuf+n, 1, inputbuflth-n, fontf); + n += fread(inputbuf + n, 1, inputbuflth - n, fontf); if (ferror(fontf)) { char *u = _("%s: Error reading input font"); fprintf(stderr, u, progname); @@ -214,14 +224,14 @@ *allbufp = inputbuf; if (allszp) *allszp = n; - inputlth = n; + inputlth = n; } else { if (!allbufp || !allszp) { char *u = _("%s: Bad call of readpsffont\n"); fprintf(stderr, u, progname); exit(EX_SOFTWARE); } - inputbuf = *allbufp; + inputbuf = *allbufp; inputbuflth = inputlth = n = *allszp; } @@ -229,21 +239,21 @@ PSF1_MAGIC_OK((unsigned char *)inputbuf)) { struct psf1_header *psfhdr; - psfhdr = (struct psf1_header *) &inputbuf[0]; + psfhdr = (struct psf1_header *)&inputbuf[0]; if (psfhdr->mode > PSF1_MAXMODE) { char *u = _("%s: Unsupported psf file mode (%d)\n"); fprintf(stderr, u, progname, psfhdr->mode); exit(EX_DATAERR); } - fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256); - charsize = psfhdr->charsize; - hastable = (psfhdr->mode & (PSF1_MODEHASTAB|PSF1_MODEHASSEQ)); - ftoffset = sizeof(struct psf1_header); + fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256); + charsize = psfhdr->charsize; + hastable = (psfhdr->mode & (PSF1_MODEHASTAB | PSF1_MODEHASSEQ)); + ftoffset = sizeof(struct psf1_header); fontwidth = 8; - utf8 = 0; + utf8 = 0; } else if (inputlth >= sizeof(struct psf2_header) && - PSF2_MAGIC_OK((unsigned char *)inputbuf)) { + PSF2_MAGIC_OK((unsigned char *)inputbuf)) { struct psf2_header psfhdr; int flags; @@ -254,15 +264,15 @@ fprintf(stderr, u, progname, psfhdr.version); exit(EX_DATAERR); } - fontlen = assemble_int((unsigned char *) &psfhdr.length); - charsize = assemble_int((unsigned char *) &psfhdr.charsize); - flags = assemble_int((unsigned char *) &psfhdr.flags); - hastable = (flags & PSF2_HAS_UNICODE_TABLE); - ftoffset = assemble_int((unsigned char *) &psfhdr.headersize); - fontwidth = assemble_int((unsigned char *) &psfhdr.width); - utf8 = 1; + fontlen = assemble_int((unsigned char *)&psfhdr.length); + charsize = assemble_int((unsigned char *)&psfhdr.charsize); + flags = assemble_int((unsigned char *)&psfhdr.flags); + hastable = (flags & PSF2_HAS_UNICODE_TABLE); + ftoffset = assemble_int((unsigned char *)&psfhdr.headersize); + fontwidth = assemble_int((unsigned char *)&psfhdr.width); + utf8 = 1; } else - return -1; /* not psf */ + return -1; /* not psf */ /* tests required - we divide by these */ if (fontlen == 0) { @@ -292,21 +302,21 @@ *fontwidthp = fontwidth; if (!uclistheadsp) - return 0; /* got font, don't need unicode_list */ + return 0; /* got font, don't need unicode_list */ *uclistheadsp = xrealloc(*uclistheadsp, - (fontpos0+fontlen)*sizeof(struct unicode_list)); + (fontpos0 + fontlen) * sizeof(struct unicode_list)); if (hastable) { char *inptr, *endptr; - inptr = inputbuf + ftoffset + fontlen * charsize; + inptr = inputbuf + ftoffset + fontlen * charsize; endptr = inputbuf + inputlth; - for (i=0; iseq; if (us && us->next) return 1; @@ -341,8 +352,8 @@ return 0; } -void -appendunicode(FILE *fp, unsigned int uc, int utf8) { +void appendunicode(FILE *fp, unsigned int uc, int utf8) +{ int n = 6; unsigned char out[6]; @@ -364,29 +375,30 @@ } out[--n] = ((uc + ~mask + ~mask) & 0xff); } - if (fwrite(out+n, 6-n, 1, fp) != 1) { + if (fwrite(out + n, 6 - n, 1, fp) != 1) { perror("appendunimap"); exit(1); } if (debug) { - printf ("("); + printf("("); if (!utf8) - printf ("U+"); - while (n < 6) printf ("%02x ", out[n++]); - printf (")"); + printf("U+"); + while (n < 6) + printf("%02x ", out[n++]); + printf(")"); } } -void -appendseparator(FILE *fp, int seq, int utf8) { +void appendseparator(FILE *fp, int seq, int utf8) +{ int n; if (utf8) { unsigned char u = (seq ? PSF2_STARTSEQ : PSF2_SEPARATOR); - n = fwrite(&u, sizeof(u), 1, fp); + n = fwrite(&u, sizeof(u), 1, fp); } else { unsigned short u = (seq ? PSF1_STARTSEQ : PSF1_SEPARATOR); - n = fwrite(&u, sizeof(u), 1, fp); + n = fwrite(&u, sizeof(u), 1, fp); } if (n != 1) { perror("appendseparator"); @@ -394,13 +406,13 @@ } } -void -writepsffontheader(FILE *ofil, int width, int height, int fontlen, - int *psftype, int flags) { +void writepsffontheader(FILE *ofil, int width, int height, int fontlen, + int *psftype, int flags) +{ int bytewidth, charsize, ret; - bytewidth = (width+7)/8; - charsize = bytewidth * height; + bytewidth = (width + 7) / 8; + charsize = bytewidth * height; if ((fontlen != 256 && fontlen != 512) || width != 8) *psftype = 2; @@ -415,20 +427,20 @@ h.magic[1] = PSF2_MAGIC1; h.magic[2] = PSF2_MAGIC2; h.magic[3] = PSF2_MAGIC3; - store_int_le((unsigned char *) &h.version, 0); - store_int_le((unsigned char *) &h.headersize, sizeof(h)); - store_int_le((unsigned char *) &h.flags, flags2); - store_int_le((unsigned char *) &h.length, fontlen); - store_int_le((unsigned char *) &h.charsize, charsize); - store_int_le((unsigned char *) &h.width, width); - store_int_le((unsigned char *) &h.height, height); + store_int_le((unsigned char *)&h.version, 0); + store_int_le((unsigned char *)&h.headersize, sizeof(h)); + store_int_le((unsigned char *)&h.flags, flags2); + store_int_le((unsigned char *)&h.length, fontlen); + store_int_le((unsigned char *)&h.charsize, charsize); + store_int_le((unsigned char *)&h.width, width); + store_int_le((unsigned char *)&h.height, height); ret = fwrite(&h, sizeof(h), 1, ofil); } else { struct psf1_header h; h.magic[0] = PSF1_MAGIC0; h.magic[1] = PSF1_MAGIC1; - h.mode = 0; + h.mode = 0; if (fontlen == 512) h.mode |= PSF1_MODE512; if (flags & WPSFH_HASSEQ) @@ -436,7 +448,7 @@ else if (flags & WPSFH_HASTAB) h.mode |= PSF1_MODEHASTAB; h.charsize = charsize; - ret = fwrite(&h, sizeof(h), 1, ofil); + ret = fwrite(&h, sizeof(h), 1, ofil); } if (ret != 1) { @@ -445,16 +457,15 @@ } } - -int -writepsffont(FILE *ofil, char *fontbuf, int width, int height, size_t fontlen, - int psftype, struct unicode_list *uclistheads) { +int writepsffont(FILE *ofil, char *fontbuf, int width, int height, size_t fontlen, + int psftype, struct unicode_list *uclistheads) +{ int bytewidth, charsize, flags, utf8; size_t i; - bytewidth = (width+7)/8; - charsize = bytewidth * height; - flags = 0; + bytewidth = (width + 7) / 8; + charsize = bytewidth * height; + flags = 0; if (uclistheads) { flags |= WPSFH_HASTAB; @@ -471,17 +482,17 @@ } /* unimaps: -1 => do nothing: caller will append map */ - if (uclistheads != NULL && uclistheads != (struct unicode_list*)-1) { + if (uclistheads != NULL && uclistheads != (struct unicode_list *)-1) { struct unicode_list *ul; struct unicode_seq *us; - for (i=0; iseq; if (us && us->next) appendseparator(ofil, 1, utf8); - while(us) { + while (us) { appendunicode(ofil, us->uc, utf8); us = us->next; } @@ -492,4 +503,3 @@ } return utf8; } - diff -Nru kbd-2.0.3/src/psffontop.h kbd-2.0.4/src/psffontop.h --- kbd-2.0.3/src/psffontop.h 2015-01-26 15:46:49.000000000 +0000 +++ kbd-2.0.4/src/psffontop.h 2016-12-20 18:49:24.000000000 +0000 @@ -21,21 +21,21 @@ }; extern int readpsffont(FILE *fontf, char **allbufp, int *allszp, - char **fontbufp, int *fontszp, - int *fontwidthp, int *fontlenp, int fontpos0, - struct unicode_list **uclistheadsp); + char **fontbufp, int *fontszp, + int *fontwidthp, int *fontlenp, int fontpos0, + struct unicode_list **uclistheadsp); extern int writepsffont(FILE *ofil, char *fontbuf, - int width, int height, size_t fontlen, int psftype, - struct unicode_list *uclistheads); + int width, int height, size_t fontlen, int psftype, + struct unicode_list *uclistheads); -#define WPSFH_HASTAB 1 -#define WPSFH_HASSEQ 2 -extern void writepsffontheader(FILE *ofil, - int width, int height, int fontlen, - int *psftype, int flags); +#define WPSFH_HASTAB 1 +#define WPSFH_HASSEQ 2 +extern void writepsffontheader(FILE *ofil, + int width, int height, int fontlen, + int *psftype, int flags); extern void appendunicode(FILE *fp, unsigned int uc, int utf8); extern void appendseparator(FILE *fp, int seq, int utf8); -#endif /* _PSFFONTOP_H */ +#endif /* _PSFFONTOP_H */ diff -Nru kbd-2.0.3/src/psf.h kbd-2.0.4/src/psf.h --- kbd-2.0.3/src/psf.h 2015-01-26 15:46:49.000000000 +0000 +++ kbd-2.0.4/src/psf.h 2016-12-20 18:49:24.000000000 +0000 @@ -35,22 +35,21 @@ #ifndef _PSF_H #define _PSF_H +#define PSF1_MAGIC0 0x36 +#define PSF1_MAGIC1 0x04 -#define PSF1_MAGIC0 0x36 -#define PSF1_MAGIC1 0x04 - -#define PSF1_MODE512 0x01 +#define PSF1_MODE512 0x01 #define PSF1_MODEHASTAB 0x02 #define PSF1_MODEHASSEQ 0x04 -#define PSF1_MAXMODE 0x05 +#define PSF1_MAXMODE 0x05 -#define PSF1_SEPARATOR 0xFFFF -#define PSF1_STARTSEQ 0xFFFE +#define PSF1_SEPARATOR 0xFFFF +#define PSF1_STARTSEQ 0xFFFE struct psf1_header { - unsigned char magic[2]; /* Magic number */ - unsigned char mode; /* PSF font mode */ - unsigned char charsize; /* Character size */ + unsigned char magic[2]; /* Magic number */ + unsigned char mode; /* PSF font mode */ + unsigned char charsize; /* Character size */ }; /* @@ -65,36 +64,33 @@ * The integers here are little endian 4-byte integers. */ -#define PSF2_MAGIC0 0x72 -#define PSF2_MAGIC1 0xb5 -#define PSF2_MAGIC2 0x4a -#define PSF2_MAGIC3 0x86 +#define PSF2_MAGIC0 0x72 +#define PSF2_MAGIC1 0xb5 +#define PSF2_MAGIC2 0x4a +#define PSF2_MAGIC3 0x86 struct psf2_header { unsigned char magic[4]; unsigned int version; - unsigned int headersize; /* offset of bitmaps in file */ + unsigned int headersize; /* offset of bitmaps in file */ unsigned int flags; - unsigned int length; /* number of glyphs */ - unsigned int charsize; /* number of bytes for each character */ + unsigned int length; /* number of glyphs */ + unsigned int charsize; /* number of bytes for each character */ unsigned int height, width; /* max dimensions of glyphs */ - /* charsize = height * ((width + 7) / 8) */ + /* charsize = height * ((width + 7) / 8) */ }; /* bits used in flags */ #define PSF2_HAS_UNICODE_TABLE 0x01 /* max version recognized so far */ -#define PSF2_MAXVERSION 0 +#define PSF2_MAXVERSION 0 /* UTF8 separators */ -#define PSF2_SEPARATOR 0xFF -#define PSF2_STARTSEQ 0xFE - - -#define PSF1_MAGIC_OK(x) ((x)[0]==PSF1_MAGIC0 && (x)[1]==PSF1_MAGIC1) -#define PSF2_MAGIC_OK(x) ((x)[0]==PSF2_MAGIC0 && (x)[1]==PSF2_MAGIC1 \ - && (x)[2]==PSF2_MAGIC2 && (x)[3]==PSF2_MAGIC3) +#define PSF2_SEPARATOR 0xFF +#define PSF2_STARTSEQ 0xFE +#define PSF1_MAGIC_OK(x) ((x)[0] == PSF1_MAGIC0 && (x)[1] == PSF1_MAGIC1) +#define PSF2_MAGIC_OK(x) ((x)[0] == PSF2_MAGIC0 && (x)[1] == PSF2_MAGIC1 && (x)[2] == PSF2_MAGIC2 && (x)[3] == PSF2_MAGIC3) -#endif /* _PSF_H */ +#endif /* _PSF_H */ diff -Nru kbd-2.0.3/src/psfxtable.c kbd-2.0.4/src/psfxtable.c --- kbd-2.0.3/src/psfxtable.c 2015-01-26 15:46:49.000000000 +0000 +++ kbd-2.0.4/src/psfxtable.c 2016-12-20 18:49:24.000000000 +0000 @@ -11,6 +11,7 @@ * General Public License (GPL), version 2, or at your option * any later version. */ +#include "config.h" #include #include @@ -53,38 +54,41 @@ struct unicode_list *uclistheads; static void -addpair(int fontpos, unsigned int uc) { +addpair(int fontpos, unsigned int uc) +{ struct unicode_list *ul; struct unicode_seq *us; - ul = xmalloc(sizeof(struct unicode_list)); - us = xmalloc(sizeof(struct unicode_seq)); - us->uc = uc; - us->prev = us; - us->next = NULL; - ul->seq = us; - ul->prev = uclistheads[fontpos].prev; - ul->prev->next = ul; - ul->next = NULL; + ul = xmalloc(sizeof(struct unicode_list)); + us = xmalloc(sizeof(struct unicode_seq)); + us->uc = uc; + us->prev = us; + us->next = NULL; + ul->seq = us; + ul->prev = uclistheads[fontpos].prev; + ul->prev->next = ul; + ul->next = NULL; uclistheads[fontpos].prev = ul; } static void -addseq(int fontpos, unsigned int uc) { +addseq(int fontpos, unsigned int uc) +{ struct unicode_list *ul; struct unicode_seq *us; - ul = uclistheads[fontpos].prev; - us = xmalloc(sizeof(struct unicode_seq)); - us->uc = uc; - us->prev = ul->seq->prev; + ul = uclistheads[fontpos].prev; + us = xmalloc(sizeof(struct unicode_seq)); + us->uc = uc; + us->prev = ul->seq->prev; us->prev->next = us; - us->next = NULL; - ul->seq->prev = us; + us->next = NULL; + ul->seq->prev = us; } static int -getunicode(char **p0) { +getunicode(char **p0) +{ char *p = *p0; while (*p == ' ' || *p == '\t') @@ -93,12 +97,13 @@ !isxdigit(p[2]) || !isxdigit(p[3]) || !isxdigit(p[4]) || !isxdigit(p[5]) || isxdigit(p[6])) return -1; - *p0 = p+6; - return strtol(p+2,0,16); + *p0 = p + 6; + return strtol(p + 2, 0, 16); } static void -parse_itab_line(char *buf, int fontlen){ +parse_itab_line(char *buf, int fontlen) +{ char *p, *p1; int i; long fp0, fp1, un0, un1; @@ -156,7 +161,7 @@ p++; if (!strncmp(p, "idem", 4)) { for (i = fp0; i <= fp1; i++) - addpair(i,i); + addpair(i, i); p += 4; } else { un0 = getunicode(&p); @@ -164,8 +169,8 @@ p++; if (*p != '-') { char *u = _("%s: Corresponding to a range of " - "font positions, there should be " - "a Unicode range\n"); + "font positions, there should be " + "a Unicode range\n"); fprintf(stderr, u, progname); exit(EX_DATAERR); } @@ -173,21 +178,21 @@ un1 = getunicode(&p); if (un0 < 0 || un1 < 0) { char *u = _("%s: Bad Unicode range " - "corresponding to font position " - "range 0x%x-0x%x\n"); + "corresponding to font position " + "range 0x%x-0x%x\n"); fprintf(stderr, u, progname, fp0, fp1); exit(EX_DATAERR); } if (un1 - un0 != fp1 - fp0) { char *u = _("%s: Unicode range U+%x-U+%x not " - "of the same length as font " - "position range 0x%x-0x%x\n"); + "of the same length as font " + "position range 0x%x-0x%x\n"); fprintf(stderr, u, progname, - un0, un1, fp0, fp1); + un0, un1, fp0, fp1); exit(EX_DATAERR); } for (i = fp0; i <= fp1; i++) - addpair(i, un0-fp0+i); + addpair(i, un0 - fp0 + i); } /* not idem */ } else { /* no range */ while ((un0 = getunicode(&p)) >= 0) { @@ -207,18 +212,19 @@ } static void -read_itable(FILE *itab, int fontlen, struct unicode_list **uclistheadsp) { +read_itable(FILE *itab, int fontlen, struct unicode_list **uclistheadsp) +{ char buf[65536]; int i; if (uclistheadsp) { *uclistheadsp = xrealloc(*uclistheadsp, - fontlen*sizeof(struct unicode_list)); - for (i=0; inext = NULL; - up->seq = NULL; - up->prev = up; + up->next = NULL; + up->seq = NULL; + up->prev = up; } while (fgets(buf, sizeof(buf), itab) != NULL) parse_itab_line(buf, fontlen); @@ -227,8 +233,8 @@ int debug = 0; -int -main(int argc, char **argv) { +int main(int argc, char **argv) +{ char *ifname, *ofname, *itname, *otname; FILE *ifil, *ofil, *itab, *otab; int psftype, fontlen, charsize, hastable, notable; @@ -248,8 +254,8 @@ ifil = ofil = itab = otab = NULL; ifname = ofname = itname = otname = NULL; - fontbuf = NULL; - notable = 0; + fontbuf = NULL; + notable = 0; if (!strcmp(progname, "psfaddtable")) { /* Do not send binary data to stdout without explicit "-" */ @@ -276,29 +282,27 @@ fprintf(stderr, u, progname); exit(EX_USAGE); } - ifname = argv[1]; - ofname = argv[2]; + ifname = argv[1]; + ofname = argv[2]; notable = 1; } else { - for (i = 1; i < argc; i ++) { - if ((!strcmp(argv[i], "-i") || !strcmp(argv[i], "-if")) - && i < argc-1) + for (i = 1; i < argc; i++) { + if ((!strcmp(argv[i], "-i") || !strcmp(argv[i], "-if")) && i < argc - 1) ifname = argv[++i]; - else if((!strcmp(argv[i],"-o")||!strcmp(argv[i],"-of")) - && i < argc-1) + else if ((!strcmp(argv[i], "-o") || !strcmp(argv[i], "-of")) && i < argc - 1) ofname = argv[++i]; - else if(!strcmp(argv[i], "-it") && i < argc-1) + else if (!strcmp(argv[i], "-it") && i < argc - 1) itname = argv[++i]; - else if(!strcmp(argv[i], "-ot") && i < argc-1) + else if (!strcmp(argv[i], "-ot") && i < argc - 1) otname = argv[++i]; - else if(!strcmp(argv[i], "-nt")) + else if (!strcmp(argv[i], "-nt")) notable = 1; else break; } if (i < argc || argc <= 1) { char *u = _("Usage:\n\t%s [-i infont] [-o outfont] " - "[-it intable] [-ot outtable] [-nt]\n"); + "[-it intable] [-ot outtable] [-nt]\n"); fprintf(stderr, u, progname); exit(EX_USAGE); } @@ -355,19 +359,19 @@ } if (readpsffont(ifil, &inbuf, &inbuflth, &fontbuf, &fontbuflth, - &width, &fontlen, 0, - itab ? NULL : &uclistheads) == -1) { + &width, &fontlen, 0, + itab ? NULL : &uclistheads) == -1) { char *u = _("%s: Bad magic number on %s\n"); fprintf(stderr, u, progname, ifname); exit(EX_DATAERR); } fclose(ifil); - charsize = fontbuflth/fontlen; - bytewidth = (width + 7)/8; + charsize = fontbuflth / fontlen; + bytewidth = (width + 7) / 8; if (!bytewidth) bytewidth = 1; - height = charsize / bytewidth; + height = charsize / bytewidth; hastable = (uclistheads != NULL); @@ -397,20 +401,20 @@ exit(EX_DATAERR); } fprintf(otab, - "#\n# Character table extracted from font %s\n#\n", - ifname); - for (i=0; iseq; - while(us) { + while (us) { fprintf(otab, "%sU+%04x", sep, us->uc); - us = us->next; + us = us->next; sep = ", "; } - ul = ul->next; + ul = ul->next; sep = " "; } fprintf(otab, "\n"); @@ -420,7 +424,7 @@ if (ofil) { writepsffont(ofil, fontbuf, width, height, fontlen, psftype, - notable ? NULL : uclistheads); + notable ? NULL : uclistheads); fclose(ofil); } diff -Nru kbd-2.0.3/src/resizecons.c kbd-2.0.4/src/resizecons.c --- kbd-2.0.3/src/resizecons.c 2015-05-04 12:43:16.000000000 +0000 +++ kbd-2.0.4/src/resizecons.c 2016-12-19 15:01:51.000000000 +0000 @@ -68,6 +68,7 @@ * 9 pixel wide characters, but that has nothing to do with the font * data. */ +#include "config.h" #include #include @@ -86,8 +87,8 @@ #include "version.h" #include "kbd_error.h" -#define MODE_RESTORETEXTMODE 0 -#define MODE_VGALINES 1 +#define MODE_RESTORETEXTMODE 0 +#define MODE_VGALINES 1 static void usage(void); @@ -100,171 +101,190 @@ static void vga_set_cursor(int, int); static void vga_set_verticaldisplayend_lowbyte(int); -const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0}; +const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0 }; const char *const suffixes[] = { "", 0 }; -int -main(int argc, char **argv) { - int rr, cc, fd, i, mode; - struct vt_sizes vtsizes; - struct vt_stat vtstat; - struct winsize winsize; - char *p; - char tty[12], cmd[80], infile[1024]; - char *defaultfont; - lkfile_t fp; - - set_progname(argv[0]); - - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE_NAME, LOCALEDIR); - textdomain(PACKAGE_NAME); - - if (argc < 2) - usage(); - - if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); - - rr = 0; /* make gcc happy */ - cc = atoi(argv[1]); - mode = MODE_RESTORETEXTMODE; - if (argc == 3 && strcmp(argv[1], "-lines") == 0) { - mode = MODE_VGALINES; - rr = atoi(argv[2]); - } - else - if (argc == 2 && (p = strchr(argv[1], 'x')) != 0) - rr = atoi(p+1); - else if(argc == 3) - rr = atoi(argv[2]); - else - usage(); - - if (mode == MODE_RESTORETEXTMODE) { - /* prepare for: restoretextmode -r 80x25 */ - sprintf(infile, "%dx%d", cc, rr); - if (lk_findfile(infile, dirpath, suffixes, &fp)) { - kbd_error(EXIT_FAILURE, 0, _("resizecons: cannot find videomode file %s\n"), infile); - } - lk_fpclose(&fp); - } +int main(int argc, char **argv) +{ + int rr, cc, fd, i, mode; + struct vt_sizes vtsizes; + struct vt_stat vtstat; + struct winsize winsize; + char *p; + char tty[12], cmd[80], infile[1024]; + char *defaultfont; + lkfile_t fp; + + set_progname(argv[0]); + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + textdomain(PACKAGE_NAME); + + if (argc < 2) + usage(); + + if (argc == 2 && !strcmp(argv[1], "-V")) + print_version_and_exit(); + + rr = 0; /* make gcc happy */ + cc = atoi(argv[1]); + mode = MODE_RESTORETEXTMODE; + if (argc == 3 && strcmp(argv[1], "-lines") == 0) { + mode = MODE_VGALINES; + rr = atoi(argv[2]); + } else if (argc == 2 && (p = strchr(argv[1], 'x')) != 0) + rr = atoi(p + 1); + else if (argc == 3) + rr = atoi(argv[2]); + else + usage(); - fd = getfd(NULL); + if (mode == MODE_RESTORETEXTMODE) { + /* prepare for: restoretextmode -r 80x25 */ + sprintf(infile, "%dx%d", cc, rr); + if (lk_findfile(infile, dirpath, suffixes, &fp)) { + kbd_error(EXIT_FAILURE, 0, _("resizecons: cannot find videomode file %s\n"), infile); + } + lk_fpclose(&fp); + } - if(ioctl(fd, TIOCGWINSZ, &winsize)) { - kbd_error(EXIT_FAILURE, errno, "ioctl TIOCGWINSZ"); - } + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); - if (mode == MODE_VGALINES) { - /* Get the number of columns. */ - cc = winsize.ws_col; - if (rr != 25 && rr != 28 && rr != 30 && rr != 34 && rr != 36 && - rr != 40 && rr != 44 && rr != 50 && rr != 60) { - kbd_error(EXIT_FAILURE, 0, _("Invalid number of lines\n")); - } - } + if (ioctl(fd, TIOCGWINSZ, &winsize)) { + kbd_error(EXIT_FAILURE, errno, "ioctl TIOCGWINSZ"); + } - if(ioctl(fd, VT_GETSTATE, &vtstat)) { - kbd_error(EXIT_FAILURE, errno, "ioctl VT_GETSTATE"); - } + if (mode == MODE_VGALINES) { + /* Get the number of columns. */ + cc = winsize.ws_col; + if (rr != 25 && rr != 28 && rr != 30 && rr != 34 && rr != 36 && + rr != 40 && rr != 44 && rr != 50 && rr != 60) { + kbd_error(EXIT_FAILURE, 0, _("Invalid number of lines\n")); + } + } - vtsizes.v_rows = rr; - vtsizes.v_cols = cc; - vtsizes.v_scrollsize = 0; + if (ioctl(fd, VT_GETSTATE, &vtstat)) { + kbd_error(EXIT_FAILURE, errno, "ioctl VT_GETSTATE"); + } - vga_init_io(); /* maybe only if (mode == MODE_VGALINES) */ + vtsizes.v_rows = rr; + vtsizes.v_cols = cc; + vtsizes.v_scrollsize = 0; - if(ioctl(fd, VT_RESIZE, &vtsizes)) { - kbd_error(EXIT_FAILURE, errno, "ioctl VT_RESIZE"); - } + vga_init_io(); /* maybe only if (mode == MODE_VGALINES) */ - if (mode == MODE_VGALINES) { - /* Program the VGA registers. */ - int scanlines_old; - int scanlines_new; - int fontheight; - if (winsize.ws_row == 25 || winsize.ws_row == 28 || - winsize.ws_row == 36 || winsize.ws_row == 44 || - winsize.ws_row == 50) - scanlines_old = 400; - else - scanlines_old = 480; - if (rr == 25 || rr == 28 || rr == 36 || rr == 44 || rr == 50) - scanlines_new = 400; - else - scanlines_new = 480; - /* Switch to 400 or 480 scanline vertical timing if required. */ - if (scanlines_old != 400 && scanlines_new == 400) - vga_400_scanlines(); - if (scanlines_old != 480 && scanlines_new == 480) - vga_480_scanlines(); - switch (rr) { - case 25 : fontheight = 16; break; - case 28 : fontheight = 14; break; - case 30 : fontheight = 16; break; - case 34 : fontheight = 14; break; - case 36 : fontheight = 12; break; - case 40 : fontheight = 12; break; - case 44 : fontheight = 9; break; - case 50 : fontheight = 8; break; - case 60 : fontheight = 8; break; - default : fontheight = 8; break; - } - /* Set the VGA character height. */ - vga_set_fontheight(fontheight); - /* Set the line offsets within a character cell of the cursor. */ - if (fontheight >= 10) - vga_set_cursor(fontheight - 3, fontheight - 2); - else - vga_set_cursor(fontheight - 2, fontheight - 1); - /* + if (ioctl(fd, VT_RESIZE, &vtsizes)) { + kbd_error(EXIT_FAILURE, errno, "ioctl VT_RESIZE"); + } + + if (mode == MODE_VGALINES) { + /* Program the VGA registers. */ + int scanlines_old; + int scanlines_new; + int fontheight; + if (winsize.ws_row == 25 || winsize.ws_row == 28 || + winsize.ws_row == 36 || winsize.ws_row == 44 || + winsize.ws_row == 50) + scanlines_old = 400; + else + scanlines_old = 480; + if (rr == 25 || rr == 28 || rr == 36 || rr == 44 || rr == 50) + scanlines_new = 400; + else + scanlines_new = 480; + /* Switch to 400 or 480 scanline vertical timing if required. */ + if (scanlines_old != 400 && scanlines_new == 400) + vga_400_scanlines(); + if (scanlines_old != 480 && scanlines_new == 480) + vga_480_scanlines(); + switch (rr) { + case 25: + fontheight = 16; + break; + case 28: + fontheight = 14; + break; + case 30: + fontheight = 16; + break; + case 34: + fontheight = 14; + break; + case 36: + fontheight = 12; + break; + case 40: + fontheight = 12; + break; + case 44: + fontheight = 9; + break; + case 50: + fontheight = 8; + break; + case 60: + fontheight = 8; + break; + default: + fontheight = 8; + break; + } + /* Set the VGA character height. */ + vga_set_fontheight(fontheight); + /* Set the line offsets within a character cell of the cursor. */ + if (fontheight >= 10) + vga_set_cursor(fontheight - 3, fontheight - 2); + else + vga_set_cursor(fontheight - 2, fontheight - 1); + /* * If there are a few unused scanlines at the bottom of the * screen, make sure they are not displayed (otherwise * there is a annoying changing partial line at the bottom). */ - vga_set_verticaldisplayend_lowbyte((fontheight * rr - 1) & 0xff); - printf(_("Old mode: %dx%d New mode: %dx%d\n"), winsize.ws_col, - winsize.ws_row, cc, rr); - printf(_("Old #scanlines: %d New #scanlines: %d Character height: %d\n"), - scanlines_old, scanlines_new, fontheight); - } + vga_set_verticaldisplayend_lowbyte((fontheight * rr - 1) & 0xff); + printf(_("Old mode: %dx%d New mode: %dx%d\n"), winsize.ws_col, + winsize.ws_row, cc, rr); + printf(_("Old #scanlines: %d New #scanlines: %d Character height: %d\n"), + scanlines_old, scanlines_new, fontheight); + } - if (mode == MODE_RESTORETEXTMODE) { - /* do: restoretextmode -r 25x80 */ - sprintf(cmd, "restoretextmode -r %s\n", fp.pathname); - errno = 0; - if(system(cmd)) { - if(errno) - perror("restoretextmode"); - fprintf(stderr, _("resizecons: the command `%s' failed\n"), cmd); - exit(EXIT_FAILURE); + if (mode == MODE_RESTORETEXTMODE) { + /* do: restoretextmode -r 25x80 */ + sprintf(cmd, "restoretextmode -r %s\n", fp.pathname); + errno = 0; + if (system(cmd)) { + if (errno) + perror("restoretextmode"); + fprintf(stderr, _("resizecons: the command `%s' failed\n"), cmd); + exit(EXIT_FAILURE); + } } - } - /* + /* * for i in /dev/tty[0-9] /dev/tty[0-9][0-9] * do * stty rows $rr cols $cc < $i * done * kill -SIGWINCH `cat /tmp/selection.pid` */ - winsize.ws_row = rr; - winsize.ws_col = cc; - for (i=0; i<16; i++) - if (vtstat.v_state & (1<= 0) { - if(ioctl(fd, TIOCSWINSZ, &winsize)) - kbd_warning(errno, "ioctl TIOCSWINSZ"); - close(fd); - } - } + winsize.ws_row = rr; + winsize.ws_col = cc; + for (i = 0; i < 16; i++) + if (vtstat.v_state & (1 << i)) { + sprintf(tty, "/dev/tty%d", i); + fd = open(tty, O_RDONLY); + if (fd < 0 && errno == ENOENT) { + sprintf(tty, "/dev/vc/%d", i); + fd = open(tty, O_RDONLY); + } + if (fd >= 0) { + if (ioctl(fd, TIOCSWINSZ, &winsize)) + kbd_warning(errno, "ioctl TIOCSWINSZ"); + close(fd); + } + } #if 0 /* Try to tell selection about the change */ @@ -283,51 +303,62 @@ } #endif - /* do: setfont default8x16 */ - /* (other people might wish other fonts - this should be settable) */ + /* do: setfont default8x16 */ + /* (other people might wish other fonts - this should be settable) */ - /* We read the VGA font height register to be sure. */ - /* There isn't much consistency in this. */ - switch (vga_get_fontheight()) { - case 8 : - case 9 : defaultfont = "default8x9"; break; - case 10 : defaultfont = "lat1-10"; break; - case 11 : - case 12 : defaultfont = "lat1-12"; break; - case 13 : - case 14 : defaultfont = "iso01.14"; break; - case 15 : - case 16 : - default : defaultfont = "default8x16"; break; - } + /* We read the VGA font height register to be sure. */ + /* There isn't much consistency in this. */ + switch (vga_get_fontheight()) { + case 8: + case 9: + defaultfont = "default8x9"; + break; + case 10: + defaultfont = "lat1-10"; + break; + case 11: + case 12: + defaultfont = "lat1-12"; + break; + case 13: + case 14: + defaultfont = "iso01.14"; + break; + case 15: + case 16: + default: + defaultfont = "default8x16"; + break; + } - sprintf(cmd, "setfont %s", defaultfont); - errno = 0; - if(system(cmd)) { - if(errno) - perror("setfont"); - fprintf(stderr, "resizecons: the command `%s' failed\n", cmd); - exit(EXIT_FAILURE); - } + sprintf(cmd, "setfont %s", defaultfont); + errno = 0; + if (system(cmd)) { + if (errno) + perror("setfont"); + fprintf(stderr, "resizecons: the command `%s' failed\n", cmd); + exit(EXIT_FAILURE); + } - fprintf(stderr, _("resizecons: don't forget to change TERM " - "(maybe to con%dx%d or linux-%dx%d)\n"), - cc, rr, cc, rr); - if (getenv("LINES") || getenv("COLUMNS")) - fprintf(stderr, - "Also the variables LINES and COLUMNS may need adjusting.\n"); + fprintf(stderr, _("resizecons: don't forget to change TERM " + "(maybe to con%dx%d or linux-%dx%d)\n"), + cc, rr, cc, rr); + if (getenv("LINES") || getenv("COLUMNS")) + fprintf(stderr, + "Also the variables LINES and COLUMNS may need adjusting.\n"); - return EXIT_SUCCESS; + return EXIT_SUCCESS; } -static void __attribute__ ((noreturn)) -usage() { - fprintf(stderr, - _("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")); - exit(EXIT_FAILURE); +static void __attribute__((noreturn)) +usage() +{ + fprintf(stderr, + _("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")); + exit(EXIT_FAILURE); } /* @@ -338,30 +369,31 @@ /* Port I/O macros. Note that these are not compatible with the ones */ /* defined in the kernel header files. */ -static inline void my_outb( int port, int value ) +static inline void my_outb(int port, int value) { - __asm__ volatile ("outb %0,%1" - : : "a" ((unsigned char)value), "d" ((unsigned short)port)); + __asm__ volatile("outb %0,%1" + : + : "a"((unsigned char)value), "d"((unsigned short)port)); } -static inline int my_inb( int port ) +static inline int my_inb(int port) { unsigned char value; - __asm__ volatile ("inb %1,%0" - : "=a" (value) - : "d" ((unsigned short)port)); + __asm__ volatile("inb %1,%0" + : "=a"(value) + : "d"((unsigned short)port)); return value; } - /* VGA textmode register tweaking functions. */ static int crtcport; -static void vga_init_io() { +static void vga_init_io() +{ if (iopl(3) < 0) { fprintf(stderr, - _("resizecons: cannot get I/O permissions.\n")); + _("resizecons: cannot get I/O permissions.\n")); exit(EXIT_FAILURE); } crtcport = 0x3d4; @@ -369,31 +401,36 @@ crtcport = 0x3b4; } -static void vga_set_fontheight( int h ) { +static void vga_set_fontheight(int h) +{ my_outb(crtcport, 0x09); my_outb(crtcport + 1, (my_inb(crtcport + 1) & 0xe0) | (h - 1)); } -static int vga_get_fontheight() { +static int vga_get_fontheight() +{ my_outb(crtcport, 0x09); return (my_inb(crtcport + 1) & 0x1f) + 1; } -static void vga_set_cursor( int top, int bottom ) { +static void vga_set_cursor(int top, int bottom) +{ my_outb(crtcport, 0x0a); my_outb(crtcport + 1, (my_inb(crtcport + 1) & 0xc0) | top); my_outb(crtcport, 0x0b); my_outb(crtcport + 1, (my_inb(crtcport + 1) & 0xe0) | bottom); } -static void vga_set_verticaldisplayend_lowbyte( int byte ) { +static void vga_set_verticaldisplayend_lowbyte(int byte) +{ /* CRTC register 0x12 */ /* vertical display end */ my_outb(crtcport, 0x12); my_outb(crtcport + 1, byte); } -static void vga_480_scanlines() { +static void vga_480_scanlines() +{ /* CRTC register 0x11 */ /* vertical sync end (also unlocks CR0-7) */ my_outb(crtcport, 0x11); @@ -434,7 +471,8 @@ my_outb(0x3c2, (my_inb(0x3cc) & 0x0d) | 0xe2); } -static void vga_400_scanlines() { +static void vga_400_scanlines() +{ /* CRTC register 0x11 */ /* vertical sync end (also unlocks CR0-7) */ my_outb(crtcport, 0x11); diff -Nru kbd-2.0.3/src/screendump.c kbd-2.0.4/src/screendump.c --- kbd-2.0.3/src/screendump.c 2015-05-04 12:30:56.000000000 +0000 +++ kbd-2.0.4/src/screendump.c 2016-12-19 15:01:51.000000000 +0000 @@ -16,6 +16,8 @@ * done * and give them your favourite owners and permissions. */ +#include "config.h" + #include #include #include @@ -27,73 +29,72 @@ #include "version.h" #include "kbd_error.h" -int -main(int argc, char **argv) { - int cons = 0; - char infile[20]; - unsigned char header[4]; - unsigned int rows, cols; - int fd; - unsigned int i, j; - char *inbuf, *outbuf, *p, *q; - - set_progname(argv[0]); - - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE_NAME, LOCALEDIR); - textdomain(PACKAGE_NAME); - - if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); - - if (argc > 2) { - fprintf(stderr, _("usage: screendump [n]\n")); - exit(EXIT_FAILURE); - } - - cons = (argc == 2) ? atoi(argv[1]) : 0; - - sprintf(infile, "/dev/vcsa%d", cons); - fd = open(infile, O_RDONLY); - if (fd < 0 && cons == 0 && errno == ENOENT) { - sprintf(infile, "/dev/vcsa"); - fd = open(infile, O_RDONLY); - } - if (fd < 0 && errno == ENOENT) { - sprintf(infile, "/dev/vcs/a%d", cons); - fd = open(infile, O_RDONLY); - } - if (fd < 0 && cons == 0 && errno == ENOENT) { - sprintf(infile, "/dev/vcs/a"); - fd = open(infile, O_RDONLY); - } - if (fd < 0 || read(fd, header, 4) != 4) - goto try_ioctl; - rows = header[0]; - cols = header[1]; - if (rows * cols == 0) - goto try_ioctl; - inbuf = xmalloc(rows*cols*2); - outbuf = xmalloc(rows*(cols+1)); - - if (read(fd, inbuf, rows*cols*2) != (ssize_t) (rows*cols*2)) { - kbd_error(EXIT_FAILURE, errno, _("Error reading %s"), infile); - } - p = inbuf; - q = outbuf; - for(i=0; i 0 && q[-1] == ' ') - q--; - *q++ = '\n'; - } - goto done; +int main(int argc, char **argv) +{ + int cons = 0; + char infile[20]; + unsigned char header[4]; + unsigned int rows, cols; + int fd; + unsigned int i, j; + char *inbuf, *outbuf, *p, *q; + + set_progname(argv[0]); + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + textdomain(PACKAGE_NAME); + + if (argc == 2 && !strcmp(argv[1], "-V")) + print_version_and_exit(); + + if (argc > 2) { + fprintf(stderr, _("usage: screendump [n]\n")); + exit(EXIT_FAILURE); + } + + cons = (argc == 2) ? atoi(argv[1]) : 0; + + sprintf(infile, "/dev/vcsa%d", cons); + fd = open(infile, O_RDONLY); + if (fd < 0 && cons == 0 && errno == ENOENT) { + sprintf(infile, "/dev/vcsa"); + fd = open(infile, O_RDONLY); + } + if (fd < 0 && errno == ENOENT) { + sprintf(infile, "/dev/vcs/a%d", cons); + fd = open(infile, O_RDONLY); + } + if (fd < 0 && cons == 0 && errno == ENOENT) { + sprintf(infile, "/dev/vcs/a"); + fd = open(infile, O_RDONLY); + } + if (fd < 0 || read(fd, header, 4) != 4) + goto try_ioctl; + rows = header[0]; + cols = header[1]; + if (rows * cols == 0) + goto try_ioctl; + inbuf = xmalloc(rows * cols * 2); + outbuf = xmalloc(rows * (cols + 1)); + + if (read(fd, inbuf, rows * cols * 2) != (ssize_t)(rows * cols * 2)) { + kbd_error(EXIT_FAILURE, errno, _("Error reading %s"), infile); + } + p = inbuf; + q = outbuf; + for (i = 0; i < rows; i++) { + for (j = 0; j < cols; j++) { + *q++ = *p; + p += 2; + } + while (j-- > 0 && q[-1] == ' ') + q--; + *q++ = '\n'; + } + goto done; -try_ioctl: - { +try_ioctl : { struct winsize win; char consnam[20], devfsconsnam[20]; unsigned char *screenbuf; @@ -101,62 +102,62 @@ sprintf(consnam, "/dev/tty%d", cons); fd = open(consnam, O_RDONLY); if (fd < 0 && errno == ENOENT) { - sprintf(devfsconsnam, "/dev/vc/%d", cons); - fd = open(devfsconsnam, O_RDONLY); - if (fd < 0) - errno = ENOENT; + sprintf(devfsconsnam, "/dev/vc/%d", cons); + fd = open(devfsconsnam, O_RDONLY); + if (fd < 0) + errno = ENOENT; } if (fd < 0) { - perror(consnam); - fd = 0; + perror(consnam); + fd = 0; } if (ioctl(fd, TIOCGWINSZ, &win)) { - kbd_error(EXIT_FAILURE, errno, "ioctl TIOCGWINSZ"); + kbd_error(EXIT_FAILURE, errno, "ioctl TIOCGWINSZ"); } - screenbuf = xmalloc(2 + win.ws_row * win.ws_col); + screenbuf = xmalloc(2 + win.ws_row * win.ws_col); screenbuf[0] = 0; - screenbuf[1] = (unsigned char) cons; + screenbuf[1] = (unsigned char)cons; - if (ioctl(fd,TIOCLINUX,screenbuf) && - (!fd || ioctl(0,TIOCLINUX,screenbuf))) { + if (ioctl(fd, TIOCLINUX, screenbuf) && + (!fd || ioctl(0, TIOCLINUX, screenbuf))) { #if 0 perror("TIOCLINUX"); fprintf(stderr,_("couldn't read %s, and cannot ioctl dump\n"), infile); #else - /* we tried this just to be sure, but TIOCLINUX + /* we tried this just to be sure, but TIOCLINUX function 0 has been disabled since 1.1.92 Do not mention `ioctl dump' in error msg */ - kbd_warning(0, _("couldn't read %s\n"), infile); + kbd_warning(0, _("couldn't read %s\n"), infile); #endif - return EXIT_FAILURE; + return EXIT_FAILURE; } - rows = screenbuf[0]; - cols = screenbuf[1]; + rows = screenbuf[0]; + cols = screenbuf[1]; if (rows != win.ws_row || cols != win.ws_col) { - kbd_error(EXIT_FAILURE, 0, - _("Strange ... screen is both %dx%d and %dx%d ??\n"), - win.ws_col, win.ws_row, cols, rows); + kbd_error(EXIT_FAILURE, 0, + _("Strange ... screen is both %dx%d and %dx%d ??\n"), + win.ws_col, win.ws_row, cols, rows); } - outbuf = xmalloc(rows*(cols+1)); - p = ((char *)screenbuf) + 2; - q = outbuf; - for (i=0; i 0 && (q[-1] == ' ')) - q--; - *q++ = '\n'; - } - } + outbuf = xmalloc(rows * (cols + 1)); + p = ((char *)screenbuf) + 2; + q = outbuf; + for (i = 0; i < rows; i++) { + for (j = 0; j < cols; j++) + *q++ = *p++; + while (j-- > 0 && (q[-1] == ' ')) + q--; + *q++ = '\n'; + } +} done: - if (write(1, outbuf, q-outbuf) != q-outbuf) { - kbd_error(EXIT_FAILURE, 0, _("Error writing screendump\n")); - } + if (write(1, outbuf, q - outbuf) != q - outbuf) { + kbd_error(EXIT_FAILURE, 0, _("Error writing screendump\n")); + } - return EXIT_SUCCESS; + return EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/setfont.c kbd-2.0.4/src/setfont.c --- kbd-2.0.3/src/setfont.c 2015-06-28 22:04:45.000000000 +0000 +++ kbd-2.0.4/src/setfont.c 2017-01-08 18:36:15.000000000 +0000 @@ -9,6 +9,7 @@ * font positions, and the second [-u] giving the correspondence between * font positions and Unicode values. */ +#include "config.h" #include #include @@ -33,78 +34,81 @@ #include "xmalloc.h" #include "nls.h" #include "version.h" +#include "kbd_error.h" static int position_codepage(int iunit); static void saveoldfont(int fd, char *ofil); static void saveoldfontplusunicodemap(int fd, char *Ofil); static void loadnewfont(int fd, char *ifil, - int iunit, int hwunit, int no_m, int no_u); + int iunit, int hwunit, int no_m, int no_u); static void loadnewfonts(int fd, char **ifiles, int ifilct, - int iunit, int hwunit, int no_m, int no_u); + int iunit, int hwunit, int no_m, int no_u); extern void saveoldmap(int fd, char *omfil); extern void loadnewmap(int fd, char *mfil); extern void activatemap(int fd); extern void disactivatemap(int fd); int verbose = 0; -int force = 0; -int debug = 0; +int force = 0; +int debug = 0; /* search for the font in these directories (with trailing /) */ -const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; +const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 }; /* hide partial fonts a bit - loading a single one is a bad idea */ -const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; +const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; const char *const partfontsuffixes[] = { "", 0 }; static inline int -findfont(char *fnam, lkfile_t *fp) { - return lk_findfile(fnam, fontdirpath, fontsuffixes, fp); +findfont(char *fnam, lkfile_t *fp) +{ + return lk_findfile(fnam, fontdirpath, fontsuffixes, fp); } static inline int -findpartialfont(char *fnam, lkfile_t *fp) { - return lk_findfile(fnam, partfontdirpath, partfontsuffixes, fp); +findpartialfont(char *fnam, lkfile_t *fp) +{ + return lk_findfile(fnam, partfontdirpath, partfontsuffixes, fp); } -static void __attribute__ ((noreturn)) +static void __attribute__((noreturn)) usage(void) { - fprintf(stderr, _( -"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" -" -om Write current consolemap to \n" -" -ou Write current unicodemap to \n" -"If no newfont and no -[o|O|om|ou|m|u] option is given,\n" -"a default font is loaded:\n" -" setfont Load font \"default[.gz]\"\n" -" setfont - Load font \"default8x[.gz]\"\n" -"The - option selects a font from a codepage that contains three fonts:\n" -" setfont -{8|14|16} codepage.cp[.gz] Load 8x font from codepage.cp\n" -"Explicitly (with -m or -u) or implicitly (in the fontfile) given mappings\n" -"will be loaded and, in the case of consolemaps, activated.\n" -" -h (no space) Override font height.\n" -" -m Load console screen map.\n" -" -u Load font unicode map.\n" -" -m none Suppress loading and activation of a screen map.\n" -" -u none Suppress loading of a unicode map.\n" -" -v Be verbose.\n" -" -C Indicate console device to be used.\n" -" -V Print version and exit.\n" -"Files are loaded from the current directory or %s/*/.\n" -), DATADIR); + fprintf(stderr, _( + "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" + " -om Write current consolemap to \n" + " -ou Write current unicodemap to \n" + "If no newfont and no -[o|O|om|ou|m|u] option is given,\n" + "a default font is loaded:\n" + " setfont Load font \"default[.gz]\"\n" + " setfont - Load font \"default8x[.gz]\"\n" + "The - option selects a font from a codepage that contains three fonts:\n" + " setfont -{8|14|16} codepage.cp[.gz] Load 8x font from codepage.cp\n" + "Explicitly (with -m or -u) or implicitly (in the fontfile) given mappings\n" + "will be loaded and, in the case of consolemaps, activated.\n" + " -h (no space) Override font height.\n" + " -m Load console screen map.\n" + " -u Load font unicode map.\n" + " -m none Suppress loading and activation of a screen map.\n" + " -u none Suppress loading of a unicode map.\n" + " -v Be verbose.\n" + " -C Indicate console device to be used.\n" + " -V Print version and exit.\n" + "Files are loaded from the current directory or %s/*/.\n"), + DATADIR); exit(EX_USAGE); } #define MAXIFILES 256 -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ char *ifiles[MAXIFILES]; char *mfil, *ufil, *Ofil, *ofil, *omfil, *oufil, *console; - int ifilct = 0, fd, i, iunit, hwunit, no_m, no_u; + int ifilct = 0, fd, i, iunit, hwunit, no_m, no_u; int restore = 0; set_progname(argv[0]); @@ -116,126 +120,126 @@ ifiles[0] = mfil = ufil = Ofil = ofil = omfil = oufil = NULL; iunit = hwunit = 0; no_m = no_u = 0; - console = NULL; + console = NULL; /* * No getopt() here because of the -om etc options. */ for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-V")) { - print_version_and_exit(); - } else if (!strcmp(argv[i], "-v")) { - verbose++; - } else if (!strcmp(argv[i], "-R")) { - restore = 1; - } else if (!strcmp(argv[i], "-C")) { - if (++i == argc || console) - usage(); - console = argv[i]; - } else if (!strcmp(argv[i], "-O")) { - if (++i == argc || Ofil) - usage(); - Ofil = argv[i]; - } else if (!strcmp(argv[i], "-o")) { - if (++i == argc || ofil) - usage(); - ofil = argv[i]; - } else if (!strcmp(argv[i], "-om")) { - if (++i == argc || omfil) - usage(); - omfil = argv[i]; - } else if (!strcmp(argv[i], "-ou")) { - if (++i == argc || oufil) - usage(); - oufil = argv[i]; - } else if (!strcmp(argv[i], "-m")) { - if (++i == argc || mfil) - usage(); - if (!strcmp(argv[i], "none")) - no_m = 1; - else - mfil = argv[i]; - } else if (!strcmp(argv[i], "-u")) { - if (++i == argc || ufil) - usage(); - if (!strcmp(argv[i], "none")) - no_u = 1; - else - ufil = argv[i]; - } else if (!strcmp(argv[i], "-f")) { - force = 1; - } else if (!strncmp(argv[i], "-h", 2)) { - hwunit = atoi(argv[i]+2); - if (hwunit <= 0 || hwunit > 32) - usage(); - } else if (argv[i][0] == '-') { - iunit = atoi(argv[i]+1); - if(iunit <= 0 || iunit > 32) - usage(); - } else { - if (ifilct == MAXIFILES) { - fprintf(stderr, _("setfont: too many input files\n")); - exit(EX_USAGE); + if (!strcmp(argv[i], "-V")) { + print_version_and_exit(); + } else if (!strcmp(argv[i], "-v")) { + verbose++; + } else if (!strcmp(argv[i], "-R")) { + restore = 1; + } else if (!strcmp(argv[i], "-C")) { + if (++i == argc || console) + usage(); + console = argv[i]; + } else if (!strcmp(argv[i], "-O")) { + if (++i == argc || Ofil) + usage(); + Ofil = argv[i]; + } else if (!strcmp(argv[i], "-o")) { + if (++i == argc || ofil) + usage(); + ofil = argv[i]; + } else if (!strcmp(argv[i], "-om")) { + if (++i == argc || omfil) + usage(); + omfil = argv[i]; + } else if (!strcmp(argv[i], "-ou")) { + if (++i == argc || oufil) + usage(); + oufil = argv[i]; + } else if (!strcmp(argv[i], "-m")) { + if (++i == argc || mfil) + usage(); + if (!strcmp(argv[i], "none")) + no_m = 1; + else + mfil = argv[i]; + } else if (!strcmp(argv[i], "-u")) { + if (++i == argc || ufil) + usage(); + if (!strcmp(argv[i], "none")) + no_u = 1; + else + ufil = argv[i]; + } else if (!strcmp(argv[i], "-f")) { + force = 1; + } else if (!strncmp(argv[i], "-h", 2)) { + hwunit = atoi(argv[i] + 2); + if (hwunit <= 0 || hwunit > 32) + usage(); + } else if (argv[i][0] == '-') { + iunit = atoi(argv[i] + 1); + if (iunit <= 0 || iunit > 32) + usage(); + } else { + if (ifilct == MAXIFILES) { + fprintf(stderr, _("setfont: too many input files\n")); + exit(EX_USAGE); + } + ifiles[ifilct++] = argv[i]; } - ifiles[ifilct++] = argv[i]; - } } if (ifilct && restore) { - fprintf(stderr, _("setfont: cannot both restore from character ROM" - " and from file. Font unchanged.\n")); - exit(EX_USAGE); + fprintf(stderr, _("setfont: cannot both restore from character ROM" + " and from file. Font unchanged.\n")); + exit(EX_USAGE); } - fd = getfd(console); + if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); int kd_mode = -1; - if (!ioctl(fd, KDGETMODE, &kd_mode) && (kd_mode == KD_GRAPHICS)) - { - /* - * PIO_FONT will fail on a console which is in foreground and in KD_GRAPHICS mode. - * 2005-03-03, jw@suse.de. - */ - if (verbose) - printf("setfont: graphics console %s skipped\n", console?console:""); - close(fd); - return 0; - } + if (!ioctl(fd, KDGETMODE, &kd_mode) && (kd_mode == KD_GRAPHICS)) { + /* + * PIO_FONT will fail on a console which is in foreground and in KD_GRAPHICS mode. + * 2005-03-03, jw@suse.de. + */ + if (verbose) + printf("setfont: graphics console %s skipped\n", console ? console : ""); + close(fd); + return 0; + } if (!ifilct && !mfil && !ufil && !Ofil && !ofil && !omfil && !oufil && !restore) - /* reset to some default */ - ifiles[ifilct++] = ""; + /* reset to some default */ + ifiles[ifilct++] = ""; if (Ofil) - saveoldfontplusunicodemap(fd, Ofil); + saveoldfontplusunicodemap(fd, Ofil); if (ofil) - saveoldfont(fd, ofil); + saveoldfont(fd, ofil); if (omfil) - saveoldmap(fd, omfil); + saveoldmap(fd, omfil); if (oufil) - saveunicodemap(fd, oufil); + saveunicodemap(fd, oufil); if (mfil) { - loadnewmap(fd, mfil); - activatemap(fd); - no_m = 1; + loadnewmap(fd, mfil); + activatemap(fd); + no_m = 1; } if (ufil) - no_u = 1; + no_u = 1; if (restore) - restorefont(fd); + restorefont(fd); if (ifilct) - loadnewfonts(fd, ifiles, ifilct, iunit, hwunit, no_m, no_u); + loadnewfonts(fd, ifiles, ifilct, iunit, hwunit, no_m, no_u); if (ufil) - loadunicodemap(fd, ufil); + loadunicodemap(fd, ufil); return 0; } @@ -247,12 +251,13 @@ static void do_loadfont(int fd, char *inbuf, int width, int height, int hwunit, - int fontsize, char *filename) { + int fontsize, char *filename) +{ unsigned char *buf; int i, buflen; - int bytewidth = (width+7)/8; - int charsize = height * bytewidth; - int kcharsize = 32 * bytewidth; + int bytewidth = (width + 7) / 8; + int charsize = height * bytewidth; + int kcharsize = 32 * bytewidth; int bad_video_erase_char = 0; if (height < 1 || height > 32) { @@ -268,11 +273,11 @@ hwunit = height; buflen = kcharsize * ((fontsize < 128) ? 128 : fontsize); - buf = xmalloc(buflen); - memset(buf,0,buflen); + buf = xmalloc(buflen); + memset(buf, 0, buflen); for (i = 0; i < fontsize; i++) - memcpy(buf+(i*kcharsize), inbuf+(i*charsize), charsize); + memcpy(buf + (i * kcharsize), inbuf + (i * charsize), charsize); /* * Due to a kernel bug, font position 32 is used @@ -281,24 +286,24 @@ */ if (erase_mode) { for (i = 0; i < kcharsize; i++) - if (buf[32*kcharsize+i]) + if (buf[32 * kcharsize + i]) bad_video_erase_char = 1; if (bad_video_erase_char) { fprintf(stderr, - _("%s: font position 32 is nonblank\n"), - progname); - switch(erase_mode) { - case 3: - exit(EX_DATAERR); - case 2: - for (i = 0; i < kcharsize; i++) - buf[32*kcharsize+i] = 0; - fprintf(stderr, _("%s: wiped it\n"), progname); - break; - case 1: - fprintf(stderr, - _("%s: background will look funny\n"), - progname); + _("%s: font position 32 is nonblank\n"), + progname); + switch (erase_mode) { + case 3: + exit(EX_DATAERR); + case 2: + for (i = 0; i < kcharsize; i++) + buf[32 * kcharsize + i] = 0; + fprintf(stderr, _("%s: wiped it\n"), progname); + break; + case 1: + fprintf(stderr, + _("%s: background will look funny\n"), + progname); } fflush(stderr); sleep(2); @@ -325,7 +330,8 @@ } static void -do_loadtable(int fd, struct unicode_list *uclistheads, int fontsize) { +do_loadtable(int fd, struct unicode_list *uclistheads, int fontsize) +{ struct unimapdesc ud; struct unipair *up; int i, ct = 0, maxct; @@ -335,9 +341,9 @@ maxct = 0; for (i = 0; i < fontsize; i++) { ul = uclistheads[i].next; - while(ul) { + while (ul) { us = ul->seq; - if (us && ! us->next) + if (us && !us->next) maxct++; ul = ul->next; } @@ -345,28 +351,30 @@ up = xmalloc(maxct * sizeof(struct unipair)); for (i = 0; i < fontsize; i++) { ul = uclistheads[i].next; - if (debug) printf ("char %03x:", i); - while(ul) { + if (debug) + printf("char %03x:", i); + while (ul) { us = ul->seq; - if (us && ! us->next) { + if (us && !us->next) { up[ct].unicode = us->uc; up[ct].fontpos = i; ct++; - if (debug) printf (" %04x", us->uc); - } - else - if (debug) { - printf (" seq: <"); - while (us) { - printf (" %04x", us->uc); - us = us->next; - } - printf (" >"); + if (debug) + printf(" %04x", us->uc); + } else if (debug) { + printf(" seq: <"); + while (us) { + printf(" %04x", us->uc); + us = us->next; } + printf(" >"); + } ul = ul->next; - if (debug) printf (","); + if (debug) + printf(","); } - if (debug) printf ("\n"); + if (debug) + printf("\n"); } if (ct != maxct) { char *u = _("%s: bug in do_loadtable\n"); @@ -375,17 +383,17 @@ } if (verbose) - printf(_("Loading Unicode mapping table...\n")); + printf(_("Loading Unicode mapping table...\n")); ud.entry_ct = ct; - ud.entries = up; + ud.entries = up; if (loadunimap(fd, NULL, &ud)) exit(EX_OSERR); } static void loadnewfonts(int fd, char **ifiles, int ifilct, - int iunit, int hwunit, int no_m, int no_u) + int iunit, int hwunit, int no_m, int no_u) { char *ifil, *inbuf, *fontbuf, *bigfontbuf; int inputlth, fontbuflth, fontsize, height, width, bytewidth; @@ -401,14 +409,14 @@ /* several fonts that must be merged */ /* We just concatenate the bitmaps - only allow psf fonts */ - bigfontbuf = NULL; + bigfontbuf = NULL; bigfontbuflth = 0; - bigfontsize = 0; - uclistheads = NULL; - bigheight = 0; - bigwidth = 0; + bigfontsize = 0; + uclistheads = NULL; + bigheight = 0; + bigwidth = 0; - for (i=0; i 32) iunit = 0; @@ -509,18 +517,18 @@ inbuf = fontbuf = NULL; inputlth = fontbuflth = fontsize = 0; - width = 8; - uclistheads = NULL; - if(readpsffont(fp.fd, &inbuf, &inputlth, &fontbuf, &fontbuflth, - &width, &fontsize, 0, - no_u ? NULL : &uclistheads) == 0) { + width = 8; + uclistheads = NULL; + if (readpsffont(fp.fd, &inbuf, &inputlth, &fontbuf, &fontbuflth, + &width, &fontsize, 0, + no_u ? NULL : &uclistheads) == 0) { lk_fpclose(&fp); /* we've got a psf font */ - bytewidth = (width+7) / 8; - height = fontbuflth / (bytewidth * fontsize); + bytewidth = (width + 7) / 8; + height = fontbuflth / (bytewidth * fontsize); do_loadfont(fd, fontbuf, width, height, hwunit, - fontsize, fp.pathname); + fontsize, fp.pathname); if (uclistheads && !no_u) do_loadtable(fd, uclistheads, fontsize); #if 1 @@ -529,45 +537,46 @@ #endif return; } - lk_fpclose(&fp); // avoid zombies, jw@suse.de (#88501) + lk_fpclose(&fp); // avoid zombies, jw@suse.de (#88501) /* instructions to combine fonts? */ - { char *combineheader = "# combine partial fonts\n"; - int chlth = strlen(combineheader); - char *p, *q; - if (inputlth >= chlth && !strncmp(inbuf, combineheader, chlth)) { - char *ifiles[MAXIFILES]; - int ifilct = 0; - q = inbuf + chlth; - while(q < inbuf + inputlth) { - p = q; - while (q < inbuf+inputlth && *q != '\n') - q++; - if (q == inbuf+inputlth) { - fprintf(stderr, - _("No final newline in combine file\n")); - exit(EX_DATAERR); - } - *q++ = 0; - if (ifilct == MAXIFILES) { - fprintf(stderr, - _("Too many files to combine\n")); - exit(EX_DATAERR); - } - ifiles[ifilct++] = p; - } - /* recursive call */ - loadnewfonts(fd, ifiles, ifilct, iunit, hwunit, no_m, no_u); - return; - } + { + char *combineheader = "# combine partial fonts\n"; + int chlth = strlen(combineheader); + char *p, *q; + if (inputlth >= chlth && !strncmp(inbuf, combineheader, chlth)) { + char *ifiles[MAXIFILES]; + int ifilct = 0; + q = inbuf + chlth; + while (q < inbuf + inputlth) { + p = q; + while (q < inbuf + inputlth && *q != '\n') + q++; + if (q == inbuf + inputlth) { + fprintf(stderr, + _("No final newline in combine file\n")); + exit(EX_DATAERR); + } + *q++ = 0; + if (ifilct == MAXIFILES) { + fprintf(stderr, + _("Too many files to combine\n")); + exit(EX_DATAERR); + } + ifiles[ifilct++] = p; + } + /* recursive call */ + loadnewfonts(fd, ifiles, ifilct, iunit, hwunit, no_m, no_u); + return; + } } /* file with three code pages? */ if (inputlth == 9780) { - offset = position_codepage(iunit); - height = iunit; + offset = position_codepage(iunit); + height = iunit; fontsize = 256; - width = 8; + width = 8; } else if (inputlth == 32768) { /* restorefont -w writes a SVGA font to file restorefont -r restores it @@ -576,12 +585,12 @@ and it always is, there is no default font that is saved, so probably the second half is always garbage. */ fprintf(stderr, _("Hmm - a font from restorefont? " - "Using the first half.\n")); - inputlth = 16384; /* ignore rest */ + "Using the first half.\n")); + inputlth = 16384; /* ignore rest */ fontsize = 512; - offset = 0; - width = 8; - height = 32; + offset = 0; + width = 8; + height = 32; if (!hwunit) hwunit = 16; } else { @@ -596,77 +605,82 @@ exit(EX_DATAERR); } fontsize = 256; - width = 8; - height = inputlth/256; + width = 8; + height = inputlth / 256; } - do_loadfont(fd, inbuf+offset, width, height, hwunit, fontsize, - fp.pathname); + do_loadfont(fd, inbuf + offset, width, height, hwunit, fontsize, + fp.pathname); } static int -position_codepage(int iunit) { - int offset; +position_codepage(int iunit) +{ + int offset; /* code page: first 40 bytes, then 8x16 font, then 6 bytes, then 8x14 font, then 6 bytes, then 8x8 font */ if (!iunit) { - fprintf(stderr, - _("This file contains 3 fonts: 8x8, 8x14 and 8x16." - " Please indicate\n" - "using an option -8 or -14 or -16 " - "which one you want loaded.\n")); - exit(EX_USAGE); + fprintf(stderr, + _("This file contains 3 fonts: 8x8, 8x14 and 8x16." + " Please indicate\n" + "using an option -8 or -14 or -16 " + "which one you want loaded.\n")); + exit(EX_USAGE); } switch (iunit) { - case 8: - offset = 7732; break; - case 14: - offset = 4142; break; - case 16: - offset = 40; break; - default: - fprintf(stderr, _("You asked for font size %d, " - "but only 8, 14, 16 are possible here.\n"), - iunit); - exit(EX_USAGE); + case 8: + offset = 7732; + break; + case 14: + offset = 4142; + break; + case 16: + offset = 40; + break; + default: + fprintf(stderr, _("You asked for font size %d, " + "but only 8, 14, 16 are possible here.\n"), + iunit); + exit(EX_USAGE); } return offset; } static void do_saveoldfont(int fd, char *ofil, FILE *fpo, int unimap_follows, - int *count, int *utf8) { + int *count, int *utf8) +{ /* this is the max font size the kernel is willing to handle */ -#define MAXFONTSIZE 65536 +#define MAXFONTSIZE 65536 unsigned char buf[MAXFONTSIZE]; int i, ct, width, height, bytewidth, charsize, kcharsize; - ct = sizeof(buf)/(32*32/8); /* max size 32x32, 8 bits/byte */ + ct = sizeof(buf) / (32 * 32 / 8); /* max size 32x32, 8 bits/byte */ if (getfont(fd, buf, &ct, &width, &height)) exit(EX_OSERR); /* save as efficiently as possible */ bytewidth = (width + 7) / 8; - height = font_charheight(buf, ct, width); - charsize = height * bytewidth; + height = font_charheight(buf, ct, width); + charsize = height * bytewidth; kcharsize = 32 * bytewidth; - /* Do we need a psf header? */ - /* Yes if ct==512 - otherwise we cannot distinguish +/* Do we need a psf header? */ +/* Yes if ct==512 - otherwise we cannot distinguish a 512-char 8x8 and a 256-char 8x16 font. */ -#define ALWAYS_PSF_HEADER 1 +#define ALWAYS_PSF_HEADER 1 if (ct != 256 || width != 8 || unimap_follows || ALWAYS_PSF_HEADER) { int psftype = 1; - int flags = 0; + int flags = 0; if (unimap_follows) flags |= WPSFH_HASTAB; - writepsffontheader (fpo, width, height, ct, &psftype, flags); + writepsffontheader(fpo, width, height, ct, &psftype, flags); if (utf8) *utf8 = (psftype == 2); } @@ -675,7 +689,7 @@ fprintf(stderr, _("Found nothing to save\n")); } else { for (i = 0; i < ct; i++) { - if (fwrite(buf+(i*kcharsize), charsize, 1, fpo) != 1) { + if (fwrite(buf + (i * kcharsize), charsize, 1, fpo) != 1) { fprintf(stderr, _("Cannot write font file")); exit(EX_IOERR); } @@ -691,31 +705,33 @@ } static void -saveoldfont(int fd, char *ofil) { - FILE *fpo; +saveoldfont(int fd, char *ofil) +{ + FILE *fpo; - if((fpo = fopen(ofil, "w")) == NULL) { - perror(ofil); - exit(EX_CANTCREAT); - } - do_saveoldfont(fd, ofil, fpo, 0, NULL, NULL); - fclose(fpo); + if ((fpo = fopen(ofil, "w")) == NULL) { + perror(ofil); + exit(EX_CANTCREAT); + } + do_saveoldfont(fd, ofil, fpo, 0, NULL, NULL); + fclose(fpo); } static void -saveoldfontplusunicodemap(int fd, char *Ofil) { - FILE *fpo; - int ct; - int utf8 = 0; - - if((fpo = fopen(Ofil, "w")) == NULL) { - perror(Ofil); - exit(EX_CANTCREAT); - } - ct = 0; - do_saveoldfont(fd, Ofil, fpo, 1, &ct, &utf8); - appendunicodemap(fd, fpo, ct, utf8); - fclose(fpo); +saveoldfontplusunicodemap(int fd, char *Ofil) +{ + FILE *fpo; + int ct; + int utf8 = 0; + + if ((fpo = fopen(Ofil, "w")) == NULL) { + perror(Ofil); + exit(EX_CANTCREAT); + } + ct = 0; + do_saveoldfont(fd, Ofil, fpo, 1, &ct, &utf8); + appendunicodemap(fd, fpo, ct, utf8); + fclose(fpo); } /* Only on the current console? On all allocated consoles? */ @@ -725,17 +741,18 @@ /* For the moment: only the current console, only the G0 set */ static void -send_escseq(int fd, char *seq, int n) { - if (write(fd, seq, n) != n) /* maybe fd is read-only */ +send_escseq(int fd, char *seq, int n) +{ + if (write(fd, seq, n) != n) /* maybe fd is read-only */ printf("%s", seq); } -void -activatemap(int fd) { +void activatemap(int fd) +{ send_escseq(fd, "\033(K", 3); } -void -disactivatemap(int fd) { +void disactivatemap(int fd) +{ send_escseq(fd, "\033(B", 3); } diff -Nru kbd-2.0.3/src/setkeycodes.c kbd-2.0.4/src/setkeycodes.c --- kbd-2.0.3/src/setkeycodes.c 2015-05-04 12:22:11.000000000 +0000 +++ kbd-2.0.4/src/setkeycodes.c 2016-12-19 15:01:51.000000000 +0000 @@ -5,6 +5,8 @@ * * aeb, 941108, 2004-01-11 */ +#include "config.h" + #include #include #include @@ -16,18 +18,19 @@ #include "version.h" #include "kbd_error.h" -static void __attribute__ ((noreturn)) -usage(char *s) { +static void __attribute__((noreturn)) +usage(char *s) +{ fprintf(stderr, "setkeycode: %s\n", s); fprintf(stderr, _( - "usage: setkeycode scancode keycode ...\n" - " (where scancode is either xx or e0xx, given in hexadecimal,\n" - " and keycode is given in decimal)\n")); + "usage: setkeycode scancode keycode ...\n" + " (where scancode is either xx or e0xx, given in hexadecimal,\n" + " and keycode is given in decimal)\n")); exit(EXIT_FAILURE); } -int -main(int argc, char **argv) { +int main(int argc, char **argv) +{ char *ep; int fd; struct kbkeycode a; @@ -43,16 +46,18 @@ if (argc % 2 != 1) usage(_("even number of arguments expected")); - fd = getfd(NULL); + + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); while (argc > 2) { - a.keycode = atoi(argv[2]); + a.keycode = atoi(argv[2]); a.scancode = strtol(argv[1], &ep, 16); if (*ep) usage(_("error reading scancode")); if (a.scancode >= 0xe000) { a.scancode -= 0xe000; - a.scancode += 128; /* some kernels needed +256 */ + a.scancode += 128; /* some kernels needed +256 */ } #if 0 /* Test is OK up to 2.5.31--later kernels have more keycodes */ @@ -64,10 +69,10 @@ (a.scancode > 255 || a.keycode > 239) but we can leave testing to the kernel. */ #endif - if (ioctl(fd,KDSETKEYCODE,&a)) { + if (ioctl(fd, KDSETKEYCODE, &a)) { kbd_error(EXIT_FAILURE, errno, - _("failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE"), - a.scancode, a.keycode); + _("failed to set scancode %x to keycode %d: ioctl KDSETKEYCODE"), + a.scancode, a.keycode); } argc -= 2; argv += 2; diff -Nru kbd-2.0.3/src/setleds.c kbd-2.0.4/src/setleds.c --- kbd-2.0.3/src/setleds.c 2015-05-04 14:26:37.000000000 +0000 +++ kbd-2.0.4/src/setleds.c 2016-12-19 15:01:51.000000000 +0000 @@ -6,6 +6,7 @@ * and report the settings before and after. * In particular, setleds without arguments will only report. */ +#include "config.h" #include #include @@ -17,42 +18,42 @@ #include "version.h" #include "kbd_error.h" -static void __attribute__ ((noreturn)) +static void __attribute__((noreturn)) usage(void) { - fprintf(stderr, _( -"Usage:\n" -" setleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" -"Thus,\n" -" setleds +caps -num\n" -"will set CapsLock, clear NumLock and leave ScrollLock unchanged.\n" -"The settings before and after the change (if any) are reported\n" -"when the -v option is given or when no change is requested.\n" -"Normally, setleds influences the vt flag settings\n" -"(and these are usually reflected in the leds).\n" -"With -L, setleds only sets the leds, and leaves the flags alone.\n" -"With -D, setleds sets both the flags and the default flags, so\n" -"that a subsequent reset will not change the flags.\n" -), + fprintf(stderr, _( + "Usage:\n" + " setleds [-v] [-L] [-D] [-F] [[+|-][ num | caps | scroll %s]]\n" + "Thus,\n" + " setleds +caps -num\n" + "will set CapsLock, clear NumLock and leave ScrollLock unchanged.\n" + "The settings before and after the change (if any) are reported\n" + "when the -v option is given or when no change is requested.\n" + "Normally, setleds influences the vt flag settings\n" + "(and these are usually reflected in the leds).\n" + "With -L, setleds only sets the leds, and leaves the flags alone.\n" + "With -D, setleds sets both the flags and the default flags, so\n" + "that a subsequent reset will not change the flags.\n"), #ifdef __sparc__ - "| compose " + "| compose " #else - "" + "" #endif - ); - exit(EXIT_FAILURE); + ); + exit(EXIT_FAILURE); } #define onoff(a) ((a) ? _("on ") : _("off")) /* report the bits, in the order seen on the (my) keyboard */ -#define LED_NLOCK 1 +#define LED_NLOCK 1 #define LED_CMPOSE 2 #define LED_SCRLCK 4 -#define LED_CLOCK 8 +#define LED_CLOCK 8 static void -sunreport(int leds) { +sunreport(int leds) +{ printf("NumLock %s Compose %s ScrollLock %s CapsLock %s\n", onoff(leds & LED_NLOCK), onoff(leds & LED_CMPOSE), @@ -61,245 +62,251 @@ } static void -report(int leds) { - printf("NumLock %s CapsLock %s ScrollLock %s\n", +report(int leds) +{ + printf("NumLock %s CapsLock %s ScrollLock %s\n", onoff(leds & LED_NUM), onoff(leds & LED_CAP), onoff(leds & LED_SCR)); } struct led { - char *name; - int bit; - int sunbit; + char *name; + int bit; + int sunbit; } leds[] = { - { "scroll", LED_SCR, LED_SCRLCK }, - { "num", LED_NUM, LED_NLOCK }, - { "caps", LED_CAP, LED_CLOCK }, + { "scroll", LED_SCR, LED_SCRLCK }, + { "num", LED_NUM, LED_NLOCK }, + { "caps", LED_CAP, LED_CLOCK }, #ifdef __sparc__ - { "compose", 0, LED_CMPOSE } + { "compose", 0, LED_CMPOSE } #endif }; static void -getleds(char *cur_leds) { - if (ioctl(0, KDGETLED, cur_leds)) { - kbd_error(EXIT_FAILURE, errno, _("Error reading current led setting. " - "Maybe stdin is not a VT?: " - "ioctl KDGETLED")); - } +getleds(char *cur_leds) +{ + if (ioctl(0, KDGETLED, cur_leds)) { + kbd_error(EXIT_FAILURE, errno, _("Error reading current led setting. " + "Maybe stdin is not a VT?: " + "ioctl KDGETLED")); + } } static int -setleds(char cur_leds) { - if (ioctl(0, KDSETLED, cur_leds)) { - kbd_warning(errno, "ioctl KDSETLED"); - return -1; - } - return 0; +setleds(char cur_leds) +{ + if (ioctl(0, KDSETLED, cur_leds)) { + kbd_warning(errno, "ioctl KDSETLED"); + return -1; + } + return 0; } static void -getflags(char *flags) { - if (ioctl(0, KDGKBLED, flags)) { - kbd_error(EXIT_FAILURE, errno, _("Error reading current flags setting. " - "Maybe you are not on the console?: " - "ioctl KDGKBLED")); - } +getflags(char *flags) +{ + if (ioctl(0, KDGKBLED, flags)) { + kbd_error(EXIT_FAILURE, errno, _("Error reading current flags setting. " + "Maybe you are not on the console?: " + "ioctl KDGKBLED")); + } } static int sunkbdfd = -1; #ifndef KIOCGLED -#define arg_state __attribute__ ((unused)) +#define arg_state __attribute__((unused)) #else #define arg_state #endif static void -sungetleds(arg_state char *cur_leds) { +sungetleds(arg_state char *cur_leds) +{ #ifdef KIOCGLED - if (ioctl(sunkbdfd, KIOCGLED, cur_leds)) { - kbd_error(EXIT_FAILURE, errno, _("Error reading current led setting from /dev/kbd: " - "ioctl KIOCGLED")); - } + if (ioctl(sunkbdfd, KIOCGLED, cur_leds)) { + kbd_error(EXIT_FAILURE, errno, _("Error reading current led setting from /dev/kbd: " + "ioctl KIOCGLED")); + } #else - kbd_error(EXIT_FAILURE, 0, _("KIOCGLED unavailable?\n")); + kbd_error(EXIT_FAILURE, 0, _("KIOCGLED unavailable?\n")); #endif } #ifndef KIOCSLED -#define arg_state __attribute__ ((unused)) +#define arg_state __attribute__((unused)) #else #define arg_state #endif static void -sunsetleds(arg_state char *cur_leds) { +sunsetleds(arg_state char *cur_leds) +{ #ifdef KIOCSLED - if (ioctl(sunkbdfd, KIOCSLED, cur_leds)) { - kbd_error(EXIT_FAILURE, errno, _("Error reading current led setting from /dev/kbd: " - "ioctl KIOCSLED")); - } + if (ioctl(sunkbdfd, KIOCSLED, cur_leds)) { + kbd_error(EXIT_FAILURE, errno, _("Error reading current led setting from /dev/kbd: " + "ioctl KIOCSLED")); + } #else - kbd_error(EXIT_FAILURE, 0, _("KIOCSLED unavailable?\n")); + kbd_error(EXIT_FAILURE, 0, _("KIOCSLED unavailable?\n")); #endif } -int -main(int argc, char **argv) { - int optL = 0, optD = 0, optF = 0, verbose = 0; - char oleds, nleds, oflags, nflags, odefflags, ndefflags; - char nval, ndef, sign; - char osunleds = 0, nsunleds, nsunval, nsundef; - char *ap; - struct led *lp; - - set_progname(argv[0]); - - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE_NAME, LOCALEDIR); - textdomain(PACKAGE_NAME); +int main(int argc, char **argv) +{ + int optL = 0, optD = 0, optF = 0, verbose = 0; + char oleds, nleds, oflags, nflags, odefflags, ndefflags; + char nval, ndef, sign; + char osunleds = 0, nsunleds, nsunval, nsundef; + char *ap; + struct led *lp; + + set_progname(argv[0]); + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + textdomain(PACKAGE_NAME); - if (argc == 2 && (!strcmp("-V", argv[1]) || !strcmp("--version", argv[1]))) - print_version_and_exit(); + if (argc == 2 && (!strcmp("-V", argv[1]) || !strcmp("--version", argv[1]))) + print_version_and_exit(); #ifdef __sparc__ - if ((sunkbdfd = open("/dev/kbd", O_RDONLY)) < 0) { - kbd_error(EXIT_FAILURE, errno, "open /dev/kbd"); - /* exit(1); */ - } + if ((sunkbdfd = open("/dev/kbd", O_RDONLY)) < 0) { + kbd_error(EXIT_FAILURE, errno, "open /dev/kbd"); + /* exit(1); */ + } #endif - getflags(&oflags); - getleds(&oleds); - if (sunkbdfd >= 0) - sungetleds(&osunleds); - - while (argc > 1) { - if (!strcmp("-L", argv[1])) - optL = 1; - else if (!strcmp("-D", argv[1])) - optD = 1; - else if (!strcmp("-F", argv[1])) - optF = 1; - else if (!strcmp("-v", argv[1])) - verbose = 1; - else - break; - argc--; - argv++; - } + getflags(&oflags); + getleds(&oleds); + if (sunkbdfd >= 0) + sungetleds(&osunleds); + + while (argc > 1) { + if (!strcmp("-L", argv[1])) + optL = 1; + else if (!strcmp("-D", argv[1])) + optD = 1; + else if (!strcmp("-F", argv[1])) + optF = 1; + else if (!strcmp("-v", argv[1])) + verbose = 1; + else + break; + argc--; + argv++; + } - odefflags = ndefflags = ((oflags >> 4) & 7); - oflags = nflags = (oflags & 7); + odefflags = ndefflags = ((oflags >> 4) & 7); + oflags = nflags = (oflags & 7); - if (argc <= 1) { - if (optL) { - nleds = 0xff; - if (setleds(nleds)) { - kbd_error(EXIT_FAILURE, 0, _("Error resetting ledmode\n")); - } + if (argc <= 1) { + if (optL) { + nleds = 0xff; + if (setleds(nleds)) { + kbd_error(EXIT_FAILURE, 0, _("Error resetting ledmode\n")); + } + } + + /* If nothing to do, report, even if not verbose */ + if (!optD && !optL && !optF) + optD = optL = optF = 1; + if (optD) { + printf(_("Current default flags: ")); + report(odefflags); + } + if (optF) { + printf(_("Current flags: ")); + report(oflags & 07); + } + if (optL) { + printf(_("Current leds: ")); + if (sunkbdfd >= 0) + sunreport(osunleds); + else + report(oleds); + } + exit(EXIT_SUCCESS); + } + + if (!optL) + optF = 1; + nval = 0; + ndef = 0; + nsunval = 0; + nsundef = 0; + + while (--argc) { + ap = *++argv; + sign = 1; /* by default: set */ + if (*ap == '+') + ap++; + else if (*ap == '-') { + sign = 0; + ap++; + } + for (lp = leds; (unsigned)(lp - leds) < sizeof(leds) / sizeof(leds[0]); lp++) { + if (!strcmp(ap, lp->name)) { + if (sign) { + nval |= lp->bit; + nsunval |= lp->sunbit; + } + ndef |= lp->bit; + nsundef |= lp->sunbit; + goto nxtarg; + } + } + fprintf(stderr, _("unrecognized argument: _%s_\n\n"), ap); + usage(); + + nxtarg:; } - /* If nothing to do, report, even if not verbose */ - if (!optD && !optL && !optF) - optD = optL = optF = 1; if (optD) { - printf(_("Current default flags: ")); - report(odefflags); + ndefflags = (odefflags & ~ndef) | nval; + if (verbose) { + printf(_("Old default flags: ")); + report(odefflags); + printf(_("New default flags: ")); + report(ndefflags); + } } if (optF) { - printf(_("Current flags: ")); - report(oflags & 07); + nflags = ((oflags & ~ndef) | nval); + if (verbose) { + printf(_("Old flags: ")); + report(oflags & 07); + printf(_("New flags: ")); + report(nflags & 07); + } } - if (optL) { - printf(_("Current leds: ")); - if (sunkbdfd >= 0) - sunreport(osunleds); - else - report(oleds); + if (optD || optF) { + if (ioctl(0, KDSKBLED, (ndefflags << 4) | nflags)) { + kbd_error(EXIT_FAILURE, errno, "ioctl KDSKBLED"); + } } - exit(EXIT_SUCCESS); - } - - if (!optL) - optF = 1; - nval = 0; - ndef = 0; - nsunval = 0; - nsundef = 0; - - while(--argc) { - ap = *++argv; - sign = 1; /* by default: set */ - if(*ap == '+') - ap++; - else if(*ap == '-') { - sign = 0; - ap++; - } - for (lp = leds; (unsigned) (lp-leds) < sizeof(leds)/sizeof(leds[0]); lp++) { - if(!strcmp(ap, lp->name)) { - if(sign) { - nval |= lp->bit; - nsunval |= lp->sunbit; + if (optL) { + if (sunkbdfd >= 0) { + nsunleds = (osunleds & ~nsundef) | nsunval; + if (verbose) { + printf(_("Old leds: ")); + sunreport(osunleds); + printf(_("New leds: ")); + sunreport(nsunleds); + } + sunsetleds(&nsunleds); + } else { + nleds = (oleds & ~ndef) | nval; + if (verbose) { + printf(_("Old leds: ")); + report(oleds); + printf(_("New leds: ")); + report(nleds); + } + if (setleds(nleds)) + exit(EXIT_FAILURE); } - ndef |= lp->bit; - nsundef |= lp->sunbit; - goto nxtarg; - } - } - fprintf(stderr, _("unrecognized argument: _%s_\n\n"), ap); - usage(); - - nxtarg: ; - } - - if (optD) { - ndefflags = (odefflags & ~ndef) | nval; - if (verbose) { - printf(_("Old default flags: ")); - report(odefflags); - printf(_("New default flags: ")); - report(ndefflags); - } - } - if (optF) { - nflags = ((oflags & ~ndef) | nval); - if (verbose) { - printf(_("Old flags: ")); - report(oflags & 07); - printf(_("New flags: ")); - report(nflags & 07); - } - } - if (optD || optF) { - if (ioctl(0, KDSKBLED, (ndefflags << 4) | nflags)) { - kbd_error(EXIT_FAILURE, errno, "ioctl KDSKBLED"); - } - } - if (optL) { - if (sunkbdfd >= 0) { - nsunleds = (osunleds & ~nsundef) | nsunval; - if (verbose) { - printf(_("Old leds: ")); - sunreport(osunleds); - printf(_("New leds: ")); - sunreport(nsunleds); - } - sunsetleds(&nsunleds); - } else { - nleds = (oleds & ~ndef) | nval; - if (verbose) { - printf(_("Old leds: ")); - report(oleds); - printf(_("New leds: ")); - report(nleds); - } - if (setleds(nleds)) - exit(EXIT_FAILURE); } - } - exit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } diff -Nru kbd-2.0.3/src/setlogcons.c kbd-2.0.4/src/setlogcons.c --- kbd-2.0.3/src/setlogcons.c 2015-05-04 00:04:41.000000000 +0000 +++ kbd-2.0.4/src/setlogcons.c 2016-12-19 15:01:51.000000000 +0000 @@ -5,6 +5,8 @@ */ /* Send kernel messages to the current console or to console N */ +#include "config.h" + #include #include #include @@ -15,10 +17,12 @@ #include "nls.h" #include "kbd_error.h" -int -main(int argc, char **argv){ +int main(int argc, char **argv) +{ int fd, cons; - struct { char fn, subarg; } arg; + struct { + char fn, subarg; + } arg; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE_NAME, LOCALEDIR); @@ -27,11 +31,13 @@ if (argc == 2) cons = atoi(argv[1]); else - cons = 0; /* current console */ + cons = 0; /* current console */ + + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); - fd = getfd(NULL); - arg.fn = 11; /* redirect kernel messages */ - arg.subarg = cons; /* to specified console */ + arg.fn = 11; /* redirect kernel messages */ + arg.subarg = cons; /* to specified console */ if (ioctl(fd, TIOCLINUX, &arg)) { kbd_error(EXIT_FAILURE, errno, "TIOCLINUX"); } diff -Nru kbd-2.0.3/src/setmetamode.c kbd-2.0.4/src/setmetamode.c --- kbd-2.0.3/src/setmetamode.c 2015-05-04 17:48:08.000000000 +0000 +++ kbd-2.0.4/src/setmetamode.c 2016-12-19 15:01:51.000000000 +0000 @@ -5,6 +5,7 @@ * and report the setting before and after. * Without arguments setmetamode will only report. */ +#include "config.h" #include #include @@ -16,93 +17,93 @@ #include "version.h" #include "kbd_error.h" -static void __attribute__ ((noreturn)) +static void __attribute__((noreturn)) usage(void) { - fprintf(stderr, _( -"Usage:\n" -" setmetamode [ metabit | meta | bit | escprefix | esc | prefix ]\n" -"Each vt has his own copy of this bit. Use\n" -" setmetamode [arg] < /dev/ttyn\n" -"to change the settings of another vt.\n" -"The setting before and after the change are reported.\n" -)); - exit(EXIT_FAILURE); + fprintf(stderr, _( + "Usage:\n" + " setmetamode [ metabit | meta | bit | escprefix | esc | prefix ]\n" + "Each vt has his own copy of this bit. Use\n" + " setmetamode [arg] < /dev/ttyn\n" + "to change the settings of another vt.\n" + "The setting before and after the change are reported.\n")); + exit(EXIT_FAILURE); } static void -report(int meta) { - char *s; +report(int meta) +{ + char *s; - switch(meta) { - case K_METABIT: - s = _("Meta key sets high order bit\n"); - break; - case K_ESCPREFIX: - s = _("Meta key gives Esc prefix\n"); - break; - default: - s = _("Strange mode for Meta key?\n"); - } - printf("%s", s); + switch (meta) { + case K_METABIT: + s = _("Meta key sets high order bit\n"); + break; + case K_ESCPREFIX: + s = _("Meta key gives Esc prefix\n"); + break; + default: + s = _("Strange mode for Meta key?\n"); + } + printf("%s", s); } struct meta { - char *name; - int val; + char *name; + int val; } metas[] = { - { "metabit", K_METABIT }, - { "meta", K_METABIT }, - { "bit", K_METABIT }, - { "escprefix", K_ESCPREFIX }, - { "esc", K_ESCPREFIX }, - { "prefix", K_ESCPREFIX } + { "metabit", K_METABIT }, + { "meta", K_METABIT }, + { "bit", K_METABIT }, + { "escprefix", K_ESCPREFIX }, + { "esc", K_ESCPREFIX }, + { "prefix", K_ESCPREFIX } }; -#define SIZE(a) (sizeof(a)/sizeof(a[0])) +#define SIZE(a) (sizeof(a) / sizeof(a[0])) -int -main(int argc, char **argv) { - char ometa, nmeta; - struct meta *mp; +int main(int argc, char **argv) +{ + char ometa, nmeta; + struct meta *mp; - set_progname(argv[0]); + set_progname(argv[0]); - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE_NAME, LOCALEDIR); - textdomain(PACKAGE_NAME); + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + textdomain(PACKAGE_NAME); - if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); + if (argc == 2 && !strcmp(argv[1], "-V")) + print_version_and_exit(); - if (ioctl(0, KDGKBMETA, &ometa)) { - kbd_error(EXIT_FAILURE, errno, _("Error reading current setting. Maybe stdin is not a VT?: " - "ioctl KDGKBMETA")); - } + if (ioctl(0, KDGKBMETA, &ometa)) { + kbd_error(EXIT_FAILURE, errno, _("Error reading current setting. Maybe stdin is not a VT?: " + "ioctl KDGKBMETA")); + } - if (argc <= 1) { - report(ometa); - exit(EXIT_SUCCESS); - } + if (argc <= 1) { + report(ometa); + exit(EXIT_SUCCESS); + } + + nmeta = 0; /* make gcc happy */ + for (mp = metas; (unsigned)(mp - metas) < SIZE(metas); mp++) { + if (!strcmp(argv[1], mp->name)) { + nmeta = mp->val; + goto fnd; + } + } + fprintf(stderr, _("unrecognized argument: _%s_\n\n"), argv[1]); + usage(); - nmeta = 0; /* make gcc happy */ - for (mp = metas; (unsigned) (mp-metas) < SIZE(metas); mp++) { - if(!strcmp(argv[1], mp->name)) { - nmeta = mp->val; - goto fnd; +fnd: + printf(_("old state: ")); + report(ometa); + if (ioctl(0, KDSKBMETA, nmeta)) { + kbd_error(EXIT_FAILURE, errno, "ioctl KDSKBMETA"); } - } - fprintf(stderr, _("unrecognized argument: _%s_\n\n"), argv[1]); - usage(); - - fnd: - printf(_("old state: ")); - report(ometa); - if (ioctl(0, KDSKBMETA, nmeta)) { - kbd_error(EXIT_FAILURE, errno, "ioctl KDSKBMETA"); - } - printf(_("new state: ")); - report(nmeta); + printf(_("new state: ")); + report(nmeta); - return EXIT_SUCCESS; + return EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/setpalette.c kbd-2.0.4/src/setpalette.c --- kbd-2.0.3/src/setpalette.c 2015-05-04 17:44:43.000000000 +0000 +++ kbd-2.0.4/src/setpalette.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -7,8 +9,8 @@ #include "version.h" #include "kbd_error.h" -int -main(int argc, char **argv){ +int main(int argc, char **argv) +{ int fd, indx, red, green, blue; unsigned char cmap[48]; @@ -30,14 +32,15 @@ exit(EXIT_FAILURE); } - fd = getfd(NULL); + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); if (ioctl(fd, GIO_CMAP, cmap)) kbd_error(EXIT_FAILURE, errno, "ioctl GIO_CMAP"); - cmap[3*indx] = red; - cmap[3*indx+1] = green; - cmap[3*indx+2] = blue; + cmap[3 * indx] = red; + cmap[3 * indx + 1] = green; + cmap[3 * indx + 2] = blue; if (ioctl(fd, PIO_CMAP, cmap)) kbd_error(EXIT_FAILURE, errno, "ioctl PIO_CMAP"); diff -Nru kbd-2.0.3/src/setvesablank.c kbd-2.0.4/src/setvesablank.c --- kbd-2.0.3/src/setvesablank.c 2015-05-03 23:56:38.000000000 +0000 +++ kbd-2.0.4/src/setvesablank.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,6 +3,8 @@ * * usage: setvesablank ON|on|off */ +#include "config.h" + #include #include #include @@ -12,10 +14,12 @@ #include "nls.h" #include "kbd_error.h" -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ int fd; - struct { char ten, onoff; } arg; + struct { + char ten, onoff; + } arg; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE_NAME, LOCALEDIR); @@ -25,8 +29,9 @@ fprintf(stderr, _("usage: %s\n"), "setvesablank ON|on|off"); return EXIT_FAILURE; } - fd = getfd(NULL); - arg.ten = 10; + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); + arg.ten = 10; arg.onoff = 0; if (!strcmp(argv[1], "on")) arg.onoff = 1; diff -Nru kbd-2.0.3/src/setvtrgb.c kbd-2.0.4/src/setvtrgb.c --- kbd-2.0.3/src/setvtrgb.c 2015-04-28 21:10:48.000000000 +0000 +++ kbd-2.0.4/src/setvtrgb.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -35,21 +37,26 @@ 0xff, 0xff, 0xff, }; -static void __attribute__ ((noreturn)) +static void __attribute__((noreturn)) usage(int code) { fprintf(stderr, - _("Usage: %s vga|FILE|-\n" - "\n" - "If you use the FILE parameter, FILE should be exactly 3 lines of\n" - "comma-separated decimal values for RED, GREEN, and BLUE.\n" - "\n" - "To seed a valid FILE:\n" - " cat /sys/module/vt/parameters/default_{red,grn,blu} > FILE\n" - "\n" - "and then edit the values in FILE.\n" - "\n"), - progname); + _("Usage: %s [-h] [-V]\n" + " %s vga|FILE|-\n" + "\n" + "If you use the FILE parameter, FILE should be exactly 3 lines of\n" + "comma-separated decimal values for RED, GREEN, and BLUE.\n" + "\n" + "To seed a valid FILE:\n" + " cat /sys/module/vt/parameters/default_{red,grn,blu} > FILE\n" + "\n" + "and then edit the values in FILE.\n" + "\n" + "Other options:\n" + " -h print this usage message\n" + " -V print version number\n" + "\n"), + progname, progname); exit(code); } @@ -66,28 +73,28 @@ kbd_error(EXIT_FAILURE, errno, "fscanf"); kbd_error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."), - filename, rows + 1, cols + 1); + filename, rows + 1, cols + 1); } - cmap[rows + cols * 3] = (unsigned char) val; + cmap[rows + cols * 3] = (unsigned char)val; if (cols < 15 && fgetc(fd) != ',') kbd_error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."), - filename, rows + 1); + filename, rows + 1); } if ((c = fgetc(fd)) == EOF) kbd_error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"), - filename, rows + 1); + filename, rows + 1); if (c != '\n') kbd_error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"), - filename, rows + 1); + filename, rows + 1); } } -int -main(int argc, char **argv) { +int main(int argc, char **argv) +{ int c, fd; const char *file; unsigned char *colormap = cmap; @@ -129,7 +136,8 @@ fclose(f); } - fd = getfd(NULL); + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); /* Apply the color map to the tty via ioctl */ if (ioctl(fd, PIO_CMAP, colormap) == -1) diff -Nru kbd-2.0.3/src/showconsolefont.c kbd-2.0.4/src/showconsolefont.c --- kbd-2.0.3/src/showconsolefont.c 2015-05-04 17:45:35.000000000 +0000 +++ kbd-2.0.4/src/showconsolefont.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,6 +1,8 @@ /* showfont.c - aeb, 940207 - updated 2001-02-06 */ /* renamed to showconsolefont.c to avoid clash with the X showfont */ +#include "config.h" + #include #include #include @@ -25,17 +27,18 @@ unsigned short obuf[E_TABSZ], nbuf[E_TABSZ]; struct unimapdesc ounimap, nunimap; -int fd = 0; -int have_obuf = 0; +int fd = 0; +int have_obuf = 0; int have_ounimap = 0; -static void __attribute__ ((noreturn)) -leave(int n) { - if (have_obuf && loaduniscrnmap(fd,obuf)) { +static void __attribute__((noreturn)) +leave(int n) +{ + if (have_obuf && loaduniscrnmap(fd, obuf)) { kbd_warning(0, _("failed to restore original translation table\n")); n = EXIT_FAILURE; } - if (have_ounimap && loadunimap(fd,NULL,&ounimap)) { + if (have_ounimap && loadunimap(fd, NULL, &ounimap)) { kbd_warning(0, _("failed to restore original unimap\n")); n = EXIT_FAILURE; } @@ -43,69 +46,74 @@ } static void -settrivialscreenmap(void) { +settrivialscreenmap(void) +{ int i; - if (getuniscrnmap(fd,obuf)) + if (getuniscrnmap(fd, obuf)) exit(1); have_obuf = 1; - for(i=0; i 256) ? 32 : 16); - nr = 64/cols; - rows = (n+cols-1)/cols; - sep = ((cols == 16) ? "%1$s%1$s" : "%1$s"); + nr = 64 / cols; + rows = (n + cols - 1) / cols; + sep = ((cols == 16) ? "%1$s%1$s" : "%1$s"); - for (i=0; i #include #include @@ -14,7 +16,7 @@ #include "nls.h" #include "version.h" -int tmp; /* for debugging */ +int tmp; /* for debugging */ int fd; int oldkbmode; @@ -25,34 +27,41 @@ * thus making the console unusable when it was called under X. */ static void -get_mode(void) { - char *m; +get_mode(void) +{ + char *m; if (ioctl(fd, KDGKBMODE, &oldkbmode)) { kbd_error(EXIT_FAILURE, errno, "ioctl KDGKBMODE"); } - switch(oldkbmode) { - case K_RAW: - m = "RAW"; break; - case K_XLATE: - m = "XLATE"; break; - case K_MEDIUMRAW: - m = "MEDIUMRAW"; break; - case K_UNICODE: - m = "UNICODE"; break; - default: - m = _("?UNKNOWN?"); break; + switch (oldkbmode) { + case K_RAW: + m = "RAW"; + break; + case K_XLATE: + m = "XLATE"; + break; + case K_MEDIUMRAW: + m = "MEDIUMRAW"; + break; + case K_UNICODE: + m = "UNICODE"; + break; + default: + m = _("?UNKNOWN?"); + break; } printf(_("kb mode was %s\n"), m); if (oldkbmode != K_XLATE) { - printf(_("[ if you are trying this under X, it might not work\n" - "since the X server is also reading /dev/console ]\n")); + printf(_("[ if you are trying this under X, it might not work\n" + "since the X server is also reading /dev/console ]\n")); } printf("\n"); } static void -clean_up(void) { +clean_up(void) +{ if (ioctl(fd, KDSKBMODE, oldkbmode)) { kbd_error(EXIT_FAILURE, errno, "ioctl KDSKBMODE"); } @@ -61,52 +70,56 @@ close(fd); } -static void __attribute__ ((noreturn)) -die(int x) { +static void __attribute__((noreturn)) +die(int x) +{ printf(_("caught signal %d, cleaning up...\n"), x); clean_up(); exit(EXIT_FAILURE); } -static void __attribute__ ((noreturn)) -watch_dog(int x __attribute__ ((unused))) { +static void __attribute__((noreturn)) +watch_dog(int x __attribute__((unused))) +{ clean_up(); exit(EXIT_SUCCESS); } -static void __attribute__ ((noreturn)) -usage(void) { +static void __attribute__((noreturn)) +usage(void) +{ fprintf(stderr, _( -"showkey version %s\n\n" -"usage: showkey [options...]\n" -"\n" -"valid options are:\n" -"\n" -" -h --help display this help text\n" -" -a --ascii display the decimal/octal/hex values of the keys\n" -" -s --scancodes display only the raw scan-codes\n" -" -k --keycodes display only the interpreted keycodes (default)\n" -), PACKAGE_VERSION); + "showkey version %s\n\n" + "usage: showkey [options...]\n" + "\n" + "valid options are:\n" + "\n" + " -h --help display this help text\n" + " -a --ascii display the decimal/octal/hex values of the keys\n" + " -s --scancodes display only the raw scan-codes\n" + " -k --keycodes display only the interpreted keycodes (default)\n" + " -V --version print version number\n"), + PACKAGE_VERSION); exit(EXIT_FAILURE); } -int -main (int argc, char *argv[]) { - const char *short_opts = "haskV"; +int main(int argc, char *argv[]) +{ + const char *short_opts = "haskV"; const struct option long_opts[] = { - { "help", no_argument, NULL, 'h' }, - { "ascii", no_argument, NULL, 'a' }, - { "scancodes", no_argument, NULL, 's' }, - { "keycodes", no_argument, NULL, 'k' }, - { "version", no_argument, NULL, 'V' }, + { "help", no_argument, NULL, 'h' }, + { "ascii", no_argument, NULL, 'a' }, + { "scancodes", no_argument, NULL, 's' }, + { "keycodes", no_argument, NULL, 'k' }, + { "version", no_argument, NULL, 'V' }, { NULL, 0, NULL, 0 } }; int c; int show_keycodes = 1; - int print_ascii = 0; + int print_ascii = 0; struct termios new; - unsigned char buf[18]; /* divisible by 3 */ + unsigned char buf[18]; /* divisible by 3 */ int i, n; set_progname(argv[0]); @@ -116,22 +129,22 @@ textdomain(PACKAGE_NAME); while ((c = getopt_long(argc, argv, - short_opts, long_opts, NULL)) != -1) { + short_opts, long_opts, NULL)) != -1) { switch (c) { - case 's': - show_keycodes = 0; - break; - case 'k': - show_keycodes = 1; - break; - case 'a': - print_ascii = 1; - break; - case 'V': - print_version_and_exit(); - case 'h': - case '?': - usage(); + case 's': + show_keycodes = 0; + break; + case 'k': + show_keycodes = 1; + break; + case 'a': + print_ascii = 1; + break; + case 'V': + print_version_and_exit(); + case 'h': + case '?': + usage(); } } @@ -140,17 +153,17 @@ if (print_ascii) { /* no mode and signal and timer stuff - just read stdin */ - fd = 0; + fd = 0; if (tcgetattr(fd, &old) == -1) kbd_warning(errno, "tcgetattr"); if (tcgetattr(fd, &new) == -1) kbd_warning(errno, "tcgetattr"); - new.c_lflag &= ~ (ICANON | ISIG); + new.c_lflag &= ~(ICANON | ISIG); new.c_lflag |= (ECHO | ECHOCTL); - new.c_iflag = 0; - new.c_cc[VMIN] = 1; + new.c_iflag = 0; + new.c_cc[VMIN] = 1; new.c_cc[VTIME] = 0; if (tcsetattr(fd, TCSAFLUSH, &new) == -1) @@ -172,8 +185,8 @@ return EXIT_SUCCESS; } - - fd = getfd(NULL); + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); /* the program terminates when there is no input for 10 secs */ signal(SIGALRM, watch_dog); @@ -212,10 +225,10 @@ if (tcgetattr(fd, &new) == -1) kbd_warning(errno, "tcgetattr"); - new.c_lflag &= ~ (ICANON | ECHO | ISIG); - new.c_iflag = 0; - new.c_cc[VMIN] = sizeof(buf); - new.c_cc[VTIME] = 1; /* 0.1 sec intercharacter timeout */ + new.c_lflag &= ~(ICANON | ECHO | ISIG); + new.c_iflag = 0; + new.c_cc[VMIN] = sizeof(buf); + new.c_cc[VTIME] = 1; /* 0.1 sec intercharacter timeout */ if (tcsetattr(fd, TCSAFLUSH, &new) == -1) kbd_warning(errno, "tcsetattr"); @@ -249,11 +262,9 @@ s = (buf[i] & 0x80) ? _("release") : _("press"); - if (i+2 < n && (buf[i] & 0x7f) == 0 - && (buf[i+1] & 0x80) != 0 - && (buf[i+2] & 0x80) != 0) { - kc = ((buf[i+1] & 0x7f) << 7) | - (buf[i+2] & 0x7f); + if (i + 2 < n && (buf[i] & 0x7f) == 0 && (buf[i + 1] & 0x80) != 0 && (buf[i + 2] & 0x80) != 0) { + kc = ((buf[i + 1] & 0x7f) << 7) | + (buf[i + 2] & 0x7f); i += 3; } else { kc = (buf[i] & 0x7f); diff -Nru kbd-2.0.3/src/spawn_console.c kbd-2.0.4/src/spawn_console.c --- kbd-2.0.3/src/spawn_console.c 2015-05-04 12:17:57.000000000 +0000 +++ kbd-2.0.4/src/spawn_console.c 2016-12-19 15:01:51.000000000 +0000 @@ -9,44 +9,47 @@ * start getty, not openvt, or anybody will have a root shell * with a single keystroke. */ +#include "config.h" + #include #include #include #include #include -#include /* system */ -#include /* open */ -#include /* ioctl */ -#include /* sleep */ +#include /* system */ +#include /* open */ +#include /* ioctl */ +#include /* sleep */ #include "version.h" #include "kbd.h" #include "kbd_error.h" static void -sighup(int n __attribute__ ((unused))) { - if (system("openvt -s -l bash") == -1) { - kbd_error(EXIT_FAILURE, errno, "system"); - } - signal(SIGHUP, sighup); +sighup(int n __attribute__((unused))) +{ + if (system("openvt -s -l bash") == -1) { + kbd_error(EXIT_FAILURE, errno, "system"); + } + signal(SIGHUP, sighup); } -int -main(int argc __attribute__ ((unused)), char *argv[]) { - int fd; - - set_progname(argv[0]); - - fd = open("/dev/tty0", 0); - if (fd < 0 && errno == ENOENT) - fd = open("/dev/vc/0", 0); - if (fd < 0) - fd = 0; - signal(SIGHUP, sighup); - if (ioctl(fd, KDSIGACCEPT, (long) SIGHUP)) { - kbd_error(EXIT_FAILURE, errno, "ioctl KDSIGACCEPT"); - } - while(1) - sleep(3600); - return EXIT_SUCCESS; +int main(int argc __attribute__((unused)), char *argv[]) +{ + int fd; + + set_progname(argv[0]); + + fd = open("/dev/tty0", 0); + if (fd < 0 && errno == ENOENT) + fd = open("/dev/vc/0", 0); + if (fd < 0) + fd = 0; + signal(SIGHUP, sighup); + if (ioctl(fd, KDSIGACCEPT, (long)SIGHUP)) { + kbd_error(EXIT_FAILURE, errno, "ioctl KDSIGACCEPT"); + } + while (1) + sleep(3600); + return EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/spawn_login.c kbd-2.0.4/src/spawn_login.c --- kbd-2.0.3/src/spawn_login.c 2015-05-04 12:16:46.000000000 +0000 +++ kbd-2.0.4/src/spawn_login.c 2016-12-19 15:01:51.000000000 +0000 @@ -4,6 +4,8 @@ * aeb - 941025 * */ +#include "config.h" + #include #include #include @@ -18,28 +20,29 @@ #include "kbd_error.h" static void -sighup(int n __attribute__ ((unused))) { - if (system("openvt -s -l -- login -h spawn") == -1) { - kbd_error(EXIT_FAILURE, errno, "system"); - } - signal(SIGHUP, sighup); +sighup(int n __attribute__((unused))) +{ + if (system("openvt -s -l -- login -h spawn") == -1) { + kbd_error(EXIT_FAILURE, errno, "system"); + } + signal(SIGHUP, sighup); } -int -main(int argc __attribute__ ((unused)), char *argv[]) { - int fd; - - set_progname(argv[0]); - - fd = open("/dev/tty0", 0); - if (fd < 0 && errno == ENOENT) - fd = open("/dev/vc/0", 0); - if (fd < 0) - fd = 0; - signal(SIGHUP, sighup); - if (ioctl(fd, KDSIGACCEPT, (long) SIGHUP)) - kbd_error(EXIT_FAILURE, errno, "ioctl KDSIGACCEPT"); - while(1) - sleep(3600); - return EXIT_SUCCESS; +int main(int argc __attribute__((unused)), char *argv[]) +{ + int fd; + + set_progname(argv[0]); + + fd = open("/dev/tty0", 0); + if (fd < 0 && errno == ENOENT) + fd = open("/dev/vc/0", 0); + if (fd < 0) + fd = 0; + signal(SIGHUP, sighup); + if (ioctl(fd, KDSIGACCEPT, (long)SIGHUP)) + kbd_error(EXIT_FAILURE, errno, "ioctl KDSIGACCEPT"); + while (1) + sleep(3600); + return EXIT_SUCCESS; } diff -Nru kbd-2.0.3/src/totextmode.c kbd-2.0.4/src/totextmode.c --- kbd-2.0.3/src/totextmode.c 2015-05-03 23:32:03.000000000 +0000 +++ kbd-2.0.4/src/totextmode.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,6 +1,8 @@ /* * totextmode.c - aeb - 2000-01-20 */ +#include "config.h" + #include #include #include @@ -14,8 +16,8 @@ #include "version.h" #include "kbd_error.h" -int -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ int fd, num; set_progname(argv[0]); @@ -30,9 +32,12 @@ if (argc != 2) { kbd_error(EXIT_FAILURE, 0, _("usage: totextmode\n")); } - fd = getfd(NULL); + + if ((fd = getfd(NULL)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); + num = atoi(argv[1]); - if (ioctl(fd,KDSETMODE,KD_TEXT)) { + if (ioctl(fd, KDSETMODE, KD_TEXT)) { kbd_error(EXIT_FAILURE, errno, "totextmode: KDSETMODE"); } return EXIT_SUCCESS; diff -Nru kbd-2.0.3/src/utf8.c kbd-2.0.4/src/utf8.c --- kbd-2.0.3/src/utf8.c 2013-09-15 16:21:30.000000000 +0000 +++ kbd-2.0.4/src/utf8.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,4 +1,5 @@ /* utf8.c - collect routines for conversion to/from utf8 */ +#include "config.h" #include "utf8.h" /* @@ -12,39 +13,41 @@ * cnt is either 0 or gives the number of available bytes */ unsigned long -from_utf8(char **inptr, int cnt, int *err) { +from_utf8(char **inptr, int cnt, int *err) +{ unsigned char *in; unsigned int uc, uc2; int need, bit, bad = 0; - in = (unsigned char *)(* inptr); - uc = *in++; + in = (unsigned char *)(*inptr); + uc = *in++; need = 0; - bit = 0x80; - while(uc & bit) { + bit = 0x80; + while (uc & bit) { need++; bit >>= 1; } - uc &= (bit-1); + uc &= (bit - 1); if (cnt && cnt < need) { *err = UTF8_SHORT; return 0; } if (need == 1) bad = 1; - else if (need) while(--need) { - uc2 = *in++; - if ((uc2 & 0xc0) != 0x80) { - bad = 1; - break; + else if (need) + while (--need) { + uc2 = *in++; + if ((uc2 & 0xc0) != 0x80) { + bad = 1; + break; + } + uc = ((uc << 6) | (uc2 & 0x3f)); } - uc = ((uc << 6) | (uc2 & 0x3f)); - } if (bad) { *err = UTF8_BAD; return 0; } *inptr = (char *)in; - *err = 0; + *err = 0; return uc; } diff -Nru kbd-2.0.3/src/utf8.h kbd-2.0.4/src/utf8.h --- kbd-2.0.3/src/utf8.h 2013-09-15 16:21:30.000000000 +0000 +++ kbd-2.0.4/src/utf8.h 2016-12-19 15:01:55.000000000 +0000 @@ -3,7 +3,7 @@ extern unsigned long from_utf8(char **inptr, int cnt, int *err); -#define UTF8_BAD (-1) -#define UTF8_SHORT (-2) +#define UTF8_BAD (-1) +#define UTF8_SHORT (-2) #endif /* _UTF8_H */ diff -Nru kbd-2.0.3/src/version.h kbd-2.0.4/src/version.h --- kbd-2.0.3/src/version.h 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/version.h 2016-12-19 15:01:55.000000000 +0000 @@ -1,6 +1,6 @@ +#include "config.h" #include "kbd.h" #include "nls.h" -#include "../config.h" #include #include #include @@ -8,15 +8,17 @@ char *progname; static inline void -set_progname(char *name) { +set_progname(char *name) +{ char *p; - p = strrchr(name, '/'); - progname = (p ? p+1 : name); + p = strrchr(name, '/'); + progname = (p ? p + 1 : name); } -static inline void __attribute__ ((noreturn)) -print_version_and_exit(void) { +static inline void __attribute__((noreturn)) +print_version_and_exit(void) +{ printf(_("%s from %s\n"), progname, PACKAGE_STRING); exit(0); } diff -Nru kbd-2.0.3/src/vlock/auth.c kbd-2.0.4/src/vlock/auth.c --- kbd-2.0.3/src/vlock/auth.c 2015-04-27 23:18:04.000000000 +0000 +++ kbd-2.0.4/src/vlock/auth.c 2016-12-19 15:01:51.000000000 +0000 @@ -20,6 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include #include @@ -33,134 +34,125 @@ #include "nls.h" /* Delay after fatal PAM errors, in seconds. */ -#define LONG_DELAY 10 +#define LONG_DELAY 10 /* Delay after other PAM errors, in seconds. */ -#define SHORT_DELAY 1 +#define SHORT_DELAY 1 static int -do_account_password_management (pam_handle_t *pamh) +do_account_password_management(pam_handle_t *pamh) { int rc; /* Whether the authenticated user is allowed to log in? */ - rc = pam_acct_mgmt (pamh, 0); + rc = pam_acct_mgmt(pamh, 0); /* Do we need to prompt the user for a new password? */ if (rc == PAM_NEW_AUTHTOK_REQD) - rc = pam_chauthtok (pamh, PAM_CHANGE_EXPIRED_AUTHTOK); + rc = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); /* Extend the lifetime of the existing credentials. */ if (rc == PAM_SUCCESS) - rc = pam_setcred (pamh, PAM_REFRESH_CRED); + rc = pam_setcred(pamh, PAM_REFRESH_CRED); return rc; } -int -get_password (pam_handle_t * pamh, const char *username, const char *tty) +int get_password(pam_handle_t *pamh, const char *username, const char *tty) { - uid_t uid = getuid (); + uid_t uid = getuid(); - for (;;) - { - int rc; + for (;;) { + int rc; const char *msg; - if (!pamh) - { - pamh = init_pam (username, tty, 1); - if (!pamh) - { + 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 (LONG_DELAY); + 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(LONG_DELAY); 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 (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.")); + puts(_("Use Alt-function keys to switch to other virtual consoles.")); } - fflush (stdout); + 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); + rc = pam_authenticate(pamh, 0); - switch (rc) - { + switch (rc) { case PAM_SUCCESS: - rc = do_account_password_management (pamh); + rc = do_account_password_management(pamh); - if (rc != PAM_SUCCESS) - { + if (rc != PAM_SUCCESS) { /* * The user was authenticated but * either account or password management * returned an error. */ - printf ("%s.\n\n\n", - pam_strerror (pamh, rc)); - fflush (stdout); - pam_end (pamh, rc); + printf("%s.\n\n\n", + pam_strerror(pamh, rc)); + fflush(stdout); + pam_end(pamh, rc); pamh = 0; - sleep (SHORT_DELAY); + sleep(SHORT_DELAY); break; } - pam_end (pamh, rc); + 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); + syslog(LOG_NOTICE, + "Unlocked %s on %s for %s by (uid=%u)", + locked_name(), tty, username, uid); return EXIT_SUCCESS; case PAM_MAXTRIES: case PAM_ABORT: - msg = pam_strerror (pamh, rc); + msg = pam_strerror(pamh, rc); /* Log the fact of failure. */ - syslog (LOG_WARNING, "%s", msg); - printf ("%s.\n\n\n", msg); - fflush (stdout); + syslog(LOG_WARNING, "%s", msg); + printf("%s.\n\n\n", msg); + fflush(stdout); msg = 0; - pam_end (pamh, rc); + pam_end(pamh, rc); pamh = 0; - sleep (LONG_DELAY); + sleep(LONG_DELAY); break; default: - printf ("%s.\n\n\n", pam_strerror (pamh, rc)); - fflush (stdout); + printf("%s.\n\n\n", pam_strerror(pamh, rc)); + fflush(stdout); /* * EOF encountered on read? * If not on VT, check stdin. */ - if (is_vt || isatty (STDIN_FILENO)) - { + if (is_vt || isatty(STDIN_FILENO)) { /* Ignore error. */ - sleep (SHORT_DELAY); + sleep(SHORT_DELAY); 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); + 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; } } diff -Nru kbd-2.0.3/src/vlock/pam_auth.h kbd-2.0.4/src/vlock/pam_auth.h --- kbd-2.0.3/src/vlock/pam_auth.h 2012-02-27 10:27:11.000000000 +0000 +++ kbd-2.0.4/src/vlock/pam_auth.h 2016-12-19 15:01:55.000000000 +0000 @@ -22,6 +22,6 @@ #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); +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-2.0.3/src/vlock/pam.c kbd-2.0.4/src/vlock/pam.c --- kbd-2.0.3/src/vlock/pam.c 2015-05-11 21:54:42.000000000 +0000 +++ kbd-2.0.4/src/vlock/pam.c 2016-12-19 15:01:51.000000000 +0000 @@ -19,6 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include #include @@ -37,31 +38,29 @@ }; pam_handle_t * -init_pam (const char *username, const char *tty, int log) +init_pam(const char *username, const char *tty, int log) { pam_handle_t *pamh = 0; - int rc = pam_start ("vlock", username, &conv, &pamh); + int rc = pam_start("vlock", username, &conv, &pamh); - if (rc != PAM_SUCCESS) - { + if (rc != PAM_SUCCESS) { /* pam_strerror is not available atm. */ if (log) - syslog (LOG_WARNING, "pam_start failed: %m"); + syslog(LOG_WARNING, "pam_start failed: %m"); else kbd_warning(errno, "pam_start"); return 0; } - rc = pam_set_item (pamh, PAM_TTY, tty); - if (rc != PAM_SUCCESS) - { + 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)); + syslog(LOG_WARNING, "pam_set_item: %s", + pam_strerror(pamh, rc)); else kbd_warning(0, "pam_set_item: %s", - pam_strerror (pamh, rc)); - pam_end (pamh, rc); + pam_strerror(pamh, rc)); + pam_end(pamh, rc); return 0; } diff -Nru kbd-2.0.3/src/vlock/parse.c kbd-2.0.4/src/vlock/parse.c --- kbd-2.0.3/src/vlock/parse.c 2015-04-27 23:11:15.000000000 +0000 +++ kbd-2.0.4/src/vlock/parse.c 2016-12-19 15:01:51.000000000 +0000 @@ -20,6 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include #include @@ -27,7 +28,6 @@ #include #include "vlock.h" -#include "config.h" #include "nls.h" #include "version.h" @@ -36,55 +36,52 @@ * current VT or all of them. * 0 means current, 1 means all. */ -int o_lock_all; +int o_lock_all; const char * -locked_name (void) +locked_name(void) { return o_lock_all ? "console" : (is_vt ? "VC" : "tty"); } -static void __attribute__ ((__noreturn__)) +static void __attribute__((__noreturn__)) show_usage(void) { fprintf(stderr, - _("Try `%s --help' for more information.\n"), - program_invocation_short_name); + _("Try `%s --help' for more information.\n"), + program_invocation_short_name); exit(1); } -static void __attribute__ ((__noreturn__)) +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"), + "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"), progname, progname); exit(0); } -void -parse (int ac, char *const av[]) +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}, + { "current", 0, 0, 'c' }, + { "all", 0, 0, 'a' }, + { "version", 0, 0, 'v' }, + { "help", 0, 0, 'h' }, + { 0, 0, 0, 0 }, }; - int c; + int c; - while ((c = getopt_long(ac, av, "acvh", long_options, 0)) != -1) - { - switch (c) - { + while ((c = getopt_long(ac, av, "acvh", long_options, 0)) != -1) { + switch (c) { case 'c': o_lock_all = 0; break; diff -Nru kbd-2.0.3/src/vlock/screen.c kbd-2.0.4/src/vlock/screen.c --- kbd-2.0.3/src/vlock/screen.c 2013-01-20 22:50:39.000000000 +0000 +++ kbd-2.0.4/src/vlock/screen.c 2016-12-19 15:01:51.000000000 +0000 @@ -20,6 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include #include @@ -31,20 +32,18 @@ static unsigned char lines, columns; static void *screen_buf = 0; -static int vcs = -1; +static int vcs = -1; -void -init_screen(void) +void init_screen(void) { - int failed = 1; + int failed = 1; const char clear_str[] = "\33[3J\33[H\33[J"; vcs = -1; - do - { + do { struct stat st; unsigned i, size; - char path[16]; + char path[16]; if (fstat(STDIN_FILENO, &st) == -1) break; @@ -67,13 +66,12 @@ if (read(vcs, &lines, 1) != 1) break; - size = 2 * lines * columns + 2; + size = 2 * lines * columns + 2; screen_buf = malloc(size); if (!screen_buf) break; - if (read(vcs, screen_buf, size) != (int) size) - { + if (read(vcs, screen_buf, size) != (int)size) { free(screen_buf); screen_buf = NULL; break; @@ -82,8 +80,7 @@ failed = 0; } while (0); - if (failed && vcs >= 0) - { + if (failed && vcs >= 0) { close(vcs); vcs = -1; } @@ -94,13 +91,10 @@ return; } -void -restore_screen(void) +void restore_screen(void) { - if (screen_buf) - { - do - { + if (screen_buf) { + do { if (lseek(vcs, 0, SEEK_SET)) break; if (write(vcs, &columns, 1) != 1) diff -Nru kbd-2.0.3/src/vlock/username.c kbd-2.0.4/src/vlock/username.c --- kbd-2.0.3/src/vlock/username.c 2015-04-28 21:11:27.000000000 +0000 +++ kbd-2.0.4/src/vlock/username.c 2016-12-19 15:01:51.000000000 +0000 @@ -19,6 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include #include @@ -35,31 +36,30 @@ * Try to find out proper login name. */ const char * -get_username (void) +get_username(void) { const char *name; struct passwd *pw = 0; - uid_t uid = getuid (); + uid_t uid = getuid(); - char *logname = getenv ("LOGNAME"); + char *logname = getenv("LOGNAME"); - if (logname) - { - pw = getpwnam (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); + pw = getpwuid(uid); if (!pw) - kbd_error (EXIT_FAILURE, 0, _("unrecognized user")); + kbd_error(EXIT_FAILURE, 0, _("unrecognized user")); - name = strdup (pw->pw_name); + name = strdup(pw->pw_name); if (!name) - kbd_error (EXIT_FAILURE, errno, "strdup"); + kbd_error(EXIT_FAILURE, errno, "strdup"); - endpwent (); + endpwent(); return name; } diff -Nru kbd-2.0.3/src/vlock/vlock.c kbd-2.0.4/src/vlock/vlock.c --- kbd-2.0.3/src/vlock/vlock.c 2015-04-28 21:11:33.000000000 +0000 +++ kbd-2.0.4/src/vlock/vlock.c 2016-12-19 15:01:51.000000000 +0000 @@ -20,6 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include #include @@ -35,10 +36,9 @@ #include "version.h" #include "kbd_error.h" -int -main (int ac, char *const av[]) +int main(int ac, char *const av[]) { - int rc; + int rc; const char dev_prefix[] = "/dev/"; const char *username, *tty; pam_handle_t *pamh; @@ -50,41 +50,40 @@ textdomain(PACKAGE_NAME); /* 1st, parse command line arguments. */ - parse (ac, av); + parse(ac, av); /* 2nd, find out tty name... */ - tty = ttyname (STDIN_FILENO); + tty = ttyname(STDIN_FILENO); if (!tty) /* stdin is not a tty, so no need to try. */ - kbd_error (EXIT_FAILURE, 0, _("stdin is not a tty")); + kbd_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; + if (!strncmp(tty, dev_prefix, sizeof(dev_prefix) - 1)) + tty += sizeof(dev_prefix) - 1; /* 3rd, get username for PAM. */ - username = get_username (); + username = get_username(); /* 4th, initialize system logger. */ - openlog ("vlock", LOG_PID, LOG_AUTH); + openlog("vlock", LOG_PID, LOG_AUTH); /* 5th, initialize PAM. */ - if (!(pamh = init_pam (username, tty, 0))) - exit (EXIT_FAILURE); + 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); + 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 ()); + 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 (); + rc = get_password(pamh, username, tty); + restore_vt(); return rc; } diff -Nru kbd-2.0.3/src/vlock/vlock.h kbd-2.0.4/src/vlock/vlock.h --- kbd-2.0.3/src/vlock/vlock.h 2012-11-15 19:18:36.000000000 +0000 +++ kbd-2.0.4/src/vlock/vlock.h 2016-12-19 15:01:55.000000000 +0000 @@ -21,17 +21,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -int init_vt (const char *tty); -void restore_vt (void); +int init_vt(const char *tty); +void restore_vt(void); -void init_screen (void); -void restore_screen (void); +void init_screen(void); +void restore_screen(void); -const char *get_username (void); +const char *get_username(void); -void parse (int ac, char *const av[]); +void parse(int ac, char *const av[]); -const char *locked_name (void); +const char *locked_name(void); /* * This determines whether the default behavior is to lock only the diff -Nru kbd-2.0.3/src/vlock/vt.c kbd-2.0.4/src/vlock/vt.c --- kbd-2.0.3/src/vlock/vt.c 2015-05-11 21:54:42.000000000 +0000 +++ kbd-2.0.4/src/vlock/vt.c 2016-12-19 15:01:51.000000000 +0000 @@ -20,6 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include #include @@ -43,99 +44,95 @@ static int vfd = -1; /* Copy of the VT mode when the program was started. */ -int is_vt; +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) +release_vt(__attribute__((unused)) int signo) { /* * Kernel is not allowed to switch. * Return code is silently ignored. */ - ioctl (vfd, VT_RELDISP, 0); + ioctl(vfd, VT_RELDISP, 0); } /* This is called whenever a user switches to that VC. */ static void -acquire_vt (__attribute__ ((unused)) int signo) +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); + ioctl(vfd, VT_RELDISP, VT_ACKACQ); } /* Set the signal masks and handlers. */ static void -mask_signals (void) +mask_signals(void) { static sigset_t sig; static struct sigaction sa; - memset (&sa, 0, sizeof sa); - sigemptyset (&(sa.sa_mask)); + memset(&sa, 0, sizeof sa); + sigemptyset(&(sa.sa_mask)); sa.sa_flags = SA_RESTART; - if (o_lock_all) - { + if (o_lock_all) { /* handle SIGUSR{1,2}... */ sa.sa_handler = release_vt; - sigaction (SIGUSR1, &sa, 0); + sigaction(SIGUSR1, &sa, 0); sa.sa_handler = acquire_vt; - sigaction (SIGUSR2, &sa, 0); + sigaction(SIGUSR2, &sa, 0); /* ... and ensure they are unblocked. */ - sigemptyset (&sig); - sigaddset (&sig, SIGUSR1); - sigaddset (&sig, SIGUSR2); - sigprocmask (SIG_UNBLOCK, &sig, 0); + 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); + 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); + sigemptyset(&sig); + sigaddset(&sig, SIGCHLD); + sigprocmask(SIG_BLOCK, &sig, 0); } -int -init_vt (const char *tty) +int init_vt(const char *tty) { const char dev_tty[] = "/dev/tty"; - vfd = open (dev_tty, O_RDWR); - if (vfd < 0) - { + vfd = open(dev_tty, O_RDWR); + if (vfd < 0) { kbd_warning(errno, "could not open %s", dev_tty); return 0; } @@ -146,72 +143,63 @@ * and will print a warning message. * - If it doesn't fail, it gets the current VT status. */ - if (ioctl (vfd, VT_GETMODE, &ovtm) < 0) - { + 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) - { + fprintf(stderr, _("This tty (%s) is not a virtual console.\n"), + tty); + if (o_lock_all) { o_lock_all = 0; - close (vfd); + close(vfd); vfd = -1; - fprintf (stderr, - _("The entire console display cannot be locked.\n")); + fprintf(stderr, + _("The entire console display cannot be locked.\n")); return 0; } - fprintf (stderr, "\n\n"); - fflush (stderr); - } else - { + 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); + if (!o_lock_all) { + close(vfd); vfd = -1; } - mask_signals (); + mask_signals(); - if (o_lock_all) - { + 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(). */ + 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) - { + if (ioctl(vfd, VT_SETMODE, &vtm) < 0) { kbd_warning(errno, "ioctl VT_SETMODE"); return 0; } } if (is_vt) - init_screen (); + init_screen(); return 1; } -void -restore_vt (void) +void restore_vt(void) { - if (is_vt) - { - restore_screen (); + if (is_vt) { + restore_screen(); - if (o_lock_all) - { + if (o_lock_all) { /* * Reset mode of active vt. * Don't check return code - it won't help anyway. */ - ioctl (vfd, VT_SETMODE, &ovtm); + ioctl(vfd, VT_SETMODE, &ovtm); } } } diff -Nru kbd-2.0.3/src/wctomb.c kbd-2.0.4/src/wctomb.c --- kbd-2.0.3/src/wctomb.c 2012-02-27 10:27:11.000000000 +0000 +++ kbd-2.0.4/src/wctomb.c 2016-12-19 15:01:51.000000000 +0000 @@ -13,86 +13,85 @@ but stopped that after i found a system which made wchar_t an unsigned char. */ -enum -{ - T1 = 0x00, - Tx = 0x80, - T2 = 0xC0, - T3 = 0xE0, - T4 = 0xF0, - T5 = 0xF8, - T6 = 0xFC, +enum { + T1 = 0x00, + Tx = 0x80, + T2 = 0xC0, + T3 = 0xE0, + T4 = 0xF0, + T5 = 0xF8, + T6 = 0xFC, - Bit1 = 7, - Bitx = 6, - Bit2 = 5, - Bit3 = 4, - Bit4 = 3, - Bit5 = 2, - Bit6 = 2, + Bit1 = 7, + Bitx = 6, + Bit2 = 5, + Bit3 = 4, + Bit4 = 3, + Bit5 = 2, + Bit6 = 2, - Mask1 = (1<> 5*Bitx) & Mask6); - s[1] = Tx | ((wc >> 4*Bitx) & Maskx); - s[2] = Tx | ((wc >> 3*Bitx) & Maskx); - s[3] = Tx | ((wc >> 2*Bitx) & Maskx); - s[4] = Tx | ((wc >> 1*Bitx) & Maskx); - s[5] = Tx | (wc & Maskx); + s[0] = T6 | ((wc >> 5 * Bitx) & Mask6); + s[1] = Tx | ((wc >> 4 * Bitx) & Maskx); + s[2] = Tx | ((wc >> 3 * Bitx) & Maskx); + s[3] = Tx | ((wc >> 2 * Bitx) & Maskx); + s[4] = Tx | ((wc >> 1 * Bitx) & Maskx); + s[5] = Tx | (wc & Maskx); return 6; } /* 5 bytes */ - s[0] = T5 | (wc >> 4*Bitx); - s[1] = Tx | ((wc >> 3*Bitx) & Maskx); - s[2] = Tx | ((wc >> 2*Bitx) & Maskx); - s[3] = Tx | ((wc >> 1*Bitx) & Maskx); - s[4] = Tx | (wc & Maskx); + s[0] = T5 | (wc >> 4 * Bitx); + s[1] = Tx | ((wc >> 3 * Bitx) & Maskx); + s[2] = Tx | ((wc >> 2 * Bitx) & Maskx); + s[3] = Tx | ((wc >> 1 * Bitx) & Maskx); + s[4] = Tx | (wc & Maskx); return 5; } - if(wc & ~Wchar3) { + if (wc & ~Wchar3) { /* 4 bytes */ - s[0] = T4 | (wc >> 3*Bitx); - s[1] = Tx | ((wc >> 2*Bitx) & Maskx); - s[2] = Tx | ((wc >> 1*Bitx) & Maskx); - s[3] = Tx | (wc & Maskx); + s[0] = T4 | (wc >> 3 * Bitx); + s[1] = Tx | ((wc >> 2 * Bitx) & Maskx); + s[2] = Tx | ((wc >> 1 * Bitx) & Maskx); + s[3] = Tx | (wc & Maskx); return 4; } /* 3 bytes */ - s[0] = T3 | (wc >> 2*Bitx); - s[1] = Tx | ((wc >> 1*Bitx) & Maskx); - s[2] = Tx | (wc & Maskx); + s[0] = T3 | (wc >> 2 * Bitx); + s[1] = Tx | ((wc >> 1 * Bitx) & Maskx); + s[2] = Tx | (wc & Maskx); return 3; } - if(wc & ~Wchar1) { + if (wc & ~Wchar1) { /* 2 bytes */ - s[0] = T2 | (wc >> 1*Bitx); + s[0] = T2 | (wc >> 1 * Bitx); s[1] = Tx | (wc & Maskx); return 2; } diff -Nru kbd-2.0.3/src/xmalloc.c kbd-2.0.4/src/xmalloc.c --- kbd-2.0.3/src/xmalloc.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/src/xmalloc.c 2016-12-19 15:01:51.000000000 +0000 @@ -1,5 +1,7 @@ /* Error-free versions of some libc routines */ +#include "config.h" + #include #include #include @@ -10,14 +12,16 @@ extern char *progname; -static void __attribute__ ((noreturn)) -nomem(void) { +static void __attribute__((noreturn)) +nomem(void) +{ fprintf(stderr, _("%s: out of memory\n"), progname); exit(EX_OSERR); } void * -xmalloc(size_t sz) { +xmalloc(size_t sz) +{ void *p = malloc(sz); if (p == NULL) nomem(); @@ -25,7 +29,8 @@ } void * -xrealloc(void *pp, size_t sz) { +xrealloc(void *pp, size_t sz) +{ void *p = realloc(pp, sz); if (p == NULL) nomem(); @@ -33,7 +38,8 @@ } char * -xstrdup(char *p) { +xstrdup(char *p) +{ char *q = strdup(p); if (q == NULL) nomem(); @@ -41,7 +47,8 @@ } char * -xstrndup(char *p, size_t n) { +xstrndup(char *p, size_t n) +{ char *q = strndup(p, n); if (q == NULL) nomem(); @@ -49,7 +56,8 @@ } void * -xfree(void *p) { +xfree(void *p) +{ if (p != NULL) free(p); return NULL; diff -Nru kbd-2.0.3/tests/dumpkeys.defkeymap.c kbd-2.0.4/tests/dumpkeys.defkeymap.c --- kbd-2.0.3/tests/dumpkeys.defkeymap.c 2015-05-11 21:55:13.000000000 +0000 +++ kbd-2.0.4/tests/dumpkeys.defkeymap.c 2016-12-19 15:01:51.000000000 +0000 @@ -5,570 +5,570 @@ #include unsigned short plain_map[NR_KEYS] = { - 0xf200, 0xf01b, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, - 0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf03d, 0xf07f, 0xf009, - 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, - 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf702, 0xfb61, 0xfb73, - 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b, - 0xf027, 0xf060, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, - 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf700, 0xf30c, - 0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, - 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03c, 0xf10a, - 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf210, 0xf211, 0xf20e, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf01b, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, + 0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf03d, 0xf07f, 0xf009, + 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, + 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf702, 0xfb61, 0xfb73, + 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b, + 0xf027, 0xf060, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, + 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf700, 0xf30c, + 0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, + 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03c, 0xf10a, + 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf210, 0xf211, 0xf20e, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_map[NR_KEYS] = { - 0xf200, 0xf01b, 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e, - 0xf026, 0xf02a, 0xf028, 0xf029, 0xf05f, 0xf02b, 0xf07f, 0xf809, - 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, - 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf702, 0xfb41, 0xfb53, - 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a, - 0xf022, 0xf07e, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, - 0xfb42, 0xfb4e, 0xfb4d, 0xf03c, 0xf03e, 0xf03f, 0xf700, 0xf30c, - 0xf703, 0xf020, 0xf207, 0xf10c, 0xf10d, 0xf10e, 0xf10f, 0xf110, - 0xf111, 0xf112, 0xf113, 0xf11e, 0xf11f, 0xf208, 0xf203, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf120, - 0xf121, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf20b, 0xf601, 0xf602, 0xf117, 0xf600, 0xf20a, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf206, 0xf206, 0xf210, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf01b, 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e, + 0xf026, 0xf02a, 0xf028, 0xf029, 0xf05f, 0xf02b, 0xf07f, 0xf809, + 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, + 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf702, 0xfb41, 0xfb53, + 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a, + 0xf022, 0xf07e, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, + 0xfb42, 0xfb4e, 0xfb4d, 0xf03c, 0xf03e, 0xf03f, 0xf700, 0xf30c, + 0xf703, 0xf020, 0xf207, 0xf10c, 0xf10d, 0xf10e, 0xf10f, 0xf110, + 0xf111, 0xf112, 0xf113, 0xf11e, 0xf11f, 0xf208, 0xf203, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf120, + 0xf121, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf20b, 0xf601, 0xf602, 0xf117, 0xf600, 0xf20a, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf206, 0xf206, 0xf210, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short altgr_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf040, 0xf200, 0xf024, 0xf200, 0xf200, - 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf200, 0xf200, 0xf200, - 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, - 0xfb6f, 0xfb70, 0xf200, 0xf07e, 0xf201, 0xf702, 0xfb61, 0xfb73, - 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, - 0xfb62, 0xfb6e, 0xfb6d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf50c, 0xf50d, 0xf50e, 0xf50f, 0xf510, - 0xf511, 0xf512, 0xf513, 0xf514, 0xf515, 0xf208, 0xf202, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf516, - 0xf517, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf211, 0xf210, 0xf211, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf040, 0xf200, 0xf024, 0xf200, 0xf200, + 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf200, 0xf200, 0xf200, + 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, + 0xfb6f, 0xfb70, 0xf200, 0xf07e, 0xf201, 0xf702, 0xfb61, 0xfb73, + 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, + 0xfb62, 0xfb6e, 0xfb6d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf50c, 0xf50d, 0xf50e, 0xf50f, 0xf510, + 0xf511, 0xf512, 0xf513, 0xf514, 0xf515, 0xf208, 0xf202, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf516, + 0xf517, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf211, 0xf210, 0xf211, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_altgr_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, - 0xfb4f, 0xfb50, 0xf200, 0xf200, 0xf201, 0xf702, 0xfb41, 0xfb53, - 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, - 0xfb42, 0xfb4e, 0xfb4d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf20e, 0xf20e, 0xf206, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, + 0xfb4f, 0xfb50, 0xf200, 0xf200, 0xf201, 0xf702, 0xfb41, 0xfb53, + 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, + 0xfb42, 0xfb4e, 0xfb4d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf20e, 0xf20e, 0xf206, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short ctrl_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf000, 0xf01b, 0xf01c, 0xf01d, 0xf01e, - 0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200, - 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, - 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf702, 0xf001, 0xf013, - 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, - 0xf007, 0xf000, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016, - 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf700, 0xf30c, - 0xf703, 0xf000, 0xf207, 0xf122, 0xf123, 0xf124, 0xf125, 0xf126, - 0xf127, 0xf128, 0xf129, 0xf12a, 0xf12b, 0xf208, 0xf204, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf12c, - 0xf12d, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf000, 0xf01b, 0xf01c, 0xf01d, 0xf01e, + 0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200, + 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, + 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf702, 0xf001, 0xf013, + 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, + 0xf007, 0xf000, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016, + 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf700, 0xf30c, + 0xf703, 0xf000, 0xf207, 0xf122, 0xf123, 0xf124, 0xf125, 0xf126, + 0xf127, 0xf128, 0xf129, 0xf12a, 0xf12b, 0xf208, 0xf204, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf12c, + 0xf12d, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_ctrl_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf000, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200, - 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, - 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, - 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, - 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf07f, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf12e, 0xf12f, 0xf130, 0xf131, 0xf132, - 0xf133, 0xf134, 0xf135, 0xf136, 0xf137, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf138, - 0xf139, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf000, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200, + 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, + 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, + 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, + 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf07f, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf12e, 0xf12f, 0xf130, 0xf131, 0xf132, + 0xf133, 0xf134, 0xf135, 0xf136, 0xf137, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf138, + 0xf139, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short altgr_ctrl_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, - 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, - 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, - 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, + 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, + 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, + 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_altgr_ctrl_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, - 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, - 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, - 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, + 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, + 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, + 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short alt_map[NR_KEYS] = { - 0xf200, 0xf81b, 0xf831, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836, - 0xf837, 0xf838, 0xf839, 0xf830, 0xf82d, 0xf83d, 0xf87f, 0xf809, - 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, - 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf702, 0xf861, 0xf873, - 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b, - 0xf827, 0xf860, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876, - 0xf862, 0xf86e, 0xf86d, 0xf82c, 0xf82e, 0xf82f, 0xf700, 0xf30c, - 0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, - 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907, - 0xf908, 0xf909, 0xf30b, 0xf904, 0xf905, 0xf906, 0xf30a, 0xf901, - 0xf902, 0xf903, 0xf900, 0xf310, 0xf206, 0xf200, 0xf83c, 0xf50a, - 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf210, 0xf211, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf81b, 0xf831, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836, + 0xf837, 0xf838, 0xf839, 0xf830, 0xf82d, 0xf83d, 0xf87f, 0xf809, + 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, + 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf702, 0xf861, 0xf873, + 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b, + 0xf827, 0xf860, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876, + 0xf862, 0xf86e, 0xf86d, 0xf82c, 0xf82e, 0xf82f, 0xf700, 0xf30c, + 0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, + 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907, + 0xf908, 0xf909, 0xf30b, 0xf904, 0xf905, 0xf906, 0xf30a, 0xf901, + 0xf902, 0xf903, 0xf900, 0xf310, 0xf206, 0xf200, 0xf83c, 0xf50a, + 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf210, 0xf211, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf821, 0xf840, 0xf823, 0xf824, 0xf825, 0xf85e, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf851, 0xf857, 0xf845, 0xf852, 0xf854, 0xf859, 0xf855, 0xf849, - 0xf84f, 0xf850, 0xf87b, 0xf87d, 0xf201, 0xf702, 0xf841, 0xf853, - 0xf844, 0xf846, 0xf847, 0xf848, 0xf84a, 0xf84b, 0xf84c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf87c, 0xf85a, 0xf858, 0xf843, 0xf856, - 0xf842, 0xf84e, 0xf84d, 0xf83c, 0xf83e, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf821, 0xf840, 0xf823, 0xf824, 0xf825, 0xf85e, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf851, 0xf857, 0xf845, 0xf852, 0xf854, 0xf859, 0xf855, 0xf849, + 0xf84f, 0xf850, 0xf87b, 0xf87d, 0xf201, 0xf702, 0xf841, 0xf853, + 0xf844, 0xf846, 0xf847, 0xf848, 0xf84a, 0xf84b, 0xf84c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf87c, 0xf85a, 0xf858, 0xf843, 0xf856, + 0xf842, 0xf84e, 0xf84d, 0xf83c, 0xf83e, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short altgr_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, - 0xf86f, 0xf870, 0xf200, 0xf200, 0xf201, 0xf702, 0xf861, 0xf873, - 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf87a, 0xf878, 0xf863, 0xf876, - 0xf862, 0xf86e, 0xf86d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, + 0xf86f, 0xf870, 0xf200, 0xf200, 0xf201, 0xf702, 0xf861, 0xf873, + 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf87a, 0xf878, 0xf863, 0xf876, + 0xf862, 0xf86e, 0xf86d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_altgr_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf851, 0xf857, 0xf845, 0xf852, 0xf854, 0xf859, 0xf855, 0xf849, - 0xf84f, 0xf850, 0xf200, 0xf200, 0xf201, 0xf702, 0xf841, 0xf853, - 0xf844, 0xf846, 0xf847, 0xf848, 0xf84a, 0xf84b, 0xf84c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf85a, 0xf858, 0xf843, 0xf856, - 0xf842, 0xf84e, 0xf84d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf851, 0xf857, 0xf845, 0xf852, 0xf854, 0xf859, 0xf855, 0xf849, + 0xf84f, 0xf850, 0xf200, 0xf200, 0xf201, 0xf702, 0xf841, 0xf853, + 0xf844, 0xf846, 0xf847, 0xf848, 0xf84a, 0xf84b, 0xf84c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf85a, 0xf858, 0xf843, 0xf856, + 0xf842, 0xf84e, 0xf84d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short ctrl_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, - 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, - 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, - 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, - 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf50a, - 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, + 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, + 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, + 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, + 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf50a, + 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_ctrl_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, - 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, - 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, - 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, + 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, + 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, + 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short altgr_ctrl_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, - 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, - 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, - 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, + 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, + 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, + 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; static unsigned short shift_altgr_ctrl_alt_map[NR_KEYS] = { - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, - 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, - 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, - 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, - 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, - 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, - 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, - 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, - 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, + 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, + 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, + 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; ushort *key_maps[MAX_NR_KEYMAPS] = { plain_map, shift_map, altgr_map, shift_altgr_map, ctrl_map, shift_ctrl_map, altgr_ctrl_map, shift_altgr_ctrl_map, alt_map, shift_alt_map, altgr_alt_map, shift_altgr_alt_map, - ctrl_alt_map, shift_ctrl_alt_map, altgr_ctrl_alt_map, shift_altgr_ctrl_alt_map, 0 + ctrl_alt_map, shift_ctrl_alt_map, altgr_ctrl_alt_map, shift_altgr_ctrl_alt_map, 0 }; unsigned int keymap_count = 16; @@ -580,39 +580,39 @@ */ char func_buf[] = { - '\033', '[', '[', 'A', 0, - '\033', '[', '[', 'B', 0, - '\033', '[', '[', 'C', 0, - '\033', '[', '[', 'D', 0, - '\033', '[', '[', 'E', 0, - '\033', '[', '1', '7', '~', 0, - '\033', '[', '1', '8', '~', 0, - '\033', '[', '1', '9', '~', 0, - '\033', '[', '2', '0', '~', 0, - '\033', '[', '2', '1', '~', 0, - '\033', '[', '2', '3', '~', 0, - '\033', '[', '2', '4', '~', 0, - '\033', '[', '2', '5', '~', 0, - '\033', '[', '2', '6', '~', 0, - '\033', '[', '2', '8', '~', 0, - '\033', '[', '2', '9', '~', 0, - '\033', '[', '3', '1', '~', 0, - '\033', '[', '3', '2', '~', 0, - '\033', '[', '3', '3', '~', 0, - '\033', '[', '3', '4', '~', 0, - '\033', '[', '1', '~', 0, - '\033', '[', '2', '~', 0, - '\033', '[', '3', '~', 0, - '\033', '[', '4', '~', 0, - '\033', '[', '5', '~', 0, - '\033', '[', '6', '~', 0, - '\033', '[', 'M', 0, - '\033', '[', 'P', 0, + '\033', '[', '[', 'A', 0, + '\033', '[', '[', 'B', 0, + '\033', '[', '[', 'C', 0, + '\033', '[', '[', 'D', 0, + '\033', '[', '[', 'E', 0, + '\033', '[', '1', '7', '~', 0, + '\033', '[', '1', '8', '~', 0, + '\033', '[', '1', '9', '~', 0, + '\033', '[', '2', '0', '~', 0, + '\033', '[', '2', '1', '~', 0, + '\033', '[', '2', '3', '~', 0, + '\033', '[', '2', '4', '~', 0, + '\033', '[', '2', '5', '~', 0, + '\033', '[', '2', '6', '~', 0, + '\033', '[', '2', '8', '~', 0, + '\033', '[', '2', '9', '~', 0, + '\033', '[', '3', '1', '~', 0, + '\033', '[', '3', '2', '~', 0, + '\033', '[', '3', '3', '~', 0, + '\033', '[', '3', '4', '~', 0, + '\033', '[', '1', '~', 0, + '\033', '[', '2', '~', 0, + '\033', '[', '3', '~', 0, + '\033', '[', '4', '~', 0, + '\033', '[', '5', '~', 0, + '\033', '[', '6', '~', 0, + '\033', '[', 'M', 0, + '\033', '[', 'P', 0, }; char *funcbufptr = func_buf; -int funcbufsize = sizeof(func_buf); -int funcbufleft = 0; /* space left */ +int funcbufsize = sizeof(func_buf); +int funcbufleft = 0; /* space left */ char *func_table[MAX_NR_FUNC] = { func_buf + 0, @@ -649,40 +649,7 @@ }; struct kbdiacr accent_table[MAX_DIACR] = { - {'`', 'A', '\300'}, {'`', 'a', '\340'}, - {'\'', 'A', '\301'}, {'\'', 'a', '\341'}, - {'^', 'A', '\302'}, {'^', 'a', '\342'}, - {'~', 'A', '\303'}, {'~', 'a', '\343'}, - {'"', 'A', '\304'}, {'"', 'a', '\344'}, - {'O', 'A', '\305'}, {'o', 'a', '\345'}, - {'0', 'A', '\305'}, {'0', 'a', '\345'}, - {'A', 'A', '\305'}, {'a', 'a', '\345'}, - {'A', 'E', '\306'}, {'a', 'e', '\346'}, - {',', 'C', '\307'}, {',', 'c', '\347'}, - {'`', 'E', '\310'}, {'`', 'e', '\350'}, - {'\'', 'E', '\311'}, {'\'', 'e', '\351'}, - {'^', 'E', '\312'}, {'^', 'e', '\352'}, - {'"', 'E', '\313'}, {'"', 'e', '\353'}, - {'`', 'I', '\314'}, {'`', 'i', '\354'}, - {'\'', 'I', '\315'}, {'\'', 'i', '\355'}, - {'^', 'I', '\316'}, {'^', 'i', '\356'}, - {'"', 'I', '\317'}, {'"', 'i', '\357'}, - {'-', 'D', '\320'}, {'-', 'd', '\360'}, - {'~', 'N', '\321'}, {'~', 'n', '\361'}, - {'`', 'O', '\322'}, {'`', 'o', '\362'}, - {'\'', 'O', '\323'}, {'\'', 'o', '\363'}, - {'^', 'O', '\324'}, {'^', 'o', '\364'}, - {'~', 'O', '\325'}, {'~', 'o', '\365'}, - {'"', 'O', '\326'}, {'"', 'o', '\366'}, - {'/', 'O', '\330'}, {'/', 'o', '\370'}, - {'`', 'U', '\331'}, {'`', 'u', '\371'}, - {'\'', 'U', '\332'}, {'\'', 'u', '\372'}, - {'^', 'U', '\333'}, {'^', 'u', '\373'}, - {'"', 'U', '\334'}, {'"', 'u', '\374'}, - {'\'', 'Y', '\335'}, {'\'', 'y', '\375'}, - {'T', 'H', '\336'}, {'t', 'h', '\376'}, - {'s', 's', '\337'}, {'"', 'y', '\377'}, - {'s', 'z', '\337'}, {'i', 'j', '\377'}, + { '`', 'A', '\300' }, { '`', 'a', '\340' }, { '\'', 'A', '\301' }, { '\'', 'a', '\341' }, { '^', 'A', '\302' }, { '^', 'a', '\342' }, { '~', 'A', '\303' }, { '~', 'a', '\343' }, { '"', 'A', '\304' }, { '"', 'a', '\344' }, { 'O', 'A', '\305' }, { 'o', 'a', '\345' }, { '0', 'A', '\305' }, { '0', 'a', '\345' }, { 'A', 'A', '\305' }, { 'a', 'a', '\345' }, { 'A', 'E', '\306' }, { 'a', 'e', '\346' }, { ',', 'C', '\307' }, { ',', 'c', '\347' }, { '`', 'E', '\310' }, { '`', 'e', '\350' }, { '\'', 'E', '\311' }, { '\'', 'e', '\351' }, { '^', 'E', '\312' }, { '^', 'e', '\352' }, { '"', 'E', '\313' }, { '"', 'e', '\353' }, { '`', 'I', '\314' }, { '`', 'i', '\354' }, { '\'', 'I', '\315' }, { '\'', 'i', '\355' }, { '^', 'I', '\316' }, { '^', 'i', '\356' }, { '"', 'I', '\317' }, { '"', 'i', '\357' }, { '-', 'D', '\320' }, { '-', 'd', '\360' }, { '~', 'N', '\321' }, { '~', 'n', '\361' }, { '`', 'O', '\322' }, { '`', 'o', '\362' }, { '\'', 'O', '\323' }, { '\'', 'o', '\363' }, { '^', 'O', '\324' }, { '^', 'o', '\364' }, { '~', 'O', '\325' }, { '~', 'o', '\365' }, { '"', 'O', '\326' }, { '"', 'o', '\366' }, { '/', 'O', '\330' }, { '/', 'o', '\370' }, { '`', 'U', '\331' }, { '`', 'u', '\371' }, { '\'', 'U', '\332' }, { '\'', 'u', '\372' }, { '^', 'U', '\333' }, { '^', 'u', '\373' }, { '"', 'U', '\334' }, { '"', 'u', '\374' }, { '\'', 'Y', '\335' }, { '\'', 'y', '\375' }, { 'T', 'H', '\336' }, { 't', 'h', '\376' }, { 's', 's', '\337' }, { '"', 'y', '\377' }, { 's', 'z', '\337' }, { 'i', 'j', '\377' }, }; unsigned int accent_table_size = 68; diff -Nru kbd-2.0.3/tests/dumpkeys.full.ruwin_cplk-UTF-8.map kbd-2.0.4/tests/dumpkeys.full.ruwin_cplk-UTF-8.map --- kbd-2.0.3/tests/dumpkeys.full.ruwin_cplk-UTF-8.map 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/dumpkeys.full.ruwin_cplk-UTF-8.map 2016-11-14 19:51:48.000000000 +0000 @@ -282,232 +282,232 @@ string Next = "\033[6~" string Macro = "\033[M" string Pause = "\033[P" -compose '!' '!' to U+00a1 -compose '"' 'A' to U+00c4 -compose '"' 'E' to U+00cb -compose '"' 'I' to U+00cf -compose '"' 'O' to U+00d6 -compose '"' 'U' to U+00dc -compose '"' 'Y' to U+00be -compose '"' 'a' to U+00e4 -compose '"' 'c' to U+00a9 -compose '"' 'e' to U+00eb -compose '"' 'i' to U+00ef -compose '"' 'o' to U+00f6 -compose '"' 'r' to U+00ae -compose '"' 'u' to U+00fc -compose '"' 'y' to U+00ff -compose '(' 'c' to U+00a9 -compose '(' 'r' to U+00ae -compose '+' '-' to U+00b1 -compose ',' 'A' to U+00a1 -compose ',' 'C' to U+00c7 -compose ',' 'E' to U+00ca -compose ',' 'G' to U+00ab -compose ',' 'I' to U+00c7 -compose ',' 'K' to U+00d3 -compose ',' 'L' to U+00a6 -compose ',' 'N' to U+00d1 -compose ',' 'R' to U+00a3 -compose ',' 'S' to U+00aa -compose ',' 'T' to U+00de -compose ',' 'U' to U+00d9 -compose ',' 'a' to U+00b1 -compose ',' 'c' to U+00e7 -compose ',' 'e' to U+00ea -compose ',' 'g' to U+00bb -compose ',' 'i' to U+00e7 -compose ',' 'k' to U+00f3 -compose ',' 'l' to U+00b6 -compose ',' 'n' to U+00f1 -compose ',' 'r' to U+00b3 -compose ',' 's' to U+00ba -compose ',' 't' to U+00fe -compose ',' 'u' to U+00f9 -compose '-' ':' to U+00f7 -compose '-' 'A' to U+00aa -compose '-' 'C' to U+00a2 -compose '-' 'D' to U+00d0 -compose '-' 'E' to U+00a4 -compose '-' 'H' to U+00a1 -compose '-' 'L' to U+00a3 -compose '-' 'O' to U+00ba -compose '-' 'T' to U+00ac -compose '-' 'Y' to U+00a5 -compose '-' 'a' to U+00aa -compose '-' 'c' to U+00a2 -compose '-' 'd' to U+00f0 -compose '-' 'e' to U+00a4 -compose '-' 'h' to U+00b1 -compose '-' 'l' to U+00a3 -compose '-' 'l' to U+00a5 -compose '-' 'l' to U+00b3 -compose '-' 'o' to U+00ba -compose '-' 't' to U+00bc -compose '.' '.' to U+00b7 -compose '.' 'C' to U+00c5 -compose '.' 'C' to U+00d5 -compose '.' 'E' to U+00cc -compose '.' 'I' to U+00a9 -compose '.' 'Z' to U+00af -compose '.' 'c' to U+00e5 -compose '.' 'c' to U+00f5 -compose '.' 'e' to U+00ec -compose '.' 'i' to U+00b9 -compose '.' 'z' to U+00bf -compose '/' 'D' to U+00d0 -compose '/' 'L' to U+00a3 -compose '/' 'O' to U+00d8 -compose '/' 'T' to U+00ac -compose '/' 'c' to U+00a2 -compose '/' 'd' to U+00f0 -compose '/' 'l' to U+00b3 -compose '/' 'o' to U+00f8 -compose '/' 't' to U+00bc -compose '0' 'A' to U+00c5 -compose '0' 'U' to U+00d9 -compose '0' 'a' to U+00e5 -compose '0' 'u' to U+00f9 -compose '1' '2' to U+00bd -compose '1' '4' to U+00bc -compose '3' '4' to U+00be -compose ':' '-' to U+00f7 -compose ':' 'A' to U+00c4 -compose ':' 'E' to U+00cb -compose ':' 'O' to U+00d6 -compose ':' 'U' to U+00dc -compose ':' 'a' to U+00e4 -compose ':' 'e' to U+00eb -compose ':' 'o' to U+00f6 -compose ':' 'u' to U+00fc -compose '<' '<' to U+00ab -compose '>' '>' to U+00bb -compose '?' '?' to U+00bf -compose 'A' 'A' to U+00c5 -compose 'A' 'E' to U+00c6 -compose 'I' 'J' to U+00be -compose 'L' '=' to U+00a3 -compose 'N' 'G' to U+00bd -compose 'N' 'H' to U+00d1 -compose 'N' 'N' to U+00d1 -compose 'N' 'Y' to U+00d1 -compose 'N' 'h' to U+00d1 -compose 'N' 'n' to U+00d1 -compose 'N' 'y' to U+00d1 -compose 'O' 'A' to U+00c5 -compose 'O' 'E' to U+00bc -compose 'O' 'e' to U+00bc -compose 'T' 'H' to U+00de -compose 'U' 'U' to U+00d9 -compose 'Y' '=' to U+00a5 -compose '\'' 'A' to U+00c1 -compose '\'' 'C' to U+00c6 -compose '\'' 'E' to U+00c9 -compose '\'' 'I' to U+00cd -compose '\'' 'L' to U+00c5 -compose '\'' 'N' to U+00d1 -compose '\'' 'O' to U+00d3 -compose '\'' 'R' to U+00c0 -compose '\'' 'S' to U+00a6 -compose '\'' 'U' to U+00da -compose '\'' 'Y' to U+00dd -compose '\'' 'Z' to U+00ac -compose '\'' 'a' to U+00e1 -compose '\'' 'c' to U+00e6 -compose '\'' 'e' to U+00e9 -compose '\'' 'i' to U+00ed -compose '\'' 'l' to U+00e5 -compose '\'' 'n' to U+00f1 -compose '\'' 'o' to U+00f3 -compose '\'' 'r' to U+00e0 -compose '\'' 's' to U+00b6 -compose '\'' 'u' to U+00fa -compose '\'' 'y' to U+00fd -compose '\'' 'z' to U+00bc -compose '^' '!' to U+00a1 -compose '^' '*' to U+00d7 -compose '^' '.' to U+00b7 -compose '^' '/' to U+00f7 -compose '^' '1' to U+00b9 -compose '^' '2' to U+00b2 -compose '^' '3' to U+00b3 -compose '^' ':' to U+00f7 -compose '^' '?' to U+00bf -compose '^' 'A' to U+00c2 -compose '^' 'C' to U+00c7 -compose '^' 'D' to U+00d0 -compose '^' 'E' to U+00ca -compose '^' 'G' to U+00d4 -compose '^' 'H' to U+00a6 -compose '^' 'I' to U+00ce -compose '^' 'J' to U+00ac -compose '^' 'L' to U+00a5 -compose '^' 'N' to U+00d1 -compose '^' 'R' to U+00d8 -compose '^' 'S' to U+00a6 -compose '^' 'T' to U+00ab -compose '^' 'U' to U+00db -compose '^' 'Z' to U+00b4 -compose '^' 'a' to U+00e2 -compose '^' 'c' to U+00e7 -compose '^' 'd' to U+00f0 -compose '^' 'e' to U+00ea -compose '^' 'g' to U+00f8 -compose '^' 'h' to U+00b6 -compose '^' 'i' to U+00ee -compose '^' 'j' to U+00bc -compose '^' 'l' to U+00b5 -compose '^' 'n' to U+00f1 -compose '^' 'o' to U+00f4 -compose '^' 'r' to U+00f8 -compose '^' 's' to U+00a8 -compose '^' 't' to U+00bb -compose '^' 'u' to U+00fb -compose '^' 'x' to U+00d7 -compose '^' 'z' to U+00b8 -compose '`' 'A' to U+00c0 -compose '`' 'E' to U+00c8 -compose '`' 'I' to U+00cc -compose '`' 'O' to U+00d2 -compose '`' 'U' to U+00d9 -compose '`' 'a' to U+00e0 -compose '`' 'e' to U+00e8 -compose '`' 'i' to U+00ec -compose '`' 'o' to U+00f2 -compose '`' 'u' to U+00f9 -compose 'a' 'a' to U+00e5 -compose 'a' 'e' to U+00e6 -compose 'c' '/' to U+00a2 -compose 'c' '=' to U+00a2 -compose 'e' '=' to U+00a4 -compose 'i' 'j' to U+00ff -compose 'm' 'u' to U+00b5 -compose 'n' 'g' to U+00bf -compose 'n' 'h' to U+00f1 -compose 'n' 'n' to U+00f1 -compose 'o' 'a' to U+00e5 -compose 'o' 'e' to U+00bd -compose 's' 's' to U+00df -compose 's' 'z' to U+00df -compose 't' 'h' to U+00fe -compose 'u' 'u' to U+00f9 -compose 'v' 'S' to U+00a6 -compose 'v' 'Z' to U+00b4 -compose 'v' 's' to U+00a8 -compose 'v' 'z' to U+00b8 -compose 'x' 'x' to U+00d7 -compose '~' 'A' to U+00c3 -compose '~' 'G' to U+00ab -compose '~' 'I' to U+00a5 -compose '~' 'N' to U+00d1 -compose '~' 'O' to U+00d5 -compose '~' 'U' to U+00dd -compose '~' 'a' to U+00e3 -compose '~' 'g' to U+00bb -compose '~' 'i' to U+00b5 -compose '~' 'n' to U+00f1 -compose '~' 'o' to U+00f5 -compose '~' 'u' to U+00fd -compose '|' 's' to U+0024 -compose '|' 'S' to U+0024 -compose 'S' 'S' to U+00a7 +compose '!' '!' to exclamdown +compose '"' 'A' to Adiaeresis +compose '"' 'E' to Ediaeresis +compose '"' 'I' to Idiaeresis +compose '"' 'O' to Odiaeresis +compose '"' 'U' to Udiaeresis +compose '"' 'Y' to threequarters +compose '"' 'a' to adiaeresis +compose '"' 'c' to copyright +compose '"' 'e' to ediaeresis +compose '"' 'i' to idiaeresis +compose '"' 'o' to odiaeresis +compose '"' 'r' to registered +compose '"' 'u' to udiaeresis +compose '"' 'y' to ydiaeresis +compose '(' 'c' to copyright +compose '(' 'r' to registered +compose '+' '-' to plusminus +compose ',' 'A' to exclamdown +compose ',' 'C' to Ccedilla +compose ',' 'E' to Ecircumflex +compose ',' 'G' to guillemotleft +compose ',' 'I' to Ccedilla +compose ',' 'K' to Oacute +compose ',' 'L' to brokenbar +compose ',' 'N' to Ntilde +compose ',' 'R' to sterling +compose ',' 'S' to ordfeminine +compose ',' 'T' to THORN +compose ',' 'U' to Ugrave +compose ',' 'a' to plusminus +compose ',' 'c' to ccedilla +compose ',' 'e' to ecircumflex +compose ',' 'g' to guillemotright +compose ',' 'i' to ccedilla +compose ',' 'k' to oacute +compose ',' 'l' to paragraph +compose ',' 'n' to ntilde +compose ',' 'r' to threesuperior +compose ',' 's' to masculine +compose ',' 't' to thorn +compose ',' 'u' to ugrave +compose '-' ':' to division +compose '-' 'A' to ordfeminine +compose '-' 'C' to cent +compose '-' 'D' to ETH +compose '-' 'E' to currency +compose '-' 'H' to exclamdown +compose '-' 'L' to sterling +compose '-' 'O' to masculine +compose '-' 'T' to notsign +compose '-' 'Y' to yen +compose '-' 'a' to ordfeminine +compose '-' 'c' to cent +compose '-' 'd' to eth +compose '-' 'e' to currency +compose '-' 'h' to plusminus +compose '-' 'l' to sterling +compose '-' 'l' to yen +compose '-' 'l' to threesuperior +compose '-' 'o' to masculine +compose '-' 't' to onequarter +compose '.' '.' to periodcentered +compose '.' 'C' to Aring +compose '.' 'C' to Otilde +compose '.' 'E' to Igrave +compose '.' 'I' to copyright +compose '.' 'Z' to macron +compose '.' 'c' to aring +compose '.' 'c' to otilde +compose '.' 'e' to igrave +compose '.' 'i' to onesuperior +compose '.' 'z' to questiondown +compose '/' 'D' to ETH +compose '/' 'L' to sterling +compose '/' 'O' to Ooblique +compose '/' 'T' to notsign +compose '/' 'c' to cent +compose '/' 'd' to eth +compose '/' 'l' to threesuperior +compose '/' 'o' to oslash +compose '/' 't' to onequarter +compose '0' 'A' to Aring +compose '0' 'U' to Ugrave +compose '0' 'a' to aring +compose '0' 'u' to ugrave +compose '1' '2' to onehalf +compose '1' '4' to onequarter +compose '3' '4' to threequarters +compose ':' '-' to division +compose ':' 'A' to Adiaeresis +compose ':' 'E' to Ediaeresis +compose ':' 'O' to Odiaeresis +compose ':' 'U' to Udiaeresis +compose ':' 'a' to adiaeresis +compose ':' 'e' to ediaeresis +compose ':' 'o' to odiaeresis +compose ':' 'u' to udiaeresis +compose '<' '<' to guillemotleft +compose '>' '>' to guillemotright +compose '?' '?' to questiondown +compose 'A' 'A' to Aring +compose 'A' 'E' to AE +compose 'I' 'J' to threequarters +compose 'L' '=' to sterling +compose 'N' 'G' to onehalf +compose 'N' 'H' to Ntilde +compose 'N' 'N' to Ntilde +compose 'N' 'Y' to Ntilde +compose 'N' 'h' to Ntilde +compose 'N' 'n' to Ntilde +compose 'N' 'y' to Ntilde +compose 'O' 'A' to Aring +compose 'O' 'E' to onequarter +compose 'O' 'e' to onequarter +compose 'T' 'H' to THORN +compose 'U' 'U' to Ugrave +compose 'Y' '=' to yen +compose '\'' 'A' to Aacute +compose '\'' 'C' to AE +compose '\'' 'E' to Eacute +compose '\'' 'I' to Iacute +compose '\'' 'L' to Aring +compose '\'' 'N' to Ntilde +compose '\'' 'O' to Oacute +compose '\'' 'R' to Agrave +compose '\'' 'S' to brokenbar +compose '\'' 'U' to Uacute +compose '\'' 'Y' to Yacute +compose '\'' 'Z' to notsign +compose '\'' 'a' to aacute +compose '\'' 'c' to ae +compose '\'' 'e' to eacute +compose '\'' 'i' to iacute +compose '\'' 'l' to aring +compose '\'' 'n' to ntilde +compose '\'' 'o' to oacute +compose '\'' 'r' to agrave +compose '\'' 's' to paragraph +compose '\'' 'u' to uacute +compose '\'' 'y' to yacute +compose '\'' 'z' to onequarter +compose '^' '!' to exclamdown +compose '^' '*' to multiply +compose '^' '.' to periodcentered +compose '^' '/' to division +compose '^' '1' to onesuperior +compose '^' '2' to twosuperior +compose '^' '3' to threesuperior +compose '^' ':' to division +compose '^' '?' to questiondown +compose '^' 'A' to Acircumflex +compose '^' 'C' to Ccedilla +compose '^' 'D' to ETH +compose '^' 'E' to Ecircumflex +compose '^' 'G' to Ocircumflex +compose '^' 'H' to brokenbar +compose '^' 'I' to Icircumflex +compose '^' 'J' to notsign +compose '^' 'L' to yen +compose '^' 'N' to Ntilde +compose '^' 'R' to Ooblique +compose '^' 'S' to brokenbar +compose '^' 'T' to guillemotleft +compose '^' 'U' to Ucircumflex +compose '^' 'Z' to acute +compose '^' 'a' to acircumflex +compose '^' 'c' to ccedilla +compose '^' 'd' to eth +compose '^' 'e' to ecircumflex +compose '^' 'g' to oslash +compose '^' 'h' to paragraph +compose '^' 'i' to icircumflex +compose '^' 'j' to onequarter +compose '^' 'l' to mu +compose '^' 'n' to ntilde +compose '^' 'o' to ocircumflex +compose '^' 'r' to oslash +compose '^' 's' to diaeresis +compose '^' 't' to guillemotright +compose '^' 'u' to ucircumflex +compose '^' 'x' to multiply +compose '^' 'z' to cedilla +compose '`' 'A' to Agrave +compose '`' 'E' to Egrave +compose '`' 'I' to Igrave +compose '`' 'O' to Ograve +compose '`' 'U' to Ugrave +compose '`' 'a' to agrave +compose '`' 'e' to egrave +compose '`' 'i' to igrave +compose '`' 'o' to ograve +compose '`' 'u' to ugrave +compose 'a' 'a' to aring +compose 'a' 'e' to ae +compose 'c' '/' to cent +compose 'c' '=' to cent +compose 'e' '=' to currency +compose 'i' 'j' to ydiaeresis +compose 'm' 'u' to mu +compose 'n' 'g' to questiondown +compose 'n' 'h' to ntilde +compose 'n' 'n' to ntilde +compose 'o' 'a' to aring +compose 'o' 'e' to onehalf +compose 's' 's' to ssharp +compose 's' 'z' to ssharp +compose 't' 'h' to thorn +compose 'u' 'u' to ugrave +compose 'v' 'S' to brokenbar +compose 'v' 'Z' to acute +compose 'v' 's' to diaeresis +compose 'v' 'z' to cedilla +compose 'x' 'x' to multiply +compose '~' 'A' to Atilde +compose '~' 'G' to guillemotleft +compose '~' 'I' to yen +compose '~' 'N' to Ntilde +compose '~' 'O' to Otilde +compose '~' 'U' to Yacute +compose '~' 'a' to atilde +compose '~' 'g' to guillemotright +compose '~' 'i' to mu +compose '~' 'n' to ntilde +compose '~' 'o' to otilde +compose '~' 'u' to yacute +compose '|' 's' to dollar +compose '|' 'S' to dollar +compose 'S' 'S' to section diff -Nru kbd-2.0.3/tests/dumpkeys-fulltable.in kbd-2.0.4/tests/dumpkeys-fulltable.in --- kbd-2.0.3/tests/dumpkeys-fulltable.in 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/dumpkeys-fulltable.in 2016-10-31 15:56:03.000000000 +0000 @@ -33,7 +33,7 @@ kmap="$DATADIR/dumpkeys.ua-ws.map" line0="$(grep '^#keymaps ' "$kmap")" ||: line0="${line0#\#}" -line1="$(./libkeymap-dumpkeys "$kmap" SEPARATE_LINE FALSE |grep '^keymaps ')" ||: +line1="$(./libkeymap-dumpkeys "$kmap" SEPARATE_LINES FALSE |grep '^keymaps ')" ||: if [ "$line0" != "$line1" ]; then printf 'was: %s\n' "$line0" diff -Nru kbd-2.0.3/tests/libkeymap-bkeymap.c kbd-2.0.4/tests/libkeymap-bkeymap.c --- kbd-2.0.3/tests/libkeymap-bkeymap.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-bkeymap.c 2016-12-19 15:01:51.000000000 +0000 @@ -12,7 +12,7 @@ f.pipe = 0; strcpy(f.pathname, argv[1]); - f.fd = fopen( argv[1], "r"); + f.fd = fopen(argv[1], "r"); lk_parse_keymap(ctx, &f); lk_dump_bkeymap(ctx, stdout); diff -Nru kbd-2.0.3/tests/libkeymap-charset.c kbd-2.0.4/tests/libkeymap-charset.c --- kbd-2.0.3/tests/libkeymap-charset.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-charset.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,7 +3,6 @@ #include #include - START_TEST(test0) { char *s; @@ -44,7 +43,8 @@ s = lk_get_charset(ctx); - fail_if(s != NULL, "Wrong charset"); + fail_if(s == NULL, "Charset not found"); + fail_if(strcmp(s, "iso-8859-1"), "Unable to parse charset"); lk_free(ctx); } @@ -53,7 +53,7 @@ static Suite * libkeymap_suite(void) { - Suite *s = suite_create("libkeymap"); + Suite *s = suite_create("libkeymap"); TCase *tc_core = tcase_create(NULL); tcase_add_test(tc_core, test0); @@ -67,13 +67,13 @@ { int number_failed; - Suite *s = libkeymap_suite(); - SRunner *sr = srunner_create (s); + Suite *s = libkeymap_suite(); + SRunner *sr = srunner_create(s); srunner_run_all(sr, CK_NORMAL); number_failed = srunner_ntests_failed(sr); - srunner_free (sr); + srunner_free(sr); return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff -Nru kbd-2.0.3/tests/libkeymap-dumpkeys.c kbd-2.0.4/tests/libkeymap-dumpkeys.c --- kbd-2.0.3/tests/libkeymap-dumpkeys.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-dumpkeys.c 2016-12-19 15:01:51.000000000 +0000 @@ -15,10 +15,14 @@ return 1; } - if (!strcasecmp(argv[2], "FULL_TABLE")) table = LK_SHAPE_FULL_TABLE; - else if (!strcasecmp(argv[2], "SEPARATE_LINES")) table = LK_SHAPE_SEPARATE_LINES; - else if (!strcasecmp(argv[2], "UNTIL_HOLE")) table = LK_SHAPE_UNTIL_HOLE; - else table = LK_SHAPE_DEFAULT; + if (!strcasecmp(argv[2], "FULL_TABLE")) + table = LK_SHAPE_FULL_TABLE; + else if (!strcasecmp(argv[2], "SEPARATE_LINES")) + table = LK_SHAPE_SEPARATE_LINES; + else if (!strcasecmp(argv[2], "UNTIL_HOLE")) + table = LK_SHAPE_UNTIL_HOLE; + else + table = LK_SHAPE_DEFAULT; numeric = (!strcasecmp(argv[3], "TRUE")) ? 1 : 0; @@ -27,7 +31,7 @@ f.pipe = 0; strcpy(f.pathname, argv[1]); - f.fd = fopen( argv[1], "r"); + f.fd = fopen(argv[1], "r"); lk_parse_keymap(ctx, &f); lk_dump_keymap(ctx, stdout, table, numeric); diff -Nru kbd-2.0.3/tests/libkeymap-init.c kbd-2.0.4/tests/libkeymap-init.c --- kbd-2.0.3/tests/libkeymap-init.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-init.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,7 +3,6 @@ #include #include - START_TEST(test_create_0) { struct lk_ctx *ctx; @@ -11,7 +10,7 @@ ctx = lk_init(); fail_if(ctx == NULL, - "Unable to initialize structure by valid pointer"); + "Unable to initialize structure by valid pointer"); lk_free(ctx); } END_TEST @@ -23,25 +22,24 @@ ctx = lk_init(); fail_if(ctx == NULL, - "Unable to initialize structure by valid pointer"); + "Unable to initialize structure by valid pointer"); fail_unless(lk_free(ctx) == 0, - "Unable to free by valid pointer"); + "Unable to free by valid pointer"); } END_TEST START_TEST(test_free_1) { fail_if(lk_free(NULL) == 0, - "Possible to free NULL pointer"); + "Possible to free NULL pointer"); } END_TEST - static Suite * libkeymap_suite(void) { - Suite *s = suite_create("libkeymap"); + Suite *s = suite_create("libkeymap"); TCase *tc_core = tcase_create(NULL); tcase_add_test(tc_core, test_create_0); @@ -56,13 +54,13 @@ { int number_failed; - Suite *s = libkeymap_suite(); - SRunner *sr = srunner_create (s); + Suite *s = libkeymap_suite(); + SRunner *sr = srunner_create(s); srunner_run_all(sr, CK_NORMAL); number_failed = srunner_ntests_failed(sr); - srunner_free (sr); + srunner_free(sr); return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff -Nru kbd-2.0.3/tests/libkeymap-keys.c kbd-2.0.4/tests/libkeymap-keys.c --- kbd-2.0.3/tests/libkeymap-keys.c 2014-06-26 13:34:41.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-keys.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,7 +3,6 @@ #include #include - START_TEST(test_add_key_0) { struct lk_ctx *ctx; @@ -12,10 +11,10 @@ lk_set_log_fn(ctx, NULL, NULL); fail_if(lk_add_key(ctx, 0, NR_KEYS + 1, 0) != 0, - "Unable to use index > NR_KEYS"); + "Unable to use index > NR_KEYS"); fail_if(lk_add_key(ctx, MAX_NR_KEYMAPS + 1, 0, 0) != 0, - "Unable to use table > MAX_NR_KEYMAPS"); + "Unable to use table > MAX_NR_KEYMAPS"); lk_free(ctx); } @@ -29,13 +28,13 @@ lk_set_log_fn(ctx, NULL, NULL); fail_unless(lk_add_key(ctx, 0, 0, 0) == 0, - "Unable to add keycode = 0"); + "Unable to add keycode = 0"); fail_unless(lk_add_key(ctx, 0, 0, 16) == 0, - "Unable to add keycode = 16"); + "Unable to add keycode = 16"); fail_unless(lk_add_key(ctx, 1, 1, K_HOLE) == 0, - "Unable to add keycode = K_HOLE"); + "Unable to add keycode = K_HOLE"); lk_free(ctx); } @@ -50,10 +49,10 @@ lk_set_parser_flags(ctx, LK_KEYWORD_ALTISMETA); fail_unless(lk_add_key(ctx, 0, 0, 16) == 0, - "Unable to add keycode"); + "Unable to add keycode"); fail_unless(lk_get_key(ctx, 0, 0) == 16, - "Unable to get keycode"); + "Unable to get keycode"); lk_free(ctx); } @@ -63,15 +62,15 @@ { char *stringvalues[30] = { /* F1 .. F20 */ - "\033[[A", "\033[[B", "\033[[C", "\033[[D", "\033[[E", + "\033[[A", "\033[[B", "\033[[C", "\033[[D", "\033[[E", "\033[17~", "\033[18~", "\033[19~", "\033[20~", "\033[21~", "\033[23~", "\033[24~", "\033[25~", "\033[26~", "\033[28~", "\033[29~", "\033[31~", "\033[32~", "\033[33~", "\033[34~", /* Find, Insert, Remove, Select, Prior */ - "\033[1~", "\033[2~", "\033[3~", "\033[4~", "\033[5~", + "\033[1~", "\033[2~", "\033[3~", "\033[4~", "\033[5~", /* Next, Macro, Help, Do, Pause */ - "\033[6~", 0, 0, 0, 0 + "\033[6~", 0, 0, 0, 0 }; int i; struct lk_ctx *ctx; @@ -86,12 +85,12 @@ continue; strncpy((char *)ke.kb_string, stringvalues[i], - sizeof(ke.kb_string)); + sizeof(ke.kb_string)); ke.kb_string[sizeof(ke.kb_string) - 1] = 0; - ke.kb_func = i; + ke.kb_func = i; fail_if(lk_add_func(ctx, &ke) == -1, - "Unable to add function"); + "Unable to add function"); } lk_free(ctx); @@ -113,7 +112,7 @@ while (i > 0) { fail_if(lk_append_diacr(ctx, &ptr) != 0, - "Unable to add diacr"); + "Unable to add diacr"); i--; } @@ -124,7 +123,7 @@ static Suite * libkeymap_suite(void) { - Suite *s = suite_create("libkeymap"); + Suite *s = suite_create("libkeymap"); TCase *tc_core = tcase_create(NULL); tcase_add_test(tc_core, test_add_key_0); @@ -141,13 +140,13 @@ { int number_failed; - Suite *s = libkeymap_suite(); - SRunner *sr = srunner_create (s); + Suite *s = libkeymap_suite(); + SRunner *sr = srunner_create(s); srunner_run_all(sr, CK_NORMAL); number_failed = srunner_ntests_failed(sr); - srunner_free (sr); + srunner_free(sr); return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff -Nru kbd-2.0.3/tests/libkeymap-kmap.c kbd-2.0.4/tests/libkeymap-kmap.c --- kbd-2.0.3/tests/libkeymap-kmap.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-kmap.c 2016-12-19 15:01:51.000000000 +0000 @@ -3,7 +3,6 @@ #include #include - START_TEST(test_add_map_border) { struct lk_ctx *ctx; @@ -12,16 +11,16 @@ lk_set_log_fn(ctx, NULL, NULL); fail_unless(lk_add_map(ctx, MAX_NR_KEYMAPS) == 0, - "Unable to define map == MAX_NR_KEYMAPS"); + "Unable to define map == MAX_NR_KEYMAPS"); - fail_unless(lk_add_map(ctx, MAX_NR_KEYMAPS*2) == 0, - "Unable to define map == MAX_NR_KEYMAPS*2"); + fail_unless(lk_add_map(ctx, MAX_NR_KEYMAPS * 2) == 0, + "Unable to define map == MAX_NR_KEYMAPS*2"); fail_unless(lk_add_map(ctx, 0) == 0, - "Unable to define map"); + "Unable to define map"); fail_unless(lk_add_map(ctx, 0) == 0, - "Unable to define map"); + "Unable to define map"); lk_free(ctx); } @@ -42,7 +41,7 @@ fail_if(lk_add_map(ctx, 0) != 0, "Unable to define map"); lk_get_kmapinfo(ctx, &info); fail_if(info.keymaps != 1, "Wrong keymap number"); - + fail_if(lk_add_map(ctx, 1) != 0, "Unable to define map"); lk_get_kmapinfo(ctx, &info); fail_if(info.keymaps != 2, "Wrong keymap number"); @@ -58,7 +57,7 @@ static Suite * libkeymap_suite(void) { - Suite *s = suite_create("libkeymap"); + Suite *s = suite_create("libkeymap"); TCase *tc_core = tcase_create(NULL); tcase_add_test(tc_core, test_add_map_border); @@ -72,13 +71,13 @@ { int number_failed; - Suite *s = libkeymap_suite(); - SRunner *sr = srunner_create (s); + Suite *s = libkeymap_suite(); + SRunner *sr = srunner_create(s); srunner_run_all(sr, CK_NORMAL); number_failed = srunner_ntests_failed(sr); - srunner_free (sr); + srunner_free(sr); return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff -Nru kbd-2.0.3/tests/libkeymap-mktable.c kbd-2.0.4/tests/libkeymap-mktable.c --- kbd-2.0.3/tests/libkeymap-mktable.c 2013-08-27 20:45:33.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-mktable.c 2016-12-19 15:01:51.000000000 +0000 @@ -12,7 +12,7 @@ f.pipe = 0; strcpy(f.pathname, argv[1]); - f.fd = fopen( argv[1], "r"); + f.fd = fopen(argv[1], "r"); lk_parse_keymap(ctx, &f); lk_dump_ctable(ctx, stdout); diff -Nru kbd-2.0.3/tests/libkeymap-parse.c kbd-2.0.4/tests/libkeymap-parse.c --- kbd-2.0.3/tests/libkeymap-parse.c 2013-10-07 12:55:01.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-parse.c 2016-12-19 15:01:51.000000000 +0000 @@ -11,7 +11,6 @@ const char ch; }; - START_TEST(test_parse_0) { int c; @@ -168,11 +167,11 @@ fail_if(lk_parse_keymap(ctx, &f) != 0, "Unable to parse keymap"); - for(i = 0; i < MAX_NR_FUNC; i++) { - kbs.kb_func = i; + for (i = 0; i < MAX_NR_FUNC; i++) { + kbs.kb_func = i; kbs.kb_string[0] = 0; fail_if(lk_get_func(ctx, &kbs) != 0, - "Unable to get func %d", i); + "Unable to get func %d", i); } lk_free(ctx); @@ -194,15 +193,15 @@ fail_if(lk_parse_keymap(ctx, &f) != 0, "Unable to parse keymap"); - kbs.kb_func = 0; + kbs.kb_func = 0; kbs.kb_string[0] = 0; fail_if(lk_get_func(ctx, &kbs) != 0, "Unable to get func 0"); - kbs.kb_func = 1; + kbs.kb_func = 1; kbs.kb_string[0] = 0; fail_if(lk_get_func(ctx, &kbs) != 0, "Unable to get func 1"); - kbs.kb_func = 2; + kbs.kb_func = 2; kbs.kb_string[0] = 0; fail_if(lk_get_func(ctx, &kbs) != -1, "Possible to get not alloced func"); @@ -213,7 +212,7 @@ static Suite * libkeymap_suite(void) { - Suite *s = suite_create("libkeymap"); + Suite *s = suite_create("libkeymap"); TCase *tc_core = tcase_create(NULL); setenv("LOADKEYS_INCLUDE_PATH", DATADIR, 1); @@ -234,13 +233,13 @@ { int number_failed; - Suite *s = libkeymap_suite(); - SRunner *sr = srunner_create (s); + Suite *s = libkeymap_suite(); + SRunner *sr = srunner_create(s); srunner_run_all(sr, CK_NORMAL); number_failed = srunner_ntests_failed(sr); - srunner_free (sr); + srunner_free(sr); return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff -Nru kbd-2.0.3/tests/libkeymap-showmaps.c kbd-2.0.4/tests/libkeymap-showmaps.c --- kbd-2.0.3/tests/libkeymap-showmaps.c 2013-10-07 14:13:31.000000000 +0000 +++ kbd-2.0.4/tests/libkeymap-showmaps.c 2016-12-19 15:01:51.000000000 +0000 @@ -15,7 +15,7 @@ f.pipe = 0; strcpy(f.pathname, argv[1]); - f.fd = fopen( argv[1], "r"); + f.fd = fopen(argv[1], "r"); lk_parse_keymap(ctx, &f); diff -Nru kbd-2.0.3/tests/Makefile.am kbd-2.0.4/tests/Makefile.am --- kbd-2.0.3/tests/Makefile.am 2013-11-01 12:33:46.000000000 +0000 +++ kbd-2.0.4/tests/Makefile.am 2016-10-31 15:56:03.000000000 +0000 @@ -4,7 +4,7 @@ -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" AM_CFLAGS = $(CHECK_CFLAGS) -LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) +LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ EXTRA_DIST = \ alt-is-meta.in \ diff -Nru kbd-2.0.3/tests/Makefile.in kbd-2.0.4/tests/Makefile.in --- kbd-2.0.3/tests/Makefile.in 2015-07-13 22:17:11.000000000 +0000 +++ kbd-2.0.4/tests/Makefile.in 2017-01-08 18:49:38.000000000 +0000 @@ -336,7 +336,7 @@ -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" AM_CFLAGS = $(CHECK_CFLAGS) -LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) +LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ EXTRA_DIST = \ alt-is-meta.in \ dumpkeys-bkeymap.in \